Merge branch 'development' of github.com:gnosis/safe-react into release-3.6.0

This commit is contained in:
katspaugh 2021-05-10 09:21:09 +02:00
commit 26dbc6dfb5
3 changed files with 44 additions and 1 deletions

39
.github/PULL_REQUEST_TEMPLATE.md vendored Normal file
View File

@ -0,0 +1,39 @@
<!--
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
- [ ] TypeScript definitions 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 -->

View File

@ -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)}

View File

@ -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 })
}