Merge pull request #2838 from binary-com/beta

beta to master

Author: Aaron

gulp/i18n.js

@@ -48,10 +48,7 @@ const customTransform = function _transform(file, enc, done) {
     done();
 };
 
-gulp.task(
-    'clean-i18n',
-    gulp.series(() => gulp.src(['src/common/translations/en/*']).pipe(paths(del)))
-);
+gulp.task('clean-i18n', gulp.series(() => gulp.src(['src/common/translations/en/*']).pipe(paths(del))));
 
 gulp.task(
     'i18n-xml',
@@ -86,13 +83,10 @@ gulp.task(
 gulp.task(
     'pull-blockly-translations',
     gulp.series(done => {
-        const blocklyLanguages = ['en', 'de', 'it', 'vi', 'pl', 'ru', 'pt', 'es', 'fr', 'zh-hans', 'zh-hant'];
-        remoteSrc(
-            blocklyLanguages.map(lang => `${lang}.js?_=${Date.now()}`),
-            {
-                base: 'https://blockly-demo.appspot.com/static/msg/js/',
-            }
-        )
+        const blocklyLanguages = ['en', 'de', 'id', 'it', 'vi', 'pl', 'ru', 'pt', 'es', 'fr', 'zh-hans', 'zh-hant'];
+        remoteSrc(blocklyLanguages.map(lang => `${lang}.js?_=${Date.now()}`), {
+            base: 'https://blockly-demo.appspot.com/static/msg/js/',
+        })
             .pipe(rename(path => (path.extname = '.js')))
             .pipe(gulp.dest('www/translations'));
         done();

package-lock.json

@@ -103,7 +103,7 @@
     "webpack-stream": "^4.0.0"
   },
   "dependencies": {
-    "smartcharts-beta": "^0.8.0-betam.10",
+    "smartcharts-beta": "^0.8.0-betam.11",
     "binary-style": "^0.2.4",
     "blockly": "github:google/blockly#59e5ac6",
     "clone": "aminmarashi/clone#d97b4f",

package.json

@@ -27,6 +27,7 @@ const unrecoverableErrors = [
     'FinancialAssessmentRequired',
     'AuthorizationRequired',
     'InvalidToken',
+    'ClientUnwelcome',
 ];
 const botInitialized = bot => bot && bot.tradeEngine.options;
 const botStarted = bot => botInitialized(bot) && bot.tradeEngine.tradeOptions;

src/botPage/bot/Interpreter.js

@@ -650,7 +650,7 @@ export default class View {
 
         window.addEventListener('storage', e => {
             window.onbeforeunload = null;
-            if (e.key === 'activeToken' && !e.newValue) window.location.reload();
+            if (e.key === 'activeToken' && e.newValue !== e.oldValue) window.location.reload();
             if (e.key === 'realityCheckTime') hideRealityCheck();
         });
 

src/botPage/view/View.js

@@ -20,7 +20,7 @@ const Elevio = (() => {
 
         // eslint-disable-next-line no-underscore-dangle
         window._elev.on('load', elev => {
-            const availableLanguages = ['en', 'es', 'pt', 'ru'];
+            const availableLanguages = ['en', 'es', 'id', 'pt', 'ru'];
             const currentLanguage = getLanguage();
             if (availableLanguages.includes(currentLanguage)) {
                 elev.setLanguage(currentLanguage);

src/common/elevio.js

@@ -11,6 +11,7 @@ import es from './translations/es_ES/i10n.json';
 import fr from './translations/fr_FR/i10n.json';
 import en from './translations/en/i10n.json';
 import ach from './translations/ach_UG/i10n.json';
+import id from './translations/id_ID/i10n.json';
 
 export const supportedLanguages = {
     zh_tw: zhTw,
@@ -25,6 +26,7 @@ export const supportedLanguages = {
     fr,
     en,
     ach,
+    id,
 };
 
 const fallbackLang = en;

src/common/i18n.js

@@ -32,8 +32,8 @@ const Footer = () => (
                             <SocialIcons
                                 networks={[
                                     { media: 'youtube', href: 'https://www.youtube.com/user/BinaryTradingVideos' },
-                                    { media: 'facebook', href: 'https://www.facebook.com/binarydotcom' },
-                                    { media: 'twitter', href: 'https://twitter.com/Binarydotcom' },
+                                    { media: 'facebook', href: 'https://www.facebook.com/derivdotcom' },
+                                    { media: 'twitter', href: 'https://twitter.com/derivdotcom' },
                                     { media: 'telegram', href: 'https://t.me/binarydotcom' },
                                     { media: 'reddit', href: 'https://www.reddit.com/r/binarydotcom/' },
                                 ]}

src/indexPage/react-components/footer.jsx

@@ -15,6 +15,7 @@
     <li class="en">English</li>
     <li class="de">Deutsch</li>
     <li class="fr">Français</li>
+    <li class="id">Indonesia</li>
     <li class="pl">Polish</li>
     <li class="pt">Português</li>
     <li class="ru">Русский</li>