Merge remote-tracking branch 'origin/master' into P2PS-2596

index.html

@@ -40,6 +40,7 @@
                 height="0"
                 width="0"
                 style="display: none; visibility: hidden"
+                title="Google Tag Manager"
             ></iframe
         ></noscript>
         <!-- End Google Tag Manager (noscript) -->

package.json

@@ -4,6 +4,7 @@
     "version": "0.0.0",
     "type": "module",
     "scripts": {
+        "analyze:build": "vite-bundle-visualizer",
         "dev": "vite",
         "build": "tsc && vite build",
         "fix": "eslint \"./src/**/*.?(js|jsx|ts|tsx)\" --fix",
@@ -17,13 +18,12 @@
         "@babel/preset-env": "^7.24.5",
         "@chakra-ui/react": "^2.8.2",
         "@deriv-com/analytics": "^1.10.1",
-        "@deriv-com/api-hooks": "^1.3.7",
+        "@deriv-com/api-hooks": "^1.4.5",
         "@deriv-com/translations": "^1.2.4",
         "@deriv-com/ui": "^1.29.0",
         "@deriv-com/utils": "^0.0.28",
-        "@deriv/quill-icons": "^1.22.10",
+        "@deriv/quill-icons": "^1.23.8",
         "@sendbird/chat": "^4.11.3",
-        "@svgr/rollup": "^8.1.0",
         "@tanstack/react-query": "^5.28.14",
         "@tanstack/react-table": "^8.15.0",
         "@vitejs/plugin-react": "^4.2.1",
@@ -49,7 +49,6 @@
         "use-query-params": "^2.2.1",
         "usehooks-ts": "^2.16.0",
         "vite": "^5.1.4",
-        "vite-plugin-svgr": "^4.2.0",
         "zustand": "^4.5.2"
     },
     "devDependencies": {
@@ -67,6 +66,7 @@
         "@commitlint/cli": "^17.1.2",
         "@commitlint/config-conventional": "^17.1.0",
         "@deriv-com/eslint-config-deriv": "^2.1.0-beta.3",
+        "@svgr/rollup": "^8.1.0",
         "@testing-library/jest-dom": "^6.4.2",
         "@testing-library/react": "^14.2.1",
         "@testing-library/user-event": "^14.5.2",
@@ -105,7 +105,9 @@
         "tailwindcss": "^3.3.5",
         "ts-jest": "^29.1.2",
         "typescript": "^5.2.2",
+        "vite-bundle-visualizer": "^1.2.1",
         "vite-plugin-html-config": "^1.0.11",
-        "vite-plugin-sass": "^0.1.0"
+        "vite-plugin-sass": "^0.1.0",
+        "vite-plugin-svgr": "^4.2.0"
     }
 }

src/components/AdvertsTableRow/AdvertsTableRow.scss

@@ -1,12 +1,12 @@
 .adverts-table-row {
     width: 100%;
     display: grid;
-    grid-template-columns: 2fr 1.4fr 1.4fr 2.4fr 0.8fr;
+    grid-template-columns: 2fr 1.4fr 1.4fr 2.4fr auto;
     padding: 1.6rem;
     align-items: center;
 
     @include mobile-or-tablet-screen {
-        grid-template-columns: 2fr 0.8fr;
+        grid-template-columns: 2fr auto;
     }
 
     &--advertiser {

src/components/AppHeader/AccountSwitcher/AccountSwitcher.tsx

@@ -1,5 +1,5 @@
+import { lazy } from 'react';
 import { useActiveAccount } from '@/hooks/api/account';
-import { CurrencyUsdIcon } from '@deriv/quill-icons';
 import { AccountSwitcher as UIAccountSwitcher } from '@deriv-com/ui';
 import { FormatUtils } from '@deriv-com/utils';
 
@@ -8,12 +8,14 @@ type TAccountSwitcherProps = {
     account: TActiveAccount;
 };
 
+const CurrencyIcon = lazy(() => import('../CurrencyIcon').then(module => ({ default: module.CurrencyIcon })));
+
 const AccountSwitcher = ({ account }: TAccountSwitcherProps) => {
     const activeAccount = {
         balance: FormatUtils.formatMoney(account?.balance ?? 0),
         currency: account?.currency || 'USD',
         currencyLabel: account?.currency || 'US Dollar',
-        icon: <CurrencyUsdIcon iconSize='sm' />,
+        icon: <CurrencyIcon currency={account?.currency} isVirtual={Boolean(account?.is_virtual)} />,
         isActive: true,
         isVirtual: Boolean(account?.is_virtual),
         loginid: account?.loginid || '',