Skip to content

Commit

Permalink
Merge branch 'master' into fix-networks-page
Browse files Browse the repository at this point in the history
  • Loading branch information
ChaituVR authored Sep 28, 2024
2 parents f9e1baf + e121267 commit 5c39fff
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@shutter-network/shutter-crypto": "1.0.1",
"@snapshot-labs/lock": "^0.2.7",
"@snapshot-labs/pineapple": "^1.1.0",
"@snapshot-labs/snapshot.js": "^0.12.13",
"@snapshot-labs/snapshot.js": "^0.12.18",
"@vue/apollo-composable": "4.0.0-beta.11",
"@vueuse/core": "^10.6.1",
"@vueuse/head": "^2.0.0",
Expand Down
25 changes: 25 additions & 0 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<script setup lang="ts">
import { useStorage } from '@vueuse/core';
const { domain, init, isReady, showSidebar } = useApp();
const route = useRoute();
const { restorePendingTransactions } = useTxStatus();
Expand All @@ -7,6 +9,11 @@ onMounted(async () => {
await init();
restorePendingTransactions();
});
const bannerClosed = useStorage('snapshot.v2-banner-closed', false);
const showBanner = computed(() => {
const showInPages = ['home', 'timeline'];
return showInPages.includes(route.name as string) && !bannerClosed.value;
});
</script>

<template>
Expand Down Expand Up @@ -34,6 +41,24 @@ onMounted(async () => {
>
<TheNavbar />
</div>
<div
v-if="showBanner"
class="relative flex items-center justify-center gap-2 mb-2 bg-skin-border px-4 py-[10px]"
>
<a
class="flex gap-2"
target="_blank"
href="https://snapshot.box/#/home"
>
<i-ho-speakerphone class="shrink-0" />
<div class="leading-6">
Snapshot v2 is here! Experience our new and improved interface now.
</div>
</a>
<button class="xs:absolute xs:right-3" @click="bannerClosed = true">
<i-ho-x />
</button>
</div>
<div id="content" class="pb-6 pt-4">
<router-view v-slot="{ Component }">
<KeepAlive :include="['ExploreView', 'RankingView']">
Expand Down
1 change: 1 addition & 0 deletions src/helpers/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const SNAPSHOT_BREAKPOINTS = {

export const KNOWN_HOSTS = [
'app.safe.global',
'horizen-eon.safe.onchainden.com',
'pilot.gnosisguild.org',
'metissafe.tech',
'multisig.mantle.xyz',
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1679,10 +1679,10 @@
resolved "https://registry.yarnpkg.com/@snapshot-labs/prettier-config/-/prettier-config-0.1.0-beta.15.tgz#07e5ae35ed36304250462218e115bab1c1609812"
integrity sha512-va6zYSl8oIraBJeIZWEatOI292rfJQouyyvEeHv8qi9ns+LgxMsKayQtXSqn9GcmAfdWQVs/P9bDaCQ77FyJYw==

"@snapshot-labs/snapshot.js@^0.12.13":
version "0.12.13"
resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.12.13.tgz#40b6cbf20ec4f1222bb231d1b3e26e5f702bf912"
integrity sha512-e9pXdQA45tO5+af42PkOYI01WAPPR7IrQDejjUdhz3y98e7m/Na9Foqlbj6nIksnTJ4GubcmOZV7iQzcrNw/kw==
"@snapshot-labs/snapshot.js@^0.12.18":
version "0.12.18"
resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.12.18.tgz#58421fc0fd8c424b76923a2d9b41e1f73c4767b0"
integrity sha512-zGRFgWws3cjQUZRw12uOpHlrdUgctMNRWlMu2N6QYD1VKQKZ21nW4ONanmSE/eWsQtiQL11wAAApaFxa4DdosA==
dependencies:
"@ensdomains/eth-ens-namehash" "^2.0.15"
"@ethersproject/abi" "^5.6.4"
Expand Down

0 comments on commit 5c39fff

Please sign in to comment.