rujira.ui 1.0.15 → 1.0.16

package/lib/cjs/components/balance/OmniBalance.js

@@ -6,8 +6,8 @@ const react_1 = require("react");
 const react_tooltip_1 = require("react-tooltip");
 const rujira_js_1 = require("rujira.js");
 const helpers_1 = require("../../helpers");
-const ProviderIcon_1 = require("../icons/ProviderIcon");
 const NetworkIcon_1 = require("../icons/NetworkIcon");
+const ProviderIcon_1 = require("../icons/ProviderIcon");
 const Decimal_1 = require("../numbers/Decimal");
 const accountSorter = (a, b) => {
     const aIsSecured = a.asset.type === "SECURED";
@@ -20,7 +20,10 @@ const accountSorter = (a, b) => {
 };
 const OmniBalance = ({ balance, onClick, className, accountProviders, }) => {
     const tooltipId = (0, react_1.useId)();
-    const providerLookup = (0, react_1.useMemo)(() => new Map(accountProviders?.map(({ address, provider }) => [address, provider])), [accountProviders]);
+    const providerLookup = (0, react_1.useMemo)(() => new Map(accountProviders?.map(({ address, provider }) => [
+        address.address,
+        provider,
+    ])), [accountProviders]);
     const sortedAccounts = balance?.accounts
         ? [...balance.accounts].sort(accountSorter)
         : [];

package/lib/cjs/components/bridges/DepositModal.js

@@ -52,7 +52,7 @@ const Confirm = ({ asset, balance, targets, target: target_, Submit, onSuccess,
     const { t } = (0, i18n_1.useTranslation)("common");
     const ref = (0, react_1.useRef)(null);
     const [amount, setAmount] = (0, react_1.useState)(requestAmount || 0n);
-    const [target, setTarget] = (0, react_1.useState)(target_ || "");
+    const [target, setTarget] = (0, react_1.useState)(target_?.address || "");
     const [custom, setCustom] = (0, react_1.useState)("");
     const [direct, setDirect] = (0, react_1.useState)(false);
     const [advanced, setAdvanced] = (0, react_1.useState)(false);
@@ -130,7 +130,7 @@ const Confirm = ({ asset, balance, targets, target: target_, Submit, onSuccess,
                                     "w-2 h-2": true,
                                     "filter-grey": !hoverAd,
                                     "filter-white": hoverAd,
-                                }) }), advanced ? t("hideAdvancedOptions") : t("showAdvancedOptions")] })] }), advanced && ((0, jsx_runtime_1.jsxs)("div", { className: "br-1 p-2 bg-black mt-1 row wrap condensed fs-14 px-2 gap-y-1", children: [(0, jsx_runtime_1.jsx)("div", { className: "col-12 col-xs-4 text-center text-xs-left color-grey fw-500", children: t("destination") }), (0, jsx_runtime_1.jsx)("div", { className: "col-12 col-xs-8 text-center text-xs-right", children: (0, jsx_runtime_1.jsxs)(Select_1.Select, { containerClassName: "fs-14", className: "select--inline text-right", value: target, onChange: (e) => setTarget(e.currentTarget.value), children: [targets.map((x) => ((0, jsx_runtime_1.jsx)("option", { value: x, className: "bg-darkGrey", children: x }, x))), (0, jsx_runtime_1.jsx)("option", { className: "bg-darkGrey", value: "custom", children: t("customAddress") })] }) }), target === "custom" && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("div", { className: "col-12 col-xs-4 text-center text-xs-left color-grey fw-500", children: t("customDestination") }), (0, jsx_runtime_1.jsx)("div", { className: "col-12 col-xs-8 text-center text-xs-right", children: (0, jsx_runtime_1.jsx)(Input_1.Input, { containerClassName: "fs-14", value: custom, onChange: (e) => setCustom(e.currentTarget.value), className: "input--inline text-right", innerRef: ref }) })] })), canSwap && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [asset.chain === rujira_js_1.THOR ? null : ((0, jsx_runtime_1.jsx)("div", { className: "col-12 text-center text-xs-right", children: (0, jsx_runtime_1.jsx)(__1.Toggle, { className: "toggle--xs", label: `Deposit ${account?.asset.chain}.${account?.asset.metadata.symbol} directly`, checked: direct, onChange: () => setDirect((prev) => !prev) }) })), direct && ((0, jsx_runtime_1.jsxs)(__1.Warning, { className: "warning--sm condensed flex ai-c mt-1", color: "orange", children: [(0, jsx_runtime_1.jsx)("img", { src: swap_gif_1.default, alt: "", className: "filter-orange block no-shrink", style: { width: "2.5rem", height: "2.5rem" } }), (0, jsx_runtime_1.jsxs)("small", { className: "text-left fs-14", children: ["You are depositing a version of", " ", (0, jsx_runtime_1.jsx)("span", { className: "color-white", children: asset.metadata.symbol }), " ", "that is not the standard on Rujira. Our products use the", " ", (0, jsx_runtime_1.jsx)("span", { className: "color-white", children: "Ethereum" }), " version of", " ", (0, jsx_runtime_1.jsx)("span", { className: "color-white", children: asset.metadata.symbol }), "."] })] }))] })), isCustomAddressInvalid && ((0, jsx_runtime_1.jsx)("div", { className: "flex dir-r jc-c grow mt-1", children: (0, jsx_runtime_1.jsxs)(__1.Warning, { color: "red", className: "condensed iflex grow", children: [(0, jsx_runtime_1.jsx)(__1.Icons.ExclamationTriangle, { className: "color-red" }), (0, jsx_runtime_1.jsx)("span", { className: "warning__msg", children: t("invalidThorAddress") })] }) }))] })), (0, jsx_runtime_1.jsx)(Submit, { selected: account, amount: amount, target: target !== "custom" ? target : custom, swapMemo: "memo", onSuccess: onSuccess, disabled: isCustomAddressInvalid, isDangerous: false, quote: quote, shouldSwap: shouldSwap })] }));
+                                }) }), advanced ? t("hideAdvancedOptions") : t("showAdvancedOptions")] })] }), advanced && ((0, jsx_runtime_1.jsxs)("div", { className: "br-1 p-2 bg-black mt-1 row wrap condensed fs-14 px-2 gap-y-1", children: [(0, jsx_runtime_1.jsx)("div", { className: "col-12 col-xs-4 text-center text-xs-left color-grey fw-500", children: t("destination") }), (0, jsx_runtime_1.jsx)("div", { className: "col-12 col-xs-8 text-center text-xs-right", children: (0, jsx_runtime_1.jsxs)(Select_1.Select, { containerClassName: "fs-14", className: "select--inline text-right", value: target, onChange: (e) => setTarget(e.currentTarget.value), children: [targets.map((x) => ((0, jsx_runtime_1.jsx)("option", { value: x.address, className: "bg-darkGrey", children: x.address }, x.address))), (0, jsx_runtime_1.jsx)("option", { className: "bg-darkGrey", value: "custom", children: t("customAddress") })] }) }), target === "custom" && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("div", { className: "col-12 col-xs-4 text-center text-xs-left color-grey fw-500", children: t("customDestination") }), (0, jsx_runtime_1.jsx)("div", { className: "col-12 col-xs-8 text-center text-xs-right", children: (0, jsx_runtime_1.jsx)(Input_1.Input, { containerClassName: "fs-14", value: custom, onChange: (e) => setCustom(e.currentTarget.value), className: "input--inline text-right", innerRef: ref }) })] })), canSwap && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [asset.chain === rujira_js_1.THOR ? null : ((0, jsx_runtime_1.jsx)("div", { className: "col-12 text-center text-xs-right", children: (0, jsx_runtime_1.jsx)(__1.Toggle, { className: "toggle--xs", label: `Deposit ${account?.asset.chain}.${account?.asset.metadata.symbol} directly`, checked: direct, onChange: () => setDirect((prev) => !prev) }) })), direct && ((0, jsx_runtime_1.jsxs)(__1.Warning, { className: "warning--sm condensed flex ai-c mt-1", color: "orange", children: [(0, jsx_runtime_1.jsx)("img", { src: swap_gif_1.default, alt: "", className: "filter-orange block no-shrink", style: { width: "2.5rem", height: "2.5rem" } }), (0, jsx_runtime_1.jsxs)("small", { className: "text-left fs-14", children: ["You are depositing a version of", " ", (0, jsx_runtime_1.jsx)("span", { className: "color-white", children: asset.metadata.symbol }), " ", "that is not the standard on Rujira. Our products use the", " ", (0, jsx_runtime_1.jsx)("span", { className: "color-white", children: "Ethereum" }), " version of", " ", (0, jsx_runtime_1.jsx)("span", { className: "color-white", children: asset.metadata.symbol }), "."] })] }))] })), isCustomAddressInvalid && ((0, jsx_runtime_1.jsx)("div", { className: "flex dir-r jc-c grow mt-1", children: (0, jsx_runtime_1.jsxs)(__1.Warning, { color: "red", className: "condensed iflex grow", children: [(0, jsx_runtime_1.jsx)(__1.Icons.ExclamationTriangle, { className: "color-red" }), (0, jsx_runtime_1.jsx)("span", { className: "warning__msg", children: t("invalidThorAddress") })] }) }))] })), (0, jsx_runtime_1.jsx)(Submit, { selected: account, amount: amount, target: target !== "custom" ? target : custom, swapMemo: "memo", onSuccess: onSuccess, disabled: isCustomAddressInvalid, isDangerous: false, quote: quote, shouldSwap: shouldSwap })] }));
 };
 const Success = ({ tx, dismiss, }) => {
     const { t } = (0, i18n_1.useTranslation)("common");

package/lib/cjs/components/buttons/TxButton.js

@@ -194,13 +194,19 @@ const TxButton = (props) => {
                     "button--grey": disabled &&
                         !isSimulating &&
                         !stylingClasses.includes("transparent"),
-                    "button--waiting": (isSigning || isRejected || isSuccess || (isSimulating && animateSimulation)) &&
+                    "button--waiting": (isSigning ||
+                        isRejected ||
+                        isSuccess ||
+                        (isSimulating && animateSimulation)) &&
                         !className?.includes("transparent"),
                     "button--success": isSuccess,
                     "button--rejected": isRejected,
                     "button--simulating": isSimulating && animateSimulation,
                 }), style: {
-                    cursor: isSigning || isSuccess || isRejected || (isSimulating && animateSimulation)
+                    cursor: isSigning ||
+                        isSuccess ||
+                        isRejected ||
+                        (isSimulating && animateSimulation)
                         ? "default"
                         : undefined,
                     ...rest.style,

package/lib/cjs/components/header/Accounts.js

@@ -37,15 +37,7 @@ const Accounts = ({ provider, routingElement, wallets, ProviderIcon, getValue, c
                         }, children: (0, jsx_runtime_1.jsx)(__1.Input, { value: `https://rujira.network/?ref=${referral}`, readOnly: true, label: t("clickToCopy") }) }), (0, jsx_runtime_1.jsx)("p", { className: "fs-12 color-grey mt-2", children: t("referralValidUntil") }), (0, jsx_runtime_1.jsx)("div", { className: "modal__footer mt-4 px-3 py-2 text-right", children: (0, jsx_runtime_1.jsx)(__1.Button, { label: t("close"), onClick: hideModal }) })] })),
         });
     };
-    return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: !accounts || accounts.length === 0 ? ((0, jsx_runtime_1.jsx)(ConnectAnimation, { children: (0, jsx_runtime_1.jsx)(exports.Wallets, { provider: provider, wallets: wallets }) })) : ((0, jsx_runtime_1.jsxs)(MyAccount, { routingElement: routingElement, provider: provider, value: selected
-                ? getValue({
-                    address: selected.address,
-                    network: rujira_js_1.THOR,
-                })
-                : false, onHide: () => setShowBlur(false), children: [selected ? ((0, jsx_runtime_1.jsxs)(ResolveLink_1.ResolveLink, { as: routingElement, to: "portfolio", className: "balance", children: [(0, jsx_runtime_1.jsx)("div", { className: "flex ai-b", children: showBalance === "true" ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Fiat_1.Fiat, { amount: getValue({
-                                            address: selected.address,
-                                            network: rujira_js_1.THOR,
-                                        }), decimals: 12, symbol: "~$", padSymbol: false, className: "color-white fs-26 condensed" }), (0, jsx_runtime_1.jsx)("button", { className: "transparent ml-1 color-grey hover-white", onClick: (e) => {
+    return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: !accounts || accounts.length === 0 ? ((0, jsx_runtime_1.jsx)(ConnectAnimation, { children: (0, jsx_runtime_1.jsx)(exports.Wallets, { provider: provider, wallets: wallets }) })) : ((0, jsx_runtime_1.jsxs)(MyAccount, { routingElement: routingElement, provider: provider, value: selected ? getValue(rujira_js_1.Account.fromAddress(selected.address)) : false, onHide: () => setShowBlur(false), children: [selected ? ((0, jsx_runtime_1.jsxs)(ResolveLink_1.ResolveLink, { as: routingElement, to: "portfolio", className: "balance", children: [(0, jsx_runtime_1.jsx)("div", { className: "flex ai-b", children: showBalance === "true" ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Fiat_1.Fiat, { amount: getValue(rujira_js_1.Account.fromAddress(selected.address)), decimals: 12, symbol: "~$", padSymbol: false, className: "color-white fs-26 condensed" }), (0, jsx_runtime_1.jsx)("button", { className: "transparent ml-1 color-grey hover-white", onClick: (e) => {
                                             e.stopPropagation();
                                             e.preventDefault();
                                             setShowBalance("false");
@@ -55,8 +47,8 @@ const Accounts = ({ provider, routingElement, wallets, ProviderIcon, getValue, c
                                             e.preventDefault();
                                             setShowBalance("true");
                                             return false;
-                                        }, style: { marginRight: "-1rem" }, children: (0, jsx_runtime_1.jsx)(Icons_1.EyeSlash, { className: "w-2 h-2" }) })] })) }), (0, jsx_runtime_1.jsx)("p", { className: "fs-12 condensed color-grey mt-0.5", children: t("viewPortfolio") })] })) : null, accounts.map((account) => ((0, jsx_runtime_1.jsx)(AddressC, { provider: provider, ProviderIcon: ProviderIcon, account: account, selected: selected?.address === account.address &&
-                        selected.provider === account.provider }, account.address + account.provider))), (0, jsx_runtime_1.jsxs)("nav", { className: "actions", children: [referral && ((0, jsx_runtime_1.jsxs)("button", { className: "action transparent", onClick: ReferralModal, children: [(0, jsx_runtime_1.jsx)(Icons_1.Users, {}), (0, jsx_runtime_1.jsx)("span", { children: t("referralLink") })] })), (0, jsx_runtime_1.jsxs)(react_router_dom_1.Link, { className: "action transparent", to: "connect", children: [(0, jsx_runtime_1.jsx)(Icons_1.Plus, {}), (0, jsx_runtime_1.jsx)("span", { children: t("connectAnotherWallet") })] }), customActions &&
+                                        }, style: { marginRight: "-1rem" }, children: (0, jsx_runtime_1.jsx)(Icons_1.EyeSlash, { className: "w-2 h-2" }) })] })) }), (0, jsx_runtime_1.jsx)("p", { className: "fs-12 condensed color-grey mt-0.5", children: t("viewPortfolio") })] })) : null, accounts.map((account) => ((0, jsx_runtime_1.jsx)(AddressC, { provider: provider, ProviderIcon: ProviderIcon, account: account, selected: selected?.address.address === account.address.address &&
+                        selected.provider === account.provider }, `${account.address.address}:${account.provider}`))), (0, jsx_runtime_1.jsxs)("nav", { className: "actions", children: [referral && ((0, jsx_runtime_1.jsxs)("button", { className: "action transparent", onClick: ReferralModal, children: [(0, jsx_runtime_1.jsx)(Icons_1.Users, {}), (0, jsx_runtime_1.jsx)("span", { children: t("referralLink") })] })), (0, jsx_runtime_1.jsxs)(react_router_dom_1.Link, { className: "action transparent", to: "connect", children: [(0, jsx_runtime_1.jsx)(Icons_1.Plus, {}), (0, jsx_runtime_1.jsx)("span", { children: t("connectAnotherWallet") })] }), customActions &&
                             customActions.map((e, index) => (0, react_2.cloneElement)(e, { key: index })), (0, jsx_runtime_1.jsxs)("button", { className: "action transparent", onClick: disconnectAll, children: [(0, jsx_runtime_1.jsx)(Icons_1.LinkDisconnect, {}), (0, jsx_runtime_1.jsx)("span", { children: t("disconnectAll") })] })] }), showBlur && (0, jsx_runtime_1.jsx)("div", { className: "blur" })] })) }));
 };
 exports.Accounts = Accounts;
