@hot-labs/kit 1.2.0-alpha.2 → 1.2.0

package/src/ui/profile/Payment.tsx

@@ -0,0 +1,309 @@
+import { observer } from "mobx-react-lite";
+import { useEffect, useState } from "react";
+import styled from "styled-components";
+
+import { WalletIcon } from "../icons/wallet";
+import { PopupOption, PopupOptionInfo } from "../styles";
+import { Commitment, Intents } from "../../core";
+import { Recipient } from "../../core/recipient";
+import { Token } from "../../core/token";
+
+import { TokenCard } from "../bridge/TokenCard";
+import { BridgeReview } from "../../exchange";
+import { openConnector } from "../router";
+
+import { OmniWallet } from "../../OmniWallet";
+import { HotConnector } from "../../HotConnector";
+import Popup from "../Popup";
+
+import { Loader } from "../uikit/loader";
+import { HorizontalStepper } from "../uikit/Stepper";
+import { serializeError } from "../utils";
+import { ActionButton, Button } from "../uikit/button";
+
+interface PaymentProps {
+  intents: Intents;
+  title?: string;
+  allowedTokens?: string[];
+  prepaidAmount: bigint;
+  payableToken: Token;
+  needAmount: bigint;
+  connector: HotConnector;
+  onReject: (message: string) => void;
+  onConfirm: (args: { depositQoute?: BridgeReview; processing?: () => Promise<BridgeReview> }) => Promise<void>;
+  close: () => void;
+}
+
+const animations = {
+  success: "https://hex.exchange/success.json",
+  failed: "https://hex.exchange/error.json",
+  loading: "https://hex.exchange/loading.json",
+};
+
+const PAY_SLIPPAGE = 0.002;
+
+export const Payment = observer(({ connector, intents, title = "Payment", allowedTokens, prepaidAmount, payableToken, needAmount, onReject, onConfirm, close }: PaymentProps) => {
+  useState(() => {
+    fetch(animations.loading);
+    fetch(animations.success);
+    fetch(animations.failed);
+  });
+
+  useEffect(() => {
+    if (connector.wallets.length !== 0) return;
+    openConnector(connector);
+  }, [connector.wallets.length]);
+
+  const [flow, setFlow] = useState<{
+    token?: Token;
+    wallet?: OmniWallet;
+    commitment?: Commitment;
+    review?: BridgeReview;
+    success?: { depositQoute?: BridgeReview; processing?: () => Promise<BridgeReview> };
+    step?: "selectToken" | "sign" | "transfer" | "success" | "error" | "loading";
+    loading?: boolean;
+    error?: any;
+  } | null>(needAmount === 0n ? { step: "transfer" } : null);
+
+  const paymentTitle = title || `Pay ${payableToken.readable(needAmount)} ${payableToken.symbol}`;
+
+  const selectToken = async (from: Token, wallet?: OmniWallet) => {
+    if (!wallet) return;
+
+    try {
+      setFlow({ token: from, wallet, review: undefined, step: "sign" });
+      const review = await connector.exchange.reviewSwap({
+        recipient: Recipient.fromWallet(intents.signer)!,
+        amount: needAmount + (needAmount * BigInt(Math.floor(PAY_SLIPPAGE * 1000))) / BigInt(1000),
+        slippage: PAY_SLIPPAGE,
+        sender: wallet,
+        refund: wallet,
+        type: "exactOut",
+        to: payableToken,
+        from,
+      });
+
+      setFlow({ token: from, wallet, review, step: "sign" });
+    } catch {
+      setFlow({ token: from, wallet, error: true, step: "sign" });
+    }
+  };
+
+  const signStep = async () => {
+    try {
+      setFlow((t) => (t ? { ...t, step: "sign", loading: true } : null));
+      await intents.sign();
+      setFlow((t) => (t ? { ...t, step: "transfer", loading: false } : null));
+    } catch (error) {
+      console.error(error);
+      setFlow((t) => (t ? { ...t, step: "error", loading: false, error } : null));
+      throw error;
+    }
+  };
+
+  const confirmPaymentStep = async () => {
+    try {
+      setFlow((t) => (t ? { ...t, step: "loading" } : null));
+
+      if (flow?.review == null) {
+        await intents.sign();
+        await onConfirm({});
+        setFlow({ loading: false, step: "success" });
+        setTimeout(() => close(), 2000);
+        return;
+      }
+
+      const result = await connector.exchange.makeSwap(flow.review, { log: () => {} });
+      await onConfirm({ depositQoute: result.review, processing: result.processing });
+      setFlow({ loading: false, step: "success" });
+      setTimeout(() => close(), 2000);
+    } catch (error) {
+      console.error(error);
+      setFlow((t) => (t ? { ...t, step: "error", loading: false, error } : null));
+      throw error;
+    }
+  };
+
+  if (flow?.step === "success") {
+    return (
+      <Popup header={<p>{paymentTitle}</p>}>
+        <div style={{ width: "100%", height: 400, display: "flex", justifyContent: "center", alignItems: "center", flexDirection: "column" }}>
+          {/* @ts-expect-error: dotlottie-wc is not typed */}
+          <dotlottie-wc key="success" src={animations.success} speed="1" style={{ width: 300, height: 300 }} mode="forward" loop autoplay></dotlottie-wc>
+          <p style={{ fontSize: 24, marginTop: -32, fontWeight: "bold" }}>Transaction successful</p>
+        </div>
+
+        <ActionButton style={{ marginTop: "auto" }} onClick={() => close()}>
+          Continue
+        </ActionButton>
+      </Popup>
+    );
+  }
+
+  if (flow?.step === "loading") {
+    return (
+      <Popup header={<p>{paymentTitle}</p>}>
+        <div style={{ width: "100%", height: 400, display: "flex", justifyContent: "center", alignItems: "center", flexDirection: "column" }}>
+          {/* @ts-expect-error: dotlottie-wc is not typed */}
+          <dotlottie-wc key="loading" src={animations.loading} speed="1" style={{ marginTop: -64, width: 300, height: 300 }} mode="forward" loop autoplay></dotlottie-wc>
+          <p style={{ fontSize: 24, marginTop: -16, fontWeight: "bold" }}>Transaction processing</p>
+        </div>
+      </Popup>
+    );
+  }
+
+  if (flow?.step === "error") {
+    return (
+      <Popup header={<p>{paymentTitle}</p>}>
+        <div style={{ width: "100%", height: 400, gap: 8, display: "flex", justifyContent: "center", alignItems: "center", flexDirection: "column" }}>
+          {/* @ts-expect-error: dotlottie-wc is not typed */}
+          <dotlottie-wc key="error" src={animations.failed} speed="1" style={{ width: 300, height: 300 }} mode="forward" loop autoplay></dotlottie-wc>
+          <p style={{ fontSize: 24, marginTop: -32, fontWeight: "bold" }}>Transaction failed</p>
+          <p style={{ fontSize: 14, width: "80%", textAlign: "center", overflowY: "auto", lineBreak: "anywhere" }}>{serializeError(flow.error)}</p>
+        </div>
+        <ActionButton onClick={() => onReject(serializeError(flow.error))}>Close</ActionButton>
+      </Popup>
+    );
+  }
+
+  if (flow?.step === "transfer") {
+    return (
+      <Popup onClose={() => onReject("closed")} header={<p>{paymentTitle}</p>}>
+        <HorizontalStepper style={{ marginBottom: 24 }} steps={[{ label: "Select" }, { label: "Review" }, { label: "Confirm" }]} currentStep={2} />
+
+        {prepaidAmount > 0n && <TokenCard token={payableToken} hot={connector} wallet={intents.signer} amount={prepaidAmount} />}
+        {prepaidAmount > 0n && flow.token != null && (
+          <PlusButton>
+            <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+              <rect x="11" y="4" width="2" height="16" rx="1" fill="var(--icon-primary)" />
+              <rect x="4" y="11" width="16" height="2" rx="1" fill="var(--icon-primary)" />
+            </svg>
+          </PlusButton>
+        )}
+
+        {flow.token != null && (
+          <TokenCard //
+            hot={connector}
+            token={flow.token}
+            wallet={flow.wallet}
+            amount={flow.review == null ? needAmount : flow.review?.amountIn ?? 0n}
+          />
+        )}
+
+        <ActionButton style={{ marginTop: 24 }} onClick={confirmPaymentStep}>
+          {flow?.loading ? "Confirming..." : "Confirm transaction"}
+        </ActionButton>
+      </Popup>
+    );
+  }
+
+  if (flow?.step === "sign") {
+    const rightControl = <div style={{ paddingRight: 4, marginLeft: "auto", alignItems: "flex-end" }}>{flow.error ? <ErrorIcon /> : <Loader />}</div>;
+
+    return (
+      <Popup onClose={() => onReject("closed")} header={<p>{title}</p>}>
+        <HorizontalStepper style={{ marginBottom: 12 }} steps={[{ label: "Select" }, { label: "Review" }, { label: "Confirm" }]} currentStep={1} />
+
+        {prepaidAmount > 0n && <TokenCard token={payableToken} hot={connector} wallet={intents.signer} amount={prepaidAmount} />}
+        {prepaidAmount > 0n && flow.token != null && (
+          <PlusButton>
+            <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+              <rect x="11" y="4" width="2" height="16" rx="1" fill="var(--icon-primary)" />
+              <rect x="4" y="11" width="16" height="2" rx="1" fill="var(--icon-primary)" />
+            </svg>
+          </PlusButton>
+        )}
+
+        {flow.token != null && (
+          <TokenCard //
+            hot={connector}
+            token={flow.token}
+            wallet={flow.wallet}
+            rightControl={flow.review ? undefined : rightControl}
+            amount={flow.review == null ? needAmount : flow.review?.amountIn ?? 0n}
+          />
+        )}
+
+        {flow.error ? (
+          <ActionButton style={{ marginTop: 24 }} onClick={() => setFlow(null)}>
+            Select another token
+          </ActionButton>
+        ) : (
+          <ActionButton style={{ marginTop: 24 }} disabled={!flow?.review} onClick={signStep}>
+            {flow?.loading ? "Signing..." : flow?.review ? "Sign review" : "Quoting..."}
+          </ActionButton>
+        )}
+      </Popup>
+    );
+  }
+
+  const recommendedTokens = connector.walletsTokens.filter((t) => t.token.symbol === "USDT" || t.token.symbol === "USDC");
+  const otherTokens = connector.walletsTokens.filter((t) => t.token.symbol !== "USDT" && t.token.symbol !== "USDC");
+
+  const renderToken = (token: Token, wallet: OmniWallet, balance: bigint) => {
+    if (token.id === payableToken.id && connector.priorityWallet?.type === wallet.type) return null;
+    const availableBalance = token.float(balance) - token.reserve;
+
+    // Allow only tokens in the allowedTokens list
+    if (allowedTokens != null && !allowedTokens?.includes(token.omniAddress)) return null;
+
+    // same token as need and enough balance is direct deposit
+    if (token.originalChain === payableToken.originalChain && token.originalAddress === payableToken.originalAddress && availableBalance >= payableToken.float(needAmount)) {
+      return <TokenCard key={token.id} token={token} onSelect={selectToken} hot={connector} wallet={wallet} />;
+    }
+
+    if (availableBalance * token.usd <= payableToken.usd * payableToken.float(needAmount) * (1 + PAY_SLIPPAGE)) return null;
+    return <TokenCard key={token.id} token={token} onSelect={selectToken} hot={connector} wallet={wallet} />;
+  };
+
+  return (
+    <Popup onClose={() => onReject("closed")} header={<p>{title}</p>}>
+      <HorizontalStepper style={{ marginBottom: 12 }} steps={[{ label: "Select" }, { label: "Review" }, { label: "Confirm" }]} currentStep={0} />
+
+      {recommendedTokens.map(({ token, wallet, balance }) => renderToken(token, wallet, balance))}
+      {otherTokens.map(({ token, wallet, balance }) => renderToken(token, wallet, balance))}
+
+      <PopupOption style={{ marginTop: 8 }} onClick={() => openConnector(connector)}>
+        <div style={{ width: 44, height: 44, borderRadius: 16, background: "#000", display: "flex", alignItems: "center", justifyContent: "center" }}>
+          <WalletIcon />
+        </div>
+        <PopupOptionInfo>
+          <p>Don't find the right token?</p>
+          <span className="wallet-address">Connect another wallet</span>
+        </PopupOptionInfo>
+      </PopupOption>
+    </Popup>
+  );
+});
+
+const ErrorIcon = () => {
+  return (
+    <svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg" aria-label="Failed" style={{ display: "block", margin: "0 auto" }}>
+      <circle cx="14" cy="14" r="13" stroke="#E74C3C" strokeWidth="2" />
+      <path d="M9 9l10 10M19 9l-10 10" stroke="#E74C3C" strokeWidth="2.5" strokeLinecap="round" />
+    </svg>
+  );
+};
+
+const PlusButton = styled.button`
+  position: absolute;
+  left: 50%;
+  top: 209px;
+  transform: translate(-50%, 0);
+
+  border-radius: 50%;
+  width: 36px;
+  height: 36px;
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  z-index: 2;
+  cursor: pointer;
+  outline: none;
+
+  border-radius: 24px;
+  border: 4px solid #191919;
+  background: #292929;
+`;

