Skip to content

Commit

Permalink
Show the channel fee warning from federation swap
Browse files Browse the repository at this point in the history
  • Loading branch information
@AnthonyRonning
AnthonyRonning committed Feb 3, 2024
1 parent f8f0103 commit 66d64ad
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 24 deletions.
7 changes: 5 additions & 2 deletions src/components/ReceiveWarnings.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import { FeesModal } from "~/components/MoreInfoModal";
import { useI18n } from "~/i18n/context";
import { useMegaStore } from "~/state/megaStore";

export function ReceiveWarnings(props: { amountSats: string | bigint }) {
export function ReceiveWarnings(props: {
amountSats: string | bigint;
from_fedi_to_ln: boolean;
}) {
const i18n = useI18n();
const [state, _actions] = useMegaStore();

Expand All @@ -26,7 +29,7 @@ export function ReceiveWarnings(props: { amountSats: string | bigint }) {
});

const warningText = () => {
if (state.federations?.length !== 0) {
if (state.federations?.length !== 0 && props.from_fedi_to_ln != true) {
return undefined;
}
if ((state.balance?.lightning || 0n) === 0n) {
Expand Down
3 changes: 2 additions & 1 deletion src/i18n/en/translations.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,8 @@ export default {
initiated: "Swap Initiated",
sats_added: "+{{amount}} sats will be added to your Lightning balance",
sats_fee: "+{{amount}} sats fee",
confirm_swap: "Confirm Swap"
confirm_swap: "Confirm Swap",
preview_swap: "Preview Swap Fee"
},
reload: {
mutiny_update: "Mutiny Update",
Expand Down
5 changes: 4 additions & 1 deletion src/routes/Receive.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,10 @@ export function Receive() {
setAmountSats={setAmount}
onSubmit={getQr}
/>
<ReceiveWarnings amountSats={amount() || "0"} />
<ReceiveWarnings
amountSats={amount() || "0"}
from_fedi_to_ln={false}
/>
</VStack>
<div class="flex-1" />
<VStack>
Expand Down
90 changes: 70 additions & 20 deletions src/routes/SwapLightning.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@ import {
DefaultMain,
Failure,
Fee,
HackActivityType,
FeeDisplay,
InfoBox,
LargeHeader,
MegaCheck,
MegaEx,
MutinyWalletGuard,
NavBar,
ReceiveWarnings,
showToast,
SuccessModal,
TextField,
Expand All @@ -49,18 +50,20 @@ export function SwapLightning() {
const i18n = useI18n();

const [amountSats, setAmountSats] = createSignal(0n);
const [feeSats, setFeeSats] = createSignal(0n);
const [maxFederationBalanceBeforeSwap, setMaxFederationBalanceBeforeSwap] =
createSignal(0n);
const [previewFee, setPreviewFee] = createSignal(false);

const [loading, setLoading] = createSignal(false);

// Details Modal
const [detailsOpen, setDetailsOpen] = createSignal(false);
const [detailsKind, setDetailsKind] = createSignal<HackActivityType>();
const [detailsId, setDetailsId] = createSignal("");

const [sweepResult, setSweepResult] = createSignal<SweepResultDetails>();

function resetState() {
setAmountSats(0n);
setFeeSats(0n);
setPreviewFee(false);
setMaxFederationBalanceBeforeSwap(0n);
setLoading(false);
setSweepResult(undefined);
}
Expand Down Expand Up @@ -110,7 +113,7 @@ export function SwapLightning() {
}

if (amountSats() > (state.balance?.federation || 0n)) {
return i18n.t("swap.insufficient_funds");
return i18n.t("swap_lightning.insufficient_funds");
}

return undefined;
Expand All @@ -128,11 +131,47 @@ export function SwapLightning() {
return amountSats() === calculateMaxFederation();
});

const feeIsSet = createMemo(() => {
return feeSats() !== 0n;
});

const feeEstimate = async () => {
if (canSwap()) {
try {
setLoading(true);
if (isMax()) {
const fee =
await state.mutiny_wallet?.estimate_sweep_federation_fee(

Check failure on line 144 in src/routes/SwapLightning.tsx

View workflow job for this annotation

GitHub Actions / Build iOS 

Property 'estimate_sweep_federation_fee' does not exist on type 'MutinyWallet'. Did you mean 'estimate_sweep_tx_fee'?

Check failure on line 144 in src/routes/SwapLightning.tsx

View workflow job for this annotation

GitHub Actions / Build APK 

Property 'estimate_sweep_federation_fee' does not exist on type 'MutinyWallet'. Did you mean 'estimate_sweep_tx_fee'?
undefined
);
setFeeSats(fee);
setMaxFederationBalanceBeforeSwap(calculateMaxFederation());
setPreviewFee(true);
} else {
const fee =
await state.mutiny_wallet?.estimate_sweep_federation_fee(

Check failure on line 152 in src/routes/SwapLightning.tsx

View workflow job for this annotation

GitHub Actions / Build iOS 

Property 'estimate_sweep_federation_fee' does not exist on type 'MutinyWallet'. Did you mean 'estimate_sweep_tx_fee'?

Check failure on line 152 in src/routes/SwapLightning.tsx

View workflow job for this annotation

GitHub Actions / Build APK 

Property 'estimate_sweep_federation_fee' does not exist on type 'MutinyWallet'. Did you mean 'estimate_sweep_tx_fee'?
amountSats()
);
setFeeSats(fee);
setMaxFederationBalanceBeforeSwap(calculateMaxFederation());
setPreviewFee(true);
}
} catch (e) {
console.error(e);
return undefined;
} finally {
setLoading(false);
}
}

return undefined;
};

return (
<MutinyWalletGuard>
<DefaultMain>
<BackLink />
<LargeHeader>{i18n.t("swap.header")}</LargeHeader>
<LargeHeader>{i18n.t("swap_lightning.header")}</LargeHeader>
<SuccessModal
confirmText={
sweepResult()?.result
Expand All @@ -153,21 +192,13 @@ export function SwapLightning() {
<Failure reason={sweepResult()?.failure_reason} />

Check failure on line 192 in src/routes/SwapLightning.tsx

View workflow job for this annotation

GitHub Actions / Build iOS 

Type 'string | undefined' is not assignable to type 'string'.

Check failure on line 192 in src/routes/SwapLightning.tsx

View workflow job for this annotation

GitHub Actions / Build APK 

Type 'string | undefined' is not assignable to type 'string'.
</Match>
<Match when={sweepResult()?.result}>
<Show when={detailsId() && detailsKind()}>
<ActivityDetailsModal
open={detailsOpen()}
kind={detailsKind()}
id={detailsId()}
setOpen={setDetailsOpen}
/>
</Show>
<MegaCheck />
<div class="flex flex-col justify-center">
<h1 class="mb-2 mt-4 w-full justify-center text-center text-2xl font-semibold md:text-3xl">
{i18n.t("swap.initiated")}
{i18n.t("swap_lightning.initiated")}
</h1>
<p class="text-center text-xl">
{i18n.t("swap.sats_added", {
{i18n.t("swap_lightning.sats_added", {
amount: Number(
sweepResult()?.result?.amount
).toLocaleString()
Expand Down Expand Up @@ -205,6 +236,17 @@ export function SwapLightning() {
}
]}
/>
<Show when={feeIsSet()}>
<FeeDisplay
amountSats={amountSats().toString()}
fee={feeSats()!.toString()}
maxAmountSats={maxFederationBalanceBeforeSwap()!.toString()}

Check failure on line 243 in src/routes/SwapLightning.tsx

View workflow job for this annotation

GitHub Actions / Build iOS 

Type 'string' is not assignable to type 'bigint'.

Check failure on line 243 in src/routes/SwapLightning.tsx

View workflow job for this annotation

GitHub Actions / Build APK 

Type 'string' is not assignable to type 'bigint'.
/>
</Show>
<ReceiveWarnings
amountSats={amountSats() || "0"}
from_fedi_to_ln={true}
/>
<Show when={amountWarning() && amountSats() > 0n}>
<InfoBox accent={"red"}>{amountWarning()}</InfoBox>
</Show>
Expand All @@ -214,10 +256,18 @@ export function SwapLightning() {
<Button
disabled={!canSwap()}
intent="blue"
onClick={handleSwap}
onClick={() => {
if (!previewFee()) {
feeEstimate();
} else {
handleSwap();
}
}}
loading={loading()}
>
{i18n.t("swap.confirm_swap")}
{!previewFee()
? i18n.t("swap_lightning.preview_swap")
: i18n.t("swap_lightning.confirm_swap")}
</Button>
</VStack>
</div>
Expand Down

0 comments on commit 66d64ad

Please sign in to comment.