Fixiki

Author: GusevPM

components/modals/BlobModal.vue

@@ -327,12 +327,12 @@ const handlePreviewContent = () => {
 						<Text size="12" weight="500" color="tertiary">Signer:</Text>
 
 						<Flex align="center" gap="8" :class="$style.value_wrapper">
-							<CopyButton :text="cacheStore.selectedBlob.signer" />
+							<CopyButton :text="cacheStore.selectedBlob.signer.hash" />
 
-							<NuxtLink :to="`/address/${cacheStore.selectedBlob.signer}`" target="_blank">
+							<NuxtLink :to="`/address/${cacheStore.selectedBlob.signer.hash}`" target="_blank">
 								<Flex align="center" gap="6">
 									<Text size="13" weight="600" color="primary" :class="$style.value">
-										{{ $getDisplayName("addresses", cacheStore.selectedBlob.signer) }}
+										{{ $getDisplayName("addresses", "", cacheStore.selectedBlob.signer) }}
 									</Text>
 
 									<Icon name="arrow-narrow-up-right" size="12" color="secondary" />

components/modules/block/BlobsTable.vue

@@ -106,7 +106,7 @@ const handleViewBlob = (blob) => {
 		namespace_name: blob.namespace.name,
 		commitment: blob.commitment,
 		height: blob.height,
-		signer: blob.signer.hash,
+		signer: blob.signer,
 		size: blob.size,
 		tx: blob.tx,
 		rollup: blob.rollup,

components/modules/navigation/Search.vue

@@ -92,7 +92,12 @@ const getResultMetadata = (target) => {
 
 		case "address":
 			metadata.type = target.type
-			metadata.title = target.result.alias || target.result.hash
+			if (target.result.celestials?.name) {
+				metadata.title = target.result.celestials?.name
+				metadata.subtitle = target.result.hash
+			} else {
+				metadata.title = target.result.alias || target.result.hash
+			}			
 			metadata.routerLink = `/address/${target.bookmark ? target.result.id : target.result.hash}`
 			break
 
@@ -157,6 +162,7 @@ const handleSelect = () => {
 								<Flex align="center" gap="8">
 									<Icon :name="getResultMetadata(result).type" size="12" color="tertiary" />
 									<Text size="13" weight="600" color="primary">{{ getResultMetadata(result).title }}</Text>
+									<Text v-if="getResultMetadata(result).subtitle" size="12" weight="500" color="tertiary">{{ getResultMetadata(result).subtitle }}</Text>
 								</Flex>
 
 								<Text size="13" weight="500" color="tertiary" style="text-transform: capitalize">{{ result.type }}</Text>

pages/blob.vue

@@ -463,7 +463,7 @@ const handleCopy = (text) => {
 								<Flex direction="column" gap="8">
 									<Text size="12" weight="600" color="tertiary"> Signer </Text>
 									<Text size="12" weight="600" color="secondary" style="text-overflow: ellipsis; overflow: hidden">
-										{{ metadata.signer.hash }}
+										{{ $getDisplayName("addresses", "", metadata.signer) }}
 									</Text>
 								</Flex>
 							</NuxtLink>

pages/txs.vue

@@ -143,6 +143,7 @@ const updateRouteQuery = () => {
 					.join(","),
 			...(filters.from ? { from: filters.from } : {}),
 			...(filters.to ? { to: filters.to } : {}),
+			page: page.value,
 		},
 	})
 }
@@ -282,16 +283,17 @@ const sort = reactive({
 	dir: "desc",
 })
 
-const page = ref(route.query.page ? parseInt(route.query.page) : 1)
-const pages = computed(() => Math.ceil(count.value / 20))
+const page = ref(route.query.page ? parseInt(route.query.page) < 1 ? 1 : parseInt(route.query.page) : 1)
+const limit = ref(20)
+const handleNextCondition = ref(false)
 
 const findPFB = ref(false)
 
 const getTransactions = async () => {
 	isRefetching.value = true
 
 	const { data } = await fetchTransactions({
-		limit: 20,
+		limit: limit.value,
 		offset: (page.value - 1) * 20,
 		sort: sort.dir,
 		sort_by: sort.by,
@@ -310,6 +312,7 @@ const getTransactions = async () => {
 	})
 	transactions.value = data.value
 
+	handleNextCondition.value = transactions.value.length < limit.value
 	isLoaded.value = true
 	isRefetching.value = false
 }
@@ -342,7 +345,7 @@ watch(
 	() => page.value,
 	async () => {
 		getTransactions()
-		router.replace({ query: { page: page.value } })
+		updateRouteQuery()
 	},
 )
 
@@ -424,7 +427,7 @@ const handleNext = () => {
 						<Text size="12" weight="600" color="primary">Page {{ comma(page) }} </Text>
 					</Button>
 
-					<Button @click="handleNext" type="secondary" size="mini" :disabled="!transactions.length">
+					<Button @click="handleNext" type="secondary" size="mini" :disabled="handleNextCondition">
 						<Icon name="arrow-right" size="12" color="primary" />
 					</Button>
 				</Flex>
@@ -704,7 +707,7 @@ const handleNext = () => {
 									<NuxtLink :to="`/tx/${tx.hash}`">
 										<Flex align="center">
 											<Text size="12" weight="600" color="primary" mono class="table_column_alias">
-												{{ $getDisplayName("addresses", tx.signers[0].hash) }}
+												{{ $getDisplayName("addresses", "", tx.signers[0]) }}
 											</Text>
 										</Flex>
 									</NuxtLink>