diff --git a/packages/admin-ui/src/pages/Customers/Customers.jsx b/packages/admin-ui/src/pages/Customers/Customers.jsx index e64ff5bb..a1f0e547 100644 --- a/packages/admin-ui/src/pages/Customers/Customers.jsx +++ b/packages/admin-ui/src/pages/Customers/Customers.jsx @@ -86,13 +86,13 @@ const Customers = () => { const handleCustomerClicked = customer => navigate(`/compliance/customer/${customer.id}`) - const [filteredCustomers, setFilteredCustomers] = useState([]) + const [customers, setCustomers] = useState([]) const [showCreationModal, setShowCreationModal] = useState(false) const { data: customersResponse, loading: customerLoading } = useQuery( GET_CUSTOMERS, { - onCompleted: data => setFilteredCustomers(R.path(['customers'])(data)), + onCompleted: data => setCustomers(R.path(['customers'])(data)), }, ) @@ -123,7 +123,7 @@ const Customers = () => { const customersData = R.pipe( R.map(setAuthorizedStatus), R.sortWith([R.ascend(byAuthorized), R.descend(byLastActive)]), - )(filteredCustomers ?? []) + )(customers ?? []) return ( <> @@ -143,7 +143,7 @@ const Customers = () => { /> diff --git a/packages/admin-ui/src/pages/Customers/CustomersList.jsx b/packages/admin-ui/src/pages/Customers/CustomersList.jsx index 6a6c146f..72530f04 100644 --- a/packages/admin-ui/src/pages/Customers/CustomersList.jsx +++ b/packages/admin-ui/src/pages/Customers/CustomersList.jsx @@ -12,19 +12,18 @@ import { import { getFormattedPhone, getName } from './helper' -const CustomersList = ({ data, locale, onClick, loading }) => { +const CustomersList = ({ data, country, onClick, loading }) => { const columns = useMemo( () => [ { accessorKey: 'id', header: 'ID', size: 315, - enableColumnFilter: true, }, { id: 'phone-email', accessorFn: it => - `${getFormattedPhone(it.phone, locale.country) || ''} ${it.email || ''}`, + `${getFormattedPhone(it.phone, country) || ''} ${it.email || ''}`, size: 180, header: 'Phone/email', },