Skip to content

Commit e28e8e7

Browse files
committed
Merge branch 'dev' of github.com:celenium-io/celenium-interface into hex
2 parents 9ef27a7 + b1d81e2 commit e28e8e7

28 files changed

+1685
-135
lines changed

app.vue

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import CommandMenu from "@/components/cmd/CommandMenu.vue"
1010
/** API */
1111
import { fetchGasPrice } from "@/services/api/gas"
1212
import { fetchHead } from "@/services/api/main"
13+
import { fetchLatestBlocks } from "@/services/api/block"
1314
1415
/** Store */
1516
import { useAppStore } from "@/store/app"
@@ -28,6 +29,10 @@ onMounted(async () => {
2829
const runtimeConfig = useRuntimeConfig()
2930
amp.init(runtimeConfig.public.AMP)
3031
32+
const data = await fetchLatestBlocks({ limit: 15 })
33+
appStore.latestBlocks = data
34+
appStore.isLatestBlocksLoaded = true
35+
3136
const head = await fetchHead()
3237
if (head) appStore.lastHead = head
3338

assets/icons.json

Lines changed: 5 additions & 2 deletions
Large diffs are not rendered by default.

assets/styles/base.scss

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,11 @@ $grayscale: (
6767
--block-progress-fill-background: #33a853;
6868
--logo-name: var(--txt-primary);
6969
--bar-fill: rgb(243, 147, 45);
70-
--validator-active: #85F891;
71-
--validator-inactive: #65C7F8;
72-
--validator-jailed: #F8774A;
73-
--supply: #65C7F8;
74-
--staking: #85F891;
75-
70+
--validator-active: #85f891;
71+
--validator-inactive: #65c7f8;
72+
--validator-jailed: #f8774a;
73+
--supply: #65c7f8;
74+
--staking: #85f891;
7675
}
7776

7877
[theme="dimmed"] {
@@ -274,6 +273,12 @@ body {
274273
cursor: copy;
275274
}
276275

276+
.divider_v {
277+
width: 2px;
278+
height: 16px;
279+
background: var(--op-10);
280+
}
281+
277282
.dot {
278283
width: 3px;
279284
height: 3px;

components/Connection.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,15 @@ const router = useRouter()
2525
2626
const isWalletAvailable = ref(false)
2727
const isFetchingAccounts = ref(false)
28-
const account = ref()
2928
3029
const { hostname } = useRequestURL()
3130
3231
switch (hostname) {
3332
case "celenium.io":
33+
case "dev.celenium.io":
3434
appStore.network = mainnet
3535
break
3636
37-
case "dev.celenium.io":
3837
case "arabica.celenium.io":
3938
case "localhost":
4039
appStore.network = arabica
@@ -70,7 +69,6 @@ const handleConnect = async () => {
7069
7170
const accounts = await getAccounts(appStore.network)
7271
if (accounts.length) {
73-
account.value = accounts[0].address
7472
appStore.address = accounts[0].address
7573
}
7674
@@ -116,7 +114,6 @@ const handleDisconnect = () => {
116114
117115
amp.log("disconnect")
118116
119-
account.value = null
120117
appStore.address = ""
121118
appStore.balance = 0
122119
@@ -157,7 +154,7 @@ const handleDisconnect = () => {
157154
<template #content> Insall Keplr Wallet before connection </template>
158155
</Tooltip>
159156
160-
<Button v-else-if="!account" @click="handleConnect" type="white" size="small"> Connect </Button>
157+
<Button v-else-if="!appStore.address" @click="handleConnect" type="white" size="small"> Connect </Button>
161158
162159
<Dropdown v-else>
163160
<Button type="secondary" size="small">

components/TheFooter.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@ const handleChangeTheme = (target) => {
165165
<NuxtLink to="/addresses" :class="$style.link">
166166
<Text size="12" weight="500" color="tertiary"> Addresses </Text>
167167
</NuxtLink>
168+
<NuxtLink to="/blobstream" :class="$style.link">
169+
<Text size="12" weight="500" color="tertiary"> Blobstream </Text>
170+
</NuxtLink>
168171
<NuxtLink to="/gas" :class="$style.link">
169172
<Text size="12" weight="500" color="tertiary"> Gas Tracker </Text>
170173
</NuxtLink>

components/cmd/CommandMenu.vue

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,15 @@ const rawNavigationActions = [
273273
router.push("/addresses")
274274
},
275275
},
276+
{
277+
type: "callback",
278+
icon: "arrow-narrow-right",
279+
title: "Go to Blobstream",
280+
runText: "Open Blobstream",
281+
callback: () => {
282+
router.push("/blobstream")
283+
},
284+
},
276285
{
277286
type: "callback",
278287
icon: "arrow-narrow-right",

0 commit comments

Comments
 (0)