From a600f041074eaca3690223b08a30c643e6f57625 Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Fri, 11 Jun 2021 12:00:53 +0200 Subject: [PATCH] Improve address equality checking --- src/base/orgs/View.svelte | 2 +- src/base/registrations/View.svelte | 3 ++- src/utils.ts | 6 +++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/base/orgs/View.svelte b/src/base/orgs/View.svelte index 1bf2dd275..a6ea04046 100644 --- a/src/base/orgs/View.svelte +++ b/src/base/orgs/View.svelte @@ -45,7 +45,7 @@ $: label = name && parseEnsLabel(name, config); $: isOwner = (org: Org): boolean => { - return org.owner === ($session && $session.address); + return $session ? utils.isAddressEqual(org.owner, $session.address) : false; }; diff --git a/src/base/registrations/View.svelte b/src/base/registrations/View.svelte index 45307f497..ff7df4e70 100644 --- a/src/base/registrations/View.svelte +++ b/src/base/registrations/View.svelte @@ -10,6 +10,7 @@ import type { Field } from '@app/Form.svelte'; import { assert } from '@app/error'; import Error from '@app/Error.svelte'; + import { isAddressEqual } from '@app/utils'; import { getRegistration } from './registrar'; import type { EnsRecord } from './resolver'; @@ -78,7 +79,7 @@ }; $: isOwner = (registration: Registration): boolean => { - return registration.owner === ($session && $session.address); + return $session ? isAddressEqual(registration.owner, $session.address) : false; }; diff --git a/src/utils.ts b/src/utils.ts index 26d090687..31b2c388b 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -18,12 +18,16 @@ export interface Safe { threshold: number; } +export function isAddressEqual(left: string, right: string): boolean { + return left.toLowerCase() === right.toLowerCase(); +} + export function formatBalance(n: BigNumber): string { return ethers.utils.commify(parseFloat(ethers.utils.formatUnits(n)).toFixed(2)); } export function formatAddress(addr: string): string { - return formatHash(addr); + return formatHash(ethers.utils.getAddress(addr)); } export function formatHash(hash: string): string {