Merge branch 'main' into terry-wallet-login

# Conflicts:
#	src/App.tsx

src/layouts/PublicLayout.tsx

@@ -302,7 +302,7 @@ export function PublicLayout() {
   const nav = useNavigate();
   const lp = useLocalizedPath();
 
-  // Keep i18n state in sync with URL so deep links (`/malay/browse`) flip the
+  // Keep i18n state in sync with URL so deep links (`/ms/browse`) flip the
   // UI language even if the user navigated via address bar or shared link.
   useEffect(() => {
     const urlLang = languageFromPathname(pathname);