diff --git a/src/components/DualCurrencyInput.vue b/src/components/DualCurrencyInput.vue
index a34bc597a..b58051902 100644
--- a/src/components/DualCurrencyInput.vue
+++ b/src/components/DualCurrencyInput.vue
@@ -2,7 +2,8 @@
 <div class="dual-currency-input">
   <section :class="{ orange: !!invalidReason }">
     <div class="flex-row primary-amount">
-      <AmountInput v-model="_cryptoAmount" :decimals="cryptoCurrencyDecimals">
+      <AmountInput :value="cryptoAmount" @input="$emit('update:cryptoAmount', $event)"
+        :decimals="cryptoCurrencyDecimals">
         <div class="amount-menu ticker" slot="suffix">
           <button class="reset button flex-row" @click.stop="currencySelectorOpen = !currencySelectorOpen">
             {{ cryptoCurrency.toUpperCase() }}
@@ -29,7 +30,8 @@
           <path d="M23.75 15.25l6.5 6.5-6.5 6.5" stroke-linejoin="round" />
         </g>
       </svg>
-      <AmountInput v-model="_fiatAmount" :decimals="fiatCurrencyDecimals" placeholder="0.00">
+      <AmountInput :value="fiatAmount" @input="$emit('update:fiatAmount', $event)"
+        :decimals="fiatCurrencyDecimals" placeholder="0.00">
         <span slot="suffix" class="ticker">{{ fiatCurrency.toUpperCase() }}</span>
       </AmountInput>
     </span>
@@ -38,7 +40,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref, watch } from '@vue/composition-api';
+import { defineComponent, ref } from '@vue/composition-api';
 import { CryptoCurrency, FiatCurrency } from '@/lib/Constants';
 import AmountInput from './AmountInput.vue';
 
@@ -76,43 +78,12 @@ export default defineComponent({
         },
         invalidReason: String,
     },
