From a72d1ab66dc01583724f33665c9ac4224dbda302 Mon Sep 17 00:00:00 2001 From: Cole Eason Date: Thu, 7 Nov 2024 12:05:58 -0500 Subject: [PATCH 1/3] Replace terms URLs and match with olddot --- docs/_includes/footer.html | 4 ++-- help/_layouts/default.html | 6 +++--- src/CONST.ts | 19 ++++++++++--------- src/languages/en.ts | 2 +- src/languages/es.ts | 2 +- src/pages/signin/SignInPageLayout/Footer.tsx | 4 ++-- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 798fb2cf7e96..eadd77d37d49 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -50,10 +50,10 @@

Resources

ExpensifyHelp
  • - Community + Terms
  • - Privacy + Privacy
    • diff --git a/help/_layouts/default.html b/help/_layouts/default.html index 8a4605807355..76b03440cacf 100644 --- a/help/_layouts/default.html +++ b/help/_layouts/default.html @@ -214,7 +214,7 @@ .footer-column { flex: 1; max-width: 300px; /* Set a max-width for each column */ - padding: 0 20px; /* Add padding for some space between the columns */ + padding: 0 20px; /* Add padding for some space between the columns */ } @@ -273,8 +273,8 @@

    Resources

  • Press Kit
  • Support
  • ExpensifyHelp
    • -
  • Community
    • -
  • Privacy
    • +
  • Terms
    • +
  • Privacy
  • Expensify App
    • diff --git a/src/CONST.ts b/src/CONST.ts index 72dff8c87b17..d5dcb0e33f63 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -20,6 +20,7 @@ const CLOUDFRONT_DOMAIN = 'cloudfront.net'; const CLOUDFRONT_URL = `https://d2k5nsl2zxldvw.${CLOUDFRONT_DOMAIN}`; const ACTIVE_EXPENSIFY_URL = Url.addTrailingForwardSlash(Config?.NEW_EXPENSIFY_URL ?? 'https://new.expensify.com'); const USE_EXPENSIFY_URL = 'https://use.expensify.com'; +const EXPENSIFY_URL = 'https://www.expensify.com'; const PLATFORM_OS_MACOS = 'Mac OS'; const PLATFORM_IOS = 'iOS'; const ANDROID_PACKAGE_NAME = 'com.expensify.chat'; @@ -832,6 +833,7 @@ const CONST = { EMPTY_ARRAY, EMPTY_OBJECT, USE_EXPENSIFY_URL, + EXPENSIFY_URL, GOOGLE_MEET_URL_ANDROID: 'https://meet.google.com', GOOGLE_DOC_IMAGE_LINK_MATCH: 'googleusercontent.com', IMAGE_BASE64_MATCH: 'base64', @@ -846,12 +848,12 @@ const CONST = { DEEP_DIVE_ERECEIPTS: 'https://community.expensify.com/discussion/5542/deep-dive-what-are-ereceipts/', DEEP_DIVE_PER_DIEM: 'https://community.expensify.com/discussion/4772/how-to-add-a-single-rate-per-diem', GITHUB_URL: 'https://github.com/Expensify/App', - TERMS_URL: `${USE_EXPENSIFY_URL}/terms`, - PRIVACY_URL: `${USE_EXPENSIFY_URL}/privacy`, + TERMS_URL: `${EXPENSIFY_URL}/terms`, + PRIVACY_URL: `${EXPENSIFY_URL}/privacy`, LICENSES_URL: `${USE_EXPENSIFY_URL}/licenses`, - ACH_TERMS_URL: `${USE_EXPENSIFY_URL}/achterms`, - WALLET_AGREEMENT_URL: `${USE_EXPENSIFY_URL}/walletagreement`, - BANCORP_WALLET_AGREEMENT_URL: `${USE_EXPENSIFY_URL}/bancorp-bank-wallet-terms-of-service`, + ACH_TERMS_URL: `${EXPENSIFY_URL}/achterms`, + WALLET_AGREEMENT_URL: `${EXPENSIFY_URL}/expensify-payments-wallet-terms-of-service`, + BANCORP_WALLET_AGREEMENT_URL: `${EXPENSIFY_URL}/bancorp-bank-wallet-terms-of-service`, HELP_LINK_URL: `${USE_EXPENSIFY_URL}/usa-patriot-act`, ELECTRONIC_DISCLOSURES_URL: `${USE_EXPENSIFY_URL}/esignagreement`, GITHUB_RELEASE_URL: 'https://api.github.com/repos/expensify/app/releases/latest', @@ -864,7 +866,6 @@ const CONST = { NEWHELP_URL: 'https://help.expensify.com', INTERNAL_DEV_EXPENSIFY_URL: 'https://www.expensify.com.dev', STAGING_EXPENSIFY_URL: 'https://staging.expensify.com', - EXPENSIFY_URL: 'https://www.expensify.com', BANK_ACCOUNT_PERSONAL_DOCUMENTATION_INFO_URL: 'https://community.expensify.com/discussion/6983/faq-why-do-i-need-to-provide-personal-documentation-when-setting-up-updating-my-bank-account', PERSONAL_DATA_PROTECTION_INFO_URL: 'https://community.expensify.com/discussion/5677/deep-dive-security-how-expensify-protects-your-information', @@ -872,7 +873,7 @@ const CONST = { ONFIDO_PRIVACY_POLICY_URL: 'https://onfido.com/privacy/', ONFIDO_TERMS_OF_SERVICE_URL: 'https://onfido.com/terms-of-service/', LIST_OF_RESTRICTED_BUSINESSES: 'https://community.expensify.com/discussion/6191/list-of-restricted-businesses', - TRAVEL_TERMS_URL: `${USE_EXPENSIFY_URL}/travelterms`, + TRAVEL_TERMS_URL: `${EXPENSIFY_URL}/travelterms`, EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT: 'https://www.expensify.com/tools/integrations/downloadPackage', EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT_FILE_NAME: 'ExpensifyPackageForSageIntacct', SAGE_INTACCT_INSTRUCTIONS: 'https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Sage-Intacct', @@ -3142,8 +3143,8 @@ const CONST = { EXPENSIFY_APPROVED_URL: `${USE_EXPENSIFY_URL}/accountants`, PRESS_KIT_URL: 'https://we.are.expensify.com/press-kit', SUPPORT_URL: `${USE_EXPENSIFY_URL}/support`, - COMMUNITY_URL: 'https://community.expensify.com/', - PRIVACY_URL: `${USE_EXPENSIFY_URL}/privacy`, + TERMS_URL: `${EXPENSIFY_URL}/terms`, + PRIVACY_URL: `${EXPENSIFY_URL}/privacy`, ABOUT_URL: 'https://we.are.expensify.com/how-we-got-here', BLOG_URL: 'https://blog.expensify.com/', JOBS_URL: 'https://we.are.expensify.com/apply', diff --git a/src/languages/en.ts b/src/languages/en.ts index 92bed5ecf1f0..b179a24433a2 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -4567,7 +4567,7 @@ const translations = { pressKit: 'Press Kit', support: 'Support', expensifyHelp: 'ExpensifyHelp', - community: 'Community', + terms: 'Terms of Service', privacy: 'Privacy', learnMore: 'Learn More', aboutExpensify: 'About Expensify', diff --git a/src/languages/es.ts b/src/languages/es.ts index eefbb16870b5..b8db669b6519 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -4616,7 +4616,7 @@ const translations = { pressKit: 'Kit de Prensa', support: 'Soporte', expensifyHelp: 'ExpensifyHelp', - community: 'Comunidad', + terms: 'Términos de Servicio', privacy: 'Privacidad', learnMore: 'Más Información', aboutExpensify: 'Acerca de Expensify', diff --git a/src/pages/signin/SignInPageLayout/Footer.tsx b/src/pages/signin/SignInPageLayout/Footer.tsx index 314d91256e80..2f0efc862a91 100644 --- a/src/pages/signin/SignInPageLayout/Footer.tsx +++ b/src/pages/signin/SignInPageLayout/Footer.tsx @@ -93,8 +93,8 @@ const columns = ({navigateFocus = () => {}}: Pick) translationPath: 'footer.expensifyHelp', }, { - href: CONST.FOOTER.COMMUNITY_URL, - translationPath: 'footer.community', + href: CONST.FOOTER.TERMS_URL, + translationPath: 'footer.terms', }, { href: CONST.FOOTER.PRIVACY_URL, From a2d690c17027a3c7507a8b83c1e4b5053e72def6 Mon Sep 17 00:00:00 2001 From: Cole Eason Date: Thu, 7 Nov 2024 12:08:26 -0500 Subject: [PATCH 2/3] Sync text to olddot --- docs/_includes/footer.html | 2 +- help/_layouts/default.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index eadd77d37d49..c7b55b28cfd5 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -50,7 +50,7 @@

    Resources

    ExpensifyHelp
  • - Terms + Terms of Service
  • Privacy diff --git a/help/_layouts/default.html b/help/_layouts/default.html index 76b03440cacf..88fc85c5f7a2 100644 --- a/help/_layouts/default.html +++ b/help/_layouts/default.html @@ -273,7 +273,7 @@

    Resources

  • Press Kit
  • Support
  • ExpensifyHelp
    • -
  • Terms
    • +
  • Terms of Service
  • Privacy
  • Expensify App
    • From 7b8619f73698bcf3a7eb3bb7b538220a8b6c850b Mon Sep 17 00:00:00 2001 From: Cole Date: Thu, 7 Nov 2024 13:37:22 -0500 Subject: [PATCH 3/3] Update help/_layouts/default.html Co-authored-by: Rafe Colton --- help/_layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/help/_layouts/default.html b/help/_layouts/default.html index 88fc85c5f7a2..7fcd95c1b325 100644 --- a/help/_layouts/default.html +++ b/help/_layouts/default.html @@ -273,7 +273,7 @@

    Resources

  • Press Kit
  • Support
  • ExpensifyHelp
    • -
  • Terms of Service
    • +
  • Terms of Service
  • Privacy
  • Expensify App