wip

Author: carina-akaia

src/common/wallet/components.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect } from "react";
+import { useCallback, useEffect, useMemo } from "react";
 
 import { useRouter } from "next/router";
 
@@ -7,7 +7,7 @@ import { IS_CLIENT } from "@/common/constants";
 
 import { useWalletUserAdapter } from "./adapters";
 import { useWalletUserMetadataStore } from "./model";
-import { isAccountId } from "../lib";
+import { isAccountId, useRouteQuery } from "../lib";
 
 type WalletProviderProps = {
   children: React.ReactNode;
@@ -16,10 +16,23 @@ type WalletProviderProps = {
 const WalletProvider: React.FC<WalletProviderProps> = ({ children }) => {
   const router = useRouter();
 
+  const { query, setSearchParams } = useRouteQuery();
+
+  console.log(query);
+
   const trackedQueryParams = router.query as {
+    /**
+     * Backward compatibility for deprecated parameter name
+     */
+    referrerId?: string;
     referrerAccountId?: string;
   };
 
+  const referrerAccountIdUrlParameter = useMemo(
+    () => trackedQueryParams.referrerAccountId || trackedQueryParams.referrerId,
+    [trackedQueryParams.referrerAccountId, trackedQueryParams.referrerId],
+  );
+
   const { registerInit, setAccountState, setError, isReady, isSignedIn, accountId, error } =
     useWalletUserAdapter();
 
@@ -73,20 +86,30 @@ const WalletProvider: React.FC<WalletProviderProps> = ({ children }) => {
     };
   }, [syncWalletState, isReady, handleChange]);
 
+  console.log(referrerAccountIdUrlParameter);
+
   /**
    * Updating referrer account id, if detected
    */
   useEffect(() => {
     if (
       isReady &&
       isSignedIn &&
-      isAccountId(trackedQueryParams.referrerAccountId) &&
-      trackedQueryParams.referrerAccountId !== referrerAccountId &&
-      trackedQueryParams.referrerAccountId !== accountId
+      isAccountId(referrerAccountIdUrlParameter) &&
+      referrerAccountIdUrlParameter !== referrerAccountId &&
+      referrerAccountIdUrlParameter !== accountId
     ) {
-      setReferrerAccountId(trackedQueryParams.referrerAccountId);
+      setReferrerAccountId(referrerAccountIdUrlParameter);
     }
-  }, [accountId, isReady, isSignedIn, referrerAccountId, setReferrerAccountId, trackedQueryParams]);
+  }, [
+    accountId,
+    isReady,
+    isSignedIn,
+    referrerAccountId,
+    referrerAccountIdUrlParameter,
+    setReferrerAccountId,
+    trackedQueryParams,
+  ]);
 
   return children;
 };

src/common/wallet/model.ts

@@ -9,7 +9,7 @@ export type WalletUserDaoRepresentativeParams =
   | { isDaoRepresentative: true; daoAccountId: AccountId };
 
 export type WalletUserMetadata = {
-  referrerAccountId?: string;
+  referrerAccountId?: AccountId;
 };
 
 export type WalletUserSession = WalletUserMetadata &
@@ -51,7 +51,7 @@ export type WalletUserSession = WalletUserMetadata &
   );
 
 interface WalletUserMetadataState extends WalletUserMetadata {
-  setReferrerAccountId: (recipientAccountId: string | undefined) => void;
+  setReferrerAccountId: (accountId: AccountId | undefined) => void;
   reset: () => void;
 }
 

src/entities/pot/hooks/forms.ts

@@ -9,7 +9,7 @@ import { potContractClient } from "@/common/contracts/core/pot";
 import { challengeResolveSchema, challengeSchema } from "../models/schemas";
 import { ChallengeInputs, ChallengeResolveInputs } from "../models/types";
 
