replace references to bpuid with logged in user

3 files changed, 37 insertions, 27 deletions

diff --git a/jb-ui/src/components/Footer.tsx b/jb-ui/src/components/Footer.tsx
index eede06c..ec458f2 100644
--- a/jb-ui/src/components/Footer.tsx
+++ b/jb-ui/src/components/Footer.tsx
@@ -1,8 +1,7 @@
-import { useAppSelector } from "@/hooks";
+import { useGetMeQuery } from "@/models/authAPI";
 
 const Footer = () => {
-  const bpuid = useAppSelector((state) => state.app.bpuid);
-  const assignment_id = useAppSelector((state) => state.app.assignment_id);
+  const { data: user, isLoading, isError } = useGetMeQuery();
 
   return (
     <div
@@ -14,7 +13,7 @@ const Footer = () => {
         <p>
           help:{" "}
           <a
-            href={`mailto:support@jamesbillings67.com?subject=AMT Support Request: (${bpuid ?? "-"}) ${assignment_id ?? "–"}`}
+            href={`mailto:support@jamesbillings67.com?subject=AMT Support Request: (${user?.product_user_id ?? "-"})`}
           >
             support@jamesbillings67.com
           </a>
diff --git a/jb-ui/src/components/Profiling.tsx b/jb-ui/src/components/Profiling.tsx
index 96b06b2..23b8457 100644
--- a/jb-ui/src/components/Profiling.tsx
+++ b/jb-ui/src/components/Profiling.tsx
@@ -1,4 +1,5 @@
 import { UpkQuestionChoice } from "@/api_fsb";
+import { useGetMeQuery } from "@/models/authAPI";
 import { ChevronRightIcon } from "lucide-react";
 import { KeyboardEvent, MouseEvent, useEffect, useRef, useState } from "react";
 
@@ -46,7 +47,7 @@ const TextEntry = () => {
   // const selectAnswer = useSelector(selectAnswerForQuestion(question));
   const metadata = activeQuestion?._metadata;
   const validation = activeQuestion?._validation;
-  const bpuid = useAppSelector((state) => state.app.bpuid);
+  const { data: user, isLoading, isError } = useGetMeQuery();
 
   if (!metadata) return null;
   if (!validation) return null;
@@ -67,11 +68,14 @@ const TextEntry = () => {
 
   const handleKeyPress = (event: KeyboardEvent<HTMLInputElement>) => {
     if (!activeQuestion.question_id) return;
-    if (!bpuid) return;
+    if (!user?.product_user_id) return;
 
     if (event.key === "Enter") {
       dispatch(
-        saveAnswer({ questionId: activeQuestion.question_id!, bpuid: bpuid }),
+        saveAnswer({
+          questionId: activeQuestion.question_id!,
+          bpuid: user.product_user_id,
+        }),
       );
     }
   };
@@ -109,14 +113,14 @@ export default function useKeyboardMode(rowModel: RowModel<UpkQuestionChoice>) {
 
   const dispatch = useAppDispatch();
   const activeQuestion = useSelector(selectActiveQuestion);
-  const bpuid = useAppSelector((state) => state.app.bpuid);
+  const { data: user, isLoading, isError } = useGetMeQuery();
 
   const keyboardSelectionIdxRef = useRef(0);
 
   useEffect(() => {
     const handleKeyDown = (event: KeyboardEvent) => {
       if (!activeQuestion) return;
-      if (!bpuid) return;
+      if (!user?.product_user_id) return;
 
       //   if (!keyboardEnabled) {
       //     return;
@@ -141,7 +145,10 @@ export default function useKeyboardMode(rowModel: RowModel<UpkQuestionChoice>) {
 
       if (event.key === "Enter") {
         dispatch(
-          saveAnswer({ questionId: activeQuestion.question_id!, bpuid: bpuid }),
+          saveAnswer({
+            questionId: activeQuestion.question_id!,
+            bpuid: user.product_user_id,
+          }),
         );
       }
 
@@ -507,15 +514,18 @@ const ProfilingQuestionSubmitButton = () => {
 
   const activeQuestion = useSelector(selectActiveQuestion);
   const activeQuestionValidation = useSelector(selectActiveQuestionValidation);
-  const bpuid = useAppSelector((state) => state.app.bpuid);
+  const { data: user, isLoading, isError } = useGetMeQuery();
 
   const handleOnClick = () => {
     if (!activeQuestion) return;
     if (!activeQuestionValidation?.isComplete) return;
-    if (!bpuid) return;
+    if (!user?.product_user_id) return;
 
     dispatch(
-      saveAnswer({ questionId: activeQuestion.question_id!, bpuid: bpuid }),
+      saveAnswer({
+        questionId: activeQuestion.question_id!,
+        bpuid: user.product_user_id,
+      }),
     );
   };
 
@@ -749,14 +759,14 @@ const Profiling = () => {
   const [showProfiling, setShowProfiling] = useState(false);
 
   const dispatch = useAppDispatch();
-  const bpuid = useAppSelector((state) => state.app.bpuid);
+  const { data: user, isLoading, isError } = useGetMeQuery();
 
   useEffect(() => {
-    if (!bpuid) return;
-    dispatch(fetchNewQuestions(bpuid));
-  }, [bpid, bpuid]);
+    if (!user?.product_user_id) return;
+    dispatch(fetchNewQuestions(user.product_user_id));
+  }, [bpid, user?.product_user_id]);
 
-  if (!bpuid) return null;
+  if (!user?.product_user_id) return null;
 
   return (
     <div
diff --git a/jb-ui/src/components/Wallet.tsx b/jb-ui/src/components/Wallet.tsx
index 933dc9a..3f5c6a4 100644
--- a/jb-ui/src/components/Wallet.tsx
+++ b/jb-ui/src/components/Wallet.tsx
@@ -3,6 +3,7 @@ import {
   UserLedgerTransactionsResponseTransactionsInner,
   WalletApi,
 } from "@/api_fsb";
+import { useGetMeQuery } from "@/models/authAPI";
 import { useAppDispatch, useAppSelector } from "@/hooks";
 import { bpid, formatCentsToUSD } from "@/lib/utils";
 import {
@@ -187,19 +188,19 @@ const WalletTransactionsHeader = () => {
 
 const WalletTransactions = () => {
   const dispatch = useAppDispatch();
-  const bpuid = useAppSelector((state) => state.app.bpuid);
+  const { data: user, isLoading, isError } = useGetMeQuery();
   const userLedgerTxs = useAppSelector((state) => state.app.userLedgerTxs);
 
   const txPagination = useAppSelector((state) => state.app.txPagination);
   const txTotalPages = useAppSelector((state) => state.app.txTotalPages);
 
   useEffect(() => {
-    if (!bpuid) return;
+    if (!user?.product_user_id) return;
 
     new WalletApi()
       .getUserTransactionHistoryProductIdTransactionHistoryGet(
         bpid, // productId
-        bpuid, // bpuid
+        user.product_user_id,
         undefined, // createdAfter
         undefined, // createdBefore
         "-created", // orderBy
@@ -215,7 +216,7 @@ const WalletTransactions = () => {
         dispatch(setTxTotalItems(response.total!));
         dispatch(setTxTotalPages(response.pages!));
       });
-  }, [bpuid, txPagination.pageIndex, txPagination.pageSize]);
+  }, [user?.product_user_id, txPagination.pageIndex, txPagination.pageSize]);
 
   const columnHelper =
     createColumnHelper<UserLedgerTransactionsResponseTransactionsInner>();
@@ -438,16 +439,16 @@ const WalletTransactions = () => {
 
 const Wallet = () => {
   const dispatch = useAppDispatch();
-  const bpuid = useAppSelector((state) => state.app.bpuid);
   const pagination = useAppSelector((state) => state.app.txPagination);
+  const { data: user, isLoading, isError } = useGetMeQuery();
 
   useEffect(() => {
-    if (!bpuid) return;
+    if (!user?.product_user_id) return;
 
     new WalletApi()
       .getUserTransactionHistoryProductIdTransactionHistoryGet(
         bpid, // productId
-        bpuid, // bpuid
+        user.product_user_id,
         undefined, // createdAfter
         undefined, // createdBefore
         "-created", // orderBy
@@ -468,9 +469,9 @@ const Wallet = () => {
         dispatch(setTxTotalItems(response.total ?? 0));
         dispatch(setTxTotalPages(response.pages ?? 9));
       });
-  }, [bpuid]);
+  }, [user?.product_user_id]);
 
-  if (!bpuid) return null;
+  if (!user?.product_user_id) return null;
 
   return (
     <div