From 0f407ca298a50e4f639f99529afed4aff575b4b9 Mon Sep 17 00:00:00 2001 From: mayuran-deriv Date: Mon, 18 Nov 2024 10:47:17 +0400 Subject: [PATCH 01/33] fix: google drive error 403 --- src/stores/google-drive-store.ts | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/src/stores/google-drive-store.ts b/src/stores/google-drive-store.ts index 5a136d8e..aefea347 100644 --- a/src/stores/google-drive-store.ts +++ b/src/stores/google-drive-store.ts @@ -104,6 +104,7 @@ export default class GoogleDriveStore { this.setIsAuthorized(true); localStorage.setItem('google_access_token', response.access_token); this.setGoogleDriveTokenExpiry(response?.expires_in); + this.setGoogleDriveTokenValid(true); } }, }); @@ -115,22 +116,15 @@ export default class GoogleDriveStore { verifyGoogleDriveAccessToken = async () => { const expiry_time = localStorage?.getItem('google_access_token_expiry'); - if (expiry_time) { - const current_epoch_time = Math.floor(Date.now() / 1000); - if (current_epoch_time > Number(expiry_time)) { - try { - //request new access token if invalid - await this.client.requestAccessToken({ prompt: '' }); - } catch (error) { - this.signOut(); - this.setGoogleDriveTokenValid(false); - localStorage.removeItem('google_access_token_expiry'); - botNotification(notification_message().google_drive_error, undefined, { - closeButton: false, - }); - return 'not_verified'; - } - } + if (!expiry_time) return 'not_verified'; + const current_epoch_time = Math.floor(Date.now() / 1000); + if (current_epoch_time > Number(expiry_time)) { + this.signOut(); + this.setGoogleDriveTokenValid(false); + localStorage.removeItem('google_access_token_expiry'); + localStorage.removeItem('google_access_token'); + botNotification(notification_message().google_drive_error, undefined, { closeButton: false }); + return 'not_verified'; } return 'verified'; }; @@ -144,8 +138,10 @@ export default class GoogleDriveStore { async signOut() { if (this.access_token) { await window?.gapi?.client?.setToken({ access_token: '' }); - await window?.google?.accounts?.oauth2?.revoke(this.access_token); - localStorage?.removeItem('google_access_token'); + if (localStorage.getItem('google_access_token')) { + await window?.google?.accounts?.oauth2?.revoke(this.access_token); + localStorage?.removeItem('google_access_token'); + } this.access_token = ''; } this.setIsAuthorized(false); From 7142b639d4a7bde70f5cfd4bccd34a93736de6a4 Mon Sep 17 00:00:00 2001 From: mayuran-deriv Date: Wed, 20 Nov 2024 14:11:33 +0400 Subject: [PATCH 02/33] fix: loader for empty page --- src/app/App.tsx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/app/App.tsx b/src/app/App.tsx index ca975080..5f32c9e2 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -3,7 +3,8 @@ import React from 'react'; import { createBrowserRouter, createRoutesFromElements, Route, RouterProvider } from 'react-router-dom'; import RoutePromptDialog from '@/components/route-prompt-dialog'; import Endpoint from '@/pages/endpoint'; -import { initializeI18n, TranslationProvider } from '@deriv-com/translations'; +import { initializeI18n, localize, TranslationProvider } from '@deriv-com/translations'; +import { Loader } from '@deriv-com/ui'; import { URLUtils } from '@deriv-com/utils'; import { StoreProvider } from '../hooks/useStore'; import CoreStoreProvider from './CoreStoreProvider'; @@ -21,7 +22,14 @@ const router = createBrowserRouter( Please wait while we load the app...}> + + +
{localize('Please wait while we connect to the server...')}
+ + } + > From 01de8f8dce449464b1e5b688912f6756cc1922a8 Mon Sep 17 00:00:00 2001 From: mayuran-deriv Date: Wed, 20 Nov 2024 14:22:55 +0400 Subject: [PATCH 03/33] fix: style --- src/app/App.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/App.tsx b/src/app/App.tsx index 5f32c9e2..b32bf9a6 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -8,6 +8,7 @@ import { Loader } from '@deriv-com/ui'; import { URLUtils } from '@deriv-com/utils'; import { StoreProvider } from '../hooks/useStore'; import CoreStoreProvider from './CoreStoreProvider'; +import './app-root.scss'; const Layout = lazy(() => import('../components/layout')); const AppRoot = lazy(() => import('./app-root')); From 3b0720ce6089ed60afe5e81c6777d7a38229aff9 Mon Sep 17 00:00:00 2001 From: mayuran-deriv Date: Wed, 20 Nov 2024 14:46:06 +0400 Subject: [PATCH 04/33] fix: margin issue --- src/app/app-root.scss | 4 ++++ src/app/app-root.tsx | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/app-root.scss b/src/app/app-root.scss index 5e6d0581..886b2cf2 100644 --- a/src/app/app-root.scss +++ b/src/app/app-root.scss @@ -4,4 +4,8 @@ align-items: center; justify-content: center; font-size: 1.6rem; + + .main-text { + margin-top: 1rem; + } } diff --git a/src/app/app-root.tsx b/src/app/app-root.tsx index cc80f567..0109bd81 100644 --- a/src/app/app-root.tsx +++ b/src/app/app-root.tsx @@ -14,7 +14,7 @@ const AppRootLoader = () => { return (
-
{localize('Please wait while we connect to the server...')}
+
{localize('Please wait while we connect to the server...')}
); }; From 55ddebbbac40ae22296055d0909c02ff3d166650 Mon Sep 17 00:00:00 2001 From: mayuran-deriv Date: Wed, 20 Nov 2024 14:52:12 +0400 Subject: [PATCH 05/33] fix: style --- src/app/App.tsx | 2 +- src/app/app-root.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/App.tsx b/src/app/App.tsx index b32bf9a6..54258b25 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -27,7 +27,7 @@ const router = createBrowserRouter( fallback={
-
{localize('Please wait while we connect to the server...')}
+
{localize('Please wait while we connect to the server...')}
} > diff --git a/src/app/app-root.tsx b/src/app/app-root.tsx index 0109bd81..cc80f567 100644 --- a/src/app/app-root.tsx +++ b/src/app/app-root.tsx @@ -14,7 +14,7 @@ const AppRootLoader = () => { return (
-
{localize('Please wait while we connect to the server...')}
+
{localize('Please wait while we connect to the server...')}
); }; From 71c680be97533e8e25795fbaf1e47e609d70292f Mon Sep 17 00:00:00 2001 From: mayuran-deriv Date: Wed, 20 Nov 2024 16:19:03 +0400 Subject: [PATCH 06/33] fix: text --- src/app/App.tsx | 13 +++---------- src/app/app-root.tsx | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/app/App.tsx b/src/app/App.tsx index 54258b25..a147b297 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -3,10 +3,10 @@ import React from 'react'; import { createBrowserRouter, createRoutesFromElements, Route, RouterProvider } from 'react-router-dom'; import RoutePromptDialog from '@/components/route-prompt-dialog'; import Endpoint from '@/pages/endpoint'; -import { initializeI18n, localize, TranslationProvider } from '@deriv-com/translations'; -import { Loader } from '@deriv-com/ui'; +import { initializeI18n, TranslationProvider } from '@deriv-com/translations'; import { URLUtils } from '@deriv-com/utils'; import { StoreProvider } from '../hooks/useStore'; +import { AppRootLoader } from './app-root'; import CoreStoreProvider from './CoreStoreProvider'; import './app-root.scss'; @@ -23,14 +23,7 @@ const router = createBrowserRouter( - -
{localize('Please wait while we connect to the server...')}
- - } - > + }> diff --git a/src/app/app-root.tsx b/src/app/app-root.tsx index cc80f567..ac42e4bf 100644 --- a/src/app/app-root.tsx +++ b/src/app/app-root.tsx @@ -10,7 +10,7 @@ import './app-root.scss'; const AppContent = lazy(() => import('./app-content')); -const AppRootLoader = () => { +export const AppRootLoader = () => { return (
From c12f6ac4aec20b91ff1c7206a55ca4472c5f2c1b Mon Sep 17 00:00:00 2001 From: mayuran-deriv Date: Wed, 20 Nov 2024 16:29:37 +0400 Subject: [PATCH 07/33] fix: margin issue --- src/app/app-root.scss | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/app/app-root.scss b/src/app/app-root.scss index 886b2cf2..9ca7c8af 100644 --- a/src/app/app-root.scss +++ b/src/app/app-root.scss @@ -4,8 +4,5 @@ align-items: center; justify-content: center; font-size: 1.6rem; - - .main-text { - margin-top: 1rem; - } + margin-top: 1.5rem; } From aa7485d30227786bd3c91083652ad35113af4353 Mon Sep 17 00:00:00 2001 From: mayuran-deriv Date: Wed, 20 Nov 2024 17:49:10 +0400 Subject: [PATCH 08/33] fix: loader and changes --- src/app/App.tsx | 10 ++++++++-- src/app/app-root.scss | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/app/App.tsx b/src/app/App.tsx index a147b297..7606969d 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -4,9 +4,9 @@ import { createBrowserRouter, createRoutesFromElements, Route, RouterProvider } import RoutePromptDialog from '@/components/route-prompt-dialog'; import Endpoint from '@/pages/endpoint'; import { initializeI18n, TranslationProvider } from '@deriv-com/translations'; +import { Loader } from '@deriv-com/ui'; import { URLUtils } from '@deriv-com/utils'; import { StoreProvider } from '../hooks/useStore'; -import { AppRootLoader } from './app-root'; import CoreStoreProvider from './CoreStoreProvider'; import './app-root.scss'; @@ -23,7 +23,13 @@ const router = createBrowserRouter( }> + + +
+ } + > diff --git a/src/app/app-root.scss b/src/app/app-root.scss index 9ca7c8af..5e6d0581 100644 --- a/src/app/app-root.scss +++ b/src/app/app-root.scss @@ -4,5 +4,4 @@ align-items: center; justify-content: center; font-size: 1.6rem; - margin-top: 1.5rem; } From 360efd85618b3f67ab6bc36234d775733d10dbec Mon Sep 17 00:00:00 2001 From: mayuran-deriv Date: Wed, 20 Nov 2024 17:51:23 +0400 Subject: [PATCH 09/33] fix: remove export --- src/app/app-root.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app-root.tsx b/src/app/app-root.tsx index ac42e4bf..cc80f567 100644 --- a/src/app/app-root.tsx +++ b/src/app/app-root.tsx @@ -10,7 +10,7 @@ import './app-root.scss'; const AppContent = lazy(() => import('./app-content')); -export const AppRootLoader = () => { +const AppRootLoader = () => { return (
From eaa3f627b994feb76ba77f420858a2e99e0f8c82 Mon Sep 17 00:00:00 2001 From: mayuran-deriv Date: Thu, 21 Nov 2024 11:04:37 +0400 Subject: [PATCH 10/33] fix: load message --- src/app/App.tsx | 5 ++++- src/app/app-root.scss | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/app/App.tsx b/src/app/App.tsx index 7606969d..2587df31 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { createBrowserRouter, createRoutesFromElements, Route, RouterProvider } from 'react-router-dom'; import RoutePromptDialog from '@/components/route-prompt-dialog'; import Endpoint from '@/pages/endpoint'; -import { initializeI18n, TranslationProvider } from '@deriv-com/translations'; +import { initializeI18n, localize, TranslationProvider } from '@deriv-com/translations'; import { Loader } from '@deriv-com/ui'; import { URLUtils } from '@deriv-com/utils'; import { StoreProvider } from '../hooks/useStore'; @@ -27,6 +27,9 @@ const router = createBrowserRouter( fallback={
+
+ {localize('Please wait while we connect to the server...')} +
} > diff --git a/src/app/app-root.scss b/src/app/app-root.scss index 5e6d0581..12c71e2a 100644 --- a/src/app/app-root.scss +++ b/src/app/app-root.scss @@ -4,4 +4,8 @@ align-items: center; justify-content: center; font-size: 1.6rem; + + .load-message { + margin-top: 9rem; + } } From ab958c783315f5161265863b37155e169af168c0 Mon Sep 17 00:00:00 2001 From: Farabi Date: Thu, 21 Nov 2024 16:29:42 +0800 Subject: [PATCH 11/33] fix: ui bugs on transaction, qs and header --- src/components/journal/journal.scss | 3 +-- .../custom-notifications/custom-notifications.scss | 4 ++-- src/components/layout/header/header-config.tsx | 2 +- src/components/layout/header/header.scss | 3 +-- .../layout/header/menu-items/menu-items.scss | 2 +- .../header/platform-switcher/platform-switcher.scss | 10 +++++++--- src/components/layout/layout.scss | 4 ++++ src/components/market/market-icon.tsx | 6 ++++++ src/components/trade-type/trade-type-icon.tsx | 4 ++-- src/components/transactions/transactions.scss | 9 +++++++++ .../bot-builder/quick-strategy/selects/symbol.tsx | 6 +++--- .../bot-builder/quick-strategy/selects/trade-type.tsx | 8 ++++---- src/pages/main/main.scss | 2 +- 13 files changed, 42 insertions(+), 21 deletions(-) diff --git a/src/components/journal/journal.scss b/src/components/journal/journal.scss index 4c2c98e2..819bc99e 100644 --- a/src/components/journal/journal.scss +++ b/src/components/journal/journal.scss @@ -16,8 +16,7 @@ } } -.journal, -.transactions { +.journal { .ReactVirtualized__Grid__innerScrollContainer { & > :first-child, :before, diff --git a/src/components/layout/header/custom-notifications/custom-notifications.scss b/src/components/layout/header/custom-notifications/custom-notifications.scss index 2b26e7f9..baa13609 100644 --- a/src/components/layout/header/custom-notifications/custom-notifications.scss +++ b/src/components/layout/header/custom-notifications/custom-notifications.scss @@ -1,10 +1,10 @@ @use 'components/shared/styles/mixins' as *; .notifications__wrapper { - padding-inline-start: 0.5rem; + padding-inline-start: 1rem; border-inline-start: 1px solid var(--general-section-1); border-width: 1px; - margin-inline-end: 2.4rem; + margin-inline-end: 2rem; @include mobile-or-tablet-screen { margin-inline-end: 0; diff --git a/src/components/layout/header/header-config.tsx b/src/components/layout/header/header-config.tsx index 3f6bfafe..e73f0226 100644 --- a/src/components/layout/header/header-config.tsx +++ b/src/components/layout/header/header-config.tsx @@ -51,7 +51,7 @@ export const platformsConfig: PlatformsConfig[] = [ }, { active: true, - buttonIcon: , + buttonIcon: , description: localize('Automated trading at your fingertips. No coding needed.'), href: standalone_routes.bot, icon: , diff --git a/src/components/layout/header/header.scss b/src/components/layout/header/header.scss index 1e670b3a..ed3635ef 100644 --- a/src/components/layout/header/header.scss +++ b/src/components/layout/header/header.scss @@ -3,9 +3,8 @@ .app-header { &__account-settings { - padding-inline-end: 0.75rem; + padding-inline-end: 1.2rem; border-inline-end: 0.1rem solid var(--general-section-1); - height: 3.2rem; } &__account-settings, diff --git a/src/components/layout/header/menu-items/menu-items.scss b/src/components/layout/header/menu-items/menu-items.scss index 4f246c3f..0fdb55cf 100644 --- a/src/components/layout/header/menu-items/menu-items.scss +++ b/src/components/layout/header/menu-items/menu-items.scss @@ -1,4 +1,4 @@ .app-header__menu { gap: 0.8rem; - padding: 1.25rem 1.25rem 1.25rem 1.65rem; + padding: 1.25rem 1.25rem 1.25rem 1.5rem; } diff --git a/src/components/layout/header/platform-switcher/platform-switcher.scss b/src/components/layout/header/platform-switcher/platform-switcher.scss index 964d7878..cea0697a 100644 --- a/src/components/layout/header/platform-switcher/platform-switcher.scss +++ b/src/components/layout/header/platform-switcher/platform-switcher.scss @@ -3,9 +3,13 @@ padding-inline-start: 1.6rem; padding-inline-end: 1.6rem; - svg > g > path, - &-chevron > path { - fill: var(--text-prominent); + &-chevron { + margin-inline-start: 3.2rem; + + svg > g > path, + > path { + fill: var(--text-prominent); + } } } } diff --git a/src/components/layout/layout.scss b/src/components/layout/layout.scss index 2e6abb39..8c1e4943 100644 --- a/src/components/layout/layout.scss +++ b/src/components/layout/layout.scss @@ -2,4 +2,8 @@ display: flex; flex-direction: column; height: 100vh; + + .deriv-header { + height: 4.9rem; + } } diff --git a/src/components/market/market-icon.tsx b/src/components/market/market-icon.tsx index 920e4bf8..4489e2ca 100644 --- a/src/components/market/market-icon.tsx +++ b/src/components/market/market-icon.tsx @@ -62,6 +62,9 @@ const MARKET_ICONS = { FRXGBPUSD: lazy(() => import('@deriv/quill-icons/Markets').then(module => ({ default: module.MarketForexGbpusdIcon })) ), + FRXGBPNZD: lazy(() => + import('@deriv/quill-icons/Markets').then(module => ({ default: module.MarketForexGbpnzdIcon })) + ), FRXNZDJPY: lazy(() => import('@deriv/quill-icons/Markets').then(module => ({ default: module.MarketForexNzdjpnIcon })) ), @@ -86,6 +89,9 @@ const MARKET_ICONS = { FRXUSDSEK: lazy(() => import('@deriv/quill-icons/Markets').then(module => ({ default: module.MarketForexUsdsekIcon })) ), + FRXUSDMXN: lazy(() => + import('@deriv/quill-icons/Markets').then(module => ({ default: module.MarketForexUsdmxnIcon })) + ), FRXXAGUSD: lazy(() => import('@deriv/quill-icons/Markets').then(module => ({ default: module.MarketCommoditySilverusdIcon })) ), diff --git a/src/components/trade-type/trade-type-icon.tsx b/src/components/trade-type/trade-type-icon.tsx index 11f116b0..f431c8b8 100644 --- a/src/components/trade-type/trade-type-icon.tsx +++ b/src/components/trade-type/trade-type-icon.tsx @@ -100,12 +100,12 @@ const TRADE_TYPE_ICONS = { ), }; -export const TradeTypeIcon = ({ type, size }: { type: string; size?: IconSize }) => { +export const TradeTypeIcon = ({ type, size, className }: { type: string; size?: IconSize; className?: string }) => { const Icon = TRADE_TYPE_ICONS[type?.toUpperCase() as keyof typeof TRADE_TYPE_ICONS] || TRADE_TYPE_ICONS.unknown; return ( - + ); }; diff --git a/src/components/transactions/transactions.scss b/src/components/transactions/transactions.scss index 53a6d2ce..f61d0d9a 100644 --- a/src/components/transactions/transactions.scss +++ b/src/components/transactions/transactions.scss @@ -7,6 +7,15 @@ flex-direction: column; + .ReactVirtualized__Grid__innerScrollContainer { + & > :first-child, + :before, + :after { + box-sizing: border-box; + animation: move-in 0.4s ease-in forwards; + } + } + .download__container { &__view-detail-button { margin-inline-start: 12px; diff --git a/src/pages/bot-builder/quick-strategy/selects/symbol.tsx b/src/pages/bot-builder/quick-strategy/selects/symbol.tsx index fdb1df2f..24457992 100644 --- a/src/pages/bot-builder/quick-strategy/selects/symbol.tsx +++ b/src/pages/bot-builder/quick-strategy/selects/symbol.tsx @@ -1,11 +1,11 @@ import React, { useEffect, useMemo, useState } from 'react'; import { Field, FieldProps, useFormikContext } from 'formik'; +import { MarketIcon } from '@/components/market/market-icon'; import Autocomplete from '@/components/shared_ui/autocomplete'; import { TItem } from '@/components/shared_ui/dropdown-list'; import Text from '@/components/shared_ui/text'; import { ApiHelpers } from '@/external/bot-skeleton'; import { useStore } from '@/hooks/useStore'; -import { Icon } from '@/utils/tmp/dummy'; import { useDevice } from '@deriv-com/ui'; import { TFormData } from '../types'; @@ -22,7 +22,7 @@ type TMarketOption = { const MarketOption: React.FC = ({ symbol }) => (
- + {symbol.text} @@ -125,7 +125,7 @@ const SymbolSelect: React.FC = () => { onChange={handleInputChange} onFocus={handleFocus} onHideDropdownList={handleHideDropdownList} - leading_icon={} + leading_icon={} /> )} diff --git a/src/pages/bot-builder/quick-strategy/selects/trade-type.tsx b/src/pages/bot-builder/quick-strategy/selects/trade-type.tsx index d6987c0e..f2fc3eb1 100644 --- a/src/pages/bot-builder/quick-strategy/selects/trade-type.tsx +++ b/src/pages/bot-builder/quick-strategy/selects/trade-type.tsx @@ -3,9 +3,9 @@ import { Field, FieldProps, useFormikContext } from 'formik'; import Autocomplete from '@/components/shared_ui/autocomplete'; import { TItem } from '@/components/shared_ui/dropdown-list'; import Text from '@/components/shared_ui/text'; +import { TradeTypeIcon } from '@/components/trade-type/trade-type-icon'; import { ApiHelpers } from '@/external/bot-skeleton'; import { useStore } from '@/hooks/useStore'; -import { IconTradeTypes } from '@/utils/tmp/dummy'; import { TApiHelpersInstance, TFormData, TTradeType } from '../types'; type TTradeTypeOption = { @@ -17,7 +17,7 @@ const TradeTypeOption: React.FC = ({ trade_type: { value, icon
{icon?.length ? icon.map((ic, idx) => ( - + )) : null} @@ -89,8 +89,8 @@ const TradeTypeSelect: React.FC = () => { }} leading_icon={ - - + + } /> diff --git a/src/pages/main/main.scss b/src/pages/main/main.scss index 60c424be..07b10a70 100644 --- a/src/pages/main/main.scss +++ b/src/pages/main/main.scss @@ -130,7 +130,7 @@ border-top-left-radius: 1rem; border-top-right-radius: 1rem; height: 4.8rem; - padding: 0 2.4rem; + padding: 0 2rem; width: auto; @include flex-center; From 2d51edaefa63c9e621adad8b61690426ef4c7710 Mon Sep 17 00:00:00 2001 From: Farabi Date: Thu, 21 Nov 2024 17:13:15 +0800 Subject: [PATCH 12/33] fix: platform switcher --- .../platform-switcher/platform-switcher.scss | 14 +++++++++++++- src/components/layout/layout.scss | 1 + src/components/transactions/transactions.scss | 8 ++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/components/layout/header/platform-switcher/platform-switcher.scss b/src/components/layout/header/platform-switcher/platform-switcher.scss index cea0697a..b308f28d 100644 --- a/src/components/layout/header/platform-switcher/platform-switcher.scss +++ b/src/components/layout/header/platform-switcher/platform-switcher.scss @@ -3,12 +3,24 @@ padding-inline-start: 1.6rem; padding-inline-end: 1.6rem; + svg > g { + fill: var(--text-general); + } + &-chevron { margin-inline-start: 3.2rem; svg > g > path, > path { - fill: var(--text-prominent); + fill: var(--text-general); + } + } + } + + &__context-menu { + &__items { + a > svg > g { + fill: var(--text-general); } } } diff --git a/src/components/layout/layout.scss b/src/components/layout/layout.scss index 8c1e4943..b1bde8f0 100644 --- a/src/components/layout/layout.scss +++ b/src/components/layout/layout.scss @@ -4,6 +4,7 @@ height: 100vh; .deriv-header { + background: var(--general-main-1); height: 4.9rem; } } diff --git a/src/components/transactions/transactions.scss b/src/components/transactions/transactions.scss index f61d0d9a..160efd1e 100644 --- a/src/components/transactions/transactions.scss +++ b/src/components/transactions/transactions.scss @@ -49,6 +49,14 @@ display: flex; justify-content: center; margin-top: 0.3rem; + + svg { + g { + path { + fill: var(--text-less-prominent); + } + } + } } &__icon { From a9741f0630daf6e7b2ad6c0bafc1a4849668cf29 Mon Sep 17 00:00:00 2001 From: Farabi Date: Thu, 21 Nov 2024 17:31:37 +0800 Subject: [PATCH 13/33] fix: sign up flow --- src/components/layout/header/header.tsx | 2 +- src/components/shared/utils/routes/routes.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/layout/header/header.tsx b/src/components/layout/header/header.tsx index 0a930feb..714761b5 100644 --- a/src/components/layout/header/header.tsx +++ b/src/components/layout/header/header.tsx @@ -76,7 +76,7 @@ const AppHeader = observer(() => {