From fad5b64963c980bec86b3d389855bf9faf9ab719 Mon Sep 17 00:00:00 2001 From: sahil Date: Fri, 31 Dec 2021 00:25:17 +0530 Subject: [PATCH 1/3] fix resend button width --- src/pages/signin/ResendValidationForm.js | 1 + src/styles/styles.js | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js index f92ffc6f84b7..fe06ddb1fb8f 100755 --- a/src/pages/signin/ResendValidationForm.js +++ b/src/pages/signin/ResendValidationForm.js @@ -141,6 +141,7 @@ class ResendValidationForm extends React.Component { text={this.props.translate('resendValidationForm.resendLink')} isLoading={this.props.account.loading} onPress={this.validateAndSubmitForm} + style={styles.resendLinkButton} /> diff --git a/src/styles/styles.js b/src/styles/styles.js index ae864429d7f1..20772eaf9666 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -865,6 +865,10 @@ const styles = { ...wordBreak.breakWord, }, + resendLinkButton: { + minWidth: 108, + }, + // Sidebar Styles sidebar: { backgroundColor: themeColors.sidebar, From 836d76c2c42545dba07c0c6ca7174a9a2f952c1c Mon Sep 17 00:00:00 2001 From: sahil Date: Thu, 6 Jan 2022 00:28:38 +0530 Subject: [PATCH 2/3] fix resend button width for spanish lang --- src/pages/signin/ResendValidationForm.js | 4 ++-- src/styles/StyleUtils.js | 14 ++++++++++++++ src/styles/styles.js | 4 ---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js index fe06ddb1fb8f..682b916921fc 100755 --- a/src/pages/signin/ResendValidationForm.js +++ b/src/pages/signin/ResendValidationForm.js @@ -14,6 +14,7 @@ import compose from '../../libs/compose'; import redirectToSignIn from '../../libs/actions/SignInRedirect'; import Avatar from '../../components/Avatar'; import * as OptionsListUtils from '../../libs/OptionsListUtils'; +import * as StyleUtils from '../../styles/StyleUtils'; const propTypes = { /* Onyx Props */ @@ -106,7 +107,6 @@ class ResendValidationForm extends React.Component { login, }); } - return ( <> @@ -141,7 +141,7 @@ class ResendValidationForm extends React.Component { text={this.props.translate('resendValidationForm.resendLink')} isLoading={this.props.account.loading} onPress={this.validateAndSubmitForm} - style={styles.resendLinkButton} + style={[StyleUtils.getResendLinkStyle(this.props.preferredLocale)]} /> diff --git a/src/styles/StyleUtils.js b/src/styles/StyleUtils.js index b15366c1f808..ceead2a51fea 100644 --- a/src/styles/StyleUtils.js +++ b/src/styles/StyleUtils.js @@ -375,6 +375,19 @@ function getMiniReportActionContextMenuWrapperStyle(isReportActionItemGrouped) { }; } +/** + * Gives the minWidth for Resend Link Button + * + * @param {String} currentLocale + * @returns {Object} + */ +function getResendLinkStyle(currentLocale) { + return { + minWidth: currentLocale === CONST.DEFAULT_LOCALE ? 108 : 139, + }; +} + + export { getSafeAreaPadding, getSafeAreaMargins, @@ -397,4 +410,5 @@ export { getLoginPagePromoStyle, getReportActionItemStyle, getMiniReportActionContextMenuWrapperStyle, + getResendLinkStyle, }; diff --git a/src/styles/styles.js b/src/styles/styles.js index 20772eaf9666..ae864429d7f1 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -865,10 +865,6 @@ const styles = { ...wordBreak.breakWord, }, - resendLinkButton: { - minWidth: 108, - }, - // Sidebar Styles sidebar: { backgroundColor: themeColors.sidebar, From be5d5839233db69154f6b9e593ebc39c46d19b2f Mon Sep 17 00:00:00 2001 From: sahil Date: Sat, 15 Jan 2022 02:41:50 +0530 Subject: [PATCH 3/3] undo previous changes and add btn width --- src/pages/signin/ResendValidationForm.js | 3 +-- src/styles/StyleUtils.js | 14 -------------- src/styles/styles.js | 4 ++++ 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js index 07cc38aad82a..f03018e548de 100755 --- a/src/pages/signin/ResendValidationForm.js +++ b/src/pages/signin/ResendValidationForm.js @@ -14,7 +14,6 @@ import compose from '../../libs/compose'; import redirectToSignIn from '../../libs/actions/SignInRedirect'; import Avatar from '../../components/Avatar'; import * as OptionsListUtils from '../../libs/OptionsListUtils'; -import * as StyleUtils from '../../styles/StyleUtils'; const propTypes = { /* Onyx Props */ @@ -144,7 +143,7 @@ class ResendValidationForm extends React.Component { text={this.props.translate('resendValidationForm.resendLink')} isLoading={this.props.account.loading} onPress={this.validateAndSubmitForm} - style={[StyleUtils.getResendLinkStyle(this.props.preferredLocale)]} + style={styles.resendLinkButton} /> diff --git a/src/styles/StyleUtils.js b/src/styles/StyleUtils.js index ceead2a51fea..b15366c1f808 100644 --- a/src/styles/StyleUtils.js +++ b/src/styles/StyleUtils.js @@ -375,19 +375,6 @@ function getMiniReportActionContextMenuWrapperStyle(isReportActionItemGrouped) { }; } -/** - * Gives the minWidth for Resend Link Button - * - * @param {String} currentLocale - * @returns {Object} - */ -function getResendLinkStyle(currentLocale) { - return { - minWidth: currentLocale === CONST.DEFAULT_LOCALE ? 108 : 139, - }; -} - - export { getSafeAreaPadding, getSafeAreaMargins, @@ -410,5 +397,4 @@ export { getLoginPagePromoStyle, getReportActionItemStyle, getMiniReportActionContextMenuWrapperStyle, - getResendLinkStyle, }; diff --git a/src/styles/styles.js b/src/styles/styles.js index f0f35055d73a..76758aa09042 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -900,6 +900,10 @@ const styles = { height: '100%', }, + resendLinkButton: { + minWidth: 124, + }, + sidebarFooter: { alignItems: 'center', display: 'flex',