This commit is contained in:
Marcos Rodriguez Vélez 2022-07-18 17:13:40 -04:00 committed by Overtorment
parent 584ef6b89d
commit 6a42b50cff
33 changed files with 11 additions and 207 deletions

View file

@ -42,7 +42,6 @@ import ViewEditMultisigCosigners from './screen/wallets/viewEditMultisigCosigner
import WalletXpub from './screen/wallets/xpub';
import SignVerify from './screen/wallets/signVerify';
import WalletAddresses from './screen/wallets/addresses';
import Marketplace from './screen/wallets/marketplace';
import ReorderWallets from './screen/wallets/reorderWallets';
import SelectWallet from './screen/wallets/selectWallet';
import ProvideEntropy from './screen/wallets/provideEntropy';
@ -469,8 +468,6 @@ const ExportMultisigCoordinationSetupRoot = () => {
const RootStack = createNativeStackNavigator();
const NavigationDefaultOptions = { headerShown: false, stackPresentation: isDesktop ? 'containedModal' : 'modal' };
const Navigation = () => {
const theme = useTheme();
return (
<RootStack.Navigator initialRouteName="UnlockWithScreenRoot" screenOptions={{ headerHideShadow: true }}>
{/* stacks */}
@ -490,7 +487,6 @@ const Navigation = () => {
<RootStack.Screen name="ViewEditMultisigCosignersRoot" component={ViewEditMultisigCosignersRoot} options={NavigationDefaultOptions} />
<RootStack.Screen name="WalletXpubRoot" component={WalletXpubStackRoot} options={NavigationDefaultOptions} />
<RootStack.Screen name="SignVerifyRoot" component={SignVerifyStackRoot} options={NavigationDefaultOptions} />
<RootStack.Screen name="Marketplace" component={Marketplace} options={Marketplace.navigationOptions(theme)} />
<RootStack.Screen name="SelectWallet" component={SelectWallet} />
<RootStack.Screen name="ReceiveDetailsRoot" component={ReceiveDetailsStackRoot} options={NavigationDefaultOptions} />
<RootStack.Screen name="LappBrowserRoot" component={LappBrowserStackRoot} options={NavigationDefaultOptions} />

View file

@ -446,9 +446,9 @@ PODS:
- React-RCTImage
- RNSecureKeyStore (1.0.0):
- React
- RNShare (7.6.4):
- RNShare (7.6.6):
- React-Core
- RNSVG (12.3.0):
- RNSVG (12.4.0):
- React-Core
- RNVectorIcons (9.2.0):
- React-Core
@ -811,8 +811,8 @@ SPEC CHECKSUMS:
RNReanimated: b5b17149593e7c05e4ec5c0efea1f21e05829510
RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7
RNSecureKeyStore: f1ad870e53806453039f650720d2845c678d89c8
RNShare: 4406f61af043027b695c3a0b8f39e2c2bdacde12
RNSVG: 302bfc9905bd8122f08966dc2ce2d07b7b52b9f8
RNShare: d56424e3926cbc239db1cc1c168adcb051aad50b
RNSVG: 3dd44d99d1c18e1342aee4bfa53ab3f6a8c4865f
RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
RNWatch: dae6c858a2051dbdcfb00b9a86cf4d90400263b4
SwiftSocket: c8d482e867ae4d3eb4c769e9382e123c1f1f833b

View file

@ -416,7 +416,6 @@
"details_derivation_path": "مسار الاشتقاق (derivation path)",
"details_display": "العرض في قائمة المحافظ",
"details_export_backup": "التصدير/النسخ الاحتياطي",
"details_marketplace": "المتجر",
"details_master_fingerprint": "بصمة الإصبع الرئيسية",
"details_ms_l": "{m} of {n} legacy (p2sh)",
"details_ms_ns": "{m} of {n} native segwit (p2wsh)",
@ -470,7 +469,6 @@
"list_long_choose": "اختيار صورة",
"list_long_clipboard": "النسخ من الحافظة",
"list_long_scan": "مسح رمز الاستجابة السرعة ضوئيًا",
"list_marketplace": "المتجر",
"list_title": "المحافظ",
"list_tryagain": "إعادة المحاولة",
"no_ln_wallet_error": "قبل دفع فاتورة برق (Lightning) ، يجب عليك أولاً إضافة محفظة برق (Lightning).",

View file

@ -416,7 +416,6 @@
"details_derivation_path": "derivační cesta",
"details_display": "Zobrazit v seznamu peněženek",
"details_export_backup": "Exportovat / zálohovat",
"details_marketplace": "Tržiště",
"details_master_fingerprint": "Hlavní otisk",
"details_ms_l": "{m} z {n} legacy (p2sh)",
"details_ms_ns": "{m} z {n} native segwit (p2wsh)",
@ -470,7 +469,6 @@
"list_long_choose": "Vybrat fotku",
"list_long_clipboard": "Kopírovat ze schránky",
"list_long_scan": "Naskenovat QR kód",
"list_marketplace": "Tržiště",
"list_title": "Peněženky",
"list_tryagain": "Zkuste to znovu",
"no_ln_wallet_error": "Před zaplacením Lightning faktury musíte nejprve přidat Lightning peněženku.",

View file

@ -181,7 +181,6 @@
"details_connected_to": "Wedi cysylltu efo",
"details_delete": "Gwaredu",
"details_delete_wallet": "Gwaredu Waled",
"details_marketplace": "Marchnad",
"details_no_cancel": "Na, canslo",
"details_save": "Safio",
"details_show_addresses": "Dangos cyfeiriadau",
@ -202,7 +201,6 @@
"list_latest_transaction": "Trafodyn Diweddaraf",
"list_long_choose": "Dewis Llun",
"list_long_clipboard": "Copio o'r Clipfwrdd",
"list_marketplace": "Marchnad",
"list_title": "Waledi",
"list_tryagain": "Trio eto",
"select_wallet": "Dewis waled",

View file

@ -416,7 +416,6 @@
"details_derivation_path": "Ableitungspfad",
"details_display": "In Wallet-Liste anzeigen",
"details_export_backup": "Exportieren / Backup",
"details_marketplace": "Marktplatz",
"details_master_fingerprint": "Fingerabdruckkennung",
"details_ms_l": "{m} von {n} Altformat (p2sh)",
"details_ms_ns": "{m} von {n} native segwit (p2wsh)",
@ -470,7 +469,6 @@
"list_long_choose": "Foto auswählen",
"list_long_clipboard": "Aus der Zwischenablage kopieren",
"list_long_scan": "QR Code scannen",
"list_marketplace": "Marktplatz",
"list_title": "Wallets",
"list_tryagain": "Nochmal versuchen",
"no_ln_wallet_error": "Vor Bezahlung einer Lightning Rechnung zuerst ein Lightning wallet eröffnen.",

View file

@ -79,7 +79,6 @@
"potentialFee": "Potential Fee: {fee}",
"remote_host": "Remote host",
"refill": "Refill",
"refill_card": "Refill with Bank Card",
"reconnect_peer": "Reconnect peer",
"refill_create": "In order to proceed, please create a Bitcoin wallet to refill with.",
"refill_external": "Refill with External Wallet",
@ -417,7 +416,6 @@
"details_derivation_path": "derivation path",
"details_display": "Display in Wallets List",
"details_export_backup": "Export/Backup",
"details_marketplace": "Marketplace",
"details_master_fingerprint": "Master Fingerprint",
"details_ms_l": "{m} of {n} legacy (p2sh)",
"details_ms_ns": "{m} of {n} native segwit (p2wsh)",
@ -471,8 +469,6 @@
"list_long_choose": "Choose Photo",
"list_long_clipboard": "Copy from Clipboard",
"list_long_scan": "Scan QR Code",
"list_marketplace": "Marketplace",
"list_tap_here_to_buy": "Buy Bitcoin",
"list_title": "Wallets",
"list_tryagain": "Try again",
"no_ln_wallet_error": "Before paying a Lightning invoice, you must first add a Lightning wallet.",

View file

@ -408,7 +408,6 @@
"details_derivation_path": "ruta de derivación",
"details_display": "mostrar en la lista de carteras",
"details_export_backup": "Exportar / Guardar",
"details_marketplace": "Marketplace",
"details_master_fingerprint": "Huella dactilar maestra",
"details_ms_l": "{m} de {n} legacy (p2sh)",
"details_ms_ns": "{m} de {n} segwit nativo (p2wsh)",
@ -462,7 +461,6 @@
"list_long_choose": "Elegir foto",
"list_long_clipboard": "Copiar del portapapeles",
"list_long_scan": "Escanear código QR",
"list_marketplace": "Mercado",
"list_title": "Carteras",
"list_tryagain": "Inténtalo otra vez",
"no_ln_wallet_error": "Antes de pagar una factura Lightning, primero debe agregar una cartera Lightning.",

View file

@ -416,7 +416,6 @@
"details_derivation_path": "ruta de derivación",
"details_display": "Mostrar en la lista de Billeteras",
"details_export_backup": "Exportar / Copia de seguridad",
"details_marketplace": "Mercado",
"details_master_fingerprint": "Huella Digital Maestra",
"details_ms_l": "{m} de {n} heredado (p2sh)",
"details_ms_ns": "{m} de {n} segwit nativo (p2wsh)",
@ -470,7 +469,6 @@
"list_long_choose": "Elige una Foto",
"list_long_clipboard": "Copiar desde el Portapapeles",
"list_long_scan": "Escanear Código QR",
"list_marketplace": "Mercado",
"list_title": "Billeteras",
"list_tryagain": "Intenta otra vez",
"no_ln_wallet_error": "Antes de pagar una factura Lightning, primero debes agregar una billetera Lightning.",

View file

@ -411,7 +411,6 @@
"details_derivation_path": "johdantopolku",
"details_display": "näkyy lompakkojen listassa",
"details_export_backup": "Vie / varmuuskopioi",
"details_marketplace": "Kauppapaikka",
"details_master_fingerprint": "Pää sormenjälki",
"details_ms_l": "{m} / {n} legacy (p2sh)",
"details_ms_ns": "{m} / {n} native segwit (p2wsh)",
@ -465,7 +464,6 @@
"list_long_choose": "Valitse Kuva",
"list_long_clipboard": "Kopioi Leikepöydältä",
"list_long_scan": "Skannaa QR-koodi",
"list_marketplace": "Kauppapaikka",
"list_title": "lompakot",
"list_tryagain": "Yritä uudelleen",
"no_ln_wallet_error": "Ennen kuin maksat Lightning-laskun, sinun on ensin lisättävä Lightning-lompakko.",

View file

@ -416,7 +416,6 @@
"details_derivation_path": "chemin de dérivation",
"details_display": "Afficher dans la list des portefeuilles",
"details_export_backup": "Exporter / sauvegarder",
"details_marketplace": "Marketplace",
"details_master_fingerprint": "Empreinte maitresse",
"details_ms_l": "{m} de {n} legacy (p2sh)",
"details_ms_ns": "{m} de {n} native segwit (p2wsh)",
@ -470,7 +469,6 @@
"list_long_choose": "Choisir une photo",
"list_long_clipboard": "Copier depuis le presse-papier",
"list_long_scan": "Scanner le QR Code",
"list_marketplace": "Place de marché",
"list_title": "portefeuilles",
"list_tryagain": "Réessayer",
"no_ln_wallet_error": "Avant de payer une facture Ligthning, vous devez créer un portefeuille Ligthning.",

View file

@ -413,7 +413,6 @@
"details_derivation_path": "נתיב גזירה",
"details_display": "הצגה ברשימת ארנקים",
"details_export_backup": "יצוא / גיבוי",
"details_marketplace": "שוק",
"details_master_fingerprint": "טביעת אצבע ראשית",
"details_ms_l": "{m} מתוך {n} legacy (p2sh)",
"details_ms_ns": "{m} מתוך {n} native segwit (p2wsh)",
@ -467,7 +466,6 @@
"list_long_choose": "בחר תמונה",
"list_long_clipboard": "העתקה מלוח",
"list_long_scan": "סריקת קוד QR",
"list_marketplace": "שוק",
"list_title": "ארנקים",
"list_tryagain": "נסו שוב",
"no_ln_wallet_error": "לפני תשלום חשבונית ברק, עלייך להוסיף ארנק ברק.",

View file

@ -411,7 +411,6 @@
"details_derivation_path": "derivációs út",
"details_display": "mutasd a tárcák listáján",
"details_export_backup": "Exportálás / Biztonsági mentés",
"details_marketplace": "Piac",
"details_master_fingerprint": "Mester ujjlenyomat ",
"details_ms_l": "{m} a {n}-ból/ből legacy (p2sh)",
"details_ms_ns": "{m} a {n}-ból/ből native segwit (p2wsh)",
@ -465,7 +464,6 @@
"list_long_choose": "Válassz fényképet",
"list_long_clipboard": "Másolás vágólapról",
"list_long_scan": "QR kód szkennelése",
"list_marketplace": "Piactér",
"list_title": "tárcák",
"list_tryagain": "Próbáld újra",
"no_ln_wallet_error": "Mielőtt tudnál fizetni a villámhálózaton, először egy Lightning tárcát kell létrehoznod vagy betöltened.",

View file

@ -402,7 +402,6 @@
"details_derivation_path": "derivation path",
"details_display": "Mostra la lista dei portafogli",
"details_export_backup": "Esporta / Backup",
"details_marketplace": "Mercato",
"details_ms_l": "{m} su {n} legacy (p2sh)",
"details_ms_ns": "{m} su {n} segwit nativo (p2wsh)",
"details_ms_ws": "{m} su {n} segwit avvolto (p2sh-p2wsh)",
@ -436,7 +435,6 @@
"list_latest_transaction": "Transazioni recenti",
"list_long_clipboard": "Copia dagli appunti",
"list_long_scan": "Scansiona un codice QR",
"list_marketplace": "Mercato",
"list_title": "Portafogli",
"list_tryagain": "Riprova",
"reorder_title": "Riordina Portafogli",

View file

@ -309,7 +309,6 @@
"details_derivation_path": "派生パス(derivation path)",
"details_display": "ウォレットリストで表示",
"details_export_backup": "エクスポート / バックアップ",
"details_marketplace": "マーケットプレイス",
"details_master_fingerprint": "マスタフィンガープリント",
"details_no_cancel": "いいえ、中止します",
"details_save": "保存",
@ -341,7 +340,6 @@
"list_long_choose": "写真選択",
"list_long_clipboard": "クリップボードからコピー",
"list_long_scan": "QRコードをスキャン",
"list_marketplace": "Marketplace",
"list_title": "ウォレット",
"list_tryagain": "再度試す",
"looks_like_bip38": "パスワード保護された秘密鍵(BIP38)のようです。",

View file

@ -415,7 +415,6 @@
"details_derivation_path": "유도 경로",
"details_display": "지갑 목록에 표시",
"details_export_backup": "보내기/백업",
"details_marketplace": "시장",
"details_master_fingerprint": "마스터 지문",
"details_ms_l": "{n}중의 {m} 레거시 (p2sh)",
"details_ms_ns": "{n}중의 {m} 네이티브 세그윗 (p2wsh)",
@ -469,7 +468,6 @@
"list_long_choose": "사진 선택하기",
"list_long_clipboard": "클립보드에서 복사",
"list_long_scan": "QR 코드 스캔",
"list_marketplace": "시장",
"list_title": "지갑",
"list_tryagain": "다시 시도하기",
"no_ln_wallet_error": "라이트닝 청구서를 지불하기 전 먼저 라이트닝 지갑을 추가해야 합니다.",

View file

@ -393,7 +393,6 @@
"details_derivation_path": "laluan terbitan",
"details_display": "Paparkan di dalam Senarai Dompet",
"details_export_backup": "Pindahkan Keluar/Sandarkan",
"details_marketplace": "Pasaran",
"details_master_fingerprint": "Cap Jari Induk",
"details_ms_l": "{m} daripada {n} warisan (p2sh)",
"details_ms_ns": "{m} daripada {n} segwit asal (p2wsh)",
@ -435,7 +434,6 @@
"list_long_choose": "Pilih Gambar",
"list_long_clipboard": "Salin dari Papan Sepit",
"list_long_scan": "Imbas Kod QR",
"list_marketplace": "Pasaran",
"list_title": "Dompet",
"list_tryagain": "Cuba lagi",
"no_ln_wallet_error": "Sebelum membayar invois Lightning, anda perlu menambah dompet Lightning terlebih dahulu.",

View file

@ -411,7 +411,6 @@
"details_derivation_path": "Derivatiepad",
"details_display": "Toon in wallet-lijst",
"details_export_backup": "Exporteren / back-up maken",
"details_marketplace": "Marktplaats",
"details_master_fingerprint": "Master vingerafdruk",
"details_ms_l": "{m} van {n} legacy (p2sh)",
"details_ms_ns": "{m} van {n} native segwit (p2wsh)",
@ -465,7 +464,6 @@
"list_long_choose": "Kies foto",
"list_long_clipboard": "Kopiëren van klembord",
"list_long_scan": "Scan QR-code",
"list_marketplace": "Marktplaats",
"list_title": "Wallets",
"list_tryagain": "Probeer opnieuw",
"no_ln_wallet_error": "Voordat u een Lightning-factuur betaalt, moet u eerst een Lightning-wallet toevoegen.",

View file

@ -416,7 +416,6 @@
"details_derivation_path": "ścieżka derywacji",
"details_display": "Pokaż na liście portfeli",
"details_export_backup": "Eksport/Kopia zapasowa",
"details_marketplace": "Rynek",
"details_master_fingerprint": "Główny odcisk palca",
"details_ms_l": "{m} z {n} starego typu (p2sh)",
"details_ms_ns": "{m} z {n} natywny segwit (p2wsh)",
@ -470,7 +469,6 @@
"list_long_choose": "Wybierz zdjęcie",
"list_long_clipboard": "Kopiuj ze schowka",
"list_long_scan": "Zeskanuj kod QR",
"list_marketplace": "Rynek",
"list_title": "Portfele",
"list_tryagain": "Spróbuj ponownie",
"no_ln_wallet_error": "Musisz najpierw dodać portfel Lightning, zanim zapłacisz fakturę.",

View file

@ -411,7 +411,6 @@
"details_derivation_path": "path de derivação",
"details_display": "Exibir na lista de carteiras",
"details_export_backup": "Exportar / backup",
"details_marketplace": "Mercado",
"details_master_fingerprint": "Master fingerprint",
"details_ms_l": "{m} de {n} legacy (p2sh)",
"details_ms_ns": "{m} de {n} segwit nativo (p2wsh)",
@ -465,7 +464,6 @@
"list_long_choose": "Escolher foto",
"list_long_clipboard": "Copiar da área de transferência",
"list_long_scan": "Ler QR Code",
"list_marketplace": "Mercado",
"list_title": "Carteiras",
"list_tryagain": "Tente de novo",
"no_ln_wallet_error": "Antes de pagar uma fatura Lightning você deve adicionar uma carteira Lightning.",

View file

@ -292,7 +292,6 @@
"details_delete_wallet": "Remover carteira",
"details_display": "mostrar na lista de carteiras",
"details_export_backup": "Exportar / backup",
"details_marketplace": "Mercado",
"details_master_fingerprint": "Master fingerprint",
"details_no_cancel": "Não, cancelar",
"details_save": "Guardar",
@ -321,7 +320,6 @@
"list_long_choose": "Escolher Foto",
"list_long_clipboard": "Copiar da área de transferência",
"list_long_scan": "Leia o código QR",
"list_marketplace": "Mercado",
"list_title": "carteiras",
"list_tryagain": "Tente novamente",
"reorder_title": "Reordenar Wallets",

View file

@ -317,7 +317,6 @@
"details_derivation_path": "calea de derivare",
"details_display": "Afișează în Lista Portofelelor",
"details_export_backup": "Exportă/Backup",
"details_marketplace": "Marketplace",
"details_master_fingerprint": "Amprenta principală",
"details_ms_l": "Legacy {m} din {n} (p2sh)",
"details_ms_ns": "Nativ segwit {m} din {n} (p2wsh)",
@ -355,7 +354,6 @@
"list_long_choose": "Alege foto",
"list_long_clipboard": "Copiază din clipboard",
"list_long_scan": "Scaneză cod QR",
"list_marketplace": "Marketplace",
"list_title": "Portofele",
"list_tryagain": "Încearcă din nou",
"no_ln_wallet_error": "Înainte de a plăti o factură Lightning, trebuie mai întîi să adaugi un portofel Lightning.",

View file

@ -410,7 +410,6 @@
"details_derivation_path": "путь деривации",
"details_display": "показывать в списке кошельков",
"details_export_backup": "Экспорт / резервная копия",
"details_marketplace": "Marketplace",
"details_master_fingerprint": "Master fingerprint",
"details_ms_l": "{m} из {n} legacy (p2sh)",
"details_ms_ns": "{m} из {n} native segwit (p2wsh)",
@ -464,7 +463,6 @@
"list_long_choose": "Выбрать фото",
"list_long_clipboard": "Вставить из буфера обмена",
"list_long_scan": "Сканировать QR-код",
"list_marketplace": "Marketplace",
"list_title": "Кошельки",
"list_tryagain": "Попробовать еще раз",
"no_ln_wallet_error": "Прежде чем оплачивать Лайнтнинг инвойс, нужно добавить Лайтнинг кошелёк.",

View file

@ -413,7 +413,6 @@
"details_derivation_path": "ව්යුත්පන්න මාර්ගය",
"details_display": "පසුම්බි ලැයිස්තුවේ පෙන්වන්න",
"details_export_backup": "අපනයනය/උපස්ථ කිරීම",
"details_marketplace": "වෙළෙඳපොළ",
"details_master_fingerprint": "ප්‍රධාන ඇඟිලි සලකුණ",
"details_ms_l": "{n} උරුමයෙන් (p2sh) {m}",
"details_ms_ns": "ස්වදේශීය සෙග්විට් {n} න් {m} (p2wsh)",
@ -467,7 +466,6 @@
"list_long_choose": "ඡායාරූපය තෝරන්න",
"list_long_clipboard": "පසුරු පුවරුවෙන් පිටපත් කරන්න",
"list_long_scan": "QR කේතය පරිලෝකනය කරන්න",
"list_marketplace": "වෙළෙඳපොළ",
"list_title": "පසුම්බි",
"list_tryagain": "නැවත උත්සාහ කරන්න",
"no_ln_wallet_error": "අකුණු ඉන්වොයිසියක් ගෙවීමට පෙර, ඔබ මුලින්ම අකුණු පසුම්බියක් එකතු කළ යුතුය.",

View file

@ -412,7 +412,6 @@
"details_derivation_path": "pot izpeljave (derivation path)",
"details_display": "Prikaži na seznamu denarnic",
"details_export_backup": "Izvozi / Varnostna kopija",
"details_marketplace": "Tržnica",
"details_master_fingerprint": "Glavni prstni odtis (fingerprint)",
"details_ms_l": "{m} od {n} legacy (p2sh)",
"details_ms_ns": "{m} od {n} native segwit (p2wsh)",
@ -466,7 +465,6 @@
"list_long_choose": "Izberite fotografijo",
"list_long_clipboard": "Kopiraj iz odložišča",
"list_long_scan": "Skeniraj QR kodo",
"list_marketplace": "Tržnica",
"list_title": "Denarnice",
"list_tryagain": "Poskusi ponovno",
"no_ln_wallet_error": "Za plačilo Lightning računa, morate najprej dodati Lightning denarnico.",

View file

@ -262,7 +262,6 @@
"details_delete_wallet": "ลบกระเป๋าสตางค์",
"details_display": "แสดงในรายการกระเป๋าสตางค์",
"details_export_backup": "ส่งออก / สำรอง",
"details_marketplace": "ตลาด",
"details_master_fingerprint": "ลายนิ้วมือต้นแบบ",
"details_no_cancel": "ไม่ใช่, ยกเลิก",
"details_save": "เก็บ",
@ -291,7 +290,6 @@
"list_long_choose": "เลือกรูปภาพ",
"list_long_clipboard": "คัดลอกจากคลิปบอร์ด",
"list_long_scan": "สแกนคิวอาร์โค้ด",
"list_marketplace": "ตลาด",
"list_title": "กระเป๋าสตางค์",
"list_tryagain": "พยายามอีกครั้ง",
"reorder_title": "เปลี่ยนลำดับกระเป๋าสตางค์",

View file

@ -273,7 +273,6 @@
"details_delete": "Видалити",
"details_delete_wallet": "Видалити Гаманець",
"details_export_backup": "Експорт / резервна копія",
"details_marketplace": "Ринок",
"details_no_cancel": "Ні, відмінити",
"details_save": "Зберегти",
"details_show_xpub": "Показати XPUB Гаманця",
@ -305,7 +304,6 @@
"list_latest_transaction": "Остання Транзакція",
"list_long_choose": "Виберіть Фото",
"list_long_scan": "Сканувати QR-код",
"list_marketplace": "Ринок",
"list_title": "Гаманці",
"list_tryagain": "Спробуйте ще раз",
"please_continue_scanning": "Продовжуйте сканування.",

View file

@ -328,7 +328,6 @@
"details_derivation_path": "推导路径",
"details_display": "在钱包清单中显示",
"details_export_backup": "导出/备份",
"details_marketplace": "市场",
"details_master_fingerprint": "主指纹",
"details_ms_l": "{m} of {n} 旧制式p2sh",
"details_ms_ns": "{m} of {n} 原始隔离见证p2wsh",
@ -370,7 +369,6 @@
"list_long_choose": "选择图片",
"list_long_clipboard": "从剪贴板复制",
"list_long_scan": "扫描二维码",
"list_marketplace": "市场",
"list_title": "钱包",
"list_tryagain": "再试一次",
"no_ln_wallet_error": "在支付闪电账单之前,必须先添加一个闪电钱包。",

View file

@ -326,7 +326,6 @@
"details_derivation_path": "推導路徑",
"details_display": "在錢包清單中顯示",
"details_export_backup": "匯出備份",
"details_marketplace": "市場",
"details_master_fingerprint": "主指紋",
"details_ms_l": "{m} of {n} 舊制式p2sh",
"details_ms_ns": "{m} of {n} 原始隔離見證p2wsh",
@ -368,7 +367,6 @@
"list_long_choose": "選擇圖片",
"list_long_clipboard": "從剪貼簿複製",
"list_long_scan": "掃描二維碼",
"list_marketplace": "市場",
"list_title": "錢包",
"list_tryagain": "再試一次",
"no_ln_wallet_error": "在繳付閃電賬單之前,必須先添加一個閃電錢包。",

View file

@ -299,11 +299,11 @@ export default class Browser extends Component {
if (props.route.params.url) url = props.route.params.url;
this.state = {
url: url || 'https://bluewallet.io/marketplace/',
url: url || 'https://www.duckduckgo.com/',
fromWallet: context.wallets.find(w => w.getID() === props.route.params.walletID),
canGoBack: false,
pageIsLoading: false,
stateURL: url || 'https://bluewallet.io/marketplace/',
stateURL: url || 'https://wwww.duckduckgo.com/',
};
BackHandler.addEventListener('hardwareBackPress', this.handleBackButton.bind(this));
}
@ -484,7 +484,7 @@ export default class Browser extends Component {
accessibilityRole="button"
onPress={() => {
processedInvoices = {};
this.setState({ url: 'https://bluewallet.io/marketplace/' });
this.setState({ url: 'https://www.duckduckgo.com/' });
}}
>
<Ionicons

View file

@ -42,7 +42,6 @@ import { BlueStorageContext } from '../../blue_modules/storage-context';
import Notifications from '../../blue_modules/notifications';
import { isDesktop } from '../../blue_modules/environment';
import { AbstractHDElectrumWallet } from '../../class/wallets/abstract-hd-electrum-wallet';
import { Chain } from '../../models/bitcoinUnits';
import alert from '../../components/Alert';
const prompt = require('../../blue_modules/prompt');
@ -304,40 +303,6 @@ const WalletDetails = () => {
walletID: wallet.getID(),
});
const renderMarketplaceButton = () => {
return (
wallet.chain === Chain.OFFCHAIN &&
Platform.select({
android: (
<>
<BlueSpacing20 />
<SecondButton
testID="Marketplace"
onPress={() =>
navigate('Marketplace', {
walletID,
})
}
title={loc.wallets.details_marketplace}
/>
</>
),
ios: (
<>
<BlueSpacing20 />
<SecondButton
testID="Marketplace"
onPress={async () => {
Linking.openURL('https://bluewallet.io/marketplace-btc/');
}}
title={loc.wallets.details_marketplace}
/>
</>
),
})
);
};
const exportInternals = async () => {
if (backdoorPressed < 10) return setBackdoorPressed(backdoorPressed + 1);
setBackdoorPressed(0);
@ -641,7 +606,6 @@ const WalletDetails = () => {
<>
<BlueSpacing20 />
<SecondButton onPress={navigateToXPub} testID="XPub" title={loc.wallets.details_show_xpub} />
{renderMarketplaceButton()}
</>
)}
{wallet.allowSignVerifyMessage() && (

View file

@ -1,90 +0,0 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { BackHandler } from 'react-native';
import { WebView } from 'react-native-webview';
import { BlueLoading } from '../../BlueComponents';
import navigationStyle from '../../components/navigationStyle';
import loc from '../../loc';
import { BlueStorageContext } from '../../blue_modules/storage-context';
export default class Marketplace extends Component {
webview = React.createRef();
constructor(props, context) {
super(props);
if (!props.route.params.walletID) throw new Error('Invalid param');
const fromWallet = context.wallets.find(w => w.getID() === props.route.params.walletID);
this.state = {
url: '',
fromWallet,
canGoBack: false,
};
BackHandler.addEventListener('hardwareBackPress', this.handleBackButton);
}
async componentDidMount() {
let address;
if (this.state.fromWallet && this.state.fromWallet.getAddressAsync) {
address = await this.state.fromWallet.getAddressAsync();
} else if (this.state.fromWallet && this.state.fromWallet.getAddress) {
address = this.state.fromWallet.getAddress();
}
const url = 'https://bluewallet.io/marketplace-btc/?address=' + address; // default
this.setState({
url,
});
}
componentWillUnmount = () => {
BackHandler.removeEventListener('hardwareBackPress', this.handleBackButton);
};
handleBackButton = () => {
this.state.canGoBack ? this.webview.current.goBack() : this.props.navigation.goBack(null);
return true;
};
_onNavigationStateChange = webViewState => {
this.setState({ canGoBack: webViewState.canGoBack });
};
render() {
if (this.state.isLoading) {
return <BlueLoading />;
}
return (
<WebView
testID="MarketplaceWebView"
ref={this.webview}
onNavigationStateChange={this._onNavigationStateChange}
source={{
uri: this.state.url,
}}
/>
);
}
}
Marketplace.propTypes = {
navigation: PropTypes.shape({
navigate: PropTypes.func,
goBack: PropTypes.func,
}),
route: PropTypes.shape({
params: PropTypes.object,
}),
};
Marketplace.contextType = BlueStorageContext;
Marketplace.navigationOptions = navigationStyle({
closeButton: true,
title: loc.wallets.list_marketplace,
stackPresentation: 'modal',
headerHideBackButton: true,
});

View file

@ -63,7 +63,7 @@ const WalletTransactions = () => {
listHeaderText: {
color: colors.foregroundColor,
},
marketplaceButton2: {
browserButton2: {
backgroundColor: colors.lightButton,
},
marketpalceText1: {
@ -234,17 +234,7 @@ const WalletTransactions = () => {
return (
<View style={styles.flex}>
<View style={styles.listHeader}>
{/*
Current logic - Offchain:
- Shows Lapp Browser empty (iOS)
- Shows Lapp Browser with marketplace (android)
The idea is to avoid showing on iOS an appstore/market style app that goes against the TOS.
*/}
{wallet.chain === Chain.OFFCHAIN && renderLappBrowserButton()}
</View>
<View style={styles.listHeader}>{wallet.chain === Chain.OFFCHAIN && renderLappBrowserButton()}</View>
{wallet.type === LightningLdkWallet.type && (lnNodeInfo.canSend > 0 || lnNodeInfo.canReceive > 0) && (
<View style={[styles.marginHorizontal18, styles.marginBottom18]}>
<LNNodeBar canSend={lnNodeInfo.canSend} canReceive={lnNodeInfo.canReceive} itemPriceUnit={itemPriceUnit} />
@ -279,7 +269,7 @@ const WalletTransactions = () => {
},
});
}}
style={[styles.marketplaceButton2, stylesHook.marketplaceButton2]}
style={[styles.browserButton2, stylesHook.browserButton2]}
>
<Text style={[styles.marketpalceText1, stylesHook.marketpalceText1]}>{loc.wallets.list_ln_browser}</Text>
</TouchableOpacity>
@ -665,7 +655,7 @@ const styles = StyleSheet.create({
fontWeight: 'bold',
fontSize: 24,
},
marketplaceButton2: {
browserButton2: {
borderRadius: 9,
minHeight: 49,
paddingHorizontal: 8,