From 94b5782ad78d2d24c2b4cdf0bf366b2efa95cbad Mon Sep 17 00:00:00 2001 From: Cristi Paval Date: Mon, 6 Feb 2023 14:48:07 +0200 Subject: [PATCH 1/7] Add left margin in MenuItem only when an icon is set --- src/components/MenuItem.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/MenuItem.js b/src/components/MenuItem.js index 8c555085712c..b97a1fa070c3 100644 --- a/src/components/MenuItem.js +++ b/src/components/MenuItem.js @@ -54,11 +54,16 @@ const defaultProps = { const MenuItem = (props) => { const titleTextStyle = StyleUtils.combineStyles([ styles.popoverMenuText, - styles.ml3, + (props.icon ? styles.ml3 : undefined), (props.shouldShowBasicTitle ? undefined : styles.textStrong), (props.interactive && props.disabled ? {...styles.disabledText, ...styles.userSelectNone} : undefined), ], props.style); - const descriptionTextStyle = StyleUtils.combineStyles([styles.textLabelSupporting, styles.ml3, styles.breakAll, styles.lineHeightNormal], props.style); + const descriptionTextStyle = StyleUtils.combineStyles([ + styles.textLabelSupporting, + (props.icon ? styles.ml3 : undefined), + styles.breakAll, + styles.lineHeightNormal, + ], props.style); return ( Date: Mon, 6 Feb 2023 14:51:20 +0200 Subject: [PATCH 2/7] Fix left margin in Preferences page. --- src/pages/settings/Preferences/PreferencesPage.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/settings/Preferences/PreferencesPage.js b/src/pages/settings/Preferences/PreferencesPage.js index 3260fda5e5ca..6bee7676b28b 100755 --- a/src/pages/settings/Preferences/PreferencesPage.js +++ b/src/pages/settings/Preferences/PreferencesPage.js @@ -56,10 +56,10 @@ const PreferencesPage = (props) => { /> - + {props.translate('common.notifications')} - + {props.translate('preferencesPage.receiveRelevantFeatureUpdatesAndExpensifyNews')} @@ -89,7 +89,7 @@ const PreferencesPage = (props) => { { _.contains([CONST.ENVIRONMENT.STAGING, CONST.ENVIRONMENT.DEV], props.environment) && ( - + ) From c0096520cb6a4ecf11da8a2da4a02d0513f04ce0 Mon Sep 17 00:00:00 2001 From: Cristi Paval Date: Mon, 6 Feb 2023 14:55:10 +0200 Subject: [PATCH 3/7] Fix left margin in TimezoneInitialPage --- src/pages/settings/Profile/TimezoneInitialPage.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/settings/Profile/TimezoneInitialPage.js b/src/pages/settings/Profile/TimezoneInitialPage.js index a96244501779..184e5dbbf8c7 100644 --- a/src/pages/settings/Profile/TimezoneInitialPage.js +++ b/src/pages/settings/Profile/TimezoneInitialPage.js @@ -68,7 +68,6 @@ const TimezoneInitialPage = (props) => { title={timezone.selected} description={props.translate('timezonePage.timezone')} shouldShowRightIcon - wrapperStyle={[styles.ph2, styles.mb3]} disabled={timezone.automatic} onPress={() => Navigation.navigate(ROUTES.SETTINGS_TIMEZONE_SELECT)} /> From 87d593fccd452957f29c3bb6d6de467841900da2 Mon Sep 17 00:00:00 2001 From: Cristi Paval Date: Wed, 8 Feb 2023 23:53:43 +0200 Subject: [PATCH 4/7] Fix back button in header bar. --- src/components/HeaderWithCloseButton.js | 4 +--- src/styles/styles.js | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/HeaderWithCloseButton.js b/src/components/HeaderWithCloseButton.js index 68597013db72..4c47ff2688f3 100755 --- a/src/components/HeaderWithCloseButton.js +++ b/src/components/HeaderWithCloseButton.js @@ -139,7 +139,6 @@ class HeaderWithCloseButton extends Component { ]} > {this.props.shouldShowBackButton && ( - { @@ -148,12 +147,11 @@ class HeaderWithCloseButton extends Component { } this.props.onBackButtonPress(); }} - style={[styles.touchableButtonImage]} + style={[styles.headerBackButtonImage]} > - )}
Date: Wed, 8 Feb 2023 23:55:04 +0200 Subject: [PATCH 5/7] Fix toggle positioning in TimezoneInitialPage --- src/pages/settings/Profile/TimezoneInitialPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/Profile/TimezoneInitialPage.js b/src/pages/settings/Profile/TimezoneInitialPage.js index 184e5dbbf8c7..c2162af65118 100644 --- a/src/pages/settings/Profile/TimezoneInitialPage.js +++ b/src/pages/settings/Profile/TimezoneInitialPage.js @@ -54,7 +54,7 @@ const TimezoneInitialPage = (props) => { {props.translate('timezonePage.isShownOnProfile')} - + {props.translate('timezonePage.getLocationAutomatically')} From 51e20155a6ccf8cf9152085505402e7426e99b0a Mon Sep 17 00:00:00 2001 From: Cristi Paval Date: Fri, 17 Feb 2023 18:47:46 +0200 Subject: [PATCH 6/7] Render back button in a 40px size square to be easy pressable --- src/components/HeaderWithCloseButton.js | 4 ++-- src/styles/styles.js | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/components/HeaderWithCloseButton.js b/src/components/HeaderWithCloseButton.js index 4c47ff2688f3..4da0b6ccb1c4 100755 --- a/src/components/HeaderWithCloseButton.js +++ b/src/components/HeaderWithCloseButton.js @@ -128,7 +128,7 @@ class HeaderWithCloseButton extends Component { render() { return ( - + diff --git a/src/styles/styles.js b/src/styles/styles.js index 774abf6db2c6..520ca2d0c14d 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -1853,12 +1853,6 @@ const styles = { width: '100%', }, - headerBackButtonImage: { - height: variables.componentSizeNormal, - justifyContent: 'center', - width: variables.componentSizeSmall, - }, - imageViewContainer: { width: '100%', height: '100%', From 0ef7be4d060b03062a686b9d75c2bf800d14743b Mon Sep 17 00:00:00 2001 From: Cristi Paval Date: Mon, 27 Feb 2023 13:32:02 +0200 Subject: [PATCH 7/7] Fix regression in PersonalDetailsInitialPage --- .../Profile/PersonalDetails/PersonalDetailsInitialPage.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage.js b/src/pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage.js index 4da6ec6134e5..88e886ae0e6d 100644 --- a/src/pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage.js +++ b/src/pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage.js @@ -104,21 +104,18 @@ const PersonalDetailsInitialPage = (props) => { title={legalName} description={props.translate('privatePersonalDetails.legalName')} shouldShowRightIcon - wrapperStyle={[styles.ph2]} onPress={() => Navigation.navigate(ROUTES.SETTINGS_PERSONAL_DETAILS_LEGAL_NAME)} /> Navigation.navigate(ROUTES.SETTINGS_PERSONAL_DETAILS_DATE_OF_BIRTH)} /> Navigation.navigate(ROUTES.SETTINGS_PERSONAL_DETAILS_ADDRESS)} />