Merge branch 'development' into upgrade-web3
This commit is contained in:
commit
22b2d03973
|
@ -0,0 +1,38 @@
|
|||
<!--
|
||||
Thanks for your interest in the project. Bugs filed and PRs submitted are appreciated!
|
||||
|
||||
This PR template was copied from https://github.com/testing-library/react-testing-library/blob/main/.github/PULL_REQUEST_TEMPLATE.md
|
||||
|
||||
Please fill out the information below to expedite the review and (hopefully)
|
||||
merge of your pull request!
|
||||
-->
|
||||
|
||||
<!-- What changes are being made? (What feature/bug is being fixed here?) -->
|
||||
|
||||
**What**:
|
||||
|
||||
<!-- Why are these changes necessary? -->
|
||||
|
||||
**Why**:
|
||||
|
||||
<!-- How were these changes implemented? -->
|
||||
|
||||
**How**:
|
||||
|
||||
<!-- Have you done all of these things? -->
|
||||
|
||||
**How to test it**:
|
||||
|
||||
<!-- If applicable, add the steps to test your changes -->
|
||||
|
||||
**Checklist**:
|
||||
|
||||
<!-- add "N/A" to the end of each line that's irrelevant to your changes -->
|
||||
|
||||
<!-- to check an item, place an "x" in the box like so: "- [x] Documentation" -->
|
||||
|
||||
- [ ] Tests added/updated
|
||||
- [ ] Ready to be merged
|
||||
<!-- In your opinion, is this ready to be merged as soon as it's reviewed? -->
|
||||
|
||||
<!-- feel free to add additional comments -->
|
|
@ -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": {
|
||||
|
|
11
readme.md
11
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
|
||||
|
||||
|
|
|
@ -47,9 +47,6 @@ const ModalStyled = styled(ModalMUI)`
|
|||
|
||||
&.smaller-modal-window {
|
||||
height: auto;
|
||||
max-height: 90vh;
|
||||
overflow: hidden;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
&.modal {
|
||||
|
|
|
@ -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',
|
||||
|
|
|
@ -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
|
|||
<Col xs={12}>
|
||||
<EthHashInfo
|
||||
hash={tx.recipientAddress}
|
||||
name={tx.recipientName}
|
||||
showCopyBtn
|
||||
showAvatar
|
||||
explorerUrl={getExplorerInfo(tx.recipientAddress)}
|
||||
|
|
|
@ -69,6 +69,7 @@ const useStyles = makeStyles(styles)
|
|||
export type SendFundsTx = {
|
||||
amount?: string
|
||||
recipientAddress?: string
|
||||
name?: string
|
||||
token?: string
|
||||
txType?: string
|
||||
tokenSpendingLimit?: SpendingLimit
|
||||
|
@ -133,11 +134,12 @@ const SendFunds = ({
|
|||
|
||||
let tokenSpendingLimit
|
||||
const handleSubmit = (values) => {
|
||||
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 })
|
||||
}
|
||||
|
||||
|
|
|
@ -11409,9 +11409,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"
|
||||
|
|
Loading…
Reference in New Issue