Merge pull request #3242 from Expensify/main

Expensify · May 31, 2021 · bfb2647 · bfb2647
2 parents 280f36d + dc2ea0a
commit bfb2647
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 11 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001005704
-        versionName "1.0.57-4"
+        versionCode 1001005705
+        versionName "1.0.57-5"
     }
     splits {
         abi {

diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.57.4</string>
+	<string>1.0.57.5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.57.4</string>
+	<string>1.0.57.5</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.57-4",
+  "version": "1.0.57-5",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.cash",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

diff --git a/src/CONST.js b/src/CONST.js
@@ -167,6 +167,7 @@ const CONST = {
         // not be changed.
         PAYMENT_TYPE: {
             ELSEWHERE: 'Elsewhere',
+            EXPENSIFY: 'Expensify',
             PAYPAL_ME: 'PayPal.me',
             VENMO: 'Venmo',
         },

diff --git a/src/languages/en.js b/src/languages/en.js
@@ -108,6 +108,7 @@ export default {
         pay: 'Pay',
         viewDetails: 'View Details',
         settleElsewhere: 'I\'ll settle up elsewhere',
+        settleExpensify: 'Pay with Expensify',
         settlePaypalMe: 'Pay with PayPal.me',
         settleVenmo: 'Pay with Venmo',
         request: ({amount}) => `Request ${amount}`,

diff --git a/src/libs/API.js b/src/libs/API.js
@@ -455,6 +455,17 @@ function PayIOU(parameters) {
     return Network.post(commandName, parameters);
 }
 
+/**
+ * @param {Object} parameters
+ * @param {Number} parameters.reportID
+ * @returns {Promise}
+ */
+function PayWithWallet(parameters) {
+    const commandName = 'PayWithWallet';
+    requireParameters(['reportID'], parameters, commandName);
+    return Network.post(commandName, parameters);
+}
+
 /**
  * @param {Object} parameters
  * @param {String} parameters.emailList
@@ -800,6 +811,7 @@ export {
     Graphite_Timer,
     Log,
     PayIOU,
+    PayWithWallet,
     PersonalDetails_GetForEmails,
     PersonalDetails_Update,
     Plaid_GetLinkToken,

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
@@ -153,10 +153,10 @@ function payIOUReport({
     chatReportID, reportID, paymentMethodType, amount, currency, submitterPhoneNumber, submitterPayPalMeAddress,
 }) {
     Onyx.merge(ONYXKEYS.IOU, {loading: true, error: false});
-    API.PayIOU({
-        reportID,
-        paymentMethodType,
-    })
+    const payIOUPromise = paymentMethodType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY
+        ? API.PayWithWallet({reportID})
+        : API.PayIOU({reportID, paymentMethodType});
+    payIOUPromise
         .then((response) => {
             if (response.jsonCode !== 200) {
                 throw new Error(response.message);
@@ -171,7 +171,7 @@ function payIOUReport({
             fetchIOUReportByIDAndUpdateChatReport(reportID, chatReportID);
 
             // Once we have successfully paid the IOU we will transfer the user to their platform of choice if they have
-            // selected something other than a manual settlement e.g. Venmo or PayPal.me
+            // selected something other than a manual settlement or Expensify Wallet e.g. Venmo or PayPal.me
             if (paymentMethodType === CONST.IOU.PAYMENT_TYPE.PAYPAL_ME) {
                 openURLInNewTab(buildPayPalPaymentUrl(amount, submitterPayPalMeAddress, currency));
             } else if (paymentMethodType === CONST.IOU.PAYMENT_TYPE.VENMO) {

diff --git a/src/pages/iou/IOUDetailsModal.js b/src/pages/iou/IOUDetailsModal.js
@@ -102,6 +102,7 @@ class IOUDetailsModal extends Component {
         this.isComponentMounted = true;
         fetchIOUReportByID(this.props.route.params.iouReportID, this.props.route.params.chatReportID);
         this.addVenmoPaymentOptionIfAvailable();
+        this.addExpensifyPaymentOptionIfAvailable();
     }
 
     componentWillUnmount() {
@@ -173,10 +174,27 @@ class IOUDetailsModal extends Component {
             });
     }
 
+    /**
+     * Checks to see if we can use Expensify.
+     * The report currency must be USD.
+     */
+    addExpensifyPaymentOptionIfAvailable() {
+        if (lodashGet(this.props, 'iouReport.currency') !== CONST.CURRENCY.USD) {
+            return;
+        }
+
+        // Make it the first payment option and set it as the default.
+        this.setState(prevState => ({
+            paymentOptions: [CONST.IOU.PAYMENT_TYPE.EXPENSIFY, ...prevState.paymentOptions],
+            paymentType: CONST.IOU.PAYMENT_TYPE.EXPENSIFY,
+        }));
+    }
+
     render() {
         const sessionEmail = lodashGet(this.props.session, 'email', null);
         const reportIsLoading = _.isUndefined(this.props.iouReport);
         const paymentTypeTextOptions = {
+            [CONST.IOU.PAYMENT_TYPE.EXPENSIFY]: this.props.translate('iou.settleExpensify'),
             [CONST.IOU.PAYMENT_TYPE.VENMO]: this.props.translate('iou.settleVenmo'),
             [CONST.IOU.PAYMENT_TYPE.PAYPAL_ME]: this.props.translate('iou.settlePaypalMe'),
             [CONST.IOU.PAYMENT_TYPE.ELSEWHERE]: this.props.translate('iou.settleElsewhere'),