Skip to content

Commit b637ac6

Browse files
committed
fix: new TOS
1 parent a0d75d2 commit b637ac6

File tree

12 files changed

+447
-281
lines changed

12 files changed

+447
-281
lines changed

src/assets/tos.ts

Lines changed: 0 additions & 263 deletions
This file was deleted.

src/assets/tos.tsx

Lines changed: 438 additions & 0 deletions
Large diffs are not rendered by default.

src/screens/Onboarding/TermsOfUse.tsx

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import React, { ReactElement, useState } from 'react';
22
import { View, StyleSheet, ScrollView } from 'react-native';
33
import { Trans, useTranslation } from 'react-i18next';
44

5-
import { Display, BodyM, BodyMSB, BodySSB } from '../../styles/text';
5+
import { Display, BodyMSB, BodySSB } from '../../styles/text';
66
import SafeAreaInset from '../../components/SafeAreaInset';
77
import Button from '../../components/Button';
88
import CheckButton from '../../components/CheckButton';
99
import VerticalShadow from '../../components/VerticalShadow';
1010
import { openURL } from '../../utils/helpers';
1111
import { wipeApp } from '../../store/utils/settings';
12-
import termsOfUseText from '../../assets/tos';
12+
import TOS from '../../assets/tos';
1313
import type { OnboardingStackScreenProps } from '../../navigation/types';
1414

