From 068205a8a150ebb39e83913c59fd43e1ce5069ab Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Sat, 8 May 2021 20:59:25 +0200 Subject: [PATCH] Org profile improvements --- src/base/orgs/Org.ts | 10 +++---- src/base/orgs/Profile.svelte | 52 +++++++++++++++++++++--------------- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/src/base/orgs/Org.ts b/src/base/orgs/Org.ts index ee46a66b9..c288a8c7a 100644 --- a/src/base/orgs/Org.ts +++ b/src/base/orgs/Org.ts @@ -1,6 +1,7 @@ import * as ethers from 'ethers'; import type { TransactionReceipt, TransactionResponse } from '@ethersproject/providers'; import type { ContractReceipt } from '@ethersproject/contracts'; +import { assert } from '@app/error'; import type { Config } from '@app/config'; @@ -16,6 +17,8 @@ export class Org { safe: string constructor(address: string, safe: string) { + assert(ethers.utils.isAddress(address), "address must be valid"); + this.address = address; this.safe = safe; } @@ -24,10 +27,6 @@ export class Org { return await config.provider.lookupAddress(this.address); } - async resolveName(config: Config): Promise { - return await config.provider.resolveName(this.address); - } - static fromReceipt(receipt: ContractReceipt): Org | null { let event = receipt.events?.find(e => e.event === 'OrgCreated'); @@ -49,10 +48,11 @@ export class Org { orgAbi, config.provider ); + const resolved = await org.resolvedAddress; try { let safe = await org.owner(); - return new Org(address, safe); + return new Org(resolved, safe); } catch (e) { console.error(e); return null; diff --git a/src/base/orgs/Profile.svelte b/src/base/orgs/Profile.svelte index 1bdaaed17..ce57efa3f 100644 --- a/src/base/orgs/Profile.svelte +++ b/src/base/orgs/Profile.svelte @@ -18,37 +18,47 @@ }; + + {#await Org.get(address, config)} - + {:then org} {#if org}

- {org.address} + {address}

- - - - - - - -
Address{org.address}
Safe{org.safe}
Name - {#await org.lookupAddress(config)} - - {:then name} - {#if name} - {name} - {:else} - Not registered - {/if} - {/await} -
+
+
Address
{org.address}
+
Safe
{org.safe}
+
Name
+
+ {#await org.lookupAddress(config)} + + {:then name} + {#if name} + {name} + {:else} + Not registered + {/if} + {/await} +
+
{:else} 🏜️ - Sorry, {address} is not an Org address. + Sorry, {address} does not resolve to an Org address.