@pollar/react 0.9.0 → 0.10.0-rc.8

package/dist/index.mjs

@@ -1033,7 +1033,7 @@ var PollarModalFooter = () => {
       /* @__PURE__ */ jsx("span", { className: "pollar-footer-name", children: "Pollar" }),
       /* @__PURE__ */ jsxs("span", { className: "pollar-footer-version", children: [
         "v",
-        "0.9.0"
+        "0.10.0-rc.8"
       ] })
     ] })
   ] });
@@ -1338,54 +1338,63 @@ function EnabledAssetsModalTemplate({
   const isLoading = enabledAssets.step === "loading";
   const data = enabledAssets.step === "loaded" ? enabledAssets.data : null;
   const busy = busyKey !== null;
-  return /* @__PURE__ */ jsxs("div", { className: "pollar-modal-card pollar-asset-modal", "data-theme": theme, style: cssVars, onClick: (e) => e.stopPropagation(), children: [
-    /* @__PURE__ */ jsxs("div", { className: "pollar-modal-header", children: [
-      /* @__PURE__ */ jsx("h2", { className: "pollar-modal-title", children: "Trustlines" }),
-      /* @__PURE__ */ jsxs("div", { className: "pollar-modal-header-actions", children: [
-        /* @__PURE__ */ jsxs("button", { className: "pollar-modal-refresh-btn", onClick: onRefresh, disabled: isLoading || busy, children: [
-          /* @__PURE__ */ jsxs(
-            "svg",
-            {
-              className: `pollar-modal-refresh-icon${isLoading ? " spinning" : ""}`,
-              width: "13",
-              height: "13",
-              viewBox: "0 0 13 13",
-              fill: "none",
-              "aria-hidden": true,
-              children: [
-                /* @__PURE__ */ jsx("path", { d: "M11.5 6.5a5 5 0 11-1.5-3.536", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round" }),
-                /* @__PURE__ */ jsx("path", { d: "M10 1v3h-3", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round", strokeLinejoin: "round" })
-              ]
-            }
-          ),
-          "Refresh"
+  return /* @__PURE__ */ jsxs(
+    "div",
+    {
+      className: "pollar-modal-card pollar-asset-modal",
+      "data-theme": theme,
+      style: cssVars,
+      onClick: (e) => e.stopPropagation(),
+      children: [
+        /* @__PURE__ */ jsxs("div", { className: "pollar-modal-header", children: [
+          /* @__PURE__ */ jsx("h2", { className: "pollar-modal-title", children: "Trustlines" }),
+          /* @__PURE__ */ jsxs("div", { className: "pollar-modal-header-actions", children: [
+            /* @__PURE__ */ jsxs("button", { className: "pollar-modal-refresh-btn", onClick: onRefresh, disabled: isLoading || busy, children: [
+              /* @__PURE__ */ jsxs(
+                "svg",
+                {
+                  className: `pollar-modal-refresh-icon${isLoading ? " spinning" : ""}`,
+                  width: "13",
+                  height: "13",
+                  viewBox: "0 0 13 13",
+                  fill: "none",
+                  "aria-hidden": true,
+                  children: [
+                    /* @__PURE__ */ jsx("path", { d: "M11.5 6.5a5 5 0 11-1.5-3.536", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round" }),
+                    /* @__PURE__ */ jsx("path", { d: "M10 1v3h-3", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round", strokeLinejoin: "round" })
+                  ]
+                }
+              ),
+              "Refresh"
+            ] }),
+            /* @__PURE__ */ jsx("button", { className: "pollar-modal-close", onClick: onClose, "aria-label": "Close", children: /* @__PURE__ */ jsx("svg", { width: "16", height: "16", viewBox: "0 0 16 16", fill: "none", "aria-hidden": true, children: /* @__PURE__ */ jsx("path", { d: "M2 2l12 12M14 2L2 14", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round" }) }) })
+          ] })
         ] }),
-        /* @__PURE__ */ jsx("button", { className: "pollar-modal-close", onClick: onClose, "aria-label": "Close", children: /* @__PURE__ */ jsx("svg", { width: "16", height: "16", viewBox: "0 0 16 16", fill: "none", "aria-hidden": true, children: /* @__PURE__ */ jsx("path", { d: "M2 2l12 12M14 2L2 14", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round" }) }) })
-      ] })
-    ] }),
-    walletAddress && /* @__PURE__ */ jsx("div", { className: "pollar-asset-address", children: cropAddress(walletAddress) }),
-    isLoading && /* @__PURE__ */ jsx("div", { className: "pollar-modal-empty", children: "Loading\u2026" }),
-    enabledAssets.step === "error" && /* @__PURE__ */ jsx("div", { className: "pollar-modal-error", children: enabledAssets.message }),
-    actionError && /* @__PURE__ */ jsx("div", { className: "pollar-modal-action-error", children: actionError }),
-    data && !data.exists && /* @__PURE__ */ jsxs("div", { className: "pollar-modal-empty", children: [
-      "Account not found on ",
-      data.network,
-      "."
-    ] }),
-    data && data.assets.length === 0 && /* @__PURE__ */ jsx("div", { className: "pollar-modal-empty", children: "No trustlines found." }),
-    data && data.assets.length > 0 && /* @__PURE__ */ jsx("div", { className: "pollar-asset-list", children: data.assets.map((a) => /* @__PURE__ */ jsx(
-      AssetItem,
-      {
-        record: a,
-        busy: busyKey === assetKey(a),
-        disabled: busy && busyKey !== assetKey(a),
-        onToggle: onToggleTrustline
-      },
-      assetKey(a)
-    )) }),
-    /* @__PURE__ */ jsx("button", { className: "pollar-asset-add-custom", onClick: onAddCustom, disabled: busy, children: "+ Add custom trustline" }),
-    /* @__PURE__ */ jsx(PollarModalFooter, {})
-  ] });
+        walletAddress && /* @__PURE__ */ jsx("div", { className: "pollar-asset-address", children: cropAddress(walletAddress) }),
+        isLoading && /* @__PURE__ */ jsx("div", { className: "pollar-modal-empty", children: "Loading\u2026" }),
+        enabledAssets.step === "error" && /* @__PURE__ */ jsx("div", { className: "pollar-modal-error", children: enabledAssets.message }),
+        actionError && /* @__PURE__ */ jsx("div", { className: "pollar-modal-action-error", children: actionError }),
+        data && !data.exists && /* @__PURE__ */ jsxs("div", { className: "pollar-modal-empty", children: [
+          "Account not found on ",
+          data.network,
+          "."
+        ] }),
+        data && data.assets.length === 0 && /* @__PURE__ */ jsx("div", { className: "pollar-modal-empty", children: "No trustlines found." }),
+        data && data.assets.length > 0 && /* @__PURE__ */ jsx("div", { className: "pollar-asset-list", children: data.assets.map((a) => /* @__PURE__ */ jsx(
+          AssetItem,
+          {
+            record: a,
+            busy: busyKey === assetKey(a),
+            disabled: busy && busyKey !== assetKey(a),
+            onToggle: onToggleTrustline
+          },
+          assetKey(a)
+        )) }),
+        /* @__PURE__ */ jsx("button", { className: "pollar-asset-add-custom", onClick: onAddCustom, disabled: busy, children: "+ Add custom trustline" }),
+        /* @__PURE__ */ jsx(PollarModalFooter, {})
+      ]
+    }
+  );
 }
 function isValidIssuer(issuer) {
   return issuer.length === 56 && issuer.startsWith("G");
@@ -1411,79 +1420,89 @@ function CustomTrustlineModalTemplate({
     const trimmedLimit = limit.trim();
     onSubmit({ code: code.trim(), issuer: issuer.trim(), ...trimmedLimit ? { limit: trimmedLimit } : {} });
   };
-  return /* @__PURE__ */ jsxs("div", { className: "pollar-modal-card pollar-asset-modal", "data-theme": theme, style: cssVars, onClick: (e) => e.stopPropagation(), children: [
-    /* @__PURE__ */ jsxs("div", { className: "pollar-modal-header", children: [
-      /* @__PURE__ */ jsxs("div", { className: "pollar-modal-header-actions", children: [
-        /* @__PURE__ */ jsx("button", { className: "pollar-modal-back", onClick: onBack, disabled: busy, "aria-label": "Back", children: /* @__PURE__ */ jsx("svg", { width: "16", height: "16", viewBox: "0 0 16 16", fill: "none", "aria-hidden": true, children: /* @__PURE__ */ jsx("path", { d: "M10 3L5 8l5 5", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" }) }) }),
-        /* @__PURE__ */ jsx("h2", { className: "pollar-modal-title", children: "Add custom trustline" })
-      ] }),
-      /* @__PURE__ */ jsx("button", { className: "pollar-modal-close", onClick: onClose, "aria-label": "Close", children: /* @__PURE__ */ jsx("svg", { width: "16", height: "16", viewBox: "0 0 16 16", fill: "none", "aria-hidden": true, children: /* @__PURE__ */ jsx("path", { d: "M2 2l12 12M14 2L2 14", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round" }) }) })
-    ] }),
-    /* @__PURE__ */ jsx("p", { className: "pollar-asset-custom-hint", children: "Custom trustlines aren't sponsored \u2014 your wallet pays the 0.5 XLM reserve and the transaction fee." }),
-    /* @__PURE__ */ jsxs("div", { className: "pollar-field", children: [
-      /* @__PURE__ */ jsx("label", { className: "pollar-label", htmlFor: "pollar-trustline-code", children: "Asset code" }),
-      /* @__PURE__ */ jsx(
-        "input",
-        {
-          id: "pollar-trustline-code",
-          className: "pollar-input",
-          value: code,
-          onChange: (e) => setCode(e.target.value),
-          placeholder: "USDC",
-          maxLength: 12,
-          autoComplete: "off",
-          spellCheck: false,
-          disabled: busy
-        }
-      )
-    ] }),
-    /* @__PURE__ */ jsxs("div", { className: "pollar-field", children: [
-      /* @__PURE__ */ jsx("label", { className: "pollar-label", htmlFor: "pollar-trustline-issuer", children: "Issuer" }),
-      /* @__PURE__ */ jsx(
-        "input",
-        {
-          id: "pollar-trustline-issuer",
-          className: "pollar-input",
-          value: issuer,
-          onChange: (e) => setIssuer(e.target.value),
-          placeholder: "G\u2026",
-          autoComplete: "off",
-          spellCheck: false,
-          disabled: busy
-        }
-      ),
-      issuer.trim().length > 0 && !issuerOk && /* @__PURE__ */ jsx("span", { className: "pollar-field-error", children: "Issuer must be a 56-character Stellar address starting with G." })
-    ] }),
-    /* @__PURE__ */ jsxs("div", { className: "pollar-field", children: [
-      /* @__PURE__ */ jsxs("label", { className: "pollar-label", htmlFor: "pollar-trustline-limit", children: [
-        "Limit ",
-        /* @__PURE__ */ jsx("span", { className: "pollar-label-optional", children: "(optional)" })
-      ] }),
-      /* @__PURE__ */ jsx(
-        "input",
-        {
-          id: "pollar-trustline-limit",
-          className: "pollar-input",
-          value: limit,
-          onChange: (e) => setLimit(e.target.value),
-          placeholder: "Maximum",
-          inputMode: "decimal",
-          autoComplete: "off",
-          spellCheck: false,
-          disabled: busy
-        }
-      )
-    ] }),
-    actionError && /* @__PURE__ */ jsx("div", { className: "pollar-modal-action-error", children: actionError }),
-    /* @__PURE__ */ jsx("button", { className: "pollar-asset-submit", onClick: submit, disabled: !canSubmit, children: busy ? "Enabling\u2026" : "Enable trustline" }),
-    /* @__PURE__ */ jsx(PollarModalFooter, {})
-  ] });
+  return /* @__PURE__ */ jsxs(
+    "div",
+    {
+      className: "pollar-modal-card pollar-asset-modal",
+      "data-theme": theme,
+      style: cssVars,
+      onClick: (e) => e.stopPropagation(),
+      children: [
+        /* @__PURE__ */ jsxs("div", { className: "pollar-modal-header", children: [
+          /* @__PURE__ */ jsxs("div", { className: "pollar-modal-header-actions", children: [
+            /* @__PURE__ */ jsx("button", { className: "pollar-modal-back", onClick: onBack, disabled: busy, "aria-label": "Back", children: /* @__PURE__ */ jsx("svg", { width: "16", height: "16", viewBox: "0 0 16 16", fill: "none", "aria-hidden": true, children: /* @__PURE__ */ jsx("path", { d: "M10 3L5 8l5 5", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" }) }) }),
+            /* @__PURE__ */ jsx("h2", { className: "pollar-modal-title", children: "Add custom trustline" })
+          ] }),
+          /* @__PURE__ */ jsx("button", { className: "pollar-modal-close", onClick: onClose, "aria-label": "Close", children: /* @__PURE__ */ jsx("svg", { width: "16", height: "16", viewBox: "0 0 16 16", fill: "none", "aria-hidden": true, children: /* @__PURE__ */ jsx("path", { d: "M2 2l12 12M14 2L2 14", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round" }) }) })
+        ] }),
+        /* @__PURE__ */ jsx("p", { className: "pollar-asset-custom-hint", children: "Custom trustlines aren't sponsored \u2014 your wallet pays the 0.5 XLM reserve and the transaction fee." }),
+        /* @__PURE__ */ jsxs("div", { className: "pollar-field", children: [
+          /* @__PURE__ */ jsx("label", { className: "pollar-label", htmlFor: "pollar-trustline-code", children: "Asset code" }),
+          /* @__PURE__ */ jsx(
+            "input",
+            {
+              id: "pollar-trustline-code",
+              className: "pollar-input",
+              value: code,
+              onChange: (e) => setCode(e.target.value),
+              placeholder: "USDC",
+              maxLength: 12,
+              autoComplete: "off",
+              spellCheck: false,
+              disabled: busy
+            }
+          )
+        ] }),
+        /* @__PURE__ */ jsxs("div", { className: "pollar-field", children: [
+          /* @__PURE__ */ jsx("label", { className: "pollar-label", htmlFor: "pollar-trustline-issuer", children: "Issuer" }),
+          /* @__PURE__ */ jsx(
+            "input",
+            {
+              id: "pollar-trustline-issuer",
+              className: "pollar-input",
+              value: issuer,
+              onChange: (e) => setIssuer(e.target.value),
+              placeholder: "G\u2026",
+              autoComplete: "off",
+              spellCheck: false,
+              disabled: busy
+            }
+          ),
+          issuer.trim().length > 0 && !issuerOk && /* @__PURE__ */ jsx("span", { className: "pollar-field-error", children: "Issuer must be a 56-character Stellar address starting with G." })
+        ] }),
+        /* @__PURE__ */ jsxs("div", { className: "pollar-field", children: [
+          /* @__PURE__ */ jsxs("label", { className: "pollar-label", htmlFor: "pollar-trustline-limit", children: [
+            "Limit ",
+            /* @__PURE__ */ jsx("span", { className: "pollar-label-optional", children: "(optional)" })
+          ] }),
+          /* @__PURE__ */ jsx(
+            "input",
+            {
+              id: "pollar-trustline-limit",
+              className: "pollar-input",
+              value: limit,
+              onChange: (e) => setLimit(e.target.value),
+              placeholder: "Maximum",
+              inputMode: "decimal",
+              autoComplete: "off",
+              spellCheck: false,
+              disabled: busy
+            }
+          )
+        ] }),
+        actionError && /* @__PURE__ */ jsx("div", { className: "pollar-modal-action-error", children: actionError }),
+        /* @__PURE__ */ jsx("button", { className: "pollar-asset-submit", onClick: submit, disabled: !canSubmit, children: busy ? "Enabling\u2026" : "Enable trustline" }),
+        /* @__PURE__ */ jsx(PollarModalFooter, {})
+      ]
+    }
+  );
 }
 function assetKey2(record) {
   return record.code + (record.issuer ?? "");
 }
 function EnabledAssetsModal({ onClose }) {
-  const { enabledAssets, refreshAssets, setTrustline, walletAddress, styles } = usePollar();
+  const { enabledAssets, refreshAssets, setTrustline, wallet, styles } = usePollar();
+  const walletAddress = wallet?.address ?? "";
   const { theme = "light", accentColor = "#005DB4" } = styles;
   const [view, setView] = useState("list");
   const [busyKey, setBusyKey] = useState(null);
@@ -1831,35 +1850,15 @@ var GoogleButton = ({ disabled, onClick }) => {
     ] })
   ] });
 };
-function DefaultFreighterAlbedoButtons({ onConnect, isLoading }) {
-  return /* @__PURE__ */ jsxs("div", { className: "pollar-wallet-list", children: [
-    /* @__PURE__ */ jsxs(
-      "button",
-      {
-        type: "button",
-        disabled: isLoading,
-        className: "pollar-wallet-list-btn",
-        onClick: () => onConnect(WalletType.FREIGHTER),
-        children: [
-          /* @__PURE__ */ jsx("img", { src: LOGO_FREIGHTER, alt: "Freighter", className: "pollar-wallet-list-icon" }),
-          /* @__PURE__ */ jsx("span", { className: "pollar-wallet-list-name", children: "Freighter" })
-        ]
-      }
-    ),
-    /* @__PURE__ */ jsxs(
-      "button",
-      {
-        type: "button",
-        disabled: isLoading,
-        className: "pollar-wallet-list-btn",
-        onClick: () => onConnect(WalletType.ALBEDO),
-        children: [
-          /* @__PURE__ */ jsx("img", { src: LOGO_ALBEDO, alt: "Albedo", className: "pollar-wallet-list-icon" }),
-          /* @__PURE__ */ jsx("span", { className: "pollar-wallet-list-name", children: "Albedo" })
-        ]
-      }
-    )
-  ] });
+function WalletAdapterButtons({
+  walletAdapters,
+  onConnect,
+  isLoading
+}) {
+  return /* @__PURE__ */ jsx("div", { className: "pollar-wallet-list", children: walletAdapters.map((a) => /* @__PURE__ */ jsxs("button", { type: "button", disabled: isLoading, className: "pollar-wallet-list-btn", onClick: () => onConnect(a.id), children: [
+    a.meta.iconUrl && /* @__PURE__ */ jsx("img", { src: a.meta.iconUrl, alt: a.meta.label, className: "pollar-wallet-list-icon" }),
+    /* @__PURE__ */ jsx("span", { className: "pollar-wallet-list-name", children: a.meta.label })
+  ] }, a.id)) });
 }
 var AUTH_STATE_MESSAGES = {
   idle: "",
@@ -1870,6 +1869,7 @@ var AUTH_STATE_MESSAGES = {
   verifying_email_code: "Verifying\u2026",
   opening_oauth: "Redirecting\u2026",
   connecting_wallet: "Connecting wallet\u2026",
+  signing_wallet_challenge: "Confirm in your wallet\u2026",
   wallet_not_installed: "Wallet not installed",
   authenticating_wallet: "Signing in with wallet\u2026",
   creating_passkey: "Waiting for passkey\u2026",
@@ -1885,6 +1885,7 @@ function authStateToStatus(step) {
     "verifying_email_code",
     "opening_oauth",
     "connecting_wallet",
+    "signing_wallet_challenge",
     "authenticating_wallet",
     "creating_passkey",
     "deploying_smart_account",
@@ -1905,6 +1906,7 @@ function LoginModalTemplate({
   embeddedWallets,
   smartWallet = false,
   providers,
+  walletAdapters,
   appName,
   email = "",
   onEmailChange,
@@ -1991,32 +1993,13 @@ function LoginModalTemplate({
     ] }) : showWalletPicker ? /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(BackButton, { onClick: () => setShowWalletPicker(false) }),
       renderWallets ? renderWallets({ onConnect: onWalletConnect ?? (() => {
-      }), authState }) : /* @__PURE__ */ jsx(DefaultFreighterAlbedoButtons, { onConnect: onWalletConnect ?? (() => {
+      }), authState }) : /* @__PURE__ */ jsx(WalletAdapterButtons, { walletAdapters, onConnect: onWalletConnect ?? (() => {
       }), isLoading })
     ] }) : showPasskeyChooser ? /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(BackButton, { onClick: () => setShowPasskeyChooser(false) }),
       /* @__PURE__ */ jsxs("div", { className: "pollar-wallet-section", children: [
-        /* @__PURE__ */ jsx(
-          "button",
-          {
-            type: "button",
-            disabled: isLoading,
-            className: "pollar-btn-primary",
-            style: { width: "100%" },
-            onClick: onCreateSmartWallet,
-            children: "Create a new wallet"
-          }
-        ),
-        /* @__PURE__ */ jsx(
-          "button",
-          {
-            type: "button",
-            disabled: isLoading,
-            className: "pollar-wallet-entry-btn",
-            onClick: onLoginSmartWallet,
-            children: "Log in with an existing wallet"
-          }
-        )
+        /* @__PURE__ */ jsx("button", { type: "button", disabled: isLoading, className: "pollar-btn-primary", onClick: onCreateSmartWallet, children: "Create a new wallet" }),
+        /* @__PURE__ */ jsx("button", { type: "button", disabled: isLoading, className: "pollar-wallet-entry-btn", onClick: onLoginSmartWallet, children: "Log in with an existing wallet" })
       ] })
     ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
       emailEnabled && /* @__PURE__ */ jsxs("div", { className: "pollar-email-section", children: [
@@ -2038,7 +2021,7 @@ function LoginModalTemplate({
             type: "button",
             disabled: isLoading || !email,
             className: "pollar-btn-primary",
-            style: { marginTop: "0.75rem", width: "100%" },
+            style: { marginTop: "0.75rem" },
             onClick: onEmailSubmit,
             children: "Submit"
           }
@@ -2123,6 +2106,7 @@ function LoginModal({ onClose }) {
   const [email, setEmail] = useState("");
   const { getClient, styles, appConfig: config, renderWallets } = usePollar();
   const [authState, setAuthState] = useState(() => getClient().getAuthState());
+  const walletAdapters = useMemo(() => getClient().listWalletAdapters(), [getClient]);
   const [codeInputKey, setCodeInputKey] = useState(0);
   const pendingEmail = useRef(null);
   const onCloseRef = useRef(onClose);
@@ -2172,7 +2156,7 @@ function LoginModal({ onClose }) {
     getClient().login({ provider });
   }
   function handleWalletConnect(type) {
-    getClient().loginWallet(type);
+    getClient().login({ provider: type });
   }
   function handleLoginSmartWallet() {
     getClient().loginSmartWallet();
@@ -2209,6 +2193,7 @@ function LoginModal({ onClose }) {
         github: !!providers?.github,
         apple: !!providers?.apple
       },
+      walletAdapters,
       appName: config.application?.name ?? "Pollar",
       email,
       onEmailChange: setEmail,
@@ -2542,7 +2527,8 @@ var MOCK_PAYMENT = {
   expiresAt: new Date(Date.now() + 30 * 60 * 1e3).toISOString()
 };
 function RampWidget({ onClose }) {
-  const { getClient, walletAddress, styles } = usePollar();
+  const { getClient, wallet, styles } = usePollar();
+  const walletAddress = wallet?.address ?? "";
   const [step, setStep] = useState("input");
   const [direction, setDirection] = useState("onramp");
   const [amount, setAmount] = useState("");
@@ -2745,7 +2731,8 @@ function ReceiveModalTemplate({
   );
 }
 function ReceiveModal({ onClose }) {
-  const { walletAddress, styles } = usePollar();
+  const { wallet, styles } = usePollar();
+  const walletAddress = wallet?.address ?? "";
   const { theme = "light", accentColor = "#005DB4" } = styles;
   const [copied, setCopied] = useState(false);
   const copyTimerRef = useRef(null);
@@ -3153,10 +3140,11 @@ function SendModal({ onClose }) {
     buildTx,
     signAndSubmitTx,
     tx: transaction,
-    walletType,
+    wallet,
     network,
     styles
   } = usePollar();
+  const walletType = wallet?.custody === "external" ? wallet.provider : null;
   const { theme = "light", accentColor = "#005DB4" } = styles;
   const [step, setStep] = useState("form");
   const [amount, setAmount] = useState("");
@@ -3565,7 +3553,8 @@ function TransactionModalTemplate({
   ] });
 }
 function TransactionModal({ onClose }) {
-  const { getClient, styles, tx: transaction, network, walletType } = usePollar();
+  const { getClient, styles, tx: transaction, network, wallet } = usePollar();
+  const walletType = wallet?.custody === "external" ? wallet.provider : null;
   const { theme = "light", accentColor = "#005DB4" } = styles;
   const [showXdr, setShowXdr] = useState(false);
   const [copied, setCopied] = useState(false);
@@ -3887,7 +3876,8 @@ function WalletBalanceModalTemplate({
   ] });
 }
 function WalletBalanceModal({ onClose }) {
-  const { walletBalance, refreshWalletBalance, walletAddress, styles } = usePollar();
+  const { walletBalance, refreshWalletBalance, wallet, styles } = usePollar();
+  const walletAddress = wallet?.address ?? "";
   const { theme = "light", accentColor = "#005DB4" } = styles;
   useEffect(() => {
     void refreshWalletBalance();
@@ -4059,10 +4049,9 @@ function PollarProvider({
     const styles = resolvedConfig.styles ?? {};
     return {
       // session
-      walletAddress,
+      wallet: pollarClient.getWallet(),
       isAuthenticated: !!walletAddress,
       verified,
-      walletType: pollarClient.getWalletType(),
       // client
       getClient,
       // auth
@@ -4482,7 +4471,7 @@ function WalletButtonTemplate({
 function WalletButton() {
   const {
     getClient,
-    walletAddress,
+    wallet,
     styles,
     openLoginModal,
     openTxHistoryModal,
@@ -4493,9 +4482,10 @@ function WalletButton() {
     openKycModal,
     openRampModal,
     openDistributionRulesModal,
-    tx: transaction,
-    walletType
+    tx: transaction
   } = usePollar();
+  const walletAddress = wallet?.address ?? "";
+  const walletType = wallet?.custody === "external" ? wallet.provider : null;
   const [open, setOpen] = useState(false);
   const [copied, setCopied] = useState(false);
   const wrapperRef = useRef(null);