{{ isSelling ? $t('Sell NIM using Sinpe Móvil') : '' }}
+{{ isSelling ? $t('Sell NIM directly to your Sinpe Móvil account.') : '' }}
+-
+
- {{ $t('Confirm Sinpe number') }} +
- {{ isSelling ? $t('Set an amount to sell') : '' }} +
- 1 NIM =
- 1 BTC =
@@ -313,12 +313,11 @@ import {
cancelSwap,
getSwap,
Swap,
+ EurHtlcDetails,
} from '@nimiq/fastspot-api';
import {
- getHtlc,
Htlc as OasisHtlc,
HtlcStatus,
- sandboxMockClearHtlc,
TransactionType,
SepaClearingInstruction,
} from '@nimiq/oasis-api';
@@ -366,8 +365,8 @@ import {
useCurrentLimitCrypto,
useCurrentLimitFiat,
useSwapEstimate,
- eurPerBtc,
- eurPerNim,
+ fiatPerNim,
+ fiatPerBtc,
fetchAssets,
fiatCurrencyInfo,
getFiatSwapParameters,
@@ -378,6 +377,7 @@ import { useBankStore } from '../../stores/Bank';
import { useKycStore } from '../../stores/Kyc';
import KycPrompt from '../kyc/KycPrompt.vue';
import KycOverlay from '../kyc/KycOverlay.vue';
+import { getHtlc, sandboxMockClearHtlc } from '../../lib/OasisEur';
enum Pages {
WELCOME,
@@ -435,9 +435,9 @@ export default defineComponent({
get: () => {
if (_cryptoAmount.value !== 0) return _cryptoAmount.value;
if (!estimate.value) return 0;
-
- if (estimate.value.to.asset !== activeCurrency.value.toUpperCase()) return 0;
- return capDecimals(estimate.value.to.amount - estimate.value.to.fee, estimate.value.to.asset);
+ const { asset, amount, fee } = estimate.value.to;
+ if (asset !== activeCurrency.value.toUpperCase()) return 0;
+ return capDecimals(amount - fee, { asset });
},
set: (value: number) => {
_fiatAmount.value = 0;
@@ -527,7 +527,7 @@ export default defineComponent({
const btcAddress = availableExternalAddresses.value[0];
try {
- const { from, to } = getFiatSwapParameters(_fiatAmount.value
+ const { from, to } = getFiatSwapParameters(SwapAsset.EUR, _fiatAmount.value
? { from: { asset: SwapAsset.EUR, amount: fiatAmount.value } }
: { to: { amount: cryptoAmount.value } },
);
@@ -540,7 +540,7 @@ export default defineComponent({
// Update local fees with latest feePerUnit values
const { settlementFee } = calculateFees({ from: FiatCurrency.EUR }, undefined, {
- eur: swapSuggestion.from.fee || 0,
+ fiat: swapSuggestion.from.fee || 0,
nim: activeCurrency.value === CryptoCurrency.NIM ? swapSuggestion.to.feePerUnit! : 0,
btc: activeCurrency.value === CryptoCurrency.BTC ? swapSuggestion.to.feePerUnit! : 0,
});
@@ -741,7 +741,8 @@ export default defineComponent({
let oasisHtlc: OasisHtlc;
try {
// TODO: Retry getting the HTLC if first time fails
- oasisHtlc = await getHtlc(confirmedSwap.contracts[SwapAsset.EUR]!.htlc.address);
+ const eurHtlc = confirmedSwap.contracts[SwapAsset.EUR]!.htlc as EurHtlcDetails;
+ oasisHtlc = await getHtlc(eurHtlc.address);
if (oasisHtlc.status !== HtlcStatus.PENDING) {
throw new Error(`UNEXPECTED: OASIS HTLC is not 'pending' but '${oasisHtlc.status}'`);
}
@@ -883,7 +884,8 @@ export default defineComponent({
function onPaid() {
if (!swap.value!.fundingInstructions || swap.value!.fundingInstructions.type !== 'sepa') {
// We are in a test environment
- sandboxMockClearHtlc(swap.value!.contracts.EUR!.htlc.address);
+ const eurHtlc = swap.value!.contracts.EUR!.htlc as EurHtlcDetails;
+ sandboxMockClearHtlc(eurHtlc.address);
}
if (!swap.value!.stateEnteredAt) {
@@ -932,8 +934,8 @@ export default defineComponent({
goBack,
selectedFiatCurrency,
CryptoCurrency,
- eurPerNim,
- eurPerBtc,
+ fiatPerNim,
+ fiatPerBtc,
fiatFees: computed(() => fiatFees.value.settlement),
limits,
activeCurrency,
diff --git a/src/components/modals/BuyOptionsModal.vue b/src/components/modals/BuyOptionsModal.vue
index 6596ee0cd..b332f6964 100644
--- a/src/components/modals/BuyOptionsModal.vue
+++ b/src/components/modals/BuyOptionsModal.vue
@@ -9,10 +9,8 @@
+
- 1 NIM =
- 1 BTC =
@@ -277,10 +277,9 @@ import {
createSwap,
cancelSwap,
getSwap,
+ Contract,
} from '@nimiq/fastspot-api';
import {
- getHtlc,
- exchangeAuthorizationToken,
HtlcStatus,
TransactionType as OasisTransactionType,
} from '@nimiq/oasis-api';
@@ -329,8 +328,8 @@ import {
useCurrentLimitCrypto,
useCurrentLimitFiat,
useSwapEstimate,
- eurPerBtc,
- eurPerNim,
+ fiatPerBtc,
+ fiatPerNim,
fetchAssets,
fiatCurrencyInfo,
getFiatSwapParameters,
@@ -343,6 +342,7 @@ import {
import { useKycStore } from '../../stores/Kyc';
import KycPrompt from '../kyc/KycPrompt.vue';
import KycOverlay from '../kyc/KycOverlay.vue';
+import { exchangeAuthorizationToken, getHtlc } from '../../lib/OasisEur';
type KycResult = import('../../swap-kyc-handler').SetupSwapWithKycResult['kyc'];
@@ -356,6 +356,12 @@ enum Pages {
const ESTIMATE_UPDATE_DEBOUNCE_DURATION = 500; // ms
export default defineComponent({
+ props: {
+ fiatCurrency: {
+ type: String as () => FiatCurrency,
+ default: FiatCurrency.EUR,
+ },
+ },
setup(props, context) {
const { activeAccountInfo, activeCurrency, hasBitcoinAddresses } = useAccountStore();
const { activeAddressInfo, activeAddress } = useAddressStore();
@@ -414,8 +420,10 @@ export default defineComponent({
if (_cryptoAmount.value !== 0) return _cryptoAmount.value;
if (!estimate.value) return 0;
+ const { asset, amount, fee } = estimate.value.from;
if (estimate.value.from.asset !== activeCurrency.value.toUpperCase()) return 0;
- return capDecimals(estimate.value.from.amount + estimate.value.from.fee, estimate.value.from.asset);
+ if (asset !== activeCurrency.value.toUpperCase()) return 0;
+ return capDecimals(amount + fee, { asset });
},
set: (value: number) => {
_fiatAmount.value = 0;
@@ -517,7 +525,7 @@ export default defineComponent({
const btcAddress = availableExternalAddresses.value[0];
try {
- const { from, to } = getFiatSwapParameters(_fiatAmount.value
+ const { from, to } = getFiatSwapParameters(SwapAsset.EUR, _fiatAmount.value
? { to: { asset: SwapAsset.EUR, amount: fiatAmount.value } }
: { from: { amount: cryptoAmount.value } },
);
@@ -530,7 +538,7 @@ export default defineComponent({
// Update local fees with latest feePerUnit values
const { fundingFee } = calculateFees({ to: FiatCurrency.EUR }, swapSuggestion.from.amount, {
- eur: swapSuggestion.to.fee || 0,
+ fiat: swapSuggestion.to.fee || 0,
nim: activeCurrency.value === CryptoCurrency.NIM ? swapSuggestion.from.feePerUnit! : 0,
btc: activeCurrency.value === CryptoCurrency.BTC ? swapSuggestion.from.feePerUnit! : 0,
});
@@ -789,7 +797,8 @@ export default defineComponent({
});
// Fetch OASIS HTLC to get clearing instructions
- const oasisHtlc = await getHtlc(confirmedSwap.contracts[SwapAsset.EUR]!.htlc.address);
+ const eurContract = confirmedSwap.contracts[SwapAsset.EUR] as Contract
+ {{ $t("Enter your Sinpe Móvil phone number.") }}
+
+ {{
+ $t("Enter the code sent to {phoneNumber} to approve.", {
+ phoneNumber: `${phoneNumber}`,
+ })
+ }}
+ {{ errorMessage }}
{{ $t('No funds were received so the swap expired.') }}
{{ $t('Click on ‘Troubleshooting’ to learn more.') }}
+ 
+
+
+ {{ $t('The swap expired') }}
-
+
{{ $t('Any funds sent will be refunded within 1-3 days.') }}
{{ $t('Any funds sent will be refunded.') }}
@@ -116,7 +116,10 @@
{{ $t('You have exceeded your OASIS limit.') }}
- {{ $t('Your EUR will be transferred to your bank account as soon as new limit is available.') }} + {{ + $t('Your {fiatCurrency} will be transferred to your bank account' + + 'as soon as new limit is available.', toAsset) + }}
-
@@ -209,13 +212,13 @@
(manualFunding && state === SwapState.CREATE_OUTGOING)
|| (toFundingDurationMins && state === SwapState.AWAIT_INCOMING)
|| (fromFundingDurationMins && state === SwapState.CREATE_OUTGOING)
- || (oasisLimitExceeded && toAsset === SwapAsset.EUR)
+ || (oasisLimitExceeded && isFiatAsset(toAsset))
? 'bottom'
: 'top'
} right`"
>
-
@@ -294,7 +294,7 @@
4/5 {{ $t('Awaiting swap secret') }}
-
+
5/5 {{ $t('Processing payout') }}
@@ -303,7 +303,7 @@
{{
$t('You will finalize your purchase by bank transfer.')
@@ -315,7 +315,7 @@
}}
-
+
{{
$t('Don\'t close your wallet until the swap is complete!')
@@ -364,7 +364,7 @@ import OverflowingCup from '../icons/OverflowingCup.vue';
import Amount from '../Amount.vue';
import ShortAddress from '../ShortAddress.vue';
import BlueLink from '../BlueLink.vue';
-import { SwapState, SwapErrorAction } from '../../stores/Swaps';
+import { SwapState, SwapErrorAction, isFiatAsset } from '../../stores/Swaps';
import { formatDuration } from '../../lib/Time';
import { getColorClass } from '../../lib/AddressColor';
import { explorerAddrLink } from '../../lib/ExplorerUtils';
@@ -372,6 +372,7 @@ import { assetToCurrency } from '../../lib/swap/utils/Assets';
import BitcoinSvg from './animation/bitcoin.svg';
import UsdcSvg from './animation/usdc.svg';
import BankSvg from './animation/bank.svg';
+import SinpeMovilSvg from './animation/sinpe-movil.svg';
import MessageTransition from '../MessageTransition.vue';
export default defineComponent({
@@ -469,28 +470,8 @@ export default defineComponent({
const leftAsset = computed(() => props.switchSides ? props.toAsset : props.fromAsset);
const rightAsset = computed(() => props.switchSides ? props.fromAsset : props.toAsset);
- // TODO: Deduplicate leftColor vs rightColor code
- const leftColor = computed(() => {
- switch (leftAsset.value) {
- case SwapAsset.NIM: {
- if (!props.nimAddress) return '';
-
- const className = getColorClass(props.nimAddress);
- if (className === 'nq-blue') return 'white';
-
- return `var(--${className.replace('nq-', 'nimiq-')})`;
- }
- case SwapAsset.BTC: return '#f7931a';
- case SwapAsset.USDC_MATIC: return '#2775ca';
- case SwapAsset.EUR: return props.bankColor;
- default: return '';
- }
- });
-
- const rightColor = computed(() => {
- if (props.oasisLimitExceeded && rightAsset.value === SwapAsset.EUR) return 'white';
-
- switch (rightAsset.value) {
+ function getColor(asset: SwapAsset) {
+ switch (asset) {
case SwapAsset.NIM: {
if (!props.nimAddress) return '';
@@ -502,9 +483,10 @@ export default defineComponent({
case SwapAsset.BTC: return '#f7931a';
case SwapAsset.USDC_MATIC: return '#2775ca';
case SwapAsset.EUR: return props.bankColor;
+ case SwapAsset.CRC: return '#0D2D49';
default: return '';
}
- });
+ }
function assetToName(asset: SwapAsset) {
switch (asset) {
@@ -512,6 +494,7 @@ export default defineComponent({
case SwapAsset.BTC: return 'Bitcoin';
case SwapAsset.USDC_MATIC: return 'USD Coin';
case SwapAsset.EUR: return 'Euro';
+ case SwapAsset.CRC: return 'Colones';
default: throw new Error(`Invalid asset ${asset}`);
}
}
@@ -641,14 +624,18 @@ export default defineComponent({
return false;
});
+ const rightLogo = rightAsset.value === SwapAsset.BTC ? BitcoinSvg
+ : rightAsset.value === SwapAsset.USDC_MATIC ? UsdcSvg
+ : rightAsset.value === SwapAsset.CRC ? SinpeMovilSvg
+ : (props.bankLogo || BankSvg);
+
return {
SwapState,
state,
animationClassName,
leftAsset,
rightAsset,
- leftColor,
- rightColor,
+ getColor,
identicon$,
identiconUrl,
setState,
@@ -664,6 +651,8 @@ export default defineComponent({
timer,
assetToCurrency,
errorActionText,
+ isFiatAsset,
+ rightLogo,
};
},
components: {
diff --git a/src/components/swap/SwapBalanceBar.vue b/src/components/swap/SwapBalanceBar.vue
index 34ec00ab6..001cca5d6 100644
--- a/src/components/swap/SwapBalanceBar.vue
+++ b/src/components/swap/SwapBalanceBar.vue
@@ -360,9 +360,13 @@ export default defineComponent({
const DECIMALS = {
[SwapAsset.NIM]: 5,
[SwapAsset.BTC]: 8,
- [SwapAsset.USDC]: 6, // For TS completeness
[SwapAsset.USDC_MATIC]: 6,
- [SwapAsset.EUR]: 2, // For TS completeness
+
+ // For TS completeness
+ [SwapAsset.USDC]: 6,
+ [SwapAsset.EUR]: 2,
+ [SwapAsset.CRC]: 0,
+ [SwapAsset.BTC_LN]: 8,
} as const;
function updateSwapBalanceBar(cursorPosition?: number) {
diff --git a/src/components/swap/SwapModal.vue b/src/components/swap/SwapModal.vue
index dddd813ad..8dbc17206 100644
--- a/src/components/swap/SwapModal.vue
+++ b/src/components/swap/SwapModal.vue
@@ -284,6 +284,8 @@ import {
RequestAsset,
getSwap,
Swap,
+ NimHtlcDetails,
+ Contract,
} from '@nimiq/fastspot-api';
import { captureException } from '@sentry/vue';
import type { BigNumber } from 'ethers';
@@ -463,9 +465,13 @@ export default defineComponent({
const DECIMALS = {
[SwapAsset.NIM]: 5,
[SwapAsset.BTC]: 8,
- [SwapAsset.USDC]: 6, // For TS completeness
[SwapAsset.USDC_MATIC]: 6,
- [SwapAsset.EUR]: 2, // For TS completeness
+
+ // For TS completeness
+ [SwapAsset.USDC]: 6,
+ [SwapAsset.EUR]: 2,
+ [SwapAsset.CRC]: 0,
+ [SwapAsset.BTC_LN]: 0,
} as const;
function effectiveDecimals(asset: SwapAsset) {
@@ -1084,9 +1090,13 @@ export default defineComponent({
switch (asset) { // eslint-disable-line default-case
case SwapAsset.NIM: return activeAddressInfo.value?.balance ?? 0;
case SwapAsset.BTC: return accountBtcBalance.value;
- case SwapAsset.USDC: return 0; // not supported for swapping
case SwapAsset.USDC_MATIC: return accountUsdcBalance.value;
+
+ // Unsupported assets for swaps
+ case SwapAsset.BTC_LN: return 0;
+ case SwapAsset.USDC: return 0; // Legacy bridged USDC
case SwapAsset.EUR: return 0;
+ case SwapAsset.CRC: return 0;
}
}
@@ -1846,10 +1856,10 @@ export default defineComponent({
if (SwapAsset.NIM in confirmedSwap.contracts) {
// Place NIM HTLC address into the swap object, as it's otherwise unknown for NIM-to-BTC swaps
- const nimHtlcAddress = confirmedSwap.from.asset === SwapAsset.NIM
+ const nimHtlc = confirmedSwap.contracts[SwapAsset.NIM]!.htlc as NimHtlcDetails;
+ nimHtlc.address = confirmedSwap.from.asset === SwapAsset.NIM
? signedTransactions.nim!.raw.recipient
: signedTransactions.nim!.raw.sender;
- confirmedSwap.contracts[SwapAsset.NIM]!.htlc.address = nimHtlcAddress;
}
setActiveSwap({
@@ -2032,7 +2042,7 @@ export default defineComponent({
console.warn('No swap found'); // eslint-disable-line no-console
return;
}
- const usdcHtlc = swap.value.contracts[SwapAsset.USDC_MATIC];
+ const usdcHtlc = swap.value.contracts[SwapAsset.USDC_MATIC] as Contract;
if (!usdcHtlc) {
console.warn('No USDC HTLC found in swap', swap.value); // eslint-disable-line no-console
return;
diff --git a/src/components/swap/SwapNotification.vue b/src/components/swap/SwapNotification.vue
index 37903136c..f3107857a 100644
--- a/src/components/swap/SwapNotification.vue
+++ b/src/components/swap/SwapNotification.vue
@@ -1,7 +1,7 @@