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

fix transactions not displaying for 1 owners/threshold safe

This commit is contained in:
mmv 2019-07-11 17:32:59 +04:00
parent e02925f5b3
commit 53dd7b0582
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/layout/Button/index.jsx
View File

@ -7,6 +7,7 @@ type Props = {
minHeight?: number,
rounded?: boolean,
testId?: string,
style?: Object,
}
const calculateStyleBased = (minWidth, minHeight, rounded) => ({
@ -16,11 +17,11 @@ const calculateStyleBased = (minWidth, minHeight, rounded) => ({
})
const GnoButton = ({
minWidth, minHeight = 27, testId = '', rounded, ...props
minWidth, minHeight = 27, testId = '', rounded, style = {}, ...props
}: Props) => {
const style = calculateStyleBased(minWidth, minHeight, rounded)
const calculatedStyle = calculateStyleBased(minWidth, minHeight, rounded)
return <Button style={style} data-testid={testId} {...props} />
return <Button style={{ ...calculatedStyle, ...style }} data-testid={testId} {...props} />
}
export default GnoButton

4
src/routes/safe/store/actions/fetchTransactions.js
View File

@ -14,7 +14,7 @@ import { EMPTY_DATA } from '~/logic/wallets/ethTransactions'
import { addTransactions } from './addTransactions'
import { getHumanFriendlyToken } from '~/logic/tokens/store/actions/fetchTokens'
import { isAddressAToken } from '~/logic/tokens/utils/tokenHelpers'
import { TX_TYPE_EXECUTION, TX_TYPE_CONFIRMATION } from '~/logic/safe/transactions/send'
import { TX_TYPE_EXECUTION } from '~/logic/safe/transactions/send'
import { decodeParamsFromSafeMethod } from '~/logic/contracts/methodIds'
let web3
@ -54,7 +54,7 @@ const buildTransactionFrom = async (safeAddress: string, tx: TxServiceModel, saf
)
const modifySettingsTx = tx.to === safeAddress
const isTokenTransfer = await isAddressAToken(tx.to)
const creationTxHash = confirmations.findLast(conf => conf.type === TX_TYPE_CONFIRMATION).hash
const creationTxHash = confirmations.last().hash
let executionTxHash
const executionTx = confirmations.find(conf => conf.type === TX_TYPE_EXECUTION)