Merges pull request #3

Off of Amazon!!!

1 files changed, 193 insertions, 160 deletions

diff --git a/jb-ui/src/models/appSlice.ts b/jb-ui/src/models/appSlice.ts
index 87952d9..42a776e 100644
--- a/jb-ui/src/models/appSlice.ts
+++ b/jb-ui/src/models/appSlice.ts
@@ -1,188 +1,221 @@
 import {
-    TaskStatusResponse,
-    TopNPlusBucket,
-    UserLedgerTransactionsResponseTransactionsInner,
-    UserLedgerTransactionTypesSummary,
-    UserWalletBalance,
-    OfferwallReason
+  TaskStatusResponse,
+  TopNPlusBucket,
+  UserLedgerTransactionsResponseTransactionsInner,
+  UserLedgerTransactionTypesSummary,
+  UserWalletBalance,
+  UserDisplayedWalletBalance,
+  UserLedgerWallet,
+  OfferwallReason,
 } from "@/api_fsb";
 import { App } from "@/models/app";
 import { RootState } from "@/store";
-import { createSelector, createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { PaginationState } from '@tanstack/react-table';
+import { createSelector, createSlice, PayloadAction } from "@reduxjs/toolkit";
+import { PaginationState } from "@tanstack/react-table";
 import moment from "moment";
 
 const initialState: App = {
-    bpuid: undefined,
-    assignment_id: undefined,
-    loi: 1800,
-    currentBuckets: undefined,
-    currentBucketEntered: undefined,
-    taskStatus: undefined,
-    offerwall_reasons: [],
-
-    userWalletBalance: undefined,
-    userLedgerSummary: undefined,
-    userLedgerTxCount: undefined,
-    userLedgerTxs: [],
-
-    txPagination: { pageIndex: 0, pageSize: 10 },
-    txTotalItems: undefined,
-    txTotalPages: undefined
-} as App
+  bpuid: undefined,
+  assignment_id: undefined,
+  loi: 1800,
+  currentBuckets: undefined,
+  currentBucketEntered: undefined,
+  taskStatus: undefined,
+  offerwall_reasons: [],
+
+  userWalletBalance: undefined,
+  userLedgerSummary: undefined,
+  userLedgerTxCount: undefined,
+  userLedgerTxs: [],
+
+  // --- new approach
+  userDisplayedWalletBalance: undefined,
+  userWallet: undefined,
+  userAttemptCreditWallet: undefined,
+  // ---
+
+  txPagination: { pageIndex: 0, pageSize: 10 },
+  txTotalItems: undefined,
+  txTotalPages: undefined,
+} as App;
 
 const appSlice = createSlice({
-    name: 'app',
-    initialState,
-    reducers: {
-
-        setProductUserID(state, action: PayloadAction<string>) {
-            state.bpuid = action.payload;
-        },
-
-        setAssignmentID(state, action: PayloadAction<string>) {
-            // This is really so silly. Amazon should simply not send 
-            // anything if it's unavailable.
-            if (action.payload === "ASSIGNMENT_ID_NOT_AVAILABLE") {
-                state.assignment_id = undefined;
-            }
-            state.assignment_id = action.payload;
-        },
-
-        setTurkSubmitTo(state, action: PayloadAction<string>) {
-            state.turkSubmitTo = action.payload;
-        },
-
-        setLOI(state, action: PayloadAction<number>) {
-            state.loi = action.payload;
-        },
-
-        setAvailabilityCount(state, action: PayloadAction<number>) {
-            state.availability_count = action.payload
-        },
-
-        setAttemptedLiveEligibleCount(state, action: PayloadAction<number>) {
-            state.attempted_live_eligible_count = action.payload
-        },
-
-        setCurrentBuckets(state, action: PayloadAction<TopNPlusBucket[] | undefined>) {
-            state.currentBucketRequested = moment.utc().unix();
-            state.currentBuckets = action.payload
-        },
-
-        setOfferwallReasons(state, action: PayloadAction<OfferwallReason[]>) {
-            state.offerwall_reasons = action.payload;
-        },
-
-        setEnteredTimestamp(state) {
-            // Go back by 2 seconds to account for any time drift
-            state.currentBucketEntered = moment.utc().unix() - 2;
-        },
-
-        setTaskStatus(state, action: PayloadAction<TaskStatusResponse>) {
-            state.taskStatus = action.payload;
-
-            state.bpuid = action.payload.product_user_id;
-        },
-
-        setUserWalletBalance(state, action: PayloadAction<UserWalletBalance>) {
-            state.userWalletBalance = action.payload;
-        },
-
-        setUserLedgerSummary(state, action: PayloadAction<UserLedgerTransactionTypesSummary>) {
-            state.userLedgerSummary = action.payload;
-        },
-
-        setUserLedgerTxs(state, action: PayloadAction<UserLedgerTransactionsResponseTransactionsInner[]>) {
-            // We're not appending the transaction details, it's only going
-            // to reassign the current page of Transactions.
-            state.userLedgerTxs = action.payload;
-        },
-
-        setTxPagination(state, action: PayloadAction<PaginationState>) {
-            state.txPagination = action.payload;
-        },
-
-        setTxTotalItems(state, action: PayloadAction<number>) {
-            state.txTotalItems = action.payload;
-        },
-
-        setTxTotalPages(state, action: PayloadAction<number>) {
-            state.txTotalPages = action.payload;
-        }
-
-    }
-})
+  name: "app",
+  initialState,
+  reducers: {
+    setProductUserID(state, action: PayloadAction<string>) {
+      state.bpuid = action.payload;
+    },
+
+    setAssignmentID(state, action: PayloadAction<string>) {
+      // This is really so silly. Amazon should simply not send
+      // anything if it's unavailable.
+      if (action.payload === "ASSIGNMENT_ID_NOT_AVAILABLE") {
+        state.assignment_id = undefined;
+      }
+      state.assignment_id = action.payload;
+    },
+
+    setTurkSubmitTo(state, action: PayloadAction<string>) {
+      state.turkSubmitTo = action.payload;
+    },
+
+    setLOI(state, action: PayloadAction<number>) {
+      state.loi = action.payload;
+    },
+
+    setAvailabilityCount(state, action: PayloadAction<number>) {
+      state.availability_count = action.payload;
+    },
+
+    setAttemptedLiveEligibleCount(state, action: PayloadAction<number>) {
+      state.attempted_live_eligible_count = action.payload;
+    },
+
+    setCurrentBuckets(
+      state,
+      action: PayloadAction<TopNPlusBucket[] | undefined>,
+    ) {
+      state.currentBucketRequested = moment.utc().unix();
+      state.currentBuckets = action.payload;
+    },
+
+    setOfferwallReasons(state, action: PayloadAction<OfferwallReason[]>) {
+      state.offerwall_reasons = action.payload;
+    },
+
+    setEnteredTimestamp(state) {
+      // Go back by 2 seconds to account for any time drift
+      state.currentBucketEntered = moment.utc().unix() - 2;
+    },
+
+    setTaskStatus(state, action: PayloadAction<TaskStatusResponse>) {
+      state.taskStatus = action.payload;
+
+      state.bpuid = action.payload.product_user_id;
+    },
+
+    setUserWalletBalance(state, action: PayloadAction<UserWalletBalance>) {
+      state.userWalletBalance = action.payload;
+    },
+
+    // --- New approach ---
+    setUserDisplayedWalletBalance(
+      state,
+      action: PayloadAction<UserDisplayedWalletBalance>,
+    ) {
+      state.userDisplayedWalletBalance = action.payload;
+    },
+
+    setUserWallet(state, action: PayloadAction<UserLedgerWallet>) {
+      state.userWallet = action.payload;
+    },
+
+    setUserAttemptCreditWallet(state, action: PayloadAction<UserLedgerWallet>) {
+      state.userAttemptCreditWallet = action.payload;
+    },
+
+    // ---  ---
+
+    setUserLedgerSummary(
+      state,
+      action: PayloadAction<UserLedgerTransactionTypesSummary>,
+    ) {
+      state.userLedgerSummary = action.payload;
+    },
+
+    setUserLedgerTxs(
+      state,
+      action: PayloadAction<UserLedgerTransactionsResponseTransactionsInner[]>,
+    ) {
+      // We're not appending the transaction details, it's only going
+      // to reassign the current page of Transactions.
+      state.userLedgerTxs = action.payload;
+    },
+
+    setTxPagination(state, action: PayloadAction<PaginationState>) {
+      state.txPagination = action.payload;
+    },
+
+    setTxTotalItems(state, action: PayloadAction<number>) {
+      state.txTotalItems = action.payload;
+    },
+
+    setTxTotalPages(state, action: PayloadAction<number>) {
+      state.txTotalPages = action.payload;
+    },
+  },
+});
 
 export const {
-    setProductUserID,
-    setAssignmentID,
-    setTurkSubmitTo,
-    setLOI,
-    setAvailabilityCount,
-    setAttemptedLiveEligibleCount,
-    setOfferwallReasons,
-    setCurrentBuckets,
-    setEnteredTimestamp,
-    setTaskStatus,
-
-    setUserWalletBalance,
-
-    setUserLedgerSummary,
-    setUserLedgerTxs,
-
-    setTxPagination,
-    setTxTotalItems,
-    setTxTotalPages
+  setProductUserID,
+  setAssignmentID,
+  setTurkSubmitTo,
+  setLOI,
+  setAvailabilityCount,
+  setAttemptedLiveEligibleCount,
+  setOfferwallReasons,
+  setCurrentBuckets,
+  setEnteredTimestamp,
+  setTaskStatus,
+
+  setUserWalletBalance,
+
+  setUserLedgerSummary,
+  setUserLedgerTxs,
+
+  setUserDisplayedWalletBalance,
+  setUserWallet,
+  setUserAttemptCreditWallet,
+
+  setTxPagination,
+  setTxTotalItems,
+  setTxTotalPages,
 } = appSlice.actions;
 
