diff --git a/android/app/build.gradle b/android/app/build.gradle index b3ca2d0ef0a..4b8b6eb0b4e 100644 --- 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 index 475772cf1cd..490af96bb96 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.1.57.10 + 1.1.57.11 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index b29ca42c1ad..a67e51b0227 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.57.10 + 1.1.57.11 diff --git a/package-lock.json b/package-lock.json index 5e0bc7043c5..2aa9b18976e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.57-10", + "version": "1.1.57-11", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -6740,9 +6740,9 @@ "integrity": "sha512-4CDw3QRN2zKj2L1Fxjq6ZOK95EW8UOnW3Par1o+P07qc+dZTAL1poKeRx74yqGLQyGVawozTHOgyE8/XWjdDvg==" }, "@react-navigation/core": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.1.1.tgz", - "integrity": "sha512-njysuiqztgvR1Z9Noxk2OGJfYtFGFDRyji5Vmm1jHzlql0m+q0wh1dUiyaIEtTyrhFXr/YNgdrKuiPaU9Jp8OA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.2.1.tgz", + "integrity": "sha512-3mjS6ujwGnPA/BC11DN9c2c42gFld6B6dQBgDedxP2djceXESpY2kVTTwISDHuqFnF7WjvRjsrDu3cKBX+JosA==", "requires": { "@react-navigation/routers": "^6.1.0", "escape-string-regexp": "^4.0.0", @@ -6759,26 +6759,26 @@ } }, "@react-navigation/drawer": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-6.1.8.tgz", - "integrity": "sha512-kYE2EO5dianUuUcaYmAlYBcgtmvGm2fxWTQ5sn103cgPNidp4KBUR9ClkhF+btfRaHKq+8Ul5M6qvL0mBAv/Lg==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-6.4.1.tgz", + "integrity": "sha512-CTVkiyhytUr4hUvWH8mEEGZ2BLcbFfWCHhanKisMBdq6qXMOIXoMX7AzOvjP8ojI1pvJZenvs8fopembGwUNUA==", "requires": { - "@react-navigation/elements": "^1.2.1", + "@react-navigation/elements": "^1.3.3", "color": "^3.1.3", "warn-once": "^0.1.0" } }, "@react-navigation/elements": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.2.1.tgz", - "integrity": "sha512-EnmAbKMsptrliRKf95rdgS6BhMjML+mIns06+G1Vdih6BrEo7/0iytThUv3WBf99AI76dyEq/cqLUwHPiFzXWg==" + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.3.tgz", + "integrity": "sha512-Lv2lR7si5gNME8dRsqz57d54m4FJtrwHRjNQLOyQO546ZxO+g864cSvoLC6hQedQU0+IJnPTsZiEI2hHqfpEpw==" }, "@react-navigation/native": { - "version": "6.0.8", - "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.0.8.tgz", - "integrity": "sha512-6022M3+Btok3xJC/49B88er3SRrlDAZ4FdmGndhEVvBcGSHWmscU2qKCwFd0RY6A0AGCVmdIlXudrfdcdRAkpQ==", + "version": "6.0.10", + "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.0.10.tgz", + "integrity": "sha512-H6QhLeiieGxNcAJismIDXIPZgf1myr7Og8v116tezIGmincJTOcWavTd7lPHGnMMXaZg94LlVtbaBRIx9cexqw==", "requires": { - "@react-navigation/core": "^6.1.1", + "@react-navigation/core": "^6.2.1", "escape-string-regexp": "^4.0.0", "fast-deep-equal": "^3.1.3", "nanoid": "^3.1.23" @@ -6800,11 +6800,11 @@ } }, "@react-navigation/stack": { - "version": "6.0.11", - "resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-6.0.11.tgz", - "integrity": "sha512-Osc2mXi0Zh/u92HRCceDqVfVnypTa2sZgYMJDU+vDhHz38negtbCG+cjje6nApSjwC5WTVhYP4OoD5WBSh51+g==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-6.2.1.tgz", + "integrity": "sha512-JI7boxtPAMCBXi4VJHVEq61jLVHFW5f3npvbndS+XfOsv7Gf0f91HOVJ28DS5c2Fn4+CO4AByjUozzlN296X+A==", "requires": { - "@react-navigation/elements": "^1.2.1", + "@react-navigation/elements": "^1.3.3", "color": "^3.1.3", "warn-once": "^0.1.0" } @@ -19483,9 +19483,9 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "color-string": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz", - "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", "requires": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" @@ -35588,9 +35588,9 @@ "dev": true }, "query-string": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.0.tgz", - "integrity": "sha512-wnJ8covk+S9isYR5JIXPt93kFUmI2fQ4R/8130fuq+qwLiGVTurg7Klodgfw4NSz/oe7xnyi09y3lSrogUeM3g==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz", + "integrity": "sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w==", "requires": { "decode-uri-component": "^0.2.0", "filter-obj": "^1.1.0", diff --git a/package.json b/package.json index e65b4596298..1d67afe824c 100644 --- 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 index 7a4d34a665b..3e43faf56c1 100644 --- 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, ]} > - - - - {this.props.policy.avatarURL - ? ( - - ) - : ( - - )} - - {!_.isEmpty(this.props.policy.name) && ( + + + - - - {this.props.policy.name} - - + {this.props.policy.avatarURL + ? ( + + ) + : ( + + )} - )} + {!_.isEmpty(this.props.policy.name) && ( + + + + {this.props.policy.name} + + + + )} + + {_.map(menuItems, item => ( + item.action()} + shouldShowRightIcon + /> + ))} - {_.map(menuItems, item => ( - item.action()} - shouldShowRightIcon - /> - ))}