Merge branch 'master' into leftover

2025-01-19 05:45:15 +01:00 · 2022-08-06 15:41:18 -04:00 · 2022-08-06 15:41:18 -04:00 · 8de484085d
commit 8de484085d
parent ba8e68d639 c4794e4672
39 changed files with 28 additions and 80 deletions
--- a/components/TransactionsNavigationHeader.js
+++ b/components/TransactionsNavigationHeader.js
@ -25,7 +25,6 @@ export default class TransactionsNavigationHeader extends Component {
    WalletBalanceVisibility: 'walletBalanceVisibility',
    Refill: 'refill',
    RefillWithExternalWallet: 'qrcode',
-    Exchange: 'exchange',
  };

  static actionIcons = {
@ -49,10 +48,6 @@ export default class TransactionsNavigationHeader extends Component {
      iconType: 'SYSTEM',
      iconValue: 'qrcode',
    },
-    Exchange: {
-      iconType: 'SYSTEM',
-      iconValue: 'link',
-    },
  };

  static getDerivedStateFromProps(props) {
@ -161,13 +156,6 @@ export default class TransactionsNavigationHeader extends Component {
      text: loc.lnd.refill_external,
      icon: TransactionsNavigationHeader.actionIcons.RefillWithExternalWallet,
    },
-    [
-      {
-        id: TransactionsNavigationHeader.actionKeys.Exchange,
-        text: loc.lnd.exchange,
-        icon: TransactionsNavigationHeader.actionIcons.Exchange,
-      },
-    ],
  ];

  render() {
--- a/ios/BlueWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ios/BlueWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved
@ -1,25 +1,23 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "EFQRCode",
-        "repositoryURL": "https://github.com/EFPrefix/EFQRCode.git",
-        "state": {
-          "branch": null,
-          "revision": "62eff300b439d0088007b4e2e2e8c600f4b2e515",
-          "version": "5.1.8"
-        }
-      },
-      {
-        "package": "swift_qrcodejs",
-        "repositoryURL": "https://github.com/ApolloZhu/swift_qrcodejs.git",
-        "state": {
-          "branch": null,
-          "revision": "f3fe9fdd39fa48e45b501000194b43a3883f732f",
-          "version": "1.1.4"
-        }
+  "pins" : [
+    {
+      "identity" : "efqrcode",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/EFPrefix/EFQRCode.git",
+      "state" : {
+        "revision" : "62eff300b439d0088007b4e2e2e8c600f4b2e515",
+        "version" : "5.1.8"
      }
-    ]
-  },
-  "version": 1
-}
+    },
+    {
+      "identity" : "swift_qrcodejs",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ApolloZhu/swift_qrcodejs.git",
+      "state" : {
+        "revision" : "f3fe9fdd39fa48e45b501000194b43a3883f732f",
+        "version" : "1.1.4"
+      }
+    }
+  ],
+  "version" : 2
+}
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -311,7 +311,7 @@ PODS:
    - React-Core
  - react-native-tor (0.1.8):
    - React
-  - react-native-webview (11.22.6):
+  - react-native-webview (11.23.0):
    - React-Core
  - react-native-widget-center (0.0.8):
    - React
@ -446,9 +446,9 @@ PODS:
    - React-RCTImage
  - RNSecureKeyStore (1.0.0):
    - React
-  - RNShare (7.6.6):
+  - RNShare (7.7.0):
    - React-Core
-  - RNSVG (12.4.0):
+  - RNSVG (12.4.3):
    - React-Core
  - RNVectorIcons (9.2.0):
    - React-Core
@ -777,7 +777,7 @@ SPEC CHECKSUMS:
  react-native-safe-area-context: 9e40fb181dac02619414ba1294d6c2a807056ab9
  react-native-tcp-socket: c1b7297619616b4c9caae6889bcb0aba78086989
  react-native-tor: 3b14e9160b2eb7fa3f310921b2dee71a5171e5b7
