fix(STK-252): Update My Stack tabs after stack cancellation (#209)

* fix: add optional chaning for safety navigation in stack order edge case * fix: make the stack modal re-fetch all stack orders after it closes
SwaprHQ · Oct 22, 2024 · 6c4db33 · 6c4db33
1 parent 6c41cdd
commit 6c4db33
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/packages/app/app/stacks/stacksOrders.tsx b/packages/app/app/stacks/stacksOrders.tsx
@@ -231,6 +231,7 @@ export const StackOrders = ({ chainId, address }: StackOrdersProps) => {
                           stacks.orders,
                           stacks.sort
                         )}
+                        fetchAllOrders={fetchAllOrders}
                         refetchStacks={() =>
                           fetchStacks(index as StackStateIndex)
                         }

diff --git a/packages/app/components/StacksTable.tsx b/packages/app/components/StacksTable.tsx
@@ -37,6 +37,7 @@ import { ModalId, useModalContext } from "@/contexts";
 
 interface StacksTableProps {
   stackOrders: StackOrder[];
+  fetchAllOrders: () => void;
   refetchStacks: () => void;
   hasMorePages: boolean;
   hasLessPages: boolean;
@@ -46,6 +47,7 @@ interface StacksTableProps {
 
 export const StacksTable = ({
   stackOrders,
+  fetchAllOrders,
   refetchStacks,
   hasMorePages,
   hasLessPages,
@@ -165,6 +167,7 @@ export const StacksTable = ({
       {stackOrder && (
         <StackModal
           refetchStacks={refetchStacks}
+          fetchAllOrders={fetchAllOrders}
           isOpen={isModalOpen(ModalId.STACK)}
           closeAction={() => closeModal(ModalId.STACK)}
           stackOrder={stackOrder}

diff --git a/packages/app/components/stack-modal/StackModal.tsx b/packages/app/components/stack-modal/StackModal.tsx
@@ -51,6 +51,7 @@ import { Transaction } from "@/models/stack";
 
 interface StackModalProps extends ModalBaseProps {
   stackOrder: StackOrder;
+  fetchAllOrders: () => void;
   refetchStacks: () => void;
 }
 
@@ -66,6 +67,7 @@ type Content = {
 export const StackModal = ({
   stackOrder,
   isOpen,
+  fetchAllOrders,
   refetchStacks,
   closeAction,
 }: StackModalProps) => {
@@ -245,6 +247,7 @@ export const StackModal = ({
         <DialogFooterActions
           primaryAction={() => {
             refetchStacks();
+            fetchAllOrders();
             closeModal(ModalId.CANCEL_STACK_PROCESSING);
             closeModal(ModalId.CANCEL_STACK_SUCCESS);
             closeAction();

diff --git a/packages/app/models/stack-order/stack-order.ts b/packages/app/models/stack-order/stack-order.ts
@@ -69,7 +69,7 @@ export const stackHasRemainingFunds = (stackOrder: StackOrder) =>
 
 export const stackRemainingFunds = (stackOrder: StackOrder) => {
   if (
-    stackOrder.cowOrders.length &&
+    stackOrder.cowOrders?.length &&
     totalFundsUsed(stackOrder) === 0 &&
     totalStackOrdersDone(stackOrder) > 0
   )