hardhat

src/components/asset-list/RecyclerAssetList2/Claimable.tsx

@@ -2,7 +2,6 @@ import React from 'react';
 import { Box, Inline, Stack, Text } from '@/design-system';
 import { useAccountSettings, useDimensions } from '@/hooks';
 import { useClaimables } from '@/resources/addys/claimables/query';
-import { getIsHardhatConnected } from '@/handlers/web3';
 import { FasterImageView } from '@candlefinance/faster-image';
 import { ButtonPressAnimation } from '@/components/animations';
 
@@ -12,7 +11,6 @@ export default function Claimable({ uniqueId }: { uniqueId: string }) {
     {
       address: accountAddress,
       currency: nativeCurrency,
-      testnetMode: getIsHardhatConnected(),
     },
     {
       select: data => data?.filter(claimable => claimable.uniqueId === uniqueId),

src/resources/addys/claimables/query.ts

@@ -8,7 +8,8 @@ import { ConsolidatedClaimablesResponse } from './types';
 import { logger, RainbowError } from '@/logger';
 import { parseClaimables } from './utils';
 import { useRemoteConfig } from '@/model/remoteConfig';
-import { CLAIMABLES, OP_REWARDS, useExperimentalFlag } from '@/config';
+import { CLAIMABLES, useExperimentalFlag } from '@/config';
+import { useConnectedToHardhatStore } from '@/state/connectedToHardhat';
 
 const addysHttp = new RainbowFetchClient({
   baseURL: 'https://addys.p.rainbow.me/v3',
@@ -67,13 +68,14 @@ type ClaimablesResult = QueryFunctionResult<typeof claimablesQueryFunction>;
 // Query Hook
 
 export function useClaimables(
-  { address, currency, testnetMode }: ClaimablesArgs,
+  { address, currency }: ClaimablesArgs,
   config: QueryConfigWithSelect<ClaimablesResult, Error, ClaimablesResult, ClaimablesQueryKey> = {}
 ) {
   const { claimables: remoteFlag } = useRemoteConfig();
   const localFlag = useExperimentalFlag(CLAIMABLES);
+  const { connectedToHardhat } = useConnectedToHardhatStore();
 
-  return useQuery(claimablesQueryKey({ address, currency, testnetMode }), claimablesQueryFunction, {
+  return useQuery(claimablesQueryKey({ address, currency, testnetMode: connectedToHardhat }), claimablesQueryFunction, {
     ...config,
     enabled: !!address && (remoteFlag || localFlag),
     staleTime: 1000 * 60 * 2,

src/screens/WalletScreen/index.tsx

@@ -31,7 +31,6 @@ import { UserAssetsSync } from '@/state/sync/UserAssetsSync';
 import { useClaimables } from '@/resources/addys/claimables/query';
 import { MobileWalletProtocolListener } from '@/components/MobileWalletProtocolListener';
 import { runWalletBackupStatusChecks } from '@/handlers/walletReadyEvents';
-import { useConnectedToHardhatStore } from '@/state/connectedToHardhat';
 
 const WalletPage = styled(Page)({
   ...position.sizeAsObject('100%'),
@@ -46,9 +45,8 @@ const WalletScreen: React.FC<any> = ({ navigation, route }) => {
   const [initialized, setInitialized] = useState(!!params?.initialized);
   const initializeWallet = useInitializeWallet();
   const { network: currentNetwork, accountAddress, appIcon, nativeCurrency } = useAccountSettings();
-  const { connectedToHardhat } = useConnectedToHardhatStore();
   usePositions({ address: accountAddress, currency: nativeCurrency });
-  useClaimables({ address: accountAddress, currency: nativeCurrency, testnetMode: connectedToHardhat });
+  useClaimables({ address: accountAddress, currency: nativeCurrency });
 
   const loadAccountLateData = useLoadAccountLateData();
   const loadGlobalLateData = useLoadGlobalLateData();