2221465267

Committed 25 Apr 2022 04:19PM UTC coverage: 35.66% (+0.05%) from 35.612%

Build Type

github

Committed by GitHub

Commit Message

Merge 5f8ba0dde into c7121a42a

Pull Request Pull Request #3812: fix: show estimation warnings on Safes that require `safeTxGas`

Run Details

1258 of 4464 branches covered (28.18%)

Branch coverage included in aggregate %.

4 of 4 new or added lines in 2 files covered. (100.0%)

13 existing lines in 1 file now uncovered.

3549 of 9016 relevant lines covered (39.36%)

36.14 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

55.0

/src/logic/addressBook/store/reducer/index.ts

import { Action, handleActions } from 'redux-actions'
import uniqWith from 'lodash/uniqWith'

import { AddressBookEntry, AddressBookState } from 'src/logic/addressBook/model/addressBook'
import { ADDRESS_BOOK_ACTIONS } from 'src/logic/addressBook/store/actions'
import { getEntryIndex, hasSameAddressAndChainId, isValidAddressBookName } from 'src/logic/addressBook/utils'
import { textShortener } from 'src/utils/strings'
import { isValidAddress } from 'src/utils/isValidAddress'
import { checksumAddress } from 'src/utils/checksumAddress'

export const ADDRESS_BOOK_REDUCER_ID = 'addressBook'

export const initialAddressBookState: AddressBookState = []

type Payloads = AddressBookEntry | AddressBookState

export const getAddressBookFallbackName = (address: string): string =>
  textShortener({ charsStart: 6, charsEnd: 4 })(address)

export const batchLoadEntries = (state: AddressBookState, action: Action<AddressBookState>): AddressBookState => {
  const newState = [...state]
  // We check that name exist before trimming
  const addressBookEntries = action.payload.map((entry) => ({
    ...entry,
    address: checksumAddress(entry.address) || entry.address,
    name: entry.name ? entry.name.trim() : getAddressBookFallbackName(entry.address),
  }))

  addressBookEntries
    .filter(({ address, name }) => {
      const isValid = isValidAddress(address) && isValidAddressBookName(name)

      if (!isValid) {
        console.warn(`We are unable to import the entry for ${name} (${address}) as it is invalid.`)
      }

      return isValid
    })
    .forEach((addressBookEntry) => {
      const entryIndex = getEntryIndex(newState, addressBookEntry)

      if (entryIndex >= 0) {
        // update
        newState[entryIndex] = addressBookEntry
      } else {
        // add
        newState.push(addressBookEntry)
      }
    })

  // filter out potential duplicates in the store
  return uniqWith(newState, hasSameAddressAndChainId)
}

const addressBookReducer = handleActions<AddressBookState, Payloads>(
  {
    [ADDRESS_BOOK_ACTIONS.ADD_OR_UPDATE]: (state, action: Action<AddressBookEntry>) => {
      if (!action.payload.address) return state

      const { address, name } = action.payload

      const newState = [...state]
      const addressBookEntry = { ...action.payload, name: name.trim() || getAddressBookFallbackName(address) }
      const entryIndex = getEntryIndex(newState, addressBookEntry)

      // update
      if (entryIndex >= 0) {
        newState[entryIndex] = addressBookEntry
        return newState
      }

      // add
      return [...newState, addressBookEntry]
    },
    [ADDRESS_BOOK_ACTIONS.REMOVE]: (state, action: Action<AddressBookEntry>) => {
      const newState = [...state]
      const addressBookEntry = action.payload

      const entryIndex = getEntryIndex(newState, addressBookEntry)

      if (entryIndex >= 0) {
        newState.splice(entryIndex, 1)
        return newState
      }

      return newState
    },
    [ADDRESS_BOOK_ACTIONS.SAFE_LOAD]: batchLoadEntries,
    [ADDRESS_BOOK_ACTIONS.IMPORT]: batchLoadEntries,
    [ADDRESS_BOOK_ACTIONS.SYNC]: (_, action: Action<AddressBookState>): AddressBookState => action.payload,
    [ADDRESS_BOOK_ACTIONS.FIX_EMPTY_NAMES]: (state) => {
      if (state.every(({ name }) => Boolean(name))) {
        return state
      }
      return state.map((entry) => ({
        ...entry,
        name: entry.name || getAddressBookFallbackName(entry.address),
      }))
    },
  },
  initialAddressBookState,
)

export default addressBookReducer

1	import { Action, handleActions } from 'redux-actions'
2	import uniqWith from 'lodash/uniqWith'
3
4	import { AddressBookEntry, AddressBookState } from 'src/logic/addressBook/model/addressBook'
5	import { ADDRESS_BOOK_ACTIONS } from 'src/logic/addressBook/store/actions'
6	import { getEntryIndex, hasSameAddressAndChainId, isValidAddressBookName } from 'src/logic/addressBook/utils'
7	import { textShortener } from 'src/utils/strings'
8	import { isValidAddress } from 'src/utils/isValidAddress'
9	import { checksumAddress } from 'src/utils/checksumAddress'
10
11	export const ADDRESS_BOOK_REDUCER_ID = 'addressBook'	38✔
12
13	export const initialAddressBookState: AddressBookState = []	38✔
14
15	type Payloads = AddressBookEntry \| AddressBookState
16
17	export const getAddressBookFallbackName = (address: string): string =>	38✔
18	textShortener({ charsStart: 6, charsEnd: 4 })(address)	5✔
19
20	export const batchLoadEntries = (state: AddressBookState, action: Action<AddressBookState>): AddressBookState => {	38✔
21	const newState = [...state]	8✔
22	// We check that name exist before trimming
23	const addressBookEntries = action.payload.map((entry) => ({	15✔
24	...entry,
25	address: checksumAddress(entry.address) \|\| entry.address,	16✔
26	name: entry.name ? entry.name.trim() : getAddressBookFallbackName(entry.address),	15✔
27	}))
28
29	addressBookEntries	8✔
30	.filter(({ address, name }) => {
31	const isValid = isValidAddress(address) && isValidAddressBookName(name)	15✔
32
33	if (!isValid) {	15✔
34	console.warn(`We are unable to import the entry for ${name} (${address}) as it is invalid.`)	3✔
35	}
36
37	return isValid	15✔
38	})
39	.forEach((addressBookEntry) => {
40	const entryIndex = getEntryIndex(newState, addressBookEntry)	12✔
41
42	if (entryIndex >= 0) {	12✔
43	// update
44	newState[entryIndex] = addressBookEntry	2✔
45	} else {
46	// add
47	newState.push(addressBookEntry)	10✔
48	}
49	})
50
51	// filter out potential duplicates in the store
52	return uniqWith(newState, hasSameAddressAndChainId)	8✔
53	}
54
55	const addressBookReducer = handleActions<AddressBookState, Payloads>(	38✔
56	{
57	[ADDRESS_BOOK_ACTIONS.ADD_OR_UPDATE]: (state, action: Action<AddressBookEntry>) => {
58	if (!action.payload.address) return state	×
59
UNCOV 60	const { address, name } = action.payload	×
61
62	const newState = [...state]	×
UNCOV 63	const addressBookEntry = { ...action.payload, name: name.trim() \|\| getAddressBookFallbackName(address) }	×
UNCOV 64	const entryIndex = getEntryIndex(newState, addressBookEntry)	×
65
66	// update
UNCOV 67	if (entryIndex >= 0) {	×
68	newState[entryIndex] = addressBookEntry	×
UNCOV 69	return newState	×
70	}
71
72	// add
UNCOV 73	return [...newState, addressBookEntry]	×
74	},
75	[ADDRESS_BOOK_ACTIONS.REMOVE]: (state, action: Action<AddressBookEntry>) => {
UNCOV 76	const newState = [...state]	×
UNCOV 77	const addressBookEntry = action.payload	×
78
79	const entryIndex = getEntryIndex(newState, addressBookEntry)	×
80
UNCOV 81	if (entryIndex >= 0) {	×
82	newState.splice(entryIndex, 1)	×
UNCOV 83	return newState	×
84	}
85
UNCOV 86	return newState	×
87	},
88	[ADDRESS_BOOK_ACTIONS.SAFE_LOAD]: batchLoadEntries,
89	[ADDRESS_BOOK_ACTIONS.IMPORT]: batchLoadEntries,
UNCOV 90	[ADDRESS_BOOK_ACTIONS.SYNC]: (_, action: Action<AddressBookState>): AddressBookState => action.payload,	×
91	[ADDRESS_BOOK_ACTIONS.FIX_EMPTY_NAMES]: (state) => {
92	if (state.every(({ name }) => Boolean(name))) {	3!
UNCOV 93	return state	×
94	}
95	return state.map((entry) => ({	4✔
96	...entry,
97	name: entry.name \|\| getAddressBookFallbackName(entry.address),	7✔
98	}))
99	},
100	},
101	initialAddressBookState,
102	)
103
104	export default addressBookReducer

safe-global / safe-react / 2221465267

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous