Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hamid/83106/resolve-conflicts-on-develop-branch #7121

Conversation

hamid-deriv
Copy link
Contributor

Changes:

Please include a summary of the change and which issue is fixed below:

  • ...

When you need to add unit test

  • If this change disrupt current flow
  • If this change is adding new flow

When you need to add integration test

  • If components from external libraries are being used to define the flow, e.g. @deriv/components
  • If it relies on a very specific set of props with no default behavior for the current component.

Test coverage checklist (for reviewer)

  • Ensure utility / function has a test case
  • Ensure all the tests are passing

Type of change

  • Bug fix
  • New feature
  • Update feature
  • Refactor code
  • Translation to code
  • Translation to crowdin
  • Script configuration
  • Improve performance
  • Style only
  • Dependency update
  • Documentation update
  • Release

Hamid and others added 4 commits December 7, 2022 09:43
…y-com#7009)

* feat: allow **all** market type on current deriv x dashboard

* fix: fix test failure

* fix: fix name convention

* feat: derivx cfd account is displayed in dashboard along with syn & fin accounts

* fix: fix test failure

* fix: remove duplicate title in account transfer form for all market type

* fix: resolve pr comment

* fix: hide duplicate title just in transfer form

* fix: hide cfd if account has unmerged account

* fix: show mt5 accounts

* fix: show proper account information

* fix: fix test failure

* fix: show derivx real and demo for not loged in users

Co-authored-by: Matin shafiei <matin@deriv.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
…ary-com#7117)

* fix: unable to create derivx real acct via trader's hub

* feat: show derivx all market type in appstore

* fix: fix typo
@vercel
Copy link

vercel bot commented Dec 8, 2022

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

Name Status Preview Updated
deriv-app ✅ Ready (Inspect) Visit Preview Dec 8, 2022 at 6:31AM (UTC)

@sonarcloud
Copy link

sonarcloud bot commented Dec 8, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@github-actions
Copy link
Contributor

github-actions bot commented Dec 8, 2022

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

Click here to copy & paste above information.
- **PR**: [https://github.com/binary-com/deriv-app/pull/7121](https://github.com/binary-com/deriv-app/pull/7121)
- **URLs**:
    - **w/ App ID + Server**: https://deriv-app-git-fork-hamid-deriv-hamid-83106resolveconflic-06d59b.binary.sx?qa_server=frontend.binaryws.com&app_id=24060
    - **Original**: https://deriv-app-git-fork-hamid-deriv-hamid-83106resolveconflic-06d59b.binary.sx
- **App ID**: `24060`

@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (develop@55e2eb8). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             develop    #7121   +/-   ##
==========================================
  Coverage           ?   20.33%           
==========================================
  Files              ?     1473           
  Lines              ?    34334           
  Branches           ?     6329           
==========================================
  Hits               ?     6982           
  Misses             ?    26858           
  Partials           ?      494           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@carolsachdeva carolsachdeva merged commit 692d479 into binary-com:develop Dec 9, 2022
@hamid-deriv hamid-deriv deleted the hamid/83106/resolve_conflicts_on_develop_branch branch June 26, 2023 03:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants