From 54a221b034974e254147269b3c81322660bf73b1 Mon Sep 17 00:00:00 2001 From: Cole Date: Fri, 30 May 2025 15:14:21 -0400 Subject: [PATCH 1/5] Fix fees URL redirect --- src/CONST.ts | 2 +- src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index 00bcd438856a..d31ab8872923 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -1165,6 +1165,7 @@ const CONST = { WALLET_AGREEMENT_URL: `${EXPENSIFY_URL}/expensify-payments-wallet-terms-of-service`, BANCORP_WALLET_AGREEMENT_URL: `${EXPENSIFY_URL}/bancorp-bank-wallet-terms-of-service`, EXPENSIFY_APPROVED_PROGRAM_URL: `${USE_EXPENSIFY_URL}/accountants-program`, + FEES_URL: `${EXPENSIFY_URL}/fees`, }, OLDDOT_URLS: { ADMIN_POLICIES_URL: 'admin_policies', @@ -3216,7 +3217,6 @@ const CONST = { CFPB_PREPAID: 'cfpb.gov/prepaid', CFPB_COMPLAINT: 'cfpb.gov/complaint', FDIC_PREPAID: 'fdic.gov/deposit/deposits/prepaid.html', - USE_EXPENSIFY_FEES: 'use.expensify.com/fees', }, LAYOUT_WIDTH: { diff --git a/src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx b/src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx index acd47e5173a6..24b40524473a 100644 --- a/src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx +++ b/src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx @@ -140,7 +140,7 @@ function ShortTermsForm(props: ShortTermsFormProps) { {translate('termsStep.shortTermsForm.generalInfo')} {CONST.TERMS.CFPB_PREPAID}. - {translate('termsStep.shortTermsForm.conditionsDetails')} {CONST.TERMS.USE_EXPENSIFY_FEES}{' '} + {translate('termsStep.shortTermsForm.conditionsDetails')} {CONST.FEES_URL}{' '} {translate('termsStep.shortTermsForm.conditionsPhone')} From 22811c7cc140b88110106eea76ad69f8f96e1777 Mon Sep 17 00:00:00 2001 From: Cole Date: Fri, 30 May 2025 15:24:13 -0400 Subject: [PATCH 2/5] Prettier --- src/CONST.ts | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index d31ab8872923..7a7e8c6982ba 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -3643,14 +3643,11 @@ const CONST = { SELF_SELECT: '__predefined_selfSelect', }, - EXPENSIFY_EMAILS_OBJECT: Object.entries(EMAIL).reduce( - (prev, [, email]) => { - // eslint-disable-next-line no-param-reassign - prev[email] = true; - return prev; - }, - {} as Record, - ), + EXPENSIFY_EMAILS_OBJECT: Object.entries(EMAIL).reduce((prev, [, email]) => { + // eslint-disable-next-line no-param-reassign + prev[email] = true; + return prev; + }, {} as Record), EXPENSIFY_EMAILS: [ EMAIL.ACCOUNTING, EMAIL.ACCOUNTS_PAYABLE, @@ -5510,9 +5507,15 @@ const CONST = { type: 'addAccountingIntegration', autoCompleted: false, mediaAttributes: { - [`${CLOUDFRONT_URL}/${connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.netsuite]}`]: `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_netsuite.png" data-expensify-width="1920" data-expensify-height="1080"`, - [`${CLOUDFRONT_URL}/${connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.quickbooksOnline]}`]: `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_qbo.png" data-expensify-width="1920" data-expensify-height="1080"`, - [`${CLOUDFRONT_URL}/${connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.xero]}`]: `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_xero.png" data-expensify-width="1920" data-expensify-height="1080"`, + [`${CLOUDFRONT_URL}/${ + connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.netsuite] + }`]: `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_netsuite.png" data-expensify-width="1920" data-expensify-height="1080"`, + [`${CLOUDFRONT_URL}/${ + connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.quickbooksOnline] + }`]: `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_qbo.png" data-expensify-width="1920" data-expensify-height="1080"`, + [`${CLOUDFRONT_URL}/${ + connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.xero] + }`]: `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_xero.png" data-expensify-width="1920" data-expensify-height="1080"`, }, title: ({integrationName, workspaceAccountingLink}) => `Connect to [${integrationName}](${workspaceAccountingLink})`, description: ({integrationName, workspaceAccountingLink}) => From 84149c27ed1129b885c3f86c6aea9f3f46e23f68 Mon Sep 17 00:00:00 2001 From: Cole Date: Fri, 30 May 2025 15:33:00 -0400 Subject: [PATCH 3/5] Actually fix prettier --- src/CONST.ts | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index 7a7e8c6982ba..81121b25eef1 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -3643,11 +3643,14 @@ const CONST = { SELF_SELECT: '__predefined_selfSelect', }, - EXPENSIFY_EMAILS_OBJECT: Object.entries(EMAIL).reduce((prev, [, email]) => { - // eslint-disable-next-line no-param-reassign - prev[email] = true; - return prev; - }, {} as Record), + EXPENSIFY_EMAILS_OBJECT: Object.entries(EMAIL).reduce( + (prev, [, email]) => { + // eslint-disable-next-line no-param-reassign + prev[email] = true; + return prev; + }, + {} as Record, + ), EXPENSIFY_EMAILS: [ EMAIL.ACCOUNTING, EMAIL.ACCOUNTS_PAYABLE, @@ -5507,15 +5510,12 @@ const CONST = { type: 'addAccountingIntegration', autoCompleted: false, mediaAttributes: { - [`${CLOUDFRONT_URL}/${ - connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.netsuite] - }`]: `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_netsuite.png" data-expensify-width="1920" data-expensify-height="1080"`, - [`${CLOUDFRONT_URL}/${ - connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.quickbooksOnline] - }`]: `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_qbo.png" data-expensify-width="1920" data-expensify-height="1080"`, - [`${CLOUDFRONT_URL}/${ - connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.xero] - }`]: `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_xero.png" data-expensify-width="1920" data-expensify-height="1080"`, + [`${CLOUDFRONT_URL}/${connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.netsuite]}`]: + `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_netsuite.png" data-expensify-width="1920" data-expensify-height="1080"`, + [`${CLOUDFRONT_URL}/${connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.quickbooksOnline]}`]: + `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_qbo.png" data-expensify-width="1920" data-expensify-height="1080"`, + [`${CLOUDFRONT_URL}/${connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.xero]}`]: + `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_xero.png" data-expensify-width="1920" data-expensify-height="1080"`, }, title: ({integrationName, workspaceAccountingLink}) => `Connect to [${integrationName}](${workspaceAccountingLink})`, description: ({integrationName, workspaceAccountingLink}) => From 23212f4bc596a5134793c414adde604eb688ce3c Mon Sep 17 00:00:00 2001 From: Cole Date: Fri, 30 May 2025 16:01:56 -0400 Subject: [PATCH 4/5] maybe actually satisfy prettier --- src/CONST.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index 81121b25eef1..d31ab8872923 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -5510,12 +5510,9 @@ const CONST = { type: 'addAccountingIntegration', autoCompleted: false, mediaAttributes: { - [`${CLOUDFRONT_URL}/${connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.netsuite]}`]: - `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_netsuite.png" data-expensify-width="1920" data-expensify-height="1080"`, - [`${CLOUDFRONT_URL}/${connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.quickbooksOnline]}`]: - `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_qbo.png" data-expensify-width="1920" data-expensify-height="1080"`, - [`${CLOUDFRONT_URL}/${connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.xero]}`]: - `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_xero.png" data-expensify-width="1920" data-expensify-height="1080"`, + [`${CLOUDFRONT_URL}/${connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.netsuite]}`]: `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_netsuite.png" data-expensify-width="1920" data-expensify-height="1080"`, + [`${CLOUDFRONT_URL}/${connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.quickbooksOnline]}`]: `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_qbo.png" data-expensify-width="1920" data-expensify-height="1080"`, + [`${CLOUDFRONT_URL}/${connectionsVideoPaths[ONBOARDING_ACCOUNTING_MAPPING.xero]}`]: `data-expensify-thumbnail-url="${CLOUDFRONT_URL}/images/walkthrough-connect_to_xero.png" data-expensify-width="1920" data-expensify-height="1080"`, }, title: ({integrationName, workspaceAccountingLink}) => `Connect to [${integrationName}](${workspaceAccountingLink})`, description: ({integrationName, workspaceAccountingLink}) => From 672c8ea9e688bb22b8a0d9133aa5eefddbc15b8a Mon Sep 17 00:00:00 2001 From: Cole Date: Wed, 6 Aug 2025 20:01:43 -0400 Subject: [PATCH 5/5] Apply suggestion from @francoisl Co-authored-by: Francois Laithier --- src/CONST/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CONST/index.ts b/src/CONST/index.ts index ed30af783189..2c7fd5f046fc 100755 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -1006,7 +1006,6 @@ const CONST = { WALLET_AGREEMENT_URL: `${EXPENSIFY_URL}/expensify-payments-wallet-terms-of-service`, BANCORP_WALLET_AGREEMENT_URL: `${EXPENSIFY_URL}/bancorp-bank-wallet-terms-of-service`, EXPENSIFY_APPROVED_PROGRAM_URL: `${USE_EXPENSIFY_URL}/accountants-program`, - FEES_URL: `${EXPENSIFY_URL}/fees`, }, OLDDOT_URLS: { ADMIN_POLICIES_URL: 'admin_policies',