Applied fixes in PR review

binary-com · Oct 10, 2019 · bbfbdc8 · bbfbdc8
1 parent c633621
commit bbfbdc8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 36 deletions.
diff --git a/packages/trader/src/Assets/Common/icon-check.jsx b/packages/trader/src/Assets/Common/icon-check.jsx
diff --git a/packages/trader/src/Assets/icon.jsx b/packages/trader/src/Assets/icon.jsx
@@ -18,7 +18,6 @@ class Icon extends React.PureComponent {
             IconBack              : React.lazy(() => import('./Common/icon-back.jsx')),
             IconCalendarToday     : React.lazy(() => import('./Common/icon-calendar-today.jsx')),
             IconCalendar          : React.lazy(() => import('./Common/icon-calendar.jsx')),
-            IconCheck             : React.lazy(() => import('./Common/icon-check.jsx')),
             IconChevronDoubleLeft : React.lazy(() => import('./Common/icon-chevron-double-left.jsx')),
             IconChevronDoubleRight: React.lazy(() => import('./Common/icon-chevron-double-right.jsx')),
             IconChevronLeft       : React.lazy(() => import('./Common/icon-chevron-left.jsx')),

diff --git a/packages/trader/src/Modules/Account/Sections/Profile/PersonalDetails/personal-details.jsx b/packages/trader/src/Modules/Account/Sections/Profile/PersonalDetails/personal-details.jsx
@@ -1,6 +1,7 @@
 // import PropTypes        from 'prop-types';
 import React                                   from 'react';
 import { Formik, Field }                       from 'formik';
+import classNames                              from 'classnames';
 import {
     Autocomplete,
     Checkbox,
@@ -25,7 +26,6 @@ import FormSubmitErrorMessage                  from '../../ErrorMessages/FormSub
 import LoadErrorMessage                        from '../../ErrorMessages/LoadErrorMessage';
 import { LeaveConfirm }                        from '../../../Components/leave-confirm.jsx';
 import { FormFooter, FormBody, FormSubHeader } from '../../../Components/layout-components.jsx';
-import Icon from '../../../../../Assets/icon.jsx';
 
 const getResidence = (residence_list, value, type) => {
     const residence = residence_list.find(location =>
@@ -587,11 +587,13 @@ class PersonalDetailsForm extends React.Component {
                                 <FormFooter>
                                     {status && status.msg && <FormSubmitErrorMessage message={status.msg} />}
                                     <div className='account-form__footer-note'>
-                                        Please make sure your information is correct or
-                                        it may affect your trading experience.
+                                        { localize('Please make sure your information is correct or it may affect your trading experience.') }
                                     </div>
                                     <Button
-                                        className='account-form__footer-btn btn--primary--green'
+                                        className={classNames('account-form__footer-btn', {
+                                            'btn--primary--default': !is_submit_success,
+                                            'btn--primary--green'  : is_submit_success,
+                                        })}
                                         type='submit'
                                         is_disabled={isSubmitting || (
                                             this.props.is_virtual ?
@@ -612,7 +614,7 @@ class PersonalDetailsForm extends React.Component {
                                         has_effect
                                         is_loading={is_btn_loading}
                                         is_submit_success={is_submit_success}
-                                        icon={<Icon icon='IconCheck' />}
+                                        text={localize('Next')}
                                     />
                                 </FormFooter>
                             </form>

diff --git a/packages/trader/src/sass/app/modules/account.scss b/packages/trader/src/sass/app/modules/account.scss
@@ -148,11 +148,6 @@
                 margin-bottom: 0;
                 margin-right: 0;
                 min-width: 6.4em;
-
-                .btn__icon {
-                    line-height: 0;
-                    padding: 0;
-                }
             }
         }
     }