From dd27cd48bf55e65c086a98b4fd02c40c27199f13 Mon Sep 17 00:00:00 2001 From: Richard Meissner Date: Wed, 11 Mar 2020 11:23:16 +0100 Subject: [PATCH] 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 Co-authored-by: Fernando Co-authored-by: Agustin Pane * 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 Co-authored-by: Fernando Co-authored-by: Agustin Pane --- .travis.yml | 2 +- config/travis/build.sh | 1 - .../Transactions/TxsTable/TxType/index.jsx | 1 - src/routes/safe/store/selectors/index.js | 4 +- yarn.lock | 1314 +++++------------ 5 files changed, 374 insertions(+), 948 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1770681..af578168 100644 --- 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 index 8856ebbd..b6c2ab48 100755 --- 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 \ No newline at end of file diff --git a/src/routes/safe/components/Transactions/TxsTable/TxType/index.jsx b/src/routes/safe/components/Transactions/TxsTable/TxType/index.jsx index 27e2cac3..1d8a36aa 100644 --- 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 } - export default TxType diff --git a/src/routes/safe/store/selectors/index.js b/src/routes/safe/store/selectors/index.js index d1fd634b..c07593b1 100644 --- a/src/routes/safe/store/selectors/index.js +++ b/src/routes/safe/store/selectors/index.js @@ -165,8 +165,10 @@ export const safeSelector: OutputSelector