Merge pull request #8950 from Expensify/roryabraham-cherry-pick-stagi…

…ng-8940

🍒 Cherry pick PR #8940 to staging 🍒

android/app/build.gradle

@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001015712
-        versionName "1.1.57-12"
+        versionCode 1001015713
+        versionName "1.1.57-13"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.57.12</string>
+	<string>1.1.57.13</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.57.12</string>
+	<string>1.1.57.13</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.57-12",
+  "version": "1.1.57-13",
   "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.",

src/pages/signin/PasswordForm.js

@@ -83,7 +83,9 @@ class PasswordForm extends React.Component {
      * Trigger the reset password flow and ensure the 2FA input field is reset to avoid it being permanently hidden
      */
     resetPassword() {
-        this.setState({twoFactorAuthCode: ''}, this.input2FA.clear);
+        if (this.input2FA) {
+            this.setState({twoFactorAuthCode: ''}, this.input2FA.clear);
+        }
         Session.resetPassword();
     }