fix conflict

ui/marketplace/MarketplaceAppAlert.tsx

@@ -4,16 +4,12 @@ import React from 'react';
 import type { IconName } from 'ui/shared/IconSvg';
 import IconSvg from 'ui/shared/IconSvg';
 
-import useMarketplaceWallet from './useMarketplaceWallet';
-
 type Props = {
   internalWallet: boolean | undefined;
+  isWalletConnected: boolean;
 }
 
-const MarketplaceAppAlert = ({ internalWallet }: Props) => {
-  const { address } = useMarketplaceWallet();
-  const isWalletConnected = Boolean(address);
-
+const MarketplaceAppAlert = ({ internalWallet, isWalletConnected }: Props) => {
   const message = React.useMemo(() => {
     let icon: IconName = 'wallet';
     let text = 'Connect your wallet to Blockscout for full-featured access';

ui/marketplace/MarketplaceAppTopBar.tsx

@@ -16,9 +16,10 @@ import MarketplaceAppInfo from './MarketplaceAppInfo';
 type Props = {
   data: MarketplaceAppOverview | undefined;
   isLoading: boolean;
+  isWalletConnected: boolean;
 }
 
-const MarketplaceAppTopBar = ({ data, isLoading }: Props) => {
+const MarketplaceAppTopBar = ({ data, isLoading, isWalletConnected }: Props) => {
   const appProps = useAppContext();
 
   const goBackUrl = React.useMemo(() => {
@@ -42,7 +43,7 @@ const MarketplaceAppTopBar = ({ data, isLoading }: Props) => {
         </LinkInternal>
       </Tooltip>
       <Skeleton width={{ base: '100%', md: 'auto' }} order={{ base: 4, md: 2 }} isLoaded={ !isLoading }>
-        <MarketplaceAppAlert internalWallet={ data?.internalWallet }/>
+        <MarketplaceAppAlert internalWallet={ data?.internalWallet } isWalletConnected={ isWalletConnected }/>
       </Skeleton>
       <Skeleton order={{ base: 2, md: 3 }} isLoaded={ !isLoading }>
         <MarketplaceAppInfo data={ data }/>

ui/pages/MarketplaceApp.tsx

@@ -140,7 +140,7 @@ const MarketplaceApp = () => {
 
   return (
     <>
-      <MarketplaceAppTopBar data={ data } isLoading={ isPending }/>
+      <MarketplaceAppTopBar data={ data } isLoading={ isPending } isWalletConnected={ Boolean(address) }/>
       <DappscoutIframeProvider
         address={ address }
         appUrl={ data?.url }