Use stored tx subjects when fetching them

src/routes/safe/store/actions/fetchTransactions.js

@@ -6,6 +6,7 @@ import { makeOwner } from '~/routes/safe/store/model/owner'
 import { makeTransaction, type Transaction, type TransactionProps } from '~/routes/safe/store/model/transaction'
 import { load, TX_KEY } from '~/utils/localStorage'
 import { type Confirmation, type ConfirmationProps, makeConfirmation } from '~/routes/safe/store/model/confirmation'
+import { loadSafeSubjects } from '~/utils/localStorage/transactions'
 import addTransactions from './addTransactions'
 
 export const loadSafeTransactions = () => {
@@ -14,10 +15,13 @@ export const loadSafeTransactions = () => {
   return Map().withMutations((map: Map<string, List<Confirmation>>) =>
     Object.keys(safes).map((safe: string) => {
       const safeTxs = safes[safe]
+      const safeSubjects = loadSafeSubjects(safe)
       const safeTxsRecord = safeTxs.map((tx: TransactionProps) => {
         const { confirmations } = tx
+        const name = safeSubjects.get(String(tx.nonce)) || 'Unknown'
         const txRecord = makeTransaction({
           ...tx,
+          name,
           confirmations: List(confirmations.map((conf: ConfirmationProps) =>
             makeConfirmation({ ...conf, owner: makeOwner(conf.owner) }))),
         })

src/test/safe.service.transactions.test.js

@@ -29,7 +29,7 @@ describe('Transactions Suite', () => {
     if (!secondOwner) { throw new Error() }
   })
 
-  it('adds first confirmation to stored safe', async () => {
+  it('adds first transaction to stored safe', async () => {
     // GIVEN
     const txName = 'Buy butteries for project'
     const nonce: number = 10
@@ -49,7 +49,7 @@ describe('Transactions Suite', () => {
     testTransactionFrom(safeTransactions, 0, txName, nonce, value, 2, destination, EMPTY_DATA, 'foo', 'confirmationHash', owners.get(0), owners.get(1))
   })
 
-  it('adds second confirmation to stored safe with one confirmation', async () => {
+  it('adds second transaction to stored safe with one transaction', async () => {
     // GIVEN
     const firstTxName = 'Buy butteries for project'
     const firstNonce: number = Date.now()
@@ -77,7 +77,7 @@ describe('Transactions Suite', () => {
     testTransactionFrom(safeTxs, 1, secondTxName, secondNonce, value, 2, destination, EMPTY_DATA, 'foo', 'confirmationHash', owners.get(0), owners.get(1))
   })
 
-  it('adds second confirmation to stored safe having two safes with one confirmation each', async () => {
+  it('adds second transaction to stored safe having two safes with one transaction each', async () => {
     const txName = 'Buy batteris for Alplha project'
     const nonce = 10
     const safeAddress = safe.address
@@ -113,7 +113,7 @@ describe('Transactions Suite', () => {
     const txConfirmations: List<Confirmation> = buildConfirmationsFrom(owners, creator, 'secondConfirmationHash')
     storeTransaction(
       txFirstName, txFirstNonce, destination, value, creator,
-      txConfirmations, '', safe.get('address'), safe.get('threshold'), EMPTY_DATA,
+      txConfirmations, '', safeAddress, safe.get('threshold'), EMPTY_DATA,
     )
 
     transactions = loadSafeTransactions()

src/utils/localStorage/transactions.js

@@ -6,10 +6,10 @@ const getSubjectKeyFrom = (safeAddress: string) => `TXS-SUBJECTS-${safeAddress}`
 
 export const storeSubject = (safeAddress: string, nonce: number, subject: string) => {
   const key = getSubjectKeyFrom(safeAddress)
-  const subjects = load(key) || Map()
+  const subjects = Map(load(key)) || Map()
 
   try {
-    const updatedSubjects = subjects.setIn([safeAddress, String(nonce)], subject)
+    const updatedSubjects = subjects.set(nonce, subject)
     const serializedState = JSON.stringify(updatedSubjects)
     localStorage.setItem(key, serializedState)
   } catch (err) {
@@ -17,3 +17,10 @@ export const storeSubject = (safeAddress: string, nonce: number, subject: string
     console.log('Error storing transaction subject in localstorage')
   }
 }
+
+export const loadSafeSubjects = (safeAddress: string): Map<string, string> => {
+  const key = getSubjectKeyFrom(safeAddress)
+  const data: any = load(key)
+
+  return data ? Map(data) : Map()
+}

src/wallets/createTransactions.js

@@ -59,7 +59,7 @@ export const storeTransaction = (
   // store subject in local storage (for testing it the actual name should be '')
 
   const transaction: Transaction = makeTransaction({
-    name, nonce, value, confirmations, destination, threshold: safeThreshold, tx, data,
+    name: '', nonce, value, confirmations, destination, threshold: safeThreshold, tx, data,
   })
 
   const safeTransactions = load(TX_KEY) || {}