1515
const TermsOfUse = ({
@@ -58,9 +58,7 @@ const TermsOfUse = ({
5858
components={{ accent: <Display color="brand" /> }}
5959
/>
6060

61-
<BodyM color="secondary" style={styles.text}>
62-
{termsOfUseText}
63-
</BodyM>
61+
<TOS />
6462
</ScrollView>
6563

6664
<View style={styles.shadowContainer}>
@@ -132,7 +130,6 @@ const styles = StyleSheet.create({
132130
scrollView: {
133131
flex: 1,
134132
paddingTop: 48,
135-
textTransform: 'uppercase',
136133
},
137134
shadowContainer: {
138135
position: 'absolute',
@@ -142,9 +139,6 @@ const styles = StyleSheet.create({
142139
height: 70,
143140
pointerEvents: 'none',
144141
},
145-
text: {
146-
marginTop: 8,
147-
},
148142
checkboxes: {
149143
marginTop: 'auto',
150144
},

src/utils/i18n/locales/cs/onboarding.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"tos_header": "Bitkit\n<accent>podmínky používání</accent>",
33
"tos_checkbox": "Podmínky použití",
4-
"tos_checkbox_value": "Prohlašuji, že jsem si přečetl/a <accent>podmínky používání</accent> a souhlasím s nimi.",
54
"pp_checkbox": "Zásady ochrany osobních údajů",
65
"pp_checkbox_value": "Prohlašuji, že jsem si přečetl/a <accent>zásady ochrany osobních údajů</accent> a souhlasím s nimi.",
76
"welcome_title": "Můžete ₿ \n<accent>změna</accent>",

src/utils/i18n/locales/de/onboarding.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"tos_header": "Bitkit\n<accent>Nutzungs-bedingungen</accent>",
33
"tos_checkbox": "Nutzungsbedingungen",
4-
"tos_checkbox_value": "Ich erkläre, dass ich die <accent>Nutzungsbedingungen</accent> gelesen und akzeptiert habe.",
54
"pp_checkbox": "Datenschutzerklärung",
65
"pp_checkbox_value": "Ich erkläre, dass ich die <accent>Datenschutzerklärung</accent> gelesen und akzeptiert habe.",
76
"welcome_title": "You can ₿ \n<accent>the change</accent>",

src/utils/i18n/locales/en/onboarding.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"tos_header": "Bitkit\n<accent>terms of use</accent>",
33
"tos_checkbox": "Terms of use",
4-
"tos_checkbox_value": "I declare that I have read and accept the <accent>terms of use.</accent>",
4+
"tos_checkbox_value": "I confirm that I have read, understood and agree to <accent>the Terms</accent> above. I confirm I am not a Prohibited Person (as defined in those Terms).",
55
"pp_checkbox": "Privacy Policy",
66
"pp_checkbox_value": "I declare that I have read and accept the <accent>privacy policy.</accent>",
77
"welcome_title": "You can ₿ \n<accent>the change</accent>",

src/utils/i18n/locales/fr/onboarding.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"tos_header": "Bitkit\n<accent>Conditions d'utilisation</accent>",
33
"tos_checkbox": "Conditions d'utilisation",
4-
"tos_checkbox_value": "Je déclare avoir lu et accepté les <accent>conditions d'utilisation</accent>.",
54
"pp_checkbox": "Politique de confidentialité",
65
"pp_checkbox_value": "Je déclare avoir lu et accepté la <accent>politique de confidentialité</accent>.",
76
"welcome_title": "Vous pouvez être \n<accent>le changement</accent>",

src/utils/i18n/locales/fr/other.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"qr_paste": "Collez le QR code ",
1313
"buy_header": "Achetez des\n<accent>Bitcoin</accent>",
1414
"buy_text": "Vous n'avez pas de bitcoin ou vous avez besoin de plus d'informations ?",
15+
"buy_button": "Choisissez une plateforme d'échange",
1516
"error_keychain": "Problème de connexion des données",
1617
"error_keychain_msg": "Une erreur s'est produite : Impossible de charger primaryKey.",
1718
"connection_restored_title": "Connection Electrum restauré",

src/utils/i18n/locales/fr/wallet.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,12 @@
168168
"details_savings_title": "Épargner",
169169
"details_spending_title": "Dépenser",
170170
"savings": {
171-
"title": "Épargner"
171+
"title": "Épargner",
172+
"onboarding": "<accent>Envoyer\nles bitcoins</accent>\nsur votre\ncompte épargne"
172173
},
173174
"spending": {
174-
"title": "Dépenser"
175+
"title": "Dépenser",
176+
"onboarding": "<accent>Envoyer\nles bitcoins</accent>\nsur votre\ncompte courant"
175177
},
176178
"details_transfer_subtitle": "Transfert entrant",
177179
"tx_invalid": "Transaction invalide",

src/utils/i18n/locales/it/onboarding.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"tos_header": "Bitkit\n<accent>termini di utilizzo</accent>",
33
"tos_checkbox": "Termini di Utilizzo",
4-
"tos_checkbox_value": "Dichiaro di aver letto e di accettare i <accent>termini di utilizzo.</accent>",
54
"pp_checkbox": "Informativa Privacy",
65
"pp_checkbox_value": "Dichiaro di aver letto e di accettare <accent>l'informativa sulla privacy.</accent>",
76
"welcome_title": "Puoi essere \n<accent>il cambiamento</accent>",

src/utils/i18n/locales/pt_BR/onboarding.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"tos_header": "Bitkit\n<accent>termos de uso</accent>",
33
"tos_checkbox": "Termos de uso",
4-
"tos_checkbox_value": "Declaro que li e aceito os <accent>termos de uso.</accent>",
54
"pp_checkbox": "Política de Privacidade",
65
"pp_checkbox_value": "Declaro que li e aceito a <accent>política de privacidade.</accent>",
76
"welcome_title": "Você pode ser \n<accent>a mudança</accent>",

src/utils/i18n/locales/ru/onboarding.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"tos_header": "Bitkit\n<accent>условия использования</accent>",
33
"tos_checkbox": "Условия использования",
4-
"tos_checkbox_value": "Я подтверждаю, что прочитал и принимаю <accent>условия использования.</accent>",
54
"pp_checkbox": "Политика Конфиденциальности",
65
"pp_checkbox_value": "Я подтверждаю, что прочитал и принимаю <accent>политику конфиденциальности.</accent>",
76
"welcome_title": "С вами начинается <accent>изменение</accent>",

0 commit comments

Comments
 (0)