Merge branch 'master' of https://github.com/binary-com/deriv-app

heorhi-deriv · Nov 24, 2023 · 544d99a · 544d99a
2 parents c7ecc83 + fd6b42f
commit 544d99a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/packages/wallets/src/AppContent.scss b/packages/wallets/src/AppContent.scss
@@ -18,14 +18,3 @@
     position: absolute;
     z-index: 1;
 }
-
-::-webkit-scrollbar {
-    width: 1.2rem;
-    height: 1.2rem;
-
-    &-thumb {
-        border: 0.4rem solid #fff;
-        border-radius: 4rem;
-        background: var(--state-active, #d6dadb);
-    }
-}
diff --git a/packages/wallets/src/components/Base/WalletButton/WalletButton.tsx b/packages/wallets/src/components/Base/WalletButton/WalletButton.tsx
@@ -87,7 +87,7 @@ const WalletButton: React.FC<WalletButtonProps> = ({
     } as const;
 
     return (
-        <button className={buttonClassNames} disabled={disabled || isLoading} onClick={onClick} type={type}>
+        <button className={buttonClassNames} disabled={disabled} onClick={onClick} type={type}>
             {isLoading && (
                 <div className='wallets-button__loader'>
                     <Loader color={isContained ? loaderColorMapper[color] : '#85ACB0'} isFullScreen={false} />

diff --git a/packages/wallets/src/features/cashier/WalletCashier.scss b/packages/wallets/src/features/cashier/WalletCashier.scss
@@ -21,4 +21,8 @@
     @include mobile {
         padding: 2.4rem 1.6rem;
     }
+
+    &::-webkit-scrollbar {
+        display: none;
+    }
 }
diff --git a/...features/cashier/modules/Transactions/components/TransactionsTable/TransactionsTable.scss b/...features/cashier/modules/Transactions/components/TransactionsTable/TransactionsTable.scss
@@ -10,6 +10,10 @@
         overflow: auto;
     }
 
+    &::-webkit-scrollbar {
+        display: none;
+    }
+
     &__row {
         width: 100%;
         display: flex;