From 12d5060c0ee8a6613e03f49d4029940c326a0916 Mon Sep 17 00:00:00 2001 From: Rostik Kayko Date: Wed, 15 Nov 2023 17:34:11 +0300 Subject: [PATCH 1/3] fix: inconsistencies --- .../features/cashier/modules/Transactions/Transactions.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/wallets/src/features/cashier/modules/Transactions/Transactions.tsx b/packages/wallets/src/features/cashier/modules/Transactions/Transactions.tsx index 710df9e4d3e7..8b54f2383db3 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', @@ -78,6 +79,7 @@ const Transactions = () => { icon={} label='Filter' list={filterOptionsList} + maxWidth={isMobile ? 'unset' : '19.5rem'} onSelect={value => setFilterValue(value)} value={filterValue} /> From b919437d916b4201552646ee320bd00a20a3596d Mon Sep 17 00:00:00 2001 From: Rostik Kayko Date: Wed, 15 Nov 2023 18:19:09 +0300 Subject: [PATCH 2/3] refactor: apply suggestion --- .../components/Base/WalletDropdown/WalletDropdown.scss | 1 + .../src/components/Base/WalletDropdown/WalletDropdown.tsx | 2 +- .../cashier/modules/Transactions/Transactions.scss | 8 ++++++++ .../cashier/modules/Transactions/Transactions.tsx | 1 - 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/wallets/src/components/Base/WalletDropdown/WalletDropdown.scss b/packages/wallets/src/components/Base/WalletDropdown/WalletDropdown.scss index b540eab6d700..a6623cd4a45a 100644 --- a/packages/wallets/src/components/Base/WalletDropdown/WalletDropdown.scss +++ b/packages/wallets/src/components/Base/WalletDropdown/WalletDropdown.scss @@ -1,5 +1,6 @@ .wallets-dropdown { width: 100%; + max-width: 19.5rem; position: relative; cursor: pointer; diff --git a/packages/wallets/src/components/Base/WalletDropdown/WalletDropdown.tsx b/packages/wallets/src/components/Base/WalletDropdown/WalletDropdown.tsx index 754d5e6fc9e7..a87852d643c6 100644 --- a/packages/wallets/src/components/Base/WalletDropdown/WalletDropdown.tsx +++ b/packages/wallets/src/components/Base/WalletDropdown/WalletDropdown.tsx @@ -26,7 +26,7 @@ const WalletDropdown: React.FC = ({ label, list, listHeight = 'md', - maxWidth = '19.5rem', + maxWidth, onSelect, type = 'prompt', value, 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 8b54f2383db3..aa4616cf2140 100644 --- a/packages/wallets/src/features/cashier/modules/Transactions/Transactions.tsx +++ b/packages/wallets/src/features/cashier/modules/Transactions/Transactions.tsx @@ -79,7 +79,6 @@ const Transactions = () => { icon={} label='Filter' list={filterOptionsList} - maxWidth={isMobile ? 'unset' : '19.5rem'} onSelect={value => setFilterValue(value)} value={filterValue} /> From 228ea049ea0c925682f0440fd9a021498692c598 Mon Sep 17 00:00:00 2001 From: Rostik Kayko Date: Thu, 16 Nov 2023 10:25:06 +0300 Subject: [PATCH 3/3] refactor: remove `WalletDropdown` `max-width` --- .../src/components/Base/WalletDropdown/WalletDropdown.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/wallets/src/components/Base/WalletDropdown/WalletDropdown.scss b/packages/wallets/src/components/Base/WalletDropdown/WalletDropdown.scss index a6623cd4a45a..b540eab6d700 100644 --- a/packages/wallets/src/components/Base/WalletDropdown/WalletDropdown.scss +++ b/packages/wallets/src/components/Base/WalletDropdown/WalletDropdown.scss @@ -1,6 +1,5 @@ .wallets-dropdown { width: 100%; - max-width: 19.5rem; position: relative; cursor: pointer;