diff --git a/src/app/router/connectorRoutes.tsx b/src/app/router/connectorRoutes.tsx index 39d52da453..417770ed69 100644 --- 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: , - }, - { - path: "create", - element: , - }, - { - path: "login", - element: , - }, -]; - 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: , - 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: , @@ -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 index a2af5b43c4..aedeb31296 100644 --- 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 deleted file mode 100644 index fdbe1208b4..0000000000 --- a/src/app/screens/connectors/ConnectKollider/index.tsx +++ /dev/null @@ -1,213 +0,0 @@ -import Button from "@components/Button"; -import ConnectorForm from "@components/ConnectorForm"; -import ConnectorPath from "@components/ConnectorPath"; -import PasswordForm from "@components/PasswordForm"; -import Select from "@components/form/Select"; -import TextField from "@components/form/TextField"; -import ConnectionErrorToast from "@components/toasts/ConnectionErrorToast"; -import { useState } from "react"; -import { useTranslation } from "react-i18next"; -import { Link, useNavigate } from "react-router-dom"; -import Alert from "~/app/components/Alert"; -import toast from "~/app/components/Toast"; -import { ACCOUNT_CURRENCIES } from "~/common/constants"; -import msg from "~/common/lib/msg"; - -import logo from "/static/assets/icons/kollider.png"; - -type Currency = { - value: ACCOUNT_CURRENCIES; - label: string; -}; - -export type Props = { - variant: "login" | "create" | "select"; -}; - -const supportedCurrencies: Currency[] = [ - { - value: "BTC", - label: "BTC (sats)", - }, - { - value: "EUR", - label: "EUR", - }, - { - value: "USD", - label: "USD", - }, -]; - -export default function ConnectKollidier({ variant }: Props) { - const navigate = useNavigate(); - const { t } = useTranslation("translation", { - keyPrefix: `choose_connector.kollider`, - }); - const { t: tCommon } = useTranslation("common"); - const [formData, setFormData] = useState({ - username: "", - password: "", - passwordConfirmation: "", - currency: "BTC", - }); - const [loading, setLoading] = useState(false); - - function handleChange( - event: React.ChangeEvent - ) { - setFormData({ - ...formData, - [event.target.name]: event.target.value.trim(), - }); - } - - async function handleSubmit(event: React.FormEvent) { - event.preventDefault(); - setLoading(true); - const account = { - name: `Kollider (${formData.currency.toUpperCase()})`, - config: { - username: formData.username, - password: formData.password, - currency: formData.currency, - }, - connector: "kollider", - }; - - try { - if (variant === "create") { - const headers = new Headers(); - headers.append("Accept", "application/json"); - headers.append("Content-Type", "application/json"); - headers.append("X-User-Agent", "alby-extension"); - const body = JSON.stringify({ - username: formData.username, - password: formData.password, - }); - const res = await ( - await fetch("https://lndhubx.kollider.xyz/api/create", { - method: "POST", - headers, - body, - }) - ).json(); - if (res.error) { - throw new Error(res.error); - } - if (res.username) { - toast.success("Account created successfully!"); - } - } - - const validation = await msg.request("validateAccount", account); - - if (validation.valid) { - const addResult = await msg.request("addAccount", account); - if (addResult.accountId) { - await msg.request("selectAccount", { - id: addResult.accountId, - }); - navigate("/test-connection"); - } - } else { - console.error(validation); - toast.error( - - ); - } - } catch (e) { - console.error(e); - let message = t("errors.connection_failed"); - if (e instanceof Error) { - message += `\n\n${e.message}`; - if (e.message === "UserAlreadyExists") { - message = t("errors.user_already_exists"); - } - if (e.message === "RegistrationLimitExceeded") { - message = t("errors.registration_limit_exceeded"); - } - } - toast.error(message); - } - setLoading(false); - } - - return variant === "select" ? ( -
-
- - } - actions={ - <> - -
-
- ) : ( - - {variant === "create" && {t("warning")}} -
- -
-
- -
-
-

- {t("currency.label")} -

- -
-
- ); -} diff --git a/src/common/constants.ts b/src/common/constants.ts index ec8b065a99..dc72e04f4a 100644 --- 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 index e7804e1884..4ff5b4b68d 100644 --- 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 index e8b957b5d2..c4888b1cf5 100644 --- 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 index e474053ff7..cba11f1235 100644 --- 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 index 8598d327fb..fbf5ffc7c0 100644 --- 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 index b7e2dc06a1..7b8c0991b7 100644 --- 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", }, }; diff --git a/src/extension/background-script/actions/ln/__tests__/getBalance.test.ts b/src/extension/background-script/actions/ln/__tests__/getBalance.test.ts index 5bf0e92895..9f9b37a1d3 100644 --- a/src/extension/background-script/actions/ln/__tests__/getBalance.test.ts +++ b/src/extension/background-script/actions/ln/__tests__/getBalance.test.ts @@ -26,12 +26,12 @@ jest.mock("~/extension/background-script/state", () => ({ const allowanceInDB = { 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, 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/ln/__tests__/request.test.ts b/src/extension/background-script/actions/ln/__tests__/request.test.ts index 54ef0cf737..128ee50973 100644 --- a/src/extension/background-script/actions/ln/__tests__/request.test.ts +++ b/src/extension/background-script/actions/ln/__tests__/request.test.ts @@ -27,12 +27,12 @@ jest.mock("~/extension/background-script/state", () => ({ const allowanceInDB = { 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, 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/payments/__tests__/all.test.ts b/src/extension/background-script/actions/payments/__tests__/all.test.ts index 6652c2f2eb..f7f34c8769 100644 --- a/src/extension/background-script/actions/payments/__tests__/all.test.ts +++ b/src/extension/background-script/actions/payments/__tests__/all.test.ts @@ -10,10 +10,10 @@ const mockPayments: DbPayment[] = [ createdAt: "123456", description: "A blue bird?!", destination: "Space", - host: "pro.kollider.xyz", + host: "getalby.com", id: 4, - location: "kollider", - name: "Kollider", + location: "https://www.getalby.com", + name: "Alby", paymentHash: "123", paymentRequest: "123", preimage: "123", @@ -26,10 +26,10 @@ const mockPayments: DbPayment[] = [ createdAt: "123456", description: "A yellow bird?!", destination: "Space", - host: "pro.kollider.xyz", + host: "getalby.com", id: 5, - location: "kollider", - name: "Kollider", + location: "https://www.getalby.com", + name: "Alby", paymentHash: "123", paymentRequest: "123", preimage: "123", diff --git a/src/extension/background-script/connectors/index.ts b/src/extension/background-script/connectors/index.ts index a0b5f52844..f98ee5b268 100644 --- a/src/extension/background-script/connectors/index.ts +++ b/src/extension/background-script/connectors/index.ts @@ -26,6 +26,7 @@ const connectors = { nativelnd: NativeLnd, lndhub: LndHub, nativelndhub: NativeLndHub, + kollider: Kollider, lnbits: LnBits, lnc: Lnc, nativelnbits: NativeLnBits, @@ -34,7 +35,6 @@ const connectors = { citadel: Citadel, nativecitadel: NativeCitadel, commando: Commando, - kollider: Kollider, alby: Alby, }; diff --git a/src/extension/background-script/events/__test__/persistPayments.test.ts b/src/extension/background-script/events/__test__/persistPayments.test.ts index d7c36fe424..da047eea94 100644 --- a/src/extension/background-script/events/__test__/persistPayments.test.ts +++ b/src/extension/background-script/events/__test__/persistPayments.test.ts @@ -24,10 +24,10 @@ const updatedPayments: DbPayment[] = [ createdAt: "1487076708000", description: "A red bird?!", destination: "Space", - host: "pro.kollider.xyz", + host: "getalby.com", id: 6, location: "test", - name: "Kollider", + name: "Alby", paymentHash: "123", paymentRequest: "", preimage: "123", @@ -73,9 +73,9 @@ const data: PaymentNotificationData = { origin: { location: "test", domain: "", - host: "pro.kollider.xyz", + host: "getalby.com", pathname: "test", - name: "Kollider", + name: "Alby", description: "test", icon: "", metaData: {}, diff --git a/src/extension/background-script/events/__test__/updateAllowances.test.ts b/src/extension/background-script/events/__test__/updateAllowances.test.ts index f1084b0247..de645ce18d 100644 --- a/src/extension/background-script/events/__test__/updateAllowances.test.ts +++ b/src/extension/background-script/events/__test__/updateAllowances.test.ts @@ -32,9 +32,9 @@ const data: PaymentNotificationData = { origin: { location: "test", domain: "", - host: "pro.kollider.xyz", + host: "getalby.com", pathname: "test", - name: "Kollider", + name: "Alby", description: "test", icon: "", metaData: {}, @@ -56,7 +56,7 @@ describe("Update Allowances", () => { internal: true, }, args: { - host: "pro.kollider.xyz", + host: "getalby.com", }, }; diff --git a/src/fixtures/allowances.ts b/src/fixtures/allowances.ts index 4574e0b978..3c5e6bb714 100644 --- a/src/fixtures/allowances.ts +++ b/src/fixtures/allowances.ts @@ -3,13 +3,13 @@ import type { DbAllowance } from "~/types"; export const allowanceFixture: DbAllowance[] = [ { 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/fixtures/blocklist.ts b/src/fixtures/blocklist.ts index 7a7149d128..ed886c562e 100644 --- a/src/fixtures/blocklist.ts +++ b/src/fixtures/blocklist.ts @@ -2,11 +2,11 @@ import type { DbBlocklist } from "~/types"; export const blocklistFixture: DbBlocklist[] = [ { - 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", }, { host: "lnmarkets.com", diff --git a/src/fixtures/payment.ts b/src/fixtures/payment.ts index f29c5a6d17..cd970f1c57 100644 --- a/src/fixtures/payment.ts +++ b/src/fixtures/payment.ts @@ -7,10 +7,10 @@ export const paymentsFixture: DbPayment[] = [ createdAt: "123456", description: "A blue bird?!", destination: "Space", - host: "pro.kollider.xyz", + host: "getalby.com", id: 4, - location: "kollider", - name: "Kollider", + location: "https://www.getalby.com", + name: "Alby", paymentHash: "123", paymentRequest: "123", preimage: "123", @@ -23,10 +23,10 @@ export const paymentsFixture: DbPayment[] = [ createdAt: "123456", description: "A yellow bird?!", destination: "Space", - host: "pro.kollider.xyz", + host: "getalby.com", id: 5, - location: "kollider", - name: "Kollider", + location: "https://www.getalby.com", + name: "Alby", paymentHash: "123", paymentRequest: "123", preimage: "123", diff --git a/src/fixtures/permissions.ts b/src/fixtures/permissions.ts index ef6f46ddb4..e2d8871f8e 100644 --- a/src/fixtures/permissions.ts +++ b/src/fixtures/permissions.ts @@ -6,7 +6,7 @@ export const permissionsFixture: DbPermission[] = [ accountId: "8b7f1dc6-ab87-4c6c-bca5-19fa8632731e", allowanceId: 1, createdAt: "1487076708000", - host: "pro.kollider.xyz", + host: "getalby.com", method: "the-request-method-1", blocked: false, enabled: true, @@ -16,7 +16,7 @@ export const permissionsFixture: DbPermission[] = [ accountId: "8b7f1dc6-ab87-4c6c-bca5-19fa8632731e", allowanceId: 1, createdAt: "1487076708000", - host: "pro.kollider.xyz", + host: "getalby.com", method: "the-request-method-2", blocked: false, enabled: true, diff --git a/src/i18n/locales/cs/translation.json b/src/i18n/locales/cs/translation.json index 2891cd76ac..4e4f5ecf0f 100644 --- a/src/i18n/locales/cs/translation.json +++ b/src/i18n/locales/cs/translation.json @@ -248,30 +248,6 @@ "placeholder": "tajná fráze" } }, - "kollider": { - "description": "Přihlášení k vašemu účtu Kollider", - "title": "Kollider", - "errors": { - "connection_failed": "Připojení se nezdařilo. Jste si jisti, že jste zadali údaje k účtu správně?", - "user_already_exists": "Uživatelské jméno již existuje", - "registration_limit_exceeded": "Limit registrací byl překročen, zkuste to znovu později." - }, - "username": { - "label": "Vložte vaše uživatelské jméno ke Kollider" - }, - "currency": { - "label": "Zvolte měnu vašeho účtu" - }, - "choose_path": { - "create_new": "Přihlásit se", - "title": "Připojení k peněžence Kollider", - "description": "Přihlašte se nebo si vytvořte nový Kollider účet a propojte ho s Alby." - }, - "warning": "⚠️ Prosím ujistěte se, že máte své přihlašovací údaje uložené bezpečně ve svém správci hesel. Bez těchto údajů nepůjde váš účet obnovit.", - "create": { - "title": "Vytvořte si svůj Kollider účet a propojte ho s Alby" - } - }, "umbrel_lightning_node": { "title": "Lightning uzel" } diff --git a/src/i18n/locales/da/translation.json b/src/i18n/locales/da/translation.json index 60339e16cd..fcaacfb98b 100644 --- a/src/i18n/locales/da/translation.json +++ b/src/i18n/locales/da/translation.json @@ -226,19 +226,6 @@ "invalid_token": "ugyldig JWT givet" } }, - "kollider": { - "title": "Kollider", - "description": "Log ind på din Kollider-konto", - "username": { - "label": "Indtast dit Kollider-brugernavn" - }, - "currency": { - "label": "Vælg din kontovaluta" - }, - "errors": { - "connection_failed": "Forbindelsen kunne ikke oprettes. Er du sikker på at kontooplysningerne er korrekte?" - } - }, "btcpay": { "title": "BTCPay Server", "page": { diff --git a/src/i18n/locales/de/translation.json b/src/i18n/locales/de/translation.json index c14b4a1ac0..1bc40ba79d 100644 --- a/src/i18n/locales/de/translation.json +++ b/src/i18n/locales/de/translation.json @@ -237,34 +237,6 @@ "connection_failed": "Verbindung fehlgeschlagen. Ist deine Core Lightning Node online und verwendet diese das Commando Plugin?" } }, - "kollider": { - "title": "Kollider", - "description": "Anmeldung bei deinem Kollider Konto", - "currency": { - "label": "Wähle dein Währungskonto" - }, - "errors": { - "connection_failed": "Verbindung fehlgeschlagen. Bist du dir sicher, dass die Kontodaten korrekt sind?", - "registration_limit_exceeded": "Registrierungslimit überschritten, versuche es später noch einmal.", - "user_already_exists": "Benutzername existiert bereits" - }, - "username": { - "label": "Benutzername" - }, - "choose_path": { - "title": "Verbinden mit deiner Kollider-Wallet", - "description": "Melde dich an oder registriere dich für ein neues Kollider-Konto und stelle eine Verbindung zu Alby her.", - "create_new": "Registriere dich" - }, - "create": { - "description": "Erstelle ein neues Kollider-Konto, um Bitcoin zu senden, zu empfangen und zu handeln.", - "title": "Erstelle dein Kollider-Konto und verbinde dich mit Alby" - }, - "login": { - "title": "Verbinden mit deinem Kollider-Konto" - }, - "warning": "⚠️ Bitte stelle sicher, dass du deine Zugangsdaten sicher in einem Passwort-Manager speicherst. Ohne diese Zugangsdaten kann dein Konto nicht wiederhergestellt werden." - }, "title": "Verbinde Lightning Wallet", "lnc": { "title": "Lightning Terminal (LNC)", diff --git a/src/i18n/locales/el/translation.json b/src/i18n/locales/el/translation.json index 93b5bcc07c..ac7980b5b7 100644 --- a/src/i18n/locales/el/translation.json +++ b/src/i18n/locales/el/translation.json @@ -98,11 +98,6 @@ "label": "Κωδικός Eclair" } }, - "kollider": { - "username": { - "label": "Όνομα χρήστη" - } - }, "commando": { "port": { "label": "Θύρα" diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json index 027b92ef0f..385176292e 100644 --- a/src/i18n/locales/en/translation.json +++ b/src/i18n/locales/en/translation.json @@ -236,34 +236,6 @@ "invalid_token": "invalid Access token passed" } }, - "kollider": { - "title": "Kollider", - "description": "Login to your Kollider account", - "warning": "⚠️ Please make sure you store your credentials securely in a password manager. Without these credentials your account will not be recoverable.", - "choose_path": { - "title": "Connect to your Kollider Wallet", - "description": "Login or sign up for a new Kollider account and connect to Alby.", - "create_new": "Sign up" - }, - "create": { - "title": "Create your Kollider account and connect to Alby", - "description": "Create a new Kollider account to send, receive and trade Bitcoin." - }, - "login": { - "title": "Connect to your Kollider account" - }, - "username": { - "label": "Username" - }, - "currency": { - "label": "Select your currency account" - }, - "errors": { - "connection_failed": "Connection failed. Are you sure the account data is correct?", - "user_already_exists": "Username already exists", - "registration_limit_exceeded": "Registration limit exceeded, try after sometime." - } - }, "btcpay": { "title": "BTCPay Server", "page": { diff --git a/src/i18n/locales/es/translation.json b/src/i18n/locales/es/translation.json index 050aef0de9..ab91b9c1e5 100644 --- a/src/i18n/locales/es/translation.json +++ b/src/i18n/locales/es/translation.json @@ -185,34 +185,6 @@ "connection_failed": "La conexión falló. ¿Es correcto el URI de LNDHub?" } }, - "kollider": { - "description": "Inicie sesión en su cuenta Kollider", - "username": { - "label": "Nombre de usuario" - }, - "errors": { - "connection_failed": "La conexión falló. ¿Te aseguraste de que los datos de la cuenta son correctos?", - "user_already_exists": "El nombre de usuario ya existe", - "registration_limit_exceeded": "Límite de registro excedido, inténtalo más tarde." - }, - "title": "Kollider", - "currency": { - "label": "Seleccione su cuenta de divisas" - }, - "choose_path": { - "description": "Inicia sesión o regístrate para obtener una nueva cuenta de Kollider y conéctate a Alby.", - "title": "Conéctate a tú monedero Kollider", - "create_new": "Regístrate" - }, - "create": { - "title": "Crea tú cuenta Kollider y conéctate a Alby", - "description": "Crea una nueva cuenta Kollider para enviar, recibir e intercambiar Bitcoin." - }, - "login": { - "title": "Conéctate a tú cuenta Kollider" - }, - "warning": "⚠️ Asegúrate de almacenar tus credenciales de forma segura en un administrador de contraseñas. Sin estas credenciales, tú cuenta no será recuperable." - }, "commando": { "pubkey": { "label": "Clave Pública" diff --git a/src/i18n/locales/fa/translation.json b/src/i18n/locales/fa/translation.json index f901096ed6..dd1c9331a8 100644 --- a/src/i18n/locales/fa/translation.json +++ b/src/i18n/locales/fa/translation.json @@ -236,34 +236,6 @@ "info": "ادغام {{label}} با البی در مرحله آلفا است و فقط برای کاربران پیشرفته توصیه می شود.