@@ -120,10 +112,10 @@ const AddressC = ({ account, selected, provider, ProviderIcon, }) => {
         }), children: [(0, jsx_runtime_1.jsx)(NetworkIcon_1.NetworkIcon, { network: rujira_js_1.THOR, className: "address__wallet", selected: selected || hover }), (0, jsx_runtime_1.jsx)("p", { className: "address__address pointer", onClick: () => {
                     if (selected) {
                         react_hot_toast_1.default.success(t("addressCopied"));
-                        navigator.clipboard.writeText(account.address);
+                        navigator.clipboard.writeText(account.address.address);
                     }
                     else {
                         select(account);
                     }
-                }, children: hover && selected ? (t("copyAddress")) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [account.address.substring(0, 8), " ... ", account.address.slice(-8)] })) }), hover ? ((0, jsx_runtime_1.jsx)(Icons_1.LinkDisconnect, { className: "address__disconnect", onClick: () => disconnect(account.provider) })) : ((0, jsx_runtime_1.jsx)(ProviderIcon, { className: "address__disconnect", provider: account.provider, selected: selected }))] }));
+                }, children: hover && selected ? (t("copyAddress")) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [account.address.address.substring(0, 8), " ...", " ", account.address.address.slice(-8)] })) }), hover ? ((0, jsx_runtime_1.jsx)(Icons_1.LinkDisconnect, { className: "address__disconnect", onClick: () => disconnect(account.provider) })) : ((0, jsx_runtime_1.jsx)(ProviderIcon, { className: "address__disconnect", provider: account.provider, selected: selected }))] }));
 };

