Preparing V2.4.8

www/i18n/ach.json

@@ -507,6 +507,8 @@
     "otc_stocks": "crwdns19350:0crwdne19350:0",
     "volidx": "crwdns33590:0crwdne33590:0",
     "volatility_indices": "crwdns33591:0crwdne33591:0",
+    "synthetic_indices": "crwdns68904:0crwdne68904:0",
+    "synthetic_index": "crwdns68906:0crwdne68906:0",
     "subject_to_change": "crwdns19351:0crwdne19351:0",
     "trading_limits": "crwdns19352:0crwdne19352:0",
     "withdrawal_limits": "crwdns19353:0crwdne19353:0",

www/i18n/en.json

@@ -507,6 +507,8 @@
     "otc_stocks": "OTC Stocks",
     "volidx": "Volidx",
     "volatility_indices": "Volatility Indices",
+    "synthetic_indices": "Synthetic Indices",
+    "synthetic_index": "Synthetic Indices",
     "subject_to_change": "Stated limits are subject to change without prior notice.",
     "trading_limits": "Trading Limits",
     "withdrawal_limits": "Withdrawal Limits",

www/i18n/es.json

@@ -507,6 +507,8 @@
     "otc_stocks": "Acciones OTC",
     "volidx": "Volidx",
     "volatility_indices": "Índices de Volatilidad",
+    "synthetic_indices": "Índices sintéticos",
+    "synthetic_index": "Índices sintéticos",
     "subject_to_change": "Los límites establecidos están sujetos a cambios sin previo aviso.",
     "trading_limits": "Límites",
     "withdrawal_limits": "Límite de retiro",

www/i18n/fr.json

@@ -507,6 +507,8 @@
     "otc_stocks": "Actions OTC",
     "volidx": "Volidx",
     "volatility_indices": "Indices de volatilité",
+    "synthetic_indices": "Synthetic Indices",
+    "synthetic_index": "Synthetic Indices",
     "subject_to_change": "Les limites indiquées peuvent être modifiées sans préavis.",
     "trading_limits": "Limites de trading",
     "withdrawal_limits": "Limites de retrait",

www/i18n/id.json

@@ -507,6 +507,8 @@
     "otc_stocks": "Saham OTC",
     "volidx": "Volidx",
     "volatility_indices": "Indeks Volatilitas",
+    "synthetic_indices": "Indeks Sintetis",
+    "synthetic_index": "Indeks Sintetis",
     "subject_to_change": "Batas dapat berubah tanpa pemberitahuan sebelumnya.",
     "trading_limits": "Batas Trading",
     "withdrawal_limits": "Batas Penarikan",

www/i18n/pl.json

@@ -507,6 +507,8 @@
     "otc_stocks": "Akcje OTC",
     "volidx": "Volidx",
     "volatility_indices": "Wskaźniki zmienności",
+    "synthetic_indices": "Wskaźniki syntetyczne",
+    "synthetic_index": "Wskaźniki syntetyczne",
     "subject_to_change": "Podane limity mogą ulec zmianie bez uprzedniego powiadomienia.",
     "trading_limits": "Limity handlowe",
     "withdrawal_limits": "Limity wypłat",

www/i18n/pt.json

@@ -507,6 +507,8 @@
     "otc_stocks": "Ações OTC",
     "volidx": "Volidx",
     "volatility_indices": "Índices Volatility",
+    "synthetic_indices": "Synthetic Indices",
+    "synthetic_index": "Synthetic Indices",
     "subject_to_change": "Os limites mencionados estão sujeitos a alterações sem aviso prévio.",
     "trading_limits": "Limites de negociação",
     "withdrawal_limits": "Limites de retirada",

www/i18n/ru.json

@@ -507,6 +507,8 @@
     "otc_stocks": "Внебиржевые акции",
     "volidx": "Volidx",
     "volatility_indices": "Индексы волатильности",
+    "synthetic_indices": "Синтетические индексы",
+    "synthetic_index": "Синтетические индексы",
     "subject_to_change": "Указанные лимиты могут быть изменены без предварительного уведомления.",
     "trading_limits": "Торговые лимиты",
     "withdrawal_limits": "Лимиты на вывод",

www/i18n/th.json

@@ -507,6 +507,8 @@
     "otc_stocks": "หลักทรัพย์ OTC",
     "volidx": "Volidx",
     "volatility_indices": "ดัชนีความผันผวน",
+    "synthetic_indices": "Synthetic Indices",
+    "synthetic_index": "Synthetic Indices",
     "subject_to_change": "วงเงินที่ได้รับที่ระบุไว้อาจจะมีการเปลี่ยนแปลงโดยไม่บอกกล่าวให้ทราบล่วงหน้า",
     "trading_limits": "วงเงินในการซื้อขาย",
     "withdrawal_limits": "วงเงินในการถอน",