-  react-native-webview: 5bb59e95fd9d8db6b8c2835d743d463167fc65a8
+  react-native-webview: e771bc375f789ebfa02a26939a57dbc6fa897336
  react-native-widget-center: 6bf4d5aa5ab10a9dbbf7ddf9192f06cc1d66ccd5
  React-perflogger: 0afaf2f01a47fd0fc368a93bfbb5bd3b26db6e7f
  React-RCTActionSheet: 59f35c4029e0b532fc42114241a06e170b7431a2
@ -811,8 +811,8 @@ SPEC CHECKSUMS:
  RNReanimated: b5b17149593e7c05e4ec5c0efea1f21e05829510
  RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7
  RNSecureKeyStore: f1ad870e53806453039f650720d2845c678d89c8
-  RNShare: d56424e3926cbc239db1cc1c168adcb051aad50b
-  RNSVG: 3dd44d99d1c18e1342aee4bfa53ab3f6a8c4865f
+  RNShare: ab582e93876d9df333a531390c658c31b50a767d
+  RNSVG: f3b60aeeaa81960e2e0536c3a9eef50b667ef3a9
  RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
  RNWatch: dae6c858a2051dbdcfb00b9a86cf4d90400263b4
  SwiftSocket: c8d482e867ae4d3eb4c769e9382e123c1f1f833b
--- a/loc/ar.json
+++ b/loc/ar.json
@ -58,7 +58,6 @@
    "close_channel": "اغلق القناة",
    "new_channel" : "قناة جديدة",
    "errorInvoiceExpired": "انتهت صلاحية الفاتورة",
-    "exchange": "التبادل",
    "force_close_channel": "هل تود فرض اغلاق القناة؟",
    "expired": "منتهية الصلاحية",
    "node_alias": "الاسم المستعار للعقدة",
