Merge pull request #11500 from Expensify/update-staging-from-main

Update version to 1.2.11-1 on staging
Expensify · Oct 1, 2022 · 54b7896 · 54b7896
2 parents 409d556 + 0fa5c12
commit 54b7896
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 23 deletions.
diff --git 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 1001021100
-        versionName "1.2.11-0"
+        versionCode 1001021101
+        versionName "1.2.11-1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.11.0</string>
+	<string>1.2.11.1</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.2.11.0</string>
+	<string>1.2.11.1</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.2.11-0",
+  "version": "1.2.11-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.",

diff --git a/src/components/ReimbursementAccountLoadingIndicator.js b/src/components/ReimbursementAccountLoadingIndicator.js
@@ -9,6 +9,7 @@ import HeaderWithCloseButton from './HeaderWithCloseButton';
 import Navigation from '../libs/Navigation/Navigation';
 import ScreenWrapper from './ScreenWrapper';
 import FullScreenLoadingIndicator from './FullscreenLoadingIndicator';
+import FullPageOfflineBlockingView from './BlockingViews/FullPageOfflineBlockingView';
 
 const propTypes = {
     /** Whether the user is submitting verifications data */
@@ -23,23 +24,25 @@ const ReimbursementAccountLoadingIndicator = props => (
             title={props.translate('reimbursementAccountLoadingAnimation.oneMoment')}
             onCloseButtonPress={Navigation.dismissModal}
         />
-        {props.isSubmittingVerificationsData ? (
-            <View style={[styles.pageWrapper]}>
-                <Image
-                    source={{uri: `${CONST.CLOUDFRONT_URL}/images/icons/emptystates/emptystate_reviewing.gif`}}
-                    style={[
-                        styles.loadingVBAAnimation,
-                    ]}
-                />
-                <View style={[styles.ph6]}>
-                    <Text style={[styles.textAlignCenter]}>
-                        {props.translate('reimbursementAccountLoadingAnimation.explanationLine')}
-                    </Text>
+        <FullPageOfflineBlockingView>
+            {props.isSubmittingVerificationsData ? (
+                <View style={[styles.pageWrapper]}>
+                    <Image
+                        source={{uri: `${CONST.CLOUDFRONT_URL}/images/icons/emptystates/emptystate_reviewing.gif`}}
+                        style={[
+                            styles.loadingVBAAnimation,
+                        ]}
+                    />
+                    <View style={[styles.ph6]}>
+                        <Text style={[styles.textAlignCenter]}>
+                            {props.translate('reimbursementAccountLoadingAnimation.explanationLine')}
+                        </Text>
+                    </View>
                 </View>
-            </View>
-        ) : (
-            <FullScreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
-        )}
+            ) : (
+                <FullScreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
+            )}
+        </FullPageOfflineBlockingView>
     </ScreenWrapper>
 );