From ece09442b961c4758b8f1099c2195dade795e9ee Mon Sep 17 00:00:00 2001 From: Daniel Chew Date: Wed, 25 Jan 2023 13:55:15 +0900 Subject: [PATCH 1/3] fix bug where setting new pubkey and reverting the change doesnt reflect properly --- .../xc-admin-frontend/components/tabs/UpdatePermissions.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/governance/xc-admin/packages/xc-admin-frontend/components/tabs/UpdatePermissions.tsx b/governance/xc-admin/packages/xc-admin-frontend/components/tabs/UpdatePermissions.tsx index 58422398b0..58d572aadc 100644 --- a/governance/xc-admin/packages/xc-admin-frontend/components/tabs/UpdatePermissions.tsx +++ b/governance/xc-admin/packages/xc-admin-frontend/components/tabs/UpdatePermissions.tsx @@ -228,6 +228,12 @@ const UpdatePermissions = () => { new: newPubkey, }, }) + } else { + // delete account from pubkeyChanges if it exists + if (pubkeyChanges && pubkeyChanges[account]) { + delete pubkeyChanges[account] + } + setPubkeyChanges(pubkeyChanges) } } From fc8fd7da15a4a325ab6b797e8f81b974ec76677a Mon Sep 17 00:00:00 2001 From: Daniel Chew Date: Wed, 25 Jan 2023 13:57:28 +0900 Subject: [PATCH 2/3] fix bug where switching to cluster with permissionAccount and switching back doesnt show default value --- .../xc-admin-frontend/components/tabs/UpdatePermissions.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/governance/xc-admin/packages/xc-admin-frontend/components/tabs/UpdatePermissions.tsx b/governance/xc-admin/packages/xc-admin-frontend/components/tabs/UpdatePermissions.tsx index 58d572aadc..f23774cbc8 100644 --- a/governance/xc-admin/packages/xc-admin-frontend/components/tabs/UpdatePermissions.tsx +++ b/governance/xc-admin/packages/xc-admin-frontend/components/tabs/UpdatePermissions.tsx @@ -118,6 +118,7 @@ const UpdatePermissions = () => { useState>() useEffect(() => { + console.log(rawConfig) if (rawConfig.permissionAccount) { const masterAuthority = rawConfig.permissionAccount.masterAuthority.toBase58() @@ -139,6 +140,8 @@ const UpdatePermissions = () => { pubkey: securityAuthority, }, ]) + } else { + setData([...DEFAULT_DATA]) } }, [rawConfig]) From c2a635285319406471a5ec0898f30663874b5a33 Mon Sep 17 00:00:00 2001 From: Daniel Chew Date: Wed, 25 Jan 2023 13:59:19 +0900 Subject: [PATCH 3/3] remove console.log --- .../xc-admin-frontend/components/tabs/UpdatePermissions.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/governance/xc-admin/packages/xc-admin-frontend/components/tabs/UpdatePermissions.tsx b/governance/xc-admin/packages/xc-admin-frontend/components/tabs/UpdatePermissions.tsx index f23774cbc8..56678f0db7 100644 --- a/governance/xc-admin/packages/xc-admin-frontend/components/tabs/UpdatePermissions.tsx +++ b/governance/xc-admin/packages/xc-admin-frontend/components/tabs/UpdatePermissions.tsx @@ -118,7 +118,6 @@ const UpdatePermissions = () => { useState>() useEffect(() => { - console.log(rawConfig) if (rawConfig.permissionAccount) { const masterAuthority = rawConfig.permissionAccount.masterAuthority.toBase58()