Merge pull request #114 from Crossbell-Box/fix/xsync

Crossbell-Box · Dec 6, 2022 · 89588a4 · 89588a4 · vercel · Dec 6, 2022
2 parents 7dd6616 + 4f188d9
commit 89588a4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/components/pages/sync/hooks/use-toggle-operator.ts b/components/pages/sync/hooks/use-toggle-operator.ts
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { useSetCharacterOperator } from "@/utils/apis/contract";
+import { useToggleSyncOperator } from "@/utils/apis/contract";
 import { isAddressEqual } from "@/utils/ethers";
 import { OPERATOR_ADDRESS } from "@/utils/apis/operator-sync";
 import {
@@ -16,7 +16,7 @@ export function useToggleOperator() {
 	const { data: operator } = useCharacterOperator(character?.characterId);
 	const [isTogglingOperator, setIsTogglingOperator] = React.useState(false);
 
-	const setOperator = useSetCharacterOperator(OPERATOR_ADDRESS);
+	const setOperator = useToggleSyncOperator("add");
 
 	return React.useMemo(() => {
 		const hasOperator = isAddressEqual(operator, OPERATOR_ADDRESS);

diff --git a/components/pages/sync/modals/remove-operator-modal.tsx b/components/pages/sync/modals/remove-operator-modal.tsx
@@ -6,7 +6,7 @@ import { useClickOutside } from "@mantine/hooks";
 
 import { openBorderlessModal } from "@/components/common/Modal";
 import Image from "@/components/common/Image";
-import { useSetCharacterOperator } from "@/utils/apis/contract";
+import { useToggleSyncOperator } from "@/utils/apis/contract";
 import { NIL_ADDRESS } from "@/utils/ethers";
 import { useCurrentCharacter } from "@/utils/apis/indexer";
 import { useCharacterBoundAccounts } from "@/utils/apis/operator-sync";
@@ -43,7 +43,7 @@ export function RemoveOperatorModal() {
 	const [scene, setScene] = React.useState(Scene.wannaRemoveTips);
 
 	const { mutate: removeOperator_, isLoading: isRemoving } =
-		useSetCharacterOperator(NIL_ADDRESS);
+		useToggleSyncOperator("remove");
 
 	const removeOperator = React.useCallback(() => {
 		if (!isRemoving && character?.characterId) {

diff --git a/components/pages/sync/operator-sync-welcome/index.tsx b/components/pages/sync/operator-sync-welcome/index.tsx
@@ -11,7 +11,7 @@ import {
 	useActivateCharacter,
 } from "@/utils/apis/operator-sync";
 import { useLoginChecker } from "@/utils/wallet/hooks";
-import { useSetCharacterOperator } from "@/utils/apis/contract";
+import { useToggleSyncOperator } from "@/utils/apis/contract";
 import { isAddressEqual, NIL_ADDRESS } from "@/utils/ethers";
 
 import { SNSIcons } from "./sns-icons";
@@ -21,7 +21,7 @@ export default function OperatorSyncWelcome() {
 	const { data: character } = useCurrentCharacter();
 	const { validate } = useLoginChecker();
 	const activate = useActivateCharacter(character?.characterId);
-	const setOperator = useSetCharacterOperator(OPERATOR_ADDRESS);
+	const setOperator = useToggleSyncOperator("add");
 	const { data: operator } = useCharacterOperator(character?.characterId);
 	const { openConnectModal } = useConnectModal();
 

diff --git a/utils/apis/contract/operator.ts b/utils/apis/contract/operator.ts
@@ -1,22 +1,24 @@
 import { useContract } from "@/utils/crossbell.js";
 import { showNotification } from "@mantine/notifications";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { SCOPE_KEY_CHARACTER_OPERATOR } from "../indexer";
+import { OPERATOR_ADDRESS } from "@/utils/apis/operator-sync";
 
-export function useSetCharacterOperator(operator: string) {
+import { SCOPE_KEY_CHARACTER } from "../indexer";
+
+export function useToggleSyncOperator(type: "add" | "remove") {
 	const contract = useContract();
 	const queryClient = useQueryClient();
 
 	return useMutation(
 		async (characterId: number) => {
-			return contract.setOperator(characterId, operator);
+			return type === "add"
+				? contract.addOperator(characterId, OPERATOR_ADDRESS)
+				: contract.removeOperator(characterId, OPERATOR_ADDRESS);
 		},
 		{
 			onSuccess: (_, characterId) => {
 				return Promise.all([
-					queryClient.invalidateQueries(
-						SCOPE_KEY_CHARACTER_OPERATOR(characterId)
-					),
+					queryClient.invalidateQueries(SCOPE_KEY_CHARACTER(characterId)),
 				]);
 			},
 			onError: (err: any) => {