diff --git a/public/locales/en/translations.json b/public/locales/en/translations.json index 71b0fadf3..356bba9db 100644 --- a/public/locales/en/translations.json +++ b/public/locales/en/translations.json @@ -398,7 +398,7 @@ "fee": "Withdrawal fee", "feeinfo": "The indicated price is final, all fees are included.", "byclickTC": "*By clicking {{buttonName}} you agree to our Terms and Conditions (T&C)", - "iAgreedTC": "I have read and agree to the Terms and Conditions and Privacy Policy.", + "iAgreedTC": "I have read and agree to the Terms and Conditions and Privacy Policy.", "iAcknowledgeKYC": "I acknowledge that I have to upload my Identity Document after the payment.", "tooltipTC": "By clicking 'PAY NOW' You agree to our T&C and Privacy Policy.", "refund": "Your order has been refunded. Please contact support in the live chat or at", diff --git a/public/locales/ru/translations.json b/public/locales/ru/translations.json index ad1248746..0f2b5e502 100644 --- a/public/locales/ru/translations.json +++ b/public/locales/ru/translations.json @@ -289,7 +289,7 @@ "fee": "Комиссия за вывод средств", "feeinfo": " Указанная цена является окончательной, все сборы включены.", "byclickTC": "*Переходя по ссылке {{buttonName}} вы соглашаетесь с нашими Условиями использования (T&C)", - "iAgreedTC": "Я прочитал и согласен с Условиями использования и Политикой конфиденциальности .", + "iAgreedTC": "Я прочитал и согласен с Условиями использования и Политикой конфиденциальности .", "iAcknowledgeKYC": "Я осознаю, что после оплаты я должен загрузить документ, удостоверяющий личность.", "tooltipTC": "Нажимая «ОПЛАТИТЬ СЕЙЧАС», Вы соглашаетесь с нашими условиями и положениями, а также политикой конфиденциальности.", "refund": "Ваш заказ был восстановлен. Пожалуйста, обратитесь в службу поддержки в чате или в", diff --git a/src/App.js b/src/App.js index 3d45a3852..46de89d6f 100644 --- a/src/App.js +++ b/src/App.js @@ -23,6 +23,7 @@ import './css/index.scss'; window.$ = window.jQuery = require('jquery'); require('./js/bootstrap.min.js'); +require('./js/utils.js'); // const createStoreWithMiddleware = applyMiddleware(thunk)(createStore); // const store = createStoreWithMiddleware(reducers); diff --git a/src/components/Order/OrderMain/OrderState/OrderInitial/Checkbox/Checkbox.js b/src/components/Order/OrderMain/OrderState/OrderInitial/Checkbox/Checkbox.js index 7c612aa8b..f0eff4491 100644 --- a/src/components/Order/OrderMain/OrderState/OrderInitial/Checkbox/Checkbox.js +++ b/src/components/Order/OrderMain/OrderState/OrderInitial/Checkbox/Checkbox.js @@ -14,8 +14,7 @@ class Checkbox extends Component {
{t => ( -
diff --git a/src/components/Order/OrderMain/OrderState/OrderInitial/OrderInitialFiat/OrderInitialFiat.js b/src/components/Order/OrderMain/OrderState/OrderInitial/OrderInitialFiat/OrderInitialFiat.js index 1dbb42ac8..dea41a661 100644 --- a/src/components/Order/OrderMain/OrderState/OrderInitial/OrderInitialFiat/OrderInitialFiat.js +++ b/src/components/Order/OrderMain/OrderState/OrderInitial/OrderInitialFiat/OrderInitialFiat.js @@ -90,8 +90,11 @@ class OrderInitial extends Component { if (localStorage.termsAgreed) this.setState({ showPaymentIFrame: true }); - window.addEventListener('message', this.iFrameMessage); - } + window.addEventListener('message', this.iFrameMessage); + + //double click to open link on mobile + enableDoubleClickOnMobile(); + } UNSAFE_componentWillUpdate() { const safechargeStatus = getUrlPram('ppp_status'); @@ -244,4 +247,28 @@ const getUrlPram = parameter => { return value; }; +const enableDoubleClickOnMobile = () => { + if(window.mobileCheck()) { + const termsAndConditionsLink = document.getElementById("terms-and-conditions"); + const termsAndConditionsHref = termsAndConditionsLink.href; + termsAndConditionsLink.removeAttribute("href"); + termsAndConditionsLink.removeAttribute("target"); + termsAndConditionsLink.setAttribute("data-toggle", "tooltip"); + termsAndConditionsLink.setAttribute("title", "Double click to open"); + $("#terms-and-conditions").dblclick(() => { + window.open(termsAndConditionsHref, '_blank'); + }); + const privacyLink = document.getElementById("privacy"); + const privacyHref = privacyLink.href; + privacyLink.removeAttribute("href"); + privacyLink.removeAttribute("target"); + privacyLink.setAttribute("data-toggle", "tooltip"); + privacyLink.setAttribute("title", "Double click to open"); + $("#privacy").dblclick(() => { + window.open(privacyHref, '_blank'); + }); + $('[data-toggle="tooltip"]').tooltip(); + } +} + export default OrderInitial; diff --git a/src/js/utils.js b/src/js/utils.js new file mode 100644 index 000000000..47712eb9c --- /dev/null +++ b/src/js/utils.js @@ -0,0 +1,6 @@ +window.mobileCheck = function() { + let check = false; + /* eslint max-len: ["error", { "code": 2500 }] */ + (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||window.opera); + return check; +}; \ No newline at end of file diff --git a/src/locales/en/translations.json b/src/locales/en/translations.json index 5b1097741..0773c75a5 100644 --- a/src/locales/en/translations.json +++ b/src/locales/en/translations.json @@ -275,7 +275,7 @@ "fee": "Withdrawal fee", "feeinfo": "The indicated price is final, all fees are included.", "byclickTC": "*By clicking {{buttonName}} you agree to our Terms and Conditions (T&C)", - "iAgreedTC": "I have read and agree to the Terms and Conditions and Privacy Policy.", + "iAgreedTC": "I have read and agree to the Terms and Conditions and Privacy Policy.", "iAcknowledgeKYC": "I acknowledge that I have to upload my Identity Document after the payment.", "tooltipTC": "You must agree with T&C and Privacy Policy.", "refund": "Your order has been refunded. Please contact support in the live chat or at",