This repository has been archived by the owner on Feb 22, 2024. It is now read-only.
Mahdiyeh/Fix: get trader tokens from copytrading_list api #1594
Conversation
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
salarhfz-fs
reviewed
Feb 8, 2022
src/copytrade/copytrade.es6
Outdated
| @@ -11,7 +11,7 @@ import validateToken from 'websockets/validateToken'; | |||
| import { init as instrumentPromise } from '../instruments/instruments'; | |||
|
|
|||
| // While using copy trader, this cannot be NULL | |||
| const getLoggedInUserId = () => local_storage.get("oauth")[0].id; | |||
| const getLoggedInUserId = local_storage.get("oauth")[0].id; | |||
There was a problem hiding this comment.
Suggested change
| const getLoggedInUserId = local_storage.get("oauth")[0].id; | |
| const loggedInUserId = local_storage.get("oauth")[0].id; |
src/copytrade/copytrade.es6
Outdated
| @@ -22,7 +22,7 @@ const form_error_messages = { | |||
| REFRESH_FAILED: 'Refresh failed'.i18n(), | |||
| }; | |||
|
|
|||
| const getStorageName = () => `copyTrade_${getLoggedInUserId()}`; | |||
| const getStorageName = () => `copyTrade_${getLoggedInUserId}`; | |||
There was a problem hiding this comment.
Suggested change
| const getStorageName = () => `copyTrade_${getLoggedInUserId}`; | |
| const getStorageName = () => `copyTrade_${loggedInUserId}`; |
src/copytrade/copytrade.es6
Outdated
| @@ -98,12 +98,16 @@ const refreshTraderStats = (loginid, token, scope) => { | |||
| //Check if we already added this trader. If yes, then merge the changes | |||
| if (traderTokenDetails) { | |||
| _.merge(traderTokenDetails.traderStatistics, copyStatData.copytrading_statistics); | |||
| //check if copy trading is started | |||
There was a problem hiding this comment.
Suggested change
| //check if copy trading is started | |
| // check if copy trading is started |
src/copytrade/copytrade.es6
Outdated
| if (settings.get_settings.allow_copiers) { | ||
| state.is_loading = false; | ||
| } else { | ||
| //update trader tokens and Refresh locally stored trader statistics |
There was a problem hiding this comment.
Suggested change
| //update trader tokens and Refresh locally stored trader statistics | |
| // update trader tokens and refresh locally stored trader statistics |
src/copytrade/copytrade.es6
Outdated
Comment on lines
369
to
370
| for (let traderToken of traderTokens) { | ||
| try { |
There was a problem hiding this comment.
Could we put the try/catch block just before the for loop?
There was a problem hiding this comment.
since we don't want to continue the loop even if an exception occurs during one iteration, the exception handler should be outside the loop, you're right.
src/copytrade/copytrade.es6
Outdated
Comment on lines
414
to
418
| liveapi.events.on("logout", () => { | ||
| if (getStorageName() && local_storage.get(getStorageName())) { | ||
| local_storage.remove(getStorageName()); | ||
| } | ||
| }); |
There was a problem hiding this comment.
Suggested change
| liveapi.events.on("logout", () => { | |
| if (getStorageName() && local_storage.get(getStorageName())) { | |
| local_storage.remove(getStorageName()); | |
| } | |
| }); | |
| liveapi.events.on("logout", () => { | |
| const storageName = getStorageName(); | |
| if (storageName && local_storage.get(storageName)) { | |
| local_storage.remove(storageName); | |
| } | |
| }); |
There was a problem hiding this comment.
To have 1 function call instead of 3 
salarhfz-fs
approved these changes
Feb 9, 2022
matin-deriv
approved these changes
Feb 9, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.