refactor: update BuyCredits loader and RegenRoutes to use activeWalletAddr

Author: r41ph

web-marketplace/src/clients/regen/Regen.Routes.tsx

@@ -12,6 +12,7 @@ import { Router } from '@remix-run/router';
 import * as Sentry from '@sentry/react';
 import { QueryClient } from '@tanstack/react-query';
 
+import { Maybe } from 'generated/graphql';
 import { ApolloClientFactory } from 'lib/clients/apolloClientFactory';
 import { useWallet } from 'lib/wallet/wallet';
 
@@ -101,13 +102,13 @@ export const RegenRoutes = ({
   reactQueryClient,
   apolloClientFactory,
 }: RouterProps) => {
-  const { wallet } = useWallet();
+  const { activeWalletAddr } = useWallet();
   return (
     <RouterProvider
       router={getRegenRouter({
         reactQueryClient,
         apolloClientFactory,
-        address: wallet?.address,
+        address: activeWalletAddr,
       })}
       fallbackElement={<PageLoader />}
     />
@@ -117,7 +118,7 @@ export const RegenRoutes = ({
 type RouterParams = {
   reactQueryClient: QueryClient;
   apolloClientFactory: ApolloClientFactory;
-  address?: string;
+  address?: Maybe<string>;
 };
 
 export const getRegenRoutes = ({

web-marketplace/src/pages/BuyCredits/BuyCredits.loader.ts

@@ -3,16 +3,11 @@ import { SellOrderInfo } from '@regen-network/api/lib/generated/regen/ecocredit/
 import { QueryClient } from '@tanstack/react-query';
 import { getDefaultStore } from 'jotai';
 
+import { Maybe } from 'generated/graphql';
 import { selectedLanguageAtom } from 'lib/atoms/languageSwitcher.atoms';
 import { ApolloClientFactory } from 'lib/clients/apolloClientFactory';
 import { getMarketplaceQueryClient } from 'lib/clients/regen/ecocredit/marketplace/marketplaceQueryClient';
 import { getSellOrdersExtendedQuery } from 'lib/queries/react-query/ecocredit/marketplace/getSellOrdersExtendedQuery/getSellOrdersExtendedQuery';
-import { GET_ACCOUNTS_QUERY_KEY } from 'lib/queries/react-query/registry-server/getAccounts/getAccountsQuery.constants';
-import {
-  Accounts,
-  PrivateAccount,
-} from 'lib/queries/react-query/registry-server/getAccounts/getAccountsQuery.types';
-import { getAccountByIdQuery } from 'lib/queries/react-query/registry-server/graphql/getAccountByIdQuery/getAccountByIdQuery';
 import { getProjectBySlugQuery } from 'lib/queries/react-query/registry-server/graphql/getProjectBySlugQuery/getProjectBySlugQuery';
 import { getFromCacheOrFetch } from 'lib/queries/react-query/utils/getFromCacheOrFetch';
 
@@ -21,7 +16,7 @@ import { getIsOnChainId } from 'components/templates/ProjectDetails/ProjectDetai
 type LoaderType = {
   queryClient: QueryClient;
   apolloClientFactory: ApolloClientFactory;
-  address: string | undefined;
+  address?: Maybe<string>;
 };
 /**
  * Loader function for the Buy Credits page that checks if there are available
@@ -40,33 +35,6 @@ export const buyCreditsLoader =
     const marketplaceClient = await getMarketplaceQueryClient();
     const atomStore = getDefaultStore();
     const selectedLanguage = atomStore.get(selectedLanguageAtom);
-    let currentActiveAddress = address;
-
-    if (!currentActiveAddress) {
-      const data = (await getFromCacheOrFetch({
-        query: { queryKey: [GET_ACCOUNTS_QUERY_KEY] },
-        reactQueryClient: queryClient,
-      })) as Accounts | null | undefined;
-
-      const activeAccountId = data?.activeAccountId;
-      const privAuthenticatedAccounts = data?.authenticatedAccounts;
-
-      const authenticatedAccountsResult = await getAuthenticatedAccounts({
-        privAuthenticatedAccounts,
-        client: apolloClient,
-        languageCode: selectedLanguage,
-        queryClient,
-      });
-
-      const authenticatedAccounts = authenticatedAccountsResult.map(
-        result => result?.accountById,
-      );
-
-      const activeAccount = authenticatedAccounts.find(
-        account => account?.id === activeAccountId,
-      );
-      currentActiveAddress = activeAccount?.addr ?? undefined;
-    }
 
     const sellOrdersQuery = getSellOrdersExtendedQuery({
       client: marketplaceClient,
@@ -95,41 +63,10 @@ export const buyCreditsLoader =
 
     const availableSellOrders = allSellOrders?.filter(
       (sellOrder: SellOrderInfo) =>
-        sellOrder.seller !== currentActiveAddress &&
+        sellOrder.seller !== address &&
         projectId &&
         sellOrder.batchDenom?.startsWith(projectId),
     );
 
     return !!availableSellOrders?.length;
   };
-
-async function getAuthenticatedAccounts({
-  privAuthenticatedAccounts,
-  client,
-  languageCode,
-  queryClient,
-}: {
-  privAuthenticatedAccounts: PrivateAccount[] | undefined;
-  client: ApolloClient<NormalizedCacheObject>;
-  languageCode: string;
-  queryClient: QueryClient;
-}) {
-  if (!privAuthenticatedAccounts?.length) return [];
-
-  const accounts = await Promise.all(
-    privAuthenticatedAccounts.map(({ id }) => {
-      const query = getAccountByIdQuery({
-        client,
-        id,
-        languageCode,
-      });
-
-      return queryClient.fetchQuery({
-        queryKey: query.queryKey,
-        queryFn: query.queryFn,
-      });
-    }),
-  );
-
-  return accounts;
-}