package/lib/cjs/components/header/Header.js

@@ -193,5 +193,5 @@ const SubEntertainment = ({ domain, routingElement, useRef, className, staticRou
 };
 const SubLearn = ({ domain, routingElement, useRef, className, staticRoutes, }) => {
     const { t } = (0, i18n_1.useTranslation)("header");
-    return ((0, jsx_runtime_1.jsx)(Popup, { useRef: useRef, className: className, children: (0, jsx_runtime_1.jsxs)("div", { className: "grid w-60 mt-1", children: [(0, jsx_runtime_1.jsxs)(ResolveLink_1.ResolveLink, { as: routingElement, isStatic: staticRoutes?.includes("get-started"), domain: domain, to: "get-started", className: "flex ai-s", children: [(0, jsx_runtime_1.jsx)(Icons_1.Graduate, { className: "color-grey h-3.5 w-a block mr-2 no-shrink mt-0" }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("h4", { className: "fs-14 fw-600", children: t("getStarted") }), (0, jsx_runtime_1.jsx)("p", { className: "fs-12 mt-0.5", children: t("getStartedDesc") })] })] }), (0, jsx_runtime_1.jsxs)(ResolveLink_1.ResolveLink, { as: routingElement, isStatic: staticRoutes?.includes("support"), domain: domain, to: "support", className: "flex ai-s", children: [(0, jsx_runtime_1.jsx)(Icons_1.Support, { className: "color-grey h-3.5 w-a block mr-2 no-shrink mt-0" }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("h4", { className: "fs-14 fw-600", children: t("support") }), (0, jsx_runtime_1.jsx)("p", { className: "fs-12 mt-0.5", children: t("educationDesc") })] })] }), (0, jsx_runtime_1.jsxs)("a", { href: "https://docs.rujira.network/", target: "_blank", className: "flex ai-s", children: [(0, jsx_runtime_1.jsx)(Icons_1.Code, { className: "color-grey h-3.5 w-a block mr-2 no-shrink mt-0" }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsxs)("h4", { className: "fs-14 fw-600 flex ai-c", children: [t("documentation"), " ", (0, jsx_runtime_1.jsx)(Icons_1.External, { className: "h-1.5 w-a ml-1" })] }), (0, jsx_runtime_1.jsx)("p", { className: "fs-12 mt-0.5", children: t("documentationDesc") })] })] }), (0, jsx_runtime_1.jsxs)("a", { href: "https://docs.rujira.network/developers/getting-started", target: "_blank", className: "flex ai-s", children: [(0, jsx_runtime_1.jsx)(Icons_1.Terminal, { className: "color-grey h-3.5 w-a block mr-2 no-shrink mt-0" }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsxs)("h4", { className: "fs-14 fw-600 flex ai-c", children: [t("developers"), (0, jsx_runtime_1.jsx)(Icons_1.External, { className: "h-1.5 w-a ml-1" })] }), (0, jsx_runtime_1.jsx)("p", { className: "fs-12 mt-0.5", children: t("developersDesc") })] })] }), (0, jsx_runtime_1.jsxs)(ResolveLink_1.ResolveLink, { as: routingElement, isStatic: staticRoutes?.includes("faq"), domain: domain, to: "faq", className: "flex", children: [(0, jsx_runtime_1.jsx)(Icons_1.Info, { className: "color-grey h-3.5 w-a block mr-2 no-shrink mt-0" }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("h4", { className: "fs-14 fw-600", children: t("commonQuestions") }), (0, jsx_runtime_1.jsx)("p", { className: "fs-12 mt-0.5", children: t("supportDesc") })] })] }), (0, jsx_runtime_1.jsxs)(ResolveLink_1.ResolveLink, { as: routingElement, isStatic: staticRoutes?.includes("articles"), domain: domain, to: "articles", className: "flex ai-s", children: [(0, jsx_runtime_1.jsx)(Icons_1.History, { className: "color-grey h-3.5 w-a block mr-2 no-shrink mt-0" }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("h4", { className: "fs-14 fw-600", children: t("articles") }), (0, jsx_runtime_1.jsx)("p", { className: "fs-12 mt-0.5", children: t("articlesDesc") })] })] })] }) }));
+    return ((0, jsx_runtime_1.jsx)(Popup, { useRef: useRef, className: className, children: (0, jsx_runtime_1.jsxs)("div", { className: "grid w-60 mt-1", children: [(0, jsx_runtime_1.jsxs)(ResolveLink_1.ResolveLink, { as: routingElement, isStatic: staticRoutes?.includes("get-started"), domain: domain, to: "get-started", className: "flex ai-s", children: [(0, jsx_runtime_1.jsx)(Icons_1.Graduate, { className: "color-grey h-3.5 w-a block mr-2 no-shrink mt-0" }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("h4", { className: "fs-14 fw-600", children: t("getStarted") }), (0, jsx_runtime_1.jsx)("p", { className: "fs-12 mt-0.5", children: t("getStartedDesc") })] })] }), (0, jsx_runtime_1.jsxs)(ResolveLink_1.ResolveLink, { as: routingElement, isStatic: staticRoutes?.includes("support"), domain: domain, to: "/support", className: "flex ai-s", children: [(0, jsx_runtime_1.jsx)(Icons_1.Support, { className: "color-grey h-3.5 w-a block mr-2 no-shrink mt-0" }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("h4", { className: "fs-14 fw-600", children: t("support") }), (0, jsx_runtime_1.jsx)("p", { className: "fs-12 mt-0.5", children: t("educationDesc") })] })] }), (0, jsx_runtime_1.jsxs)("a", { href: "https://docs.rujira.network/", target: "_blank", className: "flex ai-s", children: [(0, jsx_runtime_1.jsx)(Icons_1.Code, { className: "color-grey h-3.5 w-a block mr-2 no-shrink mt-0" }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsxs)("h4", { className: "fs-14 fw-600 flex ai-c", children: [t("documentation"), " ", (0, jsx_runtime_1.jsx)(Icons_1.External, { className: "h-1.5 w-a ml-1" })] }), (0, jsx_runtime_1.jsx)("p", { className: "fs-12 mt-0.5", children: t("documentationDesc") })] })] }), (0, jsx_runtime_1.jsxs)("a", { href: "https://docs.rujira.network/developers/getting-started", target: "_blank", className: "flex ai-s", children: [(0, jsx_runtime_1.jsx)(Icons_1.Terminal, { className: "color-grey h-3.5 w-a block mr-2 no-shrink mt-0" }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsxs)("h4", { className: "fs-14 fw-600 flex ai-c", children: [t("developers"), (0, jsx_runtime_1.jsx)(Icons_1.External, { className: "h-1.5 w-a ml-1" })] }), (0, jsx_runtime_1.jsx)("p", { className: "fs-12 mt-0.5", children: t("developersDesc") })] })] }), (0, jsx_runtime_1.jsxs)(ResolveLink_1.ResolveLink, { as: routingElement, isStatic: staticRoutes?.includes("faq"), domain: domain, to: "faq", className: "flex", children: [(0, jsx_runtime_1.jsx)(Icons_1.Info, { className: "color-grey h-3.5 w-a block mr-2 no-shrink mt-0" }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("h4", { className: "fs-14 fw-600", children: t("commonQuestions") }), (0, jsx_runtime_1.jsx)("p", { className: "fs-12 mt-0.5", children: t("supportDesc") })] })] }), (0, jsx_runtime_1.jsxs)(ResolveLink_1.ResolveLink, { as: routingElement, isStatic: staticRoutes?.includes("articles"), domain: domain, to: "articles", className: "flex ai-s", children: [(0, jsx_runtime_1.jsx)(Icons_1.History, { className: "color-grey h-3.5 w-a block mr-2 no-shrink mt-0" }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("h4", { className: "fs-14 fw-600", children: t("articles") }), (0, jsx_runtime_1.jsx)("p", { className: "fs-12 mt-0.5", children: t("articlesDesc") })] })] })] }) }));
 };

