Merge pull request #1593 from mahdiyeh-fs/fix_copy_trading_isue

Mahdiyeh/Fix: copy trading error

Author: matin-deriv

src/copytrade/copytrade.es6

@@ -171,20 +171,22 @@ const state = {
             if (!settingsToSend.assets || settingsToSend.assets.length <= 0) delete settingsToSend.assets;
             if (!settingsToSend.trade_types || settingsToSend.trade_types.length <= 0) delete settingsToSend.trade_types;
 
-            liveapi
-              .send(settingsToSend)
-              .then(() => {
-                newObj.disableStart = false;
-                newObj.started = true;
-                disableKeypressChars('#max_trade_stake', '#min_trade_stake');
-                updateLocalStorage(state);
-              })
-              .catch(e => {
-                $.growl.error({ message: e.message });
-                newObj.disableStart = false;
-                disableKeypressChars('#max_trade_stake', '#min_trade_stake');
-                updateLocalStorage(state);
-              });
+            liveapi.cached.authorize().then(() => {
+              liveapi
+                .send(settingsToSend)
+                .then(() => {
+                  newObj.disableStart = false;
+                  newObj.started = true;
+                  disableKeypressChars('#max_trade_stake', '#min_trade_stake');
+                  updateLocalStorage(state);
+                })
+                .catch(e => {
+                  $.growl.error({ message: e.message });
+                  newObj.disableStart = false;
+                  disableKeypressChars('#max_trade_stake', '#min_trade_stake');
+                  updateLocalStorage(state);
+                });
+            })
           });
         }
       }

src/token/token.es6

@@ -152,21 +152,25 @@ const init_state = (root) => {
         }
 
         state.token.btn_disabled = true;
-        liveapi.send(request).then((data) => {
-            state.token.name = '';
-            state.token.btn_disabled = false;
-            $.growl.notice({ message: `${'Successfully added new token '.i18n()} ${request.new_token}` });
-
-            const tokens = (data.api_token && data.api_token.tokens) || [];
-            state.update_tokens(tokens);
+        liveapi.cached.authorize().then(() => {
+            liveapi.send(request).then((data) => {
+                state.token.name = '';
+                state.token.btn_disabled = false;
+                $.growl.notice({ message: `${'Successfully added new token '.i18n()} ${request.new_token}` });
+    
+                const tokens = (data.api_token && data.api_token.tokens) || [];
+                state.update_tokens(tokens);
 
-            state.change_route('token-list');
-        }).catch((err) => {
-            state.token.btn_disabled = false;
+                state.change_route('token-list');
+            }).catch((err) => {
+                state.token.btn_disabled = false;
+                $.growl.error({ message: err.message });
+                console.error(err);
+            });
+        })
+        .catch((err) => {
             $.growl.error({ message: err.message });
-            console.error(err);
         });
-
     }
 
     token_win_view = rv.bind(root[0], state);