Merge branch 'openbuildxyz:test' into test

Author: Asa0oo0o0o

src/app/bounties/[id]/Employers.js

@@ -28,11 +28,12 @@ import { Button } from '@/components/Button';
 import { CertifiedIcon } from '@/components/Icons';
 // WarningIcon
 import { ArrowTopRightOnSquareIcon } from '@/components/Icons';
+import useListFetcher from '@/hooks/useListFetcher';
 
 import { useAuthGuard } from '#/domain/auth/hooks';
 import { isBountyApplied } from '#/domain/bounty/helper';
+import { fetchBuilderList } from '#/domain/bounty/repository';
 import CompleteProfileDialogWidget from '#/domain/profile/widgets/complete-profile-dialog';
-import { useBountyBuildersList } from '#/services/bounties/hooks';
 import { useMediaUrl, useUser } from '#/state/application/hooks';
 
 import { revalidatePathAction } from '../../actions';
@@ -72,8 +73,7 @@ export function Employers({ id, list, data, mobile }) {
   const [notComplete, setNotComplete] = useState(false);
   const mediaUrl = useMediaUrl();
   const user = useUser();
-  //const wrapBountyEnvCheck = useBountyEnvCheck();
-  const { loading: buildersLoading, list: builderList = [], doFetch } = useBountyBuildersList(id);
+  const { loading: buildersLoading, response, refetch } = useListFetcher(fetchBuilderList, id);
   const { withAuth } = useAuthGuard();
 
   const apply = () => {
@@ -108,10 +108,10 @@ export function Employers({ id, list, data, mobile }) {
     }
   };
 
-  const currentUserApplied = !buildersLoading && builderList.some(({ builder_uid }) => builder_uid === user?.base.user_id);
+  const currentUserApplied = !buildersLoading && (response?.data?.list || []).some(({ builder_uid }) => builder_uid === user?.base.user_id);
   const handleApplyDialogClose = () => {
     setOpenModal(false);
-    doFetch();
+    refetch();
   };
 
   return (

src/app/bounties/[id]/TerminateModal.js

@@ -25,7 +25,7 @@ import { contracts, payTokens } from '@/constants/contract';
 import { currentTime } from '@/utils/date';
 import { parseTokenUnits, signBounty } from '@/utils/web3';
 
-import { termination } from '#/services/bounties';
+import { requestTermination } from '#/domain/bounty/repository';
 
 import { revalidatePathAction } from '../../actions';
 
@@ -57,20 +57,20 @@ export function TerminateModal({open, close, bounty, type}) {
       setLoading(false);
       return;
     }
-    const res = await termination(
+    const res = await requestTermination(
       bounty.id,
-      Number(amount) * 100,
-      _s,
-      type,
-      _deadline
+      {
+        amount: Number(amount) * 100,
+        sig: _s,
+        close_type: type,
+        deadline: _deadline,
+      },
     );
     setLoading(false);
-    if (res.code === 200) {
+    if (res.success) {
       toast.success('Termination successful');
       close();
       revalidatePathAction();
-    } else {
-      toast.error(res.message);
     }
   };
 

src/app/creator/build/[type]/ManageModal.js

@@ -31,9 +31,9 @@ import { currentTime, fromNow } from '@/utils/date';
 import { formatTime } from '@/utils/date';
 import { parseTokenUnits, signBounty } from '@/utils/web3';
 
+import { requestTermination } from '#/domain/bounty/repository';
 import {
   getProgressList,
-  termination,
   finishConfirm,
   finishDeny,
   arbitrate,
@@ -112,20 +112,19 @@ export function ManageModal({
       setTerminateLoading(false);
       return;
     }
-    const res = await termination(
-      bounty.id,
-      Number(amount) * 100,
-      _s,
-      closeBounty,
-      _deadline
+    const res = await requestTermination(bounty.id,
+      {
+        amount: Number(amount) * 100,
+        sig: _s,
+        close_type: closeBounty,
+        deadline: _deadline,
+      },
     );
     setTerminateLoading(false);
-    if (res.code === 200) {
+    if (res.success) {
       toast.success('Termination successful');
       successCallback(18);
       close();
-    } else {
-      toast.error('Termination failed');
     }
   };
 

src/domain/bounty/repository.js

@@ -51,7 +51,11 @@ async function fetchActivityList(id) {
   return httpClient.get(`/build/general/bounties/${id}/events/activities`);
 }
 
-async function fetchBuilderList(id, params) {
+async function fetchBuilderList(id) {
+  return httpClient.get(`/build/general/bounties/${id}/builders`);
+}
+
+async function fetchBuilderListForCreator(id, params) {
   return httpClient.get(`/build/creator/bounties/${id}/builders`, { params });
 }
 
@@ -69,8 +73,13 @@ async function fetchAppliedBountyList(params = {}) {
   });
 }
 
+async function requestTermination(id, data) {
+  return httpClient.post(`/build/creator/bounties/${id}/status/termination/propose`, data);
+}
+
 export {
   fetchList, fetchOne, applyOne,
-  fetchActivityList, fetchBuilderList,
+  fetchActivityList, fetchBuilderList, fetchBuilderListForCreator,
   fetchPublishedBountyList, fetchAppliedBountyList,
+  requestTermination,
 };

src/domain/bounty/widgets/process-list/AppliedModal.js

@@ -33,11 +33,11 @@ import { parseTokenUnits } from '@/utils/web3';
 import { approveBuilder } from '#/services/creator';
 
 import { useBountyEnvCheck } from '../../hooks';
-import { fetchBuilderList } from '../../repository';
+import { fetchBuilderListForCreator } from '../../repository';
 import AppliedBuilderListView from '../../views/applied-builder-list';
 
 function AppliedModal({ open, closeModal, bounty, revalidatePathAction }) {
-  const { data, isLoading, mutate } = useUpToDate(fetchBuilderList, [bounty.id, { skip: 0, take: 25 }]);
+  const { data, isLoading, mutate } = useUpToDate(fetchBuilderListForCreator, [bounty.id, { skip: 0, take: 25 }]);
   const { address } = useAccount();
   // const { chain } = useNetwork()
   const wrapBountyEnvCheck = useBountyEnvCheck();

src/services/bounties/hooks.js

@@ -76,26 +76,6 @@ export function useDetails(id) {
   return { data, loading };
 }
 
-export function useBountyBuildersList(id) {
-  const [list, setList] = useState();
-  const [loading, setLoading] = useState(true);
-  const fetch = useCallback(async () => {
-    if (id) {
-      setLoading(true);
-      get(`ts/v1/build/general/bounties/${id}/builders`).then(result => {
-        setList(result.data?.list || []);
-        setLoading(false);
-      });
-    }
-  }, [id]);
-
-  useEffect(() => {
-    fetch();
-  }, [fetch]);
-  const doFetch = () => fetch();
-  return { list, loading, doFetch };
-}
-
 export function useBountyEvents(id) {
   const [list, setList] = useState();
   const [loading, setLoading] = useState(true);

src/services/bounties/index.js

@@ -31,15 +31,6 @@ export async function getProgressList(id, bid) {
   return await get(`ts/v1/build/general/bounties/${id}/builders/${bid}/events/progress`);
 }
 
-export async function termination(id, amount, sig, close_bounty, deadline) {
-  return await post(`ts/v1/build/creator/bounties/${id}/status/termination/propose`, {
-    amount,
-    sig,
-    close_type: close_bounty,
-    deadline,
-  });
-}
-
 export async function finishConfirm(id, hash) {
   return await post(`ts/v1/build/creator/bounties/${id}/status/finish/confirm`, { hash });
 }

src/shared/hooks/useListFetcher.ts

@@ -0,0 +1,53 @@
+/**
+ * Copyright 2024 OpenBuild
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { useState, useCallback, useEffect } from 'react';
+
+import type { DataValue, ResponseResult } from '../types';
+
+function useListFetcher<T extends DataValue = DataValue>(
+  request: (...args: DataValue[]) => Promise<ResponseResult<T>>,
+  params: DataValue,
+): {
+  response?: ResponseResult<T>;
+  loading: boolean;
+  refetch: () => Promise<ResponseResult<T>>;
+} {
+  const [response, setResponse] = useState<ResponseResult<T>>();
+  const [loading, setLoading] = useState<boolean>(false);
+
+  const fetchList = useCallback(async () => {
+    setLoading(true);
+
+    return request(...[].concat(params))
+      .then(res => {
+        if (res.success) {
+          setResponse(res);
+        }
+
+        return res;
+      })
+      .finally(() => setLoading(false));
+  }, [request, params]);
+
+  useEffect(() => {
+    fetchList();
+  }, [fetchList]);
+
+  return { response, loading, refetch: fetchList };
+}
+
+export default useListFetcher;