diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx index cda0c6ea7bf3..96e1dda27627 100755 --- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx +++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx @@ -73,6 +73,11 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim mixedUAStyles: {...styles.mutedNormalTextLabel, ...styles.mb0}, contentModel: HTMLContentModel.block, }), + 'muted-text-micro': HTMLElementModel.fromCustomModel({ + tagName: 'muted-text-micro', + mixedUAStyles: {...styles.textMicroSupporting, ...styles.mb0}, + contentModel: HTMLContentModel.block, + }), 'centered-text': HTMLElementModel.fromCustomModel({ tagName: 'centered-text', mixedUAStyles: {...styles.textAlignCenter}, @@ -181,6 +186,7 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim styles.subTextFileUpload, styles.textAlignCenter, styles.textSuccess, + styles.textMicroSupporting, ], ); /* eslint-enable @typescript-eslint/naming-convention */ diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx index ac560ffcfb32..b79731e79367 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx @@ -71,11 +71,16 @@ function AnchorRenderer({tnode, style, key}: AnchorRendererProps) { ]; } - // Special handling for links in RBR to maintain consistent font size + // Special handling for links in label font to maintain consistent font size if (HTMLEngineUtils.isChildOfMutedTextLabel(tnode)) { linkStyle = [styles.mutedNormalTextLabel, styles.link]; } + // Special handling for links in micro font to maintain consistent font size + if (HTMLEngineUtils.isChildOfMutedTextMicro(tnode)) { + linkStyle = [styles.textMicroSupporting, styles.link]; + } + if (tnode.classes.includes('no-style-link')) { // If the link has a class of a no-style-link, we don't apply any styles linkStyle = {...(style as TextStyle)}; diff --git a/src/components/HTMLEngineProvider/htmlEngineUtils.ts b/src/components/HTMLEngineProvider/htmlEngineUtils.ts index 32bc7d5fcc89..644573abdfbc 100644 --- a/src/components/HTMLEngineProvider/htmlEngineUtils.ts +++ b/src/components/HTMLEngineProvider/htmlEngineUtils.ts @@ -111,4 +111,28 @@ function isChildOfMutedTextLabel(tnode: TNode): boolean { return isChildOfMutedTextLabel(tnode.parent); } -export {computeEmbeddedMaxWidth, isChildOfComment, isChildOfH1, isDeletedNode, isChildOfTaskTitle, isChildOfRBR, isCommentTag, getFontSizeOfRBRChild, isChildOfMutedTextLabel}; +/** + * @returns Whether the node is a child of muted-text-label + */ +function isChildOfMutedTextMicro(tnode: TNode): boolean { + if (!tnode.parent) { + return false; + } + if (tnode.parent.tagName === 'muted-text-micro') { + return true; + } + return isChildOfMutedTextMicro(tnode.parent); +} + +export { + computeEmbeddedMaxWidth, + isChildOfComment, + isChildOfH1, + isDeletedNode, + isChildOfTaskTitle, + isChildOfRBR, + isCommentTag, + getFontSizeOfRBRChild, + isChildOfMutedTextLabel, + isChildOfMutedTextMicro, +}; diff --git a/src/languages/de.ts b/src/languages/de.ts index 0069cf963870..8fe00030b7fa 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -1654,12 +1654,7 @@ const translations = { restoreStashed: 'Wiederherstellen des zwischengespeicherten Logins', signOutConfirmationText: 'Sie verlieren alle Offline-Änderungen, wenn Sie sich abmelden.', versionLetter: 'v', - readTheTermsAndPrivacy: { - phrase1: 'Lesen Sie die', - phrase2: 'Nutzungsbedingungen', - phrase3: 'und', - phrase4: 'Datenschutz', - }, + readTheTermsAndPrivacy: `Lesen Sie die Nutzungsbedingungen und Datenschutzbestimmungen.`, help: 'Hilfe', whatIsNew: 'Was ist neu', accountSettings: 'Kontoeinstellungen', @@ -5435,11 +5430,7 @@ const translations = { changeOwnerPageTitle: 'Besitzer übertragen', addPaymentCardTitle: 'Geben Sie Ihre Zahlungskarte ein, um die Eigentümerschaft zu übertragen.', addPaymentCardButtonText: 'Bedingungen akzeptieren & Zahlungskarte hinzufügen', - addPaymentCardReadAndAcceptTextPart1: 'Lesen und akzeptieren', - addPaymentCardReadAndAcceptTextPart2: 'Richtlinie zum Hinzufügen Ihrer Karte', - addPaymentCardTerms: 'Bedingungen', - addPaymentCardPrivacy: 'Datenschutz', - addPaymentCardAnd: '&', + addPaymentCardReadAndAcceptText: `Lesen und akzeptieren Sie die Bedingungen und Datenschutzbestimmungen, um Ihre Karte hinzuzufügen.`, addPaymentCardPciCompliant: 'PCI-DSS-konform', addPaymentCardBankLevelEncrypt: 'Verschlüsselung auf Bankniveau', addPaymentCardRedundant: 'Redundante Infrastruktur', diff --git a/src/languages/en.ts b/src/languages/en.ts index e1e0f68f628f..acf79ec1b4ec 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -1637,12 +1637,7 @@ const translations = { restoreStashed: 'Restore stashed login', signOutConfirmationText: "You'll lose any offline changes if you sign out.", versionLetter: 'v', - readTheTermsAndPrivacy: { - phrase1: 'Read the', - phrase2: 'Terms of Service', - phrase3: 'and', - phrase4: 'Privacy', - }, + readTheTermsAndPrivacy: `Read the Terms of Service and Privacy.`, help: 'Help', whatIsNew: "What's new", accountSettings: 'Account settings', @@ -5414,11 +5409,7 @@ const translations = { changeOwnerPageTitle: 'Transfer owner', addPaymentCardTitle: 'Enter your payment card to transfer ownership', addPaymentCardButtonText: 'Accept terms & add payment card', - addPaymentCardReadAndAcceptTextPart1: 'Read and accept', - addPaymentCardReadAndAcceptTextPart2: 'policy to add your card', - addPaymentCardTerms: 'terms', - addPaymentCardPrivacy: 'privacy', - addPaymentCardAnd: '&', + addPaymentCardReadAndAcceptText: `Read and accept terms & privacy policy to add your card.`, addPaymentCardPciCompliant: 'PCI-DSS compliant', addPaymentCardBankLevelEncrypt: 'Bank level encryption', addPaymentCardRedundant: 'Redundant infrastructure', diff --git a/src/languages/es.ts b/src/languages/es.ts index a53c95bb37ce..b84fd0465c4a 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -1630,12 +1630,7 @@ const translations = { signOut: 'Desconectar', signOutConfirmationText: 'Si cierras sesión perderás los cambios hechos mientras estabas desconectado', versionLetter: 'v', - readTheTermsAndPrivacy: { - phrase1: 'Leer los', - phrase2: 'Términos de Servicio', - phrase3: 'y', - phrase4: 'Privacidad', - }, + readTheTermsAndPrivacy: `Leer los Términos de Servicio y Privacidad.`, help: 'Ayuda', whatIsNew: 'Qué hay de nuevo', accountSettings: 'Configuración de la cuenta', @@ -5426,11 +5421,7 @@ const translations = { changeOwnerPageTitle: 'Transferir la propiedad', addPaymentCardTitle: 'Ingrese tu tarjeta de pago para transferir la propiedad', addPaymentCardButtonText: 'Aceptar términos y agregar tarjeta de pago', - addPaymentCardReadAndAcceptTextPart1: 'Lea y acepte', - addPaymentCardReadAndAcceptTextPart2: 'para agregar tu tarjeta', - addPaymentCardTerms: 'los términos', - addPaymentCardPrivacy: 'la política de privacidad', - addPaymentCardAnd: 'y', + addPaymentCardReadAndAcceptText: `Lea y acepte los términos y la política de privacidad para agregar tu tarjeta.`, addPaymentCardPciCompliant: 'PCI-DSS obediente', addPaymentCardBankLevelEncrypt: 'Cifrado a nivel bancario', addPaymentCardRedundant: 'Infraestructura redundante', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index a3b37cd5ca61..2eedb5ef3462 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -1655,12 +1655,7 @@ const translations = { restoreStashed: 'Restaurer la connexion mise en attente', signOutConfirmationText: 'Vous perdrez toutes les modifications hors ligne si vous vous déconnectez.', versionLetter: 'v', - readTheTermsAndPrivacy: { - phrase1: 'Lire le', - phrase2: "Conditions d'utilisation", - phrase3: 'et', - phrase4: 'Confidentialité', - }, + readTheTermsAndPrivacy: `Lisez les Conditions d'utilisation et de Confidentialité.`, help: 'Aide', whatIsNew: 'Quoi de neuf', accountSettings: 'Paramètres du compte', @@ -5451,11 +5446,7 @@ const translations = { changeOwnerPageTitle: 'Transférer le propriétaire', addPaymentCardTitle: 'Entrez votre carte de paiement pour transférer la propriété', addPaymentCardButtonText: 'Accepter les conditions et ajouter une carte de paiement', - addPaymentCardReadAndAcceptTextPart1: 'Lire et accepter', - addPaymentCardReadAndAcceptTextPart2: 'politique pour ajouter votre carte', - addPaymentCardTerms: 'termes', - addPaymentCardPrivacy: 'confidentialité', - addPaymentCardAnd: '&', + addPaymentCardReadAndAcceptText: `Lisez et acceptez les termes et la politique de confidentialité pour ajouter votre carte.`, addPaymentCardPciCompliant: 'Conforme à la norme PCI-DSS', addPaymentCardBankLevelEncrypt: 'Chiffrement de niveau bancaire', addPaymentCardRedundant: 'Infrastructure redondante', diff --git a/src/languages/it.ts b/src/languages/it.ts index b913e76ccfed..f0920bbab812 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -1648,12 +1648,7 @@ const translations = { restoreStashed: 'Ripristina accesso nascosto', signOutConfirmationText: 'Perderai tutte le modifiche offline se esci.', versionLetter: 'v', - readTheTermsAndPrivacy: { - phrase1: 'Leggi il', - phrase2: 'Termini di Servizio', - phrase3: 'e', - phrase4: 'Privacy', - }, + readTheTermsAndPrivacy: `Leggete i Termini di servizioe e la Privacy.`, help: 'Aiuto', whatIsNew: 'Novità', accountSettings: 'Impostazioni account', @@ -5448,11 +5443,7 @@ const translations = { changeOwnerPageTitle: 'Trasferisci proprietario', addPaymentCardTitle: 'Inserisci la tua carta di pagamento per trasferire la proprietà', addPaymentCardButtonText: 'Accetta i termini e aggiungi una carta di pagamento', - addPaymentCardReadAndAcceptTextPart1: 'Leggi e accetta', - addPaymentCardReadAndAcceptTextPart2: 'politica per aggiungere la tua carta', - addPaymentCardTerms: 'termini', - addPaymentCardPrivacy: 'privacy', - addPaymentCardAnd: '&', + addPaymentCardReadAndAcceptText: `Leggere e accettare i termini e l'informativa sulla privacy per aggiungere la carta.`, addPaymentCardPciCompliant: 'Conforme a PCI-DSS', addPaymentCardBankLevelEncrypt: 'Crittografia a livello bancario', addPaymentCardRedundant: 'Infrastruttura ridondante', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 3db176f5c3e5..b75e8abef24a 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -1647,12 +1647,7 @@ const translations = { restoreStashed: '隠されたログインを復元', signOutConfirmationText: 'サインアウトすると、オフラインでの変更が失われます。', versionLetter: 'v', - readTheTermsAndPrivacy: { - phrase1: '読む', - phrase2: '利用規約', - phrase3: 'および', - phrase4: 'プライバシー', - }, + readTheTermsAndPrivacy: `利用規約プライバシーをお読みください。`, help: '助けて', whatIsNew: '新着情報', accountSettings: 'アカウント設定', @@ -5419,11 +5414,7 @@ const translations = { changeOwnerPageTitle: 'オーナーを移行', addPaymentCardTitle: '所有権を移転するために支払いカードを入力してください。', addPaymentCardButtonText: '利用規約に同意して支払いカードを追加', - addPaymentCardReadAndAcceptTextPart1: '読み取りと承認', - addPaymentCardReadAndAcceptTextPart2: 'カードを追加するためのポリシー', - addPaymentCardTerms: '利用規約', - addPaymentCardPrivacy: 'プライバシー', - addPaymentCardAnd: '&', + addPaymentCardReadAndAcceptText: `規約プライバシーポリシーに同意してカードを追加してください。`, addPaymentCardPciCompliant: 'PCI-DSS 準拠', addPaymentCardBankLevelEncrypt: '銀行レベルの暗号化', addPaymentCardRedundant: '冗長インフラストラクチャー', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 28ca40761c78..8990b45982b1 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -1649,12 +1649,7 @@ const translations = { restoreStashed: 'Herstel opgeslagen login', signOutConfirmationText: 'U verliest alle offline wijzigingen als u zich afmeldt.', versionLetter: 'v', - readTheTermsAndPrivacy: { - phrase1: 'Lees de', - phrase2: 'Servicevoorwaarden', - phrase3: 'en', - phrase4: 'Privacy', - }, + readTheTermsAndPrivacy: `Lees de Servicevoorwaarden en Privacy.`, help: 'Help', whatIsNew: 'Wat is nieuw', accountSettings: 'Accountinstellingen', @@ -5447,11 +5442,7 @@ const translations = { changeOwnerPageTitle: 'Eigenaar overdragen', addPaymentCardTitle: 'Voer uw betaalkaart in om het eigendom over te dragen', addPaymentCardButtonText: 'Accepteer voorwaarden & voeg betaalkaart toe', - addPaymentCardReadAndAcceptTextPart1: 'Lezen en accepteren', - addPaymentCardReadAndAcceptTextPart2: 'beleid om uw kaart toe te voegen', - addPaymentCardTerms: 'voorwaarden', - addPaymentCardPrivacy: 'privacy', - addPaymentCardAnd: '&', + addPaymentCardReadAndAcceptText: `Lees en accepteer de voorwaarden en het privacybeleid om je kaart toe te voegen.`, addPaymentCardPciCompliant: 'PCI-DSS-conform', addPaymentCardBankLevelEncrypt: 'Versleuteling op bankniveau', addPaymentCardRedundant: 'Redundante infrastructuur', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index d9c7568416df..e14860772065 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -1645,12 +1645,7 @@ const translations = { restoreStashed: 'Przywróć zapisane logowanie', signOutConfirmationText: 'Utracisz wszystkie zmiany offline, jeśli się wylogujesz.', versionLetter: 'v', - readTheTermsAndPrivacy: { - phrase1: 'Przeczytaj', - phrase2: 'Warunki korzystania z usługi', - phrase3: 'i', - phrase4: 'Prywatność', - }, + readTheTermsAndPrivacy: `Zapoznaj się z Warunkami korzystania z usługi i Polityką prywatności.`, help: 'Pomoc', whatIsNew: 'Co nowego', accountSettings: 'Ustawienia konta', @@ -5434,11 +5429,7 @@ const translations = { changeOwnerPageTitle: 'Przenieś właściciela', addPaymentCardTitle: 'Wprowadź swoją kartę płatniczą, aby przenieść własność', addPaymentCardButtonText: 'Zaakceptuj warunki i dodaj kartę płatniczą', - addPaymentCardReadAndAcceptTextPart1: 'Przeczytaj i zaakceptuj', - addPaymentCardReadAndAcceptTextPart2: 'zasady dodawania karty', - addPaymentCardTerms: 'warunki', - addPaymentCardPrivacy: 'prywatność', - addPaymentCardAnd: '&', + addPaymentCardReadAndAcceptText: `Przeczytaj i zaakceptuj warunki i politykę prywatności, aby dodać swoją kartę.`, addPaymentCardPciCompliant: 'Zgodny z PCI-DSS', addPaymentCardBankLevelEncrypt: 'Szyfrowanie na poziomie bankowym', addPaymentCardRedundant: 'Nadmierna infrastruktura', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 9913ae8fe939..f6dd81f76f5b 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -1646,12 +1646,7 @@ const translations = { restoreStashed: 'Restaurar login armazenado', signOutConfirmationText: 'Você perderá todas as alterações offline se sair.', versionLetter: 'v', - readTheTermsAndPrivacy: { - phrase1: 'Leia o', - phrase2: 'Termos de Serviço', - phrase3: 'e', - phrase4: 'Privacidade', - }, + readTheTermsAndPrivacy: `Leia os Termos de Serviço e Privacidade.`, help: 'Ajuda', whatIsNew: 'O que há de novo', accountSettings: 'Configurações da conta', @@ -5446,11 +5441,7 @@ const translations = { changeOwnerPageTitle: 'Transferir proprietário', addPaymentCardTitle: 'Insira seu cartão de pagamento para transferir a propriedade', addPaymentCardButtonText: 'Aceitar os termos e adicionar cartão de pagamento', - addPaymentCardReadAndAcceptTextPart1: 'Ler e aceitar', - addPaymentCardReadAndAcceptTextPart2: 'política para adicionar seu cartão', - addPaymentCardTerms: 'termos', - addPaymentCardPrivacy: 'privacidade', - addPaymentCardAnd: '&', + addPaymentCardReadAndAcceptText: `Leia e aceite os termos e a política de privacidade para adicionar seu cartão.`, addPaymentCardPciCompliant: 'Compatível com PCI-DSS', addPaymentCardBankLevelEncrypt: 'Criptografia de nível bancário', addPaymentCardRedundant: 'Infraestrutura redundante', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 58825e660566..3a6692350390 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -1628,12 +1628,7 @@ const translations = { restoreStashed: '恢复暂存的登录信息', signOutConfirmationText: '如果您退出登录,任何离线更改都将丢失。', versionLetter: 'v', - readTheTermsAndPrivacy: { - phrase1: '阅读该内容', - phrase2: '服务条款', - phrase3: '和', - phrase4: '隐私', - }, + readTheTermsAndPrivacy: `阅读服务条款隐私条款`, help: '帮助', whatIsNew: '新内容', accountSettings: '账户设置', @@ -5351,11 +5346,7 @@ const translations = { changeOwnerPageTitle: '转移所有者', addPaymentCardTitle: '输入您的支付卡以转移所有权', addPaymentCardButtonText: '接受条款并添加支付卡', - addPaymentCardReadAndAcceptTextPart1: '阅读并接受', - addPaymentCardReadAndAcceptTextPart2: '将卡添加的政策', - addPaymentCardTerms: '条款', - addPaymentCardPrivacy: '隐私', - addPaymentCardAnd: '&', + addPaymentCardReadAndAcceptText: `阅读并接受条款隐私 政策,添加您的会员卡。`, addPaymentCardPciCompliant: '符合PCI-DSS标准', addPaymentCardBankLevelEncrypt: '银行级加密', addPaymentCardRedundant: '冗余基础设施', diff --git a/src/pages/settings/AboutPage/AboutPage.tsx b/src/pages/settings/AboutPage/AboutPage.tsx index 58ed778a9434..04f3962ca761 100644 --- a/src/pages/settings/AboutPage/AboutPage.tsx +++ b/src/pages/settings/AboutPage/AboutPage.tsx @@ -8,11 +8,11 @@ import * as Expensicons from '@components/Icon/Expensicons'; import * as Illustrations from '@components/Icon/Illustrations'; import LottieAnimations from '@components/LottieAnimations'; import MenuItemList from '@components/MenuItemList'; +import RenderHTML from '@components/RenderHTML'; import ScreenWrapper from '@components/ScreenWrapper'; import ScrollView from '@components/ScrollView'; import Section from '@components/Section'; import Text from '@components/Text'; -import TextLink from '@components/TextLink'; import useLocalize from '@hooks/useLocalize'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; @@ -165,27 +165,8 @@ function AboutPage() { - - - {translate('initialSettingsPage.readTheTermsAndPrivacy.phrase1')}{' '} - - {translate('initialSettingsPage.readTheTermsAndPrivacy.phrase2')} - {' '} - {translate('initialSettingsPage.readTheTermsAndPrivacy.phrase3')}{' '} - - {translate('initialSettingsPage.readTheTermsAndPrivacy.phrase4')} - - . - + + diff --git a/src/pages/workspace/members/WorkspaceOwnerPaymentCardForm.tsx b/src/pages/workspace/members/WorkspaceOwnerPaymentCardForm.tsx index 9d9460ac422b..d0116ed2310c 100644 --- a/src/pages/workspace/members/WorkspaceOwnerPaymentCardForm.tsx +++ b/src/pages/workspace/members/WorkspaceOwnerPaymentCardForm.tsx @@ -9,7 +9,6 @@ import * as Illustrations from '@components/Icon/Illustrations'; import RenderHTML from '@components/RenderHTML'; import Section, {CARD_LAYOUT} from '@components/Section'; import Text from '@components/Text'; -import TextLink from '@components/TextLink'; import useLocalize from '@hooks/useLocalize'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; @@ -84,23 +83,9 @@ function WorkspaceOwnerPaymentCardForm({policy}: WorkspaceOwnerPaymentCardFormPr headerContent={{translate('workspace.changeOwner.addPaymentCardTitle')}} footerContent={ <> - - {translate('workspace.changeOwner.addPaymentCardReadAndAcceptTextPart1')}{' '} - - {translate('workspace.changeOwner.addPaymentCardTerms')} - {' '} - {translate('workspace.changeOwner.addPaymentCardAnd')}{' '} - - {translate('workspace.changeOwner.addPaymentCardPrivacy')} - {' '} - {translate('workspace.changeOwner.addPaymentCardReadAndAcceptTextPart2')} - + + +
borderColor: theme.appBG, }, - sidebarFooter: { - display: 'flex', - justifyContent: 'center', - width: '100%', - paddingLeft: 20, - }, - sidebarAvatar: { borderRadius: variables.sidebarAvatarSize, height: variables.sidebarAvatarSize,