Merge pull request #19 from paritytech/feat/mobile-crypto-login

Fix: blank screen on settings
paritytech · Mar 14, 2024 · 6408f3d · 6408f3d
2 parents ceb3e3c + c7b3ecd
commit 6408f3d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/modules/users/client/components/MySettings.tsx b/src/modules/users/client/components/MySettings.tsx
@@ -66,6 +66,11 @@ export const MySettings: React.FC = () => {
     if (me) {
       const addresses: Array<string[]> = []
       const linked: Record<string, AuthAddressPair[]> = {}
+      if (!me.authIds || !me.authIds['polkadot']) {
+        setLinkedAccounts({})
+        setLinkedAddresses([])
+        return
+      }
       Object.entries(me.authIds['polkadot']).forEach(
         ([walletName, authAddressPairs]) => {
           linked[formatName(walletName)] = authAddressPairs

diff --git a/src/server/auth/providers/google/helper.ts b/src/server/auth/providers/google/helper.ts
@@ -62,8 +62,8 @@ export const linkPolkadotAccountToExistingUser = async (
         }
 
         await user
-          .addAuthId(AuthProvider.Polkadot, account.meta.source, {
-            name: account.meta.name,
+          .addAuthId(AuthProvider.Polkadot, account.source, {
+            name: account.name,
             address: account.address,
           })
           .save()