package/src/ui/{payment → profile}/Profile.tsx

@@ -1,49 +1,28 @@
 import { observer } from "mobx-react-lite";
 import styled from "styled-components";
-import { useEffect, useState } from "react";
+import { useEffect } from "react";
 
+import PlusIcon from "../icons/plus";
 import { LogoutIcon } from "../icons/logout";
-import { openBridge, openConnector } from "../router";
-import { HotConnector } from "../../HotConnector";
+import ExchangeIcon from "../icons/exchange";
+
 import { formatter } from "../../core/utils";
 import { OmniToken } from "../../core/chains";
 import { tokens } from "../../core/tokens";
-import Popup from "../Popup";
 
-import { ImageView, TokenCard, TokenIcon } from "./TokenCard";
-import ExchangeIcon from "../icons/exchange";
-import { PopupOption } from "../styles";
+import { openBridge, openConnector } from "../router";
+import { HotConnector } from "../../HotConnector";
 
-export const Loader = styled.div`
-  border: 4px solid #2a2a2a;
-  border-top: 4px solid #fff;
-  border-radius: 50%;
-  width: 24px;
-  height: 24px;
-  animation: spin 0.9s linear infinite;
-  margin: 0 auto;
-
-  @keyframes spin {
-    0% {
-      transform: rotate(0deg);
-    }
-    100% {
-      transform: rotate(360deg);
-    }
-  }
-`;
+import { TokenCard, TokenIcon } from "../bridge/TokenCard";
+import { ImageView } from "../uikit/image";
+import { Loader } from "../uikit/loader";
+import { PopupOption } from "../styles";
+import Popup from "../Popup";
 
 export const Profile = observer(({ hot, onClose }: { hot: HotConnector; onClose: () => void }) => {
   let totalBalance = 0;
-  const tokensList = hot.wallets
-    .flatMap((wallet) => {
-      return tokens.list.map((token) => ({ token, wallet, balance: hot.balance(wallet, token) }));
-    })
-    .sort((a, b) => {
-      const balanceA = a.token.float(a.balance) * a.token.usd;
-      const balanceB = b.token.float(b.balance) * b.token.usd;
-      return balanceB - balanceA;
-    })
+
+  const tokensList = hot.walletsTokens
     .map(({ token, wallet, balance }) => {
       if (token.float(balance) < 0.000001) return null;
       totalBalance += token.float(balance) * token.usd;
@@ -62,7 +41,11 @@ export const Profile = observer(({ hot, onClose }: { hot: HotConnector; onClose:
           />
         ),
       };
-    });
+    })
+    .filter((t) => t != null);
+
+  const omniTokens = tokensList.filter((t) => t.chain === -4);
+  const nonOmniTokens = tokensList.filter((t) => t.chain !== -4);
 
   useEffect(() => {
     if (hot.wallets.length > 0) return;
@@ -70,32 +53,43 @@ export const Profile = observer(({ hot, onClose }: { hot: HotConnector; onClose:
   }, [hot.wallets.length]);
 
   return (
-    <Popup onClose={onClose}>
+    <Popup onClose={onClose} style={{ gap: 16 }}>
       <div style={{ display: "flex", flexWrap: "wrap", width: "100%", gap: 8 }}>
-        {hot.wallets.map((wallet) => (
-          <WalletCard onClick={() => wallet.disconnect()}>
-            <ImageView src={wallet.icon} alt={wallet.connector.name} size={20} />
-            <div>{formatter.truncateAddress(wallet.address, 8)}</div>
-            <LogoutIcon width={20} height={20} />
-          </WalletCard>
-        ))}
+        {hot.connectors.map((connector) =>
+          connector.wallets.map((wallet) => (
+            <WalletCard onClick={() => connector.disconnect()}>
+              <ImageView src={wallet.icon} alt={connector.name} size={20} />
+              <div>{formatter.truncateAddress(wallet.address, 8)}</div>
+              <LogoutIcon />
+            </WalletCard>
+          ))
+        )}
 
         {hot.wallets.length < 6 && (
-          <WalletCard style={{ paddingLeft: 12, paddingRight: 12 }} onClick={() => openConnector(hot)}>
+          <WalletCard style={{ paddingRight: 12 }} onClick={() => openConnector(hot)}>
+            <PlusIcon />
             Add wallet
           </WalletCard>
         )}
       </div>
 
-      <div style={{ display: "flex", alignItems: "center", width: "100%", gap: 8, marginTop: 16 }}>
+      <Card>
+        <PSmall>YOUR BALANCE</PSmall>
         <BalanceCard>${formatter.amount(totalBalance)}</BalanceCard>
-        <ExchangeButton onClick={() => (onClose(), openBridge(hot, { title: "Exchange" }))}>
-          <ExchangeIcon size={32} strokeColor="#d2d2d2" />
-        </ExchangeButton>
-      </div>
+
+        <div style={{ width: "100%", display: "flex", gap: 12, marginTop: 24 }}>
+          <ActionButton onClick={() => (onClose(), openBridge(hot, { title: "Exchange" }))}>
+            <ExchangeIcon />
+            Exchange
+          </ActionButton>
+          <ActionButton disabled onClick={() => (onClose(), openBridge(hot, { title: "Deposit" }))}>
+            Deposit
+          </ActionButton>
+        </div>
+      </Card>
 
       {hot.activity.withdrawalsList.length > 0 && (
-        <TokenCards style={{ marginTop: 16 }}>
+        <TokenCards>
           <p style={{ fontSize: 16, fontWeight: 600, color: "#d2d2d2", textAlign: "left" }}>Pending withdrawals</p>
           {hot.activity.withdrawalsList.map((withdrawal) => {
             const token = tokens.get(withdrawal.token as OmniToken, withdrawal.chain);
@@ -119,37 +113,56 @@ export const Profile = observer(({ hot, onClose }: { hot: HotConnector; onClose:
         </TokenCards>
       )}
 
-      {tokensList.filter((t) => t != null && t.chain === -4).length > 0 && (
-        <TokenCards style={{ marginTop: 16 }}>
+      {omniTokens.length > 0 && (
+        <TokenCards>
           <p style={{ fontSize: 16, fontWeight: 600, color: "#d2d2d2", textAlign: "left" }}>Tokens to withdraw</p>
-          {tokensList.filter((t) => t != null && t.chain === -4).map((t) => t?.component)}
-          <div style={{ marginTop: 8, marginBottom: -4, width: "100%", height: 1, background: "#383d42" }}></div>
+          {omniTokens.map((t) => t.component)}
         </TokenCards>
       )}
 
-      {tokensList.filter((t) => t != null && t.chain !== -4).length > 0 && (
-        <TokenCards style={{ marginTop: 16 }}>
-          {/* Tokens to exchange */}
-          {tokensList.filter((t) => t != null && t.chain !== -4).map((t) => t?.component)}
+      {nonOmniTokens.length > 0 && (
+        <TokenCards>
+          <p style={{ fontSize: 16, fontWeight: 600, color: "#d2d2d2", textAlign: "left" }}>Portfolio</p>
+          {nonOmniTokens.map((t) => t.component)}
         </TokenCards>
       )}
     </Popup>
   );
 });
 
-const ExchangeButton = styled.button`
+const ActionButton = styled.button`
   display: flex;
-  align-items: center;
-  gap: 8px;
-  cursor: pointer;
-  outline: none;
+  padding: 0 24px;
+  border-radius: 12px;
+  background: #e7e7e7;
   border: none;
-  background: transparent;
-  padding: 8px;
-  border-radius: 24px;
+  outline: none;
+  cursor: pointer;
   transition: background 0.2s ease-in-out;
+  height: 48px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  flex: 1;
+
+  color: #121212;
+  text-align: center;
+  font-family: "Golos Text";
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 500;
+  line-height: 22px;
+  letter-spacing: -0.16px;
+
   &:hover {
-    background: rgba(255, 255, 255, 0.1);
+    background: #d2d2d2;
+  }
+
+  &:disabled {
+    background: #3e3e3e;
+    color: #828282;
+    cursor: not-allowed;
   }
 `;
 
@@ -168,7 +181,7 @@ const WalletCard = styled.div`
   border: 1px solid rgba(255, 255, 255, 0.1);
   padding: 6px;
   padding-left: 8px;
-  padding-right: 12px;
+  padding-right: 8px;
   background: #1a1a1a;
   cursor: pointer;
   transition: background 0.2s ease-in-out;
@@ -179,7 +192,34 @@ const WalletCard = styled.div`
 `;
 
 const BalanceCard = styled.h2`
-  font-size: 48px;
-  font-weight: 600;
   color: #fff;
+  font-family: "Golos Text";
+  font-size: 32px;
+  font-style: normal;
+  font-weight: 600;
+  line-height: 44px;
+  text-align: left;
+  margin: 0;
+`;
+
+const PSmall = styled.p`
+  color: #bfbfbf;
+  font-family: "Golos Text";
+  font-size: 14px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: 20px;
+  letter-spacing: -0.14px;
+  text-align: left;
+  margin: 0;
+`;
+
+const Card = styled.div`
+  display: flex;
+  padding: 12px;
+  flex-direction: column;
+  border-radius: 16px;
+  border: 1px solid #323232;
+  background: #272727;
+  width: 100%;
 `;

package/src/ui/router.tsx

@@ -1,34 +1,62 @@
 import { HotConnector } from "../HotConnector";
 import { OmniConnector } from "../OmniConnector";
-import { BridgeReview } from "../exchange";
-import { Token } from "../core/token";
 import { OmniWallet } from "../OmniWallet";
+
+import { BridgeReview } from "../exchange";
 import { WalletType } from "../core/chains";
 import { Recipient } from "../core/recipient";
+import { Intents } from "../core/Intents";
+import { Token } from "../core/token";
 
 import { present } from "./Popup";
-import { Payment } from "./payment/Payment";
+import { SelectTokenPopup } from "./bridge/SelectToken";
+import { SelectRecipient } from "./bridge/SelectRecipient";
+import { SelectSender } from "./bridge/SelectSender";
+import { BridgeProps } from "./bridge/Bridge";
+import { Payment } from "./profile/Payment";
+import { Profile } from "./profile/Profile";
+import { Bridge } from "./bridge/Bridge";
+
+import ConnectPrimaryWallet from "./connect/PrimaryWallet";
 import { LogoutPopup } from "./connect/LogoutPopup";
-import { Bridge } from "./payment/Bridge";
-import { Profile } from "./payment/Profile";
-import { SelectTokenPopup } from "./payment/SelectToken";
 import { WalletPicker } from "./connect/WalletPicker";
-import { BridgeProps } from "./payment/Bridge";
 import { Connector } from "./connect/ConnectWallet";
-import { SelectSender } from "./payment/SelectSender";
-import { SelectRecipient } from "./payment/SelectRecipient";
 import { WCRequest } from "./connect/WCRequest";
+import Toast from "./uikit/Toast";
 
-export const openPayment = (connector: HotConnector, token: Token, amount: bigint, recipient?: Recipient) => {
-  return new Promise<Promise<BridgeReview>>((resolve, reject) => {
+export const openPayment = (
+  connector: HotConnector,
+  {
+    intents,
+    title,
+    allowedTokens,
+    prepaidAmount,
+    payableToken,
+    needAmount,
+    onConfirm,
+  }: {
+    intents: Intents;
+    title?: string;
+    allowedTokens?: string[];
+    prepaidAmount: bigint;
+    payableToken: Token;
+    needAmount: bigint;
+    onConfirm: (args: { depositQoute?: BridgeReview; processing?: () => Promise<BridgeReview> }) => Promise<void>;
+  }
+) => {
+  return new Promise<void>((resolve, reject) => {
     present((close) => (
       <Payment //
-        onClose={() => (close(), reject(new Error("User rejected")))}
-        onProcess={(task) => (close(), resolve(task))}
+        title={title}
+        intents={intents}
         connector={connector}
-        token={token}
-        amount={amount}
-        recipient={recipient}
+        needAmount={needAmount}
+        prepaidAmount={prepaidAmount}
+        allowedTokens={allowedTokens}
+        payableToken={payableToken}
+        close={() => (close(), resolve())}
+        onReject={() => (close(), reject(new Error("User rejected")))}
+        onConfirm={onConfirm}
       />
     ));
   });
@@ -62,7 +90,15 @@ export const openBridge = (hot: HotConnector, setup?: BridgeProps["setup"]) => {
 };
 
 export const openConnector = (hot: HotConnector) => {
-  present((close) => <Connector hot={hot} onClose={close} />);
+  return new Promise<void>((resolve) => {
+    present((close) => <Connector hot={hot} onClose={() => (resolve(), close())} />);
+  });
+};
+
+export const openConnectPrimaryWallet = (hot: HotConnector) => {
+  return new Promise<void>((resolve) => {
+    present((close) => <ConnectPrimaryWallet hot={hot} onClose={() => (close(), resolve())} />);
+  });
 };
 
 export const openProfile = (hot: HotConnector) => {
@@ -90,3 +126,7 @@ export const openWCRequest = <T,>(args: { task: () => Promise<T>; deeplink?: str
   present((close) => <WCRequest deeplink={args.deeplink} name={args.name} icon={args.icon} onClose={close} task={taskPromise} />);
   return taskPromise;
 };
+
+export const openToast = (message: string) => {
+  return present(() => <Toast message={message} />);
+};