Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace terms URLs and match with olddot #52205

Merged
merged 3 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/_includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ <h3>Resources</h3>
<a href="https://help.expensify.com/" alt="ExpensifyHelp" target="_blank">ExpensifyHelp</a>
</li>
<li>
<a href="https://community.expensify.com/" alt="Community" target="_blank">Community</a>
<a href="https://www.expensify.com/terms" alt="Terms" target="_blank">Terms of Service</a>
</li>
<li>
<a href="https://use.expensify.com/privacy" alt="Privacy" target="_blank">Privacy</a>
<a href="https://www.expensify.com/privacy" alt="Privacy" target="_blank">Privacy</a>
</li>
</ul>
</div>
Expand Down
6 changes: 3 additions & 3 deletions help/_layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
}
</style>
</head>
Expand Down Expand Up @@ -273,8 +273,8 @@ <h3>Resources</h3>
<li><a href="https://use.expensify.com/press-kit">Press Kit</a></li>
<li><a href="https://use.expensify.com/support">Support</a></li>
<li><a href="https://help.expensify.com/">ExpensifyHelp</a></li>
<li><a href="https://community.expensify.com/">Community</a></li>
<li><a href="https://use.expensify.com/privacy">Privacy</a></li>
<li><a href="https://www.expensify.com/terms">Terms of Service</a></li>
<li><a href="https://www.expensify.com/privacy">Privacy</a></li>
<li><a href="https://use.expensify.com/download">Expensify App</a></li>
</ul>
</div>
Expand Down
19 changes: 10 additions & 9 deletions src/CONST.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -864,15 +866,14 @@ 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',
ONFIDO_FACIAL_SCAN_POLICY_URL: 'https://onfido.com/facial-scan-policy-and-release/',
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',
Expand Down Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions src/pages/signin/SignInPageLayout/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ const columns = ({navigateFocus = () => {}}: Pick<FooterProps, 'navigateFocus'>)
translationPath: 'footer.expensifyHelp',
},
{
href: CONST.FOOTER.COMMUNITY_URL,
translationPath: 'footer.community',
href: CONST.FOOTER.TERMS_URL,
translationPath: 'footer.terms',
},
{
href: CONST.FOOTER.PRIVACY_URL,
Expand Down
Loading