Merge pull request #309 from topcoder-platform/feat/GAME-82

GAME-121 & GAME-122

Author: kkartunov

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>
                 )

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>

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>