From b73177ad06e2f48eb067c08eff1e76cc1e46b5ae Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <sebastinez@me.com>
Date: Tue, 2 Nov 2021 10:29:51 +0100
Subject: [PATCH] Refactor Token type into utils

Signed-off-by: Sebastian Martinez <sebastinez@me.com>
---
 src/base/orgs/View.svelte |  3 +--
 src/utils.ts              | 12 +++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/base/orgs/View.svelte b/src/base/orgs/View.svelte
index 24bc51179..73cf6460f 100644
--- a/src/base/orgs/View.svelte
+++ b/src/base/orgs/View.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import type { SvelteComponent } from 'svelte';
   import type { Config } from '@app/config';
-  import type { BigNumber } from "ethers";
   import { formatName, explorerLink } from '@app/utils';
   import { session } from '@app/session';
   import Loading from '@app/Loading.svelte';
@@ -45,7 +44,7 @@
   const transferOwnership = () => {
     transferOwnerForm = TransferOwnership;
   };
-  $: getOrgTreasury = async (org: Org): Promise<Array<{ name: string; symbol: string; logo: string; decimals: number; balance: BigNumber }>| undefined> => {
+  $: getOrgTreasury = async (org: Org): Promise<Array<utils.Token>| undefined> => {
     const addressType = await utils.identifyAddress(org.owner, config);
     // We query the org treasury only for Gnosis Safes, to maintain some privacy for EOA org owners.
     if (addressType === utils.AddressType.Safe) {
diff --git a/src/utils.ts b/src/utils.ts
index 988ea28b9..d2dc15c7d 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -31,6 +31,14 @@ export interface SafeTransaction {
     operation: number;
 }
 
+export interface Token {
+  name: string;
+  symbol: string;
+  logo: string;
+  decimals: number;
+  balance: BigNumber;
+}
+
 export async function isReverseRecordSet(address: string, domain: string, config: Config): Promise<boolean> {
   const name = await config.provider.lookupAddress(address);
   return name === domain;
@@ -379,9 +387,7 @@ export async function getOwnerSafes(owner: string, config: Config): Promise<stri
 }
 
 // Get token balances for an address.
-export async function getTokens(address: string, config: Config):
-  Promise<Array<{ name: string; symbol: string; decimals: number; logo: string; balance: BigNumber }>>
-{
+export async function getTokens(address: string, config: Config): Promise<Array<Token>> {
   const userBalances = await config.provider.send("alchemy_getTokenBalances", [address, "DEFAULT_TOKENS"]);
   const balances = userBalances.tokenBalances.filter((token: any) => {
     // alchemy_getTokenBalances sometimes returns 0x and this does not work well with ethers.BigNumber