fix: network switch, another great ux improvement (#4608)

heyxyz · Feb 7, 2024 · 29944a3 · 29944a3 · vercel · Feb 7, 2024
2 parents 843d739 + a706155
commit 29944a3
Show file tree

Hide file tree

Showing 25 changed files with 42 additions and 152 deletions.
diff --git a/apps/web/src/components/Composer/NewPublication.tsx b/apps/web/src/components/Composer/NewPublication.tsx
@@ -44,7 +44,6 @@ import { useState } from 'react';
 import toast from 'react-hot-toast';
 import useCreatePoll from 'src/hooks/useCreatePoll';
 import useCreatePublication from 'src/hooks/useCreatePublication';
-import useHandleWrongNetwork from 'src/hooks/useHandleWrongNetwork';
 import usePublicationMetadata from 'src/hooks/usePublicationMetadata';
 import { useCollectModuleStore } from 'src/store/non-persisted/publication/useCollectModuleStore';
 import { useOpenActionStore } from 'src/store/non-persisted/publication/useOpenActionStore';
@@ -180,6 +179,7 @@ const NewPublication: FC<NewPublicationProps> = ({ publication }) => {
   const resetLiveVideoConfig = usePublicationLiveStore(
     (state) => state.resetLiveVideoConfig
   );
+
   const setLicense = usePublicationLicenseStore((state) => state.setLicense);
 
   // Collect module store
@@ -207,7 +207,6 @@ const NewPublication: FC<NewPublicationProps> = ({ publication }) => {
   const [editor] = useLexicalComposerContext();
   const createPoll = useCreatePoll();
   const getMetadata = usePublicationMetadata();
-  const handleWrongNetwork = useHandleWrongNetwork();
 
   const { canUseLensManager, isSponsored } =
     checkDispatcherPermissions(currentProfile);
@@ -354,10 +353,6 @@ const NewPublication: FC<NewPublicationProps> = ({ publication }) => {
       toast.error(Errors.Suspended);
     }
 
-    if (handleWrongNetwork()) {
-      return;
-    }
-
     if (isComment && publication.momoka?.proof && !isSponsored) {
       return toast.error(
         'Momoka is currently in beta - during this time certain actions are not available to all profiles.'

diff --git a/apps/web/src/components/Publication/Actions/Share/Mirror.tsx b/apps/web/src/components/Publication/Actions/Share/Mirror.tsx
@@ -146,6 +146,7 @@ const Mirror: FC<MirrorProps> = ({ isLoading, publication, setIsLoading }) => {
     isMomokaPublication = false
   ) => {
     const { id, typedData } = generatedData;
+    await handleWrongNetwork();
 
     if (canBroadcast) {
       const signature = await signTypedDataAsync(getSignature(typedData));
@@ -227,10 +228,6 @@ const Mirror: FC<MirrorProps> = ({ isLoading, publication, setIsLoading }) => {
       return toast.error(Errors.Suspended);
     }
 
-    if (handleWrongNetwork()) {
-      return;
-    }
-
     if (publication.momoka?.proof && !isSponsored) {
       return toast.error(
         'Momoka is currently in beta - during this time certain actions are not available to all profiles.'

diff --git a/apps/web/src/components/Publication/OpenAction/CollectModule/CollectAction.tsx b/apps/web/src/components/Publication/OpenAction/CollectModule/CollectAction.tsx
@@ -250,6 +250,7 @@ const CollectAction: FC<CollectActionProps> = ({
 
   const typedDataGenerator = async (generatedData: any) => {
     const { id, typedData } = generatedData;
+    await handleWrongNetwork();
 
     if (canBroadcast) {
       const signature = await signTypedDataAsync(getSignature(typedData));
@@ -335,10 +336,6 @@ const CollectAction: FC<CollectActionProps> = ({
       return toast.error(Errors.Suspended);
     }
 
-    if (handleWrongNetwork()) {
-      return;
-    }
-
     try {
       setIsLoading(true);
       if (isLegacyCollectModule) {

diff --git a/apps/web/src/components/Settings/Account/SuperFollow.tsx b/apps/web/src/components/Settings/Account/SuperFollow.tsx
@@ -128,6 +128,7 @@ const SuperFollow: FC = () => {
         const { followModule, followModuleInitData, profileId } =
           typedData.value;
         const args = [profileId, followModule, followModuleInitData];
+        await handleWrongNetwork();
 
         if (canBroadcast) {
           const signature = await signTypedDataAsync(getSignature(typedData));
@@ -158,10 +159,6 @@ const SuperFollow: FC = () => {
       return toast.error(Errors.Suspended);
     }
 
-    if (handleWrongNetwork()) {
-      return;
-    }
-
     try {
       setIsLoading(true);
       return await createSetFollowModuleTypedData({

diff --git a/apps/web/src/components/Settings/Allowance/Button.tsx b/apps/web/src/components/Settings/Allowance/Button.tsx
@@ -85,10 +85,6 @@ const AllowanceButton: FC<AllowanceButtonProps> = ({
     value: string,
     selectedModule: string
   ) => {
-    if (handleWrongNetwork()) {
-      return;
-    }
-
     try {
       const isUnknownModule =
         module.moduleName === OpenActionModuleType.UnknownOpenActionModule;
@@ -107,6 +103,7 @@ const AllowanceButton: FC<AllowanceButtonProps> = ({
           }
         }
       });
+      await handleWrongNetwork();
 
       return sendTransaction?.({
         account: data?.generateModuleCurrencyApprovalData.from,

diff --git a/apps/web/src/components/Settings/Danger/Delete.tsx b/apps/web/src/components/Settings/Danger/Delete.tsx
@@ -52,17 +52,14 @@ const DeleteSettings: FC = () => {
     });
   };
 
-  const handleDelete = () => {
+  const handleDelete = async () => {
     if (!currentProfile) {
       return toast.error(Errors.SignWallet);
     }
 
-    if (handleWrongNetwork()) {
-      return;
-    }
-
     try {
       setIsLoading(true);
+      await handleWrongNetwork();
       return write({ args: [currentProfile?.id] });
     } catch (error) {
       onError(error);

diff --git a/apps/web/src/components/Settings/Danger/Guardian.tsx b/apps/web/src/components/Settings/Danger/Guardian.tsx
@@ -48,17 +48,14 @@ const GuardianSettings: FC = () => {
     });
   };
 
-  const handleDisable = () => {
+  const handleDisable = async () => {
     if (!currentProfile) {
       return toast.error(Errors.SignWallet);
     }
 
-    if (handleWrongNetwork()) {
-      return;
-    }
-
     try {
       setIsLoading(true);
+      await handleWrongNetwork();
       return write();
     } catch (error) {
       onError(error);

diff --git a/apps/web/src/components/Settings/Handles/LinkHandle.tsx b/apps/web/src/components/Settings/Handles/LinkHandle.tsx
@@ -98,6 +98,7 @@ const LinkHandle: FC = () => {
       onCompleted: async ({ createLinkHandleToProfileTypedData }) => {
         const { id, typedData } = createLinkHandleToProfileTypedData;
         const signature = await signTypedDataAsync(getSignature(typedData));
+        await handleWrongNetwork();
         setLensHubOnchainSigNonce(lensHubOnchainSigNonce + 1);
 
         if (canBroadcast) {
@@ -145,10 +146,6 @@ const LinkHandle: FC = () => {
       return toast.error(Errors.Suspended);
     }
 
-    if (handleWrongNetwork()) {
-      return;
-    }
-
     const confirmation = confirm('Are you sure you want to link this handle?');
 
     if (!confirmation) {

diff --git a/apps/web/src/components/Settings/Handles/UnlinkHandle.tsx b/apps/web/src/components/Settings/Handles/UnlinkHandle.tsx
@@ -85,6 +85,7 @@ const UnlinkHandle: FC = () => {
     useCreateUnlinkHandleFromProfileTypedDataMutation({
       onCompleted: async ({ createUnlinkHandleFromProfileTypedData }) => {
         const { id, typedData } = createUnlinkHandleFromProfileTypedData;
+        await handleWrongNetwork();
 
         if (canBroadcast) {
           const signature = await signTypedDataAsync(getSignature(typedData));
@@ -135,10 +136,6 @@ const UnlinkHandle: FC = () => {
       return toast.error(Errors.Suspended);
     }
 
-    if (handleWrongNetwork()) {
-      return;
-    }
-
     try {
       setUnlinking(true);
       const request: UnlinkHandleFromProfileRequest = {

diff --git a/apps/web/src/components/Settings/Manager/LensManager/ToggleLensManager.tsx b/apps/web/src/components/Settings/Manager/LensManager/ToggleLensManager.tsx
@@ -94,7 +94,6 @@ const ToggleLensManager: FC<ToggleLensManagerProps> = ({
     useCreateChangeProfileManagersTypedDataMutation({
       onCompleted: async ({ createChangeProfileManagersTypedData }) => {
         const { id, typedData } = createChangeProfileManagersTypedData;
-        const signature = await signTypedDataAsync(getSignature(typedData));
         const {
           approvals,
           configNumber,
@@ -109,8 +108,10 @@ const ToggleLensManager: FC<ToggleLensManagerProps> = ({
           configNumber,
           switchToGivenConfig
         ];
+        await handleWrongNetwork();
 
         if (!isTba && canBroadcast) {
+          const signature = await signTypedDataAsync(getSignature(typedData));
           const { data } = await broadcastOnchain({
             variables: { request: { id, signature } }
           });
@@ -130,10 +131,6 @@ const ToggleLensManager: FC<ToggleLensManagerProps> = ({
       return toast.error(Errors.Suspended);
     }
 
-    if (handleWrongNetwork()) {
-      return;
-    }
-
     try {
       setIsLoading(true);
       return await createChangeProfileManagersTypedData({

diff --git a/apps/web/src/components/Settings/Manager/ProfileManager/AddProfileManager.tsx b/apps/web/src/components/Settings/Manager/ProfileManager/AddProfileManager.tsx
@@ -111,6 +111,8 @@ const AddProfileManager: FC<AddProfileManagerProps> = ({
           configNumber,
           switchToGivenConfig
         ];
+        await handleWrongNetwork();
+
         try {
           if (!isTba && canBroadcast) {
             const signature = await signTypedDataAsync(getSignature(typedData));
@@ -144,10 +146,6 @@ const AddProfileManager: FC<AddProfileManagerProps> = ({
       return toast.error(Errors.Suspended);
     }
 
-    if (handleWrongNetwork()) {
-      return;
-    }
-
     try {
       setIsLoading(true);
       return await createChangeProfileManagersTypedData({

diff --git a/apps/web/src/components/Settings/Manager/ProfileManager/Managers/List.tsx b/apps/web/src/components/Settings/Manager/ProfileManager/Managers/List.tsx
@@ -92,8 +92,6 @@ const List: FC = () => {
     useCreateChangeProfileManagersTypedDataMutation({
       onCompleted: async ({ createChangeProfileManagersTypedData }) => {
         const { id, typedData } = createChangeProfileManagersTypedData;
-        const signature = await signTypedDataAsync(getSignature(typedData));
-        setLensHubOnchainSigNonce(lensHubOnchainSigNonce + 1);
         const {
           approvals,
           configNumber,
@@ -108,8 +106,11 @@ const List: FC = () => {
           configNumber,
           switchToGivenConfig
         ];
+        await handleWrongNetwork();
+        setLensHubOnchainSigNonce(lensHubOnchainSigNonce + 1);
 
         if (canBroadcast) {
+          const signature = await signTypedDataAsync(getSignature(typedData));
           const { data } = await broadcastOnchain({
             variables: { request: { id, signature } }
           });
@@ -129,10 +130,6 @@ const List: FC = () => {
       return toast.error(Errors.Suspended);
     }
 
-    if (handleWrongNetwork()) {
-      return;
-    }
-
     try {
       setRemovingAddress(address);
       return await createChangeProfileManagersTypedData({

diff --git a/apps/web/src/components/Settings/Profile/Profile.tsx b/apps/web/src/components/Settings/Profile/Profile.tsx
@@ -165,6 +165,7 @@ const ProfileSettingsForm: FC = () => {
       onCompleted: async ({ createOnchainSetProfileMetadataTypedData }) => {
         const { id, typedData } = createOnchainSetProfileMetadataTypedData;
         const { metadataURI, profileId } = typedData.value;
+        await handleWrongNetwork();
 
         if (canBroadcast) {
           const signature = await signTypedDataAsync(getSignature(typedData));
@@ -231,10 +232,6 @@ const ProfileSettingsForm: FC = () => {
       return toast.error(Errors.Suspended);
     }
 
-    if (handleWrongNetwork()) {
-      return;
-    }
-
     try {
       setIsLoading(true);
       const otherAttributes =
@@ -300,14 +297,6 @@ const ProfileSettingsForm: FC = () => {
   };
 
   const uploadAndSave = async (type: 'avatar' | 'cover') => {
-    if (!currentProfile) {
-      return toast.error(Errors.SignWallet);
-    }
-
-    if (handleWrongNetwork()) {
-      return;
-    }
-
     try {
       const croppedImage = await getCroppedImg(
         type === 'avatar' ? profilePictureSrc : coverPictureSrc,

diff --git a/apps/web/src/components/Shared/Alert/BlockOrUnBlockProfile.tsx b/apps/web/src/components/Shared/Alert/BlockOrUnBlockProfile.tsx
@@ -111,10 +111,11 @@ const BlockOrUnBlockProfile: FC = () => {
 
   const typedDataGenerator = async (generatedData: any) => {
     const { id, typedData } = generatedData;
-    const signature = await signTypedDataAsync(getSignature(typedData));
+    await handleWrongNetwork();
     setLensHubOnchainSigNonce(lensHubOnchainSigNonce + 1);
 
     if (canBroadcast) {
+      const signature = await signTypedDataAsync(getSignature(typedData));
       const { data } = await broadcastOnchain({
         variables: { request: { id, signature } }
       });
@@ -176,10 +177,6 @@ const BlockOrUnBlockProfile: FC = () => {
       return;
     }
 
-    if (handleWrongNetwork()) {
-      return;
-    }
-
     try {
       setIsLoading(true);
       const request: BlockRequest | UnblockRequest = {

diff --git a/apps/web/src/components/Shared/Auth/WrongNetwork.tsx b/apps/web/src/components/Shared/Auth/WrongNetwork.tsx
diff --git a/apps/web/src/components/Shared/GlobalBanners/ProtectProfile.tsx b/apps/web/src/components/Shared/GlobalBanners/ProtectProfile.tsx
@@ -60,16 +60,13 @@ const ProtectProfile: FC = () => {
   ).toISOString();
   const isCoolOffPassed = new Date(coolOffDate).getTime() < Date.now();
 
-  const handleProtect = () => {
+  const handleProtect = async () => {
     if (!currentProfile) {
       return toast.error(Errors.SignWallet);
     }
 
-    if (handleWrongNetwork()) {
-      return;
-    }
-
     try {
+      await handleWrongNetwork();
       return write();
     } catch (error) {
       onError(error);