Merge pull request #103 from celenium-io/dev

Hot fix rollups category displaying and Leap wallet

Author: GusevPM

assets/logos/leap.png

@@ -18,8 +18,6 @@ const notificationsStore = useNotificationsStore()
 
 const router = useRouter()
 
-const isFetchingAccounts = ref(false)
-
 const { hostname } = useRequestURL()
 
 switch (hostname) {

components/Connection.vue

@@ -316,7 +316,7 @@ const rawQuickCommandsActions = [
 		icon: "coins",
 		title: "Send TIA",
 		subtitle: "Command",
-		runText: "Send via Keplr",
+		runText: "Send TIA",
 
 		callback: () => {
 			modalsStore.open("send")
@@ -327,7 +327,7 @@ const rawQuickCommandsActions = [
 		icon: "blob",
 		title: "Submit data blob",
 		subtitle: "Command",
-		runText: "Submit via Keplr",
+		runText: "Submit blob",
 
 		callback: () => {
 			modalsStore.open("pfb")

components/cmd/CommandMenu.vue

@@ -75,7 +75,7 @@ watch(
 			amp.log("showPfbModal")
 
 			if (!appStore.address?.length) {
-				warningBannerText.value = "Keplr wallet connection is required to submit a blob."
+				warningBannerText.value = "Wallet connection is required to submit a blob."
 			} else if (hostname !== "celenium.io") {
 				warningBannerText.value = `You are currently on ${hostname}. The transaction will be performed on the test network.`
 			} else {

components/modals/PayForBlobModal.vue

@@ -163,7 +163,7 @@ watch(
 
 const calcGasFee = (target) => {
 	const gasLimit = typeof estimatedGasLimit.value === "number" ? estimatedGasLimit.value : estimatedGasLimit.value.replaceAll(" ", "")
-	return comma((gasLimit * appStore.gas[target.toLowerCase()]).toFixed(2))
+	return comma(((selectedGasLimit.value === 'Custom' ? Number.parseInt(customGasLimit.value.toString().replaceAll(" ", "")) : gasLimit) * appStore.gas[target.toLowerCase()]).toFixed(2))
 }
 
 const runGasLimitEstimation = async () => {
@@ -202,7 +202,7 @@ watch(
 			amp.log("showSendModal")
 
 			if (!appStore.address?.length) {
-				warningBannerText.value = "Keplr wallet connection is required to send TIA."
+				warningBannerText.value = "Wallet connection is required to send TIA."
 			} else if (hostname !== "celenium.io") {
 				warningBannerText.value = `You are currently on ${hostname}. The transaction will be performed on the test network.`
 			} else {
@@ -245,7 +245,7 @@ const continueButton = computed(() => {
 		}
 	}
 
-	if (parseFloat(amount.value) === 0) {
+	if (parseFloat(amount.value) === 0 || isNaN(parseFloat(amount.value))) {
 		return {
 			title: "Enter the amount",
 			disable: true,
@@ -481,8 +481,8 @@ const handleContinue = async () => {
 					placeholder="0.00"
 				/>
 
-				<Flex direction="column" gap="12" style="opacity: 0.3; pointer-events: none">
-					<Flex direction="column" gap="8">
+				<Flex direction="column" gap="12">
+					<Flex direction="column" gap="8" :style="appStore.wallet !== 'leap' && { pointerEvents: 'none', opacity: 0.3 }">
 						<Text size="12" weight="600" color="secondary">Gas Fees</Text>
 
 						<Flex align="center" justify="between" gap="12">
@@ -531,7 +531,7 @@ const handleContinue = async () => {
 					</Flex>
 				</Flex>
 
-				<Flex gap="6">
+				<Flex v-if="appStore.wallet === 'keplr'" gap="6">
 					<Icon name="info" size="12" color="tertiary" style="margin-top: 1px" />
 					<Text size="12" weight="500" height="140" color="tertiary">
 						Keplr does not currently support receiving a Gas Fee from outside.<br />

components/modals/SendModal.vue

@@ -202,7 +202,7 @@ watch(
 			amp.log("showStakingModal")
 
 			if (!appStore.address?.length) {
-				warningBannerText.value = "Keplr wallet connection is required to delegate."
+				warningBannerText.value = "Wallet connection is required to delegate."
 			} else if (hostname !== "celenium.io") {
 				warningBannerText.value = `You are currently on ${hostname}. The transaction will be performed on the test network.`
 			} else {
@@ -526,7 +526,7 @@ const handleContinue = async () => {
 					</Flex>
 				</Flex>
 
-				<Flex gap="6">
+				<Flex v-if="appStore.wallet === 'keplr'" gap="6">
 					<Icon name="info" size="12" color="tertiary" style="margin-top: 1px" />
 					<Text size="12" weight="500" height="140" color="tertiary">
 						Keplr does not currently support receiving a Gas Fee from outside.<br />

components/modals/StakingModal.vue

@@ -95,6 +95,19 @@ const categories = computed(() => {
 	
 	return res	
 })
+const getCategoryDisplayName = (category) => {
+	switch (category) {
+		case 'nft':
+			return 'NFT'
+
+		case 'uncategorized':
+			return 'Other'
+
+		default:
+			return capitilize(category)
+	}
+}
+
 const filters = reactive({
 	categories: categories.value?.reduce((a, b) => ({ ...a, [b]: false }), {}),
 })
@@ -279,7 +292,7 @@ watch(
 								<Text size="12" weight="600" color="primary" style="text-transform: capitalize">
 									{{ Object.keys(filters.categories)
 										.filter((c) => filters.categories[c])
-										.map(c => c === 'nft' ? c.toUpperCase() : capitilize(c))
+										.map(c => getCategoryDisplayName(c))
 										.join(", ")
 									}}
 								</Text>
@@ -298,7 +311,7 @@ watch(
 										v-model="filters.categories[c]"
 									>
 										<Text size="12" weight="500" color="primary">
-											{{ c === 'nft' ? c.toUpperCase() : capitilize(c) }}
+											{{ getCategoryDisplayName(c) }}
 										</Text>
 									</Checkbox>
 								</Flex>
@@ -417,7 +430,7 @@ watch(
 								<td>
 									<NuxtLink :to="`/rollup/${r.slug}`">
 										<Flex align="center">
-											<Text size="13" weight="600" color="primary"> {{ r.category === 'nft' ? r.category.toUpperCase() : capitilize(r.category) }} </Text>
+											<Text size="13" weight="600" color="primary"> {{ getCategoryDisplayName(r.category) }} </Text>
 										</Flex>
 									</NuxtLink>
 								</td>

pages/rollups.vue

@@ -91,6 +91,19 @@ const categories = computed(() => {
 })
 const selectedCategories = ref([])
 
+const getCategoryDisplayName = (category) => {
+	switch (category) {
+		case 'nft':
+			return 'NFT'
+
+		case 'uncategorized':
+			return 'Other'
+
+		default:
+			return capitilize(category)
+	}
+}
+
 const handleSelectCategory = (category) => {
 	if (selectedCategories.value.includes(category)) {
 		selectedCategories.value = selectedCategories.value.filter(c => c !== category)
@@ -232,7 +245,7 @@ watch(
 					:class="[$style.chip, selectedCategories.includes(c) && $style.active]"
 				>
 					<Flex align="center" :class="$style.content">
-						<Text size="12" weight="600" color="primary"> {{ c === 'nft' ? c.toUpperCase() : capitilize(c) }} </Text>
+						<Text size="12" weight="600" color="primary"> {{ getCategoryDisplayName(c) }} </Text>
 					</Flex>
 				</Flex>
 
@@ -346,12 +359,7 @@ watch(
 							<Flex align="center" :class="$style.chip" :style="{ borderRadius: '8px' }">
 								<Flex align="center" :class="$style.content" :style="{ padding: '4px 8px' }">
 									<Text size="12" color="tertiary">
-										{{ r.category === 'nft'
-											? r.category.toUpperCase()
-											: r.category === 'uncategorized'
-												? 'Other'
-												: capitilize(r.category)
-										}}
+										{{ getCategoryDisplayName(r.category) }}
 									</Text>
 								</Flex>
 							</Flex>