refacter and solve conflict

src/client/js/components/Admin/MarkdownSetting/LineBreakForm.jsx

@@ -1,6 +1,6 @@
 /* eslint-disable react/no-danger */
 import React from 'react';
-import { } from 'reactstrap';
+// import { Button } from 'reactstrap';
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 import loggerFactory from '@alias/logger';

src/client/js/components/Admin/MarkdownSetting/MarkDownSetting.jsx

@@ -40,7 +40,6 @@ class MarkdownSetting extends React.Component {
         {/* Line Break Setting */}
         <div className="row mb-5">
           <h2 className="border-bottom col-12">{ t('markdown_setting.line_break_setting') }</h2>
-          {/* <div className="well w-100">{ t('markdown_setting.line_break_setting_desc') }</div> */}
           <Card className="well col-12">
             <CardBody className="px-2 py-3">{ t('markdown_setting.line_break_setting_desc') }</CardBody>
           </Card>

src/client/js/components/Admin/MarkdownSetting/PresentationForm.jsx

@@ -1,4 +1,6 @@
 import React from 'react';
+// import { Button } from 'reactstrap';
+
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 import loggerFactory from '@alias/logger';
@@ -108,7 +110,14 @@ class PresentationForm extends React.Component {
         </fieldset>
         <div className="form-group col-12 text-center my-3">
           <div className="col-xs-offset-4 col-xs-5">
-            <button type="submit" className="btn btn-primary" onClick={this.onClickSubmit}>{ t('Update') }</button>
+            <button
+              type="submit"
+              className="btn btn-primary"
+              onClick={this.onClickSubmit}
+              disabled={adminMarkDownContainer.state.retrieveError != null}
+            >
+              { t('Update') }
+            </button>
           </div>
         </div>
       </React.Fragment>

src/client/js/components/Admin/MarkdownSetting/XssForm.jsx

@@ -1,4 +1,6 @@
 import React from 'react';
+// import { Button } from 'reactstrap';
+
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 import loggerFactory from '@alias/logger';
@@ -125,9 +127,14 @@ class XssForm extends React.Component {
           </div>
         </fieldset>
         <div className="form-group col-12 text-center my-3">
-          <div className="col-xs-offset-4 col-xs-5">
-            <button type="submit" className="btn btn-primary" onClick={this.onClickSubmit}>{ t('Update') }</button>
-          </div>
+          <button
+            type="submit"
+            className="btn btn-primary"
+            onClick={this.onClickSubmit}
+            disabled={adminMarkDownContainer.state.retrieveError != null}
+          >
+            {t('Update')}
+          </button>
         </div>
       </React.Fragment>
     );