-
Notifications
You must be signed in to change notification settings - Fork 298
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
Traders hub beta #7000
Merged
jim-deriv
merged 285 commits into
binary-com:master
from
mahdiyeh-deriv:traders_hub_beta
Dec 1, 2022
Merged
Traders hub beta #7000
Changes from 1 commit
Commits
Show all changes
285 commits
Select commit
Hold shift + click to select a range
a1ac026
Merge branch 'master' into pre-appstore
balakrishna-deriv 98d488a
Hirad/74908/trigger animation (#6344)
hirad-deriv e5de8ae
Hirad/ Onboarding progress bar (#6345)
hirad-deriv 889d19e
add more derived acounts component (#6341)
mahdiyeh-deriv b781963
Bala/Fix wallet test case (#6372)
balakrishna-deriv d7ced88
Mahdiyeh/Feature: add more options accounts component (#6304)
mahdiyeh-deriv fe1b958
Ashraf pre appstore (#6297)
ashraf-deriv 6315ed0
Ashraf/74903/pre app store account (#6367)
ashraf-deriv a66af00
Hirad/75012/CFD Account Manager component (#6370)
hirad-deriv b79f372
Hirad/ Total Assets Component (#6369)
hirad-deriv 3f74796
thisyahlen/Trading hub changes (#6279)
thisyahlen-deriv e2d58f1
Hirad/ Onboarding component (#6309)
hirad-deriv 30e46d6
thisyahlen/create an options account component (#6537)
thisyahlen-deriv 9b52725
Mahdiyeh/ fix: convert cfd-account-manager to account-manager (#6552)
mahdiyeh-deriv 0dbf945
CFD accounts (#6439)
mahdiyeh-deriv a1bb80e
Mahdiyeh/Update pre_appstore with master (#6659)
mahdiyeh-deriv e731d8b
thisyahlen/ added tour guide component (#6573)
thisyahlen-deriv 88ca6df
add CFDStore to modules store of core (#6676)
mahdiyeh-deriv d964489
Hirad/76734/onboarding static dashboard (#6579)
hirad-deriv 54edd31
Pulled from main branch
hirad-deriv fff7e6d
update with master (#6722)
mahdiyeh-deriv 52a81c3
Pulled from main branch
hirad-deriv 350813f
Mahdiyeh/73628/compare account modal (#6721)
mahdiyeh-deriv 9604c47
Merge branch 'pre-appstore' of https://github.com/binary-com/deriv-ap…
hirad-deriv f0eca1e
Mahdiyeh/Update pre appstore with master (#6749)
mahdiyeh-deriv 8dfff4d
thisyahlen/ redirect new users to trading hub (#6670)
thisyahlen-deriv 8102a8c
thisyahlen/ add total assets (#6754)
thisyahlen-deriv 55f4b86
Hirad/73608/CFD Flows (#6732)
hirad-deriv a25764b
Merge branch 'pre-appstore' of https://github.com/binary-com/deriv-ap…
hirad-deriv a5f9d29
Merge branch 'master' of https://github.com/binary-com/deriv-app
hirad-deriv 7f74d48
Ashraf/73649/craete options component (#6525)
ashraf-deriv 753263e
Fixed translation files
hirad-deriv 153a137
Fixed translation files
hirad-deriv bc20e74
Hirad/78837/compare-accounts-account-creation-flow (#6783)
hirad-deriv a0b0a66
Merge branch 'pre-appstore' of https://github.com/binary-com/deriv-ap…
hirad-deriv 14bde8c
Hirad/78900/add derived functionality (#6788)
hirad-deriv 64c5d96
Merge branch 'pre-appstore' of https://github.com/binary-com/deriv-ap…
hirad-deriv b2b0023
Hirad/79281/disable available accounts (#6793)
hirad-deriv a33db7c
Merge branch 'pre-appstore' of https://github.com/binary-com/deriv-ap…
hirad-deriv a1de453
Fixed the issue
hirad-deriv a9b2e25
Hirad/79288/get changeable fields error (#6794)
hirad-deriv bc6ea27
Mahdiyeh/73607/trading hub dashboard (#6755)
mahdiyeh-deriv 812bdac
Synching Trading Hub Dashboard with master
mahdiyeh-deriv 0d14692
Merge branch 'master' of github.com:binary-com/deriv-app into Trading…
mahdiyeh-deriv fab11a4
fix code smells
mahdiyeh-deriv e2716ad
Merge branch 'master' of github.com:binary-com/deriv-app into Trading…
mahdiyeh-deriv acf08cc
remove redundant icons
mahdiyeh-deriv f9ba140
minify icon
mahdiyeh-deriv 5678377
remove appstore components which are not used in pre-appstore
mahdiyeh-deriv 49118b3
remove myapps.deriv, fix walletIcon typescript, add gap to css, repla…
mahdiyeh-deriv 08d25c0
Merge branch 'pre-appstore' of https://github.com/binary-com/deriv-ap…
hirad-deriv 0e2c262
Merge branch 'master' of github.com:binary-com/deriv-app into Trading…
mahdiyeh-deriv 6593039
Pulled from main branch
hirad-deriv 7b938c3
fix tour guide issue
mahdiyeh-deriv 8b5c221
Fixed the redundant line in onboarding dashboard
hirad-deriv 667defc
Pulled from main branch
hirad-deriv 0109f82
remove getChangeableFields from CFDPersonalDetails
mahdiyeh-deriv 769de4a
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
mahdiyeh-deriv fbfa250
fix cfd components width, fix loading
mahdiyeh-deriv a3d85ae
Merge branch 'master' of github.com:binary-com/deriv-app into Trading…
mahdiyeh-deriv 9b3e207
fix new aliases
mahdiyeh-deriv 7f5adf0
remove TempAppSettings component
mahdiyeh-deriv aa9bea3
remove decoratores
mahdiyeh-deriv 1d36fcb
change trading-hub title/ change enable-disable trading-hub buttons
mahdiyeh-deriv 6abc866
added redirection for login pre-appstore
thisyahlen-deriv 2942e0a
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
thisyahlen-deriv e982cf0
remove cfd parent div if that account is not visible
mahdiyeh-deriv 759b233
redirect to login for trading hub users
thisyahlen-deriv efb94e9
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
thisyahlen-deriv b850924
get options account word change and dark mode fix
thisyahlen-deriv c0ffebe
Fixed options titles
hirad-deriv a67ee7a
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
hirad-deriv c49c818
added beta tag to all 3 headers
thisyahlen-deriv 95555cc
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
thisyahlen-deriv d56f992
Merge branch 'master' of github.com:binary-com/deriv-app into Trading…
mahdiyeh-deriv 8d7b021
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
mahdiyeh-deriv 03c1431
remove welcome modal after signup
mahdiyeh-deriv f0fc105
revert deleted files
mahdiyeh-deriv 0a298e5
total assets blur if user has no real account
ab5ee31
fix conflicts
mahdiyeh-deriv f6d1f09
fix overflow
mahdiyeh-deriv 9f9fe60
add spacing between amount and currency
a8e3434
code refactoring from comments
27252a4
code refactor
5568c30
Merge branch 'master' of https://github.com/binary-com/deriv-app into…
984ca42
onboarding css fix
544c93f
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
hirad-deriv 6f0fcf0
Merge branch 'master' of github.com:binary-com/deriv-app into Trading…
mahdiyeh-deriv 7c0d8ba
remove translation
mahdiyeh-deriv 7c82576
comments fix and refactor
823d306
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
001dbfb
yashim comments fix part 1
d1ef13b
yashim & bala comments fix part 2
74558b4
change to staticurl
4cf9122
Merge branch 'master' into Trading_Hub_Dashboard
yashim-deriv 9f9cbac
update package.lock
9cd54d6
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
d30b18a
Merge branch 'master' of github.com:binary-com/deriv-app into Trading…
mahdiyeh-deriv 42bec35
change mt5 to deriv mt5
3434ea8
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
mahdiyeh-deriv aacb5c4
fixed languages not appearing in responsive
ac960db
fix account switcher not appearing
1fa8832
fix deriv-go redirection
mahdiyeh-deriv 2f664d4
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
mahdiyeh-deriv b1fe80e
Onboarding styling fix
hirad-deriv d5d92f7
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
hirad-deriv 315c8b3
Pulled from master
hirad-deriv 1de9462
open a new page when clicking on the trade button for different platform
mahdiyeh-deriv 7d4514c
Removed animation of get button in the last steps
hirad-deriv c2421ca
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
hirad-deriv 691fa87
Fixed the issue where all of the platform launcher options were shown
hirad-deriv fd4b024
open app according to chosen account type
7c635fd
fix options and multipliers definition
0f22355
fixed account type redirection
8fc93fe
fix overlapping
mahdiyeh-deriv 7873ab3
fixed to show add a real account first in CFD accounts if the user do…
8f0c0e2
Fixed next button visibility and options change in mobile mode
hirad-deriv 395f740
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
hirad-deriv f7dfbe9
Fixed mobile view of onboarding
hirad-deriv a312388
Fixed design differences
hirad-deriv 623488c
Undefined loginid error fixed
hirad-deriv d78cd83
Compare accounts need fix fix in responsive
hirad-deriv f70c761
dark mode ui fix
cf8b214
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
5262cc8
demo account currency fix
e7edeef
fix demo account balance in top up modal
afe01f9
fix trade button to appear for demo accounts
5550ac2
add 'Exit Trader hub' button
mahdiyeh-deriv 8d8a5f8
fix social signup
mahdiyeh-deriv 53d65c4
Merge branch 'master' of github.com:binary-com/deriv-app into Trading…
mahdiyeh-deriv 920c93c
real account signup title change
4903cdd
fix get button for demo mf account
7d11c56
disabled get button if user has no real account
2f6be60
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
hirad-deriv 6d94e8b
fix deriv x demo account creation
510b938
use CFD_PLATFORMS.MT5 instead of mt5
mahdiyeh-deriv b09131c
fix options and multipliers wording in onboarding
2e53f67
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
c8744dc
fix compare accounts responsive
mahdiyeh-deriv 1e32ea4
Fixed onboarding eu issue
hirad-deriv bf2d230
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
hirad-deriv 6e62bc3
Fixed the conflict
hirad-deriv fcd4c74
Fixed the conflict
hirad-deriv be6b414
Fixed the Exit and Explore issue of Traders Hub
hirad-deriv 20ac5c5
fix rows for CompareAccountsModal
mahdiyeh-deriv e5ce188
Merge branch 'master' of https://github.com/binary-com/deriv-app into…
79233e2
fix: fix total assets popover text for eu clients
4b4d9e4
fix: fix for deriv x demo current balance
7767b4e
fix: account launcher css for real
9ab302c
bugfix: remove CompareAccountsModal for demo
mahdiyeh-deriv fc1c2c9
bugfix: fix real total assets
77aca2a
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
2d9d972
fix: initial commit on 81112
ashraf-deriv 2bef589
bugfix: bug 80682
ashraf-deriv 17a160b
chore: pulled from main branch
hirad-deriv aaa4354
fix: handling the svg size
ashraf-deriv ed6ca40
bugfix: bug80682 try 2
ashraf-deriv c6908ed
fix: fixed the issue where wrong redirection of trader hub was shown
hirad-deriv a332456
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
hirad-deriv 535eb92
bugfix: cfd accounts not getting added in total assets
0cd4ab3
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
c6b2904
fix: made changes according to suggestions
hirad-deriv 609cd27
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
hirad-deriv a5ba07e
redeploy: pull from remote
ashraf-deriv d403639
revert: revert cfd accounts fix in real total assets
87466bd
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
32e45a2
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
ashraf-deriv 73953a9
fix: fixed mf users onboarding behavior
hirad-deriv 7ee22fb
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
hirad-deriv 2672af2
fix: made some changes to the onboarding design
hirad-deriv 815ec43
fix: fixed mf account showing more options
hirad-deriv 2ee1926
bugfix: 81112 fix in demo section
ashraf-deriv 09b36af
bugfix: 81112 fetch lates code from remote btanch
ashraf-deriv 6ec7227
bugfix: total assets real
6895506
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
6e0d762
fix: removed is_eu_country from onboarding conditions
hirad-deriv 1e43cbd
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
hirad-deriv 1610414
fix: next button visibility fix
hirad-deriv baec97d
bugfix: 81112 and 80600
ashraf-deriv 39f002f
bugfix: latest code from remote branch
ashraf-deriv 20f8f72
fix: options title and description for non eu
70a23ba
bugfix: cfds logo issue
ashraf-deriv 566828b
fix: cfd to cfds in onboarding
2058f1e
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
d328dba
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
hirad-deriv aebd3e3
fix: livechat error
mahdiyeh-deriv ad4a79d
fix: onboarding repeat tour
hirad-deriv d59d853
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
hirad-deriv 1f81c34
fix: remove shorcode from title for EU clients
mahdiyeh-deriv eea258d
Merge branch 'master' of github.com:binary-com/deriv-app into Trading…
mahdiyeh-deriv 5e3141d
fix: live_chat error
mahdiyeh-deriv 38d6f9c
refactor: clean code
mahdiyeh-deriv 5804a0f
fix: onboarding tour last button fix
hirad-deriv 3e4ba17
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
hirad-deriv a679001
fix: fixed the redirection issue of trader's hub
hirad-deriv a5edc6a
Merge branch 'master' of https://github.com/binary-com/deriv-app
hirad-deriv 3426666
Merge branch 'master' of https://github.com/binary-com/deriv-app
hirad-deriv 41c7bdf
Merge branch 'master' of https://github.com/binary-com/deriv-app
hirad-deriv 71fa668
fix: hitfixes
mahdiyeh-deriv 901d96c
fix: pulled from main branch
hirad-deriv 7a1f269
fix: fixed text issues of onboarding and account manager
hirad-deriv 0ca2c8b
fix: active class for dashboard index toggler is fixed
hirad-deriv bea020c
fix: manage account font size
c08a6bb
fix: signup for eu
052dac2
fix: add whatsapp and livechat in trader hub menu drawer
5be01ec
fix: language console error
6b1880f
chore: change reset to reset balance
jim-deriv fdc3718
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
jim-deriv c24a709
fix: account toggle overlap
36aefb9
chore: toggle reset balance button based on account balance
jim-deriv 68debf5
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
jim-deriv ab0a413
feat: beta release
mahdiyeh-deriv 2ea5468
Merge branch 'master' of github.com:binary-com/deriv-app into traders…
mahdiyeh-deriv 5e65862
refactor: code refactor
331cf2e
Merge branch 'Trading_Hub_Dashboard' of github.com:mahdiyeh-fs/deriv-…
1f5fd29
Merge branch 'traders_hub_beta' of github.com:mahdiyeh-fs/deriv-app i…
992f761
refactor: code refactor
4c73835
Merge branch 'master' of https://github.com/binary-com/deriv-app
hirad-deriv c3927ff
Merge branch 'traders_hub_beta' of github.com:mahdiyeh-fs/deriv-app i…
hirad-deriv c0517b0
fix: fixed the add button of financial accounts
hirad-deriv 538abfb
fix: overflow bug in trading-hub-body
mahdiyeh-deriv 06c4ef1
fix: padding/margin issue
mahdiyeh-deriv 1c83618
bugfix: 80674
ashraf-deriv 82f5a15
fix: onboarding for eu and non eu
8869051
Merge branch 'traders_hub_beta' of github.com:mahdiyeh-fs/deriv-app i…
e2f2791
bugfix: 80610
ashraf-deriv 9be2f8f
fix: country autoselect and code refactor
5d3cdb7
Merge branch 'traders_hub_beta' of github.com:mahdiyeh-fs/deriv-app i…
ee8cc7e
feat: account_switcher traders hub
amina-deriv c093485
fix: typo_fix
amina-deriv e86ad10
Merge remote-tracking branch 'origin/82217_account_switcher_trading_h…
amina-deriv 65ff99d
Merge branch 'traders_hub_beta' of github.com:mahdiyeh-fs/deriv-app i…
jim-deriv ddb2a36
fix: showing More Derived accounts button
mahdiyeh-deriv 6331e62
fix: eu mismatch in onboarding
mahdiyeh-deriv 5354233
fix: jim/overlap of reset blance button
mahdiyeh-deriv 5eba475
refactor: remove redundant parts
mahdiyeh-deriv 5f53f48
fix: update account status in mt5 compare account
amina-deriv f1b70f9
fix: resolve conflicts
mahdiyeh-deriv fd261c7
fix: repeat tour for eu
d4ce0df
fix: whatsapp for all
0168471
Merge branch 'master' into traders_hub_beta
thisyahlen-deriv 9057f4c
fix: onboarding eu step 3
1ad7240
Merge branch 'traders_hub_beta' of github.com:mahdiyeh-fs/deriv-app i…
6b8dc40
refactor: code fix
7226151
refactor: code fix
872eeea
fix: add is_eu_country
c18c8b1
refactor: code fix v3
1d9c908
fix: derivx not showing once we skip onboarding
amina-deriv 9ec59b7
chore: fix conflicts
350e526
chore: fix conflicts
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM