From 823fc40f7d60e3e3352472682bfbee85fee829a2 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Wed, 27 May 2020 10:10:13 -0300
Subject: [PATCH] refactor: simplify safe's fields selectors

---
 src/routes/safe/store/selectors/index.ts | 34 +++++++-----------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/routes/safe/store/selectors/index.ts b/src/routes/safe/store/selectors/index.ts
index b4401245..4a63a9dc 100644
--- a/src/routes/safe/store/selectors/index.ts
+++ b/src/routes/safe/store/selectors/index.ts
@@ -167,37 +167,23 @@ export const safeBalancesSelector = createSelector(safeSelector, (safe) => {
   return safe.balances
 })
 
-export const safeNameSelector = createSelector(safeSelector, (safe) => {
-  return safe ? safe.name : undefined
-})
+export const safeFieldSelector = (field) => (safe) => safe?.[field]
 
-export const safeEthBalanceSelector = createSelector(safeSelector, (safe) => {
-  return safe ? safe.ethBalance : undefined
-})
+export const safeNameSelector = createSelector(safeSelector, safeFieldSelector('name'))
 
-export const safeNeedsUpdateSelector = createSelector(safeSelector, (safe) => {
-  return safe ? safe.needsUpdate : undefined
-})
+export const safeEthBalanceSelector = createSelector(safeSelector, safeFieldSelector('ethBalance'))
 
-export const safeCurrentVersionSelector = createSelector(safeSelector, (safe) => {
-  return safe ? safe.currentVersion : undefined
-})
+export const safeNeedsUpdateSelector = createSelector(safeSelector, safeFieldSelector('needsUpdate'))
 
-export const safeThresholdSelector = createSelector(safeSelector, (safe) => {
-  return safe ? safe.threshold : undefined
-})
+export const safeCurrentVersionSelector = createSelector(safeSelector, safeFieldSelector('currentVersion'))
 
-export const safeNonceSelector = createSelector(safeSelector, (safe) => {
-  return safe ? safe.nonce : undefined
-})
+export const safeThresholdSelector = createSelector(safeSelector, safeFieldSelector('threshold'))
 
-export const safeOwnersSelector = createSelector(safeSelector, (safe) => {
-  return safe ? safe.owners : undefined
-})
+export const safeNonceSelector = createSelector(safeSelector, safeFieldSelector('nonce'))
 
-export const safeFeaturesEnabledSelector = createSelector(safeSelector, (safe) => {
-  return safe ? safe.featuresEnabled : undefined
-})
+export const safeOwnersSelector = createSelector(safeSelector, safeFieldSelector('owners'))
+
+export const safeFeaturesEnabledSelector = createSelector(safeSelector, safeFieldSelector('featuresEnabled'))
 
 export const getActiveTokensAddressesForAllSafes = createSelector(safesListSelector, (safes) => {
   const addresses = Set().withMutations((set) => {