From 9e33252857263c6ba72638546282f67a35b8e792 Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Thu, 5 Aug 2021 22:58:19 +0530 Subject: [PATCH 1/3] fix: outline on singin page --- package-lock.json | 50 ++++++++++++++----- .../SignInPageLayoutNarrow.js | 2 +- src/styles/styles.js | 2 +- 3 files changed, 40 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index cab95fdbdf1..c106928dbea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29605,11 +29605,6 @@ "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.2.tgz", "integrity": "sha512-+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw==" }, - "jquery": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", - "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" - }, "js-string-escape": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz", @@ -36108,30 +36103,48 @@ "underscore": "^1.13.1" }, "dependencies": { + "classnames": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz", + "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==" + }, "expensify-common": { "version": "git+https://github.com/Expensify/expensify-common.git#4016a786d66ff38ed76a191edef31ebd737a0190", "from": "git+https://github.com/Expensify/expensify-common.git#4016a786d66ff38ed76a191edef31ebd737a0190", "requires": { - "classnames": "2.2.5", + "classnames": "2.3.1", "clipboard": "2.0.4", "html-entities": "^1.3.1", - "jquery": "3.3.1", + "jquery": "3.6.0", "lodash": "4.17.21", "prop-types": "15.7.2", "react": "16.12.0", "react-dom": "16.12.0", - "semver": "^7.3.4", + "semver": "^7.3.5", "simply-deferred": "git+https://github.com/Expensify/simply-deferred.git#77a08a95754660c7bd6e0b6979fdf84e8e831bf5", - "underscore": "1.9.1" + "underscore": "1.13.1" }, "dependencies": { "underscore": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz", - "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==" + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", + "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, "react": { "version": "16.12.0", "resolved": "https://registry.npmjs.org/react/-/react-16.12.0.tgz", @@ -36153,10 +36166,23 @@ "scheduler": "^0.18.0" } }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } + }, "underscore": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" } } }, diff --git a/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js b/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js index b7b163241c6..4a85061aa0c 100755 --- a/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js +++ b/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js @@ -28,10 +28,10 @@ const SignInPageLayoutNarrow = props => ( showsVerticalScrollIndicator={false} style={[ styles.flexGrow1, - styles.mh5, styles.signInPageNarrowContentContainer, styles.alignSelfCenter, ]} + contentContainerStyle={styles.ph5} > diff --git a/src/styles/styles.js b/src/styles/styles.js index b1ade504e45..31d8103e433 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -604,7 +604,7 @@ const styles = { }, signInPageNarrowContentContainer: { - maxWidth: 295, + maxWidth: 335, }, signInPageWideLeftContainer: { From 5911293cf87160eb80c0bfabe447d8b7c48caf0e Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Thu, 5 Aug 2021 23:14:34 +0530 Subject: [PATCH 2/3] fix layout --- .../signin/SignInPageLayout/SignInPageLayoutNarrow.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js b/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js index 4a85061aa0c..e6c2ad56806 100755 --- a/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js +++ b/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js @@ -7,8 +7,6 @@ import ExpensifyCashLogo from '../../../components/ExpensifyCashLogo'; import Text from '../../../components/Text'; import TermsAndLicenses from '../TermsAndLicenses'; import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize'; -import compose from '../../../libs/compose'; -import withWindowDimensions, {windowDimensionsPropTypes} from '../../../components/withWindowDimensions'; const propTypes = { /** The children to show inside the layout */ @@ -18,7 +16,6 @@ const propTypes = { * on form type (set password, sign in, etc.) */ welcomeText: PropTypes.string.isRequired, - ...windowDimensionsPropTypes, ...withLocalizePropTypes, }; @@ -41,7 +38,7 @@ const SignInPageLayoutNarrow = props => ( styles.flex1, styles.dFlex, styles.flexColumn, - props.windowHeight > props.windowWidth ? styles.mt40Percentage : null, + styles.mt40Percentage, ]} > @@ -66,7 +63,4 @@ const SignInPageLayoutNarrow = props => ( SignInPageLayoutNarrow.propTypes = propTypes; SignInPageLayoutNarrow.displayName = 'SignInPageLayoutNarrow'; -export default compose( - withWindowDimensions, - withLocalize, -)(SignInPageLayoutNarrow); +export default withLocalize(SignInPageLayoutNarrow); From 87ebd6bc1203a4299e5cd2bb24c524863a4f3a6a Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 6 Aug 2021 10:46:41 +0000 Subject: [PATCH 3/3] Update version to 1.0.82-9 --- android/app/build.gradle | 4 ++-- ios/ExpensifyCash/Info.plist | 2 +- ios/ExpensifyCashTests/Info.plist | 2 +- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index b8cec2fa966..478d9f35629 100644 --- 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 1001008208 - versionName "1.0.82-8" + versionCode 1001008209 + versionName "1.0.82-9" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 3f34f3f780f..39283260609 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.82.8 + 1.0.82.9 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 1372877649a..04483816f79 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.82.8 + 1.0.82.9 diff --git a/package-lock.json b/package-lock.json index 307f069efe2..c17ef74815f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.82-8", + "version": "1.0.82-9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index d86807ab5b3..ba3bbf519e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.82-8", + "version": "1.0.82-9", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",