3144181237

Committed 28 Sep 2022 02:05PM UTC coverage: 41.963% (-0.1%) from 42.068%

Build Type

push

github

Committed by GitHub

Commit Message

fix: Display total allocation instead of balance in safe token widget (#4081)

Run Details

1784 of 5244 branches covered (34.02%)

Branch coverage included in aggregate %.

0 of 27 new or added lines in 2 files covered. (0.0%)

50 existing lines in 2 files now uncovered.

4776 of 10389 relevant lines covered (45.97%)

39.07 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

90.0

/src/routes/safe/components/Apps/components/SignMessageModal/index.tsx

import { RequestId, Methods, EIP712TypedData, isObjectEIP712TypedData } from '@gnosis.pm/safe-apps-sdk'
import { ReactElement } from 'react'
import { useSelector } from 'react-redux'
import { hexToUtf8, isHexStrict } from 'web3-utils'

import { getWeb3ReadOnly } from 'src/logic/wallets/getWeb3'
import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
import { getSignMessageLibContractInstance, getSignMessageLibAddress } from 'src/logic/contracts/safeContracts'
import Modal from 'src/components/Modal'
import { SafeApp } from 'src/routes/safe/components/Apps/types'
import { ReviewMessage } from './ReviewMessage'
import { currentChainId } from 'src/logic/config/store/selectors'

import { _TypedDataEncoder } from '@ethersproject/hash'

export type SignMessageModalProps = {
  isOpen: boolean
  app: SafeApp
  message: string | EIP712TypedData
  safeAddress: string
  safeName: string
  requestId: RequestId
  method: string
  ethBalance: string
  onUserConfirm: (safeTxHash: string, requestId: RequestId) => void
  onTxReject: (requestId: RequestId) => void
  onClose: () => void
}

const convertToHumanReadableMessage = (message: string): string => {
  const isHex = isHexStrict(message.toString())

  let humanReadableMessage = message
  if (isHex) {
    try {
      humanReadableMessage = hexToUtf8(message)
    } catch (e) {
      // do nothing
    }
  }

  return humanReadableMessage
}

export const SignMessageModal = ({ message, isOpen, method, ...rest }: SignMessageModalProps): ReactElement | null => {
  const web3 = getWeb3ReadOnly()
  const networkId = useSelector(currentChainId)
  const txRecipient = getSignMessageLibAddress(networkId) || ZERO_ADDRESS
  let txData, readableData
  if (method == Methods.signMessage && typeof message === 'string') {
    txData = getSignMessageLibContractInstance(web3, networkId)
      .methods.signMessage(web3.eth.accounts.hashMessage(message))
      .encodeABI()
    readableData = convertToHumanReadableMessage(message)
  } else if (method == Methods.signTypedMessage) {
    try {
      if (!isObjectEIP712TypedData(message)) {
        throw new Error('Invalid typed data')
      }
      readableData = JSON.stringify(message, undefined, 4)
    } catch (e) {
      // As the signing method is SignTypedMessage, the message should be a valid JSON.
      // When it is not, we will reject the tx and close the modal.
      rest.onTxReject(rest.requestId)
      rest.onClose()
      return null
    }
    const typesCopy = { ...message.types }

    // We need to remove the EIP712Domain type from the types object
    // Because it's a part of the JSON-RPC payload, but for the `.hash` in ethers.js
    // The types are not allowed to be recursive, so ever type must either be used by another type, or be
    // the primary type. And there must only be one type that is not used by any other type.
    delete typesCopy.EIP712Domain
    txData = getSignMessageLibContractInstance(web3, networkId)
      .methods.signMessage(_TypedDataEncoder.hash(message.domain, typesCopy, message.message))
      .encodeABI()
  } else {
    // Unsupported method
    rest.onTxReject(rest.requestId)
    rest.onClose()
  }

  return (
    <Modal description="Safe App transaction" title="Safe App transaction" open={isOpen}>
      <ReviewMessage {...rest} txRecipient={txRecipient} method={method} txData={txData} utf8Message={readableData} />
    </Modal>
  )
}

1	import { RequestId, Methods, EIP712TypedData, isObjectEIP712TypedData } from '@gnosis.pm/safe-apps-sdk'
2	import { ReactElement } from 'react'
3	import { useSelector } from 'react-redux'
4	import { hexToUtf8, isHexStrict } from 'web3-utils'
5
6	import { getWeb3ReadOnly } from 'src/logic/wallets/getWeb3'
7	import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
8	import { getSignMessageLibContractInstance, getSignMessageLibAddress } from 'src/logic/contracts/safeContracts'
9	import Modal from 'src/components/Modal'
10	import { SafeApp } from 'src/routes/safe/components/Apps/types'
11	import { ReviewMessage } from './ReviewMessage'
12	import { currentChainId } from 'src/logic/config/store/selectors'
13
14	import { _TypedDataEncoder } from '@ethersproject/hash'
15
16	export type SignMessageModalProps = {
17	isOpen: boolean
18	app: SafeApp
19	message: string \| EIP712TypedData
20	safeAddress: string
21	safeName: string
22	requestId: RequestId
23	method: string
24	ethBalance: string
25	onUserConfirm: (safeTxHash: string, requestId: RequestId) => void
26	onTxReject: (requestId: RequestId) => void
27	onClose: () => void
28	}
29
30	const convertToHumanReadableMessage = (message: string): string => {	2✔
31	const isHex = isHexStrict(message.toString())	8✔
32
33	let humanReadableMessage = message	8✔
34	if (isHex) {	8✔
35	try {	3✔
36	humanReadableMessage = hexToUtf8(message)	3✔
37	} catch (e) {
38	// do nothing
39	}
40	}
41
42	return humanReadableMessage	8✔
43	}
44
45	export const SignMessageModal = ({ message, isOpen, method, ...rest }: SignMessageModalProps): ReactElement \| null => {	2✔
46	const web3 = getWeb3ReadOnly()	11✔
47	const networkId = useSelector(currentChainId)	11✔
48	const txRecipient = getSignMessageLibAddress(networkId) \|\| ZERO_ADDRESS	11!
49	let txData, readableData
50	if (method == Methods.signMessage && typeof message === 'string') {	11✔
51	txData = getSignMessageLibContractInstance(web3, networkId)	8✔
52	.methods.signMessage(web3.eth.accounts.hashMessage(message))
53	.encodeABI()
54	readableData = convertToHumanReadableMessage(message)	8✔
55	} else if (method == Methods.signTypedMessage) {	3!
56	try {	3✔
57	if (!isObjectEIP712TypedData(message)) {	3✔
58	throw new Error('Invalid typed data')	1✔
59	}
60	readableData = JSON.stringify(message, undefined, 4)	2✔
61	} catch (e) {
62	// As the signing method is SignTypedMessage, the message should be a valid JSON.
63	// When it is not, we will reject the tx and close the modal.
64	rest.onTxReject(rest.requestId)	1✔
65	rest.onClose()	1✔
66	return null	1✔
67	}
68	const typesCopy = { ...message.types }	2✔
69
70	// We need to remove the EIP712Domain type from the types object
71	// Because it's a part of the JSON-RPC payload, but for the `.hash` in ethers.js
72	// The types are not allowed to be recursive, so ever type must either be used by another type, or be
73	// the primary type. And there must only be one type that is not used by any other type.
74	delete typesCopy.EIP712Domain	2✔
75	txData = getSignMessageLibContractInstance(web3, networkId)	2✔
76	.methods.signMessage(_TypedDataEncoder.hash(message.domain, typesCopy, message.message))
77	.encodeABI()
78	} else {
79	// Unsupported method
UNCOV 80	rest.onTxReject(rest.requestId)	×
UNCOV 81	rest.onClose()	×
82	}
83
84	return (	10✔
85	<Modal description="Safe App transaction" title="Safe App transaction" open={isOpen}>
86	<ReviewMessage {...rest} txRecipient={txRecipient} method={method} txData={txData} utf8Message={readableData} />
87	</Modal>
88	)
89	}

safe-global / safe-react / 3144181237

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous