From d35ceb9b736fe9efed8176bdadc61b7712ded7fb Mon Sep 17 00:00:00 2001 From: Rostik Kayko <119863957+rostislav-deriv@users.noreply.github.com> Date: Thu, 16 Nov 2023 13:56:53 +0300 Subject: [PATCH] [Wallets] [Fix] Rostislav / WALL-2591 / Transactions tab wrong order and dropdown width on mobile (#11459) * fix: inconsistencies * refactor: apply suggestion * refactor: remove `WalletDropdown` `max-width` --- .../cashier/modules/Transactions/Transactions.scss | 8 ++++++++ .../cashier/modules/Transactions/Transactions.tsx | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/wallets/src/features/cashier/modules/Transactions/Transactions.scss b/packages/wallets/src/features/cashier/modules/Transactions/Transactions.scss index ede739ffb995..4341670a8939 100644 --- a/packages/wallets/src/features/cashier/modules/Transactions/Transactions.scss +++ b/packages/wallets/src/features/cashier/modules/Transactions/Transactions.scss @@ -11,6 +11,14 @@ margin-top: -2.4rem; } + // adjust filter dropdown width + .wallets-dropdown { + max-width: 19.5rem; + @include mobile { + max-width: unset; + } + } + &__header { position: sticky; top: -4.8rem; // ignore CashierContent padding diff --git a/packages/wallets/src/features/cashier/modules/Transactions/Transactions.tsx b/packages/wallets/src/features/cashier/modules/Transactions/Transactions.tsx index 710df9e4d3e7..aa4616cf2140 100644 --- a/packages/wallets/src/features/cashier/modules/Transactions/Transactions.tsx +++ b/packages/wallets/src/features/cashier/modules/Transactions/Transactions.tsx @@ -15,8 +15,9 @@ const filtersMapper: Record> = { completed: { all: undefined, deposit: 'deposit', - transfer: 'transfer', withdrawal: 'withdrawal', + // eslint-disable-next-line sort-keys + transfer: 'transfer', }, pending: { all: 'all',