Conversation
Display the termsOfUse.license text below the existing readTheTermsAndPrivacy information on the About page, showing the money transmission license disclosure. Co-authored-by: Cole <coleaeason@users.noreply.github.com>
Combines the two separate RenderHTML blocks into a single one so the license text appears inline after the terms/privacy text rather than on a new line. Co-authored-by: Cole <coleaeason@users.noreply.github.com>
|
Updated — the license text now renders on the same line as the terms and privacy text instead of on a separate line. Combined both into a single |
🦜 Polyglot Parrot! 🦜Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues: View the translation diffdiff --git a/src/languages/de.ts b/src/languages/de.ts
index 7bbe257b..2049de62 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -1962,7 +1962,7 @@ const translations: TranslationDeepObject<typeof en> = {
restoreStashed: 'Gespeicherten Login wiederherstellen',
signOutConfirmationText: 'Alle Offline-Änderungen gehen verloren, wenn du dich abmeldest.',
versionLetter: 'v',
- readTheTermsAndPrivacy: `Lies die <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Nutzungsbedingungen</a> und die <a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">Datenschutzerklärung</a>.`,
+ readTheTermsAndPrivacy: `Lesen Sie die <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Nutzungsbedingungen</a> und die <a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">Datenschutzerklärung</a>.`,
help: 'Hilfe',
whatIsNew: 'Was ist neu',
accountSettings: 'Kontoeinstellungen',
@@ -2648,7 +2648,7 @@ ${amount} für ${merchant} – ${date}`,
},
termsOfUse: {
terms: `<muted-text-xs>Durch das Einloggen stimmst du den <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Nutzungsbedingungen</a> und der <a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">Datenschutzerklärung</a> zu.</muted-text-xs>`,
- license: `Geldübermittlung wird bereitgestellt von ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} (NMLS-ID:2017010) gemäß seinen <a href="${CONST.OLD_DOT_PUBLIC_URLS.LICENSES_URL}">Lizenzen</a>.`,
+ license: `Die Geldübermittlung wird von ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} (NMLS-ID:2017010) gemäß seinen <a href="${CONST.OLD_DOT_PUBLIC_URLS.LICENSES_URL}">Lizenzen</a> bereitgestellt.`,
},
validateCodeForm: {
magicCodeNotReceived: 'Keinen magischen Code erhalten?',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index dc45b174..852ee088 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -2653,7 +2653,7 @@ ${amount} pour ${merchant} - ${date}`,
},
termsOfUse: {
terms: `<muted-text-xs>En vous connectant, vous acceptez les <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Conditions d'utilisation</a> et la <a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">Politique de confidentialité</a>.</muted-text-xs>`,
- license: `Le transfert d’argent est fourni par ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} (NMLS ID:2017010) conformément à ses <a href="${CONST.OLD_DOT_PUBLIC_URLS.LICENSES_URL}">licences</a>.`,
+ license: `Les services de transfert d’argent sont fournis par ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} (ID NMLS :2017010) conformément à ses <a href="${CONST.OLD_DOT_PUBLIC_URLS.LICENSES_URL}">licences</a>.`,
},
validateCodeForm: {
magicCodeNotReceived: "Vous n'avez pas reçu de code magique ?",
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 19cd5265..8b7a6be5 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -2642,7 +2642,7 @@ ${amount} per ${merchant} - ${date}`,
},
termsOfUse: {
terms: `<muted-text-xs>Accedendo, accetti i <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Termini di servizio</a> e l’<a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">Informativa sulla privacy</a>.</muted-text-xs>`,
- license: `Il servizio di trasferimento di denaro è fornito da ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} (NMLS ID:2017010) in conformità alle sue <a href="${CONST.OLD_DOT_PUBLIC_URLS.LICENSES_URL}">licenze</a>.`,
+ license: `L’attività di trasmissione di denaro è fornita da ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} (NMLS ID:2017010) in conformità alle sue <a href="${CONST.OLD_DOT_PUBLIC_URLS.LICENSES_URL}">licenze</a>.`,
},
validateCodeForm: {
magicCodeNotReceived: 'Non hai ricevuto un codice magico?',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 9fcec8d9..a3a52cc9 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -1946,7 +1946,7 @@ const translations: TranslationDeepObject<typeof en> = {
restoreStashed: '保存済みログインを復元',
signOutConfirmationText: 'サインアウトすると、オフライン中の変更内容はすべて失われます。',
versionLetter: 'v',
- readTheTermsAndPrivacy: `<a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">利用規約</a>と<a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">プライバシー</a>をお読みください。`,
+ readTheTermsAndPrivacy: `<a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">利用規約</a>と<a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">プライバシーポリシー</a>をお読みください。`,
help: 'ヘルプ',
whatIsNew: '新機能',
accountSettings: 'アカウント設定',
@@ -2622,7 +2622,7 @@ ${date} の ${merchant} への ${amount}`,
},
termsOfUse: {
terms: `<muted-text-xs>ログインすると、<a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">利用規約</a>および<a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">プライバシーポリシー</a>に同意したものとみなされます。</muted-text-xs>`,
- license: `資金移動サービスは、その<a href="${CONST.OLD_DOT_PUBLIC_URLS.LICENSES_URL}">ライセンス</a>に基づき、${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS}(NMLS ID:2017010)によって提供されています。`,
+ license: `資金移動サービスは、その<a href="${CONST.OLD_DOT_PUBLIC_URLS.LICENSES_URL}">認可</a>に基づき、${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS}(NMLS ID:2017010)によって提供されています。`,
},
validateCodeForm: {
magicCodeNotReceived: 'マジックコードを受け取っていませんか?',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index a631df95..5d8b77dc 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -1955,7 +1955,7 @@ const translations: TranslationDeepObject<typeof en> = {
restoreStashed: 'Opgeslagen login herstellen',
signOutConfirmationText: 'Je verliest alle offline wijzigingen als je je afmeldt.',
versionLetter: 'v',
- readTheTermsAndPrivacy: `Lees de <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">servicevoorwaarden</a> en het <a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">privacybeleid</a>.`,
+ readTheTermsAndPrivacy: `Lees de <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Servicevoorwaarden</a> en het <a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">Privacybeleid</a>.`,
help: 'Help',
whatIsNew: 'Wat is er nieuw',
accountSettings: 'Accountinstellingen',
@@ -2641,7 +2641,7 @@ ${amount} voor ${merchant} - ${date}`,
},
termsOfUse: {
terms: `<muted-text-xs>Door in te loggen ga je akkoord met de <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Servicevoorwaarden</a> en het <a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">Privacybeleid</a>.</muted-text-xs>`,
- license: `Geldtransmissie wordt verzorgd door ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} (NMLS ID:2017010) overeenkomstig de <a href="${CONST.OLD_DOT_PUBLIC_URLS.LICENSES_URL}">licenties</a>.`,
+ license: `Geldtransfers worden verzorgd door ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} (NMLS ID:2017010) volgens diens <a href="${CONST.OLD_DOT_PUBLIC_URLS.LICENSES_URL}">licenties</a>.`,
},
validateCodeForm: {
magicCodeNotReceived: 'Geen magische code ontvangen?',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 42edb447..c1abffcb 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -2634,7 +2634,7 @@ ${amount} dla ${merchant} - ${date}`,
},
termsOfUse: {
terms: `<muted-text-xs>Logując się, wyrażasz zgodę na <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Warunki korzystania z usługi</a> oraz <a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">Prywatność</a>.</muted-text-xs>`,
- license: `Przekazy pieniężne są świadczone przez ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} (NMLS ID:2017010) na podstawie jego <a href="${CONST.OLD_DOT_PUBLIC_URLS.LICENSES_URL}">licencji</a>.`,
+ license: `Usługę przekazu pieniężnego świadczy ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} (NMLS ID:2017010) na podstawie swoich <a href="${CONST.OLD_DOT_PUBLIC_URLS.LICENSES_URL}">licencji</a>.`,
},
validateCodeForm: {
magicCodeNotReceived: 'Nie otrzymano magicznego kodu?',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index fd4aa3df..4aea529d 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -2634,7 +2634,7 @@ ${amount} para ${merchant} - ${date}`,
},
termsOfUse: {
terms: `<muted-text-xs>Ao entrar, você concorda com os <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Termos de Serviço</a> e a <a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">Privacidade</a>.</muted-text-xs>`,
- license: `A transmissão de dinheiro é fornecida por ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} (NMLS ID:2017010) de acordo com suas <a href="${CONST.OLD_DOT_PUBLIC_URLS.LICENSES_URL}">licenças</a>.`,
+ license: `A transmissão de dinheiro é fornecida por ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} (ID NMLS:2017010) de acordo com suas <a href="${CONST.OLD_DOT_PUBLIC_URLS.LICENSES_URL}">licenças</a>.`,
},
validateCodeForm: {
magicCodeNotReceived: 'Não recebeu um código mágico?',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 323065fc..d4688cb4 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -2582,7 +2582,7 @@ ${amount},商户:${merchant} - 日期:${date}`,
},
termsOfUse: {
terms: `<muted-text-xs>登录即表示你同意<a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">服务条款</a>和<a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">隐私政策</a>。</muted-text-xs>`,
- license: `资金传输服务由 ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS}(NMLS ID:2017010)根据其<a href="${CONST.OLD_DOT_PUBLIC_URLS.LICENSES_URL}">执照</a>提供。`,
+ license: `资金汇款服务由 ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS}(NMLS ID:2017010)根据其<a href="${CONST.OLD_DOT_PUBLIC_URLS.LICENSES_URL}">许可证</a>提供。`,
},
validateCodeForm: {
magicCodeNotReceived: '没有收到验证码?',
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
|
npm has a |
|
@ikevin127 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
The lockfile was stale from when the branch was originally created on an older version of main, causing npm ci to fail in CI because the lockfile versions did not match the package.json requirements. Co-authored-by: Cole <coleaeason@users.noreply.github.com>
|
Fixed the failing build checks: the The snyk security check failure is a separate, external check unrelated to this lockfile issue — it should resolve on the next run or can be investigated independently. |
…ToAboutPage Co-authored-by: Cole <coleaeason@users.noreply.github.com>
|
Fixed the failing checks by merging Root cause: The previous CI failures (ESLint check, Changed files ESLint check, Translation Dry Run, Verify Podfile) were all caused by Fix: Merged |
joekaufmanexpensify
left a comment
There was a problem hiding this comment.
Good for product
There was a problem hiding this comment.
This should not be included
…fy/App into claude-addLicenseTextToAboutPage
The submodule was inadvertently updated to a commit requiring node 20.19.5, causing EBADENGINE failures in CI builds. Co-authored-by: Cole <coleaeason@users.noreply.github.com>
|
Fixed the failing checks: The The |
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromeiOS: HybridAppiOS: mWeb SafariMacOS: Chrome / Safari |
|
The earlier check failures were caused by an accidental All PR checks are now passing — builds, ESLint, typecheck, all 8 test jobs, perf-tests, prettier, spellcheck, storybook, translations, and all other checks are green. |
|
🚧 @francoisl has triggered a test Expensify/App build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/francoisl in version: 9.3.36-0 🚀
|
|
🚀 Deployed to production by https://github.com/luacmartins in version: 9.3.36-10 🚀
|
Explanation of Change
Adds the
termsOfUse.licensetext to the bottom of the About page, displayed after the existingreadTheTermsAndPrivacyinformation. This shows the money transmission license disclosure ("Money transmission is provided by Expensify Payments LLC (NMLS ID:2017010) pursuant to its licenses.") on the About page.The new text follows the same rendering pattern as the existing terms and privacy line — wrapped in a
ViewwithRenderHTML.Fixed Issues
$ https://github.com/Expensify/Expensify/issues/609438
Tests
Looks like this:

Offline tests
No network-dependent behavior — this is static translated text rendered from local translation files.
QA Steps
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari