@@ -407,11 +439,13 @@
+
+
+
+
+ {{ 'self-exclusion.info_bottom_1' | translate }}
+
+
+
+
+ {{ 'self-exclusion.info_bottom_2' | translate }}
+
+
+
+
+
diff --git a/www/js/pages/trade/components/chart/chart.controller.js b/www/js/pages/trade/components/chart/chart.controller.js
index 0da3b6fda3..bd09cd9f71 100644
--- a/www/js/pages/trade/components/chart/chart.controller.js
+++ b/www/js/pages/trade/components/chart/chart.controller.js
@@ -22,9 +22,9 @@
$scope.$on("portfolio", (e, portfolio) => {
const contractId = vm.purchasedContract.contractId;
- if (!_.isEmpty(contractId)) {
+ if ((typeof contractId === "string" && !_.isEmpty(contractId)) || contractId) {
portfolio.contracts.forEach(contract => {
- if (contract.contract_id.toString() === contractId) {
+ if ((typeof contractId === "string" && contract.contract_id.toString() === contractId) || contract.contract_id === contractId) {
chartService.addContract({
startTime: contract.date_start + 1,
duration : parseInt(vm.proposal.duration),
diff --git a/www/js/pages/trade/proposal.service.js b/www/js/pages/trade/proposal.service.js
index e120595fd1..234e5362b9 100644
--- a/www/js/pages/trade/proposal.service.js
+++ b/www/js/pages/trade/proposal.service.js
@@ -71,7 +71,7 @@
const options = JSON.parse(localStorage.options);
const proposal = create();
proposal.symbol = options.underlying.symbol;
- proposal.duration = options.tick;
+ proposal.duration = parseInt(options.tick);
if (options.tradeType === "Higher/Lower") {
proposal.barrier = _.isEmpty(options.barrier) ? "" : options.barrier;
} else {
@@ -120,7 +120,7 @@
}
proposal.symbol = options.underlying.symbol;
- proposal.duration = options.tick;
+ proposal.duration = parseInt(options.tick);
if (options.tradeType === "Higher/Lower") {
proposal.barrier = _.isEmpty(options.barrier) ? "" : options.barrier;
} else {
diff --git a/www/js/pages/transaction-detail/transaction-detail.controller.js b/www/js/pages/transaction-detail/transaction-detail.controller.js
index 902b658f27..474409baa1 100644
--- a/www/js/pages/transaction-detail/transaction-detail.controller.js
+++ b/www/js/pages/transaction-detail/transaction-detail.controller.js
@@ -17,8 +17,9 @@
const vm = this;
vm.currency = sessionStorage.getItem("currency");
const id = sessionStorage.getItem("id");
+ const contractId = parseInt(id);
const extraParams = {
- req_id: id
+ req_id: contractId
};
const sendDetailsRequest = () => {
if (appStateService.isLoggedin) {
@@ -31,7 +32,7 @@
$scope.$on("proposal:open-contract", (e, proposal_open_contract, req_id) => {
const proposalOpenContract = proposal_open_contract;
const reqId = req_id;
- if (reqId === id) {
+ if (reqId === contractId) {
$scope.$applyAsync(() => {
vm.contract = proposalOpenContract;
});
diff --git a/www/js/share/components/language/language.controller.js b/www/js/share/components/language/language.controller.js
index 9ccc90c063..07ecae4f5b 100644
--- a/www/js/share/components/language/language.controller.js
+++ b/www/js/share/components/language/language.controller.js
@@ -10,9 +10,9 @@
(function() {
angular.module("binary.share.components.language.controllers").controller("LanguageController", Language);
- Language.$inject = ["$scope", "config", "languageService", "websocketService", "appStateService"];
+ Language.$inject = ["$scope", "config", "languageService", "supportedLanguagesService", "websocketService", "appStateService"];
- function Language($scope, config, languageService, websocketService, appStateService) {
+ function Language($scope, config, languageService, supportedLanguagesService, websocketService, appStateService) {
const vm = this;
vm.languages = [];
vm.appSupportedLanguages = [];
@@ -21,43 +21,34 @@
vm.showSpinner = false;
vm.ios = ionic.Platform.isIOS();
vm.android = ionic.Platform.isAndroid();
- websocketService.sendRequestFor.websiteStatus(true);
- $scope.$on("website_status", (e, website_status) => {
- if (!vm.isLanguageReady && website_status) {
- vm.languages = [];
- vm.languagesList = website_status.supported_languages;
- vm.appSupportedLanguages = config.appSupportedLanguages;
- _.forEach(vm.appSupportedLanguages, value => {
- vm.value = value.toUpperCase();
- if (vm.languagesList.indexOf(vm.value) > -1) {
- const LanguageCode = vm.value.toLowerCase();
- const languageNativeName = languageService.getLanguageNativeName(LanguageCode);
- vm.languages.push({
- id : LanguageCode,
- title: languageNativeName
- });
- }
- });
- vm.isLanguageReady = true;
- appStateService.isLanguageReady = true;
- $scope.$apply();
- }
- if (!vm.isLanguageReady && !website_status) {
- vm.languages = [];
- vm.languages.push({
- id : "en",
- title: "English"
- });
+
+ const init = () => {
+ const supportedLanguages = supportedLanguagesService.supportedLanguages;
+ vm.appSupportedLanguages = config.appSupportedLanguages;
+ _.forEach(vm.appSupportedLanguages, value => {
+ vm.value = value.toUpperCase();
+ if (supportedLanguages.indexOf(vm.value) > -1) {
+ const LanguageCode = vm.value.toLowerCase();
+ const languageNativeName = languageService.getLanguageNativeName(LanguageCode);
+ vm.languages.push({
+ id : LanguageCode,
+ title: languageNativeName
+ });
+ }
+ });
+
+ if (vm.languages.length) {
vm.isLanguageReady = true;
appStateService.isLanguageReady = true;
- $scope.$apply();
}
- });
+ };
$scope.$on('authorize', (e, authorize) => {
vm.showSpinner = false;
});
+ $scope.$on('supported_languages', init);
+
vm.language = languageService.read();
vm.changeLanguage = function(language) {
@@ -65,5 +56,7 @@
languageService.update(vm.language);
vm.showSpinner = true;
};
+
+ init();
}
})();
diff --git a/www/js/share/services/supported-languages.service.js b/www/js/share/services/supported-languages.service.js
new file mode 100644
index 0000000000..359b2b5aeb
--- /dev/null
+++ b/www/js/share/services/supported-languages.service.js
@@ -0,0 +1,13 @@
+/**
+ * @name supportedLanguagesService
+ * @author Nazanin Reihani Haghighi
+ * @contributors []
+ * @since 06/05/2019
+ * @copyright Binary Ltd
+ */
+
+angular.module("binary").service("supportedLanguagesService", function() {
+ this.supportedLanguages = ["en"];
+
+ this.setSupportedLanguages = langs => this.supportedLanguages = langs;
+});
diff --git a/www/js/share/services/websocket.service.js b/www/js/share/services/websocket.service.js
index 3681340195..e6b448c481 100644
--- a/www/js/share/services/websocket.service.js
+++ b/www/js/share/services/websocket.service.js
@@ -22,7 +22,8 @@ angular
localStorageService,
clientService,
config,
- notificationService
+ notificationService,
+ supportedLanguagesService
) => {
let dataStream = "";
const messageBuffer = [];
@@ -118,7 +119,7 @@ angular
appStateService.isLoggedin = false;
-
+
const onFailed = () => {
$rootScope.$broadcast("connection:error", true);
@@ -639,6 +640,13 @@ angular
appStateService.currenciesConfig = message.website_status.currencies_config;
$rootScope.$broadcast("website_status", message.website_status);
localStorage.termsConditionsVersion = message.website_status.terms_conditions_version;
+ const supportedLanguages = message.website_status.supported_languages;
+ if (supportedLanguages.length) {
+ supportedLanguagesService.setSupportedLanguages(
+ message.website_status.supported_languages
+ );
+ $rootScope.$broadcast("supported_languages");
+ }
} else if (message.hasOwnProperty("error")) {
trackJs.track(`${message.error.code}: ${message.error.message}`);
}
diff --git a/www/js/share/templates/layout/main-layout.template.html b/www/js/share/templates/layout/main-layout.template.html
index c972c32eeb..1702850593 100644
--- a/www/js/share/templates/layout/main-layout.template.html
+++ b/www/js/share/templates/layout/main-layout.template.html
@@ -97,6 +97,12 @@
{{ 'menu.regulatory_information' | translate }}
+