diff --git a/src/components/DualCurrencyInput.vue b/src/components/DualCurrencyInput.vue
index ee2909f44..a34bc597a 100644
--- a/src/components/DualCurrencyInput.vue
+++ b/src/components/DualCurrencyInput.vue
@@ -1,7 +1,5 @@
 <template>
 <div class="dual-currency-input">
-
-    {{ exchangeRate }}
   <section :class="{ orange: !!invalidReason }">
     <div class="flex-row primary-amount">
       <AmountInput v-model="_cryptoAmount" :decimals="cryptoCurrencyDecimals">
@@ -36,29 +34,13 @@
       </AmountInput>
     </span>
   </section>
-
-  <MessageTransition class="message-section">
-    <template v-if="invalidReason === 'insufficient-limit'">
-        <!-- TEMP: wording TBD -->
-        <i18n path="Max swappable amount is {amount}">
-            <Amount slot="amount" :amount="maxCrypto"
-                :currency="fiatCurrency" hideDecimals />
-        </i18n><br />
-        <a @click="$emit('set-max')">{{ $t('Sell max') }}</a>
-    </template>
-    <template v-else-if="invalidReason === 'insufficient-balance'">
-        {{ $t('Insufficient balance.') }} <a @click="$emit('set-max')">{{ $t('Sell max') }}</a>
-    </template>
-  </MessageTransition>
 </div>
 </template>
 
 <script lang="ts">
 import { computed, defineComponent, ref, watch } from '@vue/composition-api';
 import { CryptoCurrency, FiatCurrency } from '@/lib/Constants';
-import { Amount } from '@nimiq/vue-components';
 import AmountInput from './AmountInput.vue';
-import MessageTransition from './MessageTransition.vue';
 
 export default defineComponent({
     props: {
@@ -84,7 +66,7 @@ export default defineComponent({
         },
         cryptoCurrencyDecimals: {
             type: Number,
-            default: 2,
+            default: 5,
         },
         maxCrypto: Number,
         maxFiat: Number,
@@ -111,7 +93,8 @@ export default defineComponent({
         watch(_fiatAmount, (newVal) => {
             if (syncing.value) return;
             syncing.value = true;
-            const newCryptoValue = newVal * props.exchangeRate;
+            const newCryptoValue = Number(((newVal / props.exchangeRate) * 10 ** props.cryptoCurrencyDecimals)
+                .toFixed(props.cryptoCurrencyDecimals));
             context.emit('update:cryptoAmount', newCryptoValue);
             setTimeout(() => syncing.value = false, 100);
         }, { lazy: true });
@@ -119,7 +102,8 @@ export default defineComponent({
         watch(_cryptoAmount, (newVal) => {
             if (syncing.value) return;
             syncing.value = true;
-            const newFiatValue = newVal / props.exchangeRate;
+            const newFiatValue = Number(((newVal / 10 ** props.cryptoCurrencyDecimals) * props.exchangeRate)
+                .toFixed(props.fiatCurrencyDecimals));
             context.emit('update:fiatAmount', newFiatValue);
             setTimeout(() => syncing.value = false, 100);
         }, { lazy: true });
@@ -133,8 +117,6 @@ export default defineComponent({
     },
     components: {
         AmountInput,
-        MessageTransition,
-        Amount,
     },
 });
 </script>
@@ -143,7 +125,6 @@ export default defineComponent({
 .dual-currency-input {
     text-align: center;
     margin-top: 3rem;
-    margin-bottom: 2rem;
 
     &.orange {
         color: var(--nimiq-orange);
@@ -284,26 +265,5 @@ export default defineComponent({
             }
         }
     }
-    .message-section.message-transition {
-        width: 100%;
-        font-weight: 600;
-        font-size: 14px;
-        line-height: 21px;
-        text-align: center;
-        color: var(--nimiq-orange);
-
-        transition-delay: 0ms ;
-        --message-transition-duration: 200ms;
-
-        a {
-            text-decoration: underline;
-            cursor: pointer;
-        }
-
-        & ::v-deep .fadeY-enter,
-        & ::v-deep .fadeY-leave-to {
-            transform: translateY(-25%) !important;
-        }
-    }
 }
 </style>
diff --git a/src/components/SinpeUserInfo.vue b/src/components/SinpeUserInfo.vue
index 4b85aa7f3..7753f23ac 100644
--- a/src/components/SinpeUserInfo.vue
+++ b/src/components/SinpeUserInfo.vue
@@ -25,20 +25,18 @@
 </template>
 
 <script lang="ts">
+import { useSinpeMovilStore } from '@/stores/SinpeMovil';
 import { defineComponent } from '@vue/composition-api';
 
 export default defineComponent({
     props: {},
     setup() {
-        // const { label, phoneNumber, initials } = useSinpeMovilStore();
+        const { label, phoneNumber, initials } = useSinpeMovilStore();
 
         return {
-            // label,
-            // phoneNumber,
-            // initials,
-            label: 'Sinpe Móvil',
-            initials: 'SM',
-            phoneNumber: '+506 1234 5678',
+            label,
+            phoneNumber,
+            initials,
         };
     },
     components: {
diff --git a/src/components/layouts/Sidebar.vue b/src/components/layouts/Sidebar.vue
index e140bbc7f..5e9f72601 100644
--- a/src/components/layouts/Sidebar.vue
+++ b/src/components/layouts/Sidebar.vue
@@ -55,7 +55,7 @@
                 }}</template>
             </Tooltip>
 
-            <Tooltip v-if="$config.moonpay.enabled"
+            <Tooltip v-if="enabledSellProviders.length > 0"
                 preferredPosition="top right"
                 :container="$parent"
                 theme="inverse"
@@ -168,6 +168,7 @@
 import { defineComponent, ref, computed, onMounted } from '@vue/composition-api';
 import { GearIcon, Tooltip, InfoCircleIcon } from '@nimiq/vue-components';
 import { RouteName } from '@/router';
+import { SwapAsset } from '@nimiq/libswap';
 import { assetToCurrency } from '@/lib/swap/utils/Assets';
 import AnnouncementBox from '../AnnouncementBox.vue';
 import AccountMenu from '../AccountMenu.vue';
@@ -306,7 +307,7 @@ export default defineComponent({
 
         const sellModals = {
             [SellProvider.Moonpay]: RouteName.MoonpaySellInfo,
-            [SellProvider.SinpeMovil]: RouteName.SinpeMovilSellInfo,
+            [SellProvider.SinpeMovil]: RouteName.SinpeMovilInfo,
             [SellProvider.Simplex]: RouteName.SellCrypto, // This is a fallback, should never be reached
         };
 
@@ -315,7 +316,10 @@ export default defineComponent({
             const modalName: RouteName = enabledSellProviders.value.length === 1
                 ? sellModals[enabledSellProviders.value[0]]
                 : RouteName.SellCrypto; // TODO: SellCrypto is for SEPA operations. We need to add a new Sell Selector.
-            openModal(modalName);
+            const params = enabledSellProviders.value.includes(SellProvider.SinpeMovil)
+                ? { pair: JSON.stringify([SwapAsset.NIM, SwapAsset.CRC]) }
+                : undefined;
+            openModal(modalName, params);
         }
 
         const nimSellOptions = computed(() => {
diff --git a/src/components/modals/AssetTransferModal.vue b/src/components/modals/AssetTransferModal.vue
index b26b26f23..b64db3697 100644
--- a/src/components/modals/AssetTransferModal.vue
+++ b/src/components/modals/AssetTransferModal.vue
@@ -2,111 +2,167 @@
   <Modal
     class="asset-transfer-modal"
     :emitClose="true"
-    :showOverlay="p && p.addressListOpened"
+    :showOverlay="!!p && p.addressListOpened"
     @close="closeModal"
-    @close-overlay="p.addressListOpened = false"
+    @close-overlay="() => (p.addressListOpened = false)"
   >
     <div v-if="!p">Loading fees</div>
     <div v-else class="asset-transfer-input">
-        <PageHeader>{{ p.modalTitle }}</PageHeader>
-        <PageBody class="flex-column">
-          <section class="pills">
-              <Tooltip :styles="{width: '25.5rem'}" preferredPosition="bottom right" :container="this">
-                <div slot="trigger" class="pill">
-                    1 {{p.currencyCrypto}} =
-                    <FiatAmount :amount="1 ** 10 ** p.decimalsCrypto * p.exchangeRate"
-                      :currency="p.currencyFiatFallback"/>
-                </div>
-                <p class="explainer">
-                    {{ $t('The rate might change depending on the swap volume.') }}
-                </p>
-            </Tooltip>
-            <SwapFeesTooltip
-              preferredPosition="bottom"
-              :btcFeeFiat="p.fiatFees.btcFeeFiat"
-              :oasisFeeFiat="p.fiatFees.oasisFeeFiat"
-              :oasisFeePercentage="p.fiatFees.oasisFeePercentage"
-              :oasisMinFeeFiat="p.fiatFees.oasisMinFeeFiat"
-              :sepaFeeFiat="p.fiatFees.sepaFeeFiat"
-              :nimFeeFiat="p.fiatFees.nimFeeFiat"
-              :serviceSwapFeeFiat="p.fiatFees.serviceSwapFeeFiat"
-              :serviceSwapFeePercentage="p.fiatFees.serviceSwapFeePercentage"
-              :currency="p.currencyFiatFallback"
-              :container="this"
+      <PageHeader>{{ p.modalTitle }}</PageHeader>
+      <PageBody class="flex-column">
+        <section class="pills">
+          <Tooltip
+            :styles="{ width: '25.5rem' }"
+            preferredPosition="bottom right"
+            :container="this"
+          >
+            <div slot="trigger" class="pill">
+              1 {{ p.currencyCrypto }} =
+              <FiatAmount
+                :amount="1 ** (10 ** p.decimalsCrypto) * p.exchangeRate"
+                :currency="p.currencyFiatFallback.toLocaleLowerCase()"
+              />
+            </div>
+            <p class="explainer">
+              {{ $t("The rate might change depending on the swap volume.") }}
+            </p>
+          </Tooltip>
+          <SwapFeesTooltip
+            preferredPosition="bottom"
+            :btcFeeFiat="p.fiatFees.btcFeeFiat"
+            :oasisFeeFiat="p.fiatFees.oasisFeeFiat"
+            :oasisFeePercentage="p.fiatFees.oasisFeePercentage"
+            :oasisMinFeeFiat="p.fiatFees.oasisMinFeeFiat"
+            :sepaFeeFiat="p.fiatFees.sepaFeeFiat"
+            :nimFeeFiat="p.fiatFees.nimFeeFiat"
+            :serviceSwapFeeFiat="p.fiatFees.serviceSwapFeeFiat"
+            :serviceSwapFeePercentage="p.fiatFees.serviceSwapFeePercentage"
+            :currency="p.currencyFiatFallback.toLocaleLowerCase()"
+            :container="this"
+          >
+            <i18n
+              slot="trigger"
+              tag="div"
+              path="{feeAmount} fees"
+              class="pill"
+              :class="{ 'high-fees': p.fiatFees.isHigh }"
             >
-              <i18n slot="trigger" tag="div" path="{feeAmount} fees" class="pill"
-                :class="{'high-fees': p.fiatFees.isHigh}">
-                <template #feeAmount>
-                  <FiatAmount
-                    :amount="p.fiatFees.total"
-                    :currency="p.currencyFiatFallback"
-                  />
-                </template>
-              </i18n>
-            </SwapFeesTooltip>
-            <Tooltip :styles="{width: '28.75rem'}" preferredPosition="bottom left" :container="this"
-                class="limits-tooltip">
-                <div slot="trigger" class="pill limits flex-row">
-                    <LimitIcon />
-                    <FiatAmount v-if="p.limits"
-                      :amount="p.currentLimitFiat"
-                      :currency="p.currencyFiatFallback"
-                      hideDecimals
-                    />
-                    <CircleSpinner v-else />
-                </div>
-                <div class="price-breakdown">
-                    <label>{{ $t('30-day Limit') }}</label>
-                    <FiatConvertedAmount v-if="p.limits"
-                        :amount="p.limits.monthly.luna" roundDown
-                        currency="nim" :fiat="p.currencyFiatFallback"
-                        :max="p.currentLimitFiat"/>
-                    <span v-else>{{ $t('loading...') }}</span>
-                </div>
-                <i18n v-if="p.limits" class="explainer" path="{value} remaining" tag="p">
-                    <FiatConvertedAmount slot="value"
-                        :amount="p.limits.remaining.luna" roundDown
-                        currency="nim" :fiat="p.currencyFiatFallback"
-                        :max="p.currentLimitFiat"/>
-                </i18n>
-            </Tooltip>
-          </section>
-
-          <section class="options-section flex-row">
-            <component
-              :is="p.componentLeft"
-              @openAddressSelector="p.addressListOpened = true"
-            />
-            <div class="separator-wrapper">
-              <div class="separator" />
+              <template #feeAmount>
+                <FiatAmount
+                  :amount="p.fiatFees.total"
+                  :currency="p.currencyFiatFallback.toLocaleLowerCase()"
+                />
+              </template>
+            </i18n>
+          </SwapFeesTooltip>
+          {{p.limits}}
+          current: {{p.currentLimitFiat}}
+          <Tooltip
+            :styles="{ width: '28.75rem' }"
+            preferredPosition="bottom left"
+            :container="this"
+            class="limits-tooltip"
+          >
+            <div slot="trigger" class="pill limits flex-row">
+              <LimitIcon />
+              <FiatAmount
+                v-if="p.limits"
+                :amount="p.currentLimitFiat"
+                :currency="p.currencyFiatFallback.toLocaleLowerCase()"
+                hideDecimals
+              />
+              <CircleSpinner v-else />
+            </div>
+            <div class="price-breakdown">
+              <label>{{ $t("30-day Limit") }}</label>
+              <FiatConvertedAmount
+                v-if="p.limits"
+                :amount="p.limits.monthly.luna"
+                roundDown
+                :currency="p.currencyCrypto.toLocaleLowerCase()"
+                :fiat="p.currencyFiatFallback.toLocaleLowerCase()"
+                :max="p.currentLimitFiat"
+              />
+              <span v-else>{{ $t("loading...") }}</span>
             </div>
-            <component
-              :is="p.componentRight"
-              @openAddressSelector="p.addressListOpened = true"
-            />
-          </section>
-
-          <DualCurrencyInput
-            :fiatAmount.sync="p.fiatAmount"
-            :cryptoAmount.sync="p.cryptoAmount"
-            :fiatCurrency="p.currencyFiatFallback"
-            :cryptoCurrency="p.currencyCrypto"
-            :fiatCurrencyDecimals="p.decimalsFiat"
-            :cryptoCurrencyDecimals="p.decimalsCrypto"
-            :maxCrypto="p.currentLimitCrypto"
-            :maxFiat="p.currentLimitFiat"
-            :exchangeRate="p.exchangeRate"
-            :invalid-reason="p.invalidReason"
-            @set-max="setMax()"
+            <i18n
+              v-if="p.limits"
+              class="explainer"
+              path="{value} remaining"
+              tag="p"
+            >
+              <FiatConvertedAmount
+                slot="value"
+                :amount="p.limits.remaining.luna"
+                roundDown
+                :currency="p.currencyCrypto.toLocaleLowerCase()"
+                :fiat="p.currencyFiatFallback.toLocaleLowerCase()"
+                :max="p.currentLimitFiat"
+              />
+            </i18n>
+          </Tooltip>
+        </section>
+
+        <section class="options-section flex-row">
+          <component
+            :is="p.componentLeft"
+            @openAddressSelector="p.addressListOpened = true"
+          />
+          <div class="separator-wrapper">
+            <div class="separator" />
+          </div>
+          <component
+            :is="p.componentRight"
+            @openAddressSelector="p.addressListOpened = true"
           />
-        </PageBody>
-        <PageFooter>
-          <button class="nq-button light-blue" @mousedown.prevent
-            :disabled="p.invalid || !p.fiatAmount || !p.cryptoAmount" @click="p.sign()">
-            {{ $t("Confirm") }}
-          </button>
-        </PageFooter>
-        </div>
+        </section>
+
+        <DualCurrencyInput
+          :fiatAmount.sync="p.fiatAmount"
+          :cryptoAmount.sync="p.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()"
+        />
+        <MessageTransition class="message-section">
+          <template v-if="p.invalidReason === 'insufficient-limit' && p.currentLimitCrypto">
+            <!-- TEMP: wording TBD -->
+            <i18n path="Max swappable amount is {amount}">
+              <Amount
+                slot="amount"
+                :amount="p.currentLimitCrypto"
+                :currency="p.currencyFiatFallback.toLocaleLowerCase()"
+                hideDecimals
+              /> </i18n
+            ><br />
+            <a @click="$emit('set-max')">{{ $t("Sell max") }}</a>
+          </template>
+          <template v-else-if="p.invalidReason === 'insufficient-balance'">
+            {{ $t("Insufficient balance.") }}
+            <a @click="() => setMax()">{{ $t("Sell max") }}</a>
+          </template>
+          <template v-else-if="p.estimateError">
+            {{ p.estimateError }}
+          </template>
+        </MessageTransition>
+      </PageBody>
+      <PageFooter>
+        <button
+          class="nq-button light-blue"
+          @mousedown.prevent
+          :disabled="!p.canSign || p.invalid || !p.fiatAmount || !p.cryptoAmount"
+          @click="p.sign()"
+        >
+          {{ $t("Confirm") }}
+        </button>
+      </PageFooter>
+    </div>
 
     <div
       v-if="p && p.addressListOpened"
@@ -124,45 +180,62 @@
       </PageBody>
     </div>
 
-    <div v-if="!!p && !!p.swap" slot="overlay" class="page flex-column animation-overlay">
-            <PageBody style="padding: 0.75rem;" class="flex-column">
-                <SwapAnimation
-                    :swapId="p.swap.id"
-                    :swapState="swap.state"
-                    :fromAsset="swap.from.asset"
-                    :fromAmount="swap.from.amount + swap.from.fee"
-                    :fromAddress="'contract' in swap.contracts[swap.from.asset].htlc
-                        ? swap.contracts[swap.from.asset].htlc.contract
-                        : swap.contracts[swap.from.asset].htlc.address"
-                    :toAsset="swap.to.asset"
-                    :toAmount="swap.to.amount - swap.to.fee"
-                    :toAddress="'contract' in swap.contracts[swap.to.asset].htlc
-                        ? swap.contracts[swap.to.asset].htlc.contract
-                        : swap.contracts[swap.to.asset].htlc.address"
-                    :nimAddress="activeAddressInfo.address"
-                    :error="swap.error && swap.error.split(' req={')[0]"
-                    :fromFundingDurationMins="swap.from.asset === SwapAsset.BTC ? 10 : 0"
-                    :switchSides="swap.from.asset === rightAsset"
-                    :stateEnteredAt="swap.stateEnteredAt"
-                    :errorAction="swap.errorAction"
-                    :toFundingDurationMins="isMainnet ? p.detectionDelay : 0"
-                    :oasisLimitExceeded="p.oasisSellLimitExceeded"
-                    @finished="finishSwap"
-                    @cancel="finishSwap"
-                />
-            </PageBody>
-            <button v-if="p.swap.state !== SwapState.CREATE_OUTGOING"
-                class="nq-button-s minimize-button top-right"
-                @click="closeModal" @mousedown.prevent
-            >
-                <MinimizeIcon/>
-            </button>
-            <Timer v-else-if="!p.oasisSellLimitExceeded" :startTime="Date.now()" :endTime="swap.expires * 1000"
-                theme="white" maxUnit="minute" :tooltipProps="{
-                    preferredPosition: 'bottom left',
-                }"
-            />
-        </div>
+    <div
+      v-if="!!p && !!p.swap"
+      slot="overlay"
+      class="page flex-column animation-overlay"
+    >
+      <PageBody style="padding: 0.75rem" class="flex-column">
+        <SwapAnimation
+          :swapId="p.swap.id"
+          :swapState="p.swap.state"
+          :fromAsset="p.swap.from.asset"
+          :fromAmot="p.swap.from.amount + p.swap.from.fee"
+          :fromAddress="
+            'contract' in p.swap.contracts[p.swap.from.asset].htlc
+              ? p.swap.contracts[p.swap.from.asset].htlc.contract
+              : p.swap.contracts[p.swap.from.asset].htlc.address
+          "
+          :toAsset="p.swap.to.asset"
+          :toAmount="p.swap.to.amount - p.swap.to.fee"
+          :toAddress="
+            'contract' in p.swap.contracts[p.swap.to.asset].htlc
+              ? p.swap.contracts[p.swap.to.asset].htlc.contract
+              : p.swap.contracts[p.swap.to.asset].htlc.address
+          "
+          :nimAddress="activeAddressInfo.address"
+          :error="p.swap.error && p.swap.error.split(' req={')[0]"
+          :fromFundingDurationMins="
+            p.swap.from.asset === SwapAsset.BTC ? 10 : 0
+          "
+          :switchSides="p.swap.from.asset === p.rightAsset"
+          :stateEnteredAt="p.swap.stateEnteredAt"
+          :errorAction="p.swap.errorAction"
+          :toFundingDurationMins="isMainnet ? p.detectionDelay : 0"
+          :oasisLimitExceeded="p.oasisSellLimitExceeded"
+          @finished="finishSwap"
+          @cancel="finishSwap"
+        />
+      </PageBody>
+      <button
+        v-if="p.swap.state !== SwapState.CREATE_OUTGOING"
+        class="nq-button-s minimize-button top-right"
+        @click="closeModal"
+        @mousedown.prevent
+      >
+        <MinimizeIcon />
+      </button>
+      <Timer
+        v-else-if="!p.oasisSellLimitExceeded"
+        :startTime="Date.now()"
+        :endTime="p.swap.expires * 1000"
+        theme="white"
+        maxUnit="minute"
+        :tooltipProps="{
+          preferredPosition: 'bottom left',
+        }"
+      />
+    </div>
   </Modal>
 </template>
 
@@ -186,11 +259,13 @@ import {
     Tooltip,
     CircleSpinner,
     Timer,
+    Amount,
 } from '@nimiq/vue-components';
-import { CryptoCurrency, ENV_MAIN, FiatCurrency } from '@/lib/Constants';
+import { ENV_MAIN } from '@/lib/Constants';
 import { useAddressStore } from '@/stores/Address';
 import { useBtcAddressStore } from '@/stores/BtcAddress';
 import { SwapState, useSwapsStore } from '@/stores/Swaps';
+import { SwapAsset } from '@nimiq/libswap';
 import { useConfig } from '@/composables/useConfig';
 import AddressList from '../AddressList.vue';
 import DualCurrencyInput from '../DualCurrencyInput.vue';
@@ -200,38 +275,39 @@ import SwapAnimation from '../swap/SwapAnimation.vue';
 import Modal from './Modal.vue';
 import LimitIcon from '../icons/LimitIcon.vue';
 import MinimizeIcon from '../icons/MinimizeIcon.vue';
+import MessageTransition from '../MessageTransition.vue';
 
 export default defineComponent({
     props: {
         method: {
             type: String as () => AssetTransferMethod,
-            // required: true, JUst for testing is commented
+            // TODO
+            // required: true, Just for testing is commented
             default: () => AssetTransferMethod.SinpeMovil,
         },
-        pairFrom: {
-            type: String as () => CryptoCurrency,
-            // required: true, JUst for testing is commented
-            default: () => CryptoCurrency.NIM,
-        },
-        pairTo: {
-            type: String as () => FiatCurrency,
-            // required: true, JUst for testing is commented
-            default: () => FiatCurrency.CRC,
+        pair: {
+            type: Array as unknown as () => [SwapAsset, SwapAsset],
+            // required: true, Just for testing is commented
+            default: () => [SwapAsset.NIM, SwapAsset.CRC] as [SwapAsset, SwapAsset],
         },
     },
     setup(props, context) {
         const p /* params */ = ref<AssetTransferParams>(null);
-        const cryptoAmount = computed(() => p.value?.cryptoAmount as unknown as number || 0);
+        const cryptoAmount = computed(
+            () => (p.value?.cryptoAmount as unknown as number) || 0,
+        );
 
         onMounted(async () => {
             const options: AssetTransferOptions = {
-                pair: [props.pairFrom, props.pairTo],
+                pair: props.pair,
             };
 
             switch (props.method) {
                 case AssetTransferMethod.SinpeMovil: {
-                    const module = await import('@/composables/asset-transfer/useSinpeMovilSwap');
-                    p.value = module.useSinpeMovilSwap(options);
+                    const module = await import(
+                        '@/composables/asset-transfer/useSinpeMovilSwap'
+                    );
+                    p.value = await module.useSinpeMovilSwap(options);
                     break;
                 }
                 default:
@@ -246,20 +322,25 @@ export default defineComponent({
             if (!p.value?.isSelling) return;
 
             switch (p.value.currencyCrypto) {
-                case CryptoCurrency.NIM: {
+                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)) {
+                    } else if (
+                        p.value.currentLimitCrypto.value
+            < (activeAddressInfo.value?.balance || 0)
+                    ) {
                         p.value.updateCryptoAmount(p.value.currentLimitCrypto.value);
                     } else {
                         p.value.updateCryptoAmount(activeAddressInfo.value?.balance || 0);
                     }
                     break;
                 }
-                case CryptoCurrency.BTC: {
+                case SwapAsset.BTC: {
                     if (!p.value.currentLimitCrypto.value) {
                         p.value.updateCryptoAmount(accountBtcBalance.value);
-                    } else if (p.value.currentLimitCrypto.value < accountBtcBalance.value) {
+                    } else if (
+                        p.value.currentLimitCrypto.value < accountBtcBalance.value
+                    ) {
                         p.value.updateCryptoAmount(p.value.currentLimitCrypto.value);
                     } else {
                         p.value.updateCryptoAmount(accountBtcBalance.value);
@@ -283,7 +364,7 @@ export default defineComponent({
             if (p.value?.addressListOpened.value === true) {
                 p.value.addressListOpened.value = false;
             } else {
-                context.root.$router.back();
+                context.root.$router.push('/');
             }
         }
 
@@ -297,6 +378,8 @@ export default defineComponent({
             closeModal,
             isMainnet,
             SwapState,
+            SwapAsset,
+            activeAddressInfo,
         };
     },
     components: {
@@ -313,9 +396,10 @@ export default defineComponent({
         CircleSpinner,
         SwapAnimation,
         Timer,
-
         LimitIcon,
         MinimizeIcon,
+        MessageTransition,
+        Amount,
     },
 });
 </script>
@@ -338,7 +422,7 @@ export default defineComponent({
     }
 
     .page-footer {
-        margin-top: auto;
+      margin-top: auto;
     }
   }
 
@@ -433,6 +517,29 @@ export default defineComponent({
     }
   }
 
+  .message-section.message-transition {
+    width: 100%;
+    font-weight: 600;
+    font-size: 14px;
+    line-height: 21px;
+    text-align: center;
+    margin-top: 2rem;
+    color: var(--nimiq-orange);
+
+    transition-delay: 0ms;
+    --message-transition-duration: 200ms;
+
+    a {
+      text-decoration: underline;
+      cursor: pointer;
+    }
+
+    & ::v-deep .fadeY-enter,
+    & ::v-deep .fadeY-leave-to {
+      transform: translateY(-25%) !important;
+    }
+  }
+
   .overlay {
     overflow: hidden;
 
@@ -456,47 +563,47 @@ export default defineComponent({
 }
 
 .modal ::v-deep .overlay .animation-overlay + .close-button {
-    display: none;
+  display: none;
 }
 
 .animation-overlay {
-    flex-grow: 1;
-
-    .minimize-button {
-        background: rgba(255, 255, 255, 0.15);
-        color: white;
-        padding: 0;
-        height: 4rem;
-        width: 4rem;
-        border-radius: 50%;
-        transition: background .2s var(--nimiq-ease);
-
-        &::before {
-            border-radius: 50%;
-        }
+  flex-grow: 1;
+
+  .minimize-button {
+    background: rgba(255, 255, 255, 0.15);
+    color: white;
+    padding: 0;
+    height: 4rem;
+    width: 4rem;
+    border-radius: 50%;
+    transition: background 0.2s var(--nimiq-ease);
+
+    &::before {
+      border-radius: 50%;
+    }
 
-        &:hover,
-        &:active,
-        &:focus {
-            background: rgba(255, 255, 255, 0.20);
-        }
+    &:hover,
+    &:active,
+    &:focus {
+      background: rgba(255, 255, 255, 0.2);
+    }
 
-        &.top-right {
-            position: absolute;
-            top: 2rem;
-            right: 2rem;
-        }
+    &.top-right {
+      position: absolute;
+      top: 2rem;
+      right: 2rem;
     }
+  }
 
-    .timer {
-        position: absolute;
-        top: 2.5rem;
-        right: 2.5rem;
+  .timer {
+    position: absolute;
+    top: 2.5rem;
+    right: 2.5rem;
 
-        ::v-deep .tooltip-box {
-            font-size: var(--small-size);
-            padding: 1.25rem 1.5rem;
-        }
+    ::v-deep .tooltip-box {
+      font-size: var(--small-size);
+      padding: 1.25rem 1.5rem;
     }
+  }
 }
 </style>
diff --git a/src/components/modals/SinpeMovilSellInfoModal.vue b/src/components/modals/SinpeMovilInfoModal.vue
similarity index 64%
rename from src/components/modals/SinpeMovilSellInfoModal.vue
rename to src/components/modals/SinpeMovilInfoModal.vue
index bec7a0078..e3d71d3b1 100644
--- a/src/components/modals/SinpeMovilSellInfoModal.vue
+++ b/src/components/modals/SinpeMovilInfoModal.vue
@@ -7,44 +7,72 @@
             </header>
 
             <main class="flex-column">
-                <h1 class="nq-h1">{{ $t('Sell NIM using Sinpe Móvil') }}</h1>
-                <p class="subline">{{ $t('Sell NIM directly to your Sinpe Móvil account.') }}</p>
+                <h1 class="nq-h1">{{ isSelling ? $t('Sell NIM using Sinpe Móvil') : '' }}</h1>
+                <p class="subline">{{ isSelling ? $t('Sell NIM directly to your Sinpe Móvil account.') : '' }}</p>
                 <ol class="flex-col">
                     <li>{{ $t('Confirm Sinpe number') }}</li>
-                    <li>{{ $t('Set an amount to sell') }}</li>
+                    <li>{{ isSelling ? $t('Set an amount to sell') : '' }}</li>
                 </ol>
             </main>
         </PageBody>
         <PageFooter>
-            <router-link class="nq-button light-blue"
-                :to="{ name: RouteName.SinpeMovil, params: { flow: 'sell' }, query: $route.query }">
+            <button class="nq-button light-blue" @click="startSinpeFlow">
                 {{ $t("Let's go") }}
-            </router-link>
-            <a href="" target="_blank" class="flex-row learn-more">
+            </button>
+
+            <!-- TODO link -->
+            <!-- <a href="" target="_blank" class="flex-row learn-more">
                 Learn more
                 <CaretRightSmallIcon />
-            </a>
+            </a> -->
         </PageFooter>
     </Modal>
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
-import { PageBody, PageFooter, CaretRightSmallIcon } from '@nimiq/vue-components';
+import { defineComponent, onMounted } from '@vue/composition-api';
+import { PageBody, PageFooter } from '@nimiq/vue-components';
 import { RouteName } from '@/router';
+import { SINPE_MOVIL_PAIRS } from '@/lib/Constants';
+import { isFiatAsset } from '@/stores/Swaps';
+import { SwapAsset } from '@nimiq/libswap';
 import Modal from './Modal.vue';
 
 export default defineComponent({
-    setup() {
+    props: {
+        pair: {
+            type: Array as unknown as () => [SwapAsset, SwapAsset],
+            // TODO Remove comment
+            // required: true, Just for testing is commented
+            default: () => [SwapAsset.NIM, SwapAsset.CRC] as [SwapAsset, SwapAsset],
+        },
+    },
+    setup(props, context) {
+        onMounted(() => {
+            if (!SINPE_MOVIL_PAIRS.some(([from, to]) => from === props.pair[0] && to === props.pair[1])) {
+                console.error('Invalid pair:', props.pair); // eslint-disable-line no-console
+                context.root.$router.push('/');
+            }
+        });
+
+        async function startSinpeFlow() {
+            return context.root.$router.push({
+                name: RouteName.SinpeMovilMobileVerification,
+                params: { pair: JSON.stringify(props.pair) },
+            }).catch(() => { /* ignore */ });
+        }
+
         return {
             RouteName,
+            isSelling: isFiatAsset(props.pair[1]),
+            startSinpeFlow,
         };
     },
     components: {
         Modal,
         PageBody,
         PageFooter,
-        CaretRightSmallIcon,
+        // CaretRightSmallIcon,
     },
 });
 </script>
diff --git a/src/components/modals/SinpeMovilMobileVerificationModal.vue b/src/components/modals/SinpeMovilMobileVerificationModal.vue
new file mode 100644
index 000000000..8310e009d
--- /dev/null
+++ b/src/components/modals/SinpeMovilMobileVerificationModal.vue
@@ -0,0 +1,586 @@
+<template>
+  <Modal class="sinpe-movil-modal" emit-close @close="closeModal">
+    <a href="#" class="page-header-back-button" @click.prevent="goBack" :aria-label="$t('Go back')">
+      <ArrowLeftIcon />
+    </a>
+    <ol ref="scrollerEl">
+      <li>
+        <PageHeader>
+          {{ $t("What's your number?") }}
+          <p slot="more" class="nq-notice">
+            {{ $t("Enter your Sinpe Móvil phone number.") }}
+          </p>
+        </PageHeader>
+
+        <form @submit.prevent="sendSms">
+          <PageBody>
+            <LabelInput
+              :placeholder="$t('Enter phone number')"
+              v-model="phoneNumber"
+            />
+            <p class="nq-notice error">{{ errorMessage }}</p>
+          </PageBody>
+          <PageFooter>
+            <button
+              class="nq-button light-blue confirm"
+              type="submit"
+              :disabled="
+                sinpaMovilDisabled ||
+                !validPhoneNumber ||
+                state !== SinpeMovilFlowState.Idle
+              "
+            >
+              <template v-if="state === SinpeMovilFlowState.SendingSms">
+                {{ $t("Sending SMS...") }}
+              </template>
+              <template v-else>
+                {{ $t("Confirm Number") }}
+                <template v-if="sendSmsTimeleft > 0"
+                  >{{
+                    $tc("({secondsLeft}s)", Math.ceil(sendSmsTimeleft / 1000))
+                  }}
+                </template>
+              </template>
+            </button>
+          </PageFooter>
+        </form>
+      </li>
+
+      <li>
+        <PageHeader>
+          {{ $t("Approve the sale") }}
+          <p slot="more" class="nq-notice">
+            {{
+              $t("Enter the code sent to {phoneNumber} to approve.", {
+                phoneNumber: `${phoneNumber}`,
+              })
+            }}
+          </p>
+        </PageHeader>
+        <PageBody>
+          <input
+            type="text"
+            v-model="otpCode"
+            autocomplete="one-time-code"
+            placeholder="#"
+            inputmode="numeric"
+            maxlength="6"
+            pattern="\d{6}"
+          />
+          <p class="nq-notice error">{{ errorMessage }}</p>
+        </PageBody>
+        <PageFooter>
+          <button
+            class="nq-button-s"
+            @click="sendSms"
+            :disabled="sendSmsTimeleft > 0"
+          >
+            <template v-if="sendSmsTimeleft > 0">
+              {{
+                $tc(
+                  "Resend ({secondsLeft}s)",
+                  Math.ceil(sendSmsTimeleft / 1000)
+                )
+              }}
+            </template>
+            <template v-else>
+              {{ $t("Resend") }}
+            </template>
+          </button>
+        </PageFooter>
+      </li>
+    </ol>
+  </Modal>
+</template>
+
+<script lang="ts">
+import {
+    computed,
+    defineComponent,
+    onMounted,
+    onUnmounted,
+    ref,
+    watch,
+} from '@vue/composition-api';
+import {
+    PageHeader,
+    ArrowLeftIcon,
+    PageBody,
+    PageFooter,
+    LabelInput,
+} from '@nimiq/vue-components';
+import { useConfig } from '@/composables/useConfig';
+import { RouteName } from '@/router';
+import { captureException } from '@sentry/vue';
+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 { isFiatAsset } from '@/stores/Swaps';
+import Modal from './Modal.vue';
+
+export enum SinpeMovilFlowState {
+  Idle = 'idle',
+  SendingSms = 'sending-sms',
+  WaitingForOtp = 'waiting-for-otp',
+  VerifyingSms = 'verifying-sms',
+  PhoneVerified = 'phone-verified',
+  Error = 'error',
+}
+
+const headers = { Authorization: `Basic ${btoa('nimiq:run8.deadest')}` };
+
+interface VerifySmsRequest {
+  otp: string;
+  phone_number: string; // eslint-disable-line camelcase
+  verification_id: HmacVerificationResponse; // eslint-disable-line camelcase
+}
+
+interface HmacVerificationResponse {
+  timestamp: number;
+  hmac: string;
+}
+
+export default defineComponent({
+    props: {
+        pair: {
+            type: Array as unknown as () => [SwapAsset, SwapAsset],
+            // TODO Remove comment
+            // required: true, Just for testing is commented
+            default: () => [SwapAsset.NIM, SwapAsset.CRC] as [SwapAsset, SwapAsset],
+        },
+    },
+    setup(props, context) {
+        onMounted(() => {
+            if (!SINPE_MOVIL_PAIRS.some(([from, to]) => from === props.pair[0] && to === props.pair[1])) {
+                console.error('Invalid pair:', props.pair); // eslint-disable-line no-console
+                context.root.$router.push('/');
+            }
+        });
+
+        const { config } = useConfig();
+        const { activeAddressInfo } = useAddressStore();
+
+        const isSelling = computed(() => isFiatAsset(props.pair[1]));
+
+        const addressListOpened = ref(false);
+
+        const scrollerEl = ref<HTMLUListElement | null>(null);
+        const scrollerIndex = ref(0);
+        onMounted(() => scrollTo(scrollerIndex.value));
+
+        function scrollTo(index: number) {
+            if (
+                !scrollerEl.value
+        || index < 0
+        || index >= scrollerEl.value.children.length
+            ) return;
+            scrollerEl.value.scrollTo({
+                left: index * scrollerEl.value.clientWidth,
+                behavior: 'smooth',
+            });
+            scrollerIndex.value = index;
+        }
+        const slidePrev = () => scrollTo(scrollerIndex.value - 1);
+        const slideNext = () => scrollTo(scrollerIndex.value + 1);
+
+        const { smsApiEndpoint, enabled } = config.sinpeMovil;
+        const sinpaMovilDisabled = computed(
+            () => !enabled && SINPE_MOVIL_PAIRS.length === 0,
+        );
+
+        const state = ref(SinpeMovilFlowState.Idle);
+        const errorMessage = ref<string | null>(null);
+
+        const sendSmsResponse = ref<HmacVerificationResponse | null>(null);
+
+        const phoneNumber = ref('+50688888888');
+        const costaRicanPhoneRegex = /^(\+506)?(\s*\d{8}\s*$)/;
+        const validPhoneNumber = computed(() =>
+            costaRicanPhoneRegex.test(phoneNumber.value),
+        );
+
+        const sendSmsTs = ref<number | null>(null);
+
+        // Reactive timestamp of Date.now()
+        const now = ref(Date.now());
+        let stopIntervalNow: any;
+        onMounted(
+            () =>
+                (stopIntervalNow = setInterval(() => (now.value = Date.now()), 1000)),
+        );
+        onUnmounted(() => clearInterval(stopIntervalNow));
+
+        const sendSmsTimeout = 60 * 1000; // 1 minute
+        // Time left for the user to be able to send another SMS
+        const sendSmsTimeleft = computed(() => {
+            if (!sendSmsTs.value) return 0;
+            const timeleft = sendSmsTimeout - (now.value - sendSmsTs.value);
+            return timeleft > 0 ? timeleft : 0;
+        });
+
+        /**
+     * How to do verify the phone number:
+     * 1. User enters phone number and we send it to the server.
+     * 2. Server sends an SMS with a code to the phone number.
+     * 3. Immediately after sending the SMS, we get a response with an HMAC and a timestamp.
+     * 4. User enters the code they received in the SMS.
+     * 5. We send the phone number + the code + the HMAC + timestamp to the server to verify
+     * 6. We get a new HMAC and timestamp if the verification was successful. This new hmac
+     * will be used in the /settle request in the swap.
+     */
+
+        async function sendSms() {
+            if (sinpaMovilDisabled.value || !validPhoneNumber.value) return;
+            if (sendSmsTs.value && sendSmsTimeleft.value > 0) return;
+            state.value = SinpeMovilFlowState.SendingSms;
+            errorMessage.value = '';
+
+            sendSmsTs.value = now.value;
+
+            try {
+                const res = await fetch(`${smsApiEndpoint}/send/${phoneNumber.value}`, {
+                    headers,
+                });
+                if (!res.ok) {
+                    state.value = SinpeMovilFlowState.Error;
+                    errorMessage.value = (await res.text())
+            || 'We could not send the SMS. Please try again later.';
+                    return;
+                }
+                const json = (await res.json()) as HmacVerificationResponse;
+                if (!json.hmac || !json.timestamp) {
+                    state.value = SinpeMovilFlowState.Error;
+                    errorMessage.value = 'There was an error with the SMS response. Please try again later.';
+                    return;
+                }
+
+                sendSmsResponse.value = json;
+                state.value = SinpeMovilFlowState.WaitingForOtp;
+                slideNext();
+                detectOtp();
+            } catch (error: unknown) {
+                state.value = SinpeMovilFlowState.Error;
+                errorMessage.value = 'There was an error with the phone verification system. Please try again later.';
+                if (config.reportToSentry) captureException(error);
+                else console.error(error); // eslint-disable-line no-console
+
+                // TODO Remove
+                // state.value = SinpeMovilFlowState.WaitingForOtp;
+                // sendSmsResponse.value = { hmac: '123456', timestamp: Date.now() };
+                // slideNext();
+            }
+        }
+
+        const otpCode = ref<string>(null);
+        const otpCodeIsValid = computed(
+            () => otpCode.value && otpCode.value.toString().length === 6,
+        );
+
+        /**
+     * Detects the OTP code from the browser's autofill feature and fills the input.
+     */
+        function detectOtp() {
+            if (!('OTPCredential' in window)) return;
+
+            const input = scrollerEl.value!.querySelector(
+                'input[autocomplete="one-time-code"]',
+            );
+            if (!input) return;
+            const ac = new AbortController();
+
+            navigator.credentials
+                .get({
+                    // @ts-expect-error Types are not up to date
+                    otp: { transport: ['sms'] },
+                    signal: ac.signal,
+                })
+                .then((otp) => {
+                    // @ts-expect-error Types are not up to date
+                    const retrievedOtpCode = otp?.code;
+                    if (!retrievedOtpCode) return;
+                    otpCode.value = retrievedOtpCode;
+                    verifyOtp();
+                })
+                .catch(() => {
+                    /* Let user input the code manually */
+                });
+        }
+
+        watch(otpCode, () => {
+            if (otpCodeIsValid.value) verifyOtp();
+        });
+
+        const { setData, reset: resetSinpeMovilStore } = useSinpeMovilStore();
+        resetSinpeMovilStore();
+
+        async function verifyOtp() {
+            if (
+                sinpaMovilDisabled.value
+        || !validPhoneNumber.value
+        || !sendSmsResponse.value
+        || !otpCode.value
+            ) {
+                return;
+            }
+
+            state.value = SinpeMovilFlowState.VerifyingSms;
+            errorMessage.value = '';
+
+            const body: VerifySmsRequest = {
+                phone_number: phoneNumber.value,
+                otp: otpCode.value,
+                verification_id: sendSmsResponse.value,
+            };
+
+            const h = { ...headers, 'Content-Type': 'application/json' };
+            await fetch(`${smsApiEndpoint}/verify`, {
+                method: 'POST',
+                headers: h,
+                body: JSON.stringify(body),
+            })
+                .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(
+                                'There was an error with the phone verification system. Please try again later.',
+                            ) as string);
+                        return;
+                    }
+                    const json = (await res.json()) as { token: string, timestamp: number };
+                    if (!json || !json.token) {
+                        state.value = SinpeMovilFlowState.Error;
+                        errorMessage.value = context.root.$t(
+                            'There was an error with the phone verification system. Please try again later.') as string;
+                        return;
+                    }
+                    state.value = SinpeMovilFlowState.PhoneVerified;
+                    setData({
+                        phoneNumber: phoneNumber.value,
+                        token: json.token!,
+                        tokenTimestamp: sendSmsResponse.value!.timestamp,
+                    });
+                    context.root.$router.push({
+                        name: RouteName.AssetTransfer,
+                        params: {
+                            pair: JSON.stringify(props.pair),
+                            method: AssetTransferMethod.SinpeMovil,
+                        },
+                        query: context.root.$router.currentRoute.query,
+                    });
+
+                    setTimeout(reset, 1000);
+                })
+                .catch((error) => {
+                    errorMessage.value = error.message
+                        ? error.message
+                        : JSON.stringify(error);
+                    if (config.reportToSentry) captureException(error);
+                    else console.error(error); // eslint-disable-line no-console
+                    state.value = SinpeMovilFlowState.Error;
+                });
+        }
+
+        function goBack() {
+            if (scrollerIndex.value === 0) {
+                context.root.$router.push({
+                    name: RouteName.SinpeMovilInfo,
+                    params: { pair: JSON.stringify(props.pair) },
+                });
+            } else {
+                slidePrev();
+            }
+        }
+
+        function reset() {
+            sendSmsResponse.value = null;
+            otpCode.value = null;
+            errorMessage.value = null;
+            state.value = SinpeMovilFlowState.Idle;
+            sendSmsTs.value = null;
+            resetSinpeMovilStore();
+        }
+
+        function closeModal() {
+            reset();
+            context.root.$router.push('/');
+        }
+
+        return {
+            activeAddressInfo,
+            addressListOpened,
+            goBack,
+            scrollerEl,
+            scrollerIndex,
+
+            state,
+            SinpeMovilFlowState,
+            phoneNumber,
+            sinpaMovilDisabled,
+            validPhoneNumber,
+            errorMessage,
+
+            sendSms,
+            sendSmsTimeleft,
+
+            otpCode,
+            verifyOtp,
+
+            isSelling,
+            closeModal,
+        };
+    },
+    components: {
+        Modal,
+        PageHeader,
+        ArrowLeftIcon,
+        PageBody,
+        PageFooter,
+        LabelInput,
+    },
+});
+</script>
+
+<style lang="scss" scoped>
+.sinpe-movil-modal {
+    .page-header-back-button {
+      font-size: 3rem;
+      position: absolute;
+      left: 4rem;
+      top: 4rem;
+      padding-top: 0.25rem;
+      opacity: 0.4;
+      transition: opacity 0.3s var(--nimiq-ease),
+        transform 0.3s var(--nimiq-ease);
+      color: inherit;
+      z-index: 10;
+    }
+
+    .page-header-back-button svg {
+      display: block;
+    }
+
+    .page-header-back-button:hover,
+    .page-header-back-button:focus {
+      opacity: 1;
+      transform: translate3D(-0.375rem, 0, 0);
+      outline: none;
+    }
+
+    @media (max-width: 450px) {
+      .page-header-back-button,
+        /* Don't move button left on mobile */
+        .page-header-back-button:hover,
+        .page-header-back-button:focus {
+        left: 3rem;
+        transform: none;
+      }
+    }
+
+    .page-header-back-button::after {
+      content: "";
+      display: block;
+      position: absolute;
+      inset: -1.5rem;
+    }
+
+  .page-header {
+    .nq-notice {
+      min-height: 2lh;
+    }
+  }
+
+  ol {
+    list-style: none;
+    position: relative;
+    height: 100%;
+    width: 100%;
+    padding: 0;
+    scroll-padding: 0 5rem;
+    overflow: hidden;
+    display: flex;
+    gap: 5rem;
+    scroll-snap-type: x proximity;
+    margin: 0;
+
+    > li {
+      scroll-snap-align: center;
+      flex-shrink: 0;
+      width: calc(100% - 5rem);
+      display: flex;
+      flex-direction: column;
+
+      &:first-child {
+        padding-left: 5rem;
+      }
+
+      &:last-child {
+        padding-right: 5rem;
+      }
+
+      form {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+      }
+
+      .page-body {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        padding: 0 4rem;
+
+        .nq-notice {
+          text-align: center;
+        }
+
+        :where([autocomplete="one-time-code"]) {
+          font-size: 3rem;
+          font-weight: 600;
+          padding: 1.25rem 2.25rem;
+          border: none;
+          --border-color: rgba(31, 35, 72, 0.1);
+          box-shadow: inset 0 0 0 0.25rem var(--border-color);
+          color: var(--nimiq-light-blue);
+          caret-color: var(--nimiq-light-blue);
+          background: 0 0;
+          border-radius: 0.5rem;
+          outline: 0;
+          transition: color 0.2s ease, box-shadow 0.2s ease;
+          background-clip: padding-box;
+          width: 26rem;
+          letter-spacing: 2rem;
+          overflow: hidden;
+
+          &:focus,
+          &:hover {
+            color: var(--nimiq-light-blue);
+            --border-color: var(--nimiq-light-blue);
+          }
+        }
+      }
+
+      .page-footer {
+        margin-top: auto;
+
+        .nq-button.confirm {
+          white-space: nowrap;
+        }
+
+        .nq-button-s {
+          width: max-content;
+          margin: 0 auto;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/modals/SinpeMovilModal.vue b/src/components/modals/SinpeMovilModal.vue
deleted file mode 100644
index 18b12013f..000000000
--- a/src/components/modals/SinpeMovilModal.vue
+++ /dev/null
@@ -1,439 +0,0 @@
-<template>
-    <Modal class="sinpe-movil-modal">
-        <PageHeader back-arrow @back="goBack">
-            <transition name="fade" mode="out-in">
-                <div :key="scrollerIndex">
-                    <template v-if="scrollerIndex === 0">
-                        {{ $t("What's your number?") }}
-                        <p slot="more" class="nq-notice">
-                            {{ $t('Enter your Sinpe Móvil phone number.') }}
-                        </p>
-                    </template>
-                    <template v-if="scrollerIndex === 1">
-                        {{ $t("Approve the sale") }}
-                        <p slot="more" class="nq-notice">
-                            {{ $t('Enter the code sent to {phoneNumber} to approve.', { phoneNumber: `${phoneNumber}` })
-                            }}
-                        </p>
-                    </template>
-                    <template v-if="scrollerIndex === 2">
-                        {{ $t("Sell crypto") }}
-                    </template>
-                </div>
-            </transition>
-        </PageHeader>
-        <ol ref="scrollerEl">
-            <li>
-                <form @submit.prevent="sendSms">
-                    <PageBody>
-                        <LabelInput :placeholder="$t('Enter phone number')" v-model="phoneNumber" />
-                        <p class="nq-notice error">{{ errorMessage }}</p>
-                    </PageBody>
-                    <PageFooter>
-                        <button class="nq-button light-blue" type="submit"
-                            :disabled="sinpaMovilDisabled || !validPhoneNumber || state !== SinpeMovilFlowState.Idle">
-                            <template v-if="state === SinpeMovilFlowState.SendingSms">
-                                {{ $t("Sending SMS...") }}
-                            </template>
-                            <template v-else>
-                                {{ $t("Confirm Number") }} <template v-if="sendSmsTimeleft > 0">{{
-                                    $tc("({secondsLeft}s)", Math.ceil(sendSmsTimeleft / 1000)) }}
-                                </template>
-                            </template>
-                        </button>
-                    </PageFooter>
-                </form>
-            </li>
-
-            <li>
-                <PageBody>
-                    <input type="text" v-model="otpCode" autocomplete="one-time-code" placeholder="#"
-                        inputmode="numeric" maxlength="6" pattern="\d{6}">
-                </PageBody>
-                <PageFooter>
-                    <button class="nq-button-s" @click="sendSms" :disabled="sendSmsTimeleft > 0">
-                        <template v-if="sendSmsTimeleft > 0">
-                            {{ $tc("Resend ({secondsLeft}s)", Math.ceil(sendSmsTimeleft / 1000)) }}
-                        </template>
-                        <template v-else>
-                            {{ $t("Resend") }}
-                        </template>
-                    </button>
-                </PageFooter>
-            </li>
-        </ol>
-    </Modal>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, onMounted, onUnmounted, ref, watch } from '@vue/composition-api';
-import { PageHeader, PageBody, PageFooter, LabelInput } from '@nimiq/vue-components';
-import { useConfig } from '@/composables/useConfig';
-import { RouteName } from '@/router';
-import { captureException } from '@sentry/vue';
-import { useAddressStore } from '@/stores/Address';
-import { SwapAsset } from '@nimiq/libswap';
-import { useSinpeMovilStore } from '@/stores/SinpeMovil';
-import { AssetTransferMethod } from '@/composables/asset-transfer/types';
-import { CryptoCurrency, FiatCurrency, SINPE_MOVIL_PAIRS } from '@/lib/Constants';
-import Modal from './Modal.vue';
-
-export enum SinpeMovilFlowState {
-    Idle = 'idle',
-    SendingSms = 'sending-sms',
-    WaitingForOtp = 'waiting-for-otp',
-    VerifyingSms = 'verifying-sms',
-    PhoneVerified = 'phone-verified',
-    Error = 'error'
-}
-
-const headers = { Authorization: `Basic ${btoa('nimiq:run8.deadest')}` };
-
-interface VerifySmsRequest {
-    otp: string;
-    phone_number: string; // eslint-disable-line camelcase
-    verification_id: HmacVerificationResponse; // eslint-disable-line camelcase
-}
-
-interface HmacVerificationResponse {
-    timestamp: number;
-    hmac: string;
-}
-
-export default defineComponent({
-    props: {
-        flow: {
-            type: String as () => 'buy' | 'sell',
-            default: 'sell',
-        },
-    },
-    setup(props, context) {
-        const { config } = useConfig();
-        const { activeAddressInfo } = useAddressStore();
-
-        const addressListOpened = ref(false);
-
-        const scrollerEl = ref<HTMLUListElement | null>(null);
-        const scrollerIndex = ref(0);
-        onMounted(() => scrollTo(scrollerIndex.value));
-
-        function scrollTo(index: number) {
-            if (!scrollerEl.value || index < 0 || index >= scrollerEl.value.children.length) return;
-            scrollerEl.value.scrollTo({ left: index * scrollerEl.value.clientWidth, behavior: 'smooth' });
-            scrollerIndex.value = index;
-        }
-        const slidePrev = () => scrollTo(scrollerIndex.value - 1);
-        const slideNext = () => scrollTo(scrollerIndex.value + 1);
-
-        const { smsApiEndpoint, enabled } = config.sinpeMovil;
-        const sinpaMovilDisabled = computed(() => !enabled && SINPE_MOVIL_PAIRS.length === 0);
-
-        const state = ref(SinpeMovilFlowState.Idle);
-        const errorMessage = ref<string | null>(null);
-
-        const sendSmsResponse = ref<HmacVerificationResponse | null>(null);
-
-        const phoneNumber = ref('+50688888888');
-        const costaRicanPhoneRegex = /^(\+506)?(\s*\d{8}\s*$)/;
-        const validPhoneNumber = computed(() => costaRicanPhoneRegex.test(phoneNumber.value));
-
-        const sendSmsTs = ref<number | null>(null);
-
-        // Reactive timestamp of Date.now()
-        const now = ref<number>(Date.now());
-        let stopIntervalNow: any;
-        onMounted(() => stopIntervalNow = setInterval(() => now.value = Date.now(), 1000));
-        onUnmounted(() => clearInterval(stopIntervalNow));
-
-        const sendSmsTimeout = 60 * 1000; // 1 minute
-        // Time left for the user to be able to send another SMS
-        const sendSmsTimeleft = computed(() => {
-            if (!sendSmsTs.value) return 0;
-            const timeleft = sendSmsTimeout - (now.value - sendSmsTs.value);
-            return timeleft > 0 ? timeleft : 0;
-        });
-
-        /**
-         * How to do verify the phone number:
-         * 1. User enters phone number and we send it to the server.
-         * 2. Server sends an SMS with a code to the phone number.
-         * 3. Immediately after sending the SMS, we get a response with an HMAC and a timestamp.
-         * 4. User enters the code they received in the SMS.
-         * 5. We send the phone number + the code + the HMAC + timestamp to the server to verify
-         * 6. We get a new HMAC and timestamp if the verification was successful. This new hmac
-         * will be used in the /settle request in the swap.
-         */
-
-        async function sendSms() {
-            if (sinpaMovilDisabled.value || !validPhoneNumber.value) return;
-            if (sendSmsTs.value && sendSmsTimeleft.value > 0) return;
-            state.value = SinpeMovilFlowState.SendingSms;
-            errorMessage.value = '';
-
-            sendSmsTs.value = now.value;
-
-            try {
-                const res = await fetch(`${smsApiEndpoint}/send/${phoneNumber.value}`, { headers });
-                if (!res.ok) {
-                    state.value = SinpeMovilFlowState.Error;
-                    errorMessage.value = await res.text()
-                        || 'We could not send the SMS. Please try again later.';
-                    return;
-                }
-                const json = await res.json() as HmacVerificationResponse;
-                if (!json.hmac || !json.timestamp) {
-                    state.value = SinpeMovilFlowState.Error;
-                    errorMessage.value = 'There was an error with the SMS response. Please try again later.';
-                    return;
-                }
-
-                sendSmsResponse.value = json;
-                state.value = SinpeMovilFlowState.WaitingForOtp;
-                slideNext();
-                detectOtp();
-            } catch (error: unknown) {
-                state.value = SinpeMovilFlowState.Error;
-                errorMessage.value = 'There was an error with the phone verification system. Please try again later.';
-                if (config.reportToSentry) captureException(error);
-                else console.error(error); // eslint-disable-line no-console
-
-                // TODO Remove
-                // state.value = SinpeMovilFlowState.WaitingForOtp;
-                // sendSmsResponse.value = { hmac: '123456', timestamp: Date.now() };
-                // slideNext();
-            }
-        }
-
-        const otpCode = ref<string | null>(null);
-        const otpCodeIsValid = computed(() => otpCode.value && otpCode.value.toString().length === 6);
-
-        /**
-         * Detects the OTP code from the browser's autofill feature and fills the input.
-         */
-        function detectOtp() {
-            if (!('OTPCredential' in window)) return;
-
-            const input = scrollerEl.value!.querySelector('input[autocomplete="one-time-code"]');
-            if (!input) return;
-            const ac = new AbortController();
-
-            navigator.credentials.get({
-                // @ts-expect-error Types are not up to date
-                otp: { transport: ['sms'] },
-                signal: ac.signal,
-            }).then((otp) => {
-                // @ts-expect-error Types are not up to date
-                const retrievedOtpCode = otp?.code;
-                if (!retrievedOtpCode) return;
-                otpCode.value = retrievedOtpCode;
-                verifyOtp();
-            }).catch(() => { /* Let user input the code manually */ });
-        }
-
-        watch(otpCode, () => {
-            if (otpCodeIsValid.value) verifyOtp();
-        });
-
-        const { connect, reset: resetSinpeMovilStore } = useSinpeMovilStore();
-        resetSinpeMovilStore();
-
-        async function verifyOtp() {
-            if (sinpaMovilDisabled.value || !validPhoneNumber.value || !sendSmsResponse.value || !otpCode.value) {
-                return;
-            }
-
-            state.value = SinpeMovilFlowState.VerifyingSms;
-            errorMessage.value = '';
-
-            const body: VerifySmsRequest = {
-                phone_number: phoneNumber.value,
-                otp: otpCode.value,
-                verification_id: sendSmsResponse.value,
-            };
-
-            const h = { ...headers, 'Content-Type': 'application/json' };
-            await fetch(`${smsApiEndpoint}/verify`, { method: 'POST', headers: h, body: JSON.stringify(body) })
-                .then(async (res) => {
-                    if (!res.ok) {
-                        state.value = SinpeMovilFlowState.Error;
-                        errorMessage.value = 'There was an error with the phone verification system.'
-                            + 'Please try again later.'; // TODO Wording + translations
-                        return;
-                    }
-                    const json = await res.json() as { token: string, timestamp: number };
-                    if (!json || !json.token) {
-                        state.value = SinpeMovilFlowState.Error;
-                        errorMessage.value = 'There was an error with the phone verification system.'
-                            + 'Please try again later.'; // TODO Wording + translations
-                        return;
-                    }
-                    state.value = SinpeMovilFlowState.PhoneVerified;
-                    connect({
-                        phoneNumber: phoneNumber.value,
-                        token: json.token!,
-                        tokenTimestamp: sendSmsResponse.value!.timestamp,
-                    });
-                    context.root.$router.push({
-                        name: RouteName.AssetTransfer,
-                        params: {
-                            pairFrom: CryptoCurrency.NIM,
-                            pairTo: FiatCurrency.CRC,
-                            method: AssetTransferMethod.SinpeMovil,
-                        },
-                        query: context.root.$router.currentRoute.query,
-                    });
-
-                    setTimeout(() => state.value = SinpeMovilFlowState.Idle, 1000);
-                })
-                .catch((error) => {
-                    errorMessage.value = error.message ? error.message : JSON.stringify(error);
-                    if (config.reportToSentry) captureException(error);
-                    else console.error(error); // eslint-disable-line no-console
-                    state.value = SinpeMovilFlowState.Error;
-                });
-        }
-
-        onMounted(() => {
-            // Validate that what the user is trying to do is enabled
-            if (props.flow !== 'buy' && props.flow !== 'sell') {
-                context.root.$router.push('/');
-            } else if (props.flow === 'buy' && SINPE_MOVIL_PAIRS.some(([from]) => from === SwapAsset.CRC)) {
-                context.root.$router.push('/');
-            } else if (props.flow === 'sell' && SINPE_MOVIL_PAIRS.some(([, to]) => to === SwapAsset.CRC)) {
-                context.root.$router.push('/');
-            }
-        });
-
-        function goBack() {
-            if (scrollerIndex.value === 0) {
-                context.root.$router.push({ name: RouteName.SinpeMovilSellInfo });
-                /* When buy is enabled props.flow === 'buy'
-                    ? RouteName.SinpeMovilBuyInfo : RouteName.SinpeMovilSellInfo }); */
-            } else {
-                slidePrev();
-            }
-        }
-
-        return {
-            activeAddressInfo,
-            addressListOpened,
-            goBack,
-            scrollerEl,
-            scrollerIndex,
-
-            state,
-            SinpeMovilFlowState,
-            phoneNumber,
-            sinpaMovilDisabled,
-            validPhoneNumber,
-            errorMessage,
-
-            sendSms,
-            sendSmsTimeleft,
-
-            otpCode,
-            verifyOtp,
-
-            pair: {
-                fromAsset: SwapAsset.NIM,
-                toAsset: SwapAsset.CRC,
-                unitBPerUnitA: 0.012,
-                maxLimit: 1000,
-                nimAddress: activeAddressInfo.value?.address || '',
-            },
-        };
-    },
-    components: {
-        Modal,
-        PageHeader,
-        PageBody,
-        PageFooter,
-        LabelInput,
-    },
-});
-</script>
-
-<style lang="scss" scoped>
-.sinpe-movil-modal {
-    ol {
-        list-style: none;
-        position: relative;
-        height: 100%;
-        width: 100%;
-        padding: 0;
-        scroll-padding: 0 5rem;
-        overflow: hidden;
-        display: flex;
-        gap: 5rem;
-        scroll-snap-type: x proximity;
-        margin: 0;
-
-        >li {
-            scroll-snap-align: center;
-            flex-shrink: 0;
-            width: calc(100% - 5rem);
-            display: flex;
-            flex-direction: column;
-
-            &:first-child {
-                padding-left: 5rem;
-            }
-
-            &:last-child {
-                padding-right: 5rem;
-            }
-
-            form {
-                height: 100%;
-                display: flex;
-                flex-direction: column;
-            }
-
-            .page-body {
-                display: flex;
-                flex-direction: column;
-                align-items: center;
-                padding: 0 4rem;
-
-                .nq-notice {
-                    text-align: center;
-                }
-
-                :where([autocomplete=one-time-code]) {
-                    font-size: 3rem;
-                    font-weight: 600;
-                    padding: 1.25rem 2.25rem;
-                    border: none;
-                    --border-color: rgba(31, 35, 72, 0.1);
-                    box-shadow: inset 0 0 0 .25rem var(--border-color);
-                    color: var(--nimiq-light-blue);
-                    caret-color: var(--nimiq-light-blue);
-                    background: 0 0;
-                    border-radius: .5rem;
-                    outline: 0;
-                    transition: color .2s ease, box-shadow .2s ease;
-                    background-clip: padding-box;
-                    width: 26rem;
-                    letter-spacing: 2rem;
-                    overflow: hidden;
-
-                    &:focus,
-                    &:hover {
-                        color: var(--nimiq-light-blue);
-                        --border-color: var(--nimiq-light-blue);
-                    }
-                }
-            }
-
-            .page-footer {
-                margin-top: auto;
-
-                .nq-button-s {
-                    width: max-content;
-                    margin: 0 auto;
-                }
-            }
-        }
-    }
-}
-</style>
diff --git a/src/components/swap/SwapAnimation.vue b/src/components/swap/SwapAnimation.vue
index 6419b1c3e..3e834987f 100644
--- a/src/components/swap/SwapAnimation.vue
+++ b/src/components/swap/SwapAnimation.vue
@@ -3,7 +3,7 @@
         :class="{
             'manual-funding': manualFunding && state === SwapState.CREATE_OUTGOING,
             'to-funding-delay': toFundingDurationMins && state === SwapState.AWAIT_INCOMING,
-            'to-limit-exceeded': oasisLimitExceeded && toAsset === SwapAsset.EUR,
+            'to-limit-exceeded': oasisLimitExceeded && isFiatAsset(toAsset),
             'from-funding-delay': fromFundingDurationMins && state === SwapState.CREATE_OUTGOING,
         }"
     >
@@ -19,14 +19,14 @@
             <h1 class="title nq-h1">{{ $t('The swap expired') }}</h1>
             <p class="expired-text">
                 {{ $t('No funds were received so the swap expired.') }}<br>
-                <template v-if="fromAsset === SwapAsset.EUR">
+                <template v-if="isFiatAsset(fromAsset)">
                     {{ $t('Any funds sent will be refunded within 1-3 days.') }}
                 </template>
                 <template v-else>
                     {{ $t('Any funds sent will be refunded.') }}
                 </template>
             </p>
-            <template v-if="fromAsset === SwapAsset.EUR">
+            <template v-if="isFiatAsset(fromAsset)">
                 <p class="expired-text">
                     {{ $t('Click on ‘Troubleshooting’ to learn more.') }}
                 </p>
@@ -40,7 +40,7 @@
         </div>
 
         <div class="oasis-limit-exceeded-background flex-column nq-orange-bg"
-            :class="{'visible': oasisLimitExceeded && fromAsset === SwapAsset.EUR}"
+            :class="{'visible': oasisLimitExceeded && isFiatAsset(fromAsset)}"
         >
             <CloseButton class="top-right inverse" @click="$emit('cancel')"/>
             <div class="flex-grow"></div>
@@ -99,7 +99,7 @@
         </transition>
 
         <transition name="fade">
-            <div v-if="oasisLimitExceeded && toAsset === SwapAsset.EUR"
+            <div v-if="oasisLimitExceeded && isFiatAsset(toAsset)"
                 class="to-limit-exceeded-container flex-column"
             >
                 <div class="header flex-row">
@@ -116,7 +116,10 @@
                         {{ $t('You have exceeded your OASIS limit.') }}
                     </h2>
                     <p class="nq-gray">
-                        {{ $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)
+                        }}
                     </p>
                 </div>
             </div>
@@ -129,7 +132,7 @@
                     (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`"
@@ -185,7 +188,7 @@
                     <div class="flex-row swap-amount">
                         <GroundedArrowUpIcon v-if="!switchSides"/>
                         <GroundedArrowDownIcon v-if="switchSides"/>
-                        <Amount v-if="leftAsset !== SwapAsset.EUR" :amount="!switchSides ? fromAmount : toAmount" :currency="assetToCurrency(leftAsset)"/>
+                        <Amount v-if="!isFiatAsset(leftAsset)" :amount="!switchSides ? fromAmount : toAmount" :currency="assetToCurrency(leftAsset)"/>
                         <FiatAmount v-else :amount="(!switchSides ? fromAmount : toAmount) / 100" :currency="assetToCurrency(leftAsset)"/>
                     </div>
                 </div>
@@ -209,7 +212,7 @@
                     (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`"
@@ -265,7 +268,7 @@
                     <div class="flex-row swap-amount">
                         <GroundedArrowDownIcon v-if="!switchSides"/>
                         <GroundedArrowUpIcon v-if="switchSides"/>
-                        <Amount v-if="rightAsset !== SwapAsset.EUR" :amount="!switchSides ? toAmount : fromAmount" :currency="assetToCurrency(rightAsset)"/>
+                        <Amount v-if="!isFiatAsset(rightAsset)" :amount="!switchSides ? toAmount : fromAmount" :currency="assetToCurrency(rightAsset)"/>
                         <FiatAmount v-else :amount="(!switchSides ? toAmount : fromAmount) / 100" :currency="assetToCurrency(rightAsset)"/>
                     </div>
                 </div>
@@ -294,7 +297,7 @@
                 4/5 {{ $t('Awaiting swap secret') }}
             </div>
             <div v-if="state === SwapState.SETTLE_INCOMING || state === SwapState.COMPLETE" class="nq-h2">
-                <template v-if="toAsset === SwapAsset.EUR">
+                <template v-if="isFiatAsset(toAsset)">
                     5/5 {{ $t('Processing payout') }}
                 </template>
                 <template v-else>
@@ -303,7 +306,7 @@
             </div>
 
             <MessageTransition>
-                <template v-if="fromAsset === SwapAsset.EUR && state <= SwapState.CREATE_OUTGOING">
+                <template v-if="isFiatAsset(fromAsset) && state <= SwapState.CREATE_OUTGOING">
                     <div v-if="bottomNoticeMsg === BottomNoticeMessage.FIRST"
                         class="dont-close-wallet-notice nq-light-blue">{{
                         $t('You will finalize your purchase by bank transfer.')
@@ -315,7 +318,7 @@
                     }}</div>
                 </template>
 
-                <template v-else-if="toAsset === SwapAsset.EUR && state === SwapState.SETTLE_INCOMING">
+                <template v-else-if="isFiatAsset(toAsset) && state === SwapState.SETTLE_INCOMING">
                     <div v-if="bottomNoticeMsg === BottomNoticeMessage.FIRST"
                         class="dont-close-wallet-notice nq-orange">{{
                         $t('Don\'t close your wallet until the swap is complete!')
@@ -364,7 +367,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';
@@ -483,12 +486,13 @@ 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 '';
             }
         });
 
         const rightColor = computed(() => {
-            if (props.oasisLimitExceeded && rightAsset.value === SwapAsset.EUR) return 'white';
+            if (props.oasisLimitExceeded && isFiatAsset(rightAsset.value)) return 'white';
 
             switch (rightAsset.value) {
                 case SwapAsset.NIM: {
@@ -502,6 +506,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';
                 default: return '';
             }
         });
@@ -512,6 +517,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 'Costa Rican Colón';
                 default: throw new Error(`Invalid asset ${asset}`);
             }
         }
@@ -664,6 +670,7 @@ export default defineComponent({
             timer,
             assetToCurrency,
             errorActionText,
+            isFiatAsset,
         };
     },
     components: {
diff --git a/src/components/swap/SwapNotification.vue b/src/components/swap/SwapNotification.vue
index 14776beb3..3b1d7ae3d 100644
--- a/src/components/swap/SwapNotification.vue
+++ b/src/components/swap/SwapNotification.vue
@@ -68,8 +68,10 @@ 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 } from '../../stores/Swaps';
+import { useSwapsStore,
+    SwapState, ActiveSwap, SwapEurData, SwapErrorAction, isFiatAsset, SwapCrcData } from '../../stores/Swaps';
 import { useNetworkStore } from '../../stores/Network';
 import { useBtcNetworkStore } from '../../stores/BtcNetwork';
 import { useBankStore } from '../../stores/Bank';
@@ -104,6 +106,7 @@ 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);
@@ -153,8 +156,10 @@ export default defineComponent({
                     }
                     case SwapAsset.BTC:
                     case SwapAsset.USDC_MATIC:
+                    case SwapAsset.CRC:
                     case SwapAsset.EUR: {
-                        const { timeout } = contract as Contract<SwapAsset.BTC | SwapAsset.USDC_MATIC | SwapAsset.EUR>;
+                        const { timeout } = contract as Contract<
+                            SwapAsset.BTC | SwapAsset.USDC_MATIC | SwapAsset.EUR | SwapAsset.CRC>;
                         if (timeout <= timestamp) return true;
                         remainingTimes.push(timeout - timestamp);
                         break;
@@ -281,7 +286,9 @@ export default defineComponent({
                         endBlock: blockHeightAtTimeout > currentHeight ? undefined : blockHeightAtTimeout,
                     };
                 }
-                case SwapAsset.EUR: return { getHtlc, settleHtlc };
+                case SwapAsset.CRC:
+                case SwapAsset.EUR:
+                    return { getHtlc, settleHtlc };
                 default: throw new Error(`Unsupported asset: ${asset}`);
             }
         }
@@ -639,35 +646,53 @@ 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 },
+                                {
+                                    authorization: activeSwap.value!.settlementAuthorizationToken,
+                                    smsApi,
+                                },
                             );
 
                             if (activeSwap.value!.to.asset === SwapAsset.BTC) {
                                 subscribeToAddresses([(settlementTx as BtcTransactionDetails).outputs[0].address!]);
                             }
 
-                            if (activeSwap.value!.to.asset === SwapAsset.EUR) {
+                            if (isFiatAsset(activeSwap.value!.to.asset)) {
                                 let htlc = settlementTx as OasisHtlc<HtlcStatus.SETTLED>;
 
-                                // As EUR payments are not otherwise detected by the Wallet, we use this
+                                // As EUR/CRC payments are not otherwise detected by the Wallet, we use this
                                 // place to persist the relevant information in our store.
-                                const swapData: SwapEurData = {
+                                const htlcData: SwapEurData['htlc'] = {
+                                    id: htlc.id,
+                                    timeoutTimestamp: htlc.expires,
+                                    settlement: {
+                                        status: htlc.settlement.status,
+                                    },
+                                };
+                                const swapData = activeSwap.value!.to.asset === SwapAsset.EUR ? ({
                                     asset: SwapAsset.EUR,
                                     bankLabel: bank.value!.name,
                                     // bankLogo?: string,
                                     iban: bankAccount.value!.iban,
                                     amount: htlc.amount,
-                                    htlc: {
-                                        id: htlc.id,
-                                        timeoutTimestamp: htlc.expires,
-                                        settlement: {
-                                            status: htlc.settlement.status,
-                                        },
-                                    },
-                                };
+                                    htlc: htlcData,
+                                } as SwapEurData) : ({
+                                    asset: SwapAsset.CRC,
+                                    amount: htlc.amount,
+                                    phoneNumber: phoneNumber.value,
+                                    htlc: htlcData,
+                                } as SwapCrcData);
 
                                 if (htlc.settlement.status === SettlementStatus.PENDING) {
                                     // Add swap data to store so the tx history already shows the tx as a swap
diff --git a/src/composables/asset-transfer/types.ts b/src/composables/asset-transfer/types.ts
index b7c0bdb67..935dc57d3 100644
--- a/src/composables/asset-transfer/types.ts
+++ b/src/composables/asset-transfer/types.ts
@@ -1,6 +1,7 @@
-import { FiatCurrency, CryptoCurrency } from '@/lib/Constants';
 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 { Ref } from '@vue/composition-api';
 import { VueConstructor } from 'vue';
 import { SwapLimits } from '../useSwapLimits';
@@ -10,7 +11,7 @@ export enum AssetTransferMethod {
 }
 
 export interface AssetTransferOptions {
-  pair: (FiatCurrency | CryptoCurrency)[];
+  pair: [SwapAsset, SwapAsset];
 }
 
 type VueComponent = VueConstructor<Vue>;
@@ -21,10 +22,10 @@ type Computed<T> = Readonly<Ref<Readonly<T>>>;
 export interface AssetTransferParams {
   isSelling: boolean;
 
-  leftAsset: FiatCurrency | CryptoCurrency;
-  rightAsset: FiatCurrency | CryptoCurrency;
-  currencyFiatFallback: FiatCurrency;
-  currencyCrypto: CryptoCurrency;
+  leftAsset: SwapAsset;
+  rightAsset: SwapAsset;
+  currencyFiatFallback: FiatSwapAsset;
+  currencyCrypto: CryptoSwapAsset;
 
   fiatAmount: Ref<number>;
   cryptoAmount: Ref<number>;
@@ -49,7 +50,8 @@ export interface AssetTransferParams {
 
   modalTitle: string;
 
-  swap: Ref<Readonly<ActiveSwap | null>>;
+  swap: Computed<ActiveSwap | null>;
+  estimateError: Computed<string | null>;
 
   detectionDelay: number;
 
diff --git a/src/composables/asset-transfer/useSinpeMovilSwap.ts b/src/composables/asset-transfer/useSinpeMovilSwap.ts
index 2a7d6c6be..159c8b1bd 100644
--- a/src/composables/asset-transfer/useSinpeMovilSwap.ts
+++ b/src/composables/asset-transfer/useSinpeMovilSwap.ts
@@ -2,8 +2,8 @@ import {
     FiatCurrency,
     CryptoCurrency,
     OASIS_CRC_DETECTION_DELAY,
-    FiatCurrencyOffered,
     FIAT_CURRENCIES_OFFERED,
+    ENV_MAIN,
 } from '@/lib/Constants';
 import { computed, ref, watch } from '@vue/composition-api';
 import { selectedFiatCurrency,
@@ -12,8 +12,10 @@ import { selectedFiatCurrency,
     useCurrentLimitCrypto,
     calculateFees,
     getFiatSwapParameters,
-    useSwapEstimate } from '@/lib/swap/utils/CommonUtils';
-import { calculateDisplayedDecimals } from '@/lib/NumberFormatting';
+    useSwapEstimate,
+    capDecimals,
+    FiatSwapCurrency,
+} from '@/lib/swap/utils/CommonUtils';
 import { i18n } from '@/i18n/i18n-setup';
 import { useAddressStore } from '@/stores/Address';
 import { useSwapsStore, SwapState } from '@/stores/Swaps';
@@ -23,7 +25,7 @@ import { setupSwap } from '@/hub';
 import { getNetworkClient } from '@/network';
 import { useAccountStore } from '@/stores/Account';
 import { useNetworkStore } from '@/stores/Network';
-import { cancelSwap, Contract, createSwap, getSwap, PreSwap, RequestAsset, Swap } from '@nimiq/fastspot-api';
+import { cancelSwap, Contract, createSwap, getSwap, PreSwap, RequestAsset, Swap, SwapAsset } from '@nimiq/fastspot-api';
 import {
     SinpeMovilHtlcSettlementInstructions,
     HtlcCreationInstructions,
@@ -33,7 +35,6 @@ import {
     NimiqHtlcCreationInstructions,
     SinpeMovilHtlcCreationInstructions,
 } from '@nimiq/hub-api';
-import { SwapAsset } from '@nimiq/libswap';
 import {
     getHtlc,
     HtlcStatus,
@@ -41,6 +42,7 @@ import {
 } from '@nimiq/oasis-api';
 import { captureException } from '@sentry/vue';
 import { useSinpeMovilStore } from '@/stores/SinpeMovil';
+import router, { RouteName } from '@/router';
 import { SwapLimits, useSwapLimits } from '../useSwapLimits';
 import SinpeUserInfo from '../../components/SinpeUserInfo.vue';
 import AddressSelector from '../../components/AddressSelector.vue';
@@ -51,52 +53,63 @@ import { useConfig } from '../useConfig';
 type SinpeFiatCurrencies = FiatCurrency.CRC;
 
 function isCryptoCurrency(currency: any): currency is CryptoCurrency {
-    return Object.values(CryptoCurrency).includes(currency);
+    return Object.values(CryptoCurrency).includes(currency.toLocaleLowerCase() as CryptoCurrency);
 }
 
 function isFiatCurrency(currency: any): currency is SinpeFiatCurrencies {
-    return Object.values(FiatCurrency).includes(currency);
+    return Object.values(FiatCurrency).includes(currency.toLocaleLowerCase() as FiatCurrency);
 }
 
-const fiatDecimals: Partial<Record<SinpeFiatCurrencies, number>> = {
-    [FiatCurrency.CRC]: 2,
-};
+export async function useSinpeMovilSwap(options: AssetTransferOptions): Promise<AssetTransferParams> {
+    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) } });
+    }
 
-export function useSinpeMovilSwap(options: AssetTransferOptions): AssetTransferParams {
     const [leftAsset, rightAsset] = options.pair;
-    const fiatCurrency = isFiatCurrency(leftAsset) ? leftAsset : rightAsset as SinpeFiatCurrencies;
-    const cryptoCurrency = isCryptoCurrency(leftAsset) ? leftAsset : rightAsset as CryptoCurrency;
-    selectedFiatCurrency.value = fiatCurrency;
+    const fiatCurrency = isFiatCurrency(leftAsset) ? leftAsset : rightAsset;
+    const cryptoCurrency = isCryptoCurrency(leftAsset) ? leftAsset : rightAsset;
+
+    // Code in the wallet rely on the global "selectedFiatCurrency" for swaps
+    selectedFiatCurrency.value = fiatCurrency.toLocaleLowerCase() as FiatSwapCurrency;
 
     // Loading the CRC currency is lazy, we need to explicitly set it
-    useFiatStore().updateExchangeRates({ fiatCurrency: selectedFiatCurrency.value as FiatCurrencyOffered });
+    await useFiatStore().updateExchangeRates({ fiatCurrency: selectedFiatCurrency.value });
 
     const isSelling = leftAsset === cryptoCurrency;
 
+    const { estimate } = useSwapEstimate();
+
     const fiatAmount = ref(0);
     const cryptoAmount = ref(0);
 
-    const decimalsCrypto = computed(() => calculateDisplayedDecimals(fiatAmount.value, cryptoCurrency));
-    const decimalsFiat = computed(() => fiatDecimals[fiatCurrency] || 0);
+    // const decimalsCrypto = computed(() => calculateDisplayedDecimals(fiatAmount.value, cryptoCurrency));
+    const decimalsCrypto = computed(() => 5);
+    const decimalsFiat = computed(() => 0);
 
     const { activeAddress, accountBalance } = useAddressStore();
 
     const { exchangeRates } = useFiatStore();
     const exchangeRate = computed(() => {
-        if (!FIAT_CURRENCIES_OFFERED.includes(selectedFiatCurrency.value as FiatCurrencyOffered)) {
+        if (!FIAT_CURRENCIES_OFFERED.includes(selectedFiatCurrency.value)) {
             return 0; // No exchange rate available yet
         }
 
-        const rate = exchangeRates.value[cryptoCurrency]?.[selectedFiatCurrency.value] || 0;
+        const rate = exchangeRates.value[cryptoCurrency]?.[fiatCurrency] || 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][selectedFiatCurrency.value] || 0;
+        const usdRate = exchangeRates.value[CryptoCurrency.USDC][fiatCurrency] || 0;
         return currentLimitUsd.value * usdRate;
     });
 
@@ -104,6 +117,7 @@ export function useSinpeMovilSwap(options: AssetTransferOptions): AssetTransferP
     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);
     });
 
@@ -111,14 +125,11 @@ export function useSinpeMovilSwap(options: AssetTransferOptions): AssetTransferP
 
     const addressListOpened = ref(false);
 
-    const { label: sinpeLabel, phoneNumber } = useSinpeMovilStore();
-
     const { activeSwap: swap, setActiveSwap, setSwap } = useSwapsStore();
     const { config } = useConfig();
 
     const swapError = ref<string>(null);
 
-    const { estimate } = useSwapEstimate();
     const fetchingEstimate = ref(false);
 
     let timeoutId: number;
@@ -138,8 +149,8 @@ export function useSinpeMovilSwap(options: AssetTransferOptions): AssetTransferP
         }
 
         const args = fiatAmount.value
-            ? { fiatAmount: fiatAmount.value, fiatAsset: selectedFiatCurrency.value.toUpperCase() }
-            : { cryptoAmount: cryptoAmount.value, fiatAsset: selectedFiatCurrency.value.toUpperCase() };
+            ? { fiatAmount: fiatAmount.value, fiatAsset: fiatCurrency.toUpperCase() }
+            : { cryptoAmount: cryptoAmount.value, fiatAsset: fiatCurrency.toUpperCase() };
         await updateEstimateFn!(args).then(() => {
             estimateError.value = null;
         }).catch((error: any) => {
@@ -150,52 +161,47 @@ export function useSinpeMovilSwap(options: AssetTransferOptions): AssetTransferP
         fetchingEstimate.value = false;
     }
 
-    watch([fiatAmount, cryptoAmount], ([newFiat, newCrypto]) => {
+    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, 500);
+        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 canSign = computed(() =>
-        fiatAmount.value
-        && !estimateError.value && !swapError.value
-        && estimate.value
-        && !!sinpeLabel.value && !!phoneNumber.value
-        && limits.value?.current.usd
+        !!fiatAmount.value
+        && estimateError.value === null
+        && swapError.value === null
+        && estimate.value !== null
+        && sinpeLabel.value !== null && phoneNumber.value !== null
+        && (limits.value?.current?.usd || 0) > 0
         && !fetchingEstimate.value
         && !insufficientBalance.value
         && !insufficientLimit.value,
     );
 
     async function sign() {
-        console.log('Signing swap...'); // eslint-disable-line no-console
-        console.log(canSign.value);
-        console.log({
-            estimateError: estimateError.value,
-            isEstimateErrorTheProblem: !estimateError.value,
-            swapError: swapError.value,
-            isSwapErrorTheProblem: !swapError.value,
-            estimate: estimate.value,
-            isEstimateTheProblem: !!estimate.value,
-            sinpeLabel: sinpeLabel.value,
-            isSinpeLabelTheProblem: !sinpeLabel.value,
-            phoneNumber: phoneNumber.value,
-            isPhoneNumberTheProblem: !phoneNumber.value,
-            limits: limits.value?.current.usd,
-            isLimitsTheProblem: !!limits.value?.current.usd,
-            fetchingEstimate: fetchingEstimate.value,
-            isFetchingEstimateTheProblem: !fetchingEstimate.value,
-            insufficientBalance: insufficientBalance.value,
-            isInsufficientBalanceTheProblem: !insufficientBalance.value,
-            insufficientLimit: insufficientLimit.value,
-            isInsufficientLimitTheProblem: !insufficientLimit.value,
-        });
+        console.log('Signing swap...', canSign.value); // eslint-disable-line no-console
+
         if (!canSign.value) return;
 
         // eslint-disable-next-line no-async-promise-executor
@@ -204,21 +210,21 @@ export function useSinpeMovilSwap(options: AssetTransferOptions): AssetTransferP
 
             try {
                 const args: Parameters<typeof getFiatSwapParameters>[1] = fiatAmount.value
-                    ? { to: { asset: SwapAsset.EUR, amount: fiatAmount.value } }
+                    ? { to: { asset: SwapAsset.CRC, amount: fiatAmount.value } }
                     : { from: { amount: cryptoAmount.value } };
                 const { from, to } = getFiatSwapParameters(SwapAsset.CRC, args);
 
                 swapSuggestion = await createSwap(from as RequestAsset<SwapAsset>, to as SwapAsset);
 
                 // Update local fees with latest feePerUnit values
-                const { fundingFee } = calculateFees({ to: FiatCurrency.EUR }, swapSuggestion.from.amount, {
+                const { fundingFee } = calculateFees({ to: FiatCurrency.CRC }, swapSuggestion.from.amount, {
                     fiat: swapSuggestion.to.fee || 0,
                     nim: swapSuggestion.from.feePerUnit!,
                     btc: 0,
                 });
 
                 swapSuggestion.from.fee = fundingFee;
-                swapSuggestion.to.fee = 0; // OASIS' SEPA Instant fees are already included
+                swapSuggestion.to.fee = 0;
 
                 console.log('Swap ID:', swapSuggestion.id); // eslint-disable-line no-console
 
@@ -271,15 +277,11 @@ export function useSinpeMovilSwap(options: AssetTransferOptions): AssetTransferP
                     value: swapSuggestion.to.amount,
                     fee: swapSuggestion.to.fee,
                     recipientLabel: sinpeLabel.value!,
-                    // settlement: config.environment === ENV_MAIN ? {
-                    //     type: OasisTransactionType.SINPEMOVIL,
-                    //     phoneNumber: phoneNumber.value,
-                    // } : {
-                    //     type: OasisTransactionType.MOCK,
-                    // },
-                    settlement: {
+                    settlement: config.environment === ENV_MAIN ? {
                         type: OasisTransactionType.SINPEMOVIL,
                         phoneNumber: phoneNumber.value!,
+                    } : {
+                        type: OasisTransactionType.MOCK,
                     },
                 };
             }
@@ -299,10 +301,10 @@ export function useSinpeMovilSwap(options: AssetTransferOptions): AssetTransferP
                 swapId: swapSuggestion.id,
                 fund,
                 redeem,
-                fiatCurrency: selectedFiatCurrency.value,
+                fiatCurrency,
                 fundingFiatRate:
                         exchangeRates.value[swapSuggestion.from.asset.toLowerCase()][selectedFiatCurrency.value]!,
-                redeemingFiatRate: 1, // 1 EUR = 1 EUR
+                redeemingFiatRate: 1, // 1 CRC = 1 CRC
                 fundFees: {
                     processing: 0,
                     redeeming: swapSuggestion.from.serviceNetworkFee,
@@ -342,8 +344,8 @@ export function useSinpeMovilSwap(options: AssetTransferOptions): AssetTransferP
             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 (typeof signedTransactions.crc !== 'string' || (!signedTransactions.nim && !signedTransactions.btc)) {
+            const error = new Error('Internal error: Hub result did not contain CRC or (NIM|BTC) data');
             if (config.reportToSentry) captureException(error);
             else console.error(error); // eslint-disable-line no-console
             swapError.value = error.message;
@@ -390,7 +392,7 @@ export function useSinpeMovilSwap(options: AssetTransferOptions): AssetTransferP
 
         setActiveSwap({
             ...confirmedSwap,
-            // Place NIM HTLC address into the swap object, as it's otherwise unknown for NIM-to-EUR swaps
+            // Place NIM HTLC address into the swap object, as it's otherwise unknown for NIM-to-CRC swaps
             ...(nimHtlcAddress ? { contracts: {
                 ...confirmedSwap.contracts,
                 [SwapAsset.NIM]: {
@@ -407,15 +409,15 @@ export function useSinpeMovilSwap(options: AssetTransferOptions): AssetTransferP
             fundingSerializedTx: confirmedSwap.from.asset === SwapAsset.NIM
                 ? signedTransactions.nim!.serializedTx
                 : signedTransactions.btc!.serializedTx,
-            settlementSerializedTx: signedTransactions.eur,
+            settlementSerializedTx: signedTransactions.crc,
             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}'`);
+        const crcContract = confirmedSwap.contracts[SwapAsset.CRC] as Contract<SwapAsset.CRC>;
+        const oasisHtlc = await getHtlc(crcContract.htlc.address);
+        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!';
@@ -433,13 +435,14 @@ export function useSinpeMovilSwap(options: AssetTransferOptions): AssetTransferP
             }
             // 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');
+                throw new Error(`OASIS HTLC amount (${oasisHtlc.amount}) doesn't match with `
+                    + `confirmed swap (${confirmedSwap.to.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;
+            // 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
@@ -469,7 +472,7 @@ export function useSinpeMovilSwap(options: AssetTransferOptions): AssetTransferP
             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') {
+            if (swap.value!.to.asset === SwapAsset.CRC) {
                 settlementSerializedTx = JSON.stringify({
                     preimage: '0000000000000000000000000000000000000000000000000000000000000000',
                     settlement: settlementSerializedTx,
@@ -481,7 +484,7 @@ export function useSinpeMovilSwap(options: AssetTransferOptions): AssetTransferP
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
-                    ...(swap.value!.to.asset === 'EUR' && settlementAuthorizationToken
+                    ...(swap.value!.to.asset === SwapAsset.CRC && settlementAuthorizationToken
                         ? { 'X-OASIS-Settle-Token': settlementAuthorizationToken }
                         : null
                     ),
@@ -516,7 +519,7 @@ export function useSinpeMovilSwap(options: AssetTransferOptions): AssetTransferP
         leftAsset,
         rightAsset,
         currencyFiatFallback: fiatCurrency,
-        currencyCrypto: isCryptoCurrency(rightAsset) ? rightAsset : leftAsset as CryptoCurrency,
+        currencyCrypto: isCryptoCurrency(rightAsset) ? rightAsset : leftAsset,
 
         fiatAmount,
         updateFiatAmount: (value: number) => fiatAmount.value = value,
@@ -539,6 +542,7 @@ export function useSinpeMovilSwap(options: AssetTransferOptions): AssetTransferP
         modalTitle: i18n.t('Sell Crypto') as string,
 
         swap,
+        estimateError,
 
         detectionDelay: OASIS_CRC_DETECTION_DELAY,
 
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/composables/useSwapLimits.ts b/src/composables/useSwapLimits.ts
index 7799dc40d..50187e26e 100644
--- a/src/composables/useSwapLimits.ts
+++ b/src/composables/useSwapLimits.ts
@@ -1,7 +1,7 @@
 import { ref, watch } from '@vue/composition-api';
 import { getLimits, getUserLimits, SwapAsset } from '@nimiq/fastspot-api';
 import { useTransactionsStore, Transaction as NimTransaction } from '../stores/Transactions';
-import { SwapEurData, useSwapsStore } from '../stores/Swaps';
+import { isFiatAsset, SwapEurData, useSwapsStore } from '../stores/Swaps';
 import { useBtcTransactionsStore, Transaction as BtcTransaction } from '../stores/BtcTransactions';
 import { useFiatStore } from '../stores/Fiat';
 import { CryptoCurrency, FiatCurrency } from '../lib/Constants';
@@ -93,7 +93,7 @@ watch(async () => {
 
                 const swap = getSwapByTransactionHash.value(tx.transactionHash)!;
                 // Ignore all swaps that are not from fiat
-                if (!useSwapsStore().isFiatAsset(swap?.in?.asset)) return false;
+                if (!isFiatAsset(swap?.in?.asset)) return false;
 
                 return {
                     ...swap.in,
@@ -108,7 +108,7 @@ watch(async () => {
 
                 const swap = getSwapByTransactionHash.value(tx.transactionHash)!;
                 // Ignore all swaps that are not from fiat
-                if (!useSwapsStore().isFiatAsset(swap?.in?.asset)) return false;
+                if (!isFiatAsset(swap?.in?.asset)) return false;
 
                 return {
                     ...swap.in,
@@ -123,7 +123,7 @@ watch(async () => {
 
                 const swap = getSwapByTransactionHash.value(tx.transactionHash);
                 // Ignore all swaps that are not from fiat
-                if (!swap || !useSwapsStore().isFiatAsset(swap?.in?.asset)) return false;
+                if (!swap || !isFiatAsset(swap?.in?.asset)) return false;
 
                 return {
                     ...swap.in,
diff --git a/src/lib/ExplorerUtils.ts b/src/lib/ExplorerUtils.ts
index b1636dcbe..b9af685b7 100644
--- a/src/lib/ExplorerUtils.ts
+++ b/src/lib/ExplorerUtils.ts
@@ -28,6 +28,7 @@ export function explorerAddrLink(asset: SwapAsset, address: string) {
         case SwapAsset.USDC_MATIC:
             return `https://${config.environment === ENV_MAIN ? '' : 'mumbai.'}polygonscan.com/address/${address}`;
         case SwapAsset.EUR:
+        case SwapAsset.CRC:
             if (config.environment === ENV_MAIN) return `https://oasis.watch/?id=${address}`;
             return `${config.oasis.apiEndpoint}/htlc/${address}`;
         default: throw new Error('Invalid asset');
diff --git a/src/lib/export/Format.ts b/src/lib/export/Format.ts
index 81c2bc379..2afc8c8de 100644
--- a/src/lib/export/Format.ts
+++ b/src/lib/export/Format.ts
@@ -7,7 +7,7 @@ import { Transaction as BtcTx, useBtcTransactionsStore } from '../../stores/BtcT
 import { Transaction as UsdcTx } from '../../stores/UsdcTransactions';
 import { parseData } from '../DataFormatting';
 import { isProxyData, ProxyType } from '../ProxyDetection';
-import { SwapBtcData, SwapNimData, SwapUsdcData, useSwapsStore } from '../../stores/Swaps';
+import { isFiatAsset, SwapBtcData, SwapNimData, SwapUsdcData, useSwapsStore } from '../../stores/Swaps';
 import { ExportFormat } from './TransactionExport';
 
 /* eslint-disable class-methods-use-this */
@@ -141,7 +141,7 @@ export abstract class Format {
                     messageOverride = `Swap ${swapInfo.in.asset} to ${swapInfo.out.asset}`;
                 }
 
-                if (!useSwapsStore().isFiatAsset(otherSideSwapData?.asset)) {
+                if (!isFiatAsset(otherSideSwapData?.asset)) {
                     const otherTransaction = this.transactions.find(
                         (t) => t.transactionHash === (otherSideSwapData as SwapBtcData | SwapNimData | SwapUsdcData)
                             ?.transactionHash,
diff --git a/src/lib/swap/utils/CommonUtils.ts b/src/lib/swap/utils/CommonUtils.ts
index cf793cac3..e6637b5ec 100644
--- a/src/lib/swap/utils/CommonUtils.ts
+++ b/src/lib/swap/utils/CommonUtils.ts
@@ -1,7 +1,7 @@
 import { AssetList, Estimate, getAssets, RequestAsset, SwapAsset } from '@nimiq/fastspot-api';
 import { CurrencyInfo } from '@nimiq/utils';
 import { computed, onUnmounted, ref, getCurrentInstance, Ref } from '@vue/composition-api';
-import { useSwapsStore } from '@/stores/Swaps';
+import { isFiatAsset } from '@/stores/Swaps';
 import { useAccountStore } from '../../../stores/Account';
 import { useFiatStore } from '../../../stores/Fiat';
 import { useSettingsStore } from '../../../stores/Settings';
@@ -23,6 +23,7 @@ const { accountUtxos } = useBtcAddressStore();
 const { connectedUser: kycUser } = useKycStore();
 
 export type FiatSwapAsset = SwapAsset.EUR | SwapAsset.CRC;
+export type CryptoSwapAsset = SwapAsset.NIM | SwapAsset.BTC | SwapAsset.USDC;
 export type FiatSwapCurrency = FiatCurrency.EUR | FiatCurrency.CRC;
 
 /**
@@ -169,12 +170,12 @@ export function calculateFees(
         }
 
         settlementFee = feesPerUnit.fiat
-            || (estimate.value && useSwapsStore().isFiatAsset(estimate.value.to.asset)
+            || (estimate.value && isFiatAsset(estimate.value.to.asset)
                 && estimate.value.to.fee)
             || 0;
     } else { // from Fiat
         fundingFee = feesPerUnit.fiat
-            || (estimate.value && useSwapsStore().isFiatAsset(estimate.value.from.asset)
+            || (estimate.value && isFiatAsset(estimate.value.from.asset)
                 && estimate.value.from.fee)
             || 0;
 
@@ -217,13 +218,13 @@ export function getFiatSwapParameters<FiatAsset extends FiatSwapAsset>(fiatAsset
     if (!to && !from) return { to: null, from: null };
 
     if ((to && !('asset' in to) && to.amount)
-        || (from && ('asset' in from) && useSwapsStore().isFiatAsset(from.asset) && from.amount)) { // Buy crypto
+        || (from && ('asset' in from) && isFiatAsset(from.asset) && from.amount)) { // Buy crypto
         const fees = calculateFees({ from: assetToCurrency(fiatAsset) });
         const toSwapAsset = activeCurrency.value === CryptoCurrency.BTC
             ? SwapAsset.BTC
             : SwapAsset.NIM;
 
-        if (from && ('asset' in from) && useSwapsStore().isFiatAsset(from.asset) && from.amount) {
+        if (from && ('asset' in from) && isFiatAsset(from.asset) && from.amount) {
             return {
                 from: { [fiatAsset]: (from.amount - fees.fundingFee) / 100 },
                 to: toSwapAsset,
@@ -247,7 +248,7 @@ export function getFiatSwapParameters<FiatAsset extends FiatSwapAsset>(fiatAsset
     }
 
     if ((from && !('asset' in from) && from.amount)
-        || (to && ('asset' in to) && useSwapsStore().isFiatAsset(to.asset) && to.amount)) { // Sell crypto
+        || (to && ('asset' in to) && isFiatAsset(to.asset) && to.amount)) { // Sell crypto
         const fees = calculateFees({ to: assetToCurrency(fiatAsset) }, to?.amount);
         const fromSwapAsset = activeCurrency.value === CryptoCurrency.BTC
             ? SwapAsset.BTC
@@ -269,7 +270,7 @@ export function getFiatSwapParameters<FiatAsset extends FiatSwapAsset>(fiatAsset
 
         return {
             from: fromSwapAsset,
-            to: { [fiatAsset]: (to!.amount + fees.settlementFee) / 100 },
+            to: { [fiatAsset]: (to!.amount + fees.settlementFee) },
         } as {
             from: typeof fromSwapAsset,
             to: RequestAsset<FiatAsset>,
diff --git a/src/lib/swap/utils/Functions.ts b/src/lib/swap/utils/Functions.ts
index df01b84c2..9adf2ae66 100644
--- a/src/lib/swap/utils/Functions.ts
+++ b/src/lib/swap/utils/Functions.ts
@@ -1,5 +1,5 @@
 import { AssetList, Estimate, SwapAsset } from '@nimiq/fastspot-api';
-import { useSwapsStore } from '@/stores/Swaps';
+import { isFiatAsset } from '@/stores/Swaps';
 import { estimateFees } from '../../BitcoinTransactionUtils';
 import { CryptoCurrency, FiatCurrency } from '../../Constants';
 import { useConfig } from '../../../composables/useConfig';
@@ -156,7 +156,7 @@ export function getFiatFees(estimate: Estimate | null, cryptoCurrency: CryptoCur
 
     const data = estimate;
 
-    if (data && useSwapsStore().isFiatAsset(data.to.asset)) {
+    if (data && isFiatAsset(data.to.asset)) {
         const funding: FundingFees = {} as FundingFees;
 
         const myFiatFee = data.to.fee;
@@ -204,7 +204,7 @@ export function getFiatFees(estimate: Estimate | null, cryptoCurrency: CryptoCur
         };
     }
 
-    if (data && useSwapsStore().isFiatAsset(data.from.asset)) {
+    if (data && isFiatAsset(data.from.asset)) {
         const settlement: SettlementFees = {} as SettlementFees;
 
         const myFiatFee = data.from.serviceEscrowFee;
diff --git a/src/lib/swap/utils/SellUtils.ts b/src/lib/swap/utils/SellUtils.ts
index c31c6a5ad..1523707fe 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,22 +82,20 @@ 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 } }
         : { from: { amount: cryptoAmount! } },
     );
-    if(!from || !to) return;
+    if (!from || !to) return;
 
     const newEstimate = await getEstimate(
         // Need to force one of the function signatures
         from as RequestAsset<SwapAsset>,
         to as SwapAsset,
     );
-    
+
     if (!newEstimate.from || !newEstimate.to) {
         throw new Error(`UNEXPECTED: ${fiatAsset} or crypto price not present in estimate`);
     }
diff --git a/src/main.ts b/src/main.ts
index 5c390f172..32531b0a4 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -93,13 +93,15 @@ async function start() {
     const { config } = useConfig();
 
     watch(() => {
+        // TODO Fastspot lib should allow dynamic reconfiguration or each function accepting the endpoint and key
+        // as arguments. For now, we just initialize the API with SINPE conf since it is the only one available.
         if (!config.fastspot.apiEndpoint || !config.fastspot.apiKey) return;
         initFastspotApi(config.fastspot.apiEndpoint, config.fastspot.apiKey);
     });
 
     watch(() => {
-        if (!config.oasis.apiEndpoint) return;
-        initOasisApi(config.oasis.apiEndpoint);
+        if (!config.sinpeMovil.apiEndpoint) return;
+        initOasisApi(config.sinpeMovil.apiEndpoint);
     });
 
     watch(() => {
diff --git a/src/router.ts b/src/router.ts
index d3a563305..a3d7765ca 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -75,10 +75,10 @@ const MoonpaySellInfoModal = () =>
     import(/* webpackChunkName: "moonpay-modal" */ './components/modals/MoonpaySellInfoModal.vue');
 const SimplexModal = () =>
     import(/* webpackChunkName: "simplex-modal" */ './components/modals/SimplexModal.vue');
-const SinpeMovilModal = () =>
-    import(/* webpackChunkName: "sinpe-movil-modal" */ './components/modals/SinpeMovilModal.vue');
-const SinpeMovileSellInfoModal = () =>
-    import(/* webpackChunkName: "sinpe-movil-info-modal" */ './components/modals/SinpeMovilSellInfoModal.vue');
+const SinpeMovilMobileVerificationModal = () =>
+    import(/* webpackChunkName: "sinpe-movil-modal" */ './components/modals/SinpeMovilMobileVerificationModal.vue');
+const SinpeMovileInfoModal = () =>
+    import(/* webpackChunkName: "sinpe-movil-info-modal" */ './components/modals/SinpeMovilInfoModal.vue');
 
 // Prestaking Modals
 const PrestakingModal = () =>
@@ -123,8 +123,8 @@ export enum RouteName {
     MoonpaySellInfo = 'moonpay-sell-info',
     Moonpay = 'moonpay',
     Simplex = 'simplex',
-    SinpeMovilSellInfo = 'sinpe-movil-sell-info',
-    SinpeMovil = 'sinpe-movil',
+    SinpeMovilInfo = 'sinpe-movil-info',
+    SinpeMovilMobileVerification = 'sinpe-movil-mobile-verification',
     RootReleaseNotes = 'root-release-notes',
     ExportHistory = 'export-history',
     Prestaking = 'prestaking',
@@ -389,18 +389,18 @@ const routes: RouteConfig[] = [{
             name: RouteName.Simplex,
             meta: { column: Columns.DYNAMIC },
         }, {
-            path: '/sinpe-movil-sell-info',
+            path: '/sinpe-movil-info',
             components: {
-                'persistent-modal': SinpeMovileSellInfoModal,
+                'persistent-modal': SinpeMovileInfoModal,
             },
-            name: RouteName.SinpeMovilSellInfo,
+            name: RouteName.SinpeMovilInfo,
             meta: { column: Columns.DYNAMIC },
         }, {
-            path: '/sinpe-movil',
+            path: '/sinpe-movil-mobile-verification',
             components: {
-                'persistent-modal': SinpeMovilModal,
+                'persistent-modal': SinpeMovilMobileVerificationModal,
             },
-            name: RouteName.SinpeMovil,
+            name: RouteName.SinpeMovilMobileVerification,
             meta: { column: Columns.DYNAMIC },
         }, {
             path: '/release-notes',
diff --git a/src/stores/SinpeMovil.ts b/src/stores/SinpeMovil.ts
index 28629d0bb..4f8493917 100644
--- a/src/stores/SinpeMovil.ts
+++ b/src/stores/SinpeMovil.ts
@@ -24,6 +24,7 @@ export const useSinpeMovilStore = createStore({
     getters: {
         phoneNumber: (state): Readonly<string | null> => state.phoneNumber || '',
         label: (state): Readonly<string | null> => state.label || '',
+        smsApiToken: (state): Readonly<string | null> => state.token || '',
         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('') || '',
@@ -36,7 +37,7 @@ export const useSinpeMovilStore = createStore({
         kycLimits: (state): Readonly<UserLimits | null> => state.userLimits,
     },
     actions: {
-        connect(user: Omit<SinpeMovilState, 'userLimits' | 'label'>) {
+        setData(user: Omit<SinpeMovilState, 'userLimits' | 'label'>) {
             // replace non-alphanumeric characters with spaces
             // We might show user name instead in the future
             // const label = user.label.replace(/[^a-zA-Z0-9]/g, ' ');
diff --git a/src/stores/Swaps.ts b/src/stores/Swaps.ts
index d38c7f2ad..378c8276e 100644
--- a/src/stores/Swaps.ts
+++ b/src/stores/Swaps.ts
@@ -220,7 +220,7 @@ export const useSwapsStore = createStore({
             if (!contractWithEstimate) return; // not a contract
 
             const fiatAsset = contractWithEstimate[contractProp].asset as FiatSwapAsset;
-            if (!this.isFiatAsset(otherAsset)) return; // not a fiat swap
+            if (!isFiatAsset(otherAsset)) return; // not a fiat swap
             const fiatCurrency = assetToCurrency(fiatAsset);
 
             const exchangeRate = {
@@ -247,7 +247,9 @@ export const useSwapsStore = createStore({
                 },
             });
         },
-
-        isFiatAsset: (c: any): c is SwapAsset.EUR | SwapAsset.CRC => c === SwapAsset.EUR || c === SwapAsset.CRC,
     },
 });
+
+export function isFiatAsset(c: any): c is SwapAsset.EUR | SwapAsset.CRC {
+    return c === SwapAsset.EUR || c === SwapAsset.CRC;
+}
diff --git a/src/swap-kyc-handler.ts b/src/swap-kyc-handler.ts
index 3d9d92cf5..91799b0bb 100644
--- a/src/swap-kyc-handler.ts
+++ b/src/swap-kyc-handler.ts
@@ -15,6 +15,7 @@ import { FormattableNumber } from '@nimiq/utils';
 import Config from 'config'; // Not using useConfig composable because we try to avoid Vue as dependency here.
 import { KycProvider, KycUser } from './stores/Kyc';
 import { i18n, detectLanguage, loadLanguage } from './i18n/i18n-setup';
+import { isFiatAsset } from './stores/Swaps';
 
 export interface SetupSwapWithKycResult extends SetupSwapResult {
     kyc: {
@@ -145,6 +146,7 @@ async function run() {
                                     case 'NIM': return toDecimalString(request.fund.value, 5);
                                     case 'BTC': return toDecimalString(request.fund.output.value, 8);
                                     case 'EUR': return toDecimalString(request.fund.value + request.fund.fee, 2);
+                                    case 'CRC': return toDecimalString(request.fund.value + request.fund.fee, 0);
                                     default: throw new Error($t('Unsupported currency', 'Unsupported currency'));
                                 }
                             })(),
@@ -154,6 +156,7 @@ async function run() {
                                     case 'NIM': return toDecimalString(request.redeem.value + request.redeem.fee, 5);
                                     case 'BTC': return toDecimalString(request.redeem.input.value, 8);
                                     case 'EUR': return toDecimalString(request.redeem.value, 2);
+                                    case 'CRC': return toDecimalString(request.redeem.value, 0);
                                     default: throw new Error($t('Unsupported currency', 'Unsupported currency'));
                                 }
                             })(),
@@ -203,7 +206,7 @@ async function run() {
             if (grantResponse && (!kycResponse || isChangedGrantResponse)) {
                 const s3Grant = grantResponse.services[s3ServiceId];
                 const oasisGrant = grantResponse.services[oasisServiceId];
-                const isOasisSwap = request.fund.type === 'EUR' || request.redeem.type === 'EUR';
+                const isOasisSwap = isFiatAsset(request.fund.type) || isFiatAsset(request.redeem.type);
                 if (!s3Grant || (isOasisSwap && !oasisGrant)) {
                     throw new Error($t(
                         'TEN31 Pass didn\'t return expected grants.',