Merge branch 'self-custody'

1 files changed, 2 insertions, 52 deletions

diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 8d4e2940..db14b046 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -14,26 +14,15 @@
   import { page } from "$app/stores";
   import { browser } from "$app/environment";
   import LoadingSplash from "$comp/LoadingSplash.svelte";
+  import AppHeader from "$comp/AppHeader.svelte";
   import Invoice from "$comp/Invoice.svelte";
   import Password from "$comp/Password.svelte";
-  import Request from "$comp/Request.svelte";
   import { getCookie, warning, protectedRoutes } from "$lib/utils";
   import { t, locale, loading } from "$lib/translations";
   import { goto, onNavigate } from "$app/navigation";
 
   export let data;
 
-  onNavigate((navigation) => {
-    if (!document.startViewTransition) return;
-
-    return new Promise((resolve) => {
-      document.startViewTransition(async () => {
-        resolve();
-        await navigation.complete;
-      });
-    });
-  });
-
   let { generate, rate, user, subject, token, rates } = data;
 
   $: update(data);
@@ -115,6 +104,7 @@
 <SvelteToast options={{ reversed: true, intro: { y: 192 } }} />
 
 <main class="pb-20">
+  <AppHeader {user} {subject} />
   {#if !$loading}
     <slot />
   {/if}
@@ -123,43 +113,3 @@
 {#if $invoice}
   <Invoice {user} />
 {/if}
-
-{#if $request}
-  <Request {user} />
-{/if}
-
-<style>
-  @keyframes fade-in {
-    from {
-      opacity: 0;
-    }
-  }
-
-  @keyframes fade-out {
-    to {
-      opacity: 0;
-    }
-  }
-
-  @keyframes slide-from-right {
-    from {
-      transform: translateX(60px);
-    }
-  }
-
-  @keyframes slide-to-left {
-    to {
-      transform: translateX(-60px);
-    }
-  }
-
-  :root::view-transition-old(root) {
-    animation: 280ms cubic-bezier(0.4, 0, 1, 1) both fade-out,
-      180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-to-left;
-  }
-
-  :root::view-transition-new(root) {
-    animation: 280ms cubic-bezier(0, 0, 0.2, 1) 80ms both fade-in,
-      180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-from-right;
-  }
-</style>