diff --git a/monero-harness/tests/wallet.rs b/monero-harness/tests/wallet.rs
index f8662ea3..6277b6af 100644
--- a/monero-harness/tests/wallet.rs
+++ b/monero-harness/tests/wallet.rs
@@ -35,7 +35,6 @@ async fn fund_transfer_and_check_tx_key() {
.await
.unwrap();
monero.start_miner().await.unwrap();
- let miner_address = monero.wallet("miner").unwrap().address().await.unwrap();
tracing::info!("Waiting for Alice to catch up");
diff --git a/src-gui/src/renderer/components/modal/swap/pages/in_progress/SwapSetupInflightPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/in_progress/SwapSetupInflightPage.tsx
index e352e203..446d2633 100644
--- a/src-gui/src/renderer/components/modal/swap/pages/in_progress/SwapSetupInflightPage.tsx
+++ b/src-gui/src/renderer/components/modal/swap/pages/in_progress/SwapSetupInflightPage.tsx
@@ -64,7 +64,16 @@ export default function SwapSetupInflightPage({
request.content.details.content;
return (
- <>
+
{/* Grid layout for perfect alignment */}
{/* Row 1: Bitcoin box */}
-
-
+
+
{/* Row 1: Animated arrow */}
@@ -98,20 +110,6 @@ export default function SwapSetupInflightPage({
xmr_receive_amount={xmr_receive_amount}
/>
-
- {/* Row 2: Empty space */}
-
-
- {/* Row 2: Empty space */}
-
-
- {/* Row 2: Secondary content */}
-
-
-
- >
+
);
}
@@ -162,42 +160,70 @@ interface BitcoinSendSectionProps {
btc_network_fee: number;
}
-const BitcoinMainBox = ({ btc_lock_amount }: { btc_lock_amount: number }) => (
- theme.palette.warning.light + "10",
- background: (theme) =>
- `linear-gradient(135deg, ${theme.palette.warning.light}20, ${theme.palette.warning.light}05)`,
- flex: "1 1 0",
- height: "100%", // Match the height of the Monero box
- }}
- >
- ({
- color: theme.palette.text.primary,
- })}
+const BitcoinMainBox = ({
+ btc_lock_amount,
+ btc_network_fee,
+}: {
+ btc_lock_amount: number;
+ btc_network_fee: number;
+}) => (
+
+ theme.palette.warning.light + "10",
+ background: (theme) =>
+ `linear-gradient(135deg, ${theme.palette.warning.light}20, ${theme.palette.warning.light}05)`,
+ height: "100%", // Match the height of the Monero box
+ }}
>
- You send
-
- ({
- fontWeight: "bold",
- color: theme.palette.warning.dark,
- textShadow: "0 1px 2px rgba(0,0,0,0.1)",
- })}
+ ({
+ color: theme.palette.text.primary,
+ })}
+ >
+ You send
+
+ ({
+ fontWeight: "bold",
+ color: theme.palette.warning.dark,
+ textShadow: "0 1px 2px rgba(0,0,0,0.1)",
+ })}
+ >
+
+
+
+
+ {/* Network fee box attached to the bottom */}
+ theme.palette.warning.main,
+ color: (theme) => theme.palette.warning.contrastText,
+ borderRadius: "4px",
+ fontSize: "0.75rem",
+ fontWeight: 600,
+ boxShadow: "0 2px 4px rgba(0,0,0,0.1)",
+ whiteSpace: "nowrap",
+ zIndex: 1,
+ }}
>
-
-
+ Network fee:
+
);
@@ -357,69 +383,88 @@ const MoneroMainBox = ({
);
return (
- theme.palette.success.light + "10",
- background: (theme) =>
- `linear-gradient(135deg, ${theme.palette.success.light}20, ${theme.palette.success.light}05)`,
- flex: "1 1 0",
- }}
- >
-
- ({
- color: theme.palette.text.primary,
- fontWeight: 700,
- letterSpacing: 0.5,
- })}
- >
- {highestPercentagePool.label}
-
- theme.palette.text.secondary,
- }}
- >
-
- {highestPercentagePool.address}
-
-
-
+
theme.palette.success.light + "10",
+ background: (theme) =>
+ `linear-gradient(135deg, ${theme.palette.success.light}20, ${theme.palette.success.light}05)`,
+ flex: "1 1 0",
}}
>
- ({
- fontWeight: "bold",
- color: theme.palette.success.dark,
- textShadow: "0 1px 2px rgba(0,0,0,0.1)",
- })}
+
+ ({
+ color: theme.palette.text.primary,
+ fontWeight: 700,
+ letterSpacing: 0.5,
+ })}
+ >
+ {highestPercentagePool.label}
+
+ theme.palette.text.secondary,
+ }}
+ >
+
+ {highestPercentagePool.address}
+
+
+
+
-
-
+ ({
+ fontWeight: "bold",
+ color: theme.palette.success.dark,
+ textShadow: "0 1px 2px rgba(0,0,0,0.1)",
+ })}
+ >
+
+
+
+
+
+ {/* Secondary Monero content attached to the bottom */}
+
+
);