Merge pull request #3501 from Expensify/cherry-pick-staging-3481

Expensify · Jun 9, 2021 · 4fa064e · 4fa064e
2 parents d7a0d1a + 9b26ab0
commit 4fa064e
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 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 1001006604
-        versionName "1.0.66-4"
+        versionCode 1001006605
+        versionName "1.0.66-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.66.4</string>
+	<string>1.0.66.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.66.4</string>
+	<string>1.0.66.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.66-4",
+  "version": "1.0.66-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/libs/Permissions.js b/src/libs/Permissions.js
@@ -28,16 +28,18 @@ function canUseIOU(betas) {
 }
 
 /**
+ * @param {Array<String>} betas
  * @returns {Boolean}
  */
-function canUsePayWithExpensify() {
+function canUsePayWithExpensify(betas) {
     return _.contains(betas, CONST.BETAS.PAY_WITH_EXPENSIFY) || canUseAllBetas();
 }
 
 /**
+ * @param {Array<String>} betas
  * @returns {Boolean}
  */
-function canUseFreePlan() {
+function canUseFreePlan(betas) {
     return _.contains(betas, CONST.BETAS.FREE_PLAN) || canUseAllBetas();
 }
 

diff --git a/src/pages/iou/IOUDetailsModal.js b/src/pages/iou/IOUDetailsModal.js
@@ -67,6 +67,9 @@ const propTypes = {
         email: PropTypes.string,
     }).isRequired,
 
+    /** Beta features list */
+    betas: PropTypes.arrayOf(PropTypes.string).isRequired,
+
     ...withLocalizePropTypes,
 };
 
@@ -181,7 +184,7 @@ class IOUDetailsModal extends Component {
      */
     addExpensifyPaymentOptionIfAvailable() {
         if (lodashGet(this.props, 'iouReport.currency') !== CONST.CURRENCY.USD
-            || !Permissions.canUsePayWithExpensify()) {
+            || !Permissions.canUsePayWithExpensify(this.props.betas)) {
             return;
         }
 
@@ -286,5 +289,8 @@ export default compose(
         session: {
             key: ONYXKEYS.SESSION,
         },
+        betas: {
+            key: ONYXKEYS.BETAS,
+        },
     }),
 )(IOUDetailsModal);