Skip to content
This repository was archived by the owner on Nov 10, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/App/ReceiveModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const ReceiveModal = ({ onClose, safeAddress, safeName }: Props): ReactElement =
</Paragraph>
<Paragraph className={classes.annotation} noMargin size="lg">
This is the address of your Safe. Deposit funds by scanning the QR code or copying the address below. Only send{' '}
{chainInfo.nativeCurrency.name} and assets to this address (e.g. ETH, ERC20, ERC721)!
{chainInfo.nativeCurrency.symbol} and assets to this address (e.g. ETH, ERC20, ERC721)!
</Paragraph>
<Col layout="column" middle="xs">
<Paragraph className={classes.safeName} noMargin size="lg" weight="bold">
Expand Down
9 changes: 5 additions & 4 deletions src/components/TransactionsFees/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@ export const TransactionFees = ({
connected wallet.{' '}
{!isOffChainSignature && (
<>
Make sure you have{' '}
Make sure you have
<Text size="lg" as="span" color="text" strong>
{gasCostFormatted}
</Text>{' '}
(fee price) {nativeCurrency.name} in this wallet to fund this confirmation.
{' '}
{gasCostFormatted} {nativeCurrency.symbol}{' '}
</Text>
in this wallet to fund the associated transaction fee.
</>
)}
</Paragraph>
Expand Down
8 changes: 4 additions & 4 deletions src/routes/CreateSafePage/CreateSafePage.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ describe('<CreateSafePage>', () => {
expect(estimateGasForDeployingSafeSpy).toHaveBeenCalledWith(addresses, owners, userAccount, mockedDateValue)

await waitFor(() =>
expect(screen.getByText('The creation will cost approximately 0.02302 Ether', { exact: false })),
expect(screen.getByText('The creation will cost approximately 0.02302 ETH', { exact: false })),
)
})

Expand Down Expand Up @@ -732,7 +732,7 @@ describe('<CreateSafePage>', () => {
expect(estimateGasForDeployingSafeSpy).toHaveBeenCalledWith(addresses, owners, userAccount, mockedDateValue)

await waitFor(() =>
expect(screen.getByText('The creation will cost approximately 0.02302 Ether', { exact: false })),
expect(screen.getByText('The creation will cost approximately 0.02302 ETH', { exact: false })),
)
})

Expand Down Expand Up @@ -794,7 +794,7 @@ describe('<CreateSafePage>', () => {
expect(estimateGasForDeployingSafeSpy).toHaveBeenCalledWith(addresses, owners, userAccount, mockedDateValue)

await waitFor(() =>
expect(screen.getByText('The creation will cost approximately 0.02302 Ether', { exact: false })),
expect(screen.getByText('The creation will cost approximately 0.02302 ETH', { exact: false })),
)
})

Expand Down Expand Up @@ -856,7 +856,7 @@ describe('<CreateSafePage>', () => {
expect(estimateGasForDeployingSafeSpy).toHaveBeenCalledWith(addresses, owners, userAccount, mockedDateValue)

await waitFor(() =>
expect(screen.getByText('The creation will cost approximately 0.02302 Ether', { exact: false })),
expect(screen.getByText('The creation will cost approximately 0.02302 ETH', { exact: false })),
)
})
})
Expand Down
4 changes: 2 additions & 2 deletions src/routes/CreateSafePage/steps/ReviewNewSafeStep.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ function ReviewNewSafeStep(): ReactElement | null {
<DescriptionContainer align="center">
<Paragraph color="primary" noMargin size="lg">
You&apos;re about to create a new Safe on <NetworkLabel /> and will have to confirm a transaction with your
currently connected wallet. The creation will cost approximately {gasCostFormatted} {nativeCurrency.name}. The
exact amount will be determined by your wallet.
currently connected wallet. The creation will cost approximately {gasCostFormatted} {nativeCurrency.symbol}.
The exact amount will be determined by your wallet.
</Paragraph>
</DescriptionContainer>
</Row>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const NativeCoinValue = ({ onSetMax }: NativeCoinValueProps): React.React
component={TextField}
disabled={disabled}
inputAdornment={{
endAdornment: <InputAdornment position="end">{nativeCurrency.name}</InputAdornment>,
endAdornment: <InputAdornment position="end">{nativeCurrency.symbol}</InputAdornment>,
disabled,
}}
name="value"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ const ContractInteractionReview = ({ onClose, onPrev, tx }: Props): React.ReactE
<Block justify="left">
<Paragraph className={classes.value} noMargin size="md" style={{ margin: 0 }}>
{tx.value || 0}
{' ' + nativeCurrency.name}
{' ' + nativeCurrency.symbol}
</Paragraph>
</Block>
</Col>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ const ReviewCustomTx = ({ onClose, onPrev, tx }: Props): ReactElement => {
<Img alt="Ether" height={28} onError={setImageToPlaceholder} src={getEthAsToken('0').logoUri || ''} />
<Paragraph className={classes.value} noMargin size="md">
{tx.value || 0}
{' ' + nativeCurrency.name}
{' ' + nativeCurrency.symbol}
</Paragraph>
</Row>
<Row margin="xs">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ const SendCustomTx = ({ initialValues, isABI, onClose, onNext, switchMethod }: P
<Field
component={TextField}
inputAdornment={{
endAdornment: <InputAdornment position="end">{nativeCurrency.name}</InputAdornment>,
endAdornment: <InputAdornment position="end">{nativeCurrency.symbol}</InputAdornment>,
}}
name="value"
placeholder="Value*"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export const MultiSendDetails = ({ txData }: { txData: TransactionData }): React

const actionTitle = `Action ${index + 1} ${dataDecoded ? `(${dataDecoded.method})` : ''}`
const amount = value ? fromTokenUnit(value, nativeCurrency.decimals) : 0
const title = `Send ${amount} ${nativeCurrency.name} to:`
const title = `Send ${amount} ${nativeCurrency.symbol} to:`

if (dataDecoded) {
// Backend decoded data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ const getModalTitleAndDescription = (

if (thresholdReached) {
modalInfo.title = 'Execute transaction'
modalInfo.description =
'This action will execute this transaction. A separate Transaction will be performed to submit the execution.'
modalInfo.description = 'This action will execute this transaction.'
} else {
modalInfo.title = 'Approve Transaction'
modalInfo.description =
Expand Down