Merge remote-tracking branch 'upstream/master' into add-osnap-plugin

Author: david

package.json

@@ -38,7 +38,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.8.1",
+    "@snapshot-labs/snapshot.js": "^0.8.3",
     "@snapshot-labs/tune": "^0.1.34",
     "@vue/apollo-composable": "4.0.0-beta.4",
     "@vueuse/core": "^10.4.0",

src/components/NavbarAccount.vue

@@ -19,7 +19,7 @@ async function handleLogin(connector) {
 
 const profile = computed(() => profiles.value[web3Account.value]);
 
-watchEffect(() => {
+watch(web3Account, () => {
   loadProfiles([web3Account.value]);
 });
 </script>

src/components/SpaceCreateVotingDateEnd.vue

@@ -4,6 +4,7 @@ const { d } = useI18n();
 const props = withDefaults(
   defineProps<{
     period?: number | null;
+    isEditing?: boolean;
     date: number;
   }>(),
   {
@@ -12,6 +13,7 @@ const props = withDefaults(
 );
 
 const dateString = computed(() => d(props.date * 1e3, 'short', 'en-US'));
+const isDisabled = computed(() => !!props.period || props.isEditing);
 
 const emit = defineEmits(['select']);
 </script>
@@ -20,10 +22,10 @@ const emit = defineEmits(['select']);
   <InputDate
     type="end"
     :title="$t(`create.end`)"
-    :disabled="!!period"
+    :disabled="isDisabled"
     :date="date"
     :date-string="dateString"
-    :tooltip="!!period ? $t('create.periodEnforced') : null"
+    :tooltip="!!period && !isEditing ? $t('create.periodEnforced') : null"
     @update:date="emit('select', $event)"
   />
 </template>

src/components/SpaceCreateVotingDateStart.vue

@@ -4,6 +4,7 @@ const { t, d } = useI18n();
 const props = withDefaults(
   defineProps<{
     delay?: number | null;
+    isEditing?: boolean;
     date: number;
   }>(),
   {
@@ -17,6 +18,7 @@ const dateString = computed(() =>
     ? t('create.now')
     : d(props.date * 1e3, 'short', 'en-US')
 );
+const isDisabled = computed(() => !!props.delay || props.isEditing);
 
 const emit = defineEmits(['select']);
 </script>
@@ -25,10 +27,10 @@ const emit = defineEmits(['select']);
   <InputDate
     type="start"
     :title="$t(`create.start`)"
-    :disabled="!!delay"
+    :disabled="isDisabled"
     :date="date"
     :date-string="dateString"
-    :tooltip="!!delay ? $t('create.delayEnforced') : null"
+    :tooltip="!!delay && !isEditing ? $t('create.delayEnforced') : null"
     @update:date="emit('select', $event)"
   />
 </template>

yarn.lock

@@ -1309,10 +1309,10 @@
   dependencies:
     ofetch "^1.3.3"
 
-"@snapshot-labs/snapshot.js@^0.8.1":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.8.1.tgz#1bd8e939ec354dde89fbe284366bd11e8103c0c6"
-  integrity sha512-TTKfMBMaf+jQqpgsPezQ6pz5d3IXqO4z2P+Kwfa5W9Noz4+XfrvOHo2ADl4TuCBp922EvF7bfxLQVvKAakQZPA==
+"@snapshot-labs/snapshot.js@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.8.3.tgz#a514d879d472e9da7a762c610371e65ceef3f604"
+  integrity sha512-BU3esG+M7NP3qAdE+Kzlxgg+mgQFsjaxCGh6MKGWLLwgkA8Jg6i/EpYf9cBhhXQSdgPuBxfXC+OtK1ATnAzRkQ==
   dependencies:
     "@ensdomains/eth-ens-namehash" "^2.0.15"
     "@ethersproject/abi" "^5.6.4"