--- a/loc/bg_bg.json
+++ b/loc/bg_bg.json
@ -46,7 +46,6 @@
  },
  "lnd": {
    "errorInvoiceExpired": "Изтекла фактура",
-    "exchange": "Ексчейндж",
    "expired": "Изтекла",
    "expiredLow": "изтекла",
    "payButton": "Плати",
--- a/loc/ca.json
+++ b/loc/ca.json
@ -55,7 +55,6 @@
    "close_channel": "Tancar el canal",
    "new_channel": "Nou canal",
    "errorInvoiceExpired": "La factura ha caducat",
-    "exchange": "Intercanvi",
    "force_close_channel": "Forçar tancar el canal?",
    "expired": "Caducat",
    "node_alias": "Àlies del node",
--- a/loc/cs_cz.json
+++ b/loc/cs_cz.json
@ -58,7 +58,6 @@
    "close_channel": "Zavřít kanál",
    "new_channel" : "Nový kanál",
    "errorInvoiceExpired": "Faktura vypršela",
-    "exchange": "Směnárna",
    "force_close_channel": "Vynutit uzavření kanálu?",
    "expired": "Expirováno",
    "node_alias": "Alias uzlu",
--- a/loc/cy.json
+++ b/loc/cy.json
@ -33,7 +33,6 @@
  },
  "lnd": {
    "errorInvoiceExpired": "Anfoneb wedi gorffen",
-    "exchange": "Cyfnewid",
    "expired": "Gorffen",
    "expiredLow": "Gorffen",
    "payButton": "Talu",
--- a/loc/de_de.json
+++ b/loc/de_de.json
@ -58,7 +58,6 @@
    "close_channel": "Kanal schließen",
    "new_channel" : "Neuer Kanal",
    "errorInvoiceExpired": "Rechnung verfallen",
-    "exchange": "Via Börse auf ein Wallet abheben",
    "force_close_channel": "Kanal zwangsweise schließen?",
    "expired": "Abgelaufen",
    "node_alias": "Knoten-Alias",
--- a/loc/en.json
+++ b/loc/en.json
@ -58,7 +58,6 @@
    "close_channel": "Close channel",
    "new_channel" : "New channel",
    "errorInvoiceExpired": "Invoice expired",
-    "exchange": "Exchange",
    "force_close_channel": "Force close channel?",
    "expired": "Expired",
    "node_alias": "Node alias",
--- a/loc/es.json
+++ b/loc/es.json
@ -58,7 +58,6 @@
    "close_channel": "Cerrar canal",
    "new_channel": "Nuevo canal",
    "errorInvoiceExpired": "Factura expirada",
-    "exchange": "Casa de cambio",
    "force_close_channel": "¿Forzar el cierre del canal?",
    "expired": "Expirado",
    "node_alias": "Alias del nodo",
--- a/loc/es_419.json
+++ b/loc/es_419.json
@ -58,7 +58,6 @@
    "close_channel": "Cerrar canal",
    "new_channel" : "Nuevo canal",
    "errorInvoiceExpired": "Factura expirada",
-    "exchange": "Casa de cambio",
    "force_close_channel": "¿Forzar el cierre del canal?",
    "expired": "Expirado",
    "node_alias": "Alias del nodo",
--- a/loc/fa.json
+++ b/loc/fa.json
@ -58,7 +58,6 @@
    "close_channel": "بستن کانال",
    "new_channel" : "کانال جدید",
    "errorInvoiceExpired": "صورت‌حساب منقضی شد",
-    "exchange": "تبادل",
    "force_close_channel": "بستن اجباری کانال؟",
    "expired": "منقضی‌شده",
    "node_alias": "نام مستعار گره",
--- a/loc/fi_fi.json
+++ b/loc/fi_fi.json
@ -58,7 +58,6 @@
    "close_channel": "Sulje kanava",
    "new_channel" : "Uusi kanava",
    "errorInvoiceExpired": "Lasku vanheni",
-    "exchange": "Vaihto",
    "force_close_channel": "Pakota kanavan sulku?",
    "expired": "Erääntynyt",
    "node_alias": "Solmun lempinimi",
--- a/loc/fr_fr.json
+++ b/loc/fr_fr.json
@ -58,7 +58,6 @@
    "close_channel": "Fermer le canal",
    "new_channel" : "Nouveau canal",
    "errorInvoiceExpired": "Requête expirée",
-    "exchange": "Echange",
    "force_close_channel": "Forcer la fermeture du canal ?",
    "expired": "Expiré",
    "node_alias": "Alias du node",
--- a/loc/he.json
+++ b/loc/he.json
@ -56,7 +56,6 @@
    "close_channel": "סגירת ערוץ",
    "new_channel": "ערוץ חדש",
    "errorInvoiceExpired": "חשבונית פגה",
-    "exchange": "בורסה",
    "force_close_channel": "כפיית סגירת ערוץ?",
    "expired": "פג",
    "node_alias": "כינוי צומת",
--- a/loc/hu_hu.json
+++ b/loc/hu_hu.json
@ -58,7 +58,6 @@
    "close_channel": "Csatorna zárása",
    "new_channel" : "Új csatorna",
    "errorInvoiceExpired": "A számla lejárt",
-    "exchange": "Átváltás",
    "force_close_channel": "Csatorna erőltetett zárása?",
    "expired": "Lejárt",
    "node_alias": "Node aliasz",
--- a/loc/id_id.json
+++ b/loc/id_id.json
@ -41,7 +41,6 @@
  },
  "lnd": {
    "errorInvoiceExpired": "Faktur kadarluasa",
-    "exchange": "Pertukaran",
    "expired": "Kadaluarsa",
    "expiredLow": "kadarluasa",
    "payButton": "Bayar",
--- a/loc/it.json
+++ b/loc/it.json
@ -57,7 +57,6 @@
    "close_channel": "Chiudi il canale",
    "new_channel": "Nuovo canale",
    "errorInvoiceExpired": "Fattura scaduta",
-    "exchange": "Exchange",
    "force_close_channel": "Forza la chiusura del canale?",
    "expired": "Scaduto",
    "node_alias": "Alias del nodo",
--- a/loc/jp_jp.json
+++ b/loc/jp_jp.json
@ -41,7 +41,6 @@
  },
  "lnd": {
    "errorInvoiceExpired": "インボイス失効",
-    "exchange": "エクスチェンジ",
    "expired": "失効",
    "expiredLow": "期限切れ",
    "payButton": "支払う",
--- a/loc/ko_KR.json
+++ b/loc/ko_KR.json
@ -58,7 +58,6 @@
    "close_channel": "챈널 닫기",
    "new_channel" : "새 챈널",
    "errorInvoiceExpired": "청구서가 만료되었습니다.",
-    "exchange": "교환",
    "force_close_channel": "챈널을 강제로 닫을까요?",
    "expired": "만료되었습니다",
    "node_alias": "노드 별칭",
--- a/loc/ms.json
+++ b/loc/ms.json
@ -55,7 +55,6 @@
    "close_channel": "Tutup saluran",
    "new_channel": "Saluran baru",
    "errorInvoiceExpired": "Invois tamat tempoh",
-    "exchange": "Pertukaran",
    "force_close_channel": "Tutup saluran secara paksa?",
    "expired": "Tamat tempoh",
    "node_alias": "Surihan nod",
--- a/loc/nb_no.json
+++ b/loc/nb_no.json
@ -58,7 +58,6 @@
    "close_channel": "Lukk kanal",
    "new_channel" : "Ny kanal",
    "errorInvoiceExpired": "Faktura utløpt",
-    "exchange": "Veksle",
    "force_close_channel": "Tvinge kanal til å lukke?",
    "expired": "Utløpt",
    "node_alias": "Node alias",
--- a/loc/ne.json
+++ b/loc/ne.json
@ -58,7 +58,6 @@
    "close_channel": "च्यानलहरू बन्द गर्नुहोस्",
    "new_channel": "नयाँ च्यानल",
    "errorInvoiceExpired": "इनभ्वाइसको म्याद सकियो",
-    "exchange": "आदानप्रदान",
    "force_close_channel": "जबरजस्ती च्यानल बन्द गर्ने हो?",
    "expired": "म्याद सकियो",
    "node_alias": "नोड को उपनाम",
--- a/loc/nl_nl.json
+++ b/loc/nl_nl.json
@ -58,7 +58,6 @@
    "close_channel": "Sluit kanaal",
    "new_channel" : "Nieuw kanaal",
    "errorInvoiceExpired": "Factuur verlopen",
-    "exchange": "Exchange",
    "force_close_channel": "Het sluiten van een kanaal forceren?",
    "expired": "Verlopen",
    "node_alias": "Node alias",
--- a/loc/pl.json
+++ b/loc/pl.json
@ -58,7 +58,6 @@
    "close_channel": "Zamknij kanał",
    "new_channel" : "Nowy kanał",
    "errorInvoiceExpired": "Faktura utraciła ważność",
-    "exchange": "Kantor",
    "force_close_channel": "Wymusić zamknięcie kanału?",
    "expired": "Przeterminowana",
    "node_alias": "Alias węzła",
--- a/loc/pt_br.json
+++ b/loc/pt_br.json
@ -58,7 +58,6 @@
    "close_channel": "Fechar canal",
    "new_channel" : "Novo canal",
    "errorInvoiceExpired": "Fatura expirada",
-    "exchange": "Trocar",
    "force_close_channel": "Forçar fechamento do canal?",
    "expired": "Expirada",
    "node_alias": "Apelido do nó",
--- a/loc/pt_pt.json
+++ b/loc/pt_pt.json
@ -39,7 +39,6 @@
  },
  "lnd": {
    "errorInvoiceExpired": "Factura expirada",
-    "exchange": "Exchange",
    "expired": "Expirado",
    "expiredLow": "expirada",
    "payButton": "Paga",
--- a/loc/ro.json
+++ b/loc/ro.json
@ -58,7 +58,6 @@
    "close_channel": "Închide canal",
    "new_channel": "Canal nou",
    "errorInvoiceExpired": "Factură expirată",
-    "exchange": "Schimbă",
    "force_close_channel": "Forțează închiderea canalului?",
    "expired": "Expirat",
    "node_alias": "Alias nod",
--- a/loc/ru.json
+++ b/loc/ru.json
@ -58,7 +58,6 @@
    "close_channel": "Закрыть канал",
    "new_channel": "Новый канал",
    "errorInvoiceExpired": "Инвойс просрочен",
-    "exchange": "Обмен",
    "force_close_channel": "Закрыть канал принудительно?",
    "expired": "Истекший",
    "node_alias": "Псевдоним ноды",
--- a/loc/si_LK.json
+++ b/loc/si_LK.json
@ -58,7 +58,6 @@
    "close_channel": "නාලිකාව වසන්න",
    "new_channel": "නව නාලිකාව",
    "errorInvoiceExpired": "ඉන්වොයිසිය කල් ඉකුත් වී ඇත",
-    "exchange": "හුවමාරුව",
    "force_close_channel": "කෙසේ හෝ නාලිකාව වසා දමන්නද?",
    "expired": "කල් ඉකුත් වී ඇත",
    "node_alias": "නෝඩ් අන්වර්ථ නාමය",
--- a/loc/sk_sk.json
+++ b/loc/sk_sk.json
@ -48,7 +48,6 @@
    "close_channel": "Zatvoriť kanál",
    "new_channel": "Nový kanál",
    "errorInvoiceExpired": "Faktúra je expirovaná",
-    "exchange": "Burza",
    "expired": "Expirovaná",
    "expiredLow": "expirovaná",
    "expiresIn": "Vyprší za {time} minút",
--- a/loc/sl_SI.json
+++ b/loc/sl_SI.json
@ -57,7 +57,6 @@
    "close_channel": "Zapri kanal",
    "new_channel": "Nov kanal",
    "errorInvoiceExpired": "Račun je potekel",
-    "exchange": "Menjalnica",
    "force_close_channel": "Prisilno zapri kanal?",
    "expired": "Potekel",
    "node_alias": "Vzdevek vozlišča",
--- a/loc/sv_se.json
+++ b/loc/sv_se.json
@ -39,7 +39,6 @@
  },
  "lnd": {
    "errorInvoiceExpired": "Fakturan har förfallit",
-    "exchange": "Börs",
    "expired": "Förfallen",
    "expiredLow": "förfallen",
    "payButton": "Betala",
--- a/loc/th_th.json
+++ b/loc/th_th.json
@ -37,7 +37,6 @@
  },
  "lnd": {
    "errorInvoiceExpired": "ใบวางบิลหมดอายุแล้ว",
-    "exchange": "แลกเปลี่ยน",
    "expired": "หมดอายุแล้ว",
    "expiredLow": "หมดอายุแล้ว",
    "payButton": "จ่าย",
--- a/loc/ua.json
+++ b/loc/ua.json
@ -53,7 +53,6 @@
    "no_channels": "Немає каналів",
    "close_channel": "Закрити канал",
    "new_channel": "Новий канал",
-    "exchange": "Обмін",
    "expired": "Термін дії закінчився",
    "expiredLow": "Термін дії закінчився",
    "payButton": "Оплатити",
--- a/loc/zh_cn.json
+++ b/loc/zh_cn.json
@ -46,7 +46,6 @@
  },
  "lnd": {
    "errorInvoiceExpired": "账单已过期",
-    "exchange": "交易所",
    "expired": "已过期",
    "expiredLow": "已过期",
    "payButton": "支付",
--- a/loc/zh_tw.json
+++ b/loc/zh_tw.json
@ -43,7 +43,6 @@
  },
  "lnd": {
    "errorInvoiceExpired": "賬單已過期",
-    "exchange": "交易所",
    "expired": "已過期",
    "expiredLow": "已過期",
    "payButton": "支付",
--- a/screen/wallets/transactions.js
+++ b/screen/wallets/transactions.js
@ -5,7 +5,6 @@ import {
  Dimensions,
  FlatList,
  InteractionManager,
-  Linking,
  PixelRatio,
  Platform,
  ScrollView,
@ -449,9 +448,7 @@ const WalletTransactions = () => {
  };

  const onManageFundsPressed = ({ id }) => {
-    if (id === TransactionsNavigationHeader.actionKeys.Exchange) {
-      Linking.openURL('https://zigzag.io/?utm_source=integration&utm_medium=bluewallet&utm_campaign=withdrawLink');
-    } else if (id === TransactionsNavigationHeader.actionKeys.Refill) {
+    if (id === TransactionsNavigationHeader.actionKeys.Refill) {
      const availableWallets = [...wallets.filter(item => item.chain === Chain.ONCHAIN && item.allowSend())];
      if (availableWallets.length === 0) {
        alert(loc.lnd.refill_create);