Merge pull request #1 from msamprz/timepicker-bug-fixes

Timepicker rounding fix (must differ from binary-static)

Author: easteregg

package-lock.json

@@ -137,7 +137,7 @@
     "react-transition-group": "2.4.0",
     "scriptjs": "2.5.8",
     "sinon": "7.2.2",
-    "smartcharts-beta": "0.4.22",
+    "smartcharts-beta": "0.4.23",
     "tt-react-custom-scrollbars": "4.2.1-tt2",
     "url-polyfill": "1.0.9",
     "web-push-notifications": "3.2.15"

package.json

@@ -128,6 +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/binary_grid',                   null,        'Our New Mobile Trading App',         'NOT-en'],
+    ['binary-grid',                                'landing_pages/binary_grid',                   null,        'Our New Mobile Trading App',         'NOT-en'],
     ['landing/signup-frame',                       'landing_pages/signup_frame',                  null,        'Sign up'],
 ];

scripts/config/pages.js

@@ -16,7 +16,7 @@ const MenuLinks = ({ is_logged_in, items }) => (
                         null
                         :
                         <BinaryLink key={idx} to={item.link_to} className='header__menu-link' active_class='header__menu-link--active'>
-                            <span title={item.text} className='header__menu-link-text'>{item.icon}{item.text}</span>
+                            <span title={item.text} className='header__menu-link-text'>{item.icon}{item.text}{item.logo}</span>
                         </BinaryLink>
                 ))
             }

…wnload/BIEL_Pillar_3_Report_20180601.pdf …wnload/BIEL_Pillar_3_Report_20190403.pdfsrc/download/BIEL_Pillar_3_Report_20180601.pdf renamed to src/download/BIEL_Pillar_3_Report_20190403.pdf src/download/BIEL_Pillar_3_Report_20180601.pdf renamed to src/download/BIEL_Pillar_3_Report_20190403.pdf

@@ -1,14 +1,12 @@
-import React        from 'react';
-import { localize } from '_common/localize';
-import {
-    // IconStatement,
-    IconTrade }     from 'Assets/Header/NavBar/index';
-import { routes }   from 'Constants/index';
+import React             from 'react';
+import { localize }      from '_common/localize';
+// import { IconStatement } from 'Assets/Header/NavBar/index';
+import { routes }        from 'Constants/index';
 
 const header_links = [
     {
-        icon   : <IconTrade className='header__icon' />,
-        text   : localize('Trade'),
+        logo   : <div className='header__logo'>{localize('BETA')}</div>,
+        text   : localize('BinaryNex'),
         link_to: routes.trade,
     },
     // {

src/images/app_2/header/symbol.svg

@@ -12,21 +12,26 @@ const PurchaseButton = ({
     is_disabled,
     is_high_low,
     is_loading,
+    should_fade,
     onClickPurchase,
     type,
 }) => {
     const getIconType = () => {
-        if (is_loading) return '';
+        if (!should_fade && is_loading) return '';
         return (is_high_low) ? `${type.toLowerCase()}_barrier` : type.toLowerCase();
     };
+
     return (
         <Button
             is_disabled={is_contract_mode || is_disabled}
             id={`purchase_${type}`}
             className={classNames(
                 'btn-purchase',
-                { 'btn-purchase--disabled': (is_contract_mode || is_disabled) && !is_loading },
-                { 'btn-purchase--animated': is_loading })}
+                {
+                    'btn-purchase--disabled'       : (is_contract_mode || is_disabled) && !is_loading,
+                    'btn-purchase--animated--slide': is_loading && !should_fade,
+                    'btn-purchase--animated--fade' : is_loading && should_fade,
+                })}
             has_effect
             onClick={() => { onClickPurchase(info.id, info.stake, type); }}
         >
@@ -40,14 +45,14 @@ const PurchaseButton = ({
                     </div>
                     <div className='btn-purchase__text_wrapper'>
                         <span className='btn-purchase__text'>
-                            {!is_loading && localize('[_1]', getContractTypeDisplay(type, is_high_low))}
+                            {(!should_fade && is_loading) ? '' : localize('[_1]', getContractTypeDisplay(type, is_high_low))}
                         </span>
                     </div>
                 </div>
                 <div className='btn-purchase__effect-detail' />
                 <div className='btn-purchase__info btn-purchase__info--right'>
                     <div className='btn-purchase__text_wrapper'>
-                        <span className='btn-purchase__text'>{is_loading || is_disabled ? '' : info.returns}</span>
+                        <span className='btn-purchase__text'>{!(is_loading || is_disabled) ? info.returns : ''}</span>
                     </div>
                 </div>
             </React.Fragment>

src/javascript/_autogenerated/it.js

@@ -12,15 +12,15 @@ import PurchaseButton from 'Modules/Trading/Components/Elements/purchase-button.
 class PurchaseFieldset extends React.PureComponent {
     state = {
         show_tooltip: false,
+        should_fade : false,
     }
 
-    onMouseEnter = () => {
-        this.setState({ show_tooltip: true });
+    componentDidMount() {
+        this.setState({ should_fade: true });
     }
 
-    onMouseLeave = () => {
-        this.setState({ show_tooltip: false });
-    }
+    onMouseEnter = () => this.setState({ show_tooltip: true });
+    onMouseLeave = () => this.setState({ show_tooltip: false });
 
     render() {
         const {
@@ -50,6 +50,7 @@ class PurchaseFieldset extends React.PureComponent {
                 is_high_low={is_high_low}
                 is_loading={is_loading}
                 onClickPurchase={onClickPurchase}
+                should_fade={this.state.should_fade}
                 type={type}
             />
         );
@@ -68,6 +69,7 @@ class PurchaseFieldset extends React.PureComponent {
                         proposal_info={info}
                         has_increased={info.has_increased}
                         is_loading={is_loading}
+                        should_fade={this.state.should_fade}
                         is_visible={!is_contract_mode}
                     />
                     <div