From 0d3123011650c594d8c2d37770208db76c5be5bb Mon Sep 17 00:00:00 2001 From: Mykhailo Kravchenko Date: Thu, 7 Dec 2023 19:10:30 +0100 Subject: [PATCH 1/7] use a proper const --- src/pages/ReferralDetailsPage.js | 2 +- src/styles/themes/default.ts | 4 ++++ src/styles/themes/light.ts | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/pages/ReferralDetailsPage.js b/src/pages/ReferralDetailsPage.js index b9f8dcc6f356..fc820d47f549 100644 --- a/src/pages/ReferralDetailsPage.js +++ b/src/pages/ReferralDetailsPage.js @@ -70,7 +70,7 @@ function ReferralDetailsPage({route, account}) { /> } headerContainerStyles={[styles.staticHeaderImage, styles.justifyContentCenter]} - backgroundColor={theme.PAGE_THEMES[SCREENS.SETTINGS.WORKSPACES].backgroundColor} + backgroundColor={theme.PAGE_THEMES[SCREENS.RIGHT_MODAL.REFERRAL].backgroundColor} > {contentHeader} {contentBody} diff --git a/src/styles/themes/default.ts b/src/styles/themes/default.ts index 59de9b7269a8..1d9ab3e315a0 100644 --- a/src/styles/themes/default.ts +++ b/src/styles/themes/default.ts @@ -127,6 +127,10 @@ const darkTheme = { backgroundColor: colors.darkHighlightBackground, statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT, }, + [SCREENS.RIGHT_MODAL.REFERRAL]: { + backgroundColor: colors.pink800, + statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT, + }, }, statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT, diff --git a/src/styles/themes/light.ts b/src/styles/themes/light.ts index 1541c0e723d7..0fe60d8f3f6a 100644 --- a/src/styles/themes/light.ts +++ b/src/styles/themes/light.ts @@ -127,6 +127,10 @@ const lightTheme = { backgroundColor: colors.lightHighlightBackground, statusBarStyle: CONST.STATUS_BAR_STYLE.DARK_CONTENT, }, + [SCREENS.RIGHT_MODAL.REFERRAL]: { + backgroundColor: colors.pink800, + statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT, + }, }, statusBarStyle: CONST.STATUS_BAR_STYLE.DARK_CONTENT, From 1a6fc0d168fba567b5c3ebe40761339f737833ca Mon Sep 17 00:00:00 2001 From: Mykhailo Kravchenko Date: Thu, 7 Dec 2023 19:18:43 +0100 Subject: [PATCH 2/7] align text left --- src/pages/ReferralDetailsPage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/ReferralDetailsPage.js b/src/pages/ReferralDetailsPage.js index fc820d47f549..76c53873cf05 100644 --- a/src/pages/ReferralDetailsPage.js +++ b/src/pages/ReferralDetailsPage.js @@ -72,8 +72,8 @@ function ReferralDetailsPage({route, account}) { headerContainerStyles={[styles.staticHeaderImage, styles.justifyContentCenter]} backgroundColor={theme.PAGE_THEMES[SCREENS.RIGHT_MODAL.REFERRAL].backgroundColor} > - {contentHeader} - {contentBody} + {contentHeader} + {contentBody} {shouldShowClipboard && ( Date: Thu, 7 Dec 2023 19:22:00 +0100 Subject: [PATCH 3/7] align icon --- src/pages/ReferralDetailsPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ReferralDetailsPage.js b/src/pages/ReferralDetailsPage.js index 76c53873cf05..dbbbfe05bc32 100644 --- a/src/pages/ReferralDetailsPage.js +++ b/src/pages/ReferralDetailsPage.js @@ -69,7 +69,7 @@ function ReferralDetailsPage({route, account}) { height={232} /> } - headerContainerStyles={[styles.staticHeaderImage, styles.justifyContentCenter]} + headerContainerStyles={[styles.staticHeaderImage, styles.justifyContentEnd]} backgroundColor={theme.PAGE_THEMES[SCREENS.RIGHT_MODAL.REFERRAL].backgroundColor} > {contentHeader} From 3870b4d2ea34b5ff06e9205c424f2aaf216e71e8 Mon Sep 17 00:00:00 2001 From: Mykhailo Kravchenko Date: Thu, 7 Dec 2023 19:37:41 +0100 Subject: [PATCH 4/7] add bottom margin for last element --- src/pages/ReferralDetailsPage.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/ReferralDetailsPage.js b/src/pages/ReferralDetailsPage.js index dbbbfe05bc32..d7480c2d785b 100644 --- a/src/pages/ReferralDetailsPage.js +++ b/src/pages/ReferralDetailsPage.js @@ -87,6 +87,7 @@ function ReferralDetailsPage({route, account}) { )} Date: Fri, 8 Dec 2023 10:47:55 +0100 Subject: [PATCH 5/7] translate referral link button --- src/languages/en.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index efd073496ed5..c38a1b55b610 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -1980,7 +1980,7 @@ export default { header: `Invite a friend, get $${CONST.REFERRAL_PROGRAM.REVENUE}`, body: `Be the first to invite a friend (or anyone else) to Expensify and get $${CONST.REFERRAL_PROGRAM.REVENUE} if they become an Expensify customer. Share your invite link by text, email, or post it on social media!`, }, - copyReferralLink: 'Copy referral link', + copyReferralLink: 'Copy invite link', }, violations: { allTagLevelsRequired: 'dummy.violations.allTagLevelsRequired', From 61105852e142648d32fe11ede0fc6bcb812515fe Mon Sep 17 00:00:00 2001 From: Mykhailo Kravchenko Date: Fri, 8 Dec 2023 10:48:41 +0100 Subject: [PATCH 6/7] decrease spacing --- src/pages/ReferralDetailsPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ReferralDetailsPage.js b/src/pages/ReferralDetailsPage.js index d7480c2d785b..73e1ac393615 100644 --- a/src/pages/ReferralDetailsPage.js +++ b/src/pages/ReferralDetailsPage.js @@ -72,7 +72,7 @@ function ReferralDetailsPage({route, account}) { headerContainerStyles={[styles.staticHeaderImage, styles.justifyContentEnd]} backgroundColor={theme.PAGE_THEMES[SCREENS.RIGHT_MODAL.REFERRAL].backgroundColor} > - {contentHeader} + {contentHeader} {contentBody} {shouldShowClipboard && ( From 3d4b56868de8c3370e56959c85136e53d8cc07a2 Mon Sep 17 00:00:00 2001 From: Mykhailo Kravchenko Date: Tue, 12 Dec 2023 10:40:06 +0100 Subject: [PATCH 7/7] fix merge changes --- src/languages/en.ts | 11 +++++------ src/languages/es.ts | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index a66ac51350c5..ec954d8ed427 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -1966,19 +1966,19 @@ export default { buttonText1: 'Start a chat, ', buttonText2: `get $${CONST.REFERRAL_PROGRAM.REVENUE}.`, header: `Start a chat, get $${CONST.REFERRAL_PROGRAM.REVENUE}`, - body1: `Get paid to talk to your friends! Start a chat with a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} if they become an Expensify customer.`, + body: `Get paid to talk to your friends! Start a chat with a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} if they become an Expensify customer.`, }, [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.MONEY_REQUEST]: { buttonText1: 'Request money, ', buttonText2: `get $${CONST.REFERRAL_PROGRAM.REVENUE}.`, header: `Request money, get $${CONST.REFERRAL_PROGRAM.REVENUE}`, - body1: `It pays to get paid! Request money from a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} if they become an Expensify customer.`, + body: `It pays to get paid! Request money from a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} if they become an Expensify customer.`, }, [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SEND_MONEY]: { buttonText1: 'Send money, ', buttonText2: `get $${CONST.REFERRAL_PROGRAM.REVENUE}.`, header: `Send money, get $${CONST.REFERRAL_PROGRAM.REVENUE}`, - body1: `You gotta send money to make money! Send money to a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} if they become an Expensify customer.`, + body: `You gotta send money to make money! Send money to a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} if they become an Expensify customer.`, }, [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND]: { buttonText1: 'Invite a friend, ', @@ -1988,9 +1988,8 @@ export default { }, [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE]: { buttonText1: `Get $${CONST.REFERRAL_PROGRAM.REVENUE}`, - header: `Get $${CONST.REFERRAL_PROGRAM.REVENUE} for every referral`, - body1: 'If you know anyone who’s spending too much time on expenses (literally anyone – your neighbor, your boss, your friend in accounting), send them your Expensify referral link:', - body2: `When they start an annual subscription, you’ll get $${CONST.REFERRAL_PROGRAM.REVENUE}. Easy as that.`, + header: `Invite a friend, get $${CONST.REFERRAL_PROGRAM.REVENUE}`, + body: `Be the first to invite a friend (or anyone else) to Expensify and get $${CONST.REFERRAL_PROGRAM.REVENUE} if they become an Expensify customer. Share your invite link by text, email, or post it on social media!`, }, copyReferralLink: 'Copy invite link', }, diff --git a/src/languages/es.ts b/src/languages/es.ts index 2ecfd7c10079..007c590da46f 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -2451,19 +2451,19 @@ export default { buttonText1: 'Inicia un chat y ', buttonText2: `recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`, header: `Inicia un chat y recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`, - body1: `¡Gana dinero por hablar con tus amigos! Inicia un chat con una cuenta nueva de Expensify y obtiene $${CONST.REFERRAL_PROGRAM.REVENUE} si se convierten en clientes de Expensify.`, + body: `¡Gana dinero por hablar con tus amigos! Inicia un chat con una cuenta nueva de Expensify y obtiene $${CONST.REFERRAL_PROGRAM.REVENUE} si se convierten en clientes de Expensify.`, }, [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.MONEY_REQUEST]: { buttonText1: 'Pide dinero, ', buttonText2: `recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`, header: `Pide dinero y recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`, - body1: `¡Vale la pena cobrar! Pide dinero a una cuenta nueva de Expensify y obtiene $${CONST.REFERRAL_PROGRAM.REVENUE} si se convierten en clientes de Expensify.`, + body: `¡Vale la pena cobrar! Pide dinero a una cuenta nueva de Expensify y obtiene $${CONST.REFERRAL_PROGRAM.REVENUE} si se convierten en clientes de Expensify.`, }, [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SEND_MONEY]: { buttonText1: 'Envía dinero, ', buttonText2: `recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`, header: `Envía dinero y recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`, - body1: `¡Hay que enviar dinero para ganar dinero! Envía dinero a una cuenta nueva de Expensify y obtiene $${CONST.REFERRAL_PROGRAM.REVENUE} si se convierten en clientes de Expensify.`, + body: `¡Hay que enviar dinero para ganar dinero! Envía dinero a una cuenta nueva de Expensify y obtiene $${CONST.REFERRAL_PROGRAM.REVENUE} si se convierten en clientes de Expensify.`, }, [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND]: { buttonText1: 'Invita a un amigo y ', @@ -2473,9 +2473,8 @@ export default { }, [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE]: { buttonText1: `Recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`, - header: `Recibe $${CONST.REFERRAL_PROGRAM.REVENUE} por cada recomendación`, - body1: 'Si conoces a alguien que dedique demasiado tiempo a los gastos (literalmente cualquiera: tu vecino, tu jefe, tu amigo de contabilidad), envíale tu enlace de invitación de Expensify:', - body2: `Cuando comiencen una suscripción anual, obtendrás $${CONST.REFERRAL_PROGRAM.REVENUE}. Así de fácil.`, + header: `Invita a un amigo y obtiene $${CONST.REFERRAL_PROGRAM.REVENUE}`, + body: `Sé el primero en invitar a un amigo (o a cualquier otra persona) a Expensify y obtiene $${CONST.REFERRAL_PROGRAM.REVENUE} si se convierte en cliente de Expensify. Comparte tu enlace de invitación por SMS, email o publícalo en las redes sociales.`, }, copyReferralLink: 'Copiar enlace de invitación', },