Merge pull request #6992 from Expensify/marcaaron-improveSendMoneyMethod

Return promise in payIOUReport / Fix AdditionalDetailsStep
Expensify · Jan 4, 2022 · 6e9e7a3 · 6e9e7a3
2 parents 667570c + 8b38d0a
commit 6e9e7a3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
@@ -249,7 +249,8 @@ function buildPayPalPaymentUrl(amount, submitterPayPalMeAddress, currency) {
  * @param {String} [params.requestorPhoneNumber] - used for Venmo
  * @param {String} [params.requestorPayPalMeAddress]
  * @param {String} [params.newIOUReportDetails] - Extra details required only for send money flow
- * @param {Boolean} [params.shouldRedirectToChatReport]
+ *
+ * @return {Promise}
  */
 function payIOUReport({
     chatReportID,
@@ -260,7 +261,6 @@ function payIOUReport({
     requestorPhoneNumber,
     requestorPayPalMeAddress,
     newIOUReportDetails,
-    shouldRedirectToChatReport = false,
 }) {
     Onyx.merge(ONYXKEYS.IOU, {loading: true, error: false});
 
@@ -278,7 +278,7 @@ function payIOUReport({
         url = buildVenmoPaymentURL(amount, requestorPhoneNumber);
     }
 
-    asyncOpenURL(payIOUPromise
+    const promiseWithHandlers = payIOUPromise
         .then((response) => {
             if (response.jsonCode !== 200) {
                 throw new Error(response.message);
@@ -304,12 +304,9 @@ function payIOUReport({
         })
         .finally(() => {
             Onyx.merge(ONYXKEYS.IOU, {loading: false});
-
-            if (shouldRedirectToChatReport) {
-                Navigation.navigate(ROUTES.REPORT);
-            }
-        }),
-    url);
+        });
+    asyncOpenURL(promiseWithHandlers, url);
+    return promiseWithHandlers;
 }
 
 export {

diff --git a/src/pages/EnablePayments/AdditionalDetailsStep.js b/src/pages/EnablePayments/AdditionalDetailsStep.js
@@ -214,13 +214,17 @@ class AdditionalDetailsStep extends React.Component {
                                     <AddressSearch
                                         label={this.props.translate(this.fieldNameTranslationKeys.addressStreet)}
                                         value={this.state.addressStreet}
-                                        onChangeText={(fieldName, value) => {
-                                            if (fieldName === 'addressZipCode') {
-                                                this.clearErrorAndSetValue('addressZip', value);
-                                                return;
-                                            }
-
-                                            this.clearErrorAndSetValue(fieldName, value);
+                                        onChange={(values) => {
+                                            const renamedFields = {
+                                                street: 'addressStreet',
+                                                state: 'addressState',
+                                                zipCode: 'addressZip',
+                                                city: 'addressCity',
+                                            };
+                                            _.each(values, (value, inputKey) => {
+                                                const renamedInputKey = lodashGet(renamedFields, inputKey, inputKey);
+                                                this.clearErrorAndSetValue(renamedInputKey, value);
+                                            });
                                         }}
                                         errorText={this.getErrorText('addressStreet')}
                                     />

diff --git a/src/pages/iou/IOUModal.js b/src/pages/iou/IOUModal.js
@@ -305,8 +305,10 @@ class IOUModal extends Component {
             requestorPhoneNumber: this.state.participants[0].phoneNumber,
             comment,
             newIOUReportDetails,
-            shouldRedirectToChatReport: true,
-        });
+        })
+            .finally(() => {
+                Navigation.navigate(ROUTES.REPORT);
+            });
     }
 
     /**