Merge pull request #48 from synonymdev/error-api-limits

Setting input limit validation using API fields

Author: Jasonvdb

package.json

@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@reduxjs/toolkit": "^1.6.1",
-    "@synonymdev/blocktank-client": "^0.0.45",
+    "@synonymdev/blocktank-client": "^0.0.46",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",

src/pages/public/configure/index.tsx

@@ -123,9 +123,11 @@ function ConfigurePage(): JSX.Element {
 			return true;
 		}
 
-		const errors: IFormErrors = {};
+		const { max_chan_receiving, max_chan_spending } = product;
+		const max_chan_receiving_usd = Math.floor(product.max_chan_receiving_usd);
+		const max_chan_spending_usd = Math.floor(product.max_chan_spending_usd);
 
-		// TODO check channel balance
+		const errors: IFormErrors = {};
 
 		if (channelExpiry !== '' && Number(channelExpiry) < 1) {
 			errors.channelExpiry = `Minimum channel expiry is ${product.min_chan_expiry} week${
@@ -135,26 +137,27 @@ function ConfigurePage(): JSX.Element {
 			errors.channelExpiry = `Maximum channel expiry is ${product.max_chan_expiry} weeks`;
 		}
 
-		if (Number(remoteBalance) > product.max_channel_size) {
+		if (Number(remoteBalance) > max_chan_receiving) {
 			errors.remoteBalance = `Max receiving capacity is ${numberWithSpaces(
-				product.max_channel_size
-			)} sats`;
+				max_chan_receiving
+			)} sats ($${numberWithSpaces(max_chan_receiving_usd)})`;
 		} else if (Number(remoteBalance) < product.min_channel_size) {
 			errors.remoteBalance = `Minimum receiving capacity is ${numberWithSpaces(
 				product.min_channel_size
 			)} sats`;
 		}
 
-		if (Number(localBalance) !== 0 && Number(localBalance) < product.min_channel_size) {
-			errors.localBalance = `Minimum spending balance is ${numberWithSpaces(
-				product.min_channel_size
-			)} sats`;
-		}
-
-		if (Number(localBalance) !== 0 && Number(localBalance) > product.max_channel_size) {
-			errors.localBalance = `Max spending balance is ${numberWithSpaces(
-				product.max_channel_size
-			)} sats`;
+		if (Number(localBalance) !== 0) {
+			if (Number(localBalance) > max_chan_spending) {
+				errors.localBalance = `Max spending balance is ${numberWithSpaces(
+					max_chan_spending
+				)} sats ($${max_chan_spending_usd})`;
+			} else if (Number(localBalance) < product.min_channel_size) {
+				// TODO remove this check if the min spending cap check is removed from API
+				errors.localBalance = `Minimum spending capacity is ${numberWithSpaces(
+					product.min_channel_size
+				)} sats`;
+			}
 		}
 
 		setFormErrors(errors);
@@ -171,9 +174,9 @@ function ConfigurePage(): JSX.Element {
 		const rBalance = Number(remoteBalance);
 		const lBalance = Number(localBalance);
 
-		if (rBalance < lBalance + product.min_channel_size) {
-			setRemoteBalance(`${lBalance + product.min_channel_size}`); // TODO use new min field
-		}
+		// if (rBalance < lBalance + product.min_channel_size) {
+		// 	setRemoteBalance(`${lBalance + product.min_channel_size}`); // TODO use new min field
+		// }
 	}, [localBalance]);
 
 	const onSetInput = (str: string, set: Function): void => {
@@ -209,6 +212,8 @@ function ConfigurePage(): JSX.Element {
 			setChannelExpiry(Math.trunc(Number(channelExpiry)).toString());
 		}
 
+		setGeneralError('');
+
 		isValid()
 			.then()
 			.catch((e) => console.error(e));

src/pages/public/settings/index.scss

@@ -30,7 +30,6 @@
       font-style: normal;
       font-weight: 600;
       font-size: 15px;
-      letter-spacing: -0.4px;
       color: #FFFFFF;
     }
 

yarn.lock

@@ -1768,10 +1768,10 @@
     "@svgr/plugin-svgo" "^5.5.0"
     loader-utils "^2.0.0"
 
-"@synonymdev/blocktank-client@^0.0.45":
-  version "0.0.45"
-  resolved "https://registry.yarnpkg.com/@synonymdev/blocktank-client/-/blocktank-client-0.0.45.tgz#4369d4463d5831d701bd98cfa070ccf670d5713a"
-  integrity sha512-cASzVmT9HQA0y4+yI2Kaz24dLXk1uDjDPY2+g+cVRqOK9ZinljKtHHFUNyMwPQUpf9mi4Xo21twbGHvu3eQdAg==
+"@synonymdev/blocktank-client@^0.0.46":
+  version "0.0.46"
+  resolved "https://registry.yarnpkg.com/@synonymdev/blocktank-client/-/blocktank-client-0.0.46.tgz#0b9fcb68aeffedb8f565c317dbee27f8986a0206"
+  integrity sha512-s88EDbs/mDTqoe/F4yAHtkPMslkJ+LJGJUrNsskbnyounfuij9BI6WZDPc4N/LpRy3ynqvjEZKIU0qO6V91+iQ==
   dependencies:
     cross-fetch "^3.1.4"
     node-fetch "3.1.1"