From e7c012d5d13278bb0b9562951fc5e55d6a865331 Mon Sep 17 00:00:00 2001
From: Mikhail Mikheev <mmvsha73@gmail.com>
Date: Tue, 23 Jun 2020 17:33:57 +0400
Subject: [PATCH] Fix addressbook type errors

---
 src/logic/addressBook/model/addressBook.ts            |  8 +++++++-
 .../store/actions/loadAddressBookFromStorage.ts       | 11 ++++++-----
 src/logic/addressBook/utils/index.ts                  |  7 ++++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/logic/addressBook/model/addressBook.ts b/src/logic/addressBook/model/addressBook.ts
index fb4fd19f..f051fe18 100644
--- a/src/logic/addressBook/model/addressBook.ts
+++ b/src/logic/addressBook/model/addressBook.ts
@@ -1,6 +1,12 @@
 import { Record } from 'immutable'
 
-export const makeAddressBookEntry = Record({
+export interface AddressBookEntryProps {
+  address: string
+  name: string
+  isOwner: boolean
+}
+
+export const makeAddressBookEntry = Record<AddressBookEntryProps>({
   address: '',
   name: '',
   isOwner: false,
diff --git a/src/logic/addressBook/store/actions/loadAddressBookFromStorage.ts b/src/logic/addressBook/store/actions/loadAddressBookFromStorage.ts
index 20cfe570..88009c78 100644
--- a/src/logic/addressBook/store/actions/loadAddressBookFromStorage.ts
+++ b/src/logic/addressBook/store/actions/loadAddressBookFromStorage.ts
@@ -1,4 +1,4 @@
-import { List, Map } from 'immutable'
+import { List } from 'immutable'
 
 import { loadAddressBook } from 'src/logic/addressBook/store/actions/loadAddressBook'
 import { buildAddressBook } from 'src/logic/addressBook/store/reducer/addressBook'
@@ -8,11 +8,12 @@ import { safesListSelector } from 'src/routes/safe/store/selectors'
 const loadAddressBookFromStorage = () => async (dispatch, getState) => {
   try {
     const state = getState()
-    let addressBook = await getAddressBookFromStorage()
-    if (!addressBook) {
-      addressBook = Map([])
+    let storedAdBk = await getAddressBookFromStorage()
+    if (!storedAdBk) {
+      storedAdBk = []
     }
-    addressBook = buildAddressBook(addressBook)
+
+    let addressBook = buildAddressBook(storedAdBk)
     // Fetch all the current safes, in case that we don't have a safe on the adbk, we add it
     const safes = safesListSelector(state)
     const adbkEntries = addressBook.keySeq().toArray()
diff --git a/src/logic/addressBook/utils/index.ts b/src/logic/addressBook/utils/index.ts
index b0131480..7fb48374 100644
--- a/src/logic/addressBook/utils/index.ts
+++ b/src/logic/addressBook/utils/index.ts
@@ -1,11 +1,12 @@
 import { loadFromStorage, saveToStorage } from 'src/utils/storage'
+import { AddressBookEntryProps } from './../model/addressBook'
 
 const ADDRESS_BOOK_STORAGE_KEY = 'ADDRESS_BOOK_STORAGE_KEY'
 
-export const getAddressBookFromStorage = async () => {
-  const data = await loadFromStorage(ADDRESS_BOOK_STORAGE_KEY)
+export const getAddressBookFromStorage = async (): Promise<Array<AddressBookEntryProps> | undefined> => {
+  const data = await loadFromStorage<Array<AddressBookEntryProps>>(ADDRESS_BOOK_STORAGE_KEY)
 
-  return data || []
+  return data
 }
 
 export const saveAddressBook = async (addressBook) => {