Sync master dev (#656)

* v1.7.3 (#611) * Fix #597: USD value not load (#609) * Converts all the addresses to checksum values * Fix for empty address * fix the order of transactions, change updateSafe to upgradeSafe to avoid naming confusion with the updateSafe action (#610) * Fix #596: Notification when safe is already updated (#599) * Fix notification of update if the safe is already updated * Makes the notification clickable Displays the notification for owners only * Identify upgrade tx * Add red badge to Settings tab * Fixs Padding Removes the red dot if the user is not an owner Co-authored-by: Fernando <[email protected]> Co-authored-by: Fernando <[email protected]> Co-authored-by: Agustin Pane <[email protected]> * Update package.json (#612) * Add public url to prod webpack config (#615) * add public url to prod webpack config * modify travis/webpack config to add public url * add slash * cherry pick new travis yml merge commit (#620) * V1.7.5 release (#641) * use hash history * update package json * BUG: App index.html cached on production (#642) * remove caching for webapp index.html * keep --delete flag Co-authored-by: Mikhail Mikheev <[email protected]> Co-authored-by: Fernando <[email protected]> Co-authored-by: Agustin Pane <[email protected]>
5afe · Mar 18, 2020 · e165d56 · e165d56
1 parent 7a1900d
commit e165d56
Show file tree

Hide file tree

Showing 5 changed files with 374 additions and 948 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,7 @@ before_install:
   # Install truffle
   - yarn global add truffle
 script:
-  - ./config/travis/build.sh
+  - bash ./config/travis/build.sh
 after_success:
   # Pull Request - Deploy it to a review environment
   # Travis doesn't do deploy step with pull requests builds

diff --git a/config/travis/build.sh b/config/travis/build.sh
@@ -8,7 +8,6 @@ elif [[ "$TRAVIS_BRANCH" == "development" ]]; then
     export NODE_ENV=development;
 fi
 
-
 yarn lint:check
 yarn prettier:check
 yarn build
diff --git a/src/routes/safe/components/Transactions/TxsTable/TxType/index.jsx b/src/routes/safe/components/Transactions/TxsTable/TxType/index.jsx
@@ -36,5 +36,4 @@ const TxType = ({ origin, txType }: { txType: TransactionType, origin: string |
 
   return <IconText iconUrl={iconUrl} text={text} />
 }
-
 export default TxType
diff --git a/src/routes/safe/store/selectors/index.js b/src/routes/safe/store/selectors/index.js
@@ -165,8 +165,10 @@ export const safeSelector: OutputSelector<GlobalState, RouterProps, SafeSelector
     if (!address) {
       return undefined
     }
+    const checksumed = getWeb3().utils.toChecksumAddress(address)
+    const safe = safes.get(checksumed)
 
-    return safes.get(address)
+    return safe
   },
 )