Merge pull request #364 from masa-finance/imk/remove-extra-modal

chore: remove connected view and auth finish functionality
masa-finance · Oct 25, 2023 · 8c82a3a · 8c82a3a
2 parents 133c8f2 + c778a78
commit 8c82a3a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 50 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@masa-finance/masa-react",
-  "version": "3.4.3",
+  "version": "3.4.4",
   "license": "MIT",
   "main": "./dist/src/index.js",
   "typings": "./dist/src/index.d.ts",

diff --git a/src/ui/components/modals/authenticate/authenticate.tsx b/src/ui/components/modals/authenticate/authenticate.tsx
@@ -1,10 +1,8 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import NiceModal, { useModal } from '@ebay/nice-modal-react';
 import { useWallet } from '../../../../wallet-client/wallet/use-wallet';
-import { useSession } from '../../../../masa/use-session';
 
 import { Modal } from '../modal';
-import ConnectedView from './connected-view';
 import { useAuthenticateModal } from './use-authenticate-modal';
 import { ModalLoading } from '../ModalLoading';
 
@@ -14,13 +12,11 @@ export interface AuthenticateProps {
     walletType?: string;
   }) => void;
   onAuthenticateError?: () => void;
-  onAuthenticateFinish?: () => void;
 }
 
 export const Authenticate = ({
   onAuthenticateSuccess,
   onAuthenticateError,
-  onAuthenticateFinish,
 }: AuthenticateProps): JSX.Element => {
   const modal = useModal();
 
@@ -32,7 +28,6 @@ export const Authenticate = ({
     isLoadingSigner,
   } = useWallet();
 
-  const { isLoadingSession } = useSession();
   const [copied, setCopied] = useState(false);
 
   const switchWallet = useCallback(async () => {
@@ -54,7 +49,6 @@ export const Authenticate = ({
     successMessage,
     needsWalletConnection,
     showAuthenticateView,
-    showConnectedView,
     showSwitchWalletButton,
   } = useAuthenticateModal({
     onAuthenticateError,
@@ -75,18 +69,6 @@ export const Authenticate = ({
     );
   }
 
-  if (showConnectedView) {
-    return (
-      <ConnectedView
-        titleText="Starting your soulbound journey"
-        modal={modal}
-        loading={isLoadingSession}
-        closeTimeoutMS={3000}
-        onClose={onAuthenticateFinish}
-      />
-    );
-  }
-
   if (showAuthenticateView) {
     return (
       <Modal>
@@ -146,27 +128,20 @@ export const Authenticate = ({
 };
 
 export const AuthenticateModal = NiceModal.create(
-  ({
-    onAuthenticateSuccess,
-    onAuthenticateFinish,
-    onAuthenticateError,
-  }: AuthenticateProps) => (
+  ({ onAuthenticateSuccess, onAuthenticateError }: AuthenticateProps) => (
     <Authenticate
       onAuthenticateSuccess={onAuthenticateSuccess}
       onAuthenticateError={onAuthenticateError}
-      onAuthenticateFinish={onAuthenticateFinish}
     />
   )
 );
 
 export const openAuthenticateModal = ({
   onAuthenticateSuccess,
   onAuthenticateError,
-  onAuthenticateFinish,
 }: AuthenticateProps) =>
   NiceModal.show(AuthenticateModal, {
     onAuthenticateSuccess,
-    onAuthenticateFinish,
     onAuthenticateError,
   });
 

diff --git a/src/ui/components/modals/authenticate/use-authenticate.ts b/src/ui/components/modals/authenticate/use-authenticate.ts
@@ -14,7 +14,6 @@ export const useAuthenticate = ({
   onRegisterFinish,
   onSuccess,
   onError,
-  showCreateSoulnameModal = true,
 }: {
   onAuthenticateSuccess?: (payload: {
     address?: string;
@@ -26,7 +25,6 @@ export const useAuthenticate = ({
   onRegisterFinish?: () => void;
   onSuccess?: () => void;
   onError?: () => void;
-  showCreateSoulnameModal?: boolean;
 } = {}) => {
   const { openConnectModal, isDisconnected } = useWallet();
   const { checkLogin, getSession } = useSession();
@@ -62,26 +60,6 @@ export const useAuthenticate = ({
       await openAuthenticateModal({
         onAuthenticateSuccess,
         onAuthenticateError,
-        onAuthenticateFinish: async () => {
-          const { data: identityRefetched } = await reloadIdentity();
-
-          // TODO: this is a quick fix that shoudl be removed soon
-          const { data: hasSessionCheck } = await checkLogin();
-          if (hasSessionCheck) {
-            const { data: session } = await getSession();
-            onAuthenticateSuccess?.({
-              address: session?.user.address,
-              walletType: pendingConnector?.name,
-            });
-          }
-
-          if (
-            showCreateSoulnameModal &&
-            !disable &&
-            (!identityRefetched || !identityRefetched.identityId)
-          )
-            await openSoulnameModal();
-        },
       });
     },
     [
@@ -94,7 +72,6 @@ export const useAuthenticate = ({
       checkLogin,
       getSession,
       pendingConnector?.name,
-      showCreateSoulnameModal,
     ]
   );