From b211875a519e4da2f7a5b5ace1436edbddefee4c Mon Sep 17 00:00:00 2001 From: mateomorris Date: Thu, 9 Sep 2021 21:28:41 +0200 Subject: [PATCH 1/7] Use TextLink --- src/pages/settings/AboutPage.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/pages/settings/AboutPage.js b/src/pages/settings/AboutPage.js index 3e23e166493e..5372e09d08a1 100644 --- a/src/pages/settings/AboutPage.js +++ b/src/pages/settings/AboutPage.js @@ -7,6 +7,7 @@ import Navigation from '../../libs/Navigation/Navigation'; import ROUTES from '../../ROUTES'; import styles from '../../styles/styles'; import Text from '../../components/Text'; +import TextLink from '../../components/TextLink'; import CONST from '../../CONST'; import { Link, @@ -127,27 +128,27 @@ const AboutPage = ({translate, session}) => { 'initialSettingsPage.readTheTermsAndPrivacyPolicy.phrase1', )} {' '} - Linking.openURL(CONST.TERMS_URL)} + href={CONST.TERMS_URL} > {translate( 'initialSettingsPage.readTheTermsAndPrivacyPolicy.phrase2', )} - + {' '} {translate( 'initialSettingsPage.readTheTermsAndPrivacyPolicy.phrase3', )} {' '} - Linking.openURL(CONST.PRIVACY_URL)} + href={CONST.PRIVACY_URL} > {translate( 'initialSettingsPage.readTheTermsAndPrivacyPolicy.phrase4', )} - + . From c10a5cb47285e9a5dad17deba2c9d959bdbbe6f8 Mon Sep 17 00:00:00 2001 From: mateomorris Date: Mon, 13 Sep 2021 01:45:50 +0200 Subject: [PATCH 2/7] Style links to avoid clipping & ios visual issues --- src/pages/settings/AboutPage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/settings/AboutPage.js b/src/pages/settings/AboutPage.js index 5372e09d08a1..3f31004e60bc 100644 --- a/src/pages/settings/AboutPage.js +++ b/src/pages/settings/AboutPage.js @@ -129,7 +129,7 @@ const AboutPage = ({translate, session}) => { )} {' '} {translate( @@ -142,7 +142,7 @@ const AboutPage = ({translate, session}) => { )} {' '} {translate( From d94fc0a7fd9263df57d6d736265aabdd30e48fcd Mon Sep 17 00:00:00 2001 From: Mateo Morris Date: Wed, 15 Dec 2021 06:16:33 -0500 Subject: [PATCH 3/7] Replace Text with ExpensifyText --- src/pages/settings/AboutPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/AboutPage.js b/src/pages/settings/AboutPage.js index 5b817d0b2053..82c70348fd64 100644 --- a/src/pages/settings/AboutPage.js +++ b/src/pages/settings/AboutPage.js @@ -5,7 +5,7 @@ import HeaderWithCloseButton from '../../components/HeaderWithCloseButton'; import Navigation from '../../libs/Navigation/Navigation'; import ROUTES from '../../ROUTES'; import styles from '../../styles/styles'; -import Text from '../../components/Text'; +import ExpensifyText from '../../components/ExpensifyText'; import TextLink from '../../components/TextLink'; import CONST from '../../CONST'; import * as Expensicons from '../../components/Icon/Expensicons'; From 9b56cd0cb16a058e4116a88c3770a292065c3bf1 Mon Sep 17 00:00:00 2001 From: Mateo Morris Date: Wed, 15 Dec 2021 07:27:30 -0500 Subject: [PATCH 4/7] Replace Text with ExpensifyText --- src/pages/settings/AboutPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/AboutPage.js b/src/pages/settings/AboutPage.js index 5b817d0b2053..82c70348fd64 100644 --- a/src/pages/settings/AboutPage.js +++ b/src/pages/settings/AboutPage.js @@ -5,7 +5,7 @@ import HeaderWithCloseButton from '../../components/HeaderWithCloseButton'; import Navigation from '../../libs/Navigation/Navigation'; import ROUTES from '../../ROUTES'; import styles from '../../styles/styles'; -import Text from '../../components/Text'; +import ExpensifyText from '../../components/ExpensifyText'; import TextLink from '../../components/TextLink'; import CONST from '../../CONST'; import * as Expensicons from '../../components/Icon/Expensicons'; From 66a97f41fef90c7affe3e37626de9d1d581e206e Mon Sep 17 00:00:00 2001 From: Mateo Morris Date: Fri, 17 Dec 2021 07:30:02 -0500 Subject: [PATCH 5/7] Test commit --- src/styles/styles.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/styles.js b/src/styles/styles.js index 62de97203640..1c0dc834cb7b 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -729,6 +729,7 @@ const styles = { right: 11, zIndex: -1, }, + inputWeb: { appearance: 'none', cursor: disabled ? 'not-allowed' : 'pointer', From bad70bfbb06cff1ebd562a7d99811519aa5df8ec Mon Sep 17 00:00:00 2001 From: Mateo Morris Date: Thu, 23 Dec 2021 12:56:26 -0500 Subject: [PATCH 6/7] fix lint --- src/styles/styles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 7a8ad888c76c..b95f811eacd4 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -2343,4 +2343,4 @@ const styles = { }, }; -export default styles; +export default styles; \ No newline at end of file From cb695c385189a61bfd2ce5892391bdcf7e1d5a9d Mon Sep 17 00:00:00 2001 From: Mateo Morris Date: Wed, 5 Jan 2022 10:31:59 -0500 Subject: [PATCH 7/7] Use ExpensiText --- src/pages/settings/AboutPage.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pages/settings/AboutPage.js b/src/pages/settings/AboutPage.js index 82c70348fd64..966f66bf385d 100644 --- a/src/pages/settings/AboutPage.js +++ b/src/pages/settings/AboutPage.js @@ -6,7 +6,6 @@ import Navigation from '../../libs/Navigation/Navigation'; import ROUTES from '../../ROUTES'; import styles from '../../styles/styles'; import ExpensifyText from '../../components/ExpensifyText'; -import TextLink from '../../components/TextLink'; import CONST from '../../CONST'; import * as Expensicons from '../../components/Icon/Expensicons'; import ScreenWrapper from '../../components/ScreenWrapper'; @@ -109,27 +108,27 @@ const AboutPage = (props) => { 'initialSettingsPage.readTheTermsAndPrivacyPolicy.phrase1', )} {' '} - {props.translate( 'initialSettingsPage.readTheTermsAndPrivacyPolicy.phrase2', )} - + {' '} {props.translate( 'initialSettingsPage.readTheTermsAndPrivacyPolicy.phrase3', )} {' '} - {props.translate( 'initialSettingsPage.readTheTermsAndPrivacyPolicy.phrase4', )} - + .