aboutsummaryrefslogtreecommitdiff
path: root/jb-ui/src/JBApp.tsx
diff options
context:
space:
mode:
Diffstat (limited to 'jb-ui/src/JBApp.tsx')
-rw-r--r--jb-ui/src/JBApp.tsx25
1 files changed, 12 insertions, 13 deletions
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
@@ -88,13 +87,6 @@ function QueryParamProcessor() {
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
user.product_user_id,
@@ -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 = () => {
<Outlet />
</div>
</div>
+
+ <UserAccount />
</main>
<footer className="bg-slate-700 text-zinc-200 p-2 text-center font-mono">
@@ -275,8 +271,11 @@ function JBApp() {
<Route element={<QueryParamProcessor />}>
<Route element={<Layout />}>
<Route path="/" element={<Work />} />
+
+ <Route path="/wallet/cashout/confirm/" element={<MagicWallet />} />
<Route path="/auth/magic-link/" element={<MagicLink />} />
<Route path="/auth/link-amt/" element={<MagicAMTLink />} />
+
<Route
path="/wallet/cashout/confirm/"
element={<CashoutConfirmation />}