From 51d21888fa37944d313ec28ab2195be29f03b36b Mon Sep 17 00:00:00 2001 From: Vasilica Olariu Date: Wed, 3 Dec 2025 19:02:18 +0200 Subject: [PATCH 1/2] PS-469 - update wallet admin ui to show the onhold admin dropdown --- .../wallet-admin/src/home/tabs/payments/PaymentsTab.tsx | 7 +------ .../src/lib/components/payment-edit/PaymentEdit.tsx | 4 +++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/apps/wallet-admin/src/home/tabs/payments/PaymentsTab.tsx b/src/apps/wallet-admin/src/home/tabs/payments/PaymentsTab.tsx index 1158713fa..3c1de950b 100644 --- a/src/apps/wallet-admin/src/home/tabs/payments/PaymentsTab.tsx +++ b/src/apps/wallet-admin/src/home/tabs/payments/PaymentsTab.tsx @@ -217,7 +217,7 @@ const ListView: FC = (props: ListViewProps) => { if (updateObj.paymentStatus !== undefined) { if (updateObj.paymentStatus === 'Owed') { paymentStatus = 'OWED' - } else if (updateObj.paymentStatus === 'On Hold') { + } else if (updateObj.paymentStatus === 'On Hold (Admin)') { paymentStatus = 'ON_HOLD_ADMIN' } else if (updateObj.paymentStatus === 'Cancel') { paymentStatus = 'CANCELLED' @@ -268,11 +268,6 @@ const ListView: FC = (props: ListViewProps) => { const onPaymentEditCallback = useCallback((payment: Winning) => { let status = payment.status - if (status === 'On Hold (Admin)') { - status = 'On Hold' - } else if (['On Hold (Member)', 'On Hold (Tax Form)', 'On Hold (Payment Provider)'].indexOf(status) !== -1) { - status = 'Owed' - } setConfirmFlow({ action: 'Save', diff --git a/src/apps/wallet-admin/src/lib/components/payment-edit/PaymentEdit.tsx b/src/apps/wallet-admin/src/lib/components/payment-edit/PaymentEdit.tsx index d06ebe2f6..234edc22b 100644 --- a/src/apps/wallet-admin/src/lib/components/payment-edit/PaymentEdit.tsx +++ b/src/apps/wallet-admin/src/lib/components/payment-edit/PaymentEdit.tsx @@ -179,9 +179,11 @@ const PaymentEdit: React.FC = (props: PaymentEditFormProps const options = useCallback(() => { if (props.payment.status.toUpperCase() !== 'PAID') { + const isMemberHold = ['On Hold (Member)', 'On Hold (Tax Form)', 'On Hold (Payment Provider)'].indexOf(props.payment.status) !== -1; return [ + ...(isMemberHold ? [{label: props.payment.status, value: props.payment.status}] : []), { label: 'Owed', value: 'Owed' }, - { label: 'On Hold', value: 'On Hold' }, + { label: 'On Hold (Admin)', value: 'On Hold (Admin)' }, { label: 'Cancel', value: 'Cancel' }, ] } From 674c4ed121e4427b6f96a1f0a6d56228bac667fc Mon Sep 17 00:00:00 2001 From: Vasilica Olariu Date: Wed, 3 Dec 2025 19:15:51 +0200 Subject: [PATCH 2/2] lint --- .../wallet-admin/src/home/tabs/payments/PaymentsTab.tsx | 7 +------ .../src/lib/components/payment-edit/PaymentEdit.tsx | 9 +++++++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/apps/wallet-admin/src/home/tabs/payments/PaymentsTab.tsx b/src/apps/wallet-admin/src/home/tabs/payments/PaymentsTab.tsx index 3c1de950b..c5cd9921c 100644 --- a/src/apps/wallet-admin/src/home/tabs/payments/PaymentsTab.tsx +++ b/src/apps/wallet-admin/src/home/tabs/payments/PaymentsTab.tsx @@ -267,8 +267,6 @@ const ListView: FC = (props: ListViewProps) => { }, [fetchWinnings]) const onPaymentEditCallback = useCallback((payment: Winning) => { - let status = payment.status - setConfirmFlow({ action: 'Save', callback: async () => { @@ -276,10 +274,7 @@ const ListView: FC = (props: ListViewProps) => { }, content: ( diff --git a/src/apps/wallet-admin/src/lib/components/payment-edit/PaymentEdit.tsx b/src/apps/wallet-admin/src/lib/components/payment-edit/PaymentEdit.tsx index 234edc22b..d67cc17a3 100644 --- a/src/apps/wallet-admin/src/lib/components/payment-edit/PaymentEdit.tsx +++ b/src/apps/wallet-admin/src/lib/components/payment-edit/PaymentEdit.tsx @@ -179,9 +179,14 @@ const PaymentEdit: React.FC = (props: PaymentEditFormProps const options = useCallback(() => { if (props.payment.status.toUpperCase() !== 'PAID') { - const isMemberHold = ['On Hold (Member)', 'On Hold (Tax Form)', 'On Hold (Payment Provider)'].indexOf(props.payment.status) !== -1; + const isMemberHold = [ + 'On Hold (Member)', + 'On Hold (Tax Form)', + 'On Hold (Payment Provider)', + ].includes(props.payment.status) + return [ - ...(isMemberHold ? [{label: props.payment.status, value: props.payment.status}] : []), + ...(isMemberHold ? [{ label: props.payment.status, value: props.payment.status }] : []), { label: 'Owed', value: 'Owed' }, { label: 'On Hold (Admin)', value: 'On Hold (Admin)' }, { label: 'Cancel', value: 'Cancel' },