addresses-fix

src/components/Nav/AuthModal/EmailConfirm.tsx

@@ -12,6 +12,7 @@ import styles from './AuthModal.module.scss'
 
 export const EmailConfirm = () => {
   const { t } = useLocalize()
+  const { changeSearchParams } = useRouter()
   const { session, authError } = useSession()
   const [email, setEmail] = createSignal('')
   const [emailConfirmed, setEmailConfirmed] = createSignal(false)
@@ -20,6 +21,12 @@ export const EmailConfirm = () => {
     setEmailConfirmed(session()?.user?.email_verified)
   })
 
+  createEffect(() => {
+    if (emailConfirmed() || authError()) {
+      changeSearchParams({}, true)
+    }
+  })
+
   return (
     <div>
       <Show when={authError()}>

src/components/Nav/AuthModal/RegisterForm.tsx

@@ -118,6 +118,8 @@ export const RegisterForm = () => {
       setIsSuccess(true)
     } catch (error) {
       console.error(error)
+
+      // TODO: move to context/session
       if (error?.code === 'user_already_exists') {
         return
       }

src/components/Nav/SearchModal/SearchModal.tsx

@@ -1,8 +1,10 @@
 import { clsx } from 'clsx'
 import { useLocalize } from '../../../context/localize'
 import { Icon } from '../../_shared/Icon'
+import { openPage } from '@nanostores/router'
 
 import styles from './SearchModal.module.scss'
+import { router, useRouter } from '../../../stores/router'
 
 export const SearchModal = () => {
   const { t } = useLocalize()
@@ -10,7 +12,7 @@ export const SearchModal = () => {
 
   const submitQuery = async (ev) => {
     ev.preventDefault()
-    window.history.pushState({}, '', '/search/' + qElement.value)
+    openPage(router, 'search', { q: qElement.value })
   }
   return (
     <form onSubmit={submitQuery} class={styles.searchForm}>

src/context/session.tsx

@@ -25,11 +25,12 @@ import {
 import { inboxClient } from '../graphql/client/chat'
 import { apiClient } from '../graphql/client/core'
 import { notifierClient } from '../graphql/client/notifier'
-import { useRouter } from '../stores/router'
+import { router, useRouter } from '../stores/router'
 import { showModal } from '../stores/ui'
 
 import { useLocalize } from './localize'
 import { useSnackbar } from './snackbar'
+import { openPage } from '@nanostores/router'
 
 const defaultConfig: ConfigType = {
   authorizerURL: 'https://auth.discours.io',
@@ -92,17 +93,8 @@ export const SessionProvider = (props: {
     // TODO: handle oauth here too
     const token = searchParams()?.token
     const access_token = searchParams()?.access_token
-    if (token) {
+    if (access_token) changeSearchParams({ mode: 'confirm-email', modal: 'auth', access_token })
-      changeSearchParams({
+    else if (token) changeSearchParams({ mode: 'change-password', modal: 'auth', token })
-        mode: 'change-password',
-        modal: 'auth',
-      })
-    } else if (access_token) {
-      changeSearchParams({
-        mode: 'confirm-email',
-        modal: 'auth',
-      })
-    }
   })
 
   // load