Kate / DTRA-175 / Enable 'Only ups/downs' in reports and contract details page #8883

kate-deriv · 2023-06-01T15:02:53Z

Changes:

Enable Only ups and downs in reports and contract details page
Change chart marker's styles accordinately

Screenshots:

Please provide some screenshots of the change.

vercel · 2023-06-01T15:02:57Z

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:30am

codecov · 2023-06-01T15:53:32Z

Codecov Report

Merging #8883 (1a43547) into master (d5c38a0) will not change coverage.
The diff coverage is n/a.

❗ Current head 1a43547 differs from pull request most recent head 2ac9198. Consider uploading reports for the commit 2ac9198 to get more accurate results

@@          Coverage Diff           @@
##           master   #8883   +/-   ##
======================================
  Coverage    0.05%   0.05%           
======================================
  Files         117     117           
  Lines        3425    3425           
  Branches      893     893           
======================================
  Hits            2       2           
  Misses       3423    3423

github-actions · 2023-06-02T13:04:41Z

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

PR: Kate / DTRA-175 / Enable 'Only ups/downs' in reports and contract details page #8883
URLs:
- w/ App ID + Server: https://deriv-app-git-fork-kate-deriv-kate-dtra-175onlyups.binary.sx?qa_server=red.binaryws.com&app_id=32875
- Original: https://deriv-app-git-fork-kate-deriv-kate-dtra-175onlyups.binary.sx
App ID: 32875

Click here to copy & paste above information.

