Sergei / wall 1837 / remove svg badge #10051

sergei-deriv · 2023-09-13T06:52:06Z

Changes:

change color of balance to black
delete svg badge from account-info-wallets and account-switcher-wallets
change order of balance and badge
change title of account in dropdown

Screenshots:

Screenshot from design:

Screenshot from localhost:

…ub' into sergei/wall-xxx/refactor-hooks

…ub_2' into sergei/wall-xxx/refactor-hooks

…ub_2' into sergei/wall-1837/remove-svg-badge

vercel · 2023-09-13T06:52:10Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Updated (UTC)
deriv-app	✅ Ready (Inspect)	Visit Preview	Sep 15, 2023 6:26am

github-actions · 2023-09-13T07:14:40Z

A production App ID was automatically generated for this PR. (log)

PR: Sergei / wall 1837 / remove svg badge #10051
URLs:
- w/ App ID + Server: https://deriv-app-git-fork-sergei-deriv-sergei-wall-1837remove-s-431679.binary.sx?qa_server=red.binaryws.com&app_id=38787
- Original: https://deriv-app-git-fork-sergei-deriv-sergei-wall-1837remove-s-431679.binary.sx
App ID: 38787

Click here to copy & paste above information.

- **PR**: [https://github.com/binary-com/deriv-app/pull/10051](https://github.com/binary-com/deriv-app/pull/10051)
- **URLs**:
    - **w/ App ID + Server**: https://deriv-app-git-fork-sergei-deriv-sergei-wall-1837remove-s-431679.binary.sx?qa_server=red.binaryws.com&app_id=38787
    - **Original**: https://deriv-app-git-fork-sergei-deriv-sergei-wall-1837remove-s-431679.binary.sx
- **App ID**: `38787`

github-actions · 2023-09-13T07:15:08Z

🚨 Lighthouse report for the changes in this PR:

Category	Score
🔺 Performance	21
🟧 Accessibility	75
🟢 Best practices	92
🟧 SEO	85
🟢 PWA	90

Lighthouse ran with https://deriv-app-git-fork-sergei-deriv-sergei-wall-1837remove-s-431679.binary.sx/

coveralls · 2023-09-13T07:34:06Z

coverage: 10.891% (+0.09%) from 10.8% when pulling ec7b832 on sergei-deriv:sergei/wall-1837/remove-svg-badge into e532eb8 on binary-com:feature/wallets_with_traders_hub_2.

sergei-deriv · 2023-09-13T08:37:25Z

packages/hooks/src/useWalletAccountsList.ts

                landing_company_name: wallet.landing_company_name?.replace('maltainvest', 'malta'),
                /** Indicating whether the wallet is a maltainvest wallet. */
-                is_malta_wallet: wallet.landing_company_name === 'malta',
+                is_malta_wallet: wallet.landing_company_name === 'maltainvest',


Note1: changed to maltainvest because replace function doesn't mutate original string and it's still maltainvest, not malta. Ref: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace

Note2: we don't use Jurisdiction object from shared package because hooks package doesn't have shared package as dependency

mahdiyeh-deriv · 2023-09-14T02:20:39Z

packages/core/src/App/Components/Layout/Header/wallets/account-info-wallets.tsx

    const { ui } = useStore();
    const { is_dark_mode_on } = ui;

+    const show_badge = wallet_account?.is_malta_wallet || wallet_account?.is_virtual;


@sergei-deriv add this logic to the parent of this component and make the badge an optional props so whenever you don't pass badge to it, it will be empty

@mahdiyeh-deriv What do you think if I'll add this logic inside of the WalletBadge component?

@mahdiyeh-deriv I have a suggestion, let's add show_badge as prop to WalletBadge component, in result it will be really dumb component and logic to show/hide the badge will be in his parent? What do you think?

@sergei-deriv yes, let's make the badge component a dummy one without any logic in that

mahdiyeh-deriv · 2023-09-14T02:21:30Z

packages/core/src/App/Containers/AccountSwitcherWallet/account-switcher-wallet-item.tsx

        const icon_type = is_virtual ? 'demo' : currency_config?.type;
        const is_selected = is_active || linked_to?.some(account => account.loginid === active_account?.loginid);

+        const show_badge = is_malta_wallet || is_virtual;


@mahdiyeh-deriv I'm not sure it's a good idea for this component (AccountSwitcherWalletItem), because this component needs to show every item in dropdown and we call it in AccountSwitcherWallet like this:

{dtrade_account_wallets?.map(account => ( <AccountSwitcherWalletItem key={account.dtrade_loginid} account={account} closeAccountsDialog={closeAccountsDialog} /> ))}

So we just pass account and define to show or not the badge inside of the component. In your suggestion we need to add the same logic in AccountSwitcherWallet inside of the map method. Do you think is it better?
I understand what you mean, you want a dummy component as possible, but in my opinion this logic related to only this component. Also, we already have a lot of logic to define app_icon, icon_type, selected item or not, so I don't see any problem to add the logic to define to show the badge or not, because it depends on account which we already pass to the component.

It's fine, keep it here and remove form the children component

sonarqubecloud · 2023-09-15T06:05:42Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information

sergei-deriv added 30 commits August 4, 2023 16:09

feat: add some hooks

1ac24ac

feat: add tests for useAuthorize and useBalance

41d6ba0

feat: create util function

06a1cda

feat: refactored useAuthorize

ebedd7c

feat: uncommented refetchInterval in useBalance hook

ce5a843

feat: mark useWalletsList as deprecated

7d2e7f8

feat: repair useWalletsList test

12eb63a

feat: repair test cases

5994e62

feat: refactor 2 test cases

68b21df

refactor: change comment

128c971

fix: repair WalletCardsCarousel test

33809b7

refactor: move below deprecated comment

a0e5c25

feat: refactor useAvailableWallets

3d076a4

feat: refactor some hooks and tests

a401d2e

Merge remote-tracking branch 'upstream/feature/wallets_with_traders_h…

9fa273a

…ub' into sergei/wall-xxx/refactor-hooks

Merge remote-tracking branch 'upstream/feature/wallets_with_traders_h…

1609536

…ub_2' into sergei/wall-xxx/refactor-hooks

feat: refactor useWalletTransactions

6d25227

refactor: delete unnecessary property

a96b575

Merge remote-tracking branch 'upstream/feature/wallets_with_traders_h…

e80dad1

…ub_2' into sergei/wall-xxx/refactor-hooks

feat: refactored useTransferBetweenAccounts

c19b5ca

feat: repair useTransferBetweenAccounts tests

61da986

Merge remote-tracking branch 'upstream/feature/wallets_with_traders_h…

63c6654

…ub_2' into sergei/wall-xxx/refactor-hooks

feat: delete StoreProvider from some tests

e9c1095

fix: fix WalletCardsCarousel tests

a8d6708

fix: change is_demo to is_virtual and is_selected to is_active

6e5d49c

feat: add TODO comment

12f39d0

Merge remote-tracking branch 'upstream/feature/wallets_with_traders_h…

3c5f910

…ub_2' into sergei/wall-xxx/refactor-hooks

feat: add is_demo and is_selected to useActiveWallet

bc39bae

feat: refactor useCashierLocked hoook

044894f

feat: refactor useAvailableWallets hook again

891ed2b

sergei-deriv added 2 commits September 8, 2023 15:45

refactor: change getDecimalPlaces to currency_config

9b12cd8

Merge remote-tracking branch 'upstream/feature/wallets_with_traders_h…

ec7b832

…ub_2' into sergei/wall-1837/remove-svg-badge

sergei-deriv requested review from ali-hosseini-deriv, farrah-deriv, mahdiyeh-deriv, maryia-deriv, matin-deriv and nijil-deriv as code owners September 13, 2023 06:52

boring-cyborg bot added AppStore Core labels Sep 13, 2023

vercel bot deployed to Preview September 13, 2023 07:14 View deployment

sergei-deriv commented Sep 13, 2023

View reviewed changes

vercel bot deployed to Preview September 13, 2023 08:59 View deployment

sergei-deriv force-pushed the sergei/wall-1837/remove-svg-badge branch from c78e534 to 8ae94ca Compare September 13, 2023 09:18

vercel bot deployed to Preview September 13, 2023 09:37 View deployment

sergei-deriv force-pushed the sergei/wall-1837/remove-svg-badge branch from 8ae94ca to cee3d6a Compare September 13, 2023 11:39

vercel bot deployed to Preview September 13, 2023 12:03 View deployment

mahdiyeh-deriv reviewed Sep 14, 2023

View reviewed changes

feat: implement design changes

16b833b

sergei-deriv force-pushed the sergei/wall-1837/remove-svg-badge branch from cee3d6a to 16b833b Compare September 15, 2023 06:02

aizad-deriv approved these changes Sep 15, 2023

View reviewed changes

vercel bot deployed to Preview September 15, 2023 06:26 View deployment

arshad-rao-deriv approved these changes Sep 15, 2023

View reviewed changes

sergei-deriv closed this Sep 15, 2023

Sergei / wall 1837 / remove svg badge #10051

Sergei / wall 1837 / remove svg badge #10051

Uh oh!

Conversation

sergei-deriv commented Sep 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes:

Screenshots:

Uh oh!

vercel bot commented Sep 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Sep 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Sep 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coveralls commented Sep 13, 2023

Uh oh!

sergei-deriv Sep 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mahdiyeh-deriv Sep 14, 2023

Choose a reason for hiding this comment

Uh oh!

sergei-deriv Sep 14, 2023

Choose a reason for hiding this comment

Uh oh!

sergei-deriv Sep 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mahdiyeh-deriv Sep 15, 2023

Choose a reason for hiding this comment

Uh oh!

mahdiyeh-deriv Sep 14, 2023

Choose a reason for hiding this comment

Uh oh!

sergei-deriv Sep 14, 2023

Choose a reason for hiding this comment

Uh oh!

mahdiyeh-deriv Sep 15, 2023

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Sep 15, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

sergei-deriv commented Sep 13, 2023 •

edited

Loading

vercel bot commented Sep 13, 2023 •

edited

Loading

github-actions bot commented Sep 13, 2023 •

edited

Loading

github-actions bot commented Sep 13, 2023 •

edited

Loading

sergei-deriv Sep 13, 2023 •

edited

Loading

sergei-deriv Sep 14, 2023 •

edited

Loading