shontzu/WALL-865/Incorrect-total-asset-amount #9217

shontzu-deriv · 2023-07-04T05:31:26Z

Changes:

MT5 accounts can have non-USD balance.
In Demo tab, total assets are in USD
MT5's non-USD balance must be converted first

Screenshots:

vercel · 2023-07-04T05:31:29Z

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

Name	Status	Preview	Comments	Updated (UTC)
deriv-app	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jul 21, 2023 8:38am

github-actions · 2023-07-04T06:09:15Z

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

PR: shontzu/WALL-865/Incorrect-total-asset-amount #9217
URLs:
- w/ App ID + Server: https://deriv-app-git-fork-shontzu-deriv-shontzu-wall-865incorre-7cf99c.binary.sx?qa_server=red.binaryws.com&app_id=31478
- Original: https://deriv-app-git-fork-shontzu-deriv-shontzu-wall-865incorre-7cf99c.binary.sx
App ID: 31478

Click here to copy & paste above information.

- **PR**: [https://github.com/binary-com/deriv-app/pull/9217](https://github.com/binary-com/deriv-app/pull/9217)
- **URLs**:
    - **w/ App ID + Server**: https://deriv-app-git-fork-shontzu-deriv-shontzu-wall-865incorre-7cf99c.binary.sx?qa_server=red.binaryws.com&app_id=31478
    - **Original**: https://deriv-app-git-fork-shontzu-deriv-shontzu-wall-865incorre-7cf99c.binary.sx
- **App ID**: `31478`

github-actions · 2023-07-04T06:09:42Z

🚨 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-shontzu-deriv-shontzu-wall-865incorre-7cf99c.binary.sx/

…/WALL-865/Incorrect-total-asset-amount

coveralls · 2023-07-05T08:02:18Z

coverage: 8.879% (+0.002%) from 8.877% when pulling 4a51fd6 on shontzu-deriv:shontzu/WALL-865/Incorrect-total-asset-amount into 8623b8a on binary-com:master.

shayan-deriv

@shontzu-deriv using const { is_demo } = traders_hub; just checks if you switch to demo account or not. but you need to check if the passed cfd accounts are demo or not. that's why you need to check account?.account_type .
please apply my changes and also revert back all changes in the test file and check it the tests are passing as before 🙏

shayan-deriv · 2023-07-05T10:13:28Z

packages/hooks/src/useTotalAccountBalance.ts

@@ -1,22 +1,23 @@
 import useRealTotalAssetCurrency from './useTotalAssetCurrency';
 import useExchangeRate from './useExchangeRate';
-
+import { useStore } from '@deriv/stores';


Suggested change

import { useStore } from '@deriv/stores';

shayan-deriv · 2023-07-05T10:13:41Z

packages/hooks/src/useTotalAccountBalance.ts

+    const { traders_hub } = useStore();
+    const { is_demo } = traders_hub;


Suggested change

const { traders_hub } = useStore();

const { is_demo } = traders_hub;

shayan-deriv · 2023-07-05T10:16:15Z

packages/hooks/src/useTotalAccountBalance.ts

+        const base_rate = is_demo ? getRate('USD') : getRate(total_assets_real_currency || '');
+        const rate = getRate(total_assets_real_currency || '');


Suggested change

const base_rate = is_demo ? getRate('USD') : getRate(total_assets_real_currency || '');

const rate = getRate(total_assets_real_currency || '');

const base_rate = account?.account_type === 'demo' ? 1 : getRate(total_assets_real_currency || '');

const rate = getRate(account.currency || total_assets_real_currency || '');

shayan-deriv · 2023-07-05T10:16:50Z

packages/hooks/src/useTotalAccountBalance.ts

 /**
 * we can use this hook to get the total balance of the given accounts list.
 * it loops through the accounts list and adds the balance of each account
 * to the total balance, it also converts the balance to the currency of the
 * first account in the list
 */
-
 const useTotalAccountBalance = (accounts: { balance?: number; currency?: string }[]) => {


Suggested change

const useTotalAccountBalance = (accounts: { balance?: number; currency?: string }[]) => {

const useTotalAccountBalance = (accounts: { balance?: number; currency?: string; account_type?: string; }[]) => {

…/WALL-865/Incorrect-total-asset-amount

packages/hooks/src/useTotalAccountBalance.ts

farzin-deriv · 2023-07-06T06:00:15Z

packages/hooks/src/__tests__/useTotalAccountBalance.spec.tsx

@shontzu-deriv I don't think we need to change the existing tests, I think you should add a new test case for the new scenario 🤔

farzin-deriv · 2023-07-06T06:02:29Z

packages/hooks/src/useTotalAccountBalance.ts

 /**
 * we can use this hook to get the total balance of the given accounts list.
 * it loops through the accounts list and adds the balance of each account
 * to the total balance, it also converts the balance to the currency of the
 * first account in the list
 */
-
-const useTotalAccountBalance = (accounts: { balance?: number; currency?: string }[]) => {
+const useTotalAccountBalance = (accounts: { balance?: number; currency?: string; account_type?: string }[]) => {


Suggested change

const useTotalAccountBalance = (accounts: { balance?: number; currency?: string; account_type?: string }[]) => {

type TAccounts = {

balance?: number;

currency?: string;

account_type?: string

};

const useTotalAccountBalance = (accounts: TAccounts[]) => {

@shontzu-deriv Please extract it into a type above the function 🙏🏻

packages/hooks/src/useTotalAccountBalance.ts

…/WALL-865/Incorrect-total-asset-amount

sonarcloud · 2023-07-07T03:55:17Z

Please retry analysis of this Pull-Request directly on SonarCloud.

shayan-deriv

LGTM

farzin-deriv

@shontzu-deriv Please update the test file with the new added case 🙏🏻

packages/hooks/src/useTotalAccountBalance.ts

…ent currencies

github-actions · 2023-07-21T06:55:06Z

⏳ Generating Lighthouse report...

ali-hosseini-deriv · 2023-07-21T08:18:13Z

👌 Pull request has been updated with the base branch by Paimon the Release Bot

sonarcloud · 2023-07-21T08:20:30Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
5.5% Duplication

ali-hosseini-deriv · 2023-07-21T08:48:04Z

✨ PR has been merged by Paimon the Release Bot

* shontzu/WALL-865/Incorrect-total-asset-amount (#9217) * fix: attemp #3 * chore: remove irrelevant check * chore: unit test * chore: unit test fail * chore: fixes based on review * chore: empty commit * chore: code revie fixes * chore: revert test case changes * chore: rename type to TUseTotalAccountBalance * chore: format doc and added test case for multiple accounts in different currencies --------- Co-authored-by: Ali(Ako) Hosseini <ali.hosseini@deriv.com> * Farabi/bot 317/translation fixes for dbot homepage (#9108) * fix: translation issues * redeploy: vercel retrigger --------- Co-authored-by: Ali(Ako) Hosseini <ali.hosseini@deriv.com> * shahzaib / KYC-270 / fix POI flow after IDV failure and retries (#9222) * chore: fix POI flow after IDV failure and retries * chore: fix onfido infinite trigger for nigeria clients * chore: fix onfido trigger if submission left is zero or less * style: fix manual upload card content alignment * chore: rename prop to default_enabled * fix: nimc slip document step check * chore: add comment to define the use of added prop * maryia/DTRA-297/fix: Crypto profit text & Hide barriers in case of trade params errors (#9347) * chore: remove animation correction * feat: clear barriers upon errors * fix: profit text & hide it for crypto with more than 2 decimals * test: AccumulatorsProfitLossText * Revert "chore: remove animation correction" This reverts commit f9bb5ec. * fix: not hide barriers for ongoing contract in case of trade params error --------- Co-authored-by: Ali(Ako) Hosseini <ali.hosseini@deriv.com> * Kate / DTRA-175 / Enable 'Only ups/downs' in reports and contract details page (#8883) * refactor: move trade type from un to supported * feat: ad contract type check func and add to contract details * feat: add chart markers settings for contract type * chore: add style for mobile * chore: remove gradient * chore: empty commit * chore: add gradient for contract details card for desktop * feat: add chart markers setings and update style * refactor: apply suggestions * chore: empty commit --------- Co-authored-by: Ali(Ako) Hosseini <ali.hosseini@deriv.com> * fix: token leakage to third party api (#9000) Co-authored-by: Ali(Ako) Hosseini <ali.hosseini@deriv.com> --------- Co-authored-by: shontzu <108507236+shontzu-deriv@users.noreply.github.com> Co-authored-by: Ali(Ako) Hosseini <ali.hosseini@deriv.com> Co-authored-by: Farabi <102643568+farabi-deriv@users.noreply.github.com> Co-authored-by: Shahzaib <shahzaib@deriv.com> Co-authored-by: Maryia <103177211+maryia-deriv@users.noreply.github.com> Co-authored-by: kate-deriv <121025168+kate-deriv@users.noreply.github.com> Co-authored-by: Sui Sin <103026762+suisin-deriv@users.noreply.github.com>

* fix: attemp #3 * chore: remove irrelevant check * chore: unit test * chore: unit test fail * chore: fixes based on review * chore: empty commit * chore: code revie fixes * chore: revert test case changes * chore: rename type to TUseTotalAccountBalance * chore: format doc and added test case for multiple accounts in different currencies --------- Co-authored-by: Ali(Ako) Hosseini <ali.hosseini@deriv.com>

fix: attemp #3

362602e

Merge branch 'master' into shontzu/WALL-865/Incorrect-total-asset-amount

c84aaba

vercel bot deployed to Preview July 4, 2023 06:08 View deployment

shontzu-deriv changed the title ~~fix: attemp #3~~ shontzu/WALL-865/Incorrect-total-asset-amount Jul 4, 2023

shontzu-deriv added 4 commits July 5, 2023 13:02

Merge branch 'master' of github.com:binary-com/deriv-app into shontzu…

18115a3

…/WALL-865/Incorrect-total-asset-amount

chore: remove irrelevant check

fcc6413

chore: unit test

90ad533

Merge branch 'master' of github.com:binary-com/deriv-app into shontzu…

ed620a9

…/WALL-865/Incorrect-total-asset-amount

chore: unit test fail

f31277b

vercel bot deployed to Preview July 5, 2023 09:34 View deployment

shayan-deriv reviewed Jul 5, 2023

View reviewed changes

shontzu-deriv added 2 commits July 6, 2023 10:40

Merge branch 'master' of github.com:binary-com/deriv-app into shontzu…

4678543

…/WALL-865/Incorrect-total-asset-amount

chore: fixes based on review

6c99640

vercel bot deployed to Preview July 6, 2023 03:11 View deployment

chore: empty commit

3ab5a76

vercel bot deployed to Preview July 6, 2023 04:44 View deployment

shayan-deriv reviewed Jul 6, 2023

View reviewed changes

packages/hooks/src/useTotalAccountBalance.ts Show resolved Hide resolved

farzin-deriv reviewed Jul 6, 2023

View reviewed changes

shontzu-deriv requested a review from shayan-deriv July 6, 2023 09:21

shontzu-deriv added 2 commits July 7, 2023 11:08

Merge branch 'master' of github.com:binary-com/deriv-app into shontzu…

78d9185

…/WALL-865/Incorrect-total-asset-amount

chore: code revie fixes

d4625c1

vercel bot deployed to Preview July 7, 2023 03:34 View deployment

shontzu-deriv and others added 2 commits July 7, 2023 11:52

chore: revert test case changes

83b11d1

Merge branch 'master' into shontzu/WALL-865/Incorrect-total-asset-amount

faea6de

vercel bot deployed to Preview July 7, 2023 04:29 View deployment

shontzu-deriv requested a review from hamza-deriv July 7, 2023 06:56

vercel bot deployed to Preview July 7, 2023 07:00 View deployment

shayan-deriv approved these changes Jul 7, 2023

View reviewed changes

farzin-deriv suggested changes Jul 7, 2023

View reviewed changes

packages/hooks/src/useTotalAccountBalance.ts Show resolved Hide resolved

shontzu-deriv requested a review from farzin-deriv July 10, 2023 03:16

Merge branch 'master' into shontzu/WALL-865/Incorrect-total-asset-amount

8624ae2

vercel bot deployed to Preview July 10, 2023 03:29 View deployment

mahdiyeh-deriv previously approved these changes Jul 10, 2023

View reviewed changes

chore: format doc and added test case for multiple accounts in differ…

a5e7e5b

…ent currencies

shontzu-deriv dismissed mahdiyeh-deriv’s stale review via a5e7e5b July 10, 2023 04:05

vercel bot deployed to Preview July 10, 2023 04:21 View deployment

hirad-deriv approved these changes Jul 10, 2023

View reviewed changes

farzin-deriv approved these changes Jul 10, 2023

View reviewed changes

Merge branch 'master' into shontzu/WALL-865/Incorrect-total-asset-amount

5f3ec8c

vercel bot deployed to Preview July 11, 2023 03:31 View deployment

Merge branch 'master' into shontzu/WALL-865/Incorrect-total-asset-amount

1fa3dc1

vercel bot deployed to Preview July 21, 2023 07:14 View deployment

Merge branch 'master' into shontzu/WALL-865/Incorrect-total-asset-amount

4a51fd6

vercel bot deployed to Preview July 21, 2023 08:38 View deployment

ali-hosseini-deriv merged commit 7b4ba8f into binary-com:master Jul 21, 2023
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

shontzu/WALL-865/Incorrect-total-asset-amount #9217

shontzu/WALL-865/Incorrect-total-asset-amount #9217

shontzu-deriv commented Jul 4, 2023 •

edited

Loading

vercel bot commented Jul 4, 2023 •

edited

Loading

github-actions bot commented Jul 4, 2023 •

edited

Loading

github-actions bot commented Jul 4, 2023 •

edited

Loading

coveralls commented Jul 5, 2023 •

edited

Loading

shayan-deriv left a comment •

edited

Loading

shayan-deriv Jul 5, 2023

shayan-deriv Jul 5, 2023

shayan-deriv Jul 5, 2023

shayan-deriv Jul 5, 2023

farzin-deriv Jul 6, 2023

farzin-deriv Jul 6, 2023

sonarcloud bot commented Jul 7, 2023

shayan-deriv left a comment

farzin-deriv left a comment

github-actions bot commented Jul 21, 2023 •

edited

Loading

ali-hosseini-deriv commented Jul 21, 2023

sonarcloud bot commented Jul 21, 2023

ali-hosseini-deriv commented Jul 21, 2023

		const { traders_hub } = useStore();
		const { is_demo } = traders_hub;

		const base_rate = is_demo ? getRate('USD') : getRate(total_assets_real_currency \|\| '');
		const rate = getRate(total_assets_real_currency \|\| '');

	const useTotalAccountBalance = (accounts: { balance?: number; currency?: string }[]) => {
	const useTotalAccountBalance = (accounts: { balance?: number; currency?: string; account_type?: string; }[]) => {

shontzu/WALL-865/Incorrect-total-asset-amount #9217

shontzu/WALL-865/Incorrect-total-asset-amount #9217

Conversation

shontzu-deriv commented Jul 4, 2023 • edited Loading

Changes:

Screenshots:

vercel bot commented Jul 4, 2023 • edited Loading

github-actions bot commented Jul 4, 2023 • edited Loading

github-actions bot commented Jul 4, 2023 • edited Loading

coveralls commented Jul 5, 2023 • edited Loading

shayan-deriv left a comment • edited Loading

Choose a reason for hiding this comment

shayan-deriv Jul 5, 2023

Choose a reason for hiding this comment

shayan-deriv Jul 5, 2023

Choose a reason for hiding this comment

shayan-deriv Jul 5, 2023

Choose a reason for hiding this comment

shayan-deriv Jul 5, 2023

Choose a reason for hiding this comment

farzin-deriv Jul 6, 2023

Choose a reason for hiding this comment

farzin-deriv Jul 6, 2023

Choose a reason for hiding this comment

sonarcloud bot commented Jul 7, 2023

shayan-deriv left a comment

Choose a reason for hiding this comment

farzin-deriv left a comment

Choose a reason for hiding this comment

github-actions bot commented Jul 21, 2023 • edited Loading

ali-hosseini-deriv commented Jul 21, 2023

sonarcloud bot commented Jul 21, 2023

ali-hosseini-deriv commented Jul 21, 2023

shontzu-deriv commented Jul 4, 2023 •

edited

Loading

vercel bot commented Jul 4, 2023 •

edited

Loading

github-actions bot commented Jul 4, 2023 •

edited

Loading

github-actions bot commented Jul 4, 2023 •

edited

Loading

coveralls commented Jul 5, 2023 •

edited

Loading

shayan-deriv left a comment •

edited

Loading

github-actions bot commented Jul 21, 2023 •

edited

Loading