From b169c89c74f57a1447abffcd4e2234cc60f83687 Mon Sep 17 00:00:00 2001
From: qingfeng312 <86755530+qingfeng312@users.noreply.github.com>
Date: Sun, 7 Jun 2026 09:51:25 +0800
Subject: [PATCH 1/2] Show available add/remove margin in Edit Margin modal

---
 src/components/modals/EditMargin.svelte | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/modals/EditMargin.svelte b/src/components/modals/EditMargin.svelte
index bca6bf5..af8f88f 100644
--- a/src/components/modals/EditMargin.svelte
+++ b/src/components/modals/EditMargin.svelte
@@ -9,10 +9,10 @@
 
 	import { ADDRESS_ZERO } from '@lib/config'
 	import { formatForDisplay } from '@lib/formatters'
-	import { approveAsset, getAllowance } from '@api/assets'
+	import { approveAsset, getAllowance, getUserAssetBalances } from '@api/assets'
 	import { addMargin, removeMargin } from '@api/positions'
 	import { focusInput, hideModal } from '@lib/ui'
-	import { allowances, selectedMarketInfo } from '@lib/stores'
+	import { allowances, balances, selectedMarketInfo } from '@lib/stores'
 
 	export let data;
 
@@ -53,6 +53,7 @@
 	}
 
 	let funding = data.funding || 0;
+	let availableRemoveMargin = data.position.margin * 1 + funding * 1;
 	let newLiqPrice = data.position.liqprice;
 	let newMargin = 0;
 	function calculateNewLiquidationPrice(marginDelta, mode) {
@@ -102,6 +103,7 @@
 
 	onMount(() => {
 		focusInput(`Add ${data.position.asset}`);
+		getUserAssetBalances();
 	});
 
 </script>
@@ -151,6 +153,14 @@
 				<Input label={`${selected} ${data.position.asset}`} bind:value={margin} />
 			</div>
 
+			<div class='row'>
+				{#if selected=='Add'}
+				<LabelValue label='Available' value={`${formatForDisplay($balances[data.position.asset]) || "-"} ${data.position.asset}`} isClickable={true} on:click={() => {margin = $balances[data.position.asset] || 0}} />
+				{:else}
+				<LabelValue label='Available' value={`${formatForDisplay(availableRemoveMargin) || "-"} ${data.position.asset}`} isClickable={true} on:click={() => {margin = availableRemoveMargin}} />
+				{/if}
+			</div>
+
 			<div class='row'>
 				<LabelValue label='New Liq. Price' value={`${formatForDisplay(newLiqPrice) || "-"}`} />
 			</div>

From b43d322dee329e0d4146ea412d6b5b708eaf59a0 Mon Sep 17 00:00:00 2001
From: qingfeng312 <86755530+qingfeng312@users.noreply.github.com>
Date: Sun, 7 Jun 2026 09:53:02 +0800
Subject: [PATCH 2/2] Preserve zero available margin display

---
 src/components/modals/EditMargin.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/modals/EditMargin.svelte b/src/components/modals/EditMargin.svelte
index af8f88f..648b761 100644
--- a/src/components/modals/EditMargin.svelte
+++ b/src/components/modals/EditMargin.svelte
@@ -155,9 +155,9 @@
 
 			<div class='row'>
 				{#if selected=='Add'}
-				<LabelValue label='Available' value={`${formatForDisplay($balances[data.position.asset]) || "-"} ${data.position.asset}`} isClickable={true} on:click={() => {margin = $balances[data.position.asset] || 0}} />
+				<LabelValue label='Available' value={`${formatForDisplay($balances[data.position.asset] || 0)} ${data.position.asset}`} isClickable={true} on:click={() => {margin = $balances[data.position.asset] || 0}} />
 				{:else}
-				<LabelValue label='Available' value={`${formatForDisplay(availableRemoveMargin) || "-"} ${data.position.asset}`} isClickable={true} on:click={() => {margin = availableRemoveMargin}} />
+				<LabelValue label='Available' value={`${formatForDisplay(availableRemoveMargin)} ${data.position.asset}`} isClickable={true} on:click={() => {margin = availableRemoveMargin}} />
 				{/if}
 			</div>