From 69aed0945a56b1c0c0aa62483d615c9975019785 Mon Sep 17 00:00:00 2001 From: Vasilica Olariu Date: Fri, 16 May 2025 11:54:07 +0300 Subject: [PATCH] minor admin-wallet fixes --- .../src/home/tabs/payments/PaymentsTab.tsx | 12 ++++++++++++ .../src/lib/components/filter-bar/FilterBar.tsx | 6 +++++- .../payments-table/PaymentTable.module.scss | 7 ++++++- .../lib/components/payments-table/PaymentTable.tsx | 2 +- 4 files changed, 24 insertions(+), 3 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 164afd8f4..cf52a422a 100644 --- a/src/apps/wallet-admin/src/home/tabs/payments/PaymentsTab.tsx +++ b/src/apps/wallet-admin/src/home/tabs/payments/PaymentsTab.tsx @@ -37,6 +37,10 @@ function formatStatus(status: string): string { return 'Cancel' case 'PROCESSING': return 'Processing' + case 'FAILED': + return 'Failed' + case 'RETURNED': + return 'Returned' default: return status.replaceAll('_', ' ') } @@ -340,6 +344,14 @@ const ListView: FC = (props: ListViewProps) => { label: 'Processing', value: 'PROCESSING', }, + { + label: 'Failed', + value: 'FAILED', + }, + { + label: 'Returned', + value: 'RETURNED', + }, ], type: 'dropdown', }, diff --git a/src/apps/wallet-admin/src/lib/components/filter-bar/FilterBar.tsx b/src/apps/wallet-admin/src/lib/components/filter-bar/FilterBar.tsx index 154292610..95c20712a 100644 --- a/src/apps/wallet-admin/src/lib/components/filter-bar/FilterBar.tsx +++ b/src/apps/wallet-admin/src/lib/components/filter-bar/FilterBar.tsx @@ -1,5 +1,5 @@ /* eslint-disable react/jsx-no-bind */ -import React, { ChangeEvent } from 'react' +import React, { ChangeEvent, useRef } from 'react' import { Button, IconOutline, InputSelect, InputText } from '~/libs/ui' import { InputHandleAutocomplete, MembersAutocompeteResult } from '~/apps/gamification-admin/src/game-lib' @@ -28,6 +28,7 @@ interface FilterBarProps { const FilterBar: React.FC = (props: FilterBarProps) => { const [selectedValue, setSelectedValue] = React.useState>(new Map()) + const selectedMembers = useRef([]) const renderDropdown = (index: number, filter: Filter): JSX.Element => ( = (props: FilterBarProps) => { className={styles.filterInput} placeholder={filter.label} onChange={(event: Array) => { + selectedMembers.current = event setSelectedValue(new Map(selectedValue.set(filter.key, event))) props.onFilterChange(filter.key, event.map(member => member.userId)) }} tabIndex={index} + value={selectedMembers.current} /> ) @@ -121,6 +124,7 @@ const FilterBar: React.FC = (props: FilterBarProps) => { size='lg' disabled={selectedValue.size === 0} onClick={() => { + selectedMembers.current = [] setSelectedValue(new Map()) props.onResetFilters?.() }} diff --git a/src/apps/wallet-admin/src/lib/components/payments-table/PaymentTable.module.scss b/src/apps/wallet-admin/src/lib/components/payments-table/PaymentTable.module.scss index 648854b99..bf4f9d3af 100644 --- a/src/apps/wallet-admin/src/lib/components/payments-table/PaymentTable.module.scss +++ b/src/apps/wallet-admin/src/lib/components/payments-table/PaymentTable.module.scss @@ -41,6 +41,11 @@ table { top: 0; background-color: white !important; text-transform: uppercase; + + &.description { + width: 360px; + max-width: 360px; + } } tbody tr td:first-child { @@ -97,7 +102,7 @@ table { .actionButtons { padding-left: 8px; display: flex; - justify-content: center; + justify-content: flex-end; align-items: center; } diff --git a/src/apps/wallet-admin/src/lib/components/payments-table/PaymentTable.tsx b/src/apps/wallet-admin/src/lib/components/payments-table/PaymentTable.tsx index 9c6fa0bdd..cacfe61ab 100644 --- a/src/apps/wallet-admin/src/lib/components/payments-table/PaymentTable.tsx +++ b/src/apps/wallet-admin/src/lib/components/payments-table/PaymentTable.tsx @@ -38,7 +38,7 @@ const PaymentsTable: React.FC = (props: PaymentTableProps) => HANDLE - DESCRIPTION + DESCRIPTION CREATE DATE PAYMENT STATUS