Skip to content
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
14 changes: 7 additions & 7 deletions app/components/UI/Bridge/Views/BridgeView/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -394,14 +394,12 @@ const BridgeView = () => {
activeQuote &&
quotesLastFetched && (
<Box style={styles.buttonContainer}>
{isHardwareAddress && (
{isHardwareAddress && isSolanaSourced && (
<BannerAlert
severity={BannerAlertSeverity.Error}
description={
isSolanaSourced
? strings('bridge.hardware_wallet_not_supported_solana')
: strings('bridge.hardware_wallet_not_supported')
}
description={strings(
'bridge.hardware_wallet_not_supported_solana',
)}
/>
)}
<Button
Expand All @@ -410,7 +408,9 @@ const BridgeView = () => {
onPress={handleContinue}
style={styles.button}
isDisabled={
hasInsufficientBalance || isSubmittingTx || isHardwareAddress
hasInsufficientBalance ||
isSubmittingTx ||
(isHardwareAddress && isSolanaSourced)
}
/>
<Button
Expand Down
35 changes: 35 additions & 0 deletions patches/@metamask+bridge-status-controller+34.0.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
diff --git a/node_modules/@metamask/bridge-status-controller/dist/bridge-status-controller.cjs b/node_modules/@metamask/bridge-status-controller/dist/bridge-status-controller.cjs
index 84e7c48..b43fd13 100644
--- a/node_modules/@metamask/bridge-status-controller/dist/bridge-status-controller.cjs
+++ b/node_modules/@metamask/bridge-status-controller/dist/bridge-status-controller.cjs
@@ -317,7 +317,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
}
return finalTransactionMeta;
});
- _BridgeStatusController_handleApprovalTx.set(this, async (isBridgeTx, quoteResponse) => {
+ _BridgeStatusController_handleApprovalTx.set(this, async (isBridgeTx, quoteResponse, requireApproval) => {
const { approval } = quoteResponse;
if (approval) {
const approveTx = async () => {
@@ -327,6 +327,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
? transaction_controller_1.TransactionType.bridgeApproval
: transaction_controller_1.TransactionType.swapApproval,
trade: approval,
+ requireApproval,
});
await (0, transaction_1.handleLineaDelay)(quoteResponse);
return approvalTxMeta;
@@ -521,8 +522,12 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
return tradeMeta;
}
// Set approval time and id if an approval tx is needed
- const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleApprovalTx, "f").call(this, isBridgeTx, quoteResponse);
+ const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleApprovalTx, "f").call(this, isBridgeTx, quoteResponse, requireApproval);
approvalTxId = approvalTxMeta?.id;
+ if (requireApproval) {
+ const mobileHardwareWalletDelay = new Promise((resolve) => setTimeout(resolve, 1000));
+ await mobileHardwareWalletDelay;
+ }
return await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransaction, "f").call(this, {
transactionType: isBridgeTx
? transaction_controller_1.TransactionType.bridge
Loading