From 7c5de3c13198fec8e894340a778470c324c00463 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Wed, 6 Mar 2024 22:06:00 +0100
Subject: [PATCH] Save server url when switching between register and login
 pages

---
 front/packages/primitives/src/links.tsx  | 3 ++-
 front/packages/primitives/src/types.d.ts | 1 -
 front/packages/ui/src/login/login.tsx    | 3 ++-
 front/packages/ui/src/login/register.tsx | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/front/packages/primitives/src/links.tsx b/front/packages/primitives/src/links.tsx
index b5ecc878..003adf29 100644
--- a/front/packages/primitives/src/links.tsx
+++ b/front/packages/primitives/src/links.tsx
@@ -22,6 +22,7 @@ import { forwardRef, ReactNode } from "react";
 import { Platform, Pressable, TextProps, View, PressableProps, Linking } from "react-native";
 import { TextLink, useLink } from "solito/link";
 import { useTheme, useYoshiki } from "yoshiki/native";
+import type { UrlObject } from "url";
 import { alpha } from "./themes";
 
 export const A = ({
@@ -31,7 +32,7 @@ export const A = ({
 	target,
 	...props
 }: TextProps & {
-	href?: string | null;
+	href?: string | UrlObject | null;
 	target?: string;
 	replace?: boolean;
 	children: ReactNode;
diff --git a/front/packages/primitives/src/types.d.ts b/front/packages/primitives/src/types.d.ts
index 6e419664..96b1ef58 100644
--- a/front/packages/primitives/src/types.d.ts
+++ b/front/packages/primitives/src/types.d.ts
@@ -34,7 +34,6 @@ declare module "react-native" {
 		transitionDuration?: string;
 	}
 	interface TextProps {
-		href?: string;
 		hrefAttrs?: {
 			rel?: "noreferrer";
 			target?: string;
diff --git a/front/packages/ui/src/login/login.tsx b/front/packages/ui/src/login/login.tsx
index 928f4d70..4f86c0c0 100644
--- a/front/packages/ui/src/login/login.tsx
+++ b/front/packages/ui/src/login/login.tsx
@@ -87,7 +87,8 @@ export const LoginPage: QueryPage<{ apiUrl?: string; error?: string }> = ({
 			/>
 			<P>
 				<Trans i18nKey="login.or-register">
-					Don’t have an account? <A href="/register">Register</A>.
+					Don’t have an account? <A href={{ pathname: "/register", query: { apiUrl } }}>Register</A>
+					.
 				</Trans>
 			</P>
 		</FormPage>
diff --git a/front/packages/ui/src/login/register.tsx b/front/packages/ui/src/login/register.tsx
index 606cd3b7..32fde97f 100644
--- a/front/packages/ui/src/login/register.tsx
+++ b/front/packages/ui/src/login/register.tsx
@@ -98,7 +98,7 @@ export const RegisterPage: QueryPage<{ apiUrl?: string }> = ({ apiUrl }) => {
 			/>
 			<P>
 				<Trans i18nKey="login.or-login">
-					Have an account already? <A href="/login">Log in</A>.
+					Have an account already? <A href={{ pathname: "/login", query: { apiUrl } }}>Log in</A>.
 				</Trans>
 			</P>
 		</FormPage>