From 9a7b868301555a54dd044923cb77672a33840e21 Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Sun, 12 Feb 2023 20:37:35 +0100
Subject: [PATCH] fix: Change address to id field in url

---
 src/App.tsx                                        | 2 +-
 src/route-widgets/AliasesRoute/AliasesListItem.tsx | 2 +-
 src/routes/AliasDetailRoute.tsx                    | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 75f1d89..097515f 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -81,7 +81,7 @@ const router = createBrowserRouter([
 						element: <AliasesRoute />,
 					},
 					{
-						path: "/aliases/:addressInBase64",
+						path: "/aliases/:id",
 						element: <AliasDetailRoute />,
 					},
 					{
diff --git a/src/route-widgets/AliasesRoute/AliasesListItem.tsx b/src/route-widgets/AliasesRoute/AliasesListItem.tsx
index a88fcb4..6693421 100644
--- a/src/route-widgets/AliasesRoute/AliasesListItem.tsx
+++ b/src/route-widgets/AliasesRoute/AliasesListItem.tsx
@@ -29,7 +29,7 @@ export default function AliasesListItem({
 			// @ts-ignore
 			component={isInCopyAddressMode ? undefined : RouterLink}
 			key={alias.id}
-			to={isInCopyAddressMode ? undefined : `/aliases/${btoa(address)}`}
+			to={isInCopyAddressMode ? undefined : `/aliases/${alias.id}`}
 			onClick={(event: any) => {
 				if (isInCopyAddressMode) {
 					event.preventDefault()
diff --git a/src/routes/AliasDetailRoute.tsx b/src/routes/AliasDetailRoute.tsx
index d291426..696fa07 100644
--- a/src/routes/AliasDetailRoute.tsx
+++ b/src/routes/AliasDetailRoute.tsx
@@ -25,13 +25,12 @@ import decryptAliasNotes from "~/apis/helpers/decrypt-alias-notes"
 
 export default function AliasDetailRoute(): ReactElement {
 	const {t} = useTranslation()
-	const params = useParams()
-	const address = atob(params.addressInBase64 as string)
+	const {id: aliasID} = useParams()
 	const {_decryptUsingMasterPassword, encryptionStatus} = useContext(AuthContext)
-	const queryKey = ["get_alias", address, encryptionStatus]
+	const queryKey = ["get_alias", aliasID, encryptionStatus]
 
 	const query = useQuery<Alias | DecryptedAlias, AxiosError>(queryKey, async () => {
-		const alias = await getAlias(address)
+		const alias = await getAlias(aliasID!)
 
 		if (encryptionStatus === EncryptionStatus.Available) {
 			;(alias as any as DecryptedAlias).notes = decryptAliasNotes(
@@ -60,7 +59,7 @@ export default function AliasDetailRoute(): ReactElement {
 									<AliasTypeIndicator type={alias.type} />
 								</Grid>
 								<Grid item>
-									<AliasAddress address={address} />
+									<AliasAddress address={`${alias.local}@${alias.domain}`} />
 								</Grid>
 								<Grid item>
 									<ChangeAliasActivationStatusSwitch