Merge pull request #3435 from hollaex/beta

Beta

Author: abeikverdi

server/api/swagger/swagger.js

@@ -4,7 +4,7 @@ const definition = {
 	swagger: '2.0',
 	info: {
 		title: 'HollaEx Kit',
-		version: '2.15.3'
+		version: '2.15.4'
 	},
 	host: 'api.hollaex.com',
 	basePath: '/v2',

server/package.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.15.3",
+	"version": "2.15.4",
 	"private": false,
 	"description": "HollaEx Kit",
 	"keywords": [

version

@@ -1 +1 @@
-2.15.3
+2.15.4

web/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "hollaex-kit",
-	"version": "2.15.3",
+	"version": "2.15.4",
 	"private": true,
 	"dependencies": {
 		"@ant-design/compatible": "1.0.5",

web/src/components/QuickTrade/index.js

@@ -127,6 +127,7 @@ const QuickTrade = ({
 	const [slippagePercentage, setSlippagePercentage] = useState(0);
 	const [isSwap, setSwap] = useState(true);
 	const [isSourceSelected, setIsSourceSelected] = useState(false);
+	const [isSelectTarget, setIsSelectTarget] = useState(false);
 
 	const resetForm = () => {
 		setTargetAmount();
@@ -195,6 +196,8 @@ const QuickTrade = ({
 		setSelectedSource(value);
 		setIsActiveFavQuickTrade(false);
 		setIsSourceSelected(true);
+		setToken();
+		setExpiry();
 	};
 
 	const onSelectTarget = (value) => {
@@ -203,6 +206,9 @@ const QuickTrade = ({
 		setTargetAmount();
 		setIsActiveFavQuickTrade(false);
 		setSelectedTarget(value);
+		setIsSelectTarget(true);
+		setToken();
+		setExpiry();
 	};
 
 	const goTo = (path) => {
@@ -444,7 +450,16 @@ const QuickTrade = ({
 				}
 			} else {
 				setTargetOptions(options);
-				setSelectedTarget(options[0]);
+				if (isSwap && isActiveFavQuickTrade) {
+					setSelectedSource(initialSelectedSource);
+					setSelectedTarget(initialSelectedTarget);
+					resetForm();
+				} else if (isSwap && (!isSelectTarget || isSourceSelected)) {
+					setSelectedTarget(options[0]);
+				}
+				setIsSelectTarget(false);
+				setIsSourceSelected(false);
+				setSwap(true);
 			}
 		}
 		// eslint-disable-next-line react-hooks/exhaustive-deps