-export default appSlice.reducer
+export default appSlice.reducer;
 
 export const getLOIText = createSelector(
-    [(state: RootState) => state.app],
-    (app_config): string => {
-
-        const lookup: Record<number, string> = {
-            600: "ten",
-            1200: "twenty",
-            1800: "thirty",
-        };
-
-        return lookup[app_config.loi] || " – ";
-    }
+  [(state: RootState) => state.app],
+  (app_config): string => {
+    const lookup: Record<number, string> = {
+      600: "ten",
+      1200: "twenty",
+      1800: "thirty",
+    };
+
+    return lookup[app_config.loi] || " – ";
+  },
 );
 
 export const getAvailabilityCount = createSelector(
-    [(state: RootState) => state.app],
-    (app_config): number | undefined => {
-        return app_config.availability_count;
-    }
+  [(state: RootState) => state.app],
+  (app_config): number | undefined => {
+    return app_config.availability_count;
+  },
 );
 
 export const isLowBalance = createSelector(
-    [(state: RootState) => state.app],
-    (app_config): boolean => {
-        const bal_amt = app_config.userWalletBalance?.amount ?? 0
-        return bal_amt <= -90;
-    }
+  [(state: RootState) => state.app],
+  (app_config): boolean => {
+    const bal_amt = app_config.userWalletBalance?.amount ?? 0;
+    return bal_amt <= -90;
+  },
 );
 
-
 export const selectBucket = createSelector(
-    [
-        (state: RootState) => state.app.currentBuckets,
-    ],
-    (buckets): TopNPlusBucket | null => {
-        if (buckets && buckets.length >= 1) {
-            return buckets[0]
-        }
-        return null;
+  [(state: RootState) => state.app.currentBuckets],
+  (buckets): TopNPlusBucket | null => {
+    if (buckets && buckets.length >= 1) {
+      return buckets[0];
     }
+    return null;
+  },
 );
 
 export const getSurveyURL = createSelector(
-    [selectBucket],
-    (bucket): string | null => {
-        return bucket?.uri || null;
-    }
-);
\ No newline at end of file
+  [selectBucket],
+  (bucket): string | null => {
+    return bucket?.uri || null;
+  },
+);