Fix conditions

swan-io · Oct 12, 2023 · 47d9fa8 · 47d9fa8
1 parent 137f5c9
commit 47d9fa8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/clients/banking/src/components/CardItemArea.tsx b/clients/banking/src/components/CardItemArea.tsx
@@ -173,14 +173,11 @@ export const CardItemArea = ({
             label: t("cardDetail.transactions"),
             url: Router.AccountCardsItemTransactions({ accountMembershipId, cardId }),
           },
-          ...match({ canManageAccountMembership, card })
+          ...match(card)
             .with(
               {
-                canManageAccountMembership: true,
-                card: {
-                  statusInfo: {
-                    __typename: P.not(P.union("CardCanceledStatusInfo", "CardCancelingStatusInfo")),
-                  },
+                statusInfo: {
+                  __typename: P.not(P.union("CardCanceledStatusInfo", "CardCancelingStatusInfo")),
                 },
               },
               () => [

diff --git a/clients/banking/src/components/CardItemPhysicalDetails.tsx b/clients/banking/src/components/CardItemPhysicalDetails.tsx
@@ -984,17 +984,23 @@ export const CardItemPhysicalDetails = ({
                       ],
                     )
                     .otherwise(() => []),
-                  ...match(physicalCard.statusInfo)
+                  ...match({ statusInfo: physicalCard.statusInfo, isCurrentUserCardOwner })
                     .with(
                       {
-                        __typename: P.union(
-                          "PhysicalCardRenewedStatusInfo",
-                          "PhysicalCardToActivateStatusInfo",
-                        ),
-                        isPINReady: true,
+                        isCurrentUserCardOwner: true,
+                        statusInfo: {
+                          __typename: P.union(
+                            "PhysicalCardRenewedStatusInfo",
+                            "PhysicalCardToActivateStatusInfo",
+                          ),
+                          isPINReady: true,
+                        },
                       },
                       {
-                        __typename: "PhysicalCardActivatedStatusInfo",
+                        isCurrentUserCardOwner: true,
+                        statusInfo: {
+                          __typename: "PhysicalCardActivatedStatusInfo",
+                        },
                       },
                       () => [
                         {