From b8e5600185ae82d608a6ecc7c03e64e3bef1b252 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 24 Jan 2023 05:53:50 -0500
Subject: [PATCH 1/2] Merge pull request #14509 from
 Expensify/version-BUILD-1E53A036-DC71-4A10-A537-7FE462383690

Update version to 1.2.58-4 on main

(cherry picked from commit 49ded4fea0daf4f4843f59cf4e8ac102fb0517c5)
---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 308156e3acba..9982827dc03f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001025803
-        versionName "1.2.58-3"
+        versionCode 1001025804
+        versionName "1.2.58-4"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 99798a262963..ba0f8b686825 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.58.3</string>
+	<string>1.2.58.4</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 377a0034c8eb..256cab8eab64 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.58.3</string>
+	<string>1.2.58.4</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 1c6604cbdd3d..fc5830bb9985 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.2.58-3",
+  "version": "1.2.58-4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.2.58-3",
+      "version": "1.2.58-4",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index d3dca9b00da5..7ca795459e26 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.58-3",
+  "version": "1.2.58-4",
   "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 5c8adc105e8c9ee8225be1dabedfb86e0c739665 Mon Sep 17 00:00:00 2001
From: Maria D'Costa <maria@expensify.com>
Date: Tue, 24 Jan 2023 14:48:06 +0400
Subject: [PATCH 2/2] Merge pull request #14508 from
 Expensify/nat-missingimport

Fix missing import preventing opening Plaid modal

(cherry picked from commit 553916c715ce2f0bf5c549333212702f2539f5e0)
---
 src/libs/actions/BankAccounts.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js
index b6aea981e5f6..6bc5e6d608d4 100644
--- a/src/libs/actions/BankAccounts.js
+++ b/src/libs/actions/BankAccounts.js
@@ -7,6 +7,7 @@ import DateUtils from '../DateUtils';
 import * as PlaidDataProps from '../../pages/ReimbursementAccount/plaidDataPropTypes';
 import Navigation from '../Navigation/Navigation';
 import ROUTES from '../../ROUTES';
+import * as ReimbursementAccount from './ReimbursementAccount';
 
 export {
     goToWithdrawalAccountSetupStep,
@@ -38,7 +39,7 @@ function clearPlaid() {
 }
 
 function openPlaidView() {
-    clearPlaid().then(() => this.setBankAccountSubStep(CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID));
+    clearPlaid().then(() => ReimbursementAccount.setBankAccountSubStep(CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID));
 }
 
 function openPersonalBankAccountSetupView() {