Skip to content

Commit 349940e

Browse files
author
Artem
committed
Return the api call instead of the new promise
1 parent b27f8f2 commit 349940e

1 file changed

Lines changed: 18 additions & 25 deletions

File tree

src/utils/apple-pay-helpers.js

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,27 @@ export const parseAmount = (amount: string): number => {
1313
// @method shippingAddressToPayload(contact: Object, api: Object)
1414
// Parses the data sent from Apple into the server-accepted format
1515
export function shippingAddressToPayload(contact: Object, api: Object): Promise<*> {
16-
return new Promise((resolve, reject) => {
17-
const { givenName, familyName, addressLines, locality, postalCode, phoneNumber, administrativeArea } = contact;
16+
const { givenName, familyName, addressLines, locality, postalCode, phoneNumber, administrativeArea } = contact;
1817

19-
api
20-
.get(endpoints.regionIdByCode(administrativeArea))
21-
.then((resp) => {
22-
const firstName = givenName || 'Default';
23-
const lastName = familyName || 'Name';
24-
const address1 = addressLines ? addressLines[0] : 'Default Street';
25-
const phone = phoneNumber ? phoneNumber.replace(/[^\d]/g, '') : '8888888888';
26-
const address2 = addressLines ? addressLines[1] : '';
18+
return api.get(endpoints.regionIdByCode(administrativeArea)).then((resp) => {
19+
const firstName = givenName || 'Default';
20+
const lastName = familyName || 'Name';
21+
const address1 = addressLines ? addressLines[0] : 'Default Street';
22+
const phone = phoneNumber ? phoneNumber.replace(/[^\d]/g, '') : '8888888888';
23+
const address2 = addressLines ? addressLines[1] : '';
2724

28-
const payload = {
29-
name: `${firstName} ${lastName}`,
30-
regionId: resp.id,
31-
address1,
32-
address2: _.isEmpty(address2) ? '' : address2,
33-
city: locality,
34-
zip: postalCode,
35-
phoneNumber: phone,
36-
isDefault: false,
37-
};
25+
const payload = {
26+
name: `${firstName} ${lastName}`,
27+
regionId: resp.id,
28+
address1,
29+
address2: _.isEmpty(address2) ? '' : address2,
30+
city: locality,
31+
zip: postalCode,
32+
phoneNumber: phone,
33+
isDefault: false,
34+
};
3835

39-
resolve(payload);
40-
})
41-
.catch((err) => {
42-
reject(err);
43-
});
36+
return payload;
4437
});
4538
}
4639

0 commit comments

Comments
 (0)