Merge pull request #762 from Adamant-im/fix/failed-tx-status

fix: failed tx status

Author: bludnic

src/components/LoginForm.vue

@@ -64,7 +64,6 @@ import { isAllNodesOfflineError, isAllNodesDisabledError } from '@/lib/nodes/uti
 import { mdiEye, mdiEyeOff } from '@mdi/js'
 import { useSaveCursor } from '@/hooks/useSaveCursor'
 
-
 const className = 'login-form'
 const classes = {
   root: className,
@@ -181,5 +180,4 @@ export default defineComponent({
     }
   }
 }
-
 </style>

src/components/LoginPasswordForm.vue

@@ -13,13 +13,7 @@
         variant="underlined"
       >
         <template #append-inner>
-          <v-btn
-            @click="togglePasswordVisibility"
-            icon
-            :ripple="false"
-            :size="28"
-            variant="plain"
-          >
+          <v-btn @click="togglePasswordVisibility" icon :ripple="false" :size="28" variant="plain">
             <v-icon :icon="showPassword ? mdiEye : mdiEyeOff" :size="24" />
           </v-btn>
         </template>

src/components/TransactionListItem.vue

@@ -4,9 +4,7 @@
       <template #prepend>
         <v-icon
           :class="`${className}__prepend-icon`"
-          :icon="
-            isStringEqualCI(senderId, userId) ? mdiAirplaneTakeoff : mdiAirplaneLanding
-          "
+          :icon="isStringEqualCI(senderId, userId) ? mdiAirplaneTakeoff : mdiAirplaneLanding"
           size="small"
         />
       </template>
@@ -39,7 +37,7 @@
       </v-list-item-title>
 
       <v-list-item-subtitle :class="`${className}__date`" class="a-text-explanation-small">
-        <span v-if="!isPendingTransaction">{{ formatDate(createdAt) }}</span>
+        <span v-if="!isStatusVisibleTransaction">{{ formatDate(createdAt) }}</span>
         <span v-else-if="status" :class="`${className}__status`">{{
           $t(`transaction.statuses.${status}`)
         }}</span>
@@ -72,7 +70,6 @@ import { timestampInSec } from '@/filters/helpers'
 import currency from '@/filters/currencyAmountWithSymbol'
 import { mdiAirplaneLanding, mdiAirplaneTakeoff, mdiMessageOutline, mdiMessageText } from '@mdi/js'
 
-
 export default {
   mixins: [partnerName],
   props: {
@@ -202,9 +199,11 @@ export default {
         )
       )
     },
-    isPendingTransaction() {
+    isStatusVisibleTransaction() {
       return (
-        this.status === TransactionStatus.PENDING || this.status === TransactionStatus.REGISTERED
+        this.status === TransactionStatus.PENDING ||
+        this.status === TransactionStatus.REGISTERED ||
+        this.status === TransactionStatus.REJECTED
       )
     }
   },

src/components/transactions/TransactionTemplate.vue

@@ -45,7 +45,6 @@
               />
             </v-list-item-title>
           </template>
-
           <div
             :class="[
               `${className}__inconsistent-status`,
@@ -58,7 +57,7 @@
               size="20"
               style="color: #f8a061 !important"
             />
-            {{ t(`transaction.statuses.${transactionStatus}`)
+            {{ formattedTransactionStatus
             }}<span v-if="inconsistentStatus">{{
               ': ' + t(`transaction.inconsistent_reasons.${inconsistentStatus}`, { crypto })
             }}</span>
@@ -272,6 +271,14 @@ export default defineComponent({
       props.admTx && props.admTx.message ? props.admTx.message : false
     )
 
+    const isPendingQuery = computed(() => props.queryStatus === 'pending')
+
+    const formattedTransactionStatus = computed(() => {
+      if (isPendingQuery.value) return Symbols.HOURGLASS
+
+      return t(`transaction.statuses.${props.transactionStatus}`)
+    })
+
     const statusUpdatable = computed(() => tsUpdatable(props.transactionStatus, props.crypto))
     const historyRate = computed(() => {
       if (!transaction.value) return Symbols.HOURGLASS
@@ -385,6 +392,7 @@ export default defineComponent({
       historyRate,
       rate,
       calculatedFee,
+      formattedTransactionStatus,
       formatAmount,
       mdiAlertOutline,
       mdiChevronRight,