Merge branch 'master' into negar/send_referrer

Author: ashkanx

package-lock.json

@@ -70,7 +70,7 @@
     "grunt-contrib-clean": "1.1.0",
     "grunt-contrib-connect": "1.0.2",
     "grunt-contrib-copy": "1.0.0",
-    "grunt-contrib-cssmin": "2.2.1",
+    "grunt-contrib-cssmin": "^3.0.0",
     "grunt-contrib-watch": "1.1.0",
     "grunt-embed-fonts": "0.5.1",
     "grunt-eslint": "21.0.0",
@@ -137,7 +137,7 @@
     "react-transition-group": "2.4.0",
     "scriptjs": "2.5.8",
     "sinon": "7.2.2",
-    "smartcharts-beta": "0.4.18",
+    "smartcharts-beta": "0.4.21",
     "tt-react-custom-scrollbars": "4.2.1-tt2",
     "url-polyfill": "1.0.9",
     "web-push-notifications": "3.2.15"

package.json

@@ -128,5 +128,6 @@ module.exports = [
     ['graduates',                               'landing_pages/graduate_program',                 null,        'Binary.com Graduate Program',        'NOT-en'],
     // ['hackathon',                               'landing_pages/hackathon',                     null,        'Hackathon Competition',              'NOT-en'],
     ['introducing-usb',                            'landing_pages/usb',                           null,        'Introducing USB',                    'NOT-en'],
+    ['binarygrid',                                 'landing_pages/grid_landing',                  null,        'Our New Mobile Trading App',         'NOT-en'],
     ['landing/signup-frame',                       'landing_pages/signup_frame',                  null,        'Sign up'],
 ];

scripts/config/pages.js

@@ -13,6 +13,7 @@ module.exports = [
     'Advanced',
     'All barriers in this trading window are expired',
     'Amount',
+    'Amount in',
     'An additional password can be used to restrict access to the cashier.',
     'Apply now as a professional investor',
     'Apr',
@@ -283,7 +284,6 @@ module.exports = [
     'Please reload the page',
     'Please select',
     'Please select a country',
-    'Please select a payment agent',
     'Please select a valid time.',
     'Please select at least one scope',
     'Please select the checkbox.',
@@ -337,6 +337,7 @@ module.exports = [
     'Select Asset',
     'Select Trade Type',
     'Select date',
+    'Select payment agent',
     'Select your market and underlying asset',
     'Select your trade type',
     'Selected Tick',