From cd173e67e4e0514271371f4a5e5136f7f61d06d1 Mon Sep 17 00:00:00 2001 From: Max Nanis Date: Tue, 29 Sep 2026 11:47:48 -0700 Subject: Redemption Modal. Redemption Magic flow. User Account Icon --- jb-ui/src/JBApp.tsx | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'jb-ui/src/JBApp.tsx') diff --git a/jb-ui/src/JBApp.tsx b/jb-ui/src/JBApp.tsx index 67b8dfc..3031a00 100644 --- a/jb-ui/src/JBApp.tsx +++ b/jb-ui/src/JBApp.tsx @@ -14,7 +14,6 @@ import { UserLedgerWallets, UserLedgerWalletAccountTypeEnum, WalletApi, - CashoutMethodsResponse, } from "@/api_fsb"; import Footer from "@/components/Footer"; import { useAppDispatch } from "@/hooks"; @@ -28,13 +27,12 @@ import { setUserAttemptCreditWallet, } from "@/models/appSlice"; -import { addCashoutMethods } from "@/models/cashoutMethodsSlice"; - import { addEvent } from "@/models/grlEventsSlice"; import { addStatsData } from "@/models/grlStatsSlice"; import CashoutConfirmation from "@/pages/CashoutConfirmation"; import MagicLink from "@/pages/MagicLink"; import MagicAMTLink from "@/pages/MagicAMTLink"; +import MagicWallet from "@/pages/MagicWallet"; import Result from "@/pages/Result"; import clsx from "clsx"; @@ -56,8 +54,9 @@ import { useEffect } from "react"; import Wallet from "@/components/Wallet"; import "@/index.css"; import { setTaskStatus, setUserWalletBalance } from "@/models/appSlice"; -import { Profiling } from "./components/Profiling"; -import Redemption from "./components/Redemption"; +import { Profiling } from "@/components/Profiling"; +import Redemption from "@/components/Redemption"; +import UserAccount from "@/components/UserAccount"; type Message = | PingMessage @@ -87,13 +86,6 @@ function QueryParamProcessor() { if (user?.product_user_id) { dispatch(setProductUserID(user.product_user_id)); - new WalletApi() - .getCashoutMethodsProductIdCashoutMethodsGet(bpid, user.product_user_id) - .then((res) => { - const response = res.data as CashoutMethodsResponse; - dispatch(addCashoutMethods(response.cashout_methods)); - }); - new WalletApi() .getUserWalletBalanceProductIdWalletGet( bpid, // productId @@ -111,7 +103,9 @@ function QueryParamProcessor() { const response = res.data as UserLedgerWallets; if (response.displayed_balances) { - dispatch(setUserDisplayedWalletBalance(response.displayed_balances[0])); + dispatch( + setUserDisplayedWalletBalance(response.displayed_balances[0]), + ); } const userWallet = response.wallets?.find( @@ -198,6 +192,8 @@ const Layout = () => { + +