diff --git a/src/components/AddressInfo/index.tsx b/src/components/AddressInfo/index.tsx index f9048aa8..efd40e50 100644 --- a/src/components/AddressInfo/index.tsx +++ b/src/components/AddressInfo/index.tsx @@ -64,7 +64,7 @@ const AddressInfo = ({ ethBalance, safeAddress, safeName }: Props): React.ReactE {ethBalance && ( - Balance: {`${ethBalance} ETH`} + Balance: {`${ethBalance} ETH`} )} diff --git a/src/components/Header/components/ProviderInfo/ProviderAccessible.tsx b/src/components/Header/components/ProviderInfo/ProviderAccessible.tsx index fa1ce9c9..1186c809 100644 --- a/src/components/Header/components/ProviderInfo/ProviderAccessible.tsx +++ b/src/components/Header/components/ProviderInfo/ProviderAccessible.tsx @@ -72,7 +72,7 @@ const ProviderInfo = ({ classes, connected, network, provider, userAddress }) => > {providerText} - + {cutAddress} diff --git a/src/routes/opening/components/Footer.tsx b/src/routes/opening/components/Footer.tsx index 439bc3a3..292000e3 100644 --- a/src/routes/opening/components/Footer.tsx +++ b/src/routes/opening/components/Footer.tsx @@ -23,6 +23,7 @@ export const GenericFooter = ({ safeCreationTxHash }: { safeCreationTxHash: stri href={getEtherScanLink('tx', safeCreationTxHash)} rel="noopener noreferrer" target="_blank" + data-testid="safe-create-etherscan-link" > Etherscan.io diff --git a/src/routes/safe/components/Balances/Coins/index.tsx b/src/routes/safe/components/Balances/Coins/index.tsx index edc89a05..50ba30fd 100644 --- a/src/routes/safe/components/Balances/Coins/index.tsx +++ b/src/routes/safe/components/Balances/Coins/index.tsx @@ -72,7 +72,7 @@ const Coins = (props) => { break } case BALANCE_TABLE_BALANCE_ID: { - cellItem =
{row[id]}
+ cellItem =
{row[id]}
break } case BALANCE_TABLE_VALUE_ID: { diff --git a/src/routes/safe/components/Balances/SendModal/screens/ChooseTxType/index.tsx b/src/routes/safe/components/Balances/SendModal/screens/ChooseTxType/index.tsx index 95d64406..051ab9af 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/ChooseTxType/index.tsx +++ b/src/routes/safe/components/Balances/SendModal/screens/ChooseTxType/index.tsx @@ -110,6 +110,7 @@ const ChooseTxType = ({ onClose, recipientAddress, setActiveScreen }) => { minWidth={260} onClick={() => setActiveScreen('sendFunds')} variant="contained" + testId="modal-send-funds-btn" > Send funds Send funds @@ -122,6 +123,7 @@ const ChooseTxType = ({ onClose, recipientAddress, setActiveScreen }) => { minWidth={260} onClick={() => setActiveScreen('sendCollectible')} variant="contained" + testId="modal-send-collectible-btn" > Send collectible { minWidth={260} onClick={() => setActiveScreen('contractInteraction')} variant="outlined" + testId="modal-contract-interaction-btn" > Contract Interaction { return ( <> - + Send Funds @@ -136,7 +136,12 @@ const ReviewTx = ({ closeSnackbar, enqueueSnackbar, onClose, onPrev, tx }) => { - + {tx.recipientAddress} @@ -151,12 +156,12 @@ const ReviewTx = ({ closeSnackbar, enqueueSnackbar, onClose, onPrev, tx }) => { {txToken.name} - + {tx.amount} {txToken.symbol} - + {`You're about to create a transaction and will have to confirm it with your currently connected wallet. Make sure you have ${gasCosts} (fee price) ETH in this wallet to fund this confirmation.`} diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.tsx b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.tsx index 99d81232..d33974ed 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.tsx +++ b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.tsx @@ -57,7 +57,11 @@ const TokenSelectField = ({ classes, initialValue, isValid, tokens }) => ( {token.name} - + ))} diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.tsx b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.tsx index 70f9bed8..8d3a1888 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.tsx +++ b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.tsx @@ -84,7 +84,7 @@ const SendFunds = ({ initialValues, onClose, onNext, recipientAddress, selectedT return ( <> - + Send Funds @@ -221,7 +221,11 @@ const SendFunds = ({ initialValues, onClose, onNext, recipientAddress, selectedT Amount - mutators.setMax(selectedTokenRecord.balance)} weight="bold"> + mutators.setMax(selectedTokenRecord.balance)} + weight="bold" + testId="send-max-btn" + > Send max @@ -239,6 +243,7 @@ const SendFunds = ({ initialValues, onClose, onNext, recipientAddress, selectedT placeholder="Amount*" text="Amount*" type="text" + testId="amount-input" validate={composeValidators( required, mustBeFloat, diff --git a/src/routes/safe/components/Balances/dataFetcher.ts b/src/routes/safe/components/Balances/dataFetcher.ts index dc427c99..411c24e2 100644 --- a/src/routes/safe/components/Balances/dataFetcher.ts +++ b/src/routes/safe/components/Balances/dataFetcher.ts @@ -41,6 +41,7 @@ export const getBalanceData = (activeTokens, currencySelected, currencyValues, c name: token.name, logoUri: token.logoUri, address: token.address, + symbol: token.symbol, }, [buildOrderFieldFrom(BALANCE_TABLE_ASSET_ID)]: token.name, [BALANCE_TABLE_BALANCE_ID]: `${formatAmount(token.balance)} ${token.symbol}`, diff --git a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/ApproveTxModal/index.tsx b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/ApproveTxModal/index.tsx index a9296524..aa798c10 100644 --- a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/ApproveTxModal/index.tsx +++ b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/ApproveTxModal/index.tsx @@ -147,6 +147,7 @@ const ApproveTxModal = ({ } label="Execute transaction" + data-testid="execute-checkbox" /> )} diff --git a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/OwnersColumn/index.tsx b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/OwnersColumn/index.tsx index 96624aeb..40eda58c 100644 --- a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/OwnersColumn/index.tsx +++ b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/OwnersColumn/index.tsx @@ -144,9 +144,16 @@ const OwnersColumn = ({ return ( - +
- +
{tx.isExecuted ? `Confirmed [${tx.confirmations.size}/${tx.confirmations.size}]` @@ -169,6 +176,7 @@ const OwnersColumn = ({ classes.ownerListTitle, (cancelThresholdReached || cancelTx.isExecuted) && classes.ownerListTitleCancelDone, )} + data-testid={`rejected-${cancelTx.confirmations.size}-out-of-${cancelThreshold}`} >
{ return ( {typeof Icon === 'object' ? Icon : {statusToLabel[status]}} - + {statusToLabel[status]}