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

…5160
Expensify · Sep 9, 2021 · 2a803ee · 2a803ee
2 parents 1af62ed + 1dd97e2
commit 2a803ee
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001009500
-        versionName "1.0.95-0"
+        versionCode 1001009501
+        versionName "1.0.95-1"
     }
     splits {
         abi {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.95.0</string>
+	<string>1.0.95.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.0.95.0</string>
+	<string>1.0.95.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.0.95-0",
+  "version": "1.0.95-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/withWindowDimensions.js b/src/components/withWindowDimensions.js
@@ -72,7 +72,6 @@ export default function (WrappedComponent) {
             const {window} = newDimensions;
             const isSmallScreenWidth = window.width <= variables.mobileResponsiveWidthBreakpoint;
             const isMediumScreenWidth = !isSmallScreenWidth && window.width <= variables.mediumScreenResponsiveWidthBreakpoint;
-
             this.setState({
                 windowHeight: window.height,
                 windowWidth: window.width,

diff --git a/src/styles/getModalStyles.js b/src/styles/getModalStyles.js
@@ -4,7 +4,7 @@ import variables from './variables';
 import themeColors from './themes/default';
 
 export default (type, windowDimensions, popoverAnchorPosition = {}) => {
-    const {isSmallScreenWidth, windowWidth, windowHeight} = windowDimensions;
+    const {isSmallScreenWidth, windowWidth} = windowDimensions;
 
     let modalStyle = {
         margin: 0,
@@ -131,7 +131,6 @@ export default (type, windowDimensions, popoverAnchorPosition = {}) => {
                 paddingTop: 12,
                 justifyContent: 'center',
                 overflow: 'hidden',
-                ...windowWidth >= windowHeight ? {top: 40} : {},
             };
 
             shouldAddBottomSafeAreaPadding = true;