Merge branch 'master' into upgrade-to-pineapple-1

snapshot-labs · Sep 22, 2023 · 460ef65 · 460ef65
2 parents b4f2c2a + 3595535
commit 460ef65
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -24,8 +24,8 @@
   },
   "dependencies": {
     "@adraffy/ens-normalize": "^1.9.4",
-    "@braintree/sanitize-url": "^6.0.4",
     "@apollo/client": "^3.8.3",
+    "@braintree/sanitize-url": "^6.0.4",
     "@ensdomains/eth-ens-namehash": "^2.0.15",
     "@ethersproject/abi": "^5.7.0",
     "@ethersproject/address": "^5.7.0",
@@ -45,7 +45,7 @@
     "@shutter-network/shutter-crypto": "0.1.0-beta.3",
     "@snapshot-labs/lock": "^0.2.0",
     "@snapshot-labs/pineapple": "^1.1.0",
-    "@snapshot-labs/snapshot.js": "^0.5.8",
+    "@snapshot-labs/snapshot.js": "^0.6.2",
     "@snapshot-labs/tune": "^0.1.33",
     "@vue/apollo-composable": "4.0.0-beta.4",
     "@vueuse/core": "^10.4.0",

diff --git a/public/service-worker.js b/public/service-worker.js
@@ -1 +1 @@
-importScripts('https://js.pusher.com/beams/service-worker.js');
+// importScripts('https://js.pusher.com/beams/service-worker.js');
diff --git a/snapshot-spaces b/snapshot-spaces
diff --git a/src/composables/useSpaceSubscription.ts b/src/composables/useSpaceSubscription.ts
@@ -1,5 +1,5 @@
 import { SUBSCRIPTIONS_QUERY } from '@/helpers/queries';
-import { beams } from '../helpers/beams';
+// import { beams } from '@/helpers/beams';
 import { useFlashNotification } from './useFlashNotification';
 import client from '@/helpers/clientEIP712';
 
@@ -52,13 +52,13 @@ export function useSpaceSubscription(spaceId: any) {
 
   const configurePush = async () => {
     try {
-      if (!beams) {
-        notify(['red', t('notificationsNotSupported')]);
-        return;
-      }
+      // if (!beams) {
+      //   notify(['red', t('notificationsNotSupported')]);
+      //   return;
+      // }
 
-      await beams.start();
-      await beams.addDeviceInterest(web3Account.value);
+      // await beams.start();
+      // await beams.addDeviceInterest(web3Account.value);
       await client.subscribe(aliasWallet.value, aliasWallet.value.address, {
         from: web3Account.value,
         space: spaceId

diff --git a/yarn.lock b/yarn.lock
@@ -1869,10 +1869,10 @@
   dependencies:
     ofetch "^1.3.3"
 
-"@snapshot-labs/snapshot.js@^0.5.8":
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.5.8.tgz#16bf19b27e487e937be8472e53f0ed71f25e47af"
-  integrity sha512-bFe4VBUOD2LbKKesD52G7hqBCrmx7BS/4n8JfnzR+GZddL4UWmjRhfnxx/6YLeJvaHOWSPs7LHkr16fpJXD7pQ==
+"@snapshot-labs/snapshot.js@^0.6.2":
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.6.2.tgz#0f9ddf591ec50912aeed545c807b5295365d4e2f"
+  integrity sha512-hQjZ0I9uLu2sUpuR05maYCq9KLi6yNJnCCkjIutDQjFFEzmeMqJ0Lru1tOdcRMsPW3g5ktdo5xi265ESEBDPdA==
   dependencies:
     "@ensdomains/eth-ens-namehash" "^2.0.15"
     "@ethersproject/abi" "^5.6.4"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		importScripts('https://js.pusher.com/beams/service-worker.js');
		// importScripts('https://js.pusher.com/beams/service-worker.js');