Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: consolidate tx confirmation panels #21188

Merged
merged 6 commits into from
Dec 14, 2023
Merged

chore: consolidate tx confirmation panels #21188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3244631
chore: consolidate tx confirmation panels
josheleonard Dec 1, 2023
4bd91ce
chore: combine transaction-info components
josheleonard Dec 1, 2023
a7f042b
chore: combine transaction-detail components
josheleonard Dec 1, 2023
99390ef
fix: allow rows to wrap content
josheleonard Dec 1, 2023
cc2107c
fix: allow tx confirm to-from row to wrap
josheleonard Dec 1, 2023
a332123
chore: remove max-width prop from column component
josheleonard Dec 1, 2023
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
46 changes: 21 additions & 25 deletions components/brave_wallet_ui/common/hooks/use-pending-transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ import {
accountHasInsufficientFundsForGas,
accountHasInsufficientFundsForTransaction,
getTransactionGasFee,
isSolanaTransaction,
parseTransactionWithPrices,
findTransactionToken,
isEthereumTransaction
isEthereumTransaction,
isZCashTransaction,
isBitcoinTransaction
} from '../../utils/tx-utils'
import { makeNetworkAsset } from '../../options/asset-options'

Expand Down Expand Up @@ -291,7 +292,7 @@ export const usePendingTransactions = () => {
sellTokenBalance: sellTokenBalance || '',
tx: transactionInfo
})
: undefined
: false
}, [
gasFee,
nativeBalance,
Expand Down Expand Up @@ -333,23 +334,18 @@ export const usePendingTransactions = () => {
const isERC721TransferFrom =
transactionInfo?.txType === BraveWallet.TransactionType.ERC721TransferFrom

const isSolanaTxn = transactionInfo && isSolanaTransaction(transactionInfo)
const isSolanaDappTransaction =
transactionInfo?.txType &&
[
BraveWallet.TransactionType.SolanaDappSignAndSendTransaction,
BraveWallet.TransactionType.SolanaDappSignTransaction
].includes(transactionInfo.txType)
const isSolanaDappTransaction = transactionInfo?.txType
? [
BraveWallet.TransactionType.SolanaDappSignAndSendTransaction,
BraveWallet.TransactionType.SolanaDappSignTransaction
].includes(transactionInfo.txType)
: false

const isAssociatedTokenAccountCreation =
transactionInfo?.txType ===
BraveWallet.TransactionType
.SolanaSPLTokenTransferWithAssociatedTokenAccountCreation

const isFilecoinTransaction =
transactionInfo?.txType === BraveWallet.TransactionType.Other &&
transactionInfo?.txDataUnion?.filTxData

// methods
const onEditAllowanceSave = React.useCallback(
(allowance: string) => {
Expand Down Expand Up @@ -527,14 +523,12 @@ export const usePendingTransactions = () => {
return true
}

return (
!!transactionDetails?.sameAddressError ||
!!transactionDetails?.contractAddressError ||
insufficientFundsForGasError === undefined ||
insufficientFundsError === undefined ||
!!insufficientFundsForGasError ||
!!insufficientFundsError ||
!!transactionDetails?.missingGasLimitError
return Boolean(
transactionDetails?.sameAddressError ||
transactionDetails?.contractAddressError ||
insufficientFundsForGasError ||
insufficientFundsError ||
transactionDetails?.missingGasLimitError
)
}, [
transactionDetails,
Expand Down Expand Up @@ -631,9 +625,9 @@ export const usePendingTransactions = () => {
isERC721SafeTransferFrom,
isERC721TransferFrom,
isSolanaDappTransaction,
isSolanaTransaction: isSolanaTxn,
isSolanaTransaction: transactionDetails?.isSolanaTransaction || false,
isAssociatedTokenAccountCreation,
isFilecoinTransaction,
isFilecoinTransaction: transactionDetails?.isFilecoinTransaction || false,
onEditAllowanceSave,
queueNextTransaction,
rejectAllTransactions,
Expand All @@ -654,6 +648,8 @@ export const usePendingTransactions = () => {
onConfirm,
onReject,
insufficientFundsError,
insufficientFundsForGasError
insufficientFundsForGasError,
isZCashTransaction: isZCashTransaction(transactionInfo),
isBitcoinTransaction: isBitcoinTransaction(transactionInfo)
}
}
164 changes: 0 additions & 164 deletions ...ave_wallet_ui/components/extension/confirm-transaction-panel/bitcoin-transaction-info.tsx
View file
Open in desktop

This file was deleted.

Loading