From 286751e714da5552e06962bc87c885768cc601d2 Mon Sep 17 00:00:00 2001 From: Fernando Date: Mon, 9 Mar 2020 13:06:40 -0300 Subject: [PATCH] Rebase master into development (#647) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * 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 * Bug: #482 - Address book Custom transactions Recipient validation (#577) * (fix) text input bottom border * Fix #482 input * Merge branch 'development' of https://github.com/gnosis/safe-react into fix/#482-address-book # Conflicts: # src/components/forms/TextField/index.jsx # src/routes/safe/components/Balances/SendModal/screens/AddressBookInput/index.jsx # src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.jsx # src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.jsx # yarn.lock * Fix custom tx addresses filtering * Merge branch 'development' of https://github.com/gnosis/safe-react into fix/#482-address-book # Conflicts: # yarn.lock * Remove console logs Fixed prettier issues * Remove unnecessary template string * Fix `tokenAddress` string conversion * Use `secondaryBackground` value Co-authored-by: Gabriel Rodríguez Alsina Co-authored-by: Fernando * (feature) Adding origin for Apps Transactions (#576) * Adding origin field when creates a TX * refactor: replace list of arg by object in getApprovalTransaction and getExecutionTransaction function * minor changes * Allow execute if threshold is 1 for the first tx - Related to issue #563 - `lastTx` is required due to #489 * - Normalizing logic between createTransaction and processTransaction - Moving shared function to a new file * Refactor `doesTxNeedApproval` back to the `isExecution`-related meaning * Rename function and variable names * Add tests for `getNewTxNonce` and `shouldExecuteTransaction` functions * Pass `safeInstance` instead of `safeAddress` to `getNewTxNonce` * Update Tests - remove mocked `getGnosisSafeInstanceAt` - pass `safeInstance` instead of `safeAddress` to `getNewTxNonce` Co-authored-by: Fernando * (Feature) Add checks into CI (#594) * Repare new dev and staging enviroments to deploy (#618) * Repare new dev and staging enviroments to deploy - Add to `deploy_pull_requests.sh` to the new path. - Replace upload-dir to deploy staging to the new path. * add /app/ public path for the webapp, remove duplicate yarn build from travis * add basename to app * deploy pr to /app * update travis * linter error fixes * fix travis build script Co-authored-by: David Albela Pérez <3659067+davidalbela@users.noreply.github.com> * (fix) sidebar contents' scrolling (#622) * (add) linter sorting rules (#614) * (add) linter sorting rules * (fix) linting errors according to the new rules Co-authored-by: Fernando * (feature): [Safe Apps] App Transaction List Details (#601) * Adding IconText component * Get origin for TXs in Redux * Adding Icon and name app to transaction list * Fix customTx condition * Fix HTML element for text * simplify condition * Bug: Accounts/Network are not updated in production build (#625) * Adding Apps info to toast notification (#621) * Adding APP_Name for APPs TXs in toast messages * refactor: save appId instead of appName in origin field * adding fallback icon and message to TX apps table * review changes * review fixes * force build * update Apps list info (#629) * update Apps list info * fix * Feature: replace web3connect with onboardjs (#456) * init onboard.js * dep bump * initial replacement of web3connect with onboard.js * use averta font in the modal * update onboard.js, add handlers for session murder * update preferred wallets * implement reconnecting to injected provider * fix duplicate wallet disconnected notification * update onboard dep * onboardjs fixes * test onboard js with hw * add https to rpcUrl * Added saved wallet and transactions validation * made Transactions validation * bnc-onboard version updated * Fix lock/unlock problem * bump onboardjs version * fixed material-ui lab version * Update onboard version * Added hw wallets integration * Updated preferred wallets * Add ledger modal * Merge with dev * Update onboard * BUmp new version of onboardjs * Added some logs * Added some logs * Update onboardjs version fix ledger connection * Update onboardjs version fix ledger connection * Bump new onboardjs version * Update new version * Made improvements * yarn.lock regenration * remove https=true * Remove comments and added some improvements * Updated package.json dep * Removed unused deps * Remove web3connect dep Co-authored-by: lukasschor Co-authored-by: Mati Dastugue * Passing ethBalance to Apps component (#636) * (Fix) Update safe modal verbiage (#633) * Fixs verbiage in update safe modal * Fixs yarn lock * Bump dependencies (#639) * Use hash history (#638) * 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) * use hash history Co-authored-by: Fernando Co-authored-by: Agustin Pane * - Updates how the transactions are ordered, now orders by nonce and then by date (#640) * (Fix) Lowercased safes address in URL (#631) * Return checksummed addrress from `safeParamAddressFromState` selector * Update `yarn.lock` * Remove redundant `toChecksumAddress` call Co-authored-by: Mikhail Mikheev Co-authored-by: Mikhail Mikheev Co-authored-by: Agustin Pane Co-authored-by: Gabriel Rodríguez Alsina Co-authored-by: nicolas Co-authored-by: David Albela Pérez <3659067+davidalbela@users.noreply.github.com> Co-authored-by: lukasschor Co-authored-by: Mati Dastugue Co-authored-by: francovenica --- config/travis/deploy_release.sh | 4 +++- package.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/travis/deploy_release.sh b/config/travis/deploy_release.sh index 6c6c706938..1299e76c80 100755 --- a/config/travis/deploy_release.sh +++ b/config/travis/deploy_release.sh @@ -18,5 +18,7 @@ then REVIEW_RELEASE_FOLDER="$REPO_NAME_ALPHANUMERIC/$TRAVIS_TAG_ALPHANUMERIC" # Deploy safe-team release project - aws s3 sync build_webpack s3://${REVIEW_BUCKET_NAME}/${REVIEW_RELEASE_FOLDER}/app --delete + aws s3 sync build_webpack s3://${REVIEW_BUCKET_NAME}/${REVIEW_RELEASE_FOLDER}/app --delete --exclude "*.html" --exclude "/page-data" --cache-control max-age=31536000,public + + aws s3 sync build_webpack s3://${REVIEW_BUCKET_NAME}/${REVIEW_RELEASE_FOLDER}/app --delete --exclude "*" --include "*.html" --cache-control max-age=0,no-cache,no-store,must-revalidate --content-type text/html fi diff --git a/package.json b/package.json index 77d7f26aa0..4c0ec45a9f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "safe-react", - "version": "1.7.3", + "version": "1.7.6", "description": "Allowing crypto users manage funds in a safer way", "homepage": "https://github.com/gnosis/safe-react#readme", "bugs": {