fix: replace modal

Joystream · Jul 2, 2024 · 04de1c2 · 04de1c2
1 parent 0a8ee99
commit 04de1c2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 24 deletions.
diff --git a/packages/ui/src/app/GlobalModals.tsx b/packages/ui/src/app/GlobalModals.tsx
@@ -221,7 +221,7 @@ export const MODAL_WITH_CLOSE_CONFIRMATION: ModalNames[] = [
 ]
 
 export const GlobalModals = () => {
-  const { modal, hideModal, currentModalMachine, showModal, modalData, isClosing } = useModal()
+  const { modal, hideModal, currentModalMachine, showModal, isClosing } = useModal()
   const { active: activeMember } = useMyMemberships()
   const { status } = useTransactionStatus()
   const Modal = useMemo(() => (modal && modal in modals ? memo(() => modals[modal as ModalNames]) : null), [modal])
@@ -235,12 +235,8 @@ export const GlobalModals = () => {
   const potentialFallback = useGlobalModalHandler(currentModalMachine, hideModal)
 
   if (modal && !GUEST_ACCESSIBLE_MODALS.includes(modal as ModalNames) && !activeMember) {
-    showModal<SwitchMemberModalCall>({
-      modal: 'SwitchMember',
-      data: {
-        originalModalName: modal as ModalNames,
-        originalModalData: modalData,
-      },
+    showModal({
+      modal: 'OnBoardingModal',
     })
     return null
   }

diff --git a/packages/ui/test/council/modals/AnnounceCandidacyModal.test.tsx b/packages/ui/test/council/modals/AnnounceCandidacyModal.test.tsx
@@ -109,16 +109,12 @@ describe('UI: Announce Candidacy Modal', () => {
 
       renderModal()
 
-      const switchMemberModalCall = {
-        modal: 'SwitchMember',
-        data: {
-          originalModalName: 'AnnounceCandidateModal',
-          originalModalData: null,
-        },
+      const onBoardingModalCall = {
+        modal: 'OnBoardingModal',
       }
 
       expect(showModal).toBeCalledTimes(1)
-      expect(showModal).toBeCalledWith({ ...switchMemberModalCall })
+      expect(showModal).toBeCalledWith({ ...onBoardingModalCall })
     })
 
     it('Transaction fee', async () => {

diff --git a/packages/ui/test/forum/modals/CreateThreadModal.test.tsx b/packages/ui/test/forum/modals/CreateThreadModal.test.tsx
@@ -80,11 +80,7 @@ describe('CreateThreadModal', () => {
       useMyMemberships.active = undefined
       renderModal()
       expect(useModal.showModal).toBeCalledWith({
-        modal: 'SwitchMember',
-        data: {
-          originalModalName: 'CreateThreadModal',
-          originalModalData: useModal.modalData,
-        },
+        modal: 'OnBoardingModal',
       })
     })
 

diff --git a/packages/ui/test/working-groups/modals/ApplyForRoleModal.test.tsx b/packages/ui/test/working-groups/modals/ApplyForRoleModal.test.tsx
@@ -135,11 +135,7 @@ describe('UI: ApplyForRoleModal', () => {
       await renderModal()
 
       expect(showModal).toBeCalledWith({
-        modal: 'SwitchMember',
-        data: {
-          originalModalData: modalData,
-          originalModalName: 'ApplyForRoleModal',
-        },
+        modal: 'OnBoardingModal',
       })
       showModal.mockClear()
     })