-export const useChallengeForm = ({ potDetail }: { potDetail: Pot; referrerId?: string }) => {
+export const useChallengeForm = ({ potDetail }: { potDetail: Pot }) => {
   const form = useForm<ChallengeInputs>({
     resolver: zodResolver(challengeSchema),
   });

src/features/donation/hooks/redirects.ts

@@ -22,7 +22,9 @@ export const useDonationSuccessWalletRedirect = () => {
 
   const transactionHash =
     (Array.isArray(transactionHashes) ? transactionHashes.at(-1) : undefined) ??
-    (typeof transactionHashes === "string" ? transactionHashes : undefined);
+    (typeof transactionHashes === "string" && transactionHashes.length > 0
+      ? transactionHashes
+      : undefined);
 
   const isTransactionOutcomeDetected =
     transactionHash && Boolean(recipientAccountId ?? potAccountId);

src/features/matching-pool-contribution/components/MatchingPoolContributionModal.tsx

@@ -1,4 +1,3 @@
-import { useRouter } from "next/router";
 import { Form } from "react-hook-form";
 
 import { Pot } from "@/common/api/indexer";
@@ -15,8 +14,8 @@ import {
   Spinner,
   Textarea,
 } from "@/common/ui/layout/components";
+import { useWalletUserSession } from "@/common/wallet";
 import { AccountProfileLink } from "@/entities/_shared/account";
-import { useGlobalStoreSelector } from "@/store";
 
 import { useMatchingPoolContributionForm } from "../hooks/forms";
 
@@ -31,25 +30,14 @@ export const MatchingPoolContributionModal: React.FC<MatchingPoolContributionMod
   onCloseClick,
   potDetail,
 }) => {
-  const { actAsDao, accountId } = useGlobalStoreSelector((state) => state.nav);
+  const viewer = useWalletUserSession();
 
-  const router = useRouter();
-  const query = router.query as { referrerId?: string };
-  const referrerId = query.referrerId;
-
-  // AccountID (Address)
-  const asDao = actAsDao.toggle && !!actAsDao.defaultAddress;
-
-  // Form settings
   const { form, errors, onSubmit, inProgress } = useMatchingPoolContributionForm({
-    accountId: asDao ? actAsDao.defaultAddress : accountId,
-    asDao,
     potDetail,
-    referrerId,
   });
 
   const hasMinimumAmount = ["0", "1"].includes(potDetail.min_matching_pool_donation_amount);
-  const yoctoMinimumAmout = yoctoNearToFloat(potDetail.min_matching_pool_donation_amount);
+  const yoctoMinimumAmount = yoctoNearToFloat(potDetail.min_matching_pool_donation_amount);
 
   // Get Protocol Config
   const protocolConfig = useProtocolConfig(potDetail);
@@ -70,7 +58,7 @@ export const MatchingPoolContributionModal: React.FC<MatchingPoolContributionMod
     ? 0
     : (formValues.amountNEAR * potDetail.chef_fee_basis_points) / 10_000 || 0;
 
-  const referrerFeeAmountNear = referrerId
+  const referrerFeeAmountNear = viewer.referrerAccountId
     ? (formValues.amountNEAR * potDetail.referral_fee_matching_pool_basis_points) / 10_000 || 0
     : 0;
 
@@ -89,7 +77,7 @@ export const MatchingPoolContributionModal: React.FC<MatchingPoolContributionMod
             {/*NEAR Input */}
             <p className="my-2 break-words text-[16px] font-normal leading-[20px] text-[#525252]">
               Enter matching pool contribution amount in NEAR{" "}
-              {hasMinimumAmount ? "(no minimum)" : `(Min. ${yoctoMinimumAmout})`}
+              {hasMinimumAmount ? "(no minimum)" : `(Min. ${yoctoMinimumAmount})`}
             </p>
 
             {/* Amount NEAR input */}
@@ -183,7 +171,7 @@ export const MatchingPoolContributionModal: React.FC<MatchingPoolContributionMod
             )}
 
             {/* Referrer Fee */}
