Merge branch 'master' into purchase-responsive-fix

deriv-com · Sep 4, 2024 · 1739d5b · 1739d5b
2 parents 025bf64 + 67b6cfd
commit 1739d5b
Show file tree

Hide file tree

Showing 7 changed files with 116 additions and 419 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -105,7 +105,7 @@
     "@binary-com/binary-document-uploader": "^2.4.4",
     "@binary-com/binary-style": "^0.2.26",
     "@binary-com/webtrader-charts": "^0.6.2",
-    "@deriv-com/quill-ui": "^1.13.46",
+    "@deriv-com/quill-ui": "^1.16.2",
     "@deriv/deriv-api": "^1.0.15",
     "@deriv/quill-icons": "^1.23.1",
     "@livechat/customer-sdk": "4.0.2",

diff --git a/src/images/pages/header/ic-brand-binarybot.svg b/src/images/pages/header/ic-brand-binarybot.svg
diff --git a/src/javascript/app/base/header.js b/src/javascript/app/base/header.js
@@ -260,14 +260,6 @@ const Header = (() => {
                 icon     : getPlatformSettings('smarttrader').icon,
                 on_mobile: true,
             },
-            ...(should_show_bots ? {
-                binarybot: {
-                    desc     : localize('Our classic “drag-and-drop” tool for creating trading bots, featuring pop-up trading charts, for advanced users.'),
-                    link     : `https://bot.deriv.${getTopLevelDomain()}`,
-                    icon     : getPlatformSettings('bbot').icon,
-                    on_mobile: true,
-                },
-            } : {}),
         };
 
         Object.keys(platforms).forEach(key => {

diff --git a/src/javascript/app/pages/form/form-component.jsx b/src/javascript/app/pages/form/form-component.jsx
@@ -27,6 +27,8 @@ import dataManager from '../../common/data_manager.js';
 import { setDefaultParams } from '../../common/helpers.js';
 import { isCryptocurrency } from '../../../_common/base/currency_base.js';
 
+const Cookies = require('js-cookie');
+
 export const FormComponent = () => {
     const [trade_data, setTradeData] = useState({});
 
@@ -167,6 +169,8 @@ export const FormComponent = () => {
 
     const getAmount = () => (isCryptocurrency(currency) && amount_crypto) ? amount_crypto : amount;
 
+    const lang = Cookies.get('language').replace('_','-').toLowerCase() || 'en';
+
     return (
         <BreakpointProvider>
             <div className='quill-form-container'>
@@ -252,8 +256,11 @@ export const FormComponent = () => {
                                                             <DatePickerDropdown
                                                                 value={moment(expiry_date).format('DD/MM/YYYY')}
                                                                 datePickerProps={{
-                                                                    minDate: getMinMaxDate().minDate,
-                                                                    maxDate: getMinMaxDate().maxDate,
+                                                                    minDate  : getMinMaxDate().minDate,
+                                                                    maxDate  : getMinMaxDate().maxDate,
+                                                                    locale   : lang,
+                                                                    formatDay: (locale, date) =>
+                                                                        moment(date).format('D').replace(/\D/g, ''),
                                                                 }}
                                                                 onSelectDate={(value) => {
                                                                     onExpiryDateChange(value);

diff --git a/src/javascript/app/pages/trade/markets/markets-dropdown.jsx b/src/javascript/app/pages/trade/markets/markets-dropdown.jsx
@@ -146,7 +146,7 @@ export const MarketsDropdown = () => {
             let closestOffset = Infinity;
 
             marketDivs.forEach((div) => {
-                const paddingOffset = 120;
+                const paddingOffset = window.innerWidth > 768 ? 120 : 220;
                 const offsetTop = div.offsetTop - container.scrollTop - paddingOffset;
 
                 if (offsetTop <= 0 && Math.abs(offsetTop) < Math.abs(closestOffset)) {
@@ -291,7 +291,7 @@ export const MarketsDropdown = () => {
 
                                     return (
                                         <React.Fragment key={sub_market_key}>
-                                            <DropdownTitle label={name} />
+                                            <DropdownTitle label={name} data-id={market_key} />
                                             {Object.keys(symbols).map((symbol_key) => {
                                                 const symbol = symbols[symbol_key];
                                                 const { display } = symbol;
@@ -300,6 +300,7 @@ export const MarketsDropdown = () => {
                                                 return (
                                                     <DropdownItem
                                                         key={symbol_key}
+                                                        data-id={market_key}
                                                         onClick={() => handleUnderlyingClick(symbol_key)}
                                                         label={display}
                                                         selected={isSelected}

diff --git a/src/templates/_common/brand.config.js b/src/templates/_common/brand.config.js
@@ -13,10 +13,6 @@ const brand_config_data = {
             name: 'DBot',
             icon: 'ic-brand-dbot.svg',
         },
-        bbot: {
-            name: 'Binary Bot',
-            icon: 'ic-brand-binarybot.svg',
-        },
     },
 };