Merge pull request #39 from openpeer/fix_quick_buy

Fix quick buy

Author: garjmegamind

components/Buy/EscrowButton/index.tsx

@@ -4,14 +4,10 @@ import { useAccount, useUserProfile } from "hooks";
 //import { DEPLOYER_CONTRACTS } from 'models/networks';
 import React, { useState } from "react";
 //import { useContractRead, useNetwork } from 'wagmi';
-
-import ApproveTokenButton from "./ApproveTokenButton";
-import DeploySellerContract from "./DeploySellerContract";
 import { EscrowFundsParams } from "./EscrowButton.types";
 import EscrowFundsButton from "./EscrowFundsButton";
 import { LAMPORTS_PER_SOL, PublicKey } from "@solana/web3.js";
 import { useContractRead } from "@/hooks/transactions/useContractRead";
-import useEscrowFee from "@/hooks/useEscrowFee";
 import { User } from "@/models/types";
 import CreateEscrowAccount from "./CreateEscrowAccount";
 

components/Buy/Release.tsx

@@ -1,5 +1,4 @@
 /* eslint-disable no-mixed-spaces-and-tabs */
-/* eslint-disable @typescript-eslint/indent */
 import StepLayout from 'components/Listing/StepLayout';
 import HeaderH3 from 'components/SectionHeading/h3';
 import React from 'react';

components/QuickBuy/Buy.tsx

@@ -24,6 +24,7 @@ const Buy = ({ lists, updateLists, onSeeOptions, onLoading }: BuyProps) => {
 	const [loading, setLoading] = useState(false);
 	const [creatingAd, setCreatingAd] = useState(false);
 	const router = useRouter();
+	let changeInSelector=false;
 
 	const updateLoading = (l: boolean) => {
 		setLoading(l);
@@ -38,6 +39,7 @@ const Buy = ({ lists, updateLists, onSeeOptions, onLoading }: BuyProps) => {
 		fiatValue: number | undefined;
 	}) => {
 		if (!token || !currency || (!tokenValue && !fiatValue)) return;
+		if(changeInSelector===false && ((fiatValue && fiatAmount===fiatValue)||(tokenValue && tokenAmount===tokenValue))) return;
 		updateLoading(true);
 		try {
 			const params = {
@@ -63,9 +65,14 @@ const Buy = ({ lists, updateLists, onSeeOptions, onLoading }: BuyProps) => {
 			const [list] = searchLists;
 			const { price } = list || {};
 			if (price) {
-				if (tokenValue) setFiatAmount(tokenValue * price);
-				if (fiatValue) setTokenAmount(truncate(fiatValue / price, token.decimals));
+				if (tokenValue){
+					setFiatAmount(tokenValue * price);
+				}
+				if (fiatValue){ 
+					setTokenAmount(truncate(fiatValue / price, token.decimals));
+				}
 			} else {
+
 				// @ts-ignore
 				if (fiatValue) setTokenAmount('');
 				// @ts-ignore
@@ -74,25 +81,32 @@ const Buy = ({ lists, updateLists, onSeeOptions, onLoading }: BuyProps) => {
 		} catch (error) {
 			console.error(error);
 		}
+		changeInSelector=false;
 		updateLoading(false);
 	};
 
 	useEffect(() => {
+		changeInSelector=true;
 		search({ fiatValue: fiatAmount, tokenValue: undefined });
 	}, [currency]);
 
 	useEffect(() => {
+		changeInSelector=true;
 		search({ fiatValue: undefined, tokenValue: tokenAmount });
 	}, [token]);
 
 	const onChangeFiat = (val: number | undefined) => {
+		console.log("Fiat Change");
+		if(fiatAmount===val)return;
 		setFiatAmount(val);
 		if (val && token && currency) {
 			search({ fiatValue: val, tokenValue: undefined });
 		}
 	};
 
 	const onChangeToken = (val: number | undefined) => {
+		console.log("Token Change");
+		if(tokenAmount===val)return;
 		setTokenAmount(val);
 		if (val && token && currency) {
 			search({ fiatValue: undefined, tokenValue: val });
@@ -194,4 +208,4 @@ const Buy = ({ lists, updateLists, onSeeOptions, onLoading }: BuyProps) => {
 	);
 };
 
-export default Buy;
+export default Buy;