From d05063d63bd82c04d0b42b500e616b25cc141db1 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Tue, 27 Sep 2022 12:38:43 +0300
Subject: [PATCH] GAME-121 & GAME-122

---
 .../form-input/input-image-picker/InputImagePicker.tsx       | 2 +-
 .../modals/badge-created-modal/BadgeCreatedModal.tsx         | 5 +++--
 .../pages/create-badge/CreateBadgePage.tsx                   | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src-ts/lib/form/form-groups/form-input/input-image-picker/InputImagePicker.tsx b/src-ts/lib/form/form-groups/form-input/input-image-picker/InputImagePicker.tsx
index 43882c44c..d724b8ade 100644
--- a/src-ts/lib/form/form-groups/form-input/input-image-picker/InputImagePicker.tsx
+++ b/src-ts/lib/form/form-groups/form-input/input-image-picker/InputImagePicker.tsx
@@ -62,7 +62,7 @@ const InputImagePicker: FC<InputImagePickerProps> = (props: InputImagePickerProp
             />
             {
                 fileDataURL ? (
-                    <img src={fileDataURL} alt={'Badge image preview'} className={styles.badgeImage} />
+                    <img src={fileDataURL} alt={'Badge preview'} className={styles.badgeImage} />
                 ) : (
                     <div className={styles.filePickerPlaceholder}>UPLOAD<br />IMAGE</div>
                 )
diff --git a/src-ts/tools/gamification-admin/game-lib/modals/badge-created-modal/BadgeCreatedModal.tsx b/src-ts/tools/gamification-admin/game-lib/modals/badge-created-modal/BadgeCreatedModal.tsx
index e6a27a8c4..375c47192 100644
--- a/src-ts/tools/gamification-admin/game-lib/modals/badge-created-modal/BadgeCreatedModal.tsx
+++ b/src-ts/tools/gamification-admin/game-lib/modals/badge-created-modal/BadgeCreatedModal.tsx
@@ -23,6 +23,7 @@ const BadgeCreatedModal: FC<BadgeCreatedModalProps> = (props: BadgeCreatedModalP
             open={props.isOpen}
             size='md'
             title={`Badge created`}
+            closeOnOverlayClick={false}
         >
             <div className={styles.wrapper}>
                 <div className={styles.badge}>
@@ -40,9 +41,9 @@ const BadgeCreatedModal: FC<BadgeCreatedModalProps> = (props: BadgeCreatedModalP
                         route={badgeDetailPath(props.badge.id)}
                     />
                     <Button
-                        label={props.badge.active ? 'Award' : 'Activate & Award'}
+                        label='Create a new badge'
                         buttonStyle='secondary'
-                        route={badgeDetailPath(props.badge.id, 'award')}
+                        onClick={() => window.location.reload()}
                     />
                 </div>
             </div>
diff --git a/src-ts/tools/gamification-admin/pages/create-badge/CreateBadgePage.tsx b/src-ts/tools/gamification-admin/pages/create-badge/CreateBadgePage.tsx
index 9d34a510c..e535b48e9 100644
--- a/src-ts/tools/gamification-admin/pages/create-badge/CreateBadgePage.tsx
+++ b/src-ts/tools/gamification-admin/pages/create-badge/CreateBadgePage.tsx
@@ -42,7 +42,10 @@ const CreateBadgePage: FC = () => {
                 createdBadge && <BadgeCreatedModal
                     badge={createdBadge}
                     isOpen={showBadgeCreatedModal}
-                    onClose={() => setShowBadgeCreatedModal(false)}
+                    onClose={() => {
+                        setCreatedBadge(undefined)
+                        setShowBadgeCreatedModal(false)
+                    }}
                 />
             }
         </ContentLayout>