fix PLA-1059

enjin · Dec 5, 2023 · 2400fe1 · 2400fe1
1 parent e45c74d
commit 2400fe1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/resources/js/components/slideovers/collection/DetailsCollectionSlideover.vue b/resources/js/components/slideovers/collection/DetailsCollectionSlideover.vue
@@ -20,7 +20,7 @@
                         <Address :address="Royalty.getRoyaltyBeneficiary(item)" />
 
                         <dt class="text-sm font-medium text-gray-500">Percentage</dt>
-                        <dd class="mt-1 text-sm text-gray-900">{{ Royalty.getRoyaltyPercentage(item) }}%</dd>
+                        <dd class="mt-1 text-sm text-gray-900">{{ Royalty.getRoyaltyPercentage(item) * 100 }}%</dd>
                     </div>
 
                     <div class="space-y-2 pt-4 pb-3">

diff --git a/resources/js/components/slideovers/common/DetailsTransactionSlideover.vue b/resources/js/components/slideovers/common/DetailsTransactionSlideover.vue
@@ -66,7 +66,10 @@
                             <dt class="text-base font-medium text-gray-500">State</dt>
                             <dd class="mt-1 text-sm text-gray-900">{{ transaction.state }}</dd>
                         </div>
-                        <div class="space-y-2 pt-4 pb-3" v-if="transaction.result">
+                        <div
+                            class="space-y-2 pt-4 pb-3"
+                            v-if="transaction.result && transaction.state === TransactionState.FINALIZED"
+                        >
                             <dt class="text-base font-medium text-gray-500">Result</dt>
                             <dd class="mt-1 text-sm text-gray-900 font-bold">
                                 <TransactionResultChip :text="transaction.result" />
@@ -114,6 +117,12 @@
                                         v-if="isAddressKey(param.type) && param.value"
                                         :address="`0x${param.value}`"
                                     />
+                                    <dd
+                                        v-else-if="param.type === 'percentage'"
+                                        class="mt-1 text-sm text-gray-900 break-words"
+                                    >
+                                        {{ param.value / 10000000 }}%
+                                    </dd>
                                     <dd v-else class="mt-1 text-sm text-gray-900 break-words">
                                         {{ param.value ?? '-' }}
                                     </dd>

diff --git a/resources/js/util/royalty.ts b/resources/js/util/royalty.ts
@@ -7,7 +7,7 @@ export default class Royalty {
 
     static getRoyaltyPercentage(item: any) {
         if (item?.royalty?.percentage) {
-            return item.royalty.percentage * 100;
+            return item.royalty.percentage;
         }
 
         return 0;