From 2afbc827c97f4302e28df5ff66d0fbccb16a6b22 Mon Sep 17 00:00:00 2001 From: Fernando Date: Wed, 5 May 2021 12:15:44 -0300 Subject: [PATCH 1/7] (Feature) Add PR Template (#2212) * create PULL_REQUEST_TEMPLATE.md * Update checklist * remove `documentation` from checklist --- .github/PULL_REQUEST_TEMPLATE.md | 39 ++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..0e239c55 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,39 @@ + + + + +**What**: + + + +**Why**: + + + +**How**: + + + +**How to test it**: + + + +**Checklist**: + + + + + +- [ ] Tests added/updated +- [ ] TypeScript definitions updated +- [ ] Ready to be merged + + + From f6c41244758a0c036c9b36f978e62661df43998d Mon Sep 17 00:00:00 2001 From: Mati Dastugue Date: Wed, 5 May 2021 12:30:44 -0300 Subject: [PATCH 2/7] Revert "Bugfix - Submit button out of screen in Contract Interaction modal (#2185)" (#2256) This reverts commit 4cca3cf0ed9f1185cde91fde74c9bf430ae3c554. --- src/components/Modal/index.tsx | 3 --- .../Balances/SendModal/screens/ContractInteraction/style.ts | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/components/Modal/index.tsx b/src/components/Modal/index.tsx index cebf2b75..5a6dcc33 100644 --- a/src/components/Modal/index.tsx +++ b/src/components/Modal/index.tsx @@ -47,9 +47,6 @@ const ModalStyled = styled(ModalMUI)` &.smaller-modal-window { height: auto; - max-height: 90vh; - overflow: hidden; - overflow-y: auto; } &.modal { diff --git a/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/style.ts b/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/style.ts index 1c273cca..f1498d01 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/style.ts +++ b/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/style.ts @@ -27,9 +27,6 @@ export const styles = createStyles({ formContainer: { padding: `${md} ${lg}`, wordBreak: 'break-word', - maxHeight: '50vh', - overflow: 'hidden', - overflowY: 'auto', }, value: { marginLeft: sm, @@ -51,7 +48,7 @@ export const styles = createStyles({ lineHeight: '1.43', }, buttonRow: { - padding: '25px', + height: '84px', justifyContent: 'center', '& > button': { fontFamily: 'Averta', From 404e54e42d048fe23a04ba585f05ccad5cd94686 Mon Sep 17 00:00:00 2001 From: Mati Dastugue Date: Fri, 7 May 2021 05:53:13 -0300 Subject: [PATCH 3/7] Bugfix - Add Recipient name on Send Fund's second step modal (#2255) * Set recipient name if it is selected from addressBook * Remove unnecesary console.log + some improvements --- .../Balances/SendModal/screens/ReviewSendFundsTx/index.tsx | 2 ++ .../components/Balances/SendModal/screens/SendFunds/index.tsx | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/routes/safe/components/Balances/SendModal/screens/ReviewSendFundsTx/index.tsx b/src/routes/safe/components/Balances/SendModal/screens/ReviewSendFundsTx/index.tsx index 9faccdfa..ce32578b 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/ReviewSendFundsTx/index.tsx +++ b/src/routes/safe/components/Balances/SendModal/screens/ReviewSendFundsTx/index.tsx @@ -42,6 +42,7 @@ const { nativeCoin } = getNetworkInfo() export type ReviewTxProp = { recipientAddress: string + recipientName?: string amount: string txRecipient: string token: string @@ -218,6 +219,7 @@ const ReviewSendFundsTx = ({ onClose, onPrev, tx }: ReviewTxProps): React.ReactE { - const submitValues = values + const submitValues = { ...values } // If the input wasn't modified, there was no mutation of the recipientAddress if (!values.recipientAddress) { submitValues.recipientAddress = selectedEntry?.address } + submitValues.recipientName = selectedEntry?.name onReview({ ...submitValues, tokenSpendingLimit }) } From fd0d7686f252a91137757465241e791145850dae Mon Sep 17 00:00:00 2001 From: katspaugh Date: Mon, 10 May 2021 09:20:23 +0200 Subject: [PATCH 4/7] Bump to 3.6.0 (#2273) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5c62839b..47fe0369 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "safe-react", - "version": "3.5.2", + "version": "3.6.0", "description": "Allowing crypto users manage funds in a safer way", "website": "https://github.com/gnosis/safe-react#readme", "bugs": { From 19cea9dd89cce1339562de69f4f80d740762b442 Mon Sep 17 00:00:00 2001 From: katspaugh Date: Mon, 10 May 2021 10:38:08 +0200 Subject: [PATCH 5/7] Rm Flow from the readme (#2271) --- readme.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/readme.md b/readme.md index 460b31bd..fab1323f 100644 --- a/readme.md +++ b/readme.md @@ -4,7 +4,7 @@ The most trusted platform to store digital assets on Ethereum. More info at [gno This repository contains the code for the frontend code hosted at [https://gnosis-safe.io/app/] -Besides Ethereum Mainnet, the following networks are supported: +Besides the Ethereum Mainnet, the following networks are supported: - [Rinkeby Testnet](https://rinkeby.gnosis-safe.io/app/) - [xDai](https://xdai.gnosis-safe.io/app/) @@ -21,7 +21,7 @@ These instructions will get you a copy of the project up and running on your loc ### Prerequisites -What things you need to install globally: +What you need to install globally: ``` yarn global add truffle ganache-cli @@ -31,19 +31,17 @@ We use [yarn](https://yarnpkg.com) in our infrastacture, so we decided to go wit ### Installing and running -A step by step series of examples that tell you have to get a development env running - Install dependencies for the project: ``` yarn install ``` -For using the Rinkeby services: +To use the Rinkeby services: ``` yarn start ``` -If you prefer using Mainnet ones: +If you prefer using the Mainnet ones: ``` yarn start-mainnet ``` @@ -141,7 +139,6 @@ We prepare a new release every sprint. Sprints are two weeks long. * [React](https://reactjs.org/) - A JS library for building user interfaces * [Material UI 4.X](https://material-ui.com/) - React components that implement Google's Material Design * [redux, immutable, reselect, final-form](https://redux.js.org/) - React ecosystem libraries -* [Flow](https://flow.org/) - Static Type Checker ## Contributing From a6cdde07f538679c529a4669201fdbe23c112ae9 Mon Sep 17 00:00:00 2001 From: nicolas Date: Mon, 10 May 2021 05:50:18 -0300 Subject: [PATCH 6/7] Remove TS definition from checklist (#2268) --- .github/PULL_REQUEST_TEMPLATE.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 0e239c55..4340026f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -32,7 +32,6 @@ merge of your pull request! - [ ] Tests added/updated -- [ ] TypeScript definitions updated - [ ] Ready to be merged From d89976874193b32a80e54384001504e789c1c0c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 May 2021 12:41:54 +0200 Subject: [PATCH 7/7] Bump hosted-git-info from 2.8.8 to 2.8.9 (#2270) Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9. - [Release notes](https://github.com/npm/hosted-git-info/releases) - [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md) - [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2d08a9c5..8ba924fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11419,9 +11419,9 @@ hoopy@^0.1.4: integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ== hosted-git-info@^2.1.4: - version "2.8.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" - integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== hosted-git-info@^3.0.6, hosted-git-info@^3.0.8: version "3.0.8"