-    setup(props, context) {
+    setup() {
         const currencySelectorOpen = ref(false);
 
-        const _fiatAmount = computed({
-            get: () => props.fiatAmount,
-            set: (newValue) => context.emit('update:fiatAmount', newValue),
-        });
-        const _cryptoAmount = computed({
-            get: () => props.cryptoAmount,
-            set: (newValue) => { context.emit('update:cryptoAmount', newValue); },
-        });
-
-        const syncing = ref(false);
-
-        watch(_fiatAmount, (newVal) => {
-            if (syncing.value) return;
-            syncing.value = true;
-            const newCryptoValue = Number(((newVal / props.exchangeRate) * 10 ** props.cryptoCurrencyDecimals)
-                .toFixed(props.cryptoCurrencyDecimals));
-            context.emit('update:cryptoAmount', newCryptoValue);
-            setTimeout(() => syncing.value = false, 100);
-        }, { lazy: true });
-
-        watch(_cryptoAmount, (newVal) => {
-            if (syncing.value) return;
-            syncing.value = true;
-            const newFiatValue = Number(((newVal / 10 ** props.cryptoCurrencyDecimals) * props.exchangeRate)
-                .toFixed(props.fiatCurrencyDecimals));
-            context.emit('update:fiatAmount', newFiatValue);
-            setTimeout(() => syncing.value = false, 100);
-        }, { lazy: true });
-
         return {
             currencySelectorOpen,
             CryptoCurrency,
-            _fiatAmount,
-            _cryptoAmount,
         };
     },
     components: {
diff --git a/src/components/modals/AssetTransferModal.vue b/src/components/modals/AssetTransferModal.vue
index b64db3697..16648dcfb 100644
--- a/src/components/modals/AssetTransferModal.vue
+++ b/src/components/modals/AssetTransferModal.vue
@@ -6,7 +6,14 @@
     @close="closeModal"
     @close-overlay="() => (p.addressListOpened = false)"
   >
-    <div v-if="!p">Loading fees</div>
+    <div v-if="!p" class="loading-wrapper">
+      <div class="loading-container">
+      <CircleSpinner />
+      <p>
+        {{ $t("Loading...") }}
+      </p>
+      </div>
+    </div>
     <div v-else class="asset-transfer-input">
       <PageHeader>{{ p.modalTitle }}</PageHeader>
       <PageBody class="flex-column">
@@ -55,8 +62,6 @@
               </template>
             </i18n>
           </SwapFeesTooltip>
-          {{p.limits}}
-          current: {{p.currentLimitFiat}}
           <Tooltip
             :styles="{ width: '28.75rem' }"
             preferredPosition="bottom left"
@@ -69,7 +74,7 @@
                 v-if="p.limits"
                 :amount="p.currentLimitFiat"
                 :currency="p.currencyFiatFallback.toLocaleLowerCase()"
-                hideDecimals
+                hide-decimals
               />
               <CircleSpinner v-else />
             </div>
@@ -118,14 +123,12 @@
         </section>
 
         <DualCurrencyInput
-          :fiatAmount.sync="p.fiatAmount"
-          :cryptoAmount.sync="p.cryptoAmount"
+          :fiatAmount.sync="fiatAmount"
+          :cryptoAmount.sync="cryptoAmount"
           :fiatCurrency="p.currencyFiatFallback.toLocaleLowerCase()"
           :cryptoCurrency="p.currencyCrypto.toLocaleLowerCase()"
           :fiatCurrencyDecimals="p.decimalsFiat"
           :cryptoCurrencyDecimals="p.decimalsCrypto"
-          :maxCrypto="p.currentLimitCrypto"
-          :maxFiat="p.currentLimitFiat"
           :exchangeRate="p.exchangeRate"
           :invalid-reason="p.invalidReason"
           @set-max="setMax()"
@@ -147,8 +150,8 @@
             {{ $t("Insufficient balance.") }}
             <a @click="() => setMax()">{{ $t("Sell max") }}</a>
           </template>
-          <template v-else-if="p.estimateError">
-            {{ p.estimateError }}
+          <template v-else-if="estimateError">
+            {{ estimateError }}
           </template>
         </MessageTransition>
       </PageBody>
@@ -156,7 +159,7 @@
         <button
           class="nq-button light-blue"
           @mousedown.prevent
-          :disabled="!p.canSign || p.invalid || !p.fiatAmount || !p.cryptoAmount"
+          :disabled="!p.canSign || p.invalid || !fiatAmount || !cryptoAmount"
           @click="p.sign()"
         >
           {{ $t("Confirm") }}
@@ -245,6 +248,7 @@ import {
     defineComponent,
     onMounted,
     ref,
+    watch,
 } from '@vue/composition-api';
 import {
     AssetTransferMethod,
@@ -264,9 +268,10 @@ import {
 import { ENV_MAIN } from '@/lib/Constants';
 import { useAddressStore } from '@/stores/Address';
 import { useBtcAddressStore } from '@/stores/BtcAddress';
-import { SwapState, useSwapsStore } from '@/stores/Swaps';
+import { isFiatAsset, SwapState, useSwapsStore } from '@/stores/Swaps';
 import { SwapAsset } from '@nimiq/libswap';
 import { useConfig } from '@/composables/useConfig';
+import { capDecimals, useSwapEstimate } from '@/lib/swap/utils/CommonUtils';
 import AddressList from '../AddressList.vue';
 import DualCurrencyInput from '../DualCurrencyInput.vue';
 import FiatConvertedAmount from '../FiatConvertedAmount.vue';
@@ -293,13 +298,54 @@ export default defineComponent({
     },
     setup(props, context) {
         const p /* params */ = ref<AssetTransferParams>(null);
-        const cryptoAmount = computed(
-            () => (p.value?.cryptoAmount as unknown as number) || 0,
-        );
+
+        const { estimate } = useSwapEstimate();
+
+        const _fiatAmount = ref(0);
+        const fiatAmount = computed({
+            get: () => {
+                console.log(_fiatAmount.value);
+                if (_fiatAmount.value !== 0) return _fiatAmount.value;
+                console.log(estimate.value);
+                if (!estimate?.value) return 0;
+                console.log(estimate.value.to.asset, estimate.value);
+                if (!isFiatAsset(estimate.value.to.asset)) return 0;
+                console.log(estimate.value.to.amount, estimate.value.to.fee);
+                return estimate.value.to.amount - estimate.value.to.fee;
+            },
+            set: (value: number) => {
+                _cryptoAmount.value = 0;
+                _fiatAmount.value = value;
+                onInput(value);
+            },
+        });
+
+        const _cryptoAmount = ref(0);
+        const cryptoAmount = computed({
+            get: () => {
+                if (_cryptoAmount.value !== 0) return _cryptoAmount.value;
+                if (!estimate.value || !p.value?.currencyCrypto) return 0;
+                if (estimate.value.from.asset !== p.value.currencyCrypto) return 0;
+                return capDecimals(estimate.value.from.amount + estimate.value.from.fee, estimate.value.from.asset);
+            },
+            set: (value: number) => {
+                _fiatAmount.value = 0;
+                _cryptoAmount.value = value;
+                onInput(value);
+            },
+        });
+
+        const fetchingEstimate = ref<boolean>(false);
 
         onMounted(async () => {
             const options: AssetTransferOptions = {
                 pair: props.pair,
+                cryptoAmount,
+                fiatAmount,
+                estimate,
+                updateEstimate,
+                estimateError,
+                fetchingEstimate,
             };
 
             switch (props.method) {
@@ -315,35 +361,73 @@ export default defineComponent({
             }
         });
 
+        let updateEstimateFn: (args: any) => Promise<void>;
+        const estimateError = ref<string>(null);
+        let timeoutId: number | undefined;
+
+        async function updateEstimate() {
+            if (!p.value) return;
+            clearTimeout(timeoutId);
+
+            fetchingEstimate.value = true;
+
+            if (!updateEstimateFn) {
+                updateEstimateFn = p.value?.isSelling
+                    ? (await import('@/lib/swap/utils/SellUtils')).updateSellEstimate
+                    : (await import('@/lib/swap/utils/BuyUtils')).updateBuyEstimate;
+            }
+
+            const args = _fiatAmount.value
+                ? { fiatAmount: fiatAmount.value, fiatAsset: p.value.currencyFiatFallback }
+                : { cryptoAmount: cryptoAmount.value, fiatAsset: p.value.currencyFiatFallback };
+            await updateEstimateFn(args).then(() => {
+                estimateError.value = null;
+            }).catch((error) => {
+                console.warn(error); // eslint-disable-line no-console
+                estimateError.value = error.message;
+            });
+
+            fetchingEstimate.value = false;
+        }
+
+        function onInput(val: number) {
+            clearTimeout(timeoutId);
+
+            if (!val) {
+                estimate.value = null;
+                estimateError.value = null;
+                return;
+            }
+
+            timeoutId = window.setTimeout(updateEstimate, 500);
+            fetchingEstimate.value = true;
+        }
+
         const { activeAddressInfo } = useAddressStore();
         const { accountBalance: accountBtcBalance } = useBtcAddressStore();
 
         function setMax() {
             if (!p.value?.isSelling) return;
+            const currentLimitCrypto = p.value.currentLimitCrypto.value;
 
             switch (p.value.currencyCrypto) {
                 case SwapAsset.NIM: {
-                    if (!p.value.currentLimitCrypto.value) {
-                        p.value.updateCryptoAmount(activeAddressInfo.value?.balance || 0);
-                    } else if (
-                        p.value.currentLimitCrypto.value
-            < (activeAddressInfo.value?.balance || 0)
-                    ) {
-                        p.value.updateCryptoAmount(p.value.currentLimitCrypto.value);
+                    if (!currentLimitCrypto) {
+                        cryptoAmount.value = activeAddressInfo.value?.balance || 0;
+                    } else if (currentLimitCrypto < (activeAddressInfo.value?.balance || 0)) {
+                        cryptoAmount.value = currentLimitCrypto;
                     } else {
-                        p.value.updateCryptoAmount(activeAddressInfo.value?.balance || 0);
+                        cryptoAmount.value = activeAddressInfo.value?.balance || 0;
                     }
                     break;
                 }
                 case SwapAsset.BTC: {
-                    if (!p.value.currentLimitCrypto.value) {
-                        p.value.updateCryptoAmount(accountBtcBalance.value);
-                    } else if (
-                        p.value.currentLimitCrypto.value < accountBtcBalance.value
-                    ) {
-                        p.value.updateCryptoAmount(p.value.currentLimitCrypto.value);
+                    if (!currentLimitCrypto) {
+                        cryptoAmount.value = accountBtcBalance.value;
+                    } else if (currentLimitCrypto < accountBtcBalance.value) {
+                        cryptoAmount.value = currentLimitCrypto;
                     } else {
-                        p.value.updateCryptoAmount(accountBtcBalance.value);
+                        cryptoAmount.value = accountBtcBalance.value;
                     }
                     break;
                 }
@@ -351,7 +435,7 @@ export default defineComponent({
                     throw new Error('Invalid currency');
             }
 
-            p.value.updateFiatAmount(cryptoAmount.value * p.value.exchangeRate.value);
+            fiatAmount.value = cryptoAmount.value * p.value.exchangeRate.value;
         }
 
         function finishSwap() {
@@ -380,6 +464,9 @@ export default defineComponent({
             SwapState,
             SwapAsset,
             activeAddressInfo,
+            cryptoAmount,
+            fiatAmount,
+            estimateError,
         };
     },
     components: {
@@ -406,6 +493,19 @@ export default defineComponent({
 
 <style scoped lang="scss">
 .asset-transfer-modal {
+  .loading-wrapper {
+    display: grid;
+    place-content: center;
+    height: 100%;
+
+    .loading-container {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      gap: 2rem;
+    }
+  }
+
   .asset-transfer-input {
     position: relative;
     height: 100%;
diff --git a/src/components/modals/SinpeMovilMobileVerificationModal.vue b/src/components/modals/SinpeMovilMobileVerificationModal.vue
index 8310e009d..aa9a9af81 100644
--- a/src/components/modals/SinpeMovilMobileVerificationModal.vue
+++ b/src/components/modals/SinpeMovilMobileVerificationModal.vue
@@ -116,11 +116,7 @@ import { useAddressStore } from '@/stores/Address';
 import { useSinpeMovilStore } from '@/stores/SinpeMovil';
 import { SwapAsset } from '@nimiq/libswap';
 import { AssetTransferMethod } from '@/composables/asset-transfer/types';
-import {
-    CryptoCurrency,
-    FiatCurrency,
-    SINPE_MOVIL_PAIRS,
-} from '@/lib/Constants';
+import { SINPE_MOVIL_PAIRS } from '@/lib/Constants';
 import { isFiatAsset } from '@/stores/Swaps';
 import Modal from './Modal.vue';
 
@@ -284,6 +280,7 @@ export default defineComponent({
 
         /**
      * Detects the OTP code from the browser's autofill feature and fills the input.
+     * https://developer.chrome.com/docs/identity/web-apis/web-otp
      */
         function detectOtp() {
             if (!('OTPCredential' in window)) return;
@@ -316,7 +313,7 @@ export default defineComponent({
             if (otpCodeIsValid.value) verifyOtp();
         });
 
-        const { setData, reset: resetSinpeMovilStore } = useSinpeMovilStore();
+        const { setData, resetUser: resetSinpeMovilStore } = useSinpeMovilStore();
         resetSinpeMovilStore();
 
         async function verifyOtp() {
@@ -347,7 +344,6 @@ export default defineComponent({
                 .then(async (res) => {
                     if (!res.ok) {
                         state.value = SinpeMovilFlowState.Error;
-                        console.log(res.status);
                         errorMessage.value = res.status === 412
                             ? (context.root.$t('The code you entered is incorrect. Please try again.') as string)
                             : (context.root.$t(
@@ -365,8 +361,7 @@ export default defineComponent({
                     state.value = SinpeMovilFlowState.PhoneVerified;
                     setData({
                         phoneNumber: phoneNumber.value,
-                        token: json.token!,
-                        tokenTimestamp: sendSmsResponse.value!.timestamp,
+                        smsApiToken: json.token!,
                     });
                     context.root.$router.push({
                         name: RouteName.AssetTransfer,
@@ -376,8 +371,6 @@ export default defineComponent({
                         },
                         query: context.root.$router.currentRoute.query,
                     });
-
-                    setTimeout(reset, 1000);
                 })
                 .catch((error) => {
                     errorMessage.value = error.message
diff --git a/src/components/swap/SwapAnimation.vue b/src/components/swap/SwapAnimation.vue
index 3e834987f..c04517989 100644
--- a/src/components/swap/SwapAnimation.vue
+++ b/src/components/swap/SwapAnimation.vue
@@ -237,10 +237,7 @@
                         </g>
                         <g class="logo" fill="none" opacity="1">
                             <path :fill="rightAsset === SwapAsset.EUR ? bankColor : 'currentColor'" d="M143.22 54.29a26 26 0 11-18.93-31.51 26 26 0 0118.93 31.51z" />
-                            <image
-                                :href="rightAsset === SwapAsset.BTC ? BitcoinSvg : rightAsset === SwapAsset.USDC_MATIC ? UsdcSvg : (bankLogo || BankSvg)"
-                                x="92" y="22" width="52" height="52"
-                            />
+                            <image :href="rightLogo" x="92" y="22" width="52" height="52" />
                         </g>
                     </svg>
                     <svg v-else xmlns="http://www.w3.org/2000/svg" width="177" height="96" viewBox="0 0 177 96" class="piece" :style="`color: ${rightColor}`">
@@ -375,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({
@@ -506,7 +504,7 @@ 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';
+                case SwapAsset.CRC: return '#225AA8';
                 default: return '';
             }
         });
@@ -647,6 +645,11 @@ 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,
@@ -671,6 +674,7 @@ export default defineComponent({
             assetToCurrency,
             errorActionText,
             isFiatAsset,
+            rightLogo,
         };
     },
     components: {
diff --git a/src/components/swap/SwapNotification.vue b/src/components/swap/SwapNotification.vue
index 3b1d7ae3d..93fbb8c15 100644
--- a/src/components/swap/SwapNotification.vue
+++ b/src/components/swap/SwapNotification.vue
@@ -68,7 +68,6 @@ import type { ForwardRequest } from '@opengsn/common/dist/EIP712/ForwardRequest'
 import { Event as PolygonEvent, EventType as PolygonEventType } from '@nimiq/libswap/dist/src/UsdcAssetAdapter';
 import { captureException } from '@sentry/vue';
 import { SINPE_MOVIL_PAIRS } from '@/lib/Constants';
-import { useSinpeMovilStore } from '@/stores/SinpeMovil';
 import MaximizeIcon from '../icons/MaximizeIcon.vue';
 import { useSwapsStore,
     SwapState, ActiveSwap, SwapEurData, SwapErrorAction, isFiatAsset, SwapCrcData } from '../../stores/Swaps';
@@ -106,7 +105,6 @@ export default defineComponent({
             state: swap$,
         } = useSwapsStore();
         const { bank, bankAccount } = useBankStore();
-        const { phoneNumber } = useSinpeMovilStore();
         const { config } = useConfig();
 
         const swapIsComplete = computed(() => !!activeSwap.value && activeSwap.value.state === SwapState.COMPLETE);
@@ -646,21 +644,12 @@ export default defineComponent({
                         }
                     } else {
                         try {
-                            let smsApi: string | undefined;
-                            if (activeSwap.value.to.asset === SwapAsset.CRC) {
-                                const { smsApiToken } = await import('@/stores/SinpeMovil')
-                                    .then((module) => module.useSinpeMovilStore());
-                                if (!smsApiToken.value) {
-                                    throw new Error('Sinpe Movil API token not available');
-                                }
-                                smsApi = smsApiToken.value;
-                            }
                             const settlementTx = await swapHandler.settleIncoming(
                                 activeSwap.value!.settlementSerializedTx!,
                                 activeSwap.value!.secret!,
                                 {
                                     authorization: activeSwap.value!.settlementAuthorizationToken,
-                                    smsApi,
+                                    smsApi: swap$.activeSwap?.settlementSmsToken,
                                 },
                             );
 
@@ -690,7 +679,7 @@ export default defineComponent({
                                 } as SwapEurData) : ({
                                     asset: SwapAsset.CRC,
                                     amount: htlc.amount,
-                                    phoneNumber: phoneNumber.value,
+                                    phoneNumber: activeSwap.value.phoneNumber,
                                     htlc: htlcData,
                                 } as SwapCrcData);
 
diff --git a/src/components/swap/animation/sinpe-movil.svg b/src/components/swap/animation/sinpe-movil.svg
new file mode 100644
index 000000000..48412a000
--- /dev/null
+++ b/src/components/swap/animation/sinpe-movil.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="52" height="52" fill="none"><g fill="#fff" clip-path="url(#a)"><path d="M37.144 23.332c.349-1.408.651-2.833.198-4.26-.386-1.214-1.332-2.28-2.542-2.567-.882-.21-1.807 0-2.666.292-4.092 1.397-7.306 4.6-10.73 7.293 3.17-3.49 6.68-6.705 10.707-9.085 1.396-.825 2.869-1.554 4.446-1.888.897-.19 1.934-.212 2.612.42.505.47.693 1.2.767 1.896.432 4.03-1.395 8.078-2.917 11.683-.672 1.593-1.47 3.127-2.323 4.624-.81 1.422-1.67 2.811-2.53 4.2 1.06-2.15 2.013-4.349 2.91-6.575"/><path d="M15.698 27.765c-.511 1.355-.978 2.732-.696 4.205.24 1.253 1.056 2.428 2.223 2.863.851.317 1.793.224 2.68.04 4.226-.88 7.792-3.661 11.506-5.91-3.555 3.072-7.417 5.828-11.693 7.692-1.482.646-3.03 1.188-4.634 1.324-.913.077-1.945-.03-2.544-.742-.446-.53-.547-1.277-.54-1.977.045-4.054 2.332-7.846 4.265-11.236.854-1.498 1.826-2.922 2.848-4.303.97-1.31 1.986-2.584 3.003-3.856-1.304 2.003-2.507 4.068-3.658 6.167"/></g><defs><clipPath id="a"><path fill="#fff" d="M12 13h28v25H12z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/composables/asset-transfer/types.ts b/src/composables/asset-transfer/types.ts
index 935dc57d3..37a83383a 100644
--- a/src/composables/asset-transfer/types.ts
+++ b/src/composables/asset-transfer/types.ts
@@ -2,6 +2,7 @@ import { FundingFees } from '@/lib/swap/utils/Functions';
 import { ActiveSwap } from '@/stores/Swaps';
 import { SwapAsset } from '@nimiq/libswap';
 import { CryptoSwapAsset, FiatSwapAsset } from '@/lib/swap/utils/CommonUtils';
+import { Estimate } from '@nimiq/fastspot-api';
 import { Ref } from '@vue/composition-api';
 import { VueConstructor } from 'vue';
 import { SwapLimits } from '../useSwapLimits';
@@ -12,6 +13,12 @@ export enum AssetTransferMethod {
 
 export interface AssetTransferOptions {
   pair: [SwapAsset, SwapAsset];
+  fiatAmount: Ref<number>;
+  cryptoAmount: Ref<number>;
+  estimate: Ref<Estimate | null>;
+  updateEstimate: () => Promise<void>;
+  estimateError: Ref<string | null>;
+  fetchingEstimate: Ref<boolean>;
 }
 
 type VueComponent = VueConstructor<Vue>;
@@ -27,11 +34,7 @@ export interface AssetTransferParams {
   currencyFiatFallback: FiatSwapAsset;
   currencyCrypto: CryptoSwapAsset;
 
-  fiatAmount: Ref<number>;
-  cryptoAmount: Ref<number>;
   exchangeRate: Computed<number>;
-  updateFiatAmount: (value: number) => void;
-  updateCryptoAmount: (value: number) => void;
 
   decimalsCrypto: Computed<number>;
   decimalsFiat: Computed<number>;
@@ -55,7 +58,7 @@ export interface AssetTransferParams {
 
   detectionDelay: number;
 
-  oasisSellLimitExceeded: boolean;
+  oasisLimitExceeded: Computed<boolean>;
 
   invalidReason: Computed<string>;
 
diff --git a/src/composables/asset-transfer/useSinpeMovilSwap.ts b/src/composables/asset-transfer/useSinpeMovilSwap.ts
index 159c8b1bd..a296e7804 100644
--- a/src/composables/asset-transfer/useSinpeMovilSwap.ts
+++ b/src/composables/asset-transfer/useSinpeMovilSwap.ts
@@ -4,18 +4,16 @@ import {
     OASIS_CRC_DETECTION_DELAY,
     FIAT_CURRENCIES_OFFERED,
     ENV_MAIN,
+    SINPE_MOVIL_PAIRS,
 } from '@/lib/Constants';
-import { computed, ref, watch } from '@vue/composition-api';
+import { computed, ref } from '@vue/composition-api';
 import { selectedFiatCurrency,
     fiatFees,
     useCurrentLimitFiat,
     useCurrentLimitCrypto,
     calculateFees,
     getFiatSwapParameters,
-    useSwapEstimate,
-    capDecimals,
-    FiatSwapCurrency,
-} from '@/lib/swap/utils/CommonUtils';
+    FiatSwapCurrency } from '@/lib/swap/utils/CommonUtils';
 import { i18n } from '@/i18n/i18n-setup';
 import { useAddressStore } from '@/stores/Address';
 import { useSwapsStore, SwapState } from '@/stores/Swaps';
@@ -41,34 +39,37 @@ import {
     TransactionType as OasisTransactionType,
 } from '@nimiq/oasis-api';
 import { captureException } from '@sentry/vue';
-import { useSinpeMovilStore } from '@/stores/SinpeMovil';
 import router, { RouteName } from '@/router';
+import { useSinpeMovilStore } from '@/stores/SinpeMovil';
 import { SwapLimits, useSwapLimits } from '../useSwapLimits';
 import SinpeUserInfo from '../../components/SinpeUserInfo.vue';
 import AddressSelector from '../../components/AddressSelector.vue';
 import { AssetTransferOptions, AssetTransferParams } from './types';
 import { useConfig } from '../useConfig';
 
-// Union of all the possible fiat currencies that can be used with SinpeMovil
-type SinpeFiatCurrencies = FiatCurrency.CRC;
-
 function isCryptoCurrency(currency: any): currency is CryptoCurrency {
     return Object.values(CryptoCurrency).includes(currency.toLocaleLowerCase() as CryptoCurrency);
 }
 
-function isFiatCurrency(currency: any): currency is SinpeFiatCurrencies {
+function isFiatCurrency(currency: any): currency is FiatCurrency {
     return Object.values(FiatCurrency).includes(currency.toLocaleLowerCase() as FiatCurrency);
 }
 
 export async function useSinpeMovilSwap(options: AssetTransferOptions): Promise<AssetTransferParams> {
+    const { fiatAmount, cryptoAmount, estimate, estimateError, pair, updateEstimate, fetchingEstimate } = options;
+    const [leftAsset, rightAsset] = pair;
+
+    if (!SINPE_MOVIL_PAIRS.some(([from, to]) => from === leftAsset && to === rightAsset)) {
+        throw new Error('Invalid pair for SinpeMovil swap');
+    }
+
     const { label: sinpeLabel, phoneNumber, smsApiToken } = useSinpeMovilStore();
     if (!smsApiToken.value) {
         // eslint-disable-next-line no-console
         console.error('SinpeMovil API token not set. Redirecting to Mobile verification');
-        router.push({ name: RouteName.SinpeMovilMobileVerification, params: { pair: JSON.stringify(options.pair) } });
+        router.push({ name: RouteName.SinpeMovilMobileVerification, params: { pair: JSON.stringify(pair) } });
     }
 
-    const [leftAsset, rightAsset] = options.pair;
     const fiatCurrency = isFiatCurrency(leftAsset) ? leftAsset : rightAsset;
     const cryptoCurrency = isCryptoCurrency(leftAsset) ? leftAsset : rightAsset;
 
@@ -80,44 +81,36 @@ export async function useSinpeMovilSwap(options: AssetTransferOptions): Promise<
 
     const isSelling = leftAsset === cryptoCurrency;
 
-    const { estimate } = useSwapEstimate();
-
-    const fiatAmount = ref(0);
-    const cryptoAmount = ref(0);
-
     // const decimalsCrypto = computed(() => calculateDisplayedDecimals(fiatAmount.value, cryptoCurrency));
     const decimalsCrypto = computed(() => 5);
-    const decimalsFiat = computed(() => 0);
+    const decimalsFiat = computed(() => 2);
 
     const { activeAddress, accountBalance } = useAddressStore();
 
     const { exchangeRates } = useFiatStore();
     const exchangeRate = computed(() => {
-        if (!FIAT_CURRENCIES_OFFERED.includes(selectedFiatCurrency.value)) {
+        if (!FIAT_CURRENCIES_OFFERED.includes(selectedFiatCurrency.value as any)) {
             return 0; // No exchange rate available yet
         }
 
-        const rate = exchangeRates.value[cryptoCurrency]?.[fiatCurrency] || 0;
+        const rate = exchangeRates.value[cryptoCurrency.toLocaleLowerCase()]?.[selectedFiatCurrency.value] || 0;
         return rate;
     });
 
     const nimAddress = computed(() => activeAddress.value!);
     const { limits } = useSwapLimits({ nimAddress: nimAddress.value });
     const currentLimitUsd = useCurrentLimitFiat(limits);
-    let a = 0;
     const currentLimitFiat = computed(() => {
-        // TODO Remove this console.log
-        console.log({currentLimitUsd: currentLimitUsd.value, a: a++});
         if (!currentLimitUsd.value) return 0;
-        const usdRate = exchangeRates.value[CryptoCurrency.USDC][fiatCurrency] || 0;
+        const usdRate = exchangeRates.value.usdc?.[selectedFiatCurrency.value] || 0;
         return currentLimitUsd.value * usdRate;
     });
 
+    // TODO move this to vue component
     const insufficientBalance = computed(() => cryptoAmount.value > 0 && cryptoAmount.value > accountBalance.value);
     const currentLimitCrypto = useCurrentLimitCrypto(currentLimitFiat);
     const insufficientLimit = computed(() => {
         const cryptoLimit = currentLimitCrypto?.value || Number.POSITIVE_INFINITY;
-        console.log({cryptoLimit});
         return (cryptoAmount.value > cryptoLimit || fiatAmount.value > currentLimitFiat.value);
     });
 
@@ -128,75 +121,23 @@ export async function useSinpeMovilSwap(options: AssetTransferOptions): Promise<
     const { activeSwap: swap, setActiveSwap, setSwap } = useSwapsStore();
     const { config } = useConfig();
 
-    const swapError = ref<string>(null);
-
-    const fetchingEstimate = ref(false);
-
-    let timeoutId: number;
-
-    let updateEstimateFn: (args: any) => Promise<void>;
-    const estimateError = ref<string>(null);
-
-    async function updateEstimate() {
-        clearTimeout(timeoutId);
-
-        fetchingEstimate.value = true;
-
-        if (!updateEstimateFn) {
-            updateEstimateFn = isSelling
-                ? await import('@/lib/swap/utils/SellUtils').then((module) => module.updateSellEstimate)
-                : await import('@/lib/swap/utils/BuyUtils').then((module) => module.updateBuyEstimate);
-        }
-
-        const args = fiatAmount.value
-            ? { fiatAmount: fiatAmount.value, fiatAsset: fiatCurrency.toUpperCase() }
-            : { cryptoAmount: cryptoAmount.value, fiatAsset: fiatCurrency.toUpperCase() };
-        await updateEstimateFn!(args).then(() => {
-            estimateError.value = null;
-        }).catch((error: any) => {
-            console.warn(error); // eslint-disable-line no-console
-            estimateError.value = error.message;
-        });
-
-        fetchingEstimate.value = false;
-    }
+    const oasisLimitExceeded = isSelling
+        ? ((await import('@/lib/swap/utils/SellUtils')).oasisSellLimitExceeded)
+        : ((await import('@/lib/swap/utils/BuyUtils')).oasisBuyLimitExceeded);
 
-    const syncing = ref(false);
-
-    watch([fiatAmount, cryptoAmount], ([newFiat, newCrypto], oldValues) => {
-        if (syncing.value) return;
-        if (!newFiat && !newCrypto) {
-            estimate.value = null;
-            estimateError.value = null;
-            return;
-        }
-
-        const [oldFiat, oldCrypto] = oldValues || [undefined, undefined];
-        syncing.value = true;
-        clearTimeout(timeoutId);
-        timeoutId = window.setTimeout(() => {
-            updateEstimate();
-            syncing.value = false;
-        }, 500);
-        if (estimate.value && newFiat !== oldFiat) {
-            cryptoAmount.value = capDecimals(
-                estimate.value.from.amount + estimate.value.from.fee, estimate.value.from.asset);
-        } else if (estimate.value && newCrypto !== oldCrypto) {
-            fiatAmount.value = estimate.value.to.amount - estimate.value.to.fee;
-        }
-        fetchingEstimate.value = true;
-    });
+    const swapError = ref<string>(null);
 
     const canSign = computed(() =>
         !!fiatAmount.value
         && estimateError.value === null
         && swapError.value === null
         && estimate.value !== null
-        && sinpeLabel.value !== null && phoneNumber.value !== null
+        && sinpeLabel.value !== null && phoneNumber.value !== null && smsApiToken.value !== null
         && (limits.value?.current?.usd || 0) > 0
         && !fetchingEstimate.value
         && !insufficientBalance.value
-        && !insufficientLimit.value,
+        && !insufficientLimit.value
+        && !oasisLimitExceeded.value,
     );
 
     async function sign() {
@@ -366,9 +307,8 @@ export async function useSinpeMovilSwap(options: AssetTransferOptions): Promise<
             const request = await hubRequest; // already resolved
             if (!request) return;
 
-            // TODO: Retry getting the swap if first time fails
-            const swapOrPreSwap: Swap | PreSwap = await getSwap(swapId);
-            if (!('contracts' in swapOrPreSwap)) {
+            const swapOrPreSwap = await retryOperation(() => getSwap(swapId), { retries: 5, delay: 5_000 });
+            if (!swapOrPreSwap || !('contracts' in swapOrPreSwap)) {
                 throw new Error('UNEXPECTED: No `contracts` in supposedly confirmed swap');
             }
             confirmedSwap = swapOrPreSwap;
@@ -411,18 +351,20 @@ export async function useSinpeMovilSwap(options: AssetTransferOptions): Promise<
                 : signedTransactions.btc!.serializedTx,
             settlementSerializedTx: signedTransactions.crc,
             settlementAuthorizationToken,
+            settlementSmsToken: smsApiToken.value!,
+            phoneNumber: phoneNumber.value!,
         });
 
         // Fetch OASIS HTLC to get clearing instructions
         const crcContract = confirmedSwap.contracts[SwapAsset.CRC] as Contract<SwapAsset.CRC>;
-        const oasisHtlc = await getHtlc(crcContract.htlc.address);
+        const oasisHtlc = await retryOperation(() => getHtlc(crcContract.htlc.address), { delay: 10_000, retries: 10 });
+
         if (!oasisHtlc || (oasisHtlc.status !== HtlcStatus.PENDING && oasisHtlc.status !== HtlcStatus.CLEARED)) {
             const error = new Error(`UNEXPECTED: OASIS HTLC is not 'pending'/'cleared' but '${oasisHtlc?.status}'`);
             if (config.reportToSentry) captureException(error);
             else console.error(error); // eslint-disable-line no-console
             swapError.value = 'Invalid OASIS contract state, swap aborted!';
             cancelSwap({ id: swapId } as PreSwap);
-            // currentlySigning.value = false;
             updateEstimate();
             return;
         }
@@ -466,6 +408,8 @@ export async function useSinpeMovilSwap(options: AssetTransferOptions): Promise<
             ...swap.value!,
             state: SwapState.AWAIT_INCOMING,
             stateEnteredAt: Date.now(),
+            settlementSmsToken: smsApiToken.value!,
+            phoneNumber: phoneNumber.value!,
         });
 
         if (config.fastspot.watchtowerEndpoint) {
@@ -518,13 +462,10 @@ export async function useSinpeMovilSwap(options: AssetTransferOptions): Promise<
 
         leftAsset,
         rightAsset,
+
         currencyFiatFallback: fiatCurrency,
-        currencyCrypto: isCryptoCurrency(rightAsset) ? rightAsset : leftAsset,
+        currencyCrypto: cryptoCurrency,
 
-        fiatAmount,
-        updateFiatAmount: (value: number) => fiatAmount.value = value,
-        cryptoAmount,
-        updateCryptoAmount: (value: number) => cryptoAmount.value = value,
         exchangeRate,
 
         decimalsCrypto,
@@ -539,14 +480,15 @@ export async function useSinpeMovilSwap(options: AssetTransferOptions): Promise<
         componentRight: !isSelling ? AddressSelector : SinpeUserInfo,
         addressListOpened,
 
-        modalTitle: i18n.t('Sell Crypto') as string,
+        modalTitle: isSelling ? (i18n.t('Sell Crypto') as string) : (i18n.t('Buy Crypto') as string),
 
         swap,
         estimateError,
+        estimate,
 
         detectionDelay: OASIS_CRC_DETECTION_DELAY,
 
-        oasisSellLimitExceeded: true,
+        oasisLimitExceeded,
 
         invalidReason: computed(() => {
             if (insufficientBalance.value) return 'insufficient-balance';
@@ -558,3 +500,47 @@ export async function useSinpeMovilSwap(options: AssetTransferOptions): Promise<
         sign,
     } as AssetTransferParams;
 }
+
+interface RetryOperationOptions {
+    /**
+     * The number of retries to attempt before giving up.
+     * @default 3
+     */
+    retries?: number;
+    /**
+     * The delay between retries in milliseconds.
+     * @default 1_000
+     */
+    delay?: number;
+}
+
+/**
+ * Attempts to execute a given asynchronous operation with a specified number of retries.
+ *
+ * @template T - The return type of the operation.
+ * @param operation - The asynchronous operation to be performed.
+ * @param options - The options for retrying the operation.
+ * @param _attempt - The current attempt count (used internally for recursion).
+ * @returns A promise that resolves with the operation result, or null if all attempts fail.
+ */
+async function retryOperation<T>(
+    operation: () => Promise<T>,
+    { delay = 1_000, retries = 3 }: RetryOperationOptions = {},
+    _attempt = 1,
+): Promise<T | null> {
+    try {
+        return await operation();
+    } catch (error) {
+        if (_attempt > retries) {
+            // eslint-disable-next-line no-console
+            console.error(`Operation failed after ${retries} attempts:`, error);
+            return null;
+        }
+
+        // eslint-disable-next-line no-console
+        console.warn(`${_attempt} attempt failed, retrying in ${delay / 1000} seconds...`);
+        // eslint-disable-next-line no-promise-executor-return
+        await new Promise((resolve) => window.setTimeout(resolve, delay));
+        return retryOperation(operation, { delay, retries }, _attempt + 1);
+    }
+}
diff --git a/src/composables/useSwap.ts b/src/composables/useSwap.ts
deleted file mode 100644
index b719ad747..000000000
--- a/src/composables/useSwap.ts
+++ /dev/null
@@ -1,446 +0,0 @@
-import { setupSwap } from '@/hub';
-import { calculateFees, FiatSwapAsset, getFiatSwapParameters, useSwapEstimate } from '@/lib/swap/utils/CommonUtils';
-import { getNetworkClient } from '@/network';
-import { useAccountStore } from '@/stores/Account';
-import { useAddressStore } from '@/stores/Address';
-import { useNetworkStore } from '@/stores/Network';
-import { SwapState, useSwapsStore } from '@/stores/Swaps';
-import { cancelSwap, Contract, createSwap, getSwap, PreSwap, RequestAsset, Swap } from '@nimiq/fastspot-api';
-import {
-    EuroHtlcSettlementInstructions,
-    HtlcCreationInstructions,
-    SetupSwapRequest,
-    SetupSwapResult,
-} from '@nimiq/hub-api';
-import { SwapAsset } from '@nimiq/libswap';
-import { exchangeAuthorizationToken, getHtlc, HtlcStatus } from '@nimiq/oasis-api';
-import { CryptoCurrency } from '@nimiq/utils';
-import { captureException } from '@sentry/vue';
-import { computed, Ref, ref } from '@vue/composition-api';
-import { AssetTransferParams } from './asset-transfer/types';
-import { useConfig } from './useConfig';
-import { SwapLimits } from './useSwapLimits';
-
-type KycResult = import('../swap-kyc-handler').SetupSwapWithKycResult['kyc'];
-
-type UseSwapOptions = AssetTransferParams & {
-  limits: Ref<SwapLimits | null>,
-  fetchingEstimate: Ref<boolean>,
-  invalid: Ref<boolean>,
-  updateEstimate: () => Promise<void>,
-}
-
-export function useSwap(options: UseSwapOptions) {
-    const {
-        limits, rightAsset, leftAsset,
-        isSelling, fiatAmount, cryptoAmount, currencyFiatFallback,
-        currencyCrypto, exchangeRate, updateEstimate,
-    } = options;
-    const fiatAsset = currencyFiatFallback.toUpperCase() as FiatSwapAsset;
-
-    const { activeAddress } = useAddressStore();
-    const { activeAccountInfo } = useAccountStore();
-    const { estimate } = useSwapEstimate();
-    const estimateError = ref<string>(null);
-    const swapError = ref<string>(null);
-    const { config } = useConfig();
-    const { setActiveSwap, setSwap, activeSwap: swap } = useSwapsStore();
-
-    const canSign = computed(() =>
-        leftAsset && rightAsset
-            && !estimateError.value && !swapError.value
-            && estimate.value
-            && limits.value?.current.usd,
-        // && !fetchingEstimate.value
-        // && !insufficientBalance.value
-        // && !insufficientLimit.value,
-    );
-
-    async function sign() {
-        if (!canSign.value) return;
-
-        // currentlySigning.value = true;
-
-        // eslint-disable-next-line no-async-promise-executor
-        const hubRequest = new Promise<Omit<SetupSwapRequest, 'appName'>>(async (resolve, reject) => {
-            let swapSuggestion!: PreSwap;
-
-            const nimAddress = activeAddress.value!;
-
-            try {
-                const args: Parameters<typeof getFiatSwapParameters>[1] = isSelling
-                    ? { to: { asset: SwapAsset.EUR, amount: fiatAmount.value } }
-                    : { from: { amount: cryptoAmount.value } };
-                const { from, to } = getFiatSwapParameters(fiatAsset, args);
-
-                swapSuggestion = await createSwap(
-                        // Need to force one of the function signatures
-                        from as RequestAsset<SwapAsset>,
-                        to as SwapAsset,
-                );
-
-                // Update local fees with latest feePerUnit values
-                const calculateFeesFiat = isSelling
-                    ? { to: currencyFiatFallback }
-                    : { from: currencyFiatFallback };
-                const { fundingFee } = calculateFees(calculateFeesFiat, swapSuggestion.from.amount, {
-                    fiat: swapSuggestion.to.fee || 0,
-                    nim: currencyCrypto === CryptoCurrency.NIM ? swapSuggestion.from.feePerUnit! : 0,
-                    btc: currencyCrypto === CryptoCurrency.BTC ? swapSuggestion.from.feePerUnit! : 0,
-                });
-
-                swapSuggestion.from.fee = fundingFee;
-                swapSuggestion.to.fee = 0; // OASIS' SEPA Instant fees are already included
-
-                console.log('Swap ID:', swapSuggestion.id); // eslint-disable-line no-console
-
-                console.debug('Swap:', swapSuggestion); // eslint-disable-line no-console
-                swapError.value = null;
-            } catch (error: any) {
-                console.error(error); // eslint-disable-line no-console
-                swapError.value = error.message;
-                reject(error);
-                return;
-            }
-
-            // Await Nimiq and Bitcoin consensus
-            if (currencyCrypto === CryptoCurrency.NIM) {
-                const nimiqClient = await getNetworkClient();
-
-                if (useNetworkStore().state.consensus !== 'established') {
-                    await nimiqClient.waitForConsensusEstablished();
-                }
-
-                const headHeight = await nimiqClient.getHeadHeight();
-                if (headHeight > 100) {
-                    useNetworkStore().state.height = headHeight;
-                } else {
-                    throw new Error('Invalid network state, try please reloading the app');
-                }
-            }
-            // if (activeCurrency.value === CryptoCurrency.BTC) {
-            //     const electrumClient = await getElectrumClient();
-            //     await electrumClient.waitForConsensusEstablished();
-            // }
-
-            const validityStartHeight = useNetworkStore().height.value;
-
-            // Convert the swapSuggestion to the Hub request.
-            // Note that swap-kyc-handler.ts recalculates the original swapSuggestion amounts that we got from
-            // createSwap, therefore if you change the calculation here, you'll likely also want to change it there.
-
-            // TODO: Validate swap data against estimate
-
-            let fund: HtlcCreationInstructions | null = null;
-            const redeem: EuroHtlcSettlementInstructions /* TODO: Eur is same as CRC */ | null = null;
-
-            if (swapSuggestion.from.asset === SwapAsset.NIM) {
-                fund = {
-                    type: 'NIM',
-                    sender: nimAddress,
-                    value: swapSuggestion.from.amount,
-                    fee: swapSuggestion.from.fee,
-                    validityStartHeight,
-                };
-            }
-
-            // if (swapSuggestion.from.asset === SwapAsset.BTC) {
-            //     // Assemble BTC inputs
-            //     // Transactions to an HTLC are 48 weight units bigger because of the longer recipient address
-            //     const requiredInputs = selectOutputs(
-            //         accountUtxos.value, swapSuggestion.from.amount, swapSuggestion.from.feePerUnit, 48);
-            //     let changeAddress: string | undefined;
-            //     if (requiredInputs.changeAmount > 0) {
-            //         const { nextChangeAddress } = useBtcAddressStore();
-            //         if (!nextChangeAddress.value) {
-            //             // FIXME: If no unused change address is found, need to request new ones from Hub!
-            //             throw new Error('No more unused change addresses (not yet implemented)');
-            //         }
-            //         changeAddress = nextChangeAddress.value;
-            //     }
-
-            //     fund = {
-            //         type: 'BTC',
-            //         inputs: requiredInputs.utxos.map((utxo) => ({
-            //             address: utxo.address,
-            //             transactionHash: utxo.transactionHash,
-            //             outputIndex: utxo.index,
-            //             outputScript: utxo.witness.script,
-            //             value: utxo.witness.value,
-            //         })),
-            //         output: {
-            //             value: swapSuggestion.from.amount,
-            //         },
-            //         ...(requiredInputs.changeAmount > 0 ? {
-            //             changeOutput: {
-            //                 address: changeAddress!,
-            //                 value: requiredInputs.changeAmount,
-            //             },
-            //         } : {}),
-            //         refundAddress: btcAddress,
-            //     };
-            // }
-
-            // if (swapSuggestion.to.asset === SwapAsset.EUR) {
-            //     redeem = {
-            //         type: SwapAsset.EUR,
-            //         value: swapSuggestion.to.amount,
-            //         fee: swapSuggestion.to.fee,
-            //         bankLabel: bank.value?.name,
-            //         settlement: config.environment === ENV_MAIN ? {
-            //             type: OasisTransactionType.SEPA,
-            //             recipient: {
-            //                 name: bankAccount.value!.accountName,
-            //                 iban: bankAccount.value!.iban,
-            //                 bic: bank.value!.BIC,
-            //             },
-            //         } : {
-            //             type: OasisTransactionType.MOCK,
-            //         },
-            //     };
-            // }
-
-            if (!fund || !redeem) {
-                reject(new Error('UNEXPECTED: No funding or redeeming data objects'));
-                return;
-            }
-
-            const serviceSwapFee = Math.round(
-                (swapSuggestion.from.amount - swapSuggestion.from.serviceNetworkFee)
-                    * swapSuggestion.serviceFeePercentage,
-            );
-
-            const request: Omit<SetupSwapRequest, 'appName'> = {
-                accountId: activeAccountInfo.value!.id,
-                swapId: swapSuggestion.id,
-                fund,
-                redeem,
-                fiatCurrency: currencyFiatFallback,
-                fundingFiatRate: exchangeRate.value,
-                redeemingFiatRate: 1, // 1 fiat currency = 1 fiat currency
-                fundFees: {
-                    processing: 0,
-                    redeeming: swapSuggestion.from.serviceNetworkFee,
-                },
-                redeemFees: {
-                    funding: swapSuggestion.to.serviceNetworkFee,
-                    processing: swapSuggestion.to.serviceEscrowFee,
-                },
-                serviceSwapFee,
-            };
-
-            resolve(request);
-        });
-
-        let signedTransactions: SetupSwapResult | null;
-        let kycGrantTokens: KycResult | undefined;
-        try {
-            const setupSwapResult = await setupSwap(hubRequest);
-            if (setupSwapResult === undefined) return; // Using Hub redirects
-            if (setupSwapResult && 'kyc' in setupSwapResult) {
-                ({ kyc: kycGrantTokens, ...signedTransactions } = setupSwapResult);
-            } else {
-                signedTransactions = setupSwapResult; // can be null if the hub popup was cancelled
-            }
-        } catch (error: any) {
-            if (config.reportToSentry) captureException(error);
-            else console.error(error); // eslint-disable-line no-console
-            swapError.value = error.message;
-            cancelSwap({ id: (await hubRequest).swapId } as PreSwap);
-            // currentlySigning.value = false;
-            updateEstimate();
-            return;
-        }
-
-        const { swapId } = (await hubRequest);
-
-        if (!signedTransactions) {
-            // Hub popup cancelled
-            cancelSwap({ id: swapId } as PreSwap);
-            // currentlySigning.value = false;
-            updateEstimate();
-            return;
-        }
-
-        if (typeof signedTransactions.eur !== 'string' || (!signedTransactions.nim && !signedTransactions.btc)) {
-            const error = new Error('Internal error: Hub result did not contain EUR or (NIM|BTC) data');
-            if (config.reportToSentry) captureException(error);
-            else console.error(error); // eslint-disable-line no-console
-            swapError.value = error.message;
-            cancelSwap({ id: (await hubRequest).swapId } as PreSwap);
-            // currentlySigning.value = false;
-            updateEstimate();
-            return;
-        }
-
-        console.log('Signed:', signedTransactions, 'KYC tokens', kycGrantTokens); // eslint-disable-line no-console
-
-        // Fetch contract from Fastspot and confirm that it's confirmed.
-        // In parallel convert OASIS KYC grant token to OASIS authorization token for OASIS settlements (for OASIS
-        // clearings, this is already happening in the Hub at Fastspot swap confirmation).
-        let confirmedSwap: Swap;
-        let settlementAuthorizationToken: string | undefined;
-        try {
-            const request = await hubRequest; // already resolved
-            // TODO: Retry getting the swap if first time fails
-            let swapOrPreSwap: Swap | PreSwap;
-            [swapOrPreSwap, settlementAuthorizationToken] = await Promise.all([
-                getSwap(swapId),
-                request.redeem.type === SwapAsset.EUR && kycGrantTokens?.oasisGrantToken
-                    ? exchangeAuthorizationToken(kycGrantTokens.oasisGrantToken)
-                    : undefined,
-            ]);
-            if (!('contracts' in swapOrPreSwap)) {
-                throw new Error('UNEXPECTED: No `contracts` in supposedly confirmed swap');
-            }
-            confirmedSwap = swapOrPreSwap;
-
-            // Apply the correct local fees from the swap request
-            confirmedSwap.from.fee = request.fund.type === SwapAsset.NIM
-                ? request.fund.fee
-                : request.fund.type === SwapAsset.BTC
-                    ? request.fund.inputs.reduce((sum, input) => sum + input.value, 0)
-                            - request.fund.output.value
-                            - (request.fund.changeOutput?.value || 0)
-                    : 0;
-            confirmedSwap.to.fee = (request.redeem as EuroHtlcSettlementInstructions).fee;
-        } catch (error) {
-            if (config.reportToSentry) captureException(error);
-            else console.error(error); // eslint-disable-line no-console
-            swapError.value = 'Invalid swap state, swap aborted!';
-            cancelSwap({ id: swapId } as PreSwap);
-            // currentlySigning.value = false;
-            updateEstimate();
-            return;
-        }
-
-        const nimHtlcAddress = signedTransactions.nim?.raw.recipient;
-
-        setActiveSwap({
-            ...confirmedSwap,
-            // Place NIM HTLC address into the swap object, as it's otherwise unknown for NIM-to-EUR swaps
-            ...(nimHtlcAddress ? { contracts: {
-                ...confirmedSwap.contracts,
-                [SwapAsset.NIM]: {
-                    ...confirmedSwap.contracts[SwapAsset.NIM]!,
-                    htlc: {
-                        ...confirmedSwap.contracts[SwapAsset.NIM]!.htlc,
-                        address: nimHtlcAddress,
-                    },
-                },
-            } } : {}),
-            state: SwapState.SIGN_SWAP,
-            stateEnteredAt: Date.now(),
-            watchtowerNotified: false,
-            fundingSerializedTx: confirmedSwap.from.asset === SwapAsset.NIM
-                ? signedTransactions.nim!.serializedTx
-                : signedTransactions.btc!.serializedTx,
-            settlementSerializedTx: signedTransactions.eur,
-            settlementAuthorizationToken,
-        });
-
-        // Fetch OASIS HTLC to get clearing instructions
-        const eurContract = confirmedSwap.contracts[SwapAsset.EUR] as Contract<SwapAsset.EUR>;
-        const oasisHtlc = await getHtlc(eurContract.htlc.address);
-        if (oasisHtlc.status !== HtlcStatus.PENDING && oasisHtlc.status !== HtlcStatus.CLEARED) {
-            const error = new Error(`UNEXPECTED: OASIS HTLC is not 'pending'/'cleared' but '${oasisHtlc.status}'`);
-            if (config.reportToSentry) captureException(error);
-            else console.error(error); // eslint-disable-line no-console
-            swapError.value = 'Invalid OASIS contract state, swap aborted!';
-            cancelSwap({ id: swapId } as PreSwap);
-            // currentlySigning.value = false;
-            updateEstimate();
-            return;
-        }
-
-        // Validate OASIS HTLC details
-        try {
-            // Check hash
-            if (oasisHtlc.hash.value !== confirmedSwap.hash) {
-                throw new Error('OASIS HTLC hash does not match Fastspot swap hash');
-            }
-            // Check amount (OASIS processing fee is not included in Fastspot amount)
-            if (oasisHtlc.amount !== confirmedSwap.to.amount) {
-                throw new Error('OASIS HTLC amount does not match swap amount');
-            }
-
-                // For selling, Fastspot can sometimes report a wrongly rounded fee. Since for this direction
-                // it is not important for the user what the exact fee is (that Fastspot pays to OASIS),
-                // we are taking the fee that OASIS reports, so we don't run into an HTLC validation error.
-                swap.value!.to.serviceEscrowFee = oasisHtlc.fee;
-        } catch (error) {
-            if (config.reportToSentry) captureException(error);
-            else console.error(error); // eslint-disable-line no-console
-            swapError.value = 'Invalid OASIS contract, swap aborted!';
-            cancelSwap({ id: swapId } as PreSwap);
-            // currentlySigning.value = false;
-            updateEstimate();
-            return;
-        }
-
-        // Add swap details to swap store
-        setSwap(confirmedSwap.hash, {
-            id: confirmedSwap.id,
-            fees: {
-                totalFee: options.fiatFees.total,
-                asset: confirmedSwap.to.asset,
-            },
-        });
-
-        setActiveSwap({
-            ...swap.value!,
-            state: SwapState.AWAIT_INCOMING,
-            stateEnteredAt: Date.now(),
-        });
-
-        if (config.fastspot.watchtowerEndpoint) {
-            let settlementSerializedTx = swap.value!.settlementSerializedTx!;
-
-            // In case of a OASIS settlement instruction, we need to wrap it into a JSON object
-            if (swap.value!.to.asset === 'EUR') {
-                settlementSerializedTx = JSON.stringify({
-                    preimage: '0000000000000000000000000000000000000000000000000000000000000000',
-                    settlement: settlementSerializedTx,
-                });
-            }
-
-            // Send redeem transaction to watchtower
-            fetch(`${config.fastspot.watchtowerEndpoint}/`, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    ...(swap.value!.to.asset === 'EUR' && settlementAuthorizationToken
-                        ? { 'X-OASIS-Settle-Token': settlementAuthorizationToken }
-                        : null
-                    ),
-                },
-                body: JSON.stringify({
-                    id: confirmedSwap.id,
-                    endpoint: new URL(config.fastspot.apiEndpoint).host,
-                    apikey: config.fastspot.apiKey,
-                    redeem: settlementSerializedTx,
-                    ...(signedTransactions.refundTx ? { refund: signedTransactions.refundTx } : {}),
-                }),
-            }).then(async (response) => {
-                if (!response.ok) {
-                    throw new Error((await response.json()).message);
-                }
-
-                setActiveSwap({
-                    ...swap.value!,
-                    watchtowerNotified: true,
-                });
-                console.debug('Swap watchtower notified'); // eslint-disable-line no-console
-            }).catch((error) => {
-                if (config.reportToSentry) captureException(error);
-                else console.error(error); // eslint-disable-line no-console
-            });
-        }
-
-        // setTimeout(() => currentlySigning.value = false, 1000);
-    }
-
-    return {
-        sign,
-    };
-}
diff --git a/src/lib/swap/utils/CommonUtils.ts b/src/lib/swap/utils/CommonUtils.ts
index e6637b5ec..61255668f 100644
--- a/src/lib/swap/utils/CommonUtils.ts
+++ b/src/lib/swap/utils/CommonUtils.ts
@@ -226,6 +226,7 @@ export function getFiatSwapParameters<FiatAsset extends FiatSwapAsset>(fiatAsset
 
         if (from && ('asset' in from) && isFiatAsset(from.asset) && from.amount) {
             return {
+                // TODO 100 is hardcoded and it works because EUR and CRC have 2 digits in the cents
                 from: { [fiatAsset]: (from.amount - fees.fundingFee) / 100 },
                 to: toSwapAsset,
             } as {
@@ -270,7 +271,8 @@ export function getFiatSwapParameters<FiatAsset extends FiatSwapAsset>(fiatAsset
 
         return {
             from: fromSwapAsset,
-            to: { [fiatAsset]: (to!.amount + fees.settlementFee) },
+            // TODO 100 is hardcoded and it works because EUR and CRC have 2 digits in the cents
+            to: { [fiatAsset]: (to!.amount + fees.settlementFee) / 100 },
         } as {
             from: typeof fromSwapAsset,
             to: RequestAsset<FiatAsset>,
diff --git a/src/lib/swap/utils/SellUtils.ts b/src/lib/swap/utils/SellUtils.ts
index fec938366..db8f07cbd 100644
--- a/src/lib/swap/utils/SellUtils.ts
+++ b/src/lib/swap/utils/SellUtils.ts
@@ -1,4 +1,4 @@
-import { Estimate, getEstimate, RequestAsset, SwapAsset } from '@nimiq/fastspot-api';
+import { getEstimate, RequestAsset, SwapAsset } from '@nimiq/fastspot-api';
 import {
     DeniedReason,
     Htlc as OasisHtlc,
@@ -82,9 +82,7 @@ export async function updateSellEstimate({ fiatAmount, cryptoAmount, fiatAsset:
     | { fiatAmount?: number, cryptoAmount: number, fiatAsset?: FiatSwapAsset },
 ) {
     if (!fiatAmount && !cryptoAmount) return;
-    let fiatAsset = _fiatAsset || SwapAsset.EUR; // To avoid breaking the code in the app, we default to EUR
-    // TODO Remove this
-    fiatAsset = fiatAsset === SwapAsset.CRC ? SwapAsset.EUR : fiatAsset;
+    const fiatAsset = _fiatAsset || SwapAsset.EUR; // To avoid breaking the code in the app, we default to EUR
 
     const { from, to } = getFiatSwapParameters(fiatAsset, fiatAmount
         ? { to: { asset: fiatAsset, amount: fiatAmount } }
@@ -97,7 +95,7 @@ export async function updateSellEstimate({ fiatAmount, cryptoAmount, fiatAsset:
         from as RequestAsset<SwapAsset>,
         to as SwapAsset,
     );
-    
+
     if (!newEstimate.from || !newEstimate.to) {
         throw new Error(`UNEXPECTED: ${fiatAsset} or crypto price not present in estimate`);
     }
@@ -131,5 +129,6 @@ export async function updateSellEstimate({ fiatAmount, cryptoAmount, fiatAsset:
     } // eslint-disable-line brace-style
 
     const { estimate } = useSwapEstimate();
+    console.log('New estimate:', newEstimate);
     estimate.value = newEstimate;
 }
diff --git a/src/main.ts b/src/main.ts
index 21e69be0a..93727d872 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -83,6 +83,9 @@ async function start() {
 
     watch(() => {
         if (!config.sinpeMovil.apiEndpoint) return;
+        // TODO We need to look for another solution to support dual enpoints:
+        // 1. Support to retrieve old tx made with EUR
+        // 2. Support to work SINPE
         initOasisApi(config.sinpeMovil.apiEndpoint);
     });
 
diff --git a/src/stores/SinpeMovil.ts b/src/stores/SinpeMovil.ts
index 4f8493917..a0228211c 100644
--- a/src/stores/SinpeMovil.ts
+++ b/src/stores/SinpeMovil.ts
@@ -5,8 +5,7 @@ import { useConfig } from '../composables/useConfig';
 export type SinpeMovilState = {
     phoneNumber: string | null,
     label: string,
-    token: string | null,
-    tokenTimestamp: number | null,
+    smsApiToken: string | null,
     userLimits: UserLimits | null,
 };
 
@@ -17,22 +16,20 @@ export const useSinpeMovilStore = createStore({
     state: (): SinpeMovilState => ({
         phoneNumber: null,
         label: defaultSinpeMovilLabel,
-        token: null,
-        tokenTimestamp: null,
+        smsApiToken: null,
         userLimits: null,
     }),
     getters: {
         phoneNumber: (state): Readonly<string | null> => state.phoneNumber || '',
         label: (state): Readonly<string | null> => state.label || '',
-        smsApiToken: (state): Readonly<string | null> => state.token || '',
+        smsApiToken: (state): Readonly<string | null> => state.smsApiToken || '',
         initials: (state): Readonly<string | null> =>
             // Split by non-alphabetic characters (name can be), take the first character of each word and join them
-            state.label?.split(/[^a-zA-Z]+/).map((word) => word[0]).join('') || '',
+            state.label?.split(/[^\p{L}]+/u).map((word) => word[0]).join('') || '',
+
         isUserVerified: (state): Readonly<boolean> => {
             if (!useConfig().config.sinpeMovil.enabled) return false;
-
-            // TODO: Check if state is set and the timestamp is less than 5 minutes ago
-            return !!state.phoneNumber && !!state.token;
+            return !!state.phoneNumber && !!state.smsApiToken;
         },
         kycLimits: (state): Readonly<UserLimits | null> => state.userLimits,
     },
@@ -43,15 +40,16 @@ export const useSinpeMovilStore = createStore({
             // const label = user.label.replace(/[^a-zA-Z0-9]/g, ' ');
             // For now, we just show the service name
             const label = defaultSinpeMovilLabel;
+            console.log('setData', { ...user, label });
 
             this.state = { ...user, label, userLimits: this.state.userLimits };
         },
         resetUser() {
+            console.log('resetUser');
             this.state = {
                 phoneNumber: null,
                 label: defaultSinpeMovilLabel,
-                token: null,
-                tokenTimestamp: null,
+                smsApiToken: null,
                 userLimits: this.state.userLimits,
             };
         },
diff --git a/src/stores/Swaps.ts b/src/stores/Swaps.ts
index 378c8276e..853d89773 100644
--- a/src/stores/Swaps.ts
+++ b/src/stores/Swaps.ts
@@ -115,6 +115,8 @@ export type ActiveSwap = SwapObject & {
     // S3 KYC grant tokens and KYC enabled OASIS clearing authorization tokens (buying crypto), don't have to be handled
     // during the swap process in wallet, as those tokens are passed to S3 already in the Hub during swap confirmation.
     settlementAuthorizationToken?: string,
+    settlementSmsToken?: string, // Token for Sinpe Móvil swap for the HTLC settlement
+    phoneNumber?: string, // Phone number for Sinpe Móvil swap for the HTLC settlement
     settlementSerializedTx?: string,
     nimiqProxySerializedTx?: string,
     remoteFundingTx?: ReturnType<Nimiq.Client.TransactionDetails['toPlain']>
diff --git a/yarn.lock b/yarn.lock
index ed596cf53..ed3c4db52 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1547,10 +1547,10 @@
   resolved "https://registry.yarnpkg.com/@nimiq/ten31-pass-api/-/ten31-pass-api-1.1.0.tgz#4e013dd23302304965ac032e521d38a25b186a24"
   integrity sha512-YLxzRyJcg/0xPMMBl+TcIugm8SdSitWZXEhotXK8wIj/wbtRQEbUoo052JCfpWJXVTsGDNS0VbS9oLA+fuFm1A==
 
-"@nimiq/utils@^0.11.1":
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/@nimiq/utils/-/utils-0.11.1.tgz#fe9c61fdead9b8e25a892a539b2b870cdd9cc51c"
-  integrity sha512-jwRInTkMPzyPsQN3iyf8s82mO/ChnbVtj5IzqXj9EO0PSOPd4Ix2ApIN/3NClfDfWo6HzE6NkSZOgry18p4jow==
+"@nimiq/utils@^0.11.2":
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/@nimiq/utils/-/utils-0.11.2.tgz#dca274d14ccd47abc691b6b110a60f52962ffb1f"
+  integrity sha512-eOKYERMfQ3tVVse2og5ZQuE2dtUqeqHXbsXhn22gjycDpBsCjJHZV8/UU2eOPdJVBloXVfI+MGg9ugooibU1iw==
   dependencies:
     big-integer "^1.6.44"
 
@@ -9760,8 +9760,7 @@ strict-uri-encode@^1.0.0:
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
   integrity sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  name string-width-cjs
+"string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -9787,6 +9786,15 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^5.0.1, string-width@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -9849,8 +9857,7 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  name strip-ansi-cjs
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -9878,6 +9885,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -11607,8 +11621,7 @@ workbox-window@6.4.2:
     "@types/trusted-types" "^2.0.2"
     workbox-core "6.4.2"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
-  name wrap-ansi-cjs
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -11634,6 +11647,15 @@ wrap-ansi@^5.1.0:
     string-width "^3.0.0"
     strip-ansi "^5.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"