From cca82aa85b3b3b58c2d0ac4703d9baba3d046c5a Mon Sep 17 00:00:00 2001 From: Rostik Kayko <119863957+rostislav-deriv@users.noreply.github.com> Date: Fri, 3 Nov 2023 10:19:32 +0300 Subject: [PATCH] fix: issues (#11144) --- .../Base/WalletDropdown/WalletDropdown.scss | 3 ++- .../TransactionsTable/TransactionsTable.scss | 17 ++++++++--------- .../TransactionsTable/TransactionsTable.tsx | 18 ++++++++---------- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/packages/wallets/src/components/Base/WalletDropdown/WalletDropdown.scss b/packages/wallets/src/components/Base/WalletDropdown/WalletDropdown.scss index f9e21f51bfd5..ff65794077a3 100644 --- a/packages/wallets/src/components/Base/WalletDropdown/WalletDropdown.scss +++ b/packages/wallets/src/components/Base/WalletDropdown/WalletDropdown.scss @@ -1,6 +1,6 @@ .wallets-dropdown { min-width: 12rem; - max-width: 28rem; + max-width: 19.5rem; position: relative; &__button { @@ -32,6 +32,7 @@ } &__field { + min-width: 0; /* this is required to reset input's default width */ font-family: inherit; outline: 0; font-size: 1.4rem; diff --git a/packages/wallets/src/features/cashier/modules/Transactions/components/TransactionsTable/TransactionsTable.scss b/packages/wallets/src/features/cashier/modules/Transactions/components/TransactionsTable/TransactionsTable.scss index f03f9e694bfc..049cd1a0d5df 100644 --- a/packages/wallets/src/features/cashier/modules/Transactions/components/TransactionsTable/TransactionsTable.scss +++ b/packages/wallets/src/features/cashier/modules/Transactions/components/TransactionsTable/TransactionsTable.scss @@ -1,25 +1,24 @@ .wallets-transactions-table { + height: 65vh; width: 100%; + max-width: 80rem; display: flex; flex-direction: column; align-items: center; + gap: 1.6rem; padding-block: 0 0.8rem; - height: 65vh; overflow: auto; - @include mobile { - height: 75vh; + &::-webkit-scrollbar { + display: none; } - &__content { - width: 100%; - max-width: 80rem; - display: flex; - flex-direction: column; - gap: 1.6rem; + @include mobile { + height: 75vh; } &__row { + width: 100%; display: flex; flex-direction: column; gap: 0.8rem; diff --git a/packages/wallets/src/features/cashier/modules/Transactions/components/TransactionsTable/TransactionsTable.tsx b/packages/wallets/src/features/cashier/modules/Transactions/components/TransactionsTable/TransactionsTable.tsx index 45fef557383c..e434c2fdecd9 100644 --- a/packages/wallets/src/features/cashier/modules/Transactions/components/TransactionsTable/TransactionsTable.tsx +++ b/packages/wallets/src/features/cashier/modules/Transactions/components/TransactionsTable/TransactionsTable.tsx @@ -27,16 +27,14 @@ const TransactionsTable = ({ columns, data, fetchMore, groupBy, rowGroupRend onScroll={e => (fetchMore ? fetchMore(e.target as HTMLDivElement) : null)} ref={tableContainerRef} > -
- {table.getRowModel().rows.map(rowGroup => ( -
- {rowGroupRender(rowGroup.original)} - {rowGroup.subRows.map(row => ( -
{rowRender(row.original)}
- ))} -
- ))} -
+ {table.getRowModel().rows.map(rowGroup => ( +
+ {rowGroupRender(rowGroup.original)} + {rowGroup.subRows.map(row => ( +
{rowRender(row.original)}
+ ))} +
+ ))} ); };