From c7b3ecdbfc581c61972102b813e505389dc42f9f Mon Sep 17 00:00:00 2001
From: Daria Mikhailova <daria@parity.io>
Date: Wed, 13 Mar 2024 16:34:13 +1300
Subject: [PATCH] fix: blank screen on settings

---
 src/modules/users/client/components/MySettings.tsx | 5 +++++
 src/server/auth/providers/google/helper.ts         | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/modules/users/client/components/MySettings.tsx b/src/modules/users/client/components/MySettings.tsx
index 73ef3ae2..bdecfacb 100644
--- 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
index 1c186100..914638d7 100644
--- 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()