othent support

permaweb · Jul 16, 2024 · aa06d19 · aa06d19
1 parent 16f5259
commit aa06d19
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 185 deletions.
diff --git a/src/helpers/config.ts b/src/helpers/config.ts
@@ -123,7 +123,10 @@ export const ASSETS = {
 	x,
 };
 
-export const AR_WALLETS = [{ type: WalletEnum.arConnect, logo: ASSETS.arconnect }];
+export const AR_WALLETS = [
+	{ type: WalletEnum.arConnect, logo: ASSETS.arconnect },
+	{ type: WalletEnum.othent, logo: ASSETS.othent },
+];
 
 export const DOM = {
 	loader: 'loader',

diff --git a/src/helpers/wallet.ts b/src/helpers/wallet.ts
diff --git a/src/providers/ArweaveProvider.tsx b/src/providers/ArweaveProvider.tsx
@@ -1,12 +1,13 @@
 import React from 'react';
+import { connect } from '@othent/kms';
+import * as Othent from '@othent/kms';
 
 import { getProfileByWalletAddress, readHandler } from 'api';
 
 import { Modal } from 'components/molecules/Modal';
 import { AO, AR_WALLETS, REDIRECTS, WALLET_PERMISSIONS } from 'helpers/config';
 import { getARBalanceEndpoint } from 'helpers/endpoints';
 import { ProfileHeaderType, WalletEnum } from 'helpers/types';
-import Othent from 'helpers/wallet';
 import { useLanguageProvider } from 'providers/LanguageProvider';
 
 import * as S from './styles';
@@ -105,12 +106,6 @@ export function ArweaveProvider(props: ArweaveProviderProps) {
 	const [profile, setProfile] = React.useState<ProfileHeaderType | null>(null);
 	const [toggleProfileUpdate, setToggleProfileUpdate] = React.useState<boolean>(false);
 
-	React.useEffect(() => {
-		(async function () {
-			await handleWallet();
-		})();
-	}, []);
-
 	React.useEffect(() => {
 		handleWallet();
 
@@ -216,7 +211,7 @@ export function ArweaveProvider(props: ArweaveProviderProps) {
 				[AO.pixl]: { profileBalance: 0, walletBalance: 0 },
 			});
 		}
-	}, [walletAddress && profile, toggleTokenBalanceUpdate]);
+	}, [walletAddress, profile, toggleTokenBalanceUpdate]);
 
 	React.useEffect(() => {
 		if (profile && profile.id) {
@@ -287,20 +282,24 @@ export function ArweaveProvider(props: ArweaveProviderProps) {
 	}
 
 	async function handleOthent() {
-		Othent.init();
-		await window.arweaveWallet.connect(WALLET_PERMISSIONS as any);
-		setWallet(window.arweaveWallet);
-		setWalletAddress(Othent.getUserInfo().walletAddress);
-		setWalletType(WalletEnum.othent);
-		localStorage.setItem('walletType', WalletEnum.othent);
+		try {
+			const othentConnection = await connect();
+			const address = othentConnection.walletAddress;
+			setWallet(Othent);
+			setWalletAddress(address);
+			setWalletType(WalletEnum.othent);
+			localStorage.setItem('walletType', WalletEnum.othent);
+		} catch (e: any) {
+			console.error(e);
+		}
 	}
 
 	async function handleDisconnect() {
+		if (localStorage.getItem('walletType')) localStorage.removeItem('walletType');
 		await global.window?.arweaveWallet?.disconnect();
 		setWallet(null);
 		setWalletAddress(null);
 		setProfile(null);
-		if (localStorage.getItem('walletType')) localStorage.removeItem('walletType');
 	}
 
 	async function getARBalance(walletAddress: string) {

diff --git a/src/providers/styles.ts b/src/providers/styles.ts
@@ -37,7 +37,7 @@ export const WalletListItem = styled.button`
 `;
 
 export const WalletLink = styled.div`
-	margin: 10px 0 20px 0;
+	margin: 5px 0 20px 0;
 	padding: 0 20px;
 	text-align: center;
 	a,

diff --git a/src/views/Asset/AssetAction/AssetActionMarket/AssetActionMarketOrders/styles.ts b/src/views/Asset/AssetAction/AssetActionMarket/AssetActionMarketOrders/styles.ts
@@ -83,7 +83,7 @@ export const MaxQty = styled.div`
 `;
 
 export const SalesWrapper = styled.div`
-	margin: 40px 0 20px 0;
+	margin: 0 0 20px 0;
 	> * {
 		&:not(:last-child) {
 			margin: 0 0 15px 0;