preselect repay type

burrowHQ · Dec 29, 2023 · c34fe7f · c34fe7f
1 parent 2baca0c
commit c34fe7f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/components/Modal/components.tsx b/components/Modal/components.tsx
@@ -329,9 +329,9 @@ export function useBorrowTrigger(tokenId: string) {
   };
 }
 
-export function useRepayTrigger(tokenId: string) {
+export function useRepayTrigger(tokenId: string, position?: string) {
   const dispatch = useAppDispatch();
   return () => {
-    dispatch(showModal({ action: "Repay", tokenId, amount: "0" }));
+    dispatch(showModal({ action: "Repay", tokenId, amount: "0", position }));
   };
 }
diff --git a/redux/appSlice.ts b/redux/appSlice.ts
@@ -149,6 +149,7 @@ export const appSlice = createSlice({
         action: TokenAction;
         amount: string;
         tokenId: string;
+        position?: string;
       }>,
     ) {
       state.selected = { ...state.selected, isMax: false, ...action.payload };

diff --git a/redux/selectors/getPortfolioAssets.ts b/redux/selectors/getPortfolioAssets.ts
@@ -129,6 +129,7 @@ export const getPortfolioAssets = createSelector(
         totalBorrowedUSD += borrowedUSD;
         return standardizeAsset({
           tokenId,
+          shadow_id: DEFAULT_POSITION,
           collateralType: CONST_COLLATERAL_TYPE.SINGLE_TOKEN,
           metadata: asset.metadata,
           symbol: asset.metadata.symbol,
@@ -170,6 +171,7 @@ export const getPortfolioAssets = createSelector(
           totalBorrowedUSD += borrowedUSD;
           return standardizeAsset({
             tokenId,
+            shadow_id,
             collateralType: CONST_COLLATERAL_TYPE.LP_TOKEN,
             metadata: asset.metadata,
             metadataLP: lpAsset.metadata,

diff --git a/screens/Dashboard/index.tsx b/screens/Dashboard/index.tsx
@@ -197,6 +197,7 @@ type TableRowSelect = {
   data: {
     tokenId: string | null | undefined;
     canUseAsCollateral: boolean | undefined;
+    shadow_id?: string | null | undefined;
   } | null;
   index: number | null | undefined;
 };
@@ -377,7 +378,7 @@ const YourBorrowed = ({ borrowedRows, accountId, total }) => {
         actionRow={
           <div className="flex gap-2 pb-6 table-action-row">
             <MarketButton tokenId={selected?.data?.tokenId} />
-            <RepayButton tokenId={selected?.data?.tokenId} />
+            <RepayButton tokenId={selected?.data?.tokenId} position={selected?.data?.shadow_id} />
           </div>
         }
       />

diff --git a/screens/Dashboard/supplyBorrowButtons.tsx b/screens/Dashboard/supplyBorrowButtons.tsx
@@ -49,8 +49,8 @@ export const AdjustButton = ({ tokenId }) => {
   );
 };
 
-export const RepayButton = ({ tokenId }) => {
-  const handleRepayClick = useRepayTrigger(tokenId);
+export const RepayButton = ({ tokenId, position }) => {
+  const handleRepayClick = useRepayTrigger(tokenId, position);
   return (
     <div
       role="button"

diff --git a/screens/Dashboard/supplyBorrowListMobile.tsx b/screens/Dashboard/supplyBorrowListMobile.tsx
@@ -225,7 +225,7 @@ const BorrowItem = ({ data }) => {
         </ItemRow>
 
         <div className="">
-          <RepayButton tokenId={data?.tokenId} />
+          <RepayButton tokenId={data?.tokenId} position={data?.shadow_id} />
         </div>
       </div>
     </div>