fix: refactor invalid reason for swap

nimiq · Aug 18, 2024 · e353b26 · e353b26
1 parent bb5a44b
commit e353b26
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/src/components/modals/AssetTransferModal.vue b/src/components/modals/AssetTransferModal.vue
@@ -134,7 +134,7 @@
           @set-max="setMax()"
         />
         <MessageTransition class="message-section">
-          <template v-if="p.invalidReason === 'insufficient-limit' && p.currentLimitCrypto">
+          <template v-if="p.invalidReason === InvalidSwapReason.ReachedLimit && p.currentLimitCrypto">
             <!-- TEMP: wording TBD -->
             <i18n path="Max swappable amount is {amount}">
               <Amount
@@ -146,7 +146,7 @@
             ><br />
             <a @click="$emit('set-max')">{{ $t("Sell max") }}</a>
           </template>
-          <template v-else-if="p.invalidReason === 'insufficient-balance'">
+          <template v-else-if="p.invalidReason === InvalidSwapReason.InsufficientFunds">
             {{ $t("Insufficient balance.") }}
             <a @click="() => setMax()">{{ $t("Sell max") }}</a>
           </template>
@@ -254,6 +254,7 @@ import {
     AssetTransferMethod,
     AssetTransferOptions,
     AssetTransferParams,
+    InvalidSwapReason,
 } from '@/composables/asset-transfer/types';
 import {
     PageHeader,
@@ -470,6 +471,7 @@ export default defineComponent({
             cryptoAmount,
             fiatAmount,
             estimateError,
+            InvalidSwapReason,
         };
     },
     components: {

diff --git a/src/composables/asset-transfer/types.ts b/src/composables/asset-transfer/types.ts
@@ -24,6 +24,12 @@ export interface AssetTransferOptions {
 type VueComponent = VueConstructor<Vue>;
 type Computed<T> = Readonly<Ref<Readonly<T>>>;
 
+export enum InvalidSwapReason {
+  None = '',
+  InsufficientFunds = 'insufficient-funds',
+  LimitReached = 'limit-reached',
+}
+
 // The object type that will be returned by the composable found in the same folder,
 // which will be used in the SwapTransfer.vue component.
 export interface AssetTransferParams {
@@ -60,7 +66,7 @@ export interface AssetTransferParams {
 
   oasisLimitExceeded: Computed<boolean>;
 
-  invalidReason: Computed<string>;
+  invalidReason: Computed<InvalidSwapReason>;
 
   canSign: Computed<boolean>;
   sign: () => Promise<void>;

diff --git a/src/composables/asset-transfer/useSinpeMovilSwap.ts b/src/composables/asset-transfer/useSinpeMovilSwap.ts
@@ -43,7 +43,7 @@ import { useSinpeMovilStore } from '@/stores/SinpeMovil';
 import { SwapLimits, useSwapLimits } from '../useSwapLimits';
 import SinpeUserInfo from '../../components/SinpeUserInfo.vue';
 import AddressSelector from '../../components/AddressSelector.vue';
-import { AssetTransferOptions, AssetTransferParams } from './types';
+import { AssetTransferOptions, AssetTransferParams, InvalidSwapReason } from './types';
 import { useConfig } from '../useConfig';
 import { getHtlc } from '../../lib/OasisCrc';
 
@@ -106,8 +106,10 @@ export async function useSinpeMovilSwap(options: AssetTransferOptions): Promise<
         return currentLimitUsd.value * usdRate;
     });
 
-    // TODO move this to vue component
-    const insufficientBalance = computed(() => cryptoAmount.value > 0 && cryptoAmount.value > accountBalance.value);
+    const insufficientBalance = computed(() => {
+        if (!isSelling) return true;
+        return cryptoAmount.value > 0 && cryptoAmount.value > accountBalance.value;
+    });
     const currentLimitCrypto = useCurrentLimitCrypto(currentLimitFiat);
     const insufficientLimit = computed(() => {
         const cryptoLimit = currentLimitCrypto?.value || Number.POSITIVE_INFINITY;
@@ -491,9 +493,9 @@ export async function useSinpeMovilSwap(options: AssetTransferOptions): Promise<
         oasisLimitExceeded,
 
         invalidReason: computed(() => {
-            if (insufficientBalance.value) return 'insufficient-balance';
-            if (insufficientLimit.value) return 'insufficient-limit';
-            return '';
+            if (insufficientBalance.value) return InvalidSwapReason.InsufficientFunds;
+            if (insufficientLimit.value) return InvalidSwapReason.LimitReached;
+            return InvalidSwapReason.None;
         }),
 
         canSign,