Merge branch 'master' into #2656

getAlby · Sep 18, 2023 · 4307f25 · 4307f25
2 parents 1d0c9fd + 487e9e7
commit 4307f25
Show file tree

Hide file tree

Showing 29 changed files with 79 additions and 81 deletions.
diff --git a/src/app/router/connectorRoutes.tsx b/src/app/router/connectorRoutes.tsx
@@ -20,8 +20,8 @@ import btcpay from "/static/assets/icons/btcpay.svg";
 import citadel from "/static/assets/icons/citadel.png";
 import core_ln from "/static/assets/icons/core_ln.svg";
 import eclair from "/static/assets/icons/eclair.jpg";
-import galoyBitcoinBeach from "/static/assets/icons/galoy_bitcoin_beach.png";
 import galoyBitcoinJungle from "/static/assets/icons/galoy_bitcoin_jungle.png";
+import galoyBlink from "/static/assets/icons/galoy_blink.png";
 import kolliderLogo from "/static/assets/icons/kollider.png";
 import lightning_node from "/static/assets/icons/lightning_node.png";
 import lightning_terminal from "/static/assets/icons/lightning_terminal.png";
@@ -63,7 +63,7 @@ interface ConnectorRoute extends Route {
 }
 
 const galoyPaths: { [key: string]: keyof typeof galoyUrls } = {
-  bitcoinBeach: "galoy-bitcoin-beach",
+  blink: "galoy-blink",
   bitcoinJungle: "galoy-bitcoin-jungle",
 };
 
@@ -163,11 +163,11 @@ const connectorMap: { [key: string]: ConnectorRoute } = {
     logo: kolliderLogo,
     children: kolliderConnectorRoutes,
   },
-  [galoyPaths.bitcoinBeach]: {
-    path: galoyPaths.bitcoinBeach,
-    element: <ConnectGaloy instance={galoyPaths.bitcoinBeach} />,
-    title: i18n.t("translation:choose_connector.bitcoin_beach.title"),
-    logo: galoyBitcoinBeach,
+  [galoyPaths.blink]: {
+    path: galoyPaths.blink,
+    element: <ConnectGaloy instance={galoyPaths.blink} />,
+    title: i18n.t("translation:choose_connector.blink.title"),
+    logo: galoyBlink,
   },
   [galoyPaths.bitcoinJungle]: {
     path: galoyPaths.bitcoinJungle,
@@ -262,7 +262,7 @@ function getConnectorRoutes(): ConnectorRoute[] {
     connectorMap["lnd-hub-bluewallet"],
     connectorMap["eclair"],
     connectorMap["btcpay"],
-    connectorMap[galoyPaths.bitcoinBeach],
+    connectorMap[galoyPaths.blink],
     connectorMap[galoyPaths.bitcoinJungle],
     getDistribution("citadel"),
     getDistribution("umbrel"),

diff --git a/src/app/screens/connectors/ConnectGaloy/index.tsx b/src/app/screens/connectors/ConnectGaloy/index.tsx
@@ -9,18 +9,16 @@ import { useNavigate } from "react-router-dom";
 import toast from "~/app/components/Toast";
 import msg from "~/common/lib/msg";
 
-import galoyBitcoinBeach from "/static/assets/icons/galoy_bitcoin_beach.png";
 import galoyBitcoinJungle from "/static/assets/icons/galoy_bitcoin_jungle.png";
+import galoyBlink from "/static/assets/icons/galoy_blink.png";
 
 export const galoyUrls = {
-  "galoy-bitcoin-beach": {
-    i18nPrefix: "bitcoin_beach",
-    label: "Bitcoin Beach Wallet",
-    website: "https://galoy.io/bitcoin-beach-wallet/",
-    logo: galoyBitcoinBeach,
-    url:
-      process.env.BITCOIN_BEACH_GALOY_URL ||
-      "https://api.mainnet.galoy.io/graphql",
+  "galoy-blink": {
+    i18nPrefix: "blink",
+    label: "Blink Wallet",
+    website: "https://www.blink.sv/",
+    logo: galoyBlink,
+    url: process.env.BLINK_GALOY_URL || "https://api.mainnet.galoy.io/graphql",
   },
   "galoy-bitcoin-jungle": {
     i18nPrefix: "bitcoin_jungle",

diff --git a/src/i18n/locales/cs/translation.json b/src/i18n/locales/cs/translation.json
@@ -167,10 +167,10 @@
           "placeholder": "onion-adresa-vaseho-uzlu:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink",
         "page": {
-          "title": "Připojení k <0>Bitcoin Beach Wallet</0>"
+          "title": "Připojení k <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {

diff --git a/src/i18n/locales/da/translation.json b/src/i18n/locales/da/translation.json
@@ -208,10 +208,10 @@
           "placeholder": "din-nodes-onion-adresse:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "Opret forbindelse til <0>Bitcoin Beach Wallet</0>"
+          "title": "Opret forbindelse til <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {

diff --git a/src/i18n/locales/de/translation.json b/src/i18n/locales/de/translation.json
@@ -173,10 +173,10 @@
         },
         "title": "Start9"
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "Verbinden mit <0>Bitcoin Beach Wallet</0>"
+          "title": "Verbinden mit <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {

diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
@@ -218,10 +218,10 @@
           "placeholder": "your-node-onion-address:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "Connect to <0>Bitcoin Beach Wallet</0>"
+          "title": "Connect to <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {

diff --git a/src/i18n/locales/eo/translation.json b/src/i18n/locales/eo/translation.json
@@ -166,7 +166,7 @@
           "placeholder": ""
         }
       },
-      "bitcoin_beach": {
+      "blink": {
         "title": "",
         "page": {
           "title": ""

diff --git a/src/i18n/locales/es/translation.json b/src/i18n/locales/es/translation.json
@@ -145,10 +145,10 @@
           "placeholder": "tu-nodo-direccion onion:puerto"
         }
       },
-      "bitcoin_beach": {
-        "title": "Billetera de Bitcoin Beach",
+      "blink": {
+        "title": "Billetera de Blink",
         "page": {
-          "title": "Conecta a <0>La cartera Bitcoin Beach</0>"
+          "title": "Conecta a <0>La cartera Blink</0>"
         }
       },
       "bitcoin_jungle": {

diff --git a/src/i18n/locales/fa/translation.json b/src/i18n/locales/fa/translation.json
@@ -218,10 +218,10 @@
           "placeholder": "your-node-onion-address:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "کیف پول Bitcoin Beach",
+      "blink": {
+        "title": "کیف پول Blink",
         "page": {
-          "title": "اتصال به <0>Bitcoin Beach Wallet</0>"
+          "title": "اتصال به <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {

diff --git a/src/i18n/locales/fi/translation.json b/src/i18n/locales/fi/translation.json
@@ -166,10 +166,10 @@
           "placeholder": "solmusi-sipuli-osoite:portti"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach -lompakko",
+      "blink": {
+        "title": "Bitcoin Blink -lompakko",
         "page": {
-          "title": "Yhdistä <0>Bitcoin Beach -lompakkoon</0>"
+          "title": "Yhdistä <0>Blink -lompakkoon</0>"
         }
       },
       "bitcoin_jungle": {

diff --git a/src/i18n/locales/fr/translation.json b/src/i18n/locales/fr/translation.json
@@ -208,10 +208,10 @@
           "placeholder": "adresse-de-votre-node-onion:port"
         }
       },
-      "bitcoin_beach": {
+      "blink": {
         "title": "Portefeuille de plage Bitcoin",
         "page": {
-          "title": "Connectez-vous à <0>Bitcoin Beach Wallet</0>"
+          "title": "Connectez-vous à <0>Bitcoin Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {

diff --git a/src/i18n/locales/hi/translation.json b/src/i18n/locales/hi/translation.json
@@ -215,10 +215,10 @@
           "placeholder": "your-node-onion-address:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "<0>Bitcoin Beach Wallet</0 से कनेक्ट करें>"
+          "title": "<0>Blink Wallet</0 से कनेक्ट करें>"
         }
       },
       "bitcoin_jungle": {

diff --git a/src/i18n/locales/id/translation.json b/src/i18n/locales/id/translation.json
@@ -214,10 +214,10 @@
           "placeholder": "your-node-onion-address:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "Sambungkan dengan <0>Bitcoin Beach Wallet</0>"
+          "title": "Sambungkan dengan <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {

diff --git a/src/i18n/locales/it/translation.json b/src/i18n/locales/it/translation.json
@@ -167,10 +167,10 @@
           "placeholder": "indirizzo-onion-del-tuo-nodo:porta"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "Connetti il tuo <0>Bitcoin Beach Wallet</0>"
+          "title": "Connetti il tuo <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {

diff --git a/src/i18n/locales/ja/translation.json b/src/i18n/locales/ja/translation.json
@@ -215,11 +215,11 @@
         },
         "title": "RaspiBlitz"
       },
-      "bitcoin_beach": {
+      "blink": {
         "page": {
-          "title": "<0>Bitcoin Beach Wallet</0>に接続"
+          "title": "<0>Blink Wallet</0>に接続"
         },
-        "title": "Bitcoin Beach Wallet"
+        "title": "Blink Wallet"
       },
       "title": "ライトニング・ウォレットを接続",
       "description": "外部のライトニング・ウォレットまたはノードに接続",

diff --git a/src/i18n/locales/mr/translation.json b/src/i18n/locales/mr/translation.json
@@ -208,10 +208,10 @@
           "placeholder": "your-node-onion-address:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "<0>Bitcoin Beach Wallet ला कनेक्ट करा</0>"
+          "title": "<0>Blink Wallet ला कनेक्ट करा</0>"
         }
       },
       "bitcoin_jungle": {

diff --git a/src/i18n/locales/nl/translation.json b/src/i18n/locales/nl/translation.json
@@ -167,7 +167,7 @@
           "placeholder": ""
         }
       },
-      "bitcoin_beach": {
+      "blink": {
         "title": "",
         "page": {
           "title": ""

diff --git a/src/i18n/locales/pl/translation.json b/src/i18n/locales/pl/translation.json
@@ -214,10 +214,10 @@
           "placeholder": "adres-onion-twojego-wezla:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Portfel Bitcoin Beach",
+      "blink": {
+        "title": "Portfel Blink",
         "page": {
-          "title": "Podłącz do <0>Bitcoin Beach Wallet</0>"
+          "title": "Podłącz do <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {

diff --git a/src/i18n/locales/pt_BR/translation.json b/src/i18n/locales/pt_BR/translation.json
@@ -145,10 +145,10 @@
           "placeholder": "seu-endereço-servidor-onion:porta"
         }
       },
-      "bitcoin_beach": {
-        "title": "Carteira Bitcoin Beach",
+      "blink": {
+        "title": "Carteira Blink",
         "page": {
-          "title": "Conecte-se na <0>Carteira Bitcoin Beach</0>"
+          "title": "Conecte-se na <0>Carteira Blink</0>"
         }
       },
       "bitcoin_jungle": {

diff --git a/src/i18n/locales/ro/translation.json b/src/i18n/locales/ro/translation.json
@@ -208,10 +208,10 @@
           "placeholder": "adresa-onion-a-nodului-tau:portul"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "Conectare la <0>Bitcoin Beach Wallet</0>"
+          "title": "Conectare la <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {

diff --git a/src/i18n/locales/ru/translation.json b/src/i18n/locales/ru/translation.json
@@ -208,7 +208,7 @@
           "placeholder": ""
         }
       },
-      "bitcoin_beach": {
+      "blink": {
         "title": "",
         "page": {
           "title": ""

diff --git a/src/i18n/locales/sv/translation.json b/src/i18n/locales/sv/translation.json
@@ -173,10 +173,10 @@
           "placeholder": "din-onion-nod-adress:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach plånbok",
+      "blink": {
+        "title": "Blink plånbok",
         "page": {
-          "title": "Anslut <0>Bitcoin Beach Wallet</0>"
+          "title": "Anslut <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {

diff --git a/src/i18n/locales/tl/translation.json b/src/i18n/locales/tl/translation.json
@@ -166,7 +166,7 @@
           "placeholder": ""
         }
       },
-      "bitcoin_beach": {
+      "blink": {
         "title": "",
         "page": {
           "title": ""

diff --git a/src/i18n/locales/uk/translation.json b/src/i18n/locales/uk/translation.json
@@ -208,7 +208,7 @@
           "placeholder": ""
         }
       },
-      "bitcoin_beach": {
+      "blink": {
         "title": "",
         "page": {
           "title": ""

diff --git a/src/i18n/locales/zh_Hans/translation.json b/src/i18n/locales/zh_Hans/translation.json
@@ -122,11 +122,11 @@
           "placeholder": "config=http://your-btc-pay.org/lnd-config/212121/lnd.config"
         }
       },
-      "bitcoin_beach": {
+      "blink": {
         "page": {
-          "title": "连接<0>比特币海滩钱包</0>"
+          "title": "连接<0>眨眼钱包</0>"
         },
-        "title": "比特币海滩钱包"
+        "title": "眨眼钱包"
       },
       "commando": {
         "config": {

diff --git a/src/i18n/locales/zh_Hant/translation.json b/src/i18n/locales/zh_Hant/translation.json
@@ -215,10 +215,10 @@
           "placeholder": "your-node-onion-address:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "連接<0>Bitcoin Beach Wallet</0>"
+          "title": "連接<0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {

diff --git a/static/assets/icons/galoy_bitcoin_beach.png b/static/assets/icons/galoy_bitcoin_beach.png
diff --git a/static/assets/icons/galoy_blink.png b/static/assets/icons/galoy_blink.png