Merge branch 'master' into fix-allow-null-voting-period-for-offchain-…

…spaces
snapshot-labs · Dec 5, 2024 · 5a264de · 5a264de
2 parents dd6c04c + 8c28fad
commit 5a264de
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/apps/ui/src/composables/useActions.ts b/apps/ui/src/composables/useActions.ts
@@ -286,6 +286,7 @@ export function useActions() {
     choices: string[],
     labels: string[],
     app: string,
+    created: number,
     start: number,
     min_end: number,
     max_end: number,
@@ -312,6 +313,7 @@ export function useActions() {
         choices,
         labels,
         app,
+        created,
         start,
         min_end,
         max_end,

diff --git a/apps/ui/src/main.ts b/apps/ui/src/main.ts
@@ -16,7 +16,8 @@ const knownHosts = [
   'worldassociation.org',
   'safe.mainnet.frax.com',
   'horizen-eon.safe.onchainden.com',
-  'safe.fantom.network'
+  'safe.fantom.network',
+  'safe.apechain.com'
 ];
 const parentUrl =
   window.location != window.parent.location

diff --git a/apps/ui/src/networks/evm/actions.ts b/apps/ui/src/networks/evm/actions.ts
@@ -210,6 +210,7 @@ export function createActions(
       choices: string[],
       labels: string[],
       app: string,
+      created: number,
       start: number,
       min_end: number,
       max_end: number,

diff --git a/apps/ui/src/networks/offchain/actions.ts b/apps/ui/src/networks/offchain/actions.ts
@@ -131,13 +131,13 @@ export function createActions(
       choices: string[],
       labels: string[],
       app: string,
+      created: number,
       start: number,
       min_end: number,
       max_end: number,
       executions: ExecutionInfo[]
     ) {
       const provider = getProvider(space.snapshot_chain_id as number);
-
       const plugins = await getPlugins(executions);
 
       const data = {
@@ -153,7 +153,7 @@ export function createActions(
         snapshot: (await provider.getBlockNumber()) - EDITOR_SNAPSHOT_OFFSET,
         plugins: JSON.stringify(plugins),
         app: app || EDITOR_APP_NAME,
-        timestamp: Math.floor(Date.now() / 1000)
+        timestamp: created
       };
 
       return client.propose({ signer: web3.getSigner(), data });

diff --git a/apps/ui/src/networks/starknet/actions.ts b/apps/ui/src/networks/starknet/actions.ts
@@ -229,6 +229,7 @@ export function createActions(
       choices: string[],
       labels: string[],
       app: string,
+      created: number,
       start: number,
       min_end: number,
       max_end: number,

diff --git a/apps/ui/src/networks/types.ts b/apps/ui/src/networks/types.ts
@@ -142,6 +142,7 @@ export type ReadOnlyNetworkActions = {
     choices: string[],
     labels: string[],
     app: string,
+    created: number,
     start: number,
     min_end: number,
     max_end: number,