Skip to content

Commit

Permalink
Merge pull request #9131 from Expensify/OSBotify-cherry-pick-staging-…
Browse files Browse the repository at this point in the history
…9129

🍒 Cherry pick PR #9129 to staging 🍒
  • Loading branch information
OSBotify authored May 23, 2022
2 parents c2f38be + 0024387 commit f53f442
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001016504
versionName "1.1.65-4"
versionCode 1001016506
versionName "1.1.65-6"
}
splits {
abi {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.1.65.4</string>
<string>1.1.65.6</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.1.65.4</string>
<string>1.1.65.6</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "1.1.65-4",
"version": "1.1.65-6",
"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.",
Expand Down
2 changes: 1 addition & 1 deletion src/pages/signin/SignInPageLayout/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const SignInPageLayout = (props) => {
return content;
}

if (props.isMediumScreenWidth && props.windowHeight >= variables.minHeigthToShowGraphics) {
if (props.isMediumScreenWidth && props.windowHeight >= variables.minHeightToShowGraphics) {
return (
<View style={[styles.dFlex, styles.signInPageInner, styles.flexColumnReverse, styles.justifyContentBetween]}>
{graphicLayout}
Expand Down
2 changes: 1 addition & 1 deletion src/styles/variables.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ export default {
tooltipzIndex: 10050,
gutterWidth: 16,
popoverMenuShadow: '0px 4px 12px 0px rgba(0, 0, 0, 0.06)',
minHeightToShowGraphics: 854, // below this height UI was broken on login form layout as there isn't enough height to show forma and graphics.
minHeightToShowGraphics: 854, // Login form layout breaks below this height due to insufficient space to show the form and graphics
};

0 comments on commit f53f442

Please sign in to comment.