From 0700487771d643464dd7cc48f599ce328fb7dd3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Tue, 13 Aug 2024 09:28:31 +0200 Subject: [PATCH] fixup rebase --- src/context/Create.tsx | 112 ++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 53 deletions(-) diff --git a/src/context/Create.tsx b/src/context/Create.tsx index b48d1e86..04e9119e 100644 --- a/src/context/Create.tsx +++ b/src/context/Create.tsx @@ -10,56 +10,56 @@ import { } from "solid-js"; import { config } from "../config"; -import { LN, RBTC } from "../consts/Assets"; +import { BTC, LBTC, LN, RBTC } from "../consts/Assets"; import { Side, SwapType } from "../consts/Enums"; import { detectUrlParam } from "../utils/urlparams"; export type CreateContextType = { - swapType: Accessor; - invoice: Accessor; - setInvoice: Setter; - lnurl: Accessor; - setLnurl: Setter; - onchainAddress: Accessor; - setOnchainAddress: Setter; - assetSend: Accessor; - setAssetSend: Setter; - assetReceive: Accessor; - setAssetReceive: Setter; - assetSelect: Accessor; - setAssetSelect: Setter; - assetSelected: Accessor; - setAssetSelected: Setter; - valid: Accessor; - setValid: Setter; - invoiceValid: Accessor; - setInvoiceValid: Setter; - addressValid: Accessor; - setAddressValid: Setter; - amountValid: Accessor; - setAmountValid: Setter; - pairValid: Accessor; - setPairValid: Setter; - sendAmount: Accessor; - setSendAmount: Setter; - receiveAmount: Accessor; - setReceiveAmount: Setter; - sendAmountFormatted: Accessor; - setSendAmountFormatted: Setter; - receiveAmountFormatted: Accessor; - setReceiveAmountFormatted: Setter; - amountChanged: Accessor; - setAmountChanged: Setter; - minimum: Accessor; - setMinimum: Setter; - maximum: Accessor; - setMaximum: Setter; - boltzFee: Accessor; - setBoltzFee: Setter; - minerFee: Accessor; - setMinerFee: Setter; - setInvoiceError: Setter; - invoiceError: Accessor; + swapType: Accessor; + invoice: Accessor; + setInvoice: Setter; + lnurl: Accessor; + setLnurl: Setter; + onchainAddress: Accessor; + setOnchainAddress: Setter; + assetSend: Accessor; + setAssetSend: Setter; + assetReceive: Accessor; + setAssetReceive: Setter; + assetSelect: Accessor; + setAssetSelect: Setter; + assetSelected: Accessor; + setAssetSelected: Setter; + valid: Accessor; + setValid: Setter; + invoiceValid: Accessor; + setInvoiceValid: Setter; + addressValid: Accessor; + setAddressValid: Setter; + amountValid: Accessor; + setAmountValid: Setter; + pairValid: Accessor; + setPairValid: Setter; + sendAmount: Accessor; + setSendAmount: Setter; + receiveAmount: Accessor; + setReceiveAmount: Setter; + sendAmountFormatted: Accessor; + setSendAmountFormatted: Setter; + receiveAmountFormatted: Accessor; + setReceiveAmountFormatted: Setter; + amountChanged: Accessor; + setAmountChanged: Setter; + minimum: Accessor; + setMinimum: Setter; + maximum: Accessor; + setMaximum: Setter; + boltzFee: Accessor; + setBoltzFee: Setter; + minerFee: Accessor; + setMinerFee: Setter; + setInvoiceError: Setter; + invoiceError: Accessor; }; const CreateContext = createContext(); @@ -137,20 +137,26 @@ const CreateProvider = (props: { children: any }) => { const invoiceParam = detectUrlParam("invoice"); if (invoiceParam && invoiceParam !== "") { setInvoice(invoiceParam); - setReverse(false); } const addressParam = detectUrlParam("address"); if (addressParam && addressParam !== "") { setOnchainAddress(addressParam); - setReverse(true); } - const assetParam = detectUrlParam("asset"); + const assetSendParam = detectUrlParam("assetSend"); if ( - assetParam && - assetParam !== "" && - [BTC, LBTC, RBTC].includes(assetParam) + assetSendParam && + assetSendParam !== "" && + [BTC, LBTC, RBTC, LN].includes(assetSendParam) ) { - setAsset(assetParam); + setAssetSend(assetSendParam); + } + const assetReceiveParam = detectUrlParam("assetReceive"); + if ( + assetReceiveParam && + assetReceiveParam !== "" && + [BTC, LBTC, RBTC, LN].includes(assetReceiveParam) + ) { + setAssetReceive(assetReceiveParam); } const sendAmountParam = detectUrlParam("sendAmount"); if (sendAmountParam && sendAmountParam !== "") {