fix: use new URL layout for Gnosis Safe deep links

Signed-off-by: Rūdolfs Ošiņš <rudolfs@osins.org>
radicle-dev · Nov 30, 2021 · 15c1479 · 15c1479
1 parent 726c6ce
commit 15c1479
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/ui/App/OrgScreen.svelte b/ui/App/OrgScreen.svelte
@@ -78,7 +78,7 @@
         title: "View on Gnosis Safe",
         icon: GnosisIcon,
         event: () => {
-          org.openOnGnosisSafe(gnosisSafeAddress, "transactions");
+          org.openOnGnosisSafe(gnosisSafeAddress, "transactions/queue");
         },
       },
       {

diff --git a/ui/App/OrgScreen/ConfigureEns/LinkOrgToName.svelte b/ui/App/OrgScreen/ConfigureEns/LinkOrgToName.svelte
@@ -48,7 +48,7 @@
               label: "View on Gnosis Safe",
               handler: () => {
                 safeAddress &&
-                  org.openOnGnosisSafe(safeAddress, "transactions");
+                  org.openOnGnosisSafe(safeAddress, "transactions/queue");
               },
             },
             {

diff --git a/ui/App/OrgScreen/MembersMenu.svelte b/ui/App/OrgScreen/MembersMenu.svelte
@@ -50,7 +50,7 @@
 
     <Button
       on:click={() => {
-        org.openOnGnosisSafe(gnosisSafeAddress, "settings");
+        org.openOnGnosisSafe(gnosisSafeAddress, "settings/owners");
         toggleModal();
       }}
       style="margin-top: 1rem; width: 100%; display: block; text-align: center;">

diff --git a/ui/App/OrgScreen/Projects.svelte b/ui/App/OrgScreen/Projects.svelte
@@ -82,13 +82,13 @@
           Waiting for a member to execute this anchor transaction.
           <a
             class="typo-link"
-            href={org.gnosisSafeWebAppUrl(ownerAddress, "transactions")}
+            href={org.gnosisSafeWebAppUrl(ownerAddress, "transactions/queue")}
             >Execute transaction</a>
         {:else}
           Not enough members have confirmed this anchor transaction.
           <a
             class="typo-link"
-            href={org.gnosisSafeWebAppUrl(ownerAddress, "transactions")}
+            href={org.gnosisSafeWebAppUrl(ownerAddress, "transactions/queue")}
             >Confirm transaction</a>
         {/if}
       </p>

diff --git a/ui/src/org.ts b/ui/src/org.ts
@@ -119,14 +119,14 @@ export function initialize(): void {
 
 export function openOnGnosisSafe(
   gnosisSafeAddress: string,
-  view: "transactions" | "settings"
+  view: "transactions/queue" | "settings/owners"
 ): void {
   ipc.openUrl(gnosisSafeWebAppUrl(gnosisSafeAddress, view));
 }
 
 export function gnosisSafeWebAppUrl(
   gnosisSafeAddress: string,
-  view: "transactions" | "settings"
+  view: "transactions/queue" | "settings/owners"
 ): string {
   return Safe.appUrl(
     svelteStore.get(wallet.store).environment,
@@ -187,7 +187,7 @@ export async function anchorProjectWithGnosis(
       {
         label: "View on Gnosis Safe",
         handler: () => {
-          openOnGnosisSafe(safeAddress, "transactions");
+          openOnGnosisSafe(safeAddress, "transactions/queue");
         },
       },
       {

diff --git a/ui/src/org/safe.ts b/ui/src/org/safe.ts
@@ -114,22 +114,22 @@ export async function signAndProposeTransaction(
 export function appUrl(
   ethEnv: Ethereum.Environment,
   gnosisSafeAddress: string,
-  view: "transactions" | "settings"
+  view: "transactions/queue" | "settings/owners"
 ): string {
-  let domain: string;
+  let network: string;
   switch (ethEnv) {
     case Ethereum.Environment.Local:
       throw new error.Error({
         message: "appUrl() is not implemented for ethereum.Environment.Local",
       });
     case Ethereum.Environment.Rinkeby:
-      domain = `rinkeby.gnosis-safe.io`;
+      network = "rin";
       break;
     case Ethereum.Environment.Mainnet:
-      domain = `gnosis-safe.io`;
+      network = "eth";
       break;
   }
-  return `https://${domain}/app/#/safes/${gnosisSafeAddress}/${view}`;
+  return `https://gnosis-safe.io/app/${network}:${gnosisSafeAddress}/${view}`;
 }
 
 function createSafeServiceClient(