update packages, fix initial wagmi state

local_modules/wallet/config.ts

@@ -55,16 +55,9 @@ const wagmiConfig = createConfig({
     [chiliz.id]: http(constants.rpcByChains[chiliz.id]),
     [spicy.id]: http(constants.rpcByChains[spicy.id]),
   },
-  connectors: [
-    injectedConnector,
-    walletConnectConnector,
-  ],
-  ssr: true,
+  ssr: false,
   syncConnectedChain: true,
   multiInjectedProviderDiscovery: true,
-  storage: createStorage({
-    storage: cookieStorage,
-  }),
 })
 
 declare module 'wagmi' {

local_modules/wallet/utils/useWallet.ts

@@ -1,12 +1,14 @@
 'use client'
 
+import { usePrivy } from '@privy-io/react-auth'
 import { useChains } from 'wagmi'
 import { useAccount } from '@azuro-org/sdk-social-aa-connector'
 import { ConnectorName } from 'wallet'
 
 
 export const useWallet = () => {
-  const { address, connector, isConnected, isConnecting, isReconnecting, chain, chainId, isAAWallet } = useAccount()
+  const { authenticated, user } = usePrivy()
+  const { address, connector, isConnected, isConnecting, isReconnecting, chain, chainId, isAAWallet, isReady } = useAccount()
   const chains = useChains()
 
   const isWalletConnect = connector?.name === ConnectorName.WalletConnect
@@ -19,8 +21,9 @@ export const useWallet = () => {
     chainId,
     isConnected,
     isConnecting,
-    isReconnecting,
+    isReconnecting: isReconnecting || !isReady || (authenticated && !address),
     isWalletConnect,
     isAAWallet,
+    isReady,
   }
 }

next.config.mjs

@@ -15,10 +15,6 @@ const nextConfig = {
 
     config.externals.push('pino-pretty', 'lokijs', 'encoding')
 
-    if (config.name === 'client') {
-      config.target = [ 'web', 'es7' ]
-    }
-
     config.plugins.push(
       new webpack.DefinePlugin({
         '__CLIENT__': !isServer,

package.json

@@ -16,9 +16,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.11.1",
-    "@azuro-org/dictionaries": "^3.0.20",
-    "@azuro-org/sdk": "^5.3.0",
-    "@azuro-org/sdk-social-aa-connector": "^1.0.0",
+    "@azuro-org/dictionaries": "^3.0.21",
+    "@azuro-org/sdk": "^5.3.2",
+    "@azuro-org/sdk-social-aa-connector": "^1.0.4",
     "@floating-ui/react-dom-interactions": "^0.13.3",
     "@glidejs/glide": "^3.6.2",
     "@headlessui/react": "1.7.19",

src/app/profile/page.tsx

@@ -9,14 +9,14 @@ import User from 'compositions/profile/User/User'
 
 
 export default function ProfilePage() {
-  const { account, isReconnecting } = useWallet()
+  const { account, isConnecting, isReconnecting } = useWallet()
   const router = useRouter()
 
   useEffect(() => {
-    if (!isReconnecting && !account) {
+    if (!isConnecting && !isReconnecting && !account) {
       router.push('/')
     }
-  }, [ isReconnecting, account ])
+  }, [ isConnecting, isReconnecting, account ])
 
   if (!account) {
     return null

src/compositions/PageLayout/components/Content/components/Header/Header.tsx

@@ -3,7 +3,7 @@
 import React, { useEffect, useRef, useState } from 'react'
 import { usePathname } from 'next/navigation'
 // import { openModal } from '@locmod/modal'
-import { useAccount } from '@azuro-org/sdk-social-aa-connector'
+import { useWallet } from 'wallet'
 import { usePrivy } from '@privy-io/react-auth'
 import { useFreezeBodyScroll } from 'hooks'
 
@@ -27,9 +27,9 @@ const Content: React.FC = () => {
 }
 
 const Header: React.FC = () => {
-  const { address } = useAccount()
+  const { account, isReconnecting, isConnecting } = useWallet()
   const pathname = usePathname()
-  const { connectOrCreateWallet, ready } = usePrivy()
+  const { connectOrCreateWallet } = usePrivy()
   const [ isVisible, setVisibility ] = useState(false)
   const containerRef = useRef<HTMLDivElement>(null)
 
@@ -72,14 +72,14 @@ const Header: React.FC = () => {
           <Logo className="h-4" />
         </div>
         {
-          Boolean(address) ? (
+          Boolean(account) ? (
             <Controls />
           ) : (
             <Button
               className="ml-auto"
               title={buttonMessages.connectWallet}
               size={32}
-              loading={!ready}
+              loading={isConnecting || isReconnecting}
               onClick={() => connectOrCreateWallet()}
             />
           )

src/compositions/PageLayout/components/Content/components/RightSidebar/RightSidebar.tsx

@@ -1,10 +1,9 @@
 'use client'
 
 import React from 'react'
-
 // import { openModal } from '@locmod/modal'
-import { useAccount } from '@azuro-org/sdk-social-aa-connector'
 import { usePrivy } from '@privy-io/react-auth'
+import { useWallet } from 'wallet'
 
 import { Button, buttonMessages } from 'components/inputs'
 import TabbedBetslip from 'compositions/TabbedBetslip/TabbedBetslip'
@@ -13,21 +12,21 @@ import Controls from '../Controls/Controls'
 
 
 const RightSidebar: React.FC = () => {
-  const { address } = useAccount()
-  const { connectOrCreateWallet, ready } = usePrivy()
+  const { account, isReconnecting, isConnecting } = useWallet()
+  const { connectOrCreateWallet } = usePrivy()
 
   return (
     <>
       <div className="px-6 py-3 sticky top-0 z-20">
         {
-          Boolean(address) ? (
+          Boolean(account) ? (
             <Controls className="ml-auto" />
           ) : (
             <Button
               className="ml-auto"
               title={buttonMessages.connectWallet}
               size={40}
-              loading={!ready}
+              loading={isConnecting || isReconnecting}
               onClick={() => connectOrCreateWallet()}
             />
           )