From 068049a8c2bfbbc22f47cdb0fa317500b5d87786 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Tue, 7 Dec 2021 14:51:56 -0800 Subject: [PATCH 1/2] Merge pull request #6632 from Expensify/version-BUILD-6bf6bd64f9f8527918474dbe9835795cb3eb6f07 (cherry picked from commit 44553f39963437d39a34caafa29104929b9cebff) --- 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 612ccdb82b3..8f3a3956e32 100644 --- 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 index bcde0c760e9..a17b9b611cc 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.18.1 + 1.1.18.2 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 1e8f7ee082a..2891e19d82a 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.18.1 + 1.1.18.2 diff --git a/package-lock.json b/package-lock.json index e6f314b401c..d30a7b6c96a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.18-1", + "version": "1.1.18-2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a22cddd2725..048d4f9d06d 100644 --- 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.", From 0ed0b79affcaa2bc42e7caf20325134c304030ad Mon Sep 17 00:00:00 2001 From: Rory Abraham <47436092+roryabraham@users.noreply.github.com> Date: Tue, 7 Dec 2021 14:49:31 -0800 Subject: [PATCH 2/2] Merge pull request #6630 from Expensify/marcaaron-unborkWorkspacePages (cherry picked from commit 6bf6bd64f9f8527918474dbe9835795cb3eb6f07) --- .../workspace/WorkspaceBankAccountPage.js | 67 +++++++++---------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/src/pages/workspace/WorkspaceBankAccountPage.js b/src/pages/workspace/WorkspaceBankAccountPage.js index 67ed050f504..d1c8b88476f 100644 --- 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 ( - - {() => ( - <> - - - {this.props.translate('workspace.bankAccount.youreAlmostDone')} - - - - - )} - + + Navigation.navigate(ROUTES.getWorkspaceInitialRoute(this.props.route.params.policyID))} + shouldShowBackButton + /> + + + {this.props.translate('workspace.bankAccount.youreAlmostDone')} + + + + ); } }