Merge branch 'master' into develop

Author: LieutenantRoger

.circleci/config.yml

@@ -150,7 +150,7 @@ workflows:
           context : org-global
           filters: &filters-dev
             branches:
-              only: ['develop', 'feature/forum-for-task']
+              only: ['develop', 'issue_1323']
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

src/components/Modal/ConfirmationModal.js

@@ -23,7 +23,7 @@ const ConfirmationModal = ({ title, message, errorMessage, theme, isProcessing,
         <div className={styles.button}>
           <PrimaryButton
             text={isProcessing ? 'Processing...' : confirmText || 'Confirm'}
-            disabled={disableConfirmButton}
+            disabled={disableConfirmButton || isProcessing}
             type={'info'}
             onClick={onConfirm}
           />