status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add regular and custom txs notifications

This commit is contained in:
Germán Martínez 2019-09-23 10:07:43 +02:00
parent 1b61a0294c
commit f8ba0c6217
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/routes/safe/components/Balances/SendModal/screens/ReviewCustomTx/index.jsx
View File

@ -14,11 +14,11 @@ import Img from '~/components/layout/Img'
import Block from '~/components/layout/Block'
import Identicon from '~/components/Identicon'
import Hairline from '~/components/layout/Hairline'
import { type Variant } from '~/components/Header'
import { copyToClipboard } from '~/utils/clipboard'
import SafeInfo from '~/routes/safe/components/Balances/SendModal/SafeInfo'
import { setImageToPlaceholder } from '~/routes/safe/components/Balances/utils'
import { getWeb3 } from '~/logic/wallets/getWeb3'
import { NOTIFIED_TRANSACTIONS } from '~/logic/safe/transactions'
import { getEthAsToken } from '~/logic/tokens/utils/tokenHelpers'
import ArrowDown from '../assets/arrow-down.svg'
import { secondary } from '~/theme/variables'
@ -34,7 +34,8 @@ type Props = {
ethBalance: string,
tx: Object,
createTransaction: Function,
enqueueSnackbar: (message: string, variant: Variant) => void,
enqueueSnackbar: Function,
closeSnackbar: Function,
}
const openIconStyle = {
@ -53,6 +54,7 @@ const ReviewCustomTx = ({
tx,
createTransaction,
enqueueSnackbar,
closeSnackbar,
}: Props) => {
const submitTx = async () => {
const web3 = getWeb3()
@ -60,7 +62,15 @@ const ReviewCustomTx = ({
const txData = tx.data
const txValue = tx.value ? web3.utils.toWei(tx.value, 'ether') : 0
createTransaction(safeAddress, txRecipient, txValue, txData, enqueueSnackbar)
createTransaction(
safeAddress,
txRecipient,
txValue,
txData,
NOTIFIED_TRANSACTIONS.STANDARD_TX,
enqueueSnackbar,
closeSnackbar
)
onClose()
}

16
src/routes/safe/components/Balances/SendModal/screens/ReviewTx/index.jsx
View File

@ -15,12 +15,12 @@ import Block from '~/components/layout/Block'
import Identicon from '~/components/Identicon'
import { copyToClipboard } from '~/utils/clipboard'
import Hairline from '~/components/layout/Hairline'
import { type Variant } from '~/components/Header'
import SafeInfo from '~/routes/safe/components/Balances/SendModal/SafeInfo'
import { setImageToPlaceholder } from '~/routes/safe/components/Balances/utils'
import { getStandardTokenContract } from '~/logic/tokens/store/actions/fetchTokens'
import { EMPTY_DATA } from '~/logic/wallets/ethTransactions'
import { getWeb3 } from '~/logic/wallets/getWeb3'
import { NOTIFIED_TRANSACTIONS } from '~/logic/safe/transactions'
import ArrowDown from '../assets/arrow-down.svg'
import { secondary } from '~/theme/variables'
import { isEther } from '~/logic/tokens/utils/tokenHelpers'
@ -36,7 +36,8 @@ type Props = {
ethBalance: string,
tx: Object,
createTransaction: Function,
enqueueSnackbar: (message: string, variant: Variant) => void,
enqueueSnackbar: Function,
closeSnackbar: Function,
}
const openIconStyle = {
@ -55,6 +56,7 @@ const ReviewTx = ({
tx,
createTransaction,
enqueueSnackbar,
closeSnackbar,
}: Props) => {
const submitTx = async () => {
const web3 = getWeb3()
@ -74,7 +76,15 @@ const ReviewTx = ({
txAmount = 0
}
createTransaction(safeAddress, txRecipient, txAmount, txData, enqueueSnackbar)
createTransaction(
safeAddress,
txRecipient,
txAmount,
txData,
NOTIFIED_TRANSACTIONS.STANDARD_TX,
enqueueSnackbar,
closeSnackbar,
)
onClose()
}