با ورود به اپ موبایل، با کلیک بر روی ایکن تنظیمات، و سپس سه بار ضربه زدن روی ساخت شماره در منوی توسعه دهنده، می توانید شماره دسترسی خود را بگیرید.

شماره دسترسی می تواند از اینجا کپی شود

" } }, - "kollider": { - "title": "Kollider", - "description": "به اکانت Kollider وارد شوید", - "warning": "⚠️لطفا اطمینان حاصل کنید اعتبارنامه هایتان بطور امن در یک برنامه مدیریت گذواژه ذخیره شده است. بدون این اعتبارنامه ها حساب کاربریتان قابل بازیابی نخواهد بود.", - "choose_path": { - "title": "اتصال به کیف پول Kollider شما", - "description": "به حساب کاربری Kollider وارد شوید یا ثبتنام کنید تا به البی وصل شوید.", - "create_new": "ثبتنام" - }, - "create": { - "title": "حساب کاربری Kollider بسازید تا به البی وصل شوید", - "description": "یک حساب کاربری Kollider جدید بسازید تا ارسال، دریافت و معامله انجام دهید." - }, - "login": { - "title": "اتصال به حساب کاربری Kollider شما" - }, - "username": { - "label": "نام کاربری" - }, - "currency": { - "label": "حساب کاربری فعلی خود را انتخاب کنید" - }, - "errors": { - "connection_failed": "اتصال انجام نشد. مطمئنید داده های حساب کاربری صحیح است؟", - "user_already_exists": "این نام کاربری در حال حاضر وجود دارد", - "registration_limit_exceeded": "از محدودیت ثبتنام فراتر رفته اید، پس از مدتی دوباره تلاش کنید." - } - }, "btcpay": { "title": "سرور BTCPay", "page": { diff --git a/src/i18n/locales/fr/translation.json b/src/i18n/locales/fr/translation.json index 386630db9e..870b44495c 100644 --- a/src/i18n/locales/fr/translation.json +++ b/src/i18n/locales/fr/translation.json @@ -226,19 +226,6 @@ "invalid_token": "JWT invalide passé" } }, - "kollider": { - "title": "Kollider", - "description": "Connectez-vous à votre compte Kollider", - "username": { - "label": "Saisissez votre nom d'utilisateur pour Kollider" - }, - "currency": { - "label": "Sélectionnez votre compte en devise" - }, - "errors": { - "connection_failed": "La connexion a échoué. Êtes-vous sûr que les données du compte sont correctes ?" - } - }, "btcpay": { "title": "Serveur BTCPay", "page": { diff --git a/src/i18n/locales/hi/translation.json b/src/i18n/locales/hi/translation.json index a028247ce3..292c6f31af 100644 --- a/src/i18n/locales/hi/translation.json +++ b/src/i18n/locales/hi/translation.json @@ -233,34 +233,6 @@ "invalid_token": "अवैध JWT उत्तीर्ण" } }, - "kollider": { - "title": "Kollider", - "description": "अपने Kollider account", - "username": { - "label": "अपना Kollider उपयोगकर्ता नाम दर्ज करें" - }, - "currency": { - "label": "अपना मुद्रा खाता चुनें" - }, - "errors": { - "connection_failed": "कनेक्शन विफल। क्या आप सुनिश्चित हैं कि खाता डेटा सही है?", - "registration_limit_exceeded": "पंजीकरण सीमा पार हो गई है, कुछ समय बाद प्रयास करें।", - "user_already_exists": "उपयोगकर्ता नाम पहले से मौजूद है" - }, - "create": { - "title": "अपना कोलाइडर खाता बनाएं और अल्बी से जुड़ें", - "description": "बिटकॉइन भेजने, प्राप्त करने और व्यापार करने के लिए एक नया कोलाइडर खाता बनाएं।" - }, - "warning": "⚠️ कृपया सुनिश्चित करें कि आप अपने क्रेडेंशियल्स को एक पासवर्ड मैनेजर में सुरक्षित रूप से संग्रहीत करते हैं। इन क्रेडेंशियल्स के बिना आपका खाता पुनः प्राप्त नहीं हो सकेगा", - "choose_path": { - "title": "अपने कॉलाइडर वॉलेट से जुड़ें", - "description": "कॉलाइडर खाते में लॉगिन करें या नए खाते के लिए साइन अप करें और अल्बी से जुड़ें।", - "create_new": "साइन अप करें" - }, - "login": { - "title": "अपने कॉलाइडर खाते से जुड़ें" - } - }, "btcpay": { "title": "BTCPay Server", "page": { diff --git a/src/i18n/locales/id/translation.json b/src/i18n/locales/id/translation.json index 78f96ab395..59e2a933b5 100644 --- a/src/i18n/locales/id/translation.json +++ b/src/i18n/locales/id/translation.json @@ -232,34 +232,6 @@ "login": "Login" } }, - "kollider": { - "title": "Kollider", - "description": "Masuk pada akun Kollider", - "warning": "⚠️ Mohon pastikan kamu menyimpan kredensial di aplikasi password manager secara aman. Jika tidak ada kredensial tersebut, akun kamu tidak dapat dipulihkan.", - "choose_path": { - "title": "Sambungkan dengan Kollider Wallet", - "description": "Login atau daftar akun Kollider dan sambungkan dengan Alby.", - "create_new": "Daftar" - }, - "create": { - "title": "Buat akun Kollider dan sambungkan dengan Alby", - "description": "Buat akun Kollider untuk mengirim, menerima, dan menukar Bitcoin." - }, - "login": { - "title": "Sambungkan akun Kollider kamu" - }, - "username": { - "label": "Username" - }, - "currency": { - "label": "Pilih mata uang akun kamu" - }, - "errors": { - "connection_failed": "Koneksi gagal. Apakah kamu yakin data akun sudah benar?", - "user_already_exists": "Username sudah terpakai", - "registration_limit_exceeded": "Limit pendaftaran sudah maksimal, coba lagi dalam beberapa saat." - } - }, "btcpay": { "page": { "title": "Sambungkan dengan node BTCPay LND", diff --git a/src/i18n/locales/it/translation.json b/src/i18n/locales/it/translation.json index 6ff2896bce..1fac502093 100644 --- a/src/i18n/locales/it/translation.json +++ b/src/i18n/locales/it/translation.json @@ -199,19 +199,6 @@ "connection_failed": "Connessione fallita. L'URL di connessione a BTCPay è corretto e accessibile?" } }, - "kollider": { - "description": "Accedi al tuo account Kollider", - "username": { - "label": "Inserisci il tuo username Kollider" - }, - "currency": { - "label": "Seleziona la valuta del tuo account" - }, - "errors": { - "connection_failed": "Connessione fallita. Sei sicuro che i dati dell'account siano corretti?" - }, - "title": "Kollider" - }, "commando": { "port": { "label": "Porta" diff --git a/src/i18n/locales/ja/translation.json b/src/i18n/locales/ja/translation.json index 567d038b5c..b27c722fbd 100644 --- a/src/i18n/locales/ja/translation.json +++ b/src/i18n/locales/ja/translation.json @@ -236,34 +236,6 @@ "invalid_token": "無効なアクセストークンです" } }, - "kollider": { - "warning": "⚠️ 認証情報は必ずパスワードマネージャーに保存してください。認証情報を紛失した場合、アカウントを復元することはできません。", - "title": "Kollider", - "choose_path": { - "create_new": "新規登録", - "title": "Koliderウォレットに接続", - "description": "ログインまたはKoliderアカウントを新規作成して、Albyに接続してください。" - }, - "create": { - "title": "Koliderアカウントを作成してAlbyと接続", - "description": "新しいKolliderアカウントを作成し、ビットコインの送受金と取引を始める。" - }, - "description": "Koliderアカウントにログイン", - "username": { - "label": "ユーザ名" - }, - "errors": { - "user_already_exists": "ユーザー名は既に存在します", - "registration_limit_exceeded": "登録制限を超えました。しばらくしてからお試しください。", - "connection_failed": "接続に失敗しました。アカウントデータは正しいですか?" - }, - "login": { - "title": "Kolliderアカウントに接続" - }, - "currency": { - "label": "通貨アカウントを選択" - } - }, "btcpay": { "page": { "title": "BTCPay LNDノードに接続", diff --git a/src/i18n/locales/mr/translation.json b/src/i18n/locales/mr/translation.json index a949986d0a..a9ba3e628f 100644 --- a/src/i18n/locales/mr/translation.json +++ b/src/i18n/locales/mr/translation.json @@ -226,19 +226,6 @@ "invalid_token": "चुकीचे JWT पास झाले" } }, - "kollider": { - "title": "Kollider", - "description": "तुमच्या Kollider खात्यात लॉग इन करा", - "username": { - "label": "तुमचे Kollider username प्रविष्ट करा" - }, - "currency": { - "label": "तुमचे चलन खाते निवडा" - }, - "errors": { - "connection_failed": "कनेक्शन अयशस्वी झाले. तुम्हाला खात्री आहे की खाते डेटा बरोबर आहे?" - } - }, "btcpay": { "title": "BTCPay Server", "page": { diff --git a/src/i18n/locales/pl/translation.json b/src/i18n/locales/pl/translation.json index fc621c71c9..1e95ec6731 100644 --- a/src/i18n/locales/pl/translation.json +++ b/src/i18n/locales/pl/translation.json @@ -232,23 +232,6 @@ "invalid_token": "podano nieprawidłowy token JWT" } }, - "kollider": { - "title": "Kollider", - "description": "Zaloguj się do swojego konta Kollider", - "username": { - "label": "Wprowadź nazwę użytkownika Kollider" - }, - "currency": { - "label": "Wybierz walutę swojego konta" - }, - "errors": { - "connection_failed": "Połączenie nieudane. Czy na pewno podane dane są poprawne?" - }, - "warning": "⚠️ Upewnij się, że bezpiecznie przechowujesz swoje dane uwierzytelniające w menedżerze haseł. Bez tych poświadczeń Twoje konto nie będzie możliwe do odzyskania.", - "choose_path": { - "title": "Połącz ze swoim portfelem Kollider" - } - }, "btcpay": { "title": "BTCPay Server", "page": { diff --git a/src/i18n/locales/pt_BR/translation.json b/src/i18n/locales/pt_BR/translation.json index a468a927b7..c54a8129df 100644 --- a/src/i18n/locales/pt_BR/translation.json +++ b/src/i18n/locales/pt_BR/translation.json @@ -236,32 +236,6 @@ } }, "title": "Conectar Carteira Bitcoin", - "kollider": { - "title": "Kollider", - "warning": "⚠️ Certifique-se de armazenar suas credenciais com segurança em um gerenciador de senhas. Sem essas credenciais, não poderemos recuperar sua conta.", - "choose_path": { - "create_new": "Criar conta Kollider", - "description": "Crie uma conta Kollider ou faça o login caso já possua uma conta.", - "title": "Conecte-se na sua carteira Kollider" - }, - "create": { - "title": "Crie sua conta na Kollider e conecte-se na Alby", - "description": "Crie uma nova conta Kollider para enviar, receber e negociar Bitcoin." - }, - "login": { - "title": "Conecte-se na sua conta Kollider" - }, - "username": { - "label": "Nome de usuário" - }, - "errors": { - "user_already_exists": "Esse nome de usuário já existe", - "connection_failed": "Falha na conexão. Você tem certeza de que os dados da conta estão corretos?" - }, - "currency": { - "label": "Escolha a moeda da conta" - } - }, "lnc": { "page": { "title": "Conecte-se no servidor LND usando LNC", diff --git a/src/i18n/locales/ro/translation.json b/src/i18n/locales/ro/translation.json index 5767f8ce14..c172e24c85 100644 --- a/src/i18n/locales/ro/translation.json +++ b/src/i18n/locales/ro/translation.json @@ -226,19 +226,6 @@ "invalid_token": "JWT invalid a trecut" } }, - "kollider": { - "title": "Kollider", - "description": "Logare la contul tau Kollider", - "username": { - "label": "Introdu numele de utilizator Kollider" - }, - "currency": { - "label": "Selecteaza contul de moneda" - }, - "errors": { - "connection_failed": "Conexiune esuata. Esti sigur ca datele contului sunt corecte?" - } - }, "btcpay": { "title": "Serverul BTCPay", "page": { diff --git a/src/i18n/locales/ru/translation.json b/src/i18n/locales/ru/translation.json index 6f99a00ae0..0fabfb1292 100644 --- a/src/i18n/locales/ru/translation.json +++ b/src/i18n/locales/ru/translation.json @@ -240,19 +240,6 @@ "invalid_token": "" } }, - "kollider": { - "title": "", - "description": "", - "username": { - "label": "" - }, - "currency": { - "label": "" - }, - "errors": { - "connection_failed": "" - } - }, "btcpay": { "title": "", "page": { diff --git a/src/i18n/locales/sl/translation.json b/src/i18n/locales/sl/translation.json index 9ca478b133..64a8f87374 100644 --- a/src/i18n/locales/sl/translation.json +++ b/src/i18n/locales/sl/translation.json @@ -99,33 +99,6 @@ "missing_token": "Manjka dostopni žeton, ne moreš se prijaviti." } }, - "kollider": { - "description": "Prijava v Kollider račun", - "username": { - "label": "Uporabniško ime" - }, - "errors": { - "registration_limit_exceeded": "Preseženo število registracij, poskusi čez nekaj časa.", - "connection_failed": "Povezava ni uspela. Si prepičan, da so podatki pravilni?", - "user_already_exists": "Uporabniško ime že obstaja" - }, - "title": "Kollider", - "choose_path": { - "title": "Poveži v Kollider Wallet", - "description": "Prijavi ali se registriraj v nov Kollider račun in se poveži v Alby.", - "create_new": "Registracija" - }, - "create": { - "title": "Ustvari svoj Kollider račun se poveži v Alby", - "description": "Ustvari nov Kollider račun za pošiljanje, sprejemanje in menjavo Bitcoin-ov." - }, - "login": { - "title": "Poveži se z Kollider računom" - }, - "currency": { - "label": "Izberi valuto računa" - } - }, "btcpay": { "config": { "label": "Podatki o konfiguraciji", diff --git a/src/i18n/locales/sv/translation.json b/src/i18n/locales/sv/translation.json index 492877d787..2b6f1704f8 100644 --- a/src/i18n/locales/sv/translation.json +++ b/src/i18n/locales/sv/translation.json @@ -205,34 +205,6 @@ "connection_failed": "Anslutning misslyckades. Är URL till BTCPay-anslutningen korrekt och tillgänglig?" } }, - "kollider": { - "title": "Kollider", - "currency": { - "label": "Välj ditt valutakonto" - }, - "errors": { - "connection_failed": "Anslutningen misslyckades. Är du säker på att kontouppgifterna är korrekta?", - "user_already_exists": "Användarnamnet finns redan", - "registration_limit_exceeded": "Registreringsgränsen har överskridits, försök efter en stund." - }, - "description": "Logga in på ditt Kollider-konto", - "username": { - "label": "Användarnamn" - }, - "warning": "⚠️ Se till att du sparar dina uppgifter säkert i en lösenordshanterare. Utan dessa inloggningsuppgifter kommer ditt konto inte att kunna återställas.", - "choose_path": { - "title": "Anslut till din Kollider Wallet", - "description": "Logga in eller registrera dig för ett nytt Kollider-konto och anslut till Alby.", - "create_new": "Registrera" - }, - "create": { - "title": "Skapa ditt Kollider-konto och anslut till Alby", - "description": "Skapa ett nytt Kollider-konto för att skicka, ta emot och handla Bitcoin." - }, - "login": { - "title": "Anslut till ditt Kollider-konto" - } - }, "commando": { "port": { "label": "Port" diff --git a/src/i18n/locales/th/translation.json b/src/i18n/locales/th/translation.json index f624543192..a7fc62cb30 100644 --- a/src/i18n/locales/th/translation.json +++ b/src/i18n/locales/th/translation.json @@ -602,34 +602,6 @@ }, "title": "Bitcoin Jungle Wallet" }, - "kollider": { - "title": "Kollider", - "description": "เข้าสู่ระบบ บัญชี Kollider ของคุณ", - "warning": "⚠️ โปรดตรวจสอบให้แน่ใจว่าคุณจัดเก็บข้อมูล credentials ของคุณอย่างปลอดภัยใน password manager หากไม่มี credentials บัญชีของคุณจะไม่สามารถกู้คืนได้", - "errors": { - "registration_limit_exceeded": "การลงทะเบียนถึงขีดจำกัด โปรดลองอีกครั้งในภายหลัง", - "connection_failed": "เกิดข้อผิดพลาดในการเชื่อมต่อ โปรดตรวจสอบข้อมูลบัญชีของคุณว่าถูกต้องหรือไม่ ?", - "user_already_exists": "มีชื่อผู้ใช้นี้อยู่แล้ว" - }, - "choose_path": { - "title": "เชื่อมต่อกับ Kollider Wallet ของคุณ", - "description": "เข้าสู่ระบบ หรือ สมัครบัญชี Kollider เพื่อเชื่อมต่อกับ Alby", - "create_new": "สมัครใช้งาน" - }, - "create": { - "title": "สร้างบัญชี Kollider และเชื่อมต่อกับ Alby", - "description": "สร้างบัญชี Kollider เพื่อ ส่ง, รับ และแลกเปลี่ยน Bitcoin" - }, - "login": { - "title": "เชื่อมต่อกับบัญชี Kollider ของคุณ" - }, - "username": { - "label": "ชื่อผู้ใช้" - }, - "currency": { - "label": "เลือกสกุลเงินในบัญชีของคุณ" - } - }, "btcpay": { "page": { "instructions": "ไปที่ BTCPayServer ของคุณและลงชื่อเข้าใช้ในฐานะผู้ดูแลระบบ ไปที่ Server Settings > Services > LND Rest - ดูข้อมูล จากนั้นคลิก \"See QR code information\" และ คัดลอก QR Code มาวางไว้ด้านล่าง:", diff --git a/src/i18n/locales/uk/translation.json b/src/i18n/locales/uk/translation.json index 19090e9100..805caa165e 100644 --- a/src/i18n/locales/uk/translation.json +++ b/src/i18n/locales/uk/translation.json @@ -226,19 +226,6 @@ "invalid_token": "" } }, - "kollider": { - "title": "", - "description": "", - "username": { - "label": "" - }, - "currency": { - "label": "" - }, - "errors": { - "connection_failed": "" - } - }, "btcpay": { "title": "", "page": { diff --git a/src/i18n/locales/zh_Hans/translation.json b/src/i18n/locales/zh_Hans/translation.json index cfffe283c5..4e21cf4fbb 100644 --- a/src/i18n/locales/zh_Hans/translation.json +++ b/src/i18n/locales/zh_Hans/translation.json @@ -247,38 +247,6 @@ "placeholder": "秘密的堆聪短语", "label": "你的配对短语 " } - }, - "kollider": { - "title": "Kollider", - "description": "登录你的Kollider帐户", - "username": { - "label": "用户名" - }, - "currency": { - "label": "选择你的货币帐户" - }, - "errors": { - "connection_failed": "连接失败。你确定帐户数据是正确的吗?", - "user_already_exists": "用户名已存在", - "registration_limit_exceeded": "超过了注册限制,请稍后再试。" - }, - "choose_path": { - "create_new": "注册", - "description": "登录或注册一个新的Kollider帐户并连接到Alby。", - "title": "连接到你的Kollider钱包" - }, - "create": { - "title": "创建你的Kollider帐户并连接到Alby", - "description": "创建一个新的Kollider帐户来发送、接收和交易比特币。" - }, - "login": { - "title": "连接到你的Kollider帐户" - }, - "warning": "⚠️ 请确保你将你的凭证安全地保存在密码管理器中。没有这些凭证,你的帐户将无法恢复。" - }, - "title": "连接闪电钱包", - "umbrel_lightning_node": { - "title": "闪电节点" } }, "home": { diff --git a/src/i18n/locales/zh_Hant/translation.json b/src/i18n/locales/zh_Hant/translation.json index cf8ccaa306..ab110d5c58 100644 --- a/src/i18n/locales/zh_Hant/translation.json +++ b/src/i18n/locales/zh_Hant/translation.json @@ -233,34 +233,6 @@ "invalid_token": "傳遞了無效的JWT" } }, - "kollider": { - "title": "Kollider", - "description": "登錄你的 Kollider 帳戶", - "username": { - "label": "用戶名" - }, - "currency": { - "label": "選擇你的貨幣帳戶" - }, - "errors": { - "connection_failed": "連接失敗。你確定帳戶數據正確嗎?", - "user_already_exists": "用戶名已存在", - "registration_limit_exceeded": "超出註冊限制,請稍後嘗試。" - }, - "choose_path": { - "description": "登錄或註冊一個新的Kollider帳戶並連接到Alby。", - "create_new": "註冊", - "title": "連接到你的Kollider錢包" - }, - "login": { - "title": "連接到你的 Kollider 帳戶" - }, - "create": { - "description": "創建一個新的 Kollider 帳戶來發送、接收和交易比特幣。", - "title": "創建你的 Kollider 帳戶並連接到 Alby" - }, - "warning": "⚠️ 請確保你將你的憑證安全地保存在密碼管理器中。沒有這些憑證,你的帳戶將無法恢復。" - }, "btcpay": { "title": "BTCPay Server", "page": { diff --git a/static/assets/icons/kollider.png b/static/assets/icons/kollider.png deleted file mode 100644 index ccb1046823..0000000000 Binary files a/static/assets/icons/kollider.png and /dev/null differ