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

…8912 🍒 Cherry pick PR #8912 to staging 🍒
Expensify · May 10, 2022 · 939b505 · 939b505
2 parents 03be07e + 50b6845
commit 939b505
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 86 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001015710
-        versionName "1.1.57-10"
+        versionCode 1001015711
+        versionName "1.1.57-11"
     }
     splits {
         abi {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.57.10</string>
+	<string>1.1.57.11</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.57.10</string>
+	<string>1.1.57.11</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.57-10",
+  "version": "1.1.57-11",
   "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.",
@@ -55,9 +55,9 @@
     "@react-native-masked-view/masked-view": "^0.2.4",
     "@react-native-picker/picker": "^2.3.1",
     "@react-navigation/compat": "^5.3.20",
-    "@react-navigation/drawer": "6.1.8",
-    "@react-navigation/native": "6.0.8",
-    "@react-navigation/stack": "6.0.11",
+    "@react-navigation/drawer": "6.4.1",
+    "@react-navigation/native": "6.0.10",
+    "@react-navigation/stack": "6.2.1",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",

diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js
@@ -140,67 +140,69 @@ class WorkspaceInitialPage extends React.Component {
                     contentContainerStyle={[
                         styles.flexGrow1,
                         styles.flexColumn,
-                        styles.w100,
+                        styles.justifyContentBetween,
                     ]}
                 >
-                    <View style={styles.pageWrapper}>
-                        <View style={[styles.settingsPageBody, styles.alignItemsCenter]}>
-                            <Pressable
-                                style={[styles.pRelative, styles.avatarLarge]}
-                                onPress={this.openEditor}
-                            >
-                                {this.props.policy.avatarURL
-                                    ? (
-                                        <Avatar
-                                            containerStyles={styles.avatarLarge}
-                                            imageStyles={[styles.avatarLarge, styles.alignSelfCenter]}
-                                            source={this.props.policy.avatarURL}
-                                        />
-                                    )
-                                    : (
-                                        <Icon
-                                            src={Expensicons.Workspace}
-                                            height={80}
-                                            width={80}
-                                            fill={themedefault.iconSuccessFill}
-                                        />
-                                    )}
-                            </Pressable>
-                            {!_.isEmpty(this.props.policy.name) && (
+                    <View style={[styles.flex1]}>
+                        <View style={styles.pageWrapper}>
+                            <View style={[styles.settingsPageBody, styles.alignItemsCenter]}>
                                 <Pressable
-                                    style={[
-                                        styles.alignSelfCenter,
-                                        styles.mt4,
-                                        styles.mb6,
-                                        styles.w100,
-                                    ]}
+                                    style={[styles.pRelative, styles.avatarLarge]}
                                     onPress={this.openEditor}
                                 >
-                                    <Tooltip text={this.props.policy.name}>
-                                        <Text
-                                            numberOfLines={1}
-                                            style={[
-                                                styles.displayName,
-                                                styles.alignSelfCenter,
-                                            ]}
-                                        >
-                                            {this.props.policy.name}
-                                        </Text>
-                                    </Tooltip>
+                                    {this.props.policy.avatarURL
+                                        ? (
+                                            <Avatar
+                                                containerStyles={styles.avatarLarge}
+                                                imageStyles={[styles.avatarLarge, styles.alignSelfCenter]}
+                                                source={this.props.policy.avatarURL}
+                                            />
+                                        )
+                                        : (
+                                            <Icon
+                                                src={Expensicons.Workspace}
+                                                height={80}
+                                                width={80}
+                                                fill={themedefault.iconSuccessFill}
+                                            />
+                                        )}
                                 </Pressable>
-                            )}
+                                {!_.isEmpty(this.props.policy.name) && (
+                                    <Pressable
+                                        style={[
+                                            styles.alignSelfCenter,
+                                            styles.mt4,
+                                            styles.mb6,
+                                            styles.w100,
+                                        ]}
+                                        onPress={this.openEditor}
+                                    >
+                                        <Tooltip text={this.props.policy.name}>
+                                            <Text
+                                                numberOfLines={1}
+                                                style={[
+                                                    styles.displayName,
+                                                    styles.alignSelfCenter,
+                                                ]}
+                                            >
+                                                {this.props.policy.name}
+                                            </Text>
+                                        </Tooltip>
+                                    </Pressable>
+                                )}
+                            </View>
                         </View>
+                        {_.map(menuItems, item => (
+                            <MenuItem
+                                key={item.translationKey}
+                                title={this.props.translate(item.translationKey)}
+                                icon={item.icon}
+                                iconRight={item.iconRight}
+                                onPress={() => item.action()}
+                                shouldShowRightIcon
+                            />
+                        ))}
                     </View>
-                    {_.map(menuItems, item => (
-                        <MenuItem
-                            key={item.translationKey}
-                            title={this.props.translate(item.translationKey)}
-                            icon={item.icon}
-                            iconRight={item.iconRight}
-                            onPress={() => item.action()}
-                            shouldShowRightIcon
-                        />
-                    ))}
                 </ScrollView>
                 <ConfirmModal
                     title={this.props.translate('workspace.common.delete')}