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

fix: Update settings copy for Blockaid feature #7796

Merged
merged 3 commits into from
Nov 15, 2023
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

Large diffs are not rendered by default.

79 changes: 52 additions & 27 deletions app/components/Views/Settings/ExperimentalSettings/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
ScrollView,
StyleSheet,
Switch,
Text,
View,
} from 'react-native';
import { strings } from '../../../../../locales/i18n';
Expand All @@ -14,6 +13,10 @@ import {
fontStyles,
} from '../../../../styles/common';
import { useTheme } from '../../../../util/theme';
import Text, {
TextVariant,
TextColor,
} from '../../../../component-library/components/Texts/Text';
import { getNavigationOptionsTitle } from '../../../UI/Navbar';
import StyledButton from '../../../UI/StyledButton';
import SECURITY_ALERTS_TOGGLE_TEST_ID from './constants';
Expand All @@ -31,8 +34,6 @@ const createStyles = (colors: any) =>
},
title: {
...(fontStyles.normal as any),
color: colors.text.default,
fontSize: 20,
lineHeight: 20,
paddingTop: 4,
marginTop: -4,
Expand All @@ -43,23 +44,15 @@ const createStyles = (colors: any) =>
marginBottom: 18,
},
heading: {
...fontStyles.normal,
marginTop: 18,
fontSize: 24,
lineHeight: 20,
},
desc: {
...(fontStyles.normal as any),
color: colors.text.alternative,
fontSize: 14,
lineHeight: 20,
marginTop: 12,
},
mutedText: {
...(fontStyles.normal as any),
color: colors.text.muted,
},
setting: {
marginVertical: 18,
marginVertical: 16,
},
clearHistoryConfirm: {
marginTop: 18,
Expand All @@ -68,13 +61,12 @@ const createStyles = (colors: any) =>
display: 'flex',
justifyContent: 'space-between',
flexDirection: 'row',
alignItems: 'center',
marginBottom: 5,
},
switch: {
alignSelf: 'flex-end',
},
switchLabel: {
alignSelf: 'flex-start',
},
modalView: {
alignItems: 'center',
flex: 1,
Expand Down Expand Up @@ -155,10 +147,18 @@ const ExperimentalSettings = ({ navigation, route }: Props) => {

const WalletConnectSettings: FC = () => (
<>
<Text style={styles.title}>
<Text
color={TextColor.Default}
variant={TextVariant.HeadingMD}
style={styles.title}
>
{strings('experimental_settings.wallet_connect_dapps')}
</Text>
<Text style={styles.desc}>
<Text
color={TextColor.Alternative}
variant={TextVariant.BodyMD}
style={styles.desc}
>
{strings('experimental_settings.wallet_connect_dapps_desc')}
</Text>
<StyledButton
Expand All @@ -173,22 +173,42 @@ const ExperimentalSettings = ({ navigation, route }: Props) => {

const BlockaidSettings: FC = () => (
<>
<Text style={[styles.title, styles.heading]}>
<Text
color={TextColor.Default}
variant={TextVariant.HeadingLG}
style={styles.heading}
>
{strings('app_settings.security_heading')}
</Text>
<View style={styles.setting}>
<Text style={styles.title}>
<Text
color={TextColor.Default}
variant={TextVariant.HeadingMD}
style={styles.title}
>
{strings('experimental_settings.security_alerts')}
</Text>
<Text style={styles.desc}>
<Text
color={TextColor.Alternative}
variant={TextVariant.BodyMD}
style={styles.desc}
>
{strings('experimental_settings.security_alerts_desc')}
</Text>
<Text style={[styles.title, styles.boldTitle]}>
{strings('experimental_settings.select_providers')}
</Text>
</View>
<Text
color={TextColor.Default}
variant={TextVariant.HeadingSM}
style={styles.boldTitle}
>
{strings('experimental_settings.select_provider')}
</Text>
<View style={styles.switchElement}>
<Text style={[styles.switchLabel, styles.title]}>
<Text
color={TextColor.Default}
variant={TextVariant.HeadingSMRegular}
style={styles.title}
>
{strings('experimental_settings.blockaid')}
</Text>
<Switch
Expand All @@ -204,8 +224,13 @@ const ExperimentalSettings = ({ navigation, route }: Props) => {
testID={SECURITY_ALERTS_TOGGLE_TEST_ID}
/>
</View>
<Text style={[styles.title, styles.mutedText]}>
{strings('experimental_settings.moreProviders')}

<Text
color={TextColor.Alternative}
variant={TextVariant.BodyMD}
style={styles.title}
>
{strings('experimental_settings.blockaid_desc')}
</Text>
</>
);
Expand Down
3 changes: 0 additions & 3 deletions locales/languages/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,7 @@
"wallet_connect_dapps_cta": "SITZUNGEN ANSEHEN",
"network_not_supported": "Aktuelles Netzwerk nicht unterstützt",
"security_alerts": "Sicherheitsbenachrichtigungen",
"security_alerts_desc": "Diese Funktion warnt Sie vor schädlichen Aktivitäten, indem sie Ihre Transaktionen und Signaturanfragen lokal überprüft. Ihre Daten werden dazu nicht an Dritte weitergegeben, die diesen Dienst anbieten. Denken Sie immer an Ihre eigene Sorgfaltspflicht, bevor Sie Anfragen genehmigen, denn es gibt keine Garantie dafür, dass diese Funktion alle schädlichen Aktivitäten auch tatsächlich erkennt.",
"select_providers": "Anbieter auswählen",
"blockaid": "Blockaid",
"moreProviders": "Mehr Anbieter in Kürze",
"switch_network": "Bitte wechseln Sie auf Mainnet oder Sepolia."
},
"walletconnect_sessions": {
Expand Down
3 changes: 0 additions & 3 deletions locales/languages/el.json
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,7 @@
"wallet_connect_dapps_cta": "ΠΡΟΒΟΛΗ ΣΥΝΕΔΡΙΩΝ",
"network_not_supported": "Το τρέχον δίκτυο δεν υποστηρίζεται",
"security_alerts": "Ειδοποιήσεις ασφαλείας",
"security_alerts_desc": "Αυτή η λειτουργία σας προειδοποιεί για κακόβουλη δραστηριότητα, καθώς εξετάζει τοπικά τις συναλλαγές και τα αιτήματα υπογραφής σας. Τα δεδομένα σας δεν κοινοποιούνται σε τρίτους που παρέχουν αυτή την υπηρεσία. Πάντα να προβαίνετε σε δικό σας επιμελή έλεγχο προτού εγκρίνετε οποιαδήποτε αιτήματα. Δεν υπάρχει καμία εγγύηση ότι αυτή η λειτουργία θα εντοπίσει όλες τις κακόβουλες δραστηριότητες.",
"select_providers": "Επιλέξτε παρόχους",
"blockaid": "Blockaid",
"moreProviders": "Περισσότεροι πάροχοι θα προστεθούν σύντομα",
"switch_network": "Παρακαλούμε μεταβείτε στο mainnet ή το sepolia"
},
"walletconnect_sessions": {
Expand Down
6 changes: 3 additions & 3 deletions locales/languages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1739,10 +1739,10 @@
"wallet_connect_dapps_cta": "VIEW SESSIONS",
"network_not_supported": "Current network not supported",
"security_alerts": "Security alerts",
"security_alerts_desc": "This feature alerts you to malicious activity by locally reviewing your transactions and signature requests. Your data isn't shared with the third parties providing this service. Always do your own due diligence before approving any requests. Theres no guarantee that this feature will detect all malicious activity.",
"select_providers": "Select providers",
"security_alerts_desc": "This feature alerts you to malicious activity by locally reviewing your transaction and signature requests. Always do your own due diligence before approving any requests. There's no guarantee that this feature will detect all malicious activity. By enabling this feature you agree to the provider's terms of use.",
"select_provider": "Select your preferred provider",
"blockaid": "Blockaid",
"moreProviders": "More providers coming soon",
"blockaid_desc": "Privacy preserving - no data is shared with third parties. Available on Ethereum Mainnet.",
"switch_network": "Please switch to mainnet or sepolia"
},
"walletconnect_sessions": {
Expand Down
3 changes: 0 additions & 3 deletions locales/languages/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,7 @@
"wallet_connect_dapps_cta": "VER SESIONES",
"network_not_supported": "No se admite la red actual",
"security_alerts": "Alertas de seguridad",
"security_alerts_desc": "Esta característica lo alerta sobre actividad maliciosa al revisar localmente sus transacciones y solicitudes de firma. Sus datos no se comparten con los terceros que brindan este servicio. Siempre haga su propia diligencia debida antes de aprobar cualquier solicitud. No hay garantía de que esta característica detecte toda la actividad maliciosa.",
"select_providers": "Seleccionar proveedores",
"blockaid": "Blockaid",
"moreProviders": "Próximamente más proveedores",
"switch_network": "Cambie a la red principal o a Sepolia"
},
"walletconnect_sessions": {
Expand Down
3 changes: 0 additions & 3 deletions locales/languages/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,7 @@
"wallet_connect_dapps_cta": "VOIR LES SESSIONS",
"network_not_supported": "Le réseau actuel n’est pas pris en charge",
"security_alerts": "Alertes de sécurité",
"security_alerts_desc": "Cette fonctionnalité vous avertit de toute activité malveillante en examinant localement vos transactions et vos demandes de signature. Vos données ne sont pas partagées avec les tiers qui fournissent ce service. Vous devez faire preuve de diligence raisonnable avant d’approuver toute demande. Rien ne garantit que toutes les activités malveillantes seront détectées par cette fonctionnalité.",
"select_providers": "Sélectionner les fournisseurs",
"blockaid": "Blockaid",
"moreProviders": "D’autres fournisseurs seront bientôt disponibles",
"switch_network": "Veuillez passer à Mainnet ou à Sepolia"
},
"walletconnect_sessions": {
Expand Down
3 changes: 0 additions & 3 deletions locales/languages/hi.json
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,7 @@
"wallet_connect_dapps_cta": "सत्र देखें",
"network_not_supported": "वर्तमान नेटवर्क समर्थन नहीं करता",
"security_alerts": "सुरक्षा चेतावनियाँ",
"security_alerts_desc": "यह सुविधा आपके लेनदेन और सिग्नेचर रिक्वेस्ट का लोकल रिव्यु करके आपको बुरी नीयत वाली गतिविधि के प्रति अलर्ट करता है। जो थर्ड पार्टी यह सर्विस देते हैं उनके साथ आपका डेटा शेयर नहीं किया जाता है। किसी भी रिक्वेस्ट को मंजूरी देने से पहले हमेशा पूरी जांच-पड़ताल ज़रूर करें। इस बात की कोई गारंटी नहीं है कि इस सुविधा के माध्यम से बुरी नीयत से की गई सभी गतिविधि का पता लगाया जा सकेगा।",
"select_providers": "प्रदाताओं को चुनें:",
"blockaid": "Blockaid",
"moreProviders": "और प्रदाता जल्द ही आ रहे हैं",
"switch_network": "कृपया Mainnet या sepolia पर बदलें"
},
"walletconnect_sessions": {
Expand Down
3 changes: 0 additions & 3 deletions locales/languages/id.json
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,7 @@
"wallet_connect_dapps_cta": "LIHAT SESI",
"network_not_supported": "Tidak mendukung jaringan saat ini",
"security_alerts": "Peringatan keamanan",
"security_alerts_desc": "Fitur ini memberi tahu Anda seputar aktivitas berbahaya dengan meninjau transaksi dan permintaan tanda tangan Anda secara lokal. Data Anda tidak dibagikan kepada pihak ketiga yang menyediakan layanan ini. Selalu lakukan uji tuntas sendiri sebelum menyetujui permintaan apa pun. Tidak ada jaminan bahwa fitur ini akan mendeteksi semua aktivitas berbahaya.",
"select_providers": "Pilih penyedia",
"blockaid": "Blockaid",
"moreProviders": "Penyedia lainnya akan segera hadir",
"switch_network": "Harap beralih ke mainnet atau sepolia"
},
"walletconnect_sessions": {
Expand Down
3 changes: 0 additions & 3 deletions locales/languages/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,7 @@
"wallet_connect_dapps_cta": "セッションを表示",
"network_not_supported": "現在のネットワークはサポートされていません",
"security_alerts": "セキュリティアラート",
"security_alerts_desc": "この機能は、トランザクションと署名リクエストをローカルで確認することで、悪質な行為に対する警告を発します。ユーザーのデータはこのサービスを提供するサードパーティと共有されません。リクエストを承認する前に、必ず独自のデューデリジェンスを行ってください。この機能がすべての悪質な行為を検出するという保証はありません。",
"select_providers": "プロバイダーを選択してください",
"blockaid": "Blockaid",
"moreProviders": "他のプロバイダーも近日追加予定...",
"switch_network": "メインネットまたはSepoliaに切り替えてください"
},
"walletconnect_sessions": {
Expand Down
3 changes: 0 additions & 3 deletions locales/languages/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,7 @@
"wallet_connect_dapps_cta": "세션 확인",
"network_not_supported": "현재 네트워크는 지원하지 않음",
"security_alerts": "보안 경고",
"security_alerts_desc": "이 기능은 트랜잭션 및 서명 요청을 로컬에서 검토하여 악의적인 활동이 있는 경우 경고합니다. 사용자 데이터는 이 서비스를 제공하는 타사와 공유되지 않습니다. 요청을 승인하기 전에 항상 직접 확인하세요. 이 기능이 모든 악의적인 활동 탐지를 보장하는 것은 아닙니다.",
"select_providers": "공급업체 선택",
"blockaid": "Blockaid",
"moreProviders": "더 많은 업체가 곧 추가됩니다",
"switch_network": "메인넷이나 세폴리아로 전환하세요"
},
"walletconnect_sessions": {
Expand Down
3 changes: 0 additions & 3 deletions locales/languages/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,7 @@
"wallet_connect_dapps_cta": "VER SESSÕES",
"network_not_supported": "Rede atual não compatível",
"security_alerts": "Alertas de segurança",
"security_alerts_desc": "Esse recurso alerta sobre atividades mal-intencionadas ao analisar localmente suas transações e solicitações de assinatura. Seus dados não são compartilhados com os terceiros prestadores do serviço. Sempre faça sua própria devida diligência antes de aprovar qualquer solicitação. Não há garantia de que esse recurso detectará toda e qualquer atividade mal-intencionada.",
"select_providers": "Selecionar provedores",
"blockaid": "Blockaid",
"moreProviders": "Mais provedores em breve",
"switch_network": "Alterne para a Mainnet ou Sepolia"
},
"walletconnect_sessions": {
Expand Down
3 changes: 0 additions & 3 deletions locales/languages/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,7 @@
"wallet_connect_dapps_cta": "ПРОСМОТР СЕАНСОВ",
"network_not_supported": "Текущая сеть не поддерживается",
"security_alerts": "Оповещения безопасности",
"security_alerts_desc": "Эта функция предупреждает вас о вредоносных действиях, локально просматривая ваши транзакции и запросы подписания. Ваши данные не передаются третьим сторонам, предоставляющим эту услугу. Всегда проводите комплексную проверку, прежде чем одобрять какие-либо запросы. Нет гарантии, что эта функция обнаружит все вредоносные действия.",
"select_providers": "Выберите поставщиков",
"blockaid": "Blockaid",
"moreProviders": "Скоро появится больше...",
"switch_network": "Переключитесь на мейн-нет или Sepolia"
},
"walletconnect_sessions": {
Expand Down
3 changes: 0 additions & 3 deletions locales/languages/tl.json
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,7 @@
"wallet_connect_dapps_cta": "TINGNAN ANG MGA SESSION",
"network_not_supported": "Hindi sinusuportahan ang kasalukuyang network",
"security_alerts": "Mga alerto sa seguridad",
"security_alerts_desc": "Ang feature na ito ay nagbibigay ng alerto sa iyo sa mapaminsalang aktibidad sa pamamagitan ng lokal na pagsusuri sa iyong mga transaksyon at kahilingan sa paglagda. Ang iyong data ay hindi ibinabahagi sa mga third party na nagbibigay ng serbisyong ito. Palaging gumawa ng sarili mong pagsusuri bago aprubahan ang anumang mga kahilingan. Walang garantiya na made-detect ng feature na ito ang lahat ng mapaminsalang aktibidad.",
"select_providers": "Pumili ng mga provider",
"blockaid": "Blockaid",
"moreProviders": "Marami pang parating na mga provider",
"switch_network": "Mangyaring lumipat sa mainnet o sepolia"
},
"walletconnect_sessions": {
Expand Down
3 changes: 0 additions & 3 deletions locales/languages/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,7 @@
"wallet_connect_dapps_cta": "OTURUMLARI GÖRÜNTÜLE",
"network_not_supported": "Geçerli ağ desteklenmiyor",
"security_alerts": "Güvenlik uyarıları",
"security_alerts_desc": "Bu özellik, işlemlerinizi ve imza taleplerinizi yerel olarak inceleyerek sizi kötü amaçlı aktivitelere karşı uyarır. Verileriniz bu hizmeti sunan üçüncü taraflarla paylaşılmaz. Herhangi bir talebi onaylamadan önce kendiniz daima gerekli özeni gösterin. Bu özelliğin tüm kötü amaçlı aktiviteleri algılayacağına dair herhangi bir garanti söz konusu değildir.",
"select_providers": "Sağlayıcıları seç",
"blockaid": "Blockaid",
"moreProviders": "Daha fazlası çok yakında",
"switch_network": "Lütfen ana ağa veya sepolia ağına geçin"
},
"walletconnect_sessions": {
Expand Down
3 changes: 0 additions & 3 deletions locales/languages/vi.json
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,7 @@
"wallet_connect_dapps_cta": "XEM PHIÊN",
"network_not_supported": "Không hỗ trợ mạng hiện tại",
"security_alerts": "Cảnh báo bảo mật",
"security_alerts_desc": "Tính năng này sẽ cảnh báo cho bạn khi có hoạt động độc hại bằng cách xem xét cục bộ các giao dịch và yêu cầu chữ ký của bạn. Dữ liệu của bạn không được chia sẻ với các bên thứ ba cung cấp dịch vụ này. Luôn tự thẩm định trước khi chấp thuận bất kỳ yêu cầu nào. Không có gì đảm bảo rằng tính năng này sẽ phát hiện được tất cả các hoạt động độc hại.",
"select_providers": "Chọn nhà cung cấp",
"blockaid": "Blockaid",
"moreProviders": "Sắp có thêm các nhà cung cấp khác",
"switch_network": "Vui lòng chuyển qua mạng chính hoặc sepolia"
},
"walletconnect_sessions": {
Expand Down
3 changes: 0 additions & 3 deletions locales/languages/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,7 @@
"wallet_connect_dapps_cta": "查看会话",
"network_not_supported": "不支持当前网络",
"security_alerts": "安全警报",
"security_alerts_desc": "此功能会在本地检查您的交易和签名请求,如有恶意活动就会向您发出警报。您的数据不会与提供此服务的第三方共享。在批准任何请求之前,均必须自行作出审慎调查。无法保证此功能可以检测到所有恶意活动。",
"select_providers": "选择提供商",
"blockaid": "Blockaid",
"moreProviders": "更多提供商即将加入",
"switch_network": "请切换为 mainnet 或 sepolia"
},
"walletconnect_sessions": {
Expand Down
Loading