-            {referrerId && (
+            {viewer.referrerAccountId && (
               <p className="mt-3 flex flex-row items-center break-words text-[14px] font-normal leading-[20px] text-[#292929]">
                 Referrer fee: {referrerFeeAmountNear} NEAR
               </p>
@@ -203,11 +191,16 @@ export const MatchingPoolContributionModal: React.FC<MatchingPoolContributionMod
               {inProgress ? (
                 <Spinner />
               ) : (
-                <>
-                  {asDao ? "Create proposal to contribute " : "Contribute "}
-                  {!asDao &&
-                    `${formValues.amountNEAR || 0} ${potDetail.base_currency?.toUpperCase()} to matching pool`}
-                </>
+                <span className="inline-flex gap-1">
+                  <span>
+                    {viewer.isDaoRepresentative ? "Create proposal to contribute" : "Contribute"}
+                  </span>
+
+                  <span>
+                    {`${formValues.amountNEAR || 0} ${potDetail.base_currency?.toUpperCase()}` +
+                      " to matching pool"}
+                  </span>
+                </span>
               )}
             </Button>
           </div>

src/features/matching-pool-contribution/hooks/forms.ts

@@ -8,20 +8,13 @@ import { Pot } from "@/common/api/indexer";
 import { naxiosInstance } from "@/common/blockchains/near-protocol/client";
 import { FIFTY_TGAS, FULL_TGAS, MIN_PROPOSAL_DEPOSIT_FALLBACK, ONE_TGAS } from "@/common/constants";
 import { getDaoPolicy } from "@/common/contracts/sputnik-dao";
+import { useWalletUserSession } from "@/common/wallet";
 
 import { MatchingPoolContributionInputs, matchingPoolFundingSchema } from "../model/schemas";
 
-export const useMatchingPoolContributionForm = ({
-  accountId,
-  potDetail,
-  referrerId,
-  asDao,
-}: {
-  accountId: string;
-  potDetail: Pot;
-  referrerId?: string;
-  asDao: boolean;
-}) => {
+export const useMatchingPoolContributionForm = ({ potDetail }: { potDetail: Pot }) => {
+  const viewer = useWalletUserSession();
+
   const form = useForm<MatchingPoolContributionInputs>({
     resolver: zodResolver(matchingPoolFundingSchema),
     mode: "all",
@@ -34,7 +27,7 @@ export const useMatchingPoolContributionForm = ({
       const args = {
         message: formData.data.message,
         matching_pool: true,
-        referrer_id: referrerId,
+        referrer_id: viewer.referrerAccountId,
         bypass_protocol_fee: formData.data.bypassProtocolFee,
         custom_chef_fee_basis_points: formData.data.bypassChefFee ? 0 : undefined,
       };
@@ -68,35 +61,39 @@ export const useMatchingPoolContributionForm = ({
       try {
         setInProgress(true);
 
-        if (asDao) {
-          // If Dao, get dao policy
-          const daoPolicy = await getDaoPolicy(accountId);
+        if (viewer.isDaoRepresentative) {
+          const daoPolicy = await getDaoPolicy(viewer.daoAccountId);
 
           await naxiosInstance
-            .contractApi({ contractId: accountId }) // INFO: In this case, the accountId has daoAddress value
+            .contractApi({ contractId: viewer.daoAccountId })
             .call("add_proposal", {
               args: daoTransactionArgs,
               deposit: daoPolicy?.proposal_bond || MIN_PROPOSAL_DEPOSIT_FALLBACK,
               gas: FULL_TGAS,
               callbackUrl,
             });
         } else {
-          await naxiosInstance
-            .contractApi({ contractId: potDetail.account }) // INFO: In this case, the accountId is a regular pot account
-            .call("donate", {
-              args,
-              deposit: parseNearAmount(formData.data.amountNEAR.toString()) || "0",
-              gas: ONE_TGAS.mul(100).toString(),
-              callbackUrl,
-            });
+          await naxiosInstance.contractApi({ contractId: potDetail.account }).call("donate", {
+            args,
+            deposit: parseNearAmount(formData.data.amountNEAR.toString()) || "0",
+            gas: ONE_TGAS.mul(100).toString(),
+            callbackUrl,
+          });
         }
       } catch (e) {
         console.error(e);
       } finally {
         setInProgress(false);
       }
     },
-    [accountId, asDao, potDetail, referrerId],
+
+    [
+      potDetail.account,
+      potDetail.name,
+      viewer.daoAccountId,
+      viewer.isDaoRepresentative,
+      viewer.referrerAccountId,
+    ],
   );
 
   return {

src/features/pot-application/hooks/forms.ts

@@ -25,7 +25,6 @@ export const usePotApplicationForm = ({
 }: {
   accountId: string;
   potDetail: Pot;
-  referrerId?: string;
   asDao: boolean;
 }) => {
   const form = useForm<PotApplicationInputs>({

src/features/pot-configuration/hooks/middlewares.ts

@@ -17,7 +17,9 @@ export const usePotDeploymentSuccessMiddleware = () => {
 
   const transactionHash =
     (Array.isArray(transactionHashes) ? transactionHashes.at(-1) : undefined) ??
-    (typeof transactionHashes === "string" ? transactionHashes : undefined);
+    (typeof transactionHashes === "string" && transactionHashes.length > 0
+      ? transactionHashes
+      : undefined);
 
   const isTransactionOutcomeDetected = transactionHash !== undefined;
 

src/layout/pot/components/layout-hero.tsx

@@ -68,7 +68,7 @@ export const PotLayoutHero: React.FC<PotLayoutHeroProps> = ({
   );
 
   const referrerPotLink = viewer.isSignedIn
-    ? window.location.origin + window.location.pathname + `?referrerId=${viewer.accountId}`
+    ? window.location.origin + window.location.pathname + `?referrerAccountId=${viewer.accountId}`
     : null;
 
   const [description, linkedDocumentUrl] = useMemo(() => {

src/layout/profile/components/summary.tsx

@@ -36,7 +36,7 @@ const Linktree: React.FC<ByAccountId> = ({ accountId }) => {
         <CopyToClipboard
           text={
             window.location.origin +
-            `${rootPathnames.PROFILE}/${accountId}?referrerId=${viewer.accountId}`
+            `${rootPathnames.PROFILE}/${accountId}?referrerAccountId=${viewer.accountId}`
           }
           onCopy={() => {
             setCopied(true);