Skip to content

Fix close position max size formatting #178

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

Open
nexicturbo wants to merge 1 commit into
base: main
Choose a base branch
from
+33 −4
Open

Fix close position max size formatting #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/components/layout/Input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
export let placeholder = false;
export let isHighlighted = false;
export let isInvalid = false;
export let max = 10000000;

</script>

Expand Down Expand Up @@ -110,5 +111,5 @@
<label for={label} class='prefix'>
{label}
</label>
<input id={label} type='number' step="any" bind:value={value} min="0" max="10000000" maxlength="10" spellcheck="false" placeholder={placeholder || `0.0`} autocomplete="off" autocorrect="off" inputmode="decimal" lang="en" disabled={disabled} class:secondaryColor={isSecondaryColor} class:highlighted={isHighlighted} on:focus on:blur>
</div>
<input id={label} type='number' step="any" bind:value={value} min="0" max={max} maxlength="10" spellcheck="false" placeholder={placeholder || `0.0`} autocomplete="off" autocorrect="off" inputmode="decimal" lang="en" disabled={disabled} class:secondaryColor={isSecondaryColor} class:highlighted={isHighlighted} on:focus on:blur>
</div>
32 changes: 30 additions & 2 deletions src/components/modals/ClosePosition.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,36 @@

let amount, isSubmitting, sizeToClosePercent = 0;

function formatMaxCloseSize(size, maxDecimals = 8) {
if (!size) return '';
const sizeString = `${size}`.trim();

if (sizeString.includes('e')) {
const numericSize = Number(sizeString);
if (!Number.isFinite(numericSize) || numericSize <= 0) return '';
return numericSize.toFixed(18).replace(/\.?0+$/, '');
}

const [integerPart, decimalPart = ''] = sizeString.split('.');
let trimmedDecimal = decimalPart.slice(0, maxDecimals).replace(/0+$/, '');

if (!trimmedDecimal && decimalPart && Number(integerPart || 0) === 0 && Number(sizeString) > 0) {
trimmedDecimal = decimalPart.slice(0, 18).replace(/0+$/, '');
}

if (!trimmedDecimal) {
return integerPart || '0';
}

return `${integerPart || '0'}.${trimmedDecimal}`;
}

$: formattedMaxSize = formatMaxCloseSize(data.size);
$: amountIsTooLarge = amount && formattedMaxSize && amount * 1 > formattedMaxSize * 1;

async function submit() {
if (!amount) return focusInput('Size to Close');
if (amountIsTooLarge) return focusInput('Size to Close');
isSubmitting = true;
const success = await submitCloseOrder({
market: data.market,
Expand Down Expand Up @@ -92,11 +120,11 @@
<form on:submit|preventDefault={submit}>

<div class='group'>
<Input label='Size to Close' asset={data.asset} bind:value={amount} />
<Input label='Size to Close' asset={data.asset} bind:value={amount} max={formattedMaxSize || 10000000} isInvalid={amountIsTooLarge} />
</div>

<div class='row'>
<LabelValue label='Max' value={`${formatForDisplay(data.size)} ${data.asset}`} on:click={() => amount = data.size} isClickable={true} />
<LabelValue label='Max' value={`${formattedMaxSize || formatForDisplay(data.size)} ${data.asset}`} on:click={() => amount = formattedMaxSize} isClickable={true} />
</div>

<div class='row'>
Expand Down