From e1899eb5cc6afbf8298e655b043f64e8e506387b Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Mon, 12 Jun 2023 11:07:50 +0200
Subject: [PATCH] Use better html for timeout with input list

---
 .../CreateTxForm/MsgForm/MsgTransferForm.tsx  | 83 ++++++++-----------
 components/inputs/Input.tsx                   |  2 +
 2 files changed, 37 insertions(+), 48 deletions(-)

diff --git a/components/forms/CreateTxForm/MsgForm/MsgTransferForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgTransferForm.tsx
index ddf54fe..aff6a1d 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgTransferForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgTransferForm.tsx
@@ -7,7 +7,6 @@ import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
 import { isTxMsgTransfer } from "../../../../lib/txMsgHelpers";
 import { TxMsg, TxMsgTransfer } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
-import Select from "../../../inputs/Select";
 import StackableContainer from "../../../layout/StackableContainer";
 
 const humanTimestampOptions = [
@@ -20,11 +19,8 @@ const humanTimestampOptions = [
   { label: "2 weeks from now", value: 2 * 7 * 24 * 60 * 60 * 1000 },
   { label: "3 weeks from now", value: 3 * 7 * 24 * 60 * 60 * 1000 },
   { label: "1 month from now", value: 4 * 7 * 24 * 60 * 60 * 1000 },
-  { label: "custom", value: 0 },
 ];
 
-type HumanTimestampOption = (typeof humanTimestampOptions)[number];
-
 interface MsgTransferFormProps {
   readonly fromAddress: string;
   readonly setMsgGetter: (msgGetter: MsgGetter) => void;
@@ -40,10 +36,7 @@ const MsgTransferForm = ({ fromAddress, setMsgGetter, deleteMsg }: MsgTransferFo
   const [denom, setDenom] = useState("");
   const [amount, setAmount] = useState("0");
   const [toAddress, setToAddress] = useState("");
-  const [selectedTimestamp, setSelectedTimestamp] = useState<HumanTimestampOption>(
-    humanTimestampOptions[0],
-  );
-  const [customTimestamp, setCustomTimestamp] = useState("");
+  const [timeout, setTimeout] = useState("");
   const [memo, setMemo] = useState("");
 
   const [sourcePortError, setSourcePortError] = useState("");
@@ -51,7 +44,7 @@ const MsgTransferForm = ({ fromAddress, setMsgGetter, deleteMsg }: MsgTransferFo
   const [denomError, setDenomError] = useState("");
   const [amountError, setAmountError] = useState("");
   const [toAddressError, setToAddressError] = useState("");
-  const [customTimestampError, setCustomTimestampError] = useState("");
+  const [timeoutError, setTimeoutError] = useState("");
 
   useEffect(() => {
     setSourcePortError("");
@@ -59,7 +52,7 @@ const MsgTransferForm = ({ fromAddress, setMsgGetter, deleteMsg }: MsgTransferFo
     setDenomError("");
     setAmountError("");
     setToAddressError("");
-    setCustomTimestampError("");
+    setTimeoutError("");
 
     const isMsgValid = (msg: TxMsg): msg is TxMsgTransfer => {
       assert(state.chain.addressPrefix, "addressPrefix missing");
@@ -84,31 +77,35 @@ const MsgTransferForm = ({ fromAddress, setMsgGetter, deleteMsg }: MsgTransferFo
         return false;
       }
 
-      const addressErrorMsg = checkAddress(toAddress, state.chain.addressPrefix);
+      const addressErrorMsg = checkAddress(toAddress, "");
       if (addressErrorMsg) {
         setToAddressError(`Invalid address for network ${state.chain.chainId}: ${addressErrorMsg}`);
         return false;
       }
 
-      if (selectedTimestamp.label === "custom") {
-        if (!customTimestamp || isNaN(Number(customTimestamp))) {
-          setCustomTimestampError("A timestamp is required");
-          return false;
-        }
+      const foundTimeout = humanTimestampOptions.find(({ label }) => label === timeout);
+      const isTimeoutNumber = !isNaN(Number(timeout));
+      const isTimeoutInFuture = Number(timeout) > Date.now();
 
-        if (Number(customTimestamp) <= Date.now()) {
-          setCustomTimestampError("Timestamp needs to be in the future");
-          return false;
-        }
+      if (!foundTimeout || !isTimeoutNumber || !isTimeoutInFuture) {
+        setTimeoutError("Timeout must be a valid timestamp in the future");
       }
 
       return isTxMsgTransfer(msg);
     };
 
-    const timeoutTimestamp =
-      selectedTimestamp.label === "custom"
-        ? Long.fromString(customTimestamp)
-        : Long.fromNumber(Date.now() + selectedTimestamp.value, true).multiply(1_000_000); // In nanoseconds
+    const timeoutTimestamp = (() => {
+      const foundTimeout = humanTimestampOptions.find(({ label }) => label === timeout)?.value;
+      if (foundTimeout) {
+        return Long.fromNumber(Date.now() + foundTimeout).multiply(1_000_000); // In nanoseconds
+      }
+
+      try {
+        return Long.fromString(timeout);
+      } catch {
+        return Long.fromNumber(0);
+      }
+    })();
 
     const msg: TxMsgTransfer = {
       typeUrl: "/ibc.applications.transfer.v1.MsgTransfer",
@@ -126,17 +123,15 @@ const MsgTransferForm = ({ fromAddress, setMsgGetter, deleteMsg }: MsgTransferFo
     setMsgGetter({ isMsgValid, msg });
   }, [
     amount,
-    customTimestamp,
     denom,
     fromAddress,
     memo,
-    selectedTimestamp.label,
-    selectedTimestamp.value,
     setMsgGetter,
     sourceChannel,
     sourcePort,
     state.chain.addressPrefix,
     state.chain.chainId,
+    timeout,
     toAddress,
   ]);
 
@@ -193,30 +188,22 @@ const MsgTransferForm = ({ fromAddress, setMsgGetter, deleteMsg }: MsgTransferFo
           error={sourceChannelError}
         />
       </div>
-      <div className="form-item">
-        <Select
-          options={humanTimestampOptions}
-          onChange={(option: HumanTimestampOption) => {
-            setSelectedTimestamp(option);
-
-            if (option.label !== "custom") {
-              setCustomTimestamp("");
-            }
-          }}
-          value={selectedTimestamp}
-          name="chain-select"
-        />
-      </div>
       <div className="form-item">
         <Input
-          type="number"
-          label="Custom Timestamp"
-          name="custom-timestamp"
-          disabled={selectedTimestamp.label !== "custom"}
-          value={customTimestamp}
-          onChange={({ target }) => setCustomTimestamp(target.value)}
-          error={customTimestampError}
+          type="text"
+          list="timestamp-options"
+          label="Timeout"
+          name="timeout"
+          placeholder="Enter timestamp in nanoseconds or select from list"
+          value={timeout}
+          onChange={({ target }) => setTimeout(target.value)}
+          error={timeoutError}
         />
+        <datalist id="timestamp-options">
+          {humanTimestampOptions.map(({ label }) => (
+            <option key={label}>{label}</option>
+          ))}
+        </datalist>
       </div>
       <div className="form-item">
         <Input
diff --git a/components/inputs/Input.tsx b/components/inputs/Input.tsx
index 94a6c62..b60e750 100644
--- a/components/inputs/Input.tsx
+++ b/components/inputs/Input.tsx
@@ -1,6 +1,7 @@
 interface Props {
   label?: string;
   type?: string;
+  list?: string;
   name?: string;
   onChange?: (e: React.ChangeEvent<HTMLInputElement>) => void;
   value: number | string | undefined;
@@ -18,6 +19,7 @@ const Input = (props: Props) => (
     <label>{props.label || ""}</label>
     <input
       type={props.type || "text"}
+      list={props.list}
       name={props.name || "text-input"}
       onChange={props.onChange}
       value={props.value}