package/lib/cjs/components/icons/ProviderIcon.js

@@ -24,11 +24,6 @@ const ProviderIcon = ({ provider, selected, className }) => {
         case "Vulticonnect":
         case "Vultisig":
             return selected ? ((0, jsx_runtime_1.jsx)(WalletIcons.Vultisig, { className: (0, clsx_1.default)({ [`${className}`]: className }) })) : ((0, jsx_runtime_1.jsx)(WalletIcons.VultisigSimple, { className: (0, clsx_1.default)({ [`${className}`]: className }) }));
-        case "Ctrl":
-            return ((0, jsx_runtime_1.jsx)(WalletIcons.Ctrl, { className: (0, clsx_1.default)({
-                    [`${className}`]: className,
-                    "color-white": selected,
-                }) }));
         case "DaoDao":
             return ((0, jsx_runtime_1.jsx)(WalletIcons.Daodao, { className: (0, clsx_1.default)({
                     [`${className}`]: className,

package/lib/cjs/i18n/locales/de/common.json

@@ -114,7 +114,6 @@
     "vultisigEmailLabel": "E-Mail",
     "vultisigVerifyCodeLabel": "Bestätige den Fast Vault Code, der an {{email}} gesendet wurde",
     "vultisigVerify": "Bestätigen",
-    "vultisigReadOnlyWarning": "Das Signieren mit Vultisig Vaults ist vorübergehend nur für Rujira und andere Cosmos-Chains aktiviert. Vaults können erstellt, gesichert und in jede andere Vultisig-kompatible Wallet importiert werden.",
     "vultisigConnectProviderError": "useConnect muss innerhalb von ConnectProvider verwendet werden",
     "mergeNow": "Jetzt Mergen",
     "iUnderstandContinue": "Ich verstehe, Fortfahren",

package/lib/cjs/i18n/locales/de/home.json

@@ -79,7 +79,7 @@
     "builtCardScaleMobileLine2": "um neue Services zu bauen und zu skalieren,",
     "builtCardScaleMobileLine3": "sorgfältig geprüft für sichere, zuverlässige",
     "builtCardScaleMobileLine4": "und hochwertige Produkte für dich.",
-    "productsPill": "+ Produkte",
+    "productsPill": "Produkte",
     "productsTitle": "Ein System, das zusammenarbeitet",
     "productsCopy1": "Rujira bringt alle Produkte, die du brauchst, an einen Ort, an dem alles für dich zusammenspielt.",
     "productsCopy2": "Kein Springen mehr zwischen Apps oder Chains, nur ein einfacher Weg, damit DeFi leicht wirkt.",

package/lib/cjs/i18n/locales/en/common.json

@@ -114,7 +114,6 @@
     "vultisigEmailLabel": "Email",
     "vultisigVerifyCodeLabel": "Verify the Fast Vault code sent to {{email}}",
     "vultisigVerify": "Verify",
-    "vultisigReadOnlyWarning": "Vultisig Vault signing is temporarily only enabled for Rujira and other Cosmos chains. Vaults can be created, backed up, and imported into any other Vultisig compatible wallet.",
     "vultisigConnectProviderError": "useConnect must be used within ConnectProvider",
     "depositInOrderTo": "Deposit {{symbol}} in order to {{action}}, and use other Rujira products",
     "depositSymbolTo": "Deposit {{symbol}} to {{action}}",

package/lib/cjs/i18n/locales/en/home.json

@@ -79,7 +79,7 @@
     "builtCardScaleMobileLine2": "build and scale new services, carefully",
     "builtCardScaleMobileLine3": "reviewed to ensure safe, reliable,",
     "builtCardScaleMobileLine4": "and high-quality products for you.",
-    "productsPill": "+ Products",
+    "productsPill": "Products",
     "productsTitle": "A System Built to Work in Harmony",
     "productsCopy1": "Rujira brings all the products you need into one place where everything works together for you.",
     "productsCopy2": "No more jumping between apps or chains, just a simple way to make DeFi feel easy.",

package/lib/cjs/wallets/providers/cosmos.js

@@ -31,7 +31,10 @@ class CosmosAdapter {
             await k.enable(chain.chainId);
             const signer = await k.getOfflineSignerAuto(chain.chainId);
             const accounts = await signer.getAccounts();
-            return accounts.map((a) => a.address);
+            return accounts.map((a) => ({
+                address: a.address,
+                networks: [(0, exports.getNetwork)(chain)],
+            }));
         })).then((res) => {
             return res.reduce((a, v) => v.status === "fulfilled" ? [...v.value, ...a] : a, []);
         });
@@ -53,13 +56,13 @@ class CosmosAdapter {
     }
     networks() {
         return [
-            "GAIA",
-            "KUJI",
+            rujira_js_1.GAIA,
+            rujira_js_1.KUJI,
             // "NOBLE",
-            "OSMO",
+            rujira_js_1.OSMO,
             // "TERRA",
             // "TERRA2",
-            "THOR",
+            rujira_js_1.THOR,
         ];
     }
 }
@@ -72,17 +75,17 @@ exports.getGasPrice = getGasPrice;
 const getNetwork = (c) => {
     switch (c.chainName) {
         case "Kujira":
-            return "KUJI";
+            return rujira_js_1.KUJI;
         case "Cosmos Hub":
-            return "GAIA";
+            return rujira_js_1.GAIA;
         case "Noble":
             return "NOBLE";
         case "Osmosis":
-            return "OSMO";
+            return rujira_js_1.OSMO;
         case "THORChain":
         case "THORChain Stagenet":
         case "THORChain Devnet":
-            return "THOR";
+            return rujira_js_1.THOR;
         default:
             throw new Error(`No Network for chain ${c.chainName}`);
     }

package/lib/cjs/wallets/providers/eip1193.js

@@ -25,9 +25,15 @@ class Eip1193Adapter {
             ? authorizedAccounts
             : await e.request({ method: "eth_requestAccounts" });
         const eip712 = this.eip712 ? await this.eip712.connect() : [];
-        this.map = eip1193.reduce((a, v) => ({ ...a, [v]: "1193" }), this.map);
-        this.map = eip712.reduce((a, v) => ({ ...a, [v]: "712" }), this.map);
-        return [...eip712, ...eip1193.map(ethers_1.ethers.getAddress)];
+        this.map = eip1193.reduce((a, v) => ({ ...a, [ethers_1.ethers.getAddress(v)]: "1193" }), this.map);
+        this.map = eip712.reduce((a, v) => ({ ...a, [v.address]: "712" }), this.map);
+        return [
+            ...eip712,
+            ...eip1193.map((x) => ({
+                address: ethers_1.ethers.getAddress(x),
+                networks: this.eip1193Networks(),
+            })),
+        ];
     }
     async simulate(msg) {
         if (this.map[msg.account.address] === "712") {
@@ -70,7 +76,10 @@ class Eip1193Adapter {
         return new ethers_1.JsonRpcSigner(provider, account.address);
     }
     networks() {
-        return [...(this.eip712?.networks() || []), "AVAX", "BASE", "BSC", "ETH"];
+        return [...(this.eip712?.networks() || []), ...this.eip1193Networks()];
+    }
+    eip1193Networks() {
+        return [rujira_js_1.AVAX, rujira_js_1.BASE, rujira_js_1.BSC, rujira_js_1.ETH];
     }
 }
 exports.Eip1193Adapter = Eip1193Adapter;

package/lib/cjs/wallets/providers/eip712.js

@@ -19,7 +19,10 @@ class Eip712Adapter {
             throw new Error(`No bech32 prefix provided for ${this.chainInfo.chainId}`);
         const signer = new rujira_js_1.signers.cosmos.Eip712Signer(e, prefix, this.chainInfo.rpc);
         const accounts = await signer.getAccounts();
-        return accounts.map((a) => a.address);
+        return accounts.map((a) => ({
+            address: a.address,
+            networks: this.networks(),
+        }));
     }
     async simulate(msg) {
         await this.e()?.request({

package/lib/cjs/wallets/providers/index.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Provider = exports.vultisig = void 0;
 const brave_1 = require("./brave");
 const coinbase_1 = require("./coinbase");
-const ctrl_1 = require("./ctrl");
 const keplr_1 = require("./keplr");
 const leap_1 = require("./leap");
 // import { default as ledger } from "./ledger";
@@ -21,14 +20,30 @@ Object.defineProperty(exports, "vultisig", { enumerable: true, get: function ()
 const xaman_1 = require("./xaman");
 var Provider;
 (function (Provider) {
+    Provider.keys = [
+        "Brave",
+        "Coinbase",
+        "DaoDao",
+        "Keplr",
+        "Leap",
+        "Ledger",
+        "Metamask",
+        "Okx",
+        "Rabby",
+        "Station",
+        "Ton",
+        "Tronlink",
+        "Trust",
+        "Vulticonnect",
+        "Vultisig",
+        "Xaman",
+    ];
     Provider.signer = (p) => {
         switch (p) {
             case "Brave":
                 return brave_1.default;
             case "Coinbase":
                 return coinbase_1.default;
-            case "Ctrl":
-                return ctrl_1.default;
             case "DaoDao":
                 return daodao_1.default;
             case "Keplr":

package/lib/cjs/wallets/providers/keplr.js

@@ -5,8 +5,8 @@ const bitcoinjs_lib_1 = require("bitcoinjs-lib");
 const rujira_js_1 = require("rujira.js");
 const cosmos_1 = require("./cosmos");
 const eip6963_1 = require("./eip6963");
-const utxo = require("./utxo");
 const utils_1 = require("./utils");
+const utxo = require("./utxo");
 const utxo_1 = require("./utxo");
 class KeplrAdapter {
     e;
@@ -33,15 +33,18 @@ class KeplrAdapter {
         const k = window.keplr?.bitcoin;
         if (!k)
             throw new Error("No Keplr Bitcoin provider");
-        return k.connectWallet();
+        return k
+            .connectWallet()
+            .then((addrs) => addrs.map((address) => ({ address, networks: [rujira_js_1.BTC] })));
     }
     async simulate(msg) {
-        const type = (0, utils_1.walletType)(msg.account.address);
+        const type = (0, utils_1.walletType)(msg.account);
         switch (type) {
             case "cosmos":
                 return this.c.simulate(msg);
             case "evm":
                 return this.e.simulate(msg);
+            case "sol":
             case "ton":
             case "xrp":
             case "tron":
@@ -51,12 +54,13 @@ class KeplrAdapter {
         }
     }
     async signAndBroadcast(simulation, msg) {
-        const type = (0, utils_1.walletType)(msg.account.address);
+        const type = (0, utils_1.walletType)(msg.account);
         switch (type) {
             case "cosmos":
                 return this.c.signAndBroadcast(simulation, msg);
             case "evm":
                 return this.e.signAndBroadcast(simulation, msg);
+            case "sol":
             case "ton":
             case "xrp":
             case "tron":

package/lib/cjs/wallets/providers/ledger.js

@@ -31,7 +31,7 @@ class LedgerAdapter {
                 },
                 next: this.onDevice((signer, address) => {
                     this.signer = signer;
-                    return resolve([address]);
+                    return resolve([{ address, networks: [rujira_js_1.BTC] }]);
                 }, reject),
             });
         });

package/lib/cjs/wallets/providers/okx.js

@@ -5,8 +5,8 @@ const bitcoinjs_lib_1 = require("bitcoinjs-lib");
 const rujira_js_1 = require("rujira.js");
 const cosmos_1 = require("./cosmos");
 const eip6963_1 = require("./eip6963");
-const utxo = require("./utxo");
 const utils_1 = require("./utils");
+const utxo = require("./utxo");
 const utxo_1 = require("./utxo");
 class OkxAdapter {
     e;
@@ -20,16 +20,19 @@ class OkxAdapter {
     connect() {
         if (!this.b)
             throw new Error("Okx extension not found");
-        const accs = this.b.connect().then((res) => res.address);
+        const accs = this.b
+            .connect()
+            .then((res) => ({ address: res.address, networks: [rujira_js_1.BTC] }));
         return Promise.all([this.e.connect(), this.c.connect(), accs]).then((x) => x.flat());
     }
     async simulate(msg) {
-        const type = (0, utils_1.walletType)(msg.account.address);
+        const type = (0, utils_1.walletType)(msg.account);
         switch (type) {
             case "cosmos":
                 return this.c.simulate(msg);
             case "evm":
                 return this.e.simulate(msg);
+            case "sol":
             case "ton":
             case "xrp":
             case "tron":
@@ -39,12 +42,13 @@ class OkxAdapter {
         }
     }
     async signAndBroadcast(simulation, msg) {
-        const type = (0, utils_1.walletType)(msg.account.address);
+        const type = (0, utils_1.walletType)(msg.account);
         switch (type) {
             case "cosmos":
                 return this.c.signAndBroadcast(simulation, msg);
             case "evm":
                 return this.e.signAndBroadcast(simulation, msg);
+            case "sol":
             case "ton":
             case "xrp":
             case "tron":

package/lib/cjs/wallets/providers/ton.js

@@ -31,9 +31,12 @@ class TonKeeper {
         }).then((wallet) => {
             return wallet
                 ? [
-                    ton_core_1.Address.parse(wallet.account.address).toString({
-                        bounceable: false,
-                    }),
+                    {
+                        address: ton_core_1.Address.parse(wallet.account.address).toString({
+                            bounceable: false,
+                        }),
+                        networks: [rujira_js_1.TON],
+                    },
                 ]
                 : [];
         });

package/lib/cjs/wallets/providers/tronlink.js

@@ -15,7 +15,7 @@ class Tronlink {
         await t.request({ method: "tron_requestAccounts" });
         if (!t.tronWeb.defaultAddress.base58)
             throw new Error(`No account found on TronLink`);
-        return [t.tronWeb.defaultAddress.base58];
+        return [{ address: t.tronWeb.defaultAddress.base58, networks: [rujira_js_1.TRON] }];
     }
     async simulate(msg) {
         return (0, exports.simulate)(this.context(), msg);

package/lib/cjs/wallets/providers/utils.js

@@ -1,34 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.walletType = void 0;
-const encoding_1 = require("@cosmjs/encoding");
-const address_1 = require("bitcoinjs-lib/src/address");
-const walletType = (address) => {
-    if (address.startsWith("0x"))
-        return "evm";
-    if (address.startsWith("UQ") || address.startsWith("EQ"))
-        return "ton";
-    if (address.startsWith("bc1"))
-        return ["utxo", "BTC"];
-    if (address.startsWith("bitcoincash"))
-        return ["utxo", "BCH"];
-    if (address.startsWith("q"))
-        return ["utxo", "BCH"];
-    if (address.startsWith("p"))
-        return ["utxo", "BCH"];
-    if (address.startsWith("D"))
-        return ["utxo", "DOGE"];
-    if (address.startsWith("L"))
-        return ["utxo", "LTC"];
-    if (address.startsWith("ltc") && (0, address_1.fromBech32)(address).prefix === "ltc")
-        return ["utxo", "LTC"];
-    if (address.startsWith("r"))
-        return "xrp";
-    if (address.startsWith("X"))
-        return "xrp";
-    if (address.startsWith("T"))
-        return "tron";
-    (0, encoding_1.fromBech32)(address);
-    return "cosmos";
+const walletType = (account) => {
+    switch (account.network) {
+        case "AVAX":
+        case "BASE":
+        case "BSC":
+        case "ETH":
+            return "evm";
+        case "GAIA":
+        case "KUJI":
+        case "NOBLE":
+        case "OSMO":
+        case "TERRA":
+        case "TERRA2":
+        case "THOR":
+            return "cosmos";
+        case "SOL":
+            return "sol";
+        case "TON":
+            return "ton";
+        case "TRON":
+            return "tron";
+        case "XRP":
+            return "xrp";
+        case "%future added value":
+            throw new Error(`Unknown`);
+        default:
+            return ["utxo", account.network];
+    }
 };
 exports.walletType = walletType;

package/lib/cjs/wallets/providers/vulticonnect.js

@@ -23,11 +23,11 @@ class VulticonnectAdapter {
         //connections from succeeding.
         const results = await Promise.allSettled([
             this.c.connect(),
-            this.connectTo(vs.ripple),
-            this.connectTo(vs.bitcoin),
-            this.connectTo(vs.bitcoincash),
-            this.connectTo(vs.dogecoin),
-            this.connectTo(vs.litecoin),
+            this.connectTo(vs.ripple, rujira_js_1.XRP),
+            this.connectTo(vs.bitcoin, rujira_js_1.BTC),
+            this.connectTo(vs.bitcoincash, rujira_js_1.BCH),
+            this.connectTo(vs.dogecoin, rujira_js_1.DOGE),
+            this.connectTo(vs.litecoin, rujira_js_1.LTC),
             // this.connectTo(vs.ton),
             // this.connectTo(vs.tron),
             this.t.connect(),
@@ -37,19 +37,27 @@ class VulticonnectAdapter {
             .filter((r) => r.status === "fulfilled")
             .flatMap((r) => r.value);
     }
-    async connectTo(provider) {
-        return await provider.request({
+    async connectTo(provider, network) {
+        const accounts = await provider.request({
             method: "request_accounts",
         });
+        const addresses = Array.isArray(accounts) ? accounts : [accounts];
+        return addresses.map((account) => ({
+            address: typeof account === "string" ? account : account.address,
+            networks: [network],
+        }));
     }
     async simulate(msg) {
-        switch ((0, utils_1.walletType)(msg.account.address)) {
+        switch ((0, utils_1.walletType)(msg.account)) {
             case "cosmos":
                 return this.c.simulate(msg);
             case "evm":
                 return this.e.simulate(msg);
             case "tron":
                 return this.t.simulate(msg);
+            case "sol":
+            case "ton":
+                throw new Error(`${msg.account.network} not supported by Vulticonnect`);
             case "xrp":
                 const inboundAddress = await msg.inboundAddress?.(msg.account.network);
                 return {
@@ -69,13 +77,16 @@ class VulticonnectAdapter {
         }
     }
     async signAndBroadcast(simulation, msg) {
-        switch ((0, utils_1.walletType)(msg.account.address)) {
+        switch ((0, utils_1.walletType)(msg.account)) {
             case "cosmos":
                 return this.c.signAndBroadcast(simulation, msg);
             case "evm":
                 return this.e.signAndBroadcast(simulation, msg);
             case "tron":
                 return this.t.signAndBroadcast(simulation, msg);
+            case "sol":
+            case "ton":
+                throw new Error(`${msg.account.network} not supported by Vulticonnect`);
             case "xrp":
                 const payment = await msg.toXrpPayment();
                 if (payment.Memos?.length && payment.Memos.length > 1) {

package/lib/cjs/wallets/providers/vultisig/sol.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.signAndBroadcast = exports.Sol = void 0;
+const sdk_1 = require("@vultisig/sdk");
+const rujira_js_1 = require("rujira.js");
+const native_1 = require("./native");
+class Sol extends native_1.NativeVault {
+    constructor(vault) {
+        super(vault, sdk_1.Chain.Solana, rujira_js_1.SOL, 9);
+    }
+    send(transfer) {
+        return this.sendTransfer(transfer);
+    }
+}
+exports.Sol = Sol;
+const signAndBroadcast = async (context, msg) => {
+    const transfer = await msg.toNativeTransfer();
+    return {
+        network: rujira_js_1.SOL,
+        address: msg.account.address,
+        txHash: await context.send(transfer),
+        deposited: msg.toDeposit?.() || null,
+    };
+};
+exports.signAndBroadcast = signAndBroadcast;