detect wallet switch / fix percentage formatting

permaweb · Jun 26, 2024 · 51bce5e · 51bce5e
1 parent 4dd1e6c
commit 51bce5e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/helpers/utils.ts b/src/helpers/utils.ts
@@ -67,6 +67,10 @@ export function formatPercentage(percentage) {
 		return `${multiplied.toFixed(0)}%`;
 	}
 
+	if (decimalPart.length > 6) {
+		return `${multiplied.toFixed(0)}%`;
+	}
+
 	let nonZeroIndex = decimalPart.length;
 	for (let i = 0; i < decimalPart.length; i++) {
 		if (decimalPart[i] !== '0') {

diff --git a/src/providers/ArweaveProvider.tsx b/src/providers/ArweaveProvider.tsx
@@ -105,11 +105,13 @@ export function ArweaveProvider(props: ArweaveProviderProps) {
 		handleWallet();
 
 		window.addEventListener('arweaveWalletLoaded', handleWallet);
+		window.addEventListener('walletSwitch', handleWallet);
 
 		return () => {
 			window.removeEventListener('arweaveWalletLoaded', handleWallet);
+			window.removeEventListener('walletSwitch', handleWallet);
 		};
-	}, [walletType]);
+	}, []);
 
 	React.useEffect(() => {
 		(async function () {

diff --git a/src/views/Profile/ProfileHeader/ProfileHeader.tsx b/src/views/Profile/ProfileHeader/ProfileHeader.tsx
@@ -39,18 +39,9 @@ export default function ProfileHeader(props: IProps) {
 		})();
 	}, [props.profile]);
 
-	// const copyAddress = React.useCallback(async () => {
-	// 	if (props.profile && props.profile.walletAddress) {
-	// 		if (props.profile.walletAddress.length > 0) {
-	// 			await navigator.clipboard.writeText(props.profile.walletAddress);
-	// 			setCopied(true);
-	// 			setTimeout(() => setCopied(false), 2000);
-	// 		}
-	// 	}
-	// }, [props.profile]);
-
 	function getAvatar() {
-		if (props.profile && props.profile.avatar) return <img src={getTxEndpoint(props.profile.avatar)} />;
+		if (props.profile && props.profile.avatar && checkValidAddress(props.profile.avatar))
+			return <img src={getTxEndpoint(props.profile.avatar)} />;
 		return <ReactSVG src={ASSETS.user} />;
 	}