From e28ec3d4e82884fcf8cc5b682c2e77bba78b33b6 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 13 May 2022 12:17:43 -0700
Subject: [PATCH 1/2] Merge pull request #8999 from
Expensify/version-BUILD-a6281257b623d0cce1a72d05cdef55ad28ee4972
Update version to 1.1.60-1 on main
(cherry picked from commit 12102827cc444e30dba597aecf3400cbfc7f5451)
---
android/app/build.gradle | 4 ++--
ios/NewExpensify/Info.plist | 2 +-
ios/NewExpensifyTests/Info.plist | 2 +-
package-lock.json | 2 +-
package.json | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 8d42149ec69..3e9acea53eb 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001016000
- versionName "1.1.60-0"
+ versionCode 1001016001
+ versionName "1.1.60-1"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index ed9c1f35a7d..3e57cb9c48b 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.1.60.0
+ 1.1.60.1
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 9f504c03acd..713fd2aaf85 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.60.0
+ 1.1.60.1
diff --git a/package-lock.json b/package-lock.json
index 864cac8a95a..e41e6908393 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.60-0",
+ "version": "1.1.60-1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 2414a31193f..cf9d9939217 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.60-0",
+ "version": "1.1.60-1",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
From 941a615f943ed86f9c87e39c9324b4a3e635087b Mon Sep 17 00:00:00 2001
From: Amy Evans
Date: Fri, 13 May 2022 14:08:37 -0400
Subject: [PATCH 2/2] Merge pull request #8993 from
Expensify/neil-remove-canUseFreePlan-fix
Remove left over Permissions.canUseFreePlan
(cherry picked from commit a6281257b623d0cce1a72d05cdef55ad28ee4972)
---
.../ReimbursementAccountPage.js | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index b5ef196ff10..60107f7926f 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -5,12 +5,10 @@ import {withOnyx} from 'react-native-onyx';
import Str from 'expensify-common/lib/str';
import {View} from 'react-native';
import PropTypes from 'prop-types';
-import Log from '../../libs/Log';
import ScreenWrapper from '../../components/ScreenWrapper';
import * as BankAccounts from '../../libs/actions/BankAccounts';
import ONYXKEYS from '../../ONYXKEYS';
import ReimbursementAccountLoadingIndicator from '../../components/ReimbursementAccountLoadingIndicator';
-import Permissions from '../../libs/Permissions';
import Navigation from '../../libs/Navigation/Navigation';
import CONST from '../../CONST';
import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
@@ -33,9 +31,6 @@ import reimbursementAccountPropTypes from './reimbursementAccountPropTypes';
import WorkspaceResetBankAccountModal from '../workspace/WorkspaceResetBankAccountModal';
const propTypes = {
- /** List of betas */
- betas: PropTypes.arrayOf(PropTypes.string).isRequired,
-
/** ACH data for the withdrawal account actively being set up */
reimbursementAccount: reimbursementAccountPropTypes,
@@ -145,12 +140,6 @@ class ReimbursementAccountPage extends React.Component {
}
render() {
- if (!Permissions.canUseFreePlan(this.props.betas)) {
- Log.info('Not showing new bank account page because user is not on free plan beta');
- Navigation.dismissModal();
- return null;
- }
-
// The SetupWithdrawalAccount flow allows us to continue the flow from various points depending on where the
// user left off. This view will refer to the achData as the single source of truth to determine which route to
// display. We can also specify a specific route to navigate to via route params when the component first
@@ -250,9 +239,6 @@ export default compose(
session: {
key: ONYXKEYS.SESSION,
},
- betas: {
- key: ONYXKEYS.BETAS,
- },
plaidLinkToken: {
key: ONYXKEYS.PLAID_LINK_TOKEN,
},