Merge pull request #6633 from Expensify/OSBotify-cherry-pick-staging-…

…6630
Expensify · Dec 7, 2021 · bce1708 · bce1708
2 parents e1cfcdf + 0ed0b79
commit bce1708
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 40 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -149,8 +149,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001011801
-        versionName "1.1.18-1"
+        versionCode 1001011802
+        versionName "1.1.18-2"
     }
     splits {
         abi {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.18.1</string>
+	<string>1.1.18.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.18.1</string>
+	<string>1.1.18.2</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": "new.expensify",
-  "version": "1.1.18-1",
+  "version": "1.1.18-2",
   "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.",

diff --git a/src/pages/workspace/WorkspaceBankAccountPage.js b/src/pages/workspace/WorkspaceBankAccountPage.js
@@ -1,8 +1,10 @@
 import lodashGet from 'lodash/get';
 import React from 'react';
 import {withOnyx} from 'react-native-onyx';
+import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
 import * as Expensicons from '../../components/Icon/Expensicons';
 import * as Illustrations from '../../components/Icon/Illustrations';
+import ScreenWrapper from '../../components/ScreenWrapper';
 import ExpensifyText from '../../components/ExpensifyText';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
 import * as BankAccounts from '../../libs/actions/BankAccounts';
@@ -14,8 +16,6 @@ import ROUTES from '../../ROUTES';
 import reimbursementAccountPropTypes from '../ReimbursementAccount/reimbursementAccountPropTypes';
 import WorkspaceSection from './WorkspaceSection';
 import WorkspaceResetBankAccountModal from './WorkspaceResetBankAccountModal';
-import WorkspacePageWithSections from './WorkspacePageWithSections';
-
 
 const propTypes = {
     /** ACH data for the withdrawal account actively being set up */
@@ -85,38 +85,37 @@ class WorkspaceBankAccountPage extends React.Component {
         }
 
         return (
-            <WorkspacePageWithSections
-                headerText={this.props.translate('workspace.common.bankAccount')}
-                route={this.props.route}
-            >
-                {() => (
-                    <>
-                        <WorkspaceSection
-                            title={this.props.translate('workspace.bankAccount.almostDone')}
-                            icon={Illustrations.BankArrowPink}
-                            menuItems={[
-                                {
-                                    title: this.props.translate('workspace.bankAccount.continueWithSetup'),
-                                    icon: Expensicons.Bank,
-                                    onPress: this.navigateToBankAccountRoute,
-                                    shouldShowRightIcon: true,
-                                },
-                                {
-                                    title: this.props.translate('workspace.bankAccount.startOver'),
-                                    icon: Expensicons.RotateLeft,
-                                    onPress: BankAccounts.requestResetFreePlanBankAccount,
-                                    shouldShowRightIcon: true,
-                                },
-                            ]}
-                        >
-                            <ExpensifyText>
-                                {this.props.translate('workspace.bankAccount.youreAlmostDone')}
-                            </ExpensifyText>
-                        </WorkspaceSection>
-                        <WorkspaceResetBankAccountModal />
-                    </>
-                )}
-            </WorkspacePageWithSections>
+            <ScreenWrapper>
+                <HeaderWithCloseButton
+                    title={this.props.translate('workspace.common.bankAccount')}
+                    onCloseButtonPress={Navigation.dismissModal}
+                    onBackButtonPress={() => Navigation.navigate(ROUTES.getWorkspaceInitialRoute(this.props.route.params.policyID))}
+                    shouldShowBackButton
+                />
+                <WorkspaceSection
+                    title={this.props.translate('workspace.bankAccount.almostDone')}
+                    icon={Illustrations.BankArrowPink}
+                    menuItems={[
+                        {
+                            title: this.props.translate('workspace.bankAccount.continueWithSetup'),
+                            icon: Expensicons.Bank,
+                            onPress: this.navigateToBankAccountRoute,
+                            shouldShowRightIcon: true,
+                        },
+                        {
+                            title: this.props.translate('workspace.bankAccount.startOver'),
+                            icon: Expensicons.RotateLeft,
+                            onPress: BankAccounts.requestResetFreePlanBankAccount,
+                            shouldShowRightIcon: true,
+                        },
+                    ]}
+                >
+                    <ExpensifyText>
+                        {this.props.translate('workspace.bankAccount.youreAlmostDone')}
+                    </ExpensifyText>
+                </WorkspaceSection>
+                <WorkspaceResetBankAccountModal />
+            </ScreenWrapper>
         );
     }
 }