1 files changed, 58 insertions, 11 deletions

diff --git a/jb-ui/src/JBApp.tsx b/jb-ui/src/JBApp.tsx
index 6c31164..4870e9b 100644
--- a/jb-ui/src/JBApp.tsx
+++ b/jb-ui/src/JBApp.tsx
@@ -11,7 +11,11 @@ import {
   TaskStatusResponse,
   UserWalletBalance,
   UserWalletBalanceResponse,
+  UserLedgerWallets,
+  UserLedgerWalletAccountTypeEnum,
+  UserDisplayedWalletBalance,
   WalletApi,
+  CashoutMethodsResponse,
 } from "@/api_fsb";
 import Footer from "@/components/Footer";
 import { useAppDispatch } from "@/hooks";
@@ -20,8 +24,13 @@ import { useGetMeQuery } from "@/models/authAPI";
 import {
   setAssignmentID,
   setProductUserID,
-  setTurkSubmitTo,
+  setUserDisplayedWalletBalance,
+  setUserWallet,
+  setUserAttemptCreditWallet,
 } from "@/models/appSlice";
+
+import { addCashoutMethods } from "@/models/cashoutMethodsSlice";
+
 import { addEvent } from "@/models/grlEventsSlice";
 import { addStatsData } from "@/models/grlStatsSlice";
 import Home from "@/pages/Home";
@@ -50,6 +59,7 @@ import Wallet from "@/components/Wallet";
 import "@/index.css";
 import { setTaskStatus, setUserWalletBalance } from "@/models/appSlice";
 import { Profiling } from "./components/Profiling";
+import Redemption from "./components/Redemption";
 
 type Message =
   | PingMessage
@@ -76,18 +86,17 @@ function QueryParamProcessor() {
   const { data: user, isLoading, isError } = useGetMeQuery();
 
   useEffect(() => {
-    const assignment_id = searchParams.get("assignmentId");
-    const tsid = searchParams.get("tsid");
-    const worker_id = searchParams.get("workerId");
-
-    if (worker_id) {
-      dispatch(setProductUserID(worker_id));
-    }
-
     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
           user.product_user_id,
@@ -97,6 +106,43 @@ function QueryParamProcessor() {
           const balance = response.wallet as UserWalletBalance;
           dispatch(setUserWalletBalance(balance));
         });
+
+      new WalletApi()
+        .getUserWalletsProductIdWalletsGet(bpid, user.product_user_id)
+        .then((res) => {
+          const response = res.data as UserLedgerWallets;
+
+          if (response.displayed_balances) {
+            setUserDisplayedWalletBalance(response.displayed_balances[0]);
+          }
+
+          const userWallet = response.wallets?.find(
+            (w) =>
+              w.account_type === UserLedgerWalletAccountTypeEnum.UserWallet,
+          );
+          if (userWallet) {
+            setUserWallet(userWallet);
+          }
+
+          const userAttemptCreditWallet = response.wallets?.find(
+            (w) =>
+              w.account_type ===
+              UserLedgerWalletAccountTypeEnum.UserAttemptCredit,
+          );
+          if (userAttemptCreditWallet) {
+            setUserAttemptCreditWallet(userAttemptCreditWallet);
+          }
+        });
+    }
+  }, [user]);
+
+  useEffect(() => {
+    const assignment_id = searchParams.get("assignmentId");
+    const tsid = searchParams.get("tsid");
+    const worker_id = searchParams.get("workerId");
+
+    if (worker_id) {
+      dispatch(setProductUserID(worker_id));
     }
 
     if (assignment_id) {
@@ -125,8 +171,8 @@ function QueryParamProcessor() {
 const Layout = () => {
   const location = useLocation();
 
-  const isWork = useMatch("/work*");
-  const isPreview = useMatch("/preview*");
+  const isWork = useMatch("/work/*");
+  const isPreview = useMatch("/preview/*");
   const isSpecialSubview = Boolean(isWork || isPreview);
 
   return (
@@ -152,6 +198,7 @@ const Layout = () => {
           >
             <Wallet />
             <Profiling />
+            <Redemption />
             <Outlet />
           </div>
         </div>