Fix rollups fetching

Author: GusevPM

components/modules/address/AddressCharts.vue

@@ -75,8 +75,8 @@ const seriesConfig = [
 		series: feeSeries,
 		title: "Fee Spent",
 		tooltipLabel: "Spent",
-		yAxisFormatter: (val) => (tia(val, 0) > 1 ? tia(val, 0) : tia(val, 2)),
-		tooltipValueFormatter: (val) => tia(val),
+		yAxisFormatter: (val) => `${(tia(val, 0) > 1 ? tia(val, 0) : tia(val, 2))} TIA`,
+		tooltipValueFormatter: (val) => `${tia(val)} TIA`,
 	},
 ]
 

components/modules/rollup/RollupCharts.vue

@@ -101,8 +101,8 @@ const seriesConfig = [
 		series: feeSeries,
 		title: "Fee spent",
 		tooltipLabel: "Spent",
-		yAxisFormatter: (val) => tia(val, 1),
-		tooltipValueFormatter: tia,
+		yAxisFormatter: (val) => `${tia(val, 1)} TIA`,
+		tooltipValueFormatter: (val) => `${tia(val)} TIA`,
 	},
 	{
 		name: "tvl",

pages/faucet.vue

@@ -385,7 +385,7 @@ onMounted(() => {
 										</Text>
 
 										<Text size="13" weight="400" color="secondary">
-											{{ tia(account?.balance?.spendable || 0, 2) }} TIA
+											{{ tia(account?.balance?.spendable, 2) }} TIA
 										</Text>
 									</Flex>
 

pages/rollups/index.vue

@@ -280,18 +280,29 @@ const itemsPerPage = 20
 const limit = ref(100)
 
 const getRollups = async () => {
-	const data = await fetchRollups({ limit: limit.value })
+	const [data, rankingData] = await Promise.all([
+		fetchRollups({ limit: limit.value }).catch(err => {
+			console.error("fetchRollups", err)
+			return []
+		}),
+		showRanking.value
+			? fetchRollupsRanking({ limit: limit.value }).catch(err => {
+				console.error("fetchRollupsRanking", err)
+				return []
+				})
+			: Promise.resolve([]),
+	])
+
 	rollups.value = data
 
 	if (showRanking.value) {
 		let ranking = {}
-		const ranking_data = await fetchRollupsRanking({ limit: limit.value })
-		if (ranking_data?.length) {
-			ranking_data.forEach(rank => {
+		if (rankingData?.length) {
+			rankingData.forEach(rank => {
 				ranking[rank.slug] = rank
 			})
-
-			if (data.length) {
+			
+			if (data?.length) {
 				rollups.value = data.map((r) => {
 					const rank = ranking[r.slug]
 					if (!rank) return r

services/api/rollup.js

@@ -199,7 +199,7 @@ export const fetchRollupsRanking = async ({ limit, offset, sort_by, sort }) => {
 		if (offset) url.searchParams.append("offset", offset)
 		if (sort_by) url.searchParams.append("sort_by", sort_by)
 		if (sort) url.searchParams.append("sort", sort)
-
+		
 		const data = await $fetch(url.href)
 		return data
 	} catch (error) {

services/utils/amounts.js

@@ -57,7 +57,7 @@ export const truncate = (num) => {
 export const tia = (amount, decimal = 6) => {
 	if (!amount || !parseInt(amount)) return 0
 
-	return truncateDecimalPart(parseInt(amount) / 1_000_000, decimal) + " TIA"
+	return truncateDecimalPart(parseInt(amount) / 1_000_000, decimal)
 }
 
 export const utia = (amount) => {

services/utils/general.js

@@ -142,7 +142,8 @@ export const getNetworkName = () => {
 }
 
 export const isMainnet = () => {
-	return getNetworkName() === "Mainnet" || isSelfhosted()
+	return true
+	// return getNetworkName() === "Mainnet" || isSelfhosted()
 }
 
 export const isMac = () => {