fix: reconnect when switching wallet (#376)

package.json

@@ -13,7 +13,7 @@
     "@sentry/react": "^7.64.0",
     "@typechain/ethers-v5": "^10.0.0",
     "connected-react-router": "^6.9.1",
-    "decentraland-dapps": "^22.0.0",
+    "decentraland-dapps": "^22.1.0",
     "decentraland-transactions": "^2.6.0",
     "decentraland-ui": "^6.1.0",
     "decentraland-ui2": "^0.0.2",

src/components/ProtectedRoute/ProtectedRoute.container.ts

@@ -1,14 +1,17 @@
 import { connect } from 'react-redux'
+import { localStorageGetIdentity } from '@dcl/single-sign-on-client'
 import { getData as getWallet, isConnected, isConnecting } from 'decentraland-dapps/dist/modules/wallet/selectors'
 import { RootState } from '../../modules/reducer'
 import ProtectedRoute from './ProtectedRoute'
 import { MapStateProps } from './ProtectedRoute.types'
 
 const mapState = (state: RootState): MapStateProps => {
+  const wallet = getWallet(state)
+  const identity = wallet ? localStorageGetIdentity(wallet?.address) : null
+
   return {
-    wallet: getWallet(state),
     isConnecting: isConnecting(state),
-    isConnected: isConnected(state)
+    isConnected: isConnected(state) && !!identity
   }
 }
 

src/components/ProtectedRoute/ProtectedRoute.tsx

@@ -4,11 +4,10 @@ import { locations } from '../../modules/locations'
 import { Props } from './ProtectedRoute.types'
 
 const ProtectedRoute = (props: Props) => {
-  const { isConnecting, wallet, isConnected, ...rest } = props
-
+  const { isConnecting, isConnected, ...rest } = props
   const { pathname, search } = useLocation()
 
-  if (!isConnecting && !wallet && !isConnected) {
+  if (!isConnecting && !isConnected) {
     return <Redirect to={locations.signIn(`${pathname}${search}`)} />
   }
 

src/components/ProtectedRoute/ProtectedRoute.types.ts

@@ -1,10 +1,8 @@
 import { RouteProps } from 'react-router-dom'
-import { Wallet } from 'decentraland-dapps/dist/modules/wallet/types'
 
 export type Props = RouteProps & {
   isConnected: boolean
   isConnecting: boolean
-  wallet: Wallet | null
 }
 
-export type MapStateProps = Pick<Props, 'wallet' | 'isConnecting' | 'isConnected'>
+export type MapStateProps = Pick<Props, 'isConnecting' | 'isConnected'>

src/components/SignInPage/SignInPage.container.ts

@@ -1,14 +1,19 @@
 import { connect } from 'react-redux'
-import { isConnected, isConnecting } from 'decentraland-dapps/dist/modules/wallet/selectors'
+import { localStorageGetIdentity } from '@dcl/single-sign-on-client'
+import { getData as getWallet, isConnected, isConnecting } from 'decentraland-dapps/dist/modules/wallet/selectors'
 import { getIsAuthDappEnabled } from '../../modules/features/selectors'
 import { RootState } from '../../modules/reducer'
 import SignInPage from './SignInPage'
 import { MapStateProps } from './SignInPage.types'
 
-const mapState = (state: RootState): MapStateProps => ({
-  isAuthDappEnabled: !!getIsAuthDappEnabled(state),
-  isConnecting: isConnecting(state),
-  isConnected: isConnected(state)
-})
+const mapState = (state: RootState): MapStateProps => {
+  const wallet = getWallet(state)
+  const identity = wallet ? localStorageGetIdentity(wallet?.address) : null
+  return {
+    isAuthDappEnabled: !!getIsAuthDappEnabled(state),
+    isConnecting: isConnecting(state),
+    isConnected: isConnected(state) && !!identity
+  }
+}
 
 export default connect(mapState)(SignInPage)