Fix after merge

src/components/chats/hooks/useTokenGatedRequirement.ts

@@ -8,13 +8,20 @@ import { ExternalTokenChain } from '@/services/datahub/generated-query'
 import { getBalanceQuery } from '@/services/datahub/leaderboard/points-balance/query'
 import { useMyMainAddress } from '@/stores/my-account'
 import { convertToBigInt } from '@/utils/strings'
+import { IdentityProvider } from '@subsocial/data-hub-sdk'
 
 type HasToLinkWallet = 'Solana' | 'Ethereum' | undefined
 
 export default function useTokenGatedRequirement(
   contentContainer?: ContentContainer
 ) {
-  const { evmAddress, isLoading: loadingAddress } = useLinkedEvmAddress()
+  const { identityAddress, isLoading: loadingAddress } = useLinkedEvmAddress(
+    undefined,
+    { enabled: true },
+    contentContainer?.externalToken?.chain === ExternalTokenChain.Ethereum
+      ? IdentityProvider.EVM
+      : IdentityProvider.SOLANA
+  )
 
   const externalTokenRequirement = convertToBigInt(
     contentContainer?.accessThresholdExternalTokenAmount ?? 0
@@ -44,7 +51,7 @@ export default function useTokenGatedRequirement(
   let hasToLinkWallet: HasToLinkWallet
   if (externalTokenRequirement > 0) {
     const tokenChain = contentContainer?.externalToken?.chain
-    if (tokenChain === ExternalTokenChain.Ethereum && !evmAddress) {
+    if (tokenChain === ExternalTokenChain.Ethereum && !identityAddress) {
       hasToLinkWallet = 'Ethereum'
       // TODO: validate solana address
     } else if (tokenChain === ExternalTokenChain.Solana) {

src/modules/telegram/AirdropPage/solana.tsx

@@ -1,16 +1,13 @@
+import Button, { ButtonProps } from '@/components/Button'
 import { env } from '@/env.mjs'
 import { useEncryptData } from '@/services/api/mutation'
 import { useMyAccount, useMyMainAddress } from '@/stores/my-account'
 import { useQuery } from '@tanstack/react-query'
 
-export default function SolanaButton() {
-  const url = useGetSolanaWalletUrl()
+export default function SolanaButton(props: ButtonProps) {
+  const { url, isLoading } = useGetSolanaWalletUrl()
 
-  return (
-    <LinkText href={url} className='break-all'>
-      Open Solana
-    </LinkText>
-  )
+  return <Button {...props} isLoading={isLoading} href={url} />
 }
 
 export const useGetSolanaWalletUrl = () => {
@@ -35,5 +32,5 @@ export const useGetSolanaWalletUrl = () => {
     params
   ).toString()}`
 
-  return url
+  return { url, isLoading }
 }

src/modules/telegram/MenuPage/index.tsx

@@ -187,9 +187,8 @@ function MyAccountPageContent({ setPage }: ContentProps) {
 type ModalChain = 'evm' | 'solana'
 
 function MyCryptoAddressesContent({ setPage }: ContentProps) {
-  const myAddress = useMyMainAddress()
   const [modalKind, setModalKind] = useState<ModalChain>()
-  const solanaWalletUrl = useGetSolanaWalletUrl()
+  const { url: solanaWalletUrl } = useGetSolanaWalletUrl()
   const router = useRouter()
   const [isOpenUseMobileModal, setIsOpenUseMobileModal] = useState(false)
   const [openEvmConnectWalletModal, setOpenEvmConnectWalletModal] =