Merge pull request #153 from shafin-deriv/shafin/BOT-2418/chore-add-r…

…eset-balance-and-journal-fix chore: fix journal filter and add reset balance for demo
deriv-com · Nov 27, 2024 · da610da · da610da
2 parents edc0874 + 5e8a7af
commit da610da
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
         "@deriv-com/auth-client": "^1.2.12",
         "@deriv-com/quill-ui": "1.18.1",
         "@deriv-com/translations": "^1.3.9",
-        "@deriv-com/ui": "^1.36.4",
+        "@deriv-com/ui": "^1.37.1",
         "@deriv-com/utils": "latest",
         "@deriv/deriv-api": "^1.0.15",
         "@deriv/deriv-charts": "^2.5.1",

diff --git a/src/components/journal/journal-components/filters.tsx b/src/components/journal/journal-components/filters.tsx
@@ -1,25 +1,18 @@
 import Checkbox from '@/components/shared_ui/checkbox';
 import { TFiltersProps } from '../journal.types';
 
-const Filters = ({
-    wrapper_ref,
-    checked_filters,
-    filters,
-    filterMessage,
-    className,
-    classNameLabel,
-}: TFiltersProps) => (
+const Filters = ({ wrapper_ref, checked_filters, filters, filterMessage, className }: TFiltersProps) => (
     <div ref={wrapper_ref} className={className}>
         {filters.map(item => {
             const hasFilter = Array.isArray(checked_filters) && checked_filters.includes(item.id);
             return (
                 <Checkbox
                     key={item.id}
-                    labelClassName={classNameLabel}
                     checked={hasFilter}
                     label={item.label}
                     onChange={() => filterMessage(!hasFilter, item.id)}
                     name={item.id}
+                    defaultChecked={hasFilter}
                 />
             );
         })}

diff --git a/src/components/layout/header/account-switcher.tsx b/src/components/layout/header/account-switcher.tsx
@@ -29,6 +29,7 @@ type TAccountSwitcherProps = {
     isVirtual?: boolean;
     modifiedAccountList: TModifiedAccount[];
     switchAccount: (loginId: number) => void;
+    activeLoginId?: string;
 };
 
 type TAccountSwitcher = {
@@ -49,7 +50,12 @@ interface AccountSwitcherData {
     renderCountryIsLowRiskAndHasRealAccount: boolean;
 }
 
-const RenderAccountItems = ({ isVirtual, modifiedAccountList, switchAccount }: TAccountSwitcherProps) => {
+const RenderAccountItems = ({
+    isVirtual,
+    modifiedAccountList,
+    switchAccount,
+    activeLoginId,
+}: TAccountSwitcherProps) => {
     const { client } = useStore();
     const { landing_companies } = client;
 
@@ -95,6 +101,15 @@ const RenderAccountItems = ({ isVirtual, modifiedAccountList, switchAccount }: T
                                 onSelectAccount={() => {
                                     if (!account.is_disabled) switchAccount(account.loginid);
                                 }}
+                                onResetBalance={
+                                    isVirtual && activeLoginId === account.loginid
+                                        ? () => {
+                                              api_base?.api?.send({
+                                                  topup_virtual: 1,
+                                              });
+                                          }
+                                        : undefined
+                                }
                             />
                         </span>
                     ))}
@@ -166,6 +181,7 @@ const AccountSwitcher = observer(({ activeAccount }: TAccountSwitcher) => {
     ]);
 
     const switchAccount = async (loginId: number) => {
+        if (loginId.toString() === activeAccount?.loginid) return;
         const account_list = JSON.parse(localStorage.getItem('accountsList') ?? '{}');
         const token = account_list[loginId];
         if (!token) return;
@@ -192,13 +208,15 @@ const AccountSwitcher = observer(({ activeAccount }: TAccountSwitcher) => {
                         <RenderAccountItems
                             modifiedAccountList={modifiedAccountList as TModifiedAccount[]}
                             switchAccount={switchAccount}
+                            activeLoginId={activeAccount?.loginid}
                         />
                     </UIAccountSwitcher.Tab>
                     <UIAccountSwitcher.Tab title={tabs_labels.demo}>
                         <RenderAccountItems
                             modifiedAccountList={modifiedAccountList as TModifiedAccount[]}
                             switchAccount={switchAccount}
                             isVirtual
+                            activeLoginId={activeAccount?.loginid}
                         />
                     </UIAccountSwitcher.Tab>
                 </UIAccountSwitcher>

diff --git a/src/components/layout/header/header.scss b/src/components/layout/header/header.scss
@@ -40,6 +40,16 @@
 }
 
 .deriv-account-switcher {
+    &-item {
+        &__balance {
+            button {
+                border-width: 1px;
+                height: 2.4rem;
+                min-width: 4.8rem;
+            }
+        }
+    }
+
     &__button {
         margin-inline-end: 0.8rem;
 

diff --git a/src/components/shared_ui/checkbox/checkbox.scss b/src/components/shared_ui/checkbox/checkbox.scss
@@ -10,6 +10,7 @@
     &__input {
         display: none;
     }
+
     &__box {
         display: flex;
         width: 16px;
@@ -26,16 +27,23 @@
         &--active {
             border: none;
             background-color: var(--brand-red-coral);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            fill: #fff;
         }
     }
+
     &--active {
         border: none;
         background-color: var(--brand-red-coral);
     }
+
     &--disabled {
         opacity: 0.5;
         cursor: not-allowed !important;
     }
+
     &--grey-disabled {
         background-color: var(--checkbox-disabled-grey);
     }

diff --git a/src/components/shared_ui/checkbox/checkbox.tsx b/src/components/shared_ui/checkbox/checkbox.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import classNames from 'classnames';
-import { Icon } from '@/utils/tmp/dummy';
+import { LabelPairedCheckCaptionFillIcon } from '@deriv/quill-icons/LabelPaired';
 import Text from '../text';
 
 type TCheckBoxProps = Omit<React.HTMLProps<HTMLInputElement>, 'value' | 'label'> & {
@@ -86,7 +86,7 @@ const Checkbox = React.forwardRef<HTMLInputElement, TCheckBoxProps>(
                         tabIndex={withTabIndex}
                         onKeyDown={handleKeyDown}
                     >
-                        {!!checked && <Icon icon='IcCheckmark' color='active' />}
+                        {!!checked && <LabelPairedCheckCaptionFillIcon />}
                     </span>
                 </span>
                 <Text

diff --git a/src/stores/journal-store.ts b/src/stores/journal-store.ts
@@ -106,7 +106,7 @@ export default class JournalStore {
     restoreStoredJournals() {
         const client = this.core.client as RootStore['client'];
         const { loginid } = client;
-        this.journal_filters = getSetting('journal_filter') || this.filters.map(filter => filter.id);
+        this.journal_filters = getSetting('journal_filter') ?? this.filters.map(filter => filter.id);
         this.unfiltered_messages = getStoredItemsByUser(this.JOURNAL_CACHE, loginid, []);
     }
 

diff --git a/src/stores/run-panel-store.ts b/src/stores/run-panel-store.ts
@@ -519,7 +519,8 @@ export default class RunPanelStore {
         if (this.error_type === ErrorTypes.RECOVERABLE_ERRORS) {
             // Bot should indicate it started in below cases:
             // - When error happens it's a recoverable error
-            const { shouldRestartOnError, timeMachineEnabled } = this.dbot.interpreter.bot.tradeEngine.options;
+            const { shouldRestartOnError = false, timeMachineEnabled = false } =
+                this.dbot?.interpreter?.bot?.tradeEngine?.options ?? {};
             const is_bot_recoverable = shouldRestartOnError || timeMachineEnabled;
 
             if (is_bot_recoverable) {

diff --git a/src/utils/analytics/index.ts b/src/utils/analytics/index.ts
@@ -30,6 +30,7 @@ export const AnalyticsInitializer = async () => {
                 growthbookDecryptionKey: flags.marketing_growthbook ? process.env.GROWTHBOOK_DECRYPTION_KEY : undefined,
                 rudderstackKey: process.env.RUDDERSTACK_KEY,
                 growthbookOptions: {
+                    disableCache: process.env.NODE_ENV !== 'production',
                     attributes: {
                         account_type: account_type === 'null' ? 'unlogged' : account_type,
                         app_id: String(getAppId()),