Merge pull request #122 from bitholla/refinement

fix for admin links and broker fees

Author: abeikverdi

web/src/containers/Admin/Broker/index.js

@@ -49,7 +49,7 @@ const Broker = () => {
             });
         getFees()
             .then(res => {
-                if (res.trades)
+                if (res)
                     setFees(res);
             })
             .catch(error => {
@@ -151,13 +151,13 @@ const Broker = () => {
                                     fields={generateForm()}
                                     handleSubmitBroker={handleSubmitBroker}
                                 />
-                                {feesData.trades
+                                {Object.keys(feesData).length
                                     ? <Card
                                         className="card-title m-top"
                                         title="Quick Trades  Fees"
                                         style={{ textAlign: 'center' }}
                                     >
-                                        {Object.entries(feesData.trades).map(([currency, amount], index) => (
+                                        {Object.entries(feesData).map(([currency, amount], index) => (
                                             <div
                                                 key={index}
                                                 className="list-group-item list-group-item-action"

web/src/containers/Admin/Settings/SettingsForm.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Divider, Button } from 'antd';
-import { reduxForm } from 'redux-form';
+import { reduxForm, reset } from 'redux-form';
 
 import { AdminHocForm } from '../../../components';
 import { generateAdminSettings } from './Utils';
@@ -138,6 +138,6 @@ const LinksForm = ({
 export const LinksSettingsForm = reduxForm({
     form: 'ADMIN_LINKS_SETTINGS_FORM',
     // onSubmitFail: (result, dispatch) => dispatch(reset(FORM_NAME)),
-    // onSubmitSuccess: (result, dispatch) => dispatch(reset(name)),
+    onSubmitSuccess: (result, dispatch) => dispatch(reset('ADMIN_LINKS_SETTINGS_FORM')),
     enableReinitialize: true
 })(LinksForm);

web/src/containers/Admin/Settings/index.js

@@ -164,6 +164,8 @@ export default class Settings extends Component {
                     formValues[val] = formProps[val];
                 }
             });
+        } else if (formKey === 'links') {
+            formValues.links = { ...formProps }
         }
         this.setState({ loading: true, error: '' });
         updatePlugins(formValues)