- **PR**: [https://github.com/binary-com/deriv-app/pull/8883](https://github.com/binary-com/deriv-app/pull/8883)
- **URLs**:
    - **w/ App ID + Server**: https://deriv-app-git-fork-kate-deriv-kate-dtra-175onlyups.binary.sx?qa_server=red.binaryws.com&app_id=32875
    - **Original**: https://deriv-app-git-fork-kate-deriv-kate-dtra-175onlyups.binary.sx
- **App ID**: `32875`

github-actions · 2023-06-02T13:05:11Z

🚨 Lighthouse report for the changes in this PR:

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

Lighthouse ran with https://deriv-app-git-fork-kate-deriv-kate-dtra-175onlyups.binary.sx/

kate-deriv · 2023-06-05T06:55:46Z

packages/components/src/components/contract-card/contract-card-items/contract-card-header.tsx

@@ -7,6 +7,7 @@ import {
    getGrowthRatePercentage,
    isBot,
    isAccumulatorContract,
+    isOnlyUpsDownsContract,


Currently we are enabling only one contract type from SmartTrader (Only ups/ downs). When there will be more contracts and they will all have common style, then I need to rename variable, something like isOnlyUpsDownsContract ---> isSmartTraderContract + refactor function which check if it is a SmartTrader contract.

kate-deriv · 2023-06-05T06:56:50Z

packages/core/src/Stores/Helpers/chart-marker-helpers.js

@@ -24,7 +25,8 @@ const createMarkerConfig = (marker_type, x, y, content_config) =>

 export const getSpotCount = (contract_info, spot_count) => {
    if (isDigitContract(contract_info.contract_type)) return spot_count + 1;
-    if (isAccumulatorContract(contract_info.contract_type)) return null;
+    if (isAccumulatorContract(contract_info.contract_type) || isOnlyUpsDownsContract(contract_info.contract_type))


According to new requirements, we don't need to show spot number for contracts from SmartTrader

kate-deriv · 2023-06-05T06:57:59Z

packages/core/src/Stores/Helpers/chart-marker-helpers.js

@@ -127,7 +129,7 @@ export const createMarkerSpotMiddle = (contract_info, tick, idx) => {
        spot_value: `${spot}`,
        spot_epoch,
        align_label: tick.align_label,
-        is_value_hidden: is_accumulator,
+        is_value_hidden: is_accumulator || (isOnlyUpsDownsContract(contract_info.contract_type) && idx !== 1),


According to new requirements we should hide information about tick (value, time) for all ticks, except the first and the last

kate-deriv · 2023-06-05T07:02:06Z

packages/shared/src/utils/contract/contract.ts

@@ -32,13 +32,15 @@ export const isValidToSell = (contract_info: TContractInfo) =>

 export const hasContractEntered = (contract_info: TContractInfo) => !!contract_info.entry_spot;

-export const isAccumulatorContract = (contract_type: string) => /ACCU/i.test(contract_type);
+export const isAccumulatorContract = (contract_type = '') => /ACCU/i.test(contract_type);


I added empty string as a default param because contract_type could be possibly undefined as we passed it as contract_info.contract_type inside of function and TContractInfo has :
contract_type?: string; (node_modules/@deriv/api-types/index.d.ts, line 13467)
Moreover, this approach is being used in line 51 (this file) and 143.

…-175_only_ups

coveralls · 2023-07-06T09:43:09Z

coverage: 8.882% (+0.005%) from 8.877% when pulling 2ac9198 on kate-deriv:kate/DTRA-175_only_ups into 8623b8a on binary-com:master.

github-actions · 2023-07-06T16:00:21Z

⏳ Generating Lighthouse report...

ali-hosseini-deriv · 2023-07-21T08:14:39Z

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

sonarcloud · 2023-07-21T08:18:44Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
1.8% Duplication

* 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>

…ails page (binary-com#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>

refactor: move trade type from un to supported

b80452e

boring-cyborg bot added Components Core Shared Trader labels Jun 1, 2023

kate-deriv changed the title ~~Kate / DTRA-175 / Enable 'Only ups/Downs' in reports and contract details page~~ Kate / DTRA-175 / Enable 'Only ups/downs' in reports and contract details page Jun 1, 2023

vercel bot had a problem deploying to Preview June 1, 2023 15:11 Failure

Merge branch 'master' into kate/DTRA-175_only_ups

899edcc

vercel bot had a problem deploying to Preview June 1, 2023 15:20 Failure

feat: ad contract type check func and add to contract details

8b4b51f

vercel bot had a problem deploying to Preview June 2, 2023 08:33 Failure

kate-deriv and others added 2 commits June 2, 2023 14:43

feat: add chart markers settings for contract type

07cf498

Merge branch 'master' into kate/DTRA-175_only_ups

f3ce29f

vercel bot had a problem deploying to Preview June 2, 2023 11:57 Failure

chore: add style for mobile

aaa0ac0

vercel bot deployed to Preview June 2, 2023 13:04 View deployment

chore: remove gradient

d5b9c57

vercel bot had a problem deploying to Preview June 2, 2023 13:56 Failure

chore: empty commit

4bb01cf

vercel bot deployed to Preview June 5, 2023 06:35 View deployment

kate-deriv commented Jun 5, 2023

View reviewed changes

chore: add gradient for contract details card for desktop

1fa8750

vercel bot deployed to Preview June 5, 2023 09:13 View deployment

vercel bot deployed to Preview June 19, 2023 10:42 View deployment

kate-deriv and others added 2 commits June 26, 2023 11:02

Merge branch master of github.com:binary-com/deriv-app into kate/DTRA…

400a532

…-175_only_ups

Merge branch 'master' into kate/DTRA-175_only_ups

1028050

vercel bot deployed to Preview June 26, 2023 08:33 View deployment

Merge branch 'master' into kate/DTRA-175_only_ups

1a43547

vercel bot had a problem deploying to Preview June 26, 2023 11:45 Failure

Merge branch 'master' into kate/DTRA-175_only_ups

3bd8017

vercel bot had a problem deploying to Preview June 28, 2023 09:08 Failure

Merge branch 'master' into kate/DTRA-175_only_ups

37d8626

vercel bot deployed to Preview June 28, 2023 11:42 View deployment

Merge branch 'master' into kate/DTRA-175_only_ups

eee9985

vercel bot deployed to Preview June 30, 2023 13:52 View deployment

Merge branch master into kate/DTRA-175_only_ups

d3b0c6a

vercel bot deployed to Preview July 6, 2023 09:25 View deployment

Merge branch 'master' into kate/DTRA-175_only_ups

a8c056b

vercel bot deployed to Preview July 6, 2023 15:49 View deployment

maryia-deriv approved these changes Jul 7, 2023

View reviewed changes

Merge branch 'master' into kate/DTRA-175_only_ups

2ac9198

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

bahar-sadeghzadeh merged commit 0ee0f43 into binary-com:master Jul 21, 2023
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Kate / DTRA-175 / Enable 'Only ups/downs' in reports and contract details page #8883

Kate / DTRA-175 / Enable 'Only ups/downs' in reports and contract details page #8883

kate-deriv commented Jun 1, 2023 •

edited

Loading

vercel bot commented Jun 1, 2023 •

edited

Loading

codecov bot commented Jun 1, 2023 •

edited

Loading

github-actions bot commented Jun 2, 2023 •

edited

Loading

github-actions bot commented Jun 2, 2023 •

edited

Loading

kate-deriv Jun 5, 2023

kate-deriv Jun 5, 2023

kate-deriv Jun 5, 2023

kate-deriv Jun 5, 2023

coveralls commented Jul 6, 2023 •

edited

Loading

github-actions bot commented Jul 6, 2023 •

edited

Loading

ali-hosseini-deriv commented Jul 21, 2023

sonarcloud bot commented Jul 21, 2023

Kate / DTRA-175 / Enable 'Only ups/downs' in reports and contract details page #8883

Kate / DTRA-175 / Enable 'Only ups/downs' in reports and contract details page #8883

Conversation

kate-deriv commented Jun 1, 2023 • edited Loading

Changes:

Screenshots:

vercel bot commented Jun 1, 2023 • edited Loading

codecov bot commented Jun 1, 2023 • edited Loading

Codecov Report

github-actions bot commented Jun 2, 2023 • edited Loading

github-actions bot commented Jun 2, 2023 • edited Loading

kate-deriv Jun 5, 2023

Choose a reason for hiding this comment

kate-deriv Jun 5, 2023

Choose a reason for hiding this comment

kate-deriv Jun 5, 2023

Choose a reason for hiding this comment

kate-deriv Jun 5, 2023

Choose a reason for hiding this comment

coveralls commented Jul 6, 2023 • edited Loading

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

ali-hosseini-deriv commented Jul 21, 2023

sonarcloud bot commented Jul 21, 2023

kate-deriv commented Jun 1, 2023 •

edited

Loading

vercel bot commented Jun 1, 2023 •

edited

Loading

codecov bot commented Jun 1, 2023 •

edited

Loading

github-actions bot commented Jun 2, 2023 •

edited

Loading

github-actions bot commented Jun 2, 2023 •

edited

Loading

coveralls commented Jul 6, 2023 •

edited

Loading

github-actions bot commented Jul 6, 2023 •

edited

Loading