From 415026158e36a298a8ad03de67a4d6ddb62a96fd Mon Sep 17 00:00:00 2001
From: Tibet Sprague <tibet.sprague@gmail.com>
Date: Wed, 4 Sep 2024 13:58:42 -0700
Subject: [PATCH] More fixes to back button pressing

---
 ui/src/routes/account/+page.svelte                    | 2 +-
 ui/src/routes/contacts/[id]/+page.svelte              | 2 +-
 ui/src/routes/contacts/new/+page.svelte               | 2 +-
 ui/src/routes/conversations/[id]/+page.svelte         | 6 +++---
 ui/src/routes/conversations/[id]/details/+page.svelte | 2 +-
 ui/src/routes/conversations/[id]/invite/+page.svelte  | 2 +-
 ui/src/routes/conversations/join/+page.svelte         | 2 +-
 ui/src/routes/conversations/new/+page.svelte          | 2 +-
 ui/src/routes/create/+page.svelte                     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ui/src/routes/account/+page.svelte b/ui/src/routes/account/+page.svelte
index 314c7084..d5bf70f7 100644
--- a/ui/src/routes/account/+page.svelte
+++ b/ui/src/routes/account/+page.svelte
@@ -47,7 +47,7 @@
 </script>
 
 <Header>
-  <button class='text-4xl pr-5 absolute' on:click={() => history.back()}><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></button>
+  <button class='text-4xl pr-5' on:click={() => history.back()}><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></button>
 </Header>
 
 {#if $prof && $prof.status === 'complete' && $prof.value}
diff --git a/ui/src/routes/contacts/[id]/+page.svelte b/ui/src/routes/contacts/[id]/+page.svelte
index f5758d8f..4dce2979 100644
--- a/ui/src/routes/contacts/[id]/+page.svelte
+++ b/ui/src/routes/contacts/[id]/+page.svelte
@@ -11,7 +11,7 @@
 </script>
 
 <Header>
-  <button class='text-4xl pr-5 absolute' on:click={() => goto('/create')}>
+  <button class='text-4xl pr-5' on:click={() => goto('/create')}>
     <SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' />
   </button>
 </Header>
diff --git a/ui/src/routes/contacts/new/+page.svelte b/ui/src/routes/contacts/new/+page.svelte
index c0014498..be68f28a 100644
--- a/ui/src/routes/contacts/new/+page.svelte
+++ b/ui/src/routes/contacts/new/+page.svelte
@@ -8,7 +8,7 @@
 </script>
 
 <Header>
-  <button class='text-4xl pr-5 absolute' on:click={() => goto('/create')}>
+  <button class='absolute z-10 text-4xl pr-5' on:click={() => goto('/create')}>
     <SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' />
   </button>
   <h1 class="flex-1 text-center">{$t('contacts.create_new_contact')}</h1>
diff --git a/ui/src/routes/conversations/[id]/+page.svelte b/ui/src/routes/conversations/[id]/+page.svelte
index db466b98..95010c60 100644
--- a/ui/src/routes/conversations/[id]/+page.svelte
+++ b/ui/src/routes/conversations/[id]/+page.svelte
@@ -236,10 +236,10 @@
 </script>
 
 <Header>
-  <a class='absolute pr-5' href="/conversations"><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></a>
+  <a class='pr-5' href="/conversations"><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></a>
   {#if conversation}
     <h1 class="flex-1 grow text-center">
-      <a href={`/conversations/${conversationId}/details`} class='flex flex-row items-center justify-center'>
+      <a href={`/conversations/${conversationId}/details`} class='pl-5 flex flex-row items-center justify-center'>
         {conversation.title}
         <button class='ml-2' on:click={() => goto(`/conversations/${conversationId}/details`)}>
           <SvgIcon icon='gear' size='18' color={$modeCurrent ? '%232e2e2e' : 'white'} />
@@ -247,7 +247,7 @@
       </a>
     </h1>
     {#if conversation.data.privacy === Privacy.Public || encodeHashToBase64(conversation.data.progenitor) === myPubKeyB64}
-      <a class='absolute right-5' href={`/conversations/${conversation.data.id}/${conversation.data.privacy === Privacy.Public ? 'details' : 'invite'}`}>
+      <a class='pl-5' href={`/conversations/${conversation.data.id}/${conversation.data.privacy === Privacy.Public ? 'details' : 'invite'}`}>
         <SvgIcon icon='addPerson' size='24' color={$modeCurrent ? '%232e2e2e' : 'white'} />
       </a>
     {/if}
diff --git a/ui/src/routes/conversations/[id]/details/+page.svelte b/ui/src/routes/conversations/[id]/details/+page.svelte
index 51e65775..ae13dcd3 100644
--- a/ui/src/routes/conversations/[id]/details/+page.svelte
+++ b/ui/src/routes/conversations/[id]/details/+page.svelte
@@ -50,7 +50,7 @@
 </script>
 
 <Header>
-  <a class='absolute pr-5' href={`/conversations/${conversationId}`}><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></a>
+  <a class='absolute pr-5 z-10' href={`/conversations/${conversationId}`}><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></a>
   {#if conversation}
     <h1 class="flex-1 grow text-center">{#if conversation.data.privacy === Privacy.Public}{$t('conversations.group_details')}{:else}{conversation.title}{/if}</h1>
     {#if conversation.data.privacy === Privacy.Private && encodeHashToBase64(conversation.data.progenitor) === relayStore.client.myPubKeyB64}
diff --git a/ui/src/routes/conversations/[id]/invite/+page.svelte b/ui/src/routes/conversations/[id]/invite/+page.svelte
index 5c38f74c..3cef85e9 100644
--- a/ui/src/routes/conversations/[id]/invite/+page.svelte
+++ b/ui/src/routes/conversations/[id]/invite/+page.svelte
@@ -57,7 +57,7 @@
 </script>
 
 <Header>
-  <button class='text-4xl pr-5 absolute' on:click={() => history.back()}>
+  <button class='text-4xl pr-5 absolute z-10' on:click={() => history.back()}>
     <SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' />
   </button>
   <h1 class="flex-1 text-center">{$tAny('conversations.add_people', { public: conversation && conversation.data.privacy === Privacy.Public })}</h1>
diff --git a/ui/src/routes/conversations/join/+page.svelte b/ui/src/routes/conversations/join/+page.svelte
index 24adfc7b..9a7513a9 100644
--- a/ui/src/routes/conversations/join/+page.svelte
+++ b/ui/src/routes/conversations/join/+page.svelte
@@ -46,7 +46,7 @@
 </script>
 
 <Header>
-  <button class='text-4xl pr-5 absolute' on:click={() => history.back()}><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></button>
+  <button class='text-4xl pr-5 absolute z-10' on:click={() => history.back()}><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></button>
   <h1 class="flex-1 text-center">{$t('conversations.join_conversation')}</h1>
 </Header>
 
diff --git a/ui/src/routes/conversations/new/+page.svelte b/ui/src/routes/conversations/new/+page.svelte
index 0023b940..0223371b 100644
--- a/ui/src/routes/conversations/new/+page.svelte
+++ b/ui/src/routes/conversations/new/+page.svelte
@@ -32,7 +32,7 @@
 </script>
 
 <Header>
-  <button class='text-4xl pr-5 absolute' on:click={() => history.back()}><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></button>
+  <button class='text-4xl pr-5 absolute z-10' on:click={() => history.back()}><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></button>
   <h1 class="flex-1 text-center">{$t('common.new_group')}</h1>
 </Header>
 
diff --git a/ui/src/routes/create/+page.svelte b/ui/src/routes/create/+page.svelte
index f4fb9597..59af03d1 100644
--- a/ui/src/routes/create/+page.svelte
+++ b/ui/src/routes/create/+page.svelte
@@ -72,7 +72,7 @@
 </script>
 
 <Header>
-  <button class='text-4xl pr-5 absolute' on:click={() => goto('/welcome')}>
+  <button class='text-4xl pr-5 absolute z-10' on:click={() => goto('/welcome')}>
     <SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' />
   </button>