Merge branch 'develop' into changing-network-bug

Giveth · Oct 16, 2024 · b590e06 · b590e06
2 parents 3f39ea7 + de88812
commit b590e06
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/components/modals/ManageProjectAddresses/AddNewAddress.tsx b/src/components/modals/ManageProjectAddresses/AddNewAddress.tsx
@@ -48,6 +48,7 @@ export const AddNewAddress: FC<IAddNewAddress> = ({
 		'chainType' in selectedChain ? selectedChain.chainType : undefined;
 
 	const isStellarChain = chainType === ChainType.STELLAR;
+	const isSolanaChain = chainType === ChainType.SOLANA;
 
 	const handleAdd = async (formData: IAddressForm) => {
 		setLoading(true);
@@ -137,7 +138,13 @@ export const AddNewAddress: FC<IAddNewAddress> = ({
 					...requiredOptions?.walletAddress,
 					validate: validateAddress,
 				}}
-				placeholder={isStellarChain ? 'G...' : '0x...'}
+				placeholder={
+					isStellarChain
+						? 'G...'
+						: isSolanaChain
+							? 'xxxx...xxxx'
+							: '0x...'
+				}
 				defaultValue={suggestNewAddress(
 					project.addresses!,
 					selectedChain,

diff --git a/src/components/views/verification/EmailVerificationIndex.tsx b/src/components/views/verification/EmailVerificationIndex.tsx
@@ -78,10 +78,17 @@ export default function EmailVerificationIndex() {
 }
 
 function Verified() {
+	const [querySlug, setQuerySlug] = useState<string | undefined>(undefined);
 	const router = useRouter();
 	const { slug } = router.query;
 	const { formatMessage } = useIntl();
 
+	useEffect(() => {
+		if (slug) {
+			setQuerySlug(slug as string);
+		}
+	}, [slug]);
+
 	return (
 		<>
 			<Image
@@ -99,7 +106,7 @@ function Verified() {
 				})}
 			</Lead>
 			<LinkHolder>
-				<Link href={slugToVerification(slug as string)}>
+				<Link href={slugToVerification(querySlug as string)}>
 					<ButtonLink
 						size='small'
 						label={