Merge pull request getAlby#2841 from getAlby/fix/remove-kollider

fix: remove kollider
AdarshRawat1 · Nov 26, 2023 · e797b4b · e797b4b
2 parents d2aa8d2 + 36407e2
commit e797b4b
Show file tree

Hide file tree

Showing 43 changed files with 49 additions and 796 deletions.
diff --git a/src/app/router/connectorRoutes.tsx b/src/app/router/connectorRoutes.tsx
@@ -3,7 +3,6 @@ import ConnectBtcpay from "@screens/connectors/ConnectBtcpay";
 import ConnectCitadel from "@screens/connectors/ConnectCitadel";
 import ConnectEclair from "@screens/connectors/ConnectEclair";
 import ConnectGaloy, { galoyUrls } from "@screens/connectors/ConnectGaloy";
-import ConnectKollider from "@screens/connectors/ConnectKollider";
 import ConnectLnbits from "@screens/connectors/ConnectLnbits";
 import ConnectLnc from "@screens/connectors/ConnectLnc";
 import ConnectLnd from "@screens/connectors/ConnectLnd";
@@ -22,7 +21,6 @@ import core_ln from "/static/assets/icons/core_ln.svg";
 import eclair from "/static/assets/icons/eclair.jpg";
 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";
 import lnbits from "/static/assets/icons/lnbits.png";
@@ -66,21 +64,6 @@ const galoyPaths: { [key: string]: keyof typeof galoyUrls } = {
   bitcoinJungle: "galoy-bitcoin-jungle",
 };
 
-const kolliderConnectorRoutes: ChildRoute[] = [
-  {
-    index: true,
-    element: <ConnectKollider variant="select" />,
-  },
-  {
-    path: "create",
-    element: <ConnectKollider variant="create" />,
-  },
-  {
-    path: "login",
-    element: <ConnectKollider variant="login" />,
-  },
-];
-
 const connectorMap: { [key: string]: ConnectorRoute } = {
   lnd: {
     path: "lnd",
@@ -148,14 +131,6 @@ const connectorMap: { [key: string]: ConnectorRoute } = {
     title: i18n.t("translation:choose_connector.eclair.title"),
     logo: eclair,
   },
-  kollider: {
-    path: "kollider",
-    element: <ConnectKollider variant="select" />,
-    title: i18n.t("translation:choose_connector.kollider.title"),
-    description: i18n.t("translation:choose_connector.kollider.description"),
-    logo: kolliderLogo,
-    children: kolliderConnectorRoutes,
-  },
   [galoyPaths.blink]: {
     path: galoyPaths.blink,
     element: <ConnectGaloy instance={galoyPaths.blink} />,
@@ -251,7 +226,6 @@ function getConnectorRoutes(): ConnectorRoute[] {
     connectorMap["commando"],
     connectorMap["lnbits"],
     connectorMap["lnd-hub-go"],
-    connectorMap["kollider"],
     connectorMap["eclair"],
     connectorMap["btcpay"],
     connectorMap[galoyPaths.blink],

diff --git a/src/app/screens/Discover/websites.json b/src/app/screens/Discover/websites.json
@@ -149,12 +149,6 @@
   {
     "title": "trading",
     "items": [
-      {
-        "title": "Kollider",
-        "subtitle": "Instant Bitcoin derivatives trading",
-        "logo": "https://cdn.getalby-assets.com/alby-extension-website-screen/kollider_thumbnail.png",
-        "url": "https://kollider.xyz"
-      },
       {
         "title": "LNMarkets",
         "subtitle": "Instant Bitcoin derivatives trading",

diff --git a/src/app/screens/connectors/ConnectKollider/index.tsx b/src/app/screens/connectors/ConnectKollider/index.tsx
diff --git a/src/common/constants.ts b/src/common/constants.ts
@@ -7,7 +7,7 @@ export const ABORT_PROMPT_ERROR = "Prompt was closed";
 export const USER_REJECTED_ERROR = "User rejected";
 export const NO_KEYS_ERROR = "No keys available";
 
-// Currently only relevant for connector Kollider
+// Currently only relevant for connectors which provide stablecoins
 // all other connectors fall back to BTC
 export type ACCOUNT_CURRENCIES = "EUR" | "USD" | "BTC";
 

diff --git a/src/extension/background-script/actions/allowances/__tests__/delete.test.ts b/src/extension/background-script/actions/allowances/__tests__/delete.test.ts
@@ -12,7 +12,7 @@ const mockPermissions = [
     accountId: "123456",
     allowanceId: 1,
     createdAt: "1667291216372",
-    host: "pro.kollider.xyz",
+    host: "getalby.com",
     method: "webln/listchannels",
     blocked: false,
     enabled: true,
@@ -74,13 +74,13 @@ describe("delete allowance", () => {
     expect(dbAllowances).toEqual([
       {
         enabled: true,
-        host: "pro.kollider.xyz",
+        host: "getalby.com",
         id: 1,
-        imageURL: "https://pro.kollider.xyz/favicon.ico",
+        imageURL: "https://getalby.com/favicon.ico",
         lastPaymentAt: 0,
         enabledFor: ["webln"],
         lnurlAuth: true,
-        name: "pro kollider",
+        name: "Alby: Your Bitcoin & Nostr companion for the web",
         remainingBudget: 500,
         totalBudget: 500,
         createdAt: "123456",

diff --git a/src/extension/background-script/actions/allowances/__tests__/enable.test.ts b/src/extension/background-script/actions/allowances/__tests__/enable.test.ts
@@ -78,24 +78,24 @@ describe("enable allowance", () => {
       origin: {
         location: "test",
         domain: "",
-        host: "pro.kollider.xyz",
+        host: "getalby.com",
         pathname: "test",
-        name: "pro kollider",
+        name: "Alby: Your Bitcoin & Nostr companion for the web",
         description: "test",
         icon: "",
         metaData: {},
         external: true,
       },
       args: {
-        host: "pro.kollider.xyz",
+        host: "getalby.com",
       },
     };
     const sender: Sender = {
       documentId: "ALBY123",
       documentLifecycle: "active",
       id: "alby",
-      origin: `https://pro.kollider.xyz`,
-      url: `https://pro.kollider.xyz/test`,
+      origin: `https://getalby.com`,
+      url: `https://getalby.com/test`,
     };
 
     expect(await enableAllowance(message, sender)).toStrictEqual({

diff --git a/src/extension/background-script/actions/allowances/__tests__/get.test.ts b/src/extension/background-script/actions/allowances/__tests__/get.test.ts
@@ -23,7 +23,7 @@ describe("get allowance", () => {
         internal: true,
       },
       args: {
-        host: "pro.kollider.xyz",
+        host: "getalby.com",
       },
     };
 

diff --git a/src/extension/background-script/actions/blocklist/__tests__/delete.test.ts b/src/extension/background-script/actions/blocklist/__tests__/delete.test.ts
@@ -37,11 +37,11 @@ describe("delete from blocklist", () => {
 
     expect(dbBlocklist).toEqual([
       {
-        host: "pro.kollider.xyz",
+        host: "getalby.com",
         id: 1,
-        imageURL: "https://pro.kollider.xyz/favicon.ico",
+        imageURL: "https://getalby.com/favicon.ico",
         isBlocked: true,
-        name: "pro kollider",
+        name: "Alby: Your Bitcoin & Nostr companion for the web",
       },
     ]);
   });

diff --git a/src/extension/background-script/actions/blocklist/__tests__/get.test.ts b/src/extension/background-script/actions/blocklist/__tests__/get.test.ts
@@ -20,7 +20,7 @@ describe("get blocked site", () => {
         internal: true,
       },
       args: {
-        host: "pro.kollider.xyz",
+        host: "getalby.com",
       },
     };