www/i18n/vi.json

@@ -507,6 +507,8 @@
     "otc_stocks": "Cổ phiếu OTC",
     "volidx": "Volidx",
     "volatility_indices": "Chỉ Số Biến Động",
+    "synthetic_indices": "Các chỉ số tổng hợp",
+    "synthetic_index": "Các chỉ số tổng hợp",
     "subject_to_change": "Những giới hạn đã được quy định có thể được thay đổi mà không báo trước.",
     "trading_limits": "Giới hạn Giao dịch",
     "withdrawal_limits": "Giới hạn Rút tiền",

www/i18n/zh_cn.json

@@ -507,6 +507,8 @@
     "otc_stocks": "场外交易股票",
     "volidx": "Volidx",
     "volatility_indices": "波动率指数",
+    "synthetic_indices": "综合指数",
+    "synthetic_index": "综合指数",
     "subject_to_change": "我们保留随时在没有预先通知的情况下更改所述限制的权利。",
     "trading_limits": "交易限制",
     "withdrawal_limits": "提款限额",

www/i18n/zh_tw.json

@@ -507,6 +507,8 @@
     "otc_stocks": "場外交易股票",
     "volidx": "Volidx",
     "volatility_indices": "波動率指數",
+    "synthetic_indices": "綜合指數",
+    "synthetic_index": "綜合指數",
     "subject_to_change": "我們保留隨時在沒有預先通知的情況下更改所述限制的權利。",
     "trading_limits": "交易限制",
     "withdrawal_limits": "提款限額",

www/js/configs/app.config.js

@@ -16,35 +16,35 @@ angular.module("binary").constant("config", {
     tradeCategories : [
         {
             name   : "up_down",
-            markets: ["forex", "volidx", "random"],
+            markets: ["forex", "synthetic_index", "random"],
             value  : "UP/DOWN"
         },
         {
             name   : "digit_matches_differs",
             value  : "MATCH/DIFF",
-            markets: ["volidx", "random"],
+            markets: ["synthetic_index", "random"],
             digits : true
         },
         {
             name   : "digit_even_odd",
-            markets: ["volidx", "random"],
+            markets: ["synthetic_index", "random"],
             value  : "EVEN/ODD"
         },
         {
             name   : "digit_over_under",
             value  : "OVER/UNDER",
-            markets: ["volidx", "random"],
+            markets: ["synthetic_index", "random"],
             digits : true
         },
         {
             name   : "asians",
             value  : "Asians",
-            markets: ["volidx", "random"]
+            markets: ["synthetic_index", "random"]
         },
         {
             name   : "high_low_ticks",
             value  : "HIGH/LOW TICKS",
-            markets: ["volidx"]
+            markets: ["synthetic_index"]
         }
     ],
     tradeTypes: [

www/js/share/services/chart.service.js

@@ -509,6 +509,7 @@ angular.module("binary").factory("chartService", $rootScope => {
             const fractionalLength = utils.fractionalLength(pip);
 
             if (hasEntrySpot() && broadcastable) {
+                const isLastTickAfterExit = contract.exitSpot && lastTime > contract.exitSpot;
                 if (tickPriceList.length === 0) {
                     if (contract.entrySpotTime !== lastTime && betweenExistingSpots(lastTime)) {
                         const entrySpotPrice = parseFloat(contract.entrySpotPrice).toFixed(fractionalLength);
@@ -523,16 +524,20 @@ angular.module("binary").factory("chartService", $rootScope => {
                             contract.result = "lose";
                         }
                         $rootScope.$broadcast("contract:spot", contract, entrySpotPrice);
+                    } else if (isLastTickAfterExit) {
+                        tickPriceList.push(contract.entrySpotPrice);
                     } else {
                         tickPriceList.push(parseFloat(lastPrice).toFixed(fractionalLength));
                     }
                 } else {
                     tickPriceList.push(parseFloat(lastPrice).toFixed(fractionalLength));
                 }
 
-                if (betweenExistingSpots(lastTime)) {
+                if (betweenExistingSpots(lastTime) || isLastTickAfterExit) {
                     const barrier = parseFloat(contract.barrier).toFixed(fractionalLength);
-                    const lastPriceFloat = parseFloat(lastPrice).toFixed(fractionalLength);
+                    const lastPriceFloat = isLastTickAfterExit
+                        ? tickPriceList.slice(-2)[0]
+                        : parseFloat(lastPrice).toFixed(fractionalLength);
 
                     if (utils.conditions[contract.type](barrier, lastPriceFloat,
                         tickPriceList, contract.selectedTick)) {