From e411f17247dbc1d27a6331abee204f6493d3ac2c Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Sat, 22 Jan 2022 03:40:43 +0530 Subject: [PATCH 1/3] fix: Added web link for desktop error page --- .../GenericErrorPage/ErrorBodyText/index.js | 24 ++++++++++++++++++- .../ErrorBodyText/index.native.js | 23 ------------------ .../ErrorBodyText/index.website.js | 1 + 3 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 src/pages/GenericErrorPage/ErrorBodyText/index.native.js create mode 100644 src/pages/GenericErrorPage/ErrorBodyText/index.website.js diff --git a/src/pages/GenericErrorPage/ErrorBodyText/index.js b/src/pages/GenericErrorPage/ErrorBodyText/index.js index 461f67a0a4bc..34883ffeb5bb 100644 --- a/src/pages/GenericErrorPage/ErrorBodyText/index.js +++ b/src/pages/GenericErrorPage/ErrorBodyText/index.js @@ -1 +1,23 @@ -export default () => null; +import React from 'react'; +import Text from '../../../components/Text'; +import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize'; +import TextLink from '../../../components/TextLink'; +import CONST from '../../../CONST'; +import styles from '../../../styles/styles'; + +const propTypes = { + ...withLocalizePropTypes, +}; + +const ErrorBodyText = props => ( + + {`${props.translate('genericErrorPage.body.helpTextMobile')} `} + + {props.translate('genericErrorPage.body.helpTextWeb')} + + +); + +ErrorBodyText.displayName = 'ErrorBodyText'; +ErrorBodyText.propTypes = propTypes; +export default withLocalize(ErrorBodyText); diff --git a/src/pages/GenericErrorPage/ErrorBodyText/index.native.js b/src/pages/GenericErrorPage/ErrorBodyText/index.native.js deleted file mode 100644 index 34883ffeb5bb..000000000000 --- a/src/pages/GenericErrorPage/ErrorBodyText/index.native.js +++ /dev/null @@ -1,23 +0,0 @@ -import React from 'react'; -import Text from '../../../components/Text'; -import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize'; -import TextLink from '../../../components/TextLink'; -import CONST from '../../../CONST'; -import styles from '../../../styles/styles'; - -const propTypes = { - ...withLocalizePropTypes, -}; - -const ErrorBodyText = props => ( - - {`${props.translate('genericErrorPage.body.helpTextMobile')} `} - - {props.translate('genericErrorPage.body.helpTextWeb')} - - -); - -ErrorBodyText.displayName = 'ErrorBodyText'; -ErrorBodyText.propTypes = propTypes; -export default withLocalize(ErrorBodyText); diff --git a/src/pages/GenericErrorPage/ErrorBodyText/index.website.js b/src/pages/GenericErrorPage/ErrorBodyText/index.website.js new file mode 100644 index 000000000000..461f67a0a4bc --- /dev/null +++ b/src/pages/GenericErrorPage/ErrorBodyText/index.website.js @@ -0,0 +1 @@ +export default () => null; From a7d69907501e7cb54af59b9207dadd60d784bd62 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Sat, 22 Jan 2022 04:18:06 +0530 Subject: [PATCH 2/3] fix: Changd url to ACTIVE_ENVIRONMENT_NEW_EXPENSIFY_URL --- src/CONST.js | 2 ++ src/pages/GenericErrorPage/ErrorBodyText/index.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/CONST.js b/src/CONST.js index 42580b06b157..d55bb763bfc2 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -14,6 +14,8 @@ const CONST = { // 50 megabytes in bytes API_MAX_ATTACHMENT_SIZE: 52428800, AVATAR_MAX_ATTACHMENT_SIZE: 6291456, + ACTIVE_ENVIRONMENT_NEW_EXPENSIFY_URL, + APP_DOWNLOAD_LINKS: { ANDROID: `https://play.google.com/store/apps/details?id=${ANDROID_PACKAGE_NAME}`, IOS: 'https://apps.apple.com/us/app/expensify-cash/id1530278510', diff --git a/src/pages/GenericErrorPage/ErrorBodyText/index.js b/src/pages/GenericErrorPage/ErrorBodyText/index.js index 34883ffeb5bb..b0dad70ce71b 100644 --- a/src/pages/GenericErrorPage/ErrorBodyText/index.js +++ b/src/pages/GenericErrorPage/ErrorBodyText/index.js @@ -12,7 +12,7 @@ const propTypes = { const ErrorBodyText = props => ( {`${props.translate('genericErrorPage.body.helpTextMobile')} `} - + {props.translate('genericErrorPage.body.helpTextWeb')} From 74deaf7d135715610ac149ef0ae18487a1900a66 Mon Sep 17 00:00:00 2001 From: Manan Jadhav Date: Sat, 22 Jan 2022 15:45:29 +0530 Subject: [PATCH 3/3] fix: Removed extra line --- src/CONST.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CONST.js b/src/CONST.js index d55bb763bfc2..6d430f7fa330 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -15,7 +15,6 @@ const CONST = { API_MAX_ATTACHMENT_SIZE: 52428800, AVATAR_MAX_ATTACHMENT_SIZE: 6291456, ACTIVE_ENVIRONMENT_NEW_EXPENSIFY_URL, - APP_DOWNLOAD_LINKS: { ANDROID: `https://play.google.com/store/apps/details?id=${ANDROID_PACKAGE_NAME}`, IOS: 'https://apps.apple.com/us/app/expensify-cash/id1530278510',