From ba76e1fb40f9e9f07c115befc18440dbee1cb3e4 Mon Sep 17 00:00:00 2001
From: dr-frmr <docterformer@protonmail.com>
Date: Tue, 13 Aug 2024 17:02:08 +0300
Subject: [PATCH 1/6] login: only enable once initialized!

---
 kinode/src/http/login.html | 43 +++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/kinode/src/http/login.html b/kinode/src/http/login.html
index 9a5ff601e..0e5481b54 100644
--- a/kinode/src/http/login.html
+++ b/kinode/src/http/login.html
@@ -143,7 +143,7 @@ <h3 id="node-and-domain" class="flex flex-col text-lg"></h3>
           oninput="document.getElementById('password-err').style.display = 'none';" value="" class="self-stretch mb-2">
         <div id="password-err" class="login-row flex mb-2" style="display: none;"> Incorrect Password </div>
         <div class="flex flex-col leading-6 self-stretch mb-2">
-          <button> Login </button>
+          <button id="login-button" disabled> Login </button>
           <div class="flex flex-col mt-2 text-sm leading-6" id="fake-or-not"></div>
         </div>
       </form>
@@ -156,20 +156,27 @@ <h3>Logging in...</h3>
 
   <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.2.0/crypto-js.min.js"></script>
   <script>
-    if ('${fake}' === 'true') {
-      document.getElementById("fake-or-not").innerHTML = "Fake node -- any password will work!";
-    } else {
-      document.getElementById("fake-or-not").innerHTML = "Restart your node to change networking settings.";
-    }
+    let isInitialized = false;
+
+    function initializeLoginForm() {
+      if ('${fake}' === 'true') {
+        document.getElementById("fake-or-not").innerHTML = "Fake node -- any password will work!";
+      } else {
+        document.getElementById("fake-or-not").innerHTML = "Restart your node to change networking settings.";
+      }
+
+      const firstPathItem = window.location.pathname.split('/')[1];
+      const expectedSecureSubdomain = generateSecureSubdomain(firstPathItem);
+      const maybeSecureSubdomain = window.location.host.split('.')[0];
+      const isSecureSubdomain = expectedSecureSubdomain === maybeSecureSubdomain;
+      if (isSecureSubdomain) {
+        document.getElementById("node-and-domain").innerText = "${node}: authenticate for secure subdomain app " + firstPathItem;
+      } else {
+        document.getElementById("node-and-domain").innerText = "${node} ";
+      }
 
-    const firstPathItem = window.location.pathname.split('/')[1];
-    const expectedSecureSubdomain = generateSecureSubdomain(firstPathItem);
-    const maybeSecureSubdomain = window.location.host.split('.')[0];
-    const isSecureSubdomain = expectedSecureSubdomain === maybeSecureSubdomain;
-    if (isSecureSubdomain) {
-      document.getElementById("node-and-domain").innerText = "${node}: authenticate for secure subdomain app " + firstPathItem;
-    } else {
-      document.getElementById("node-and-domain").innerText = "${node} ";
+      document.getElementById("login-button").disabled = false;
+      isInitialized = true;
     }
 
     async function login(password) {
@@ -197,7 +204,6 @@ <h3>Logging in...</h3>
         document.getElementById("password").value = "";
         document.getElementById("password-err").style.display = "flex";
         document.getElementById("password").focus();
-        return;
       }
     }
 
@@ -213,12 +219,15 @@ <h3>Logging in...</h3>
     }
 
     document.addEventListener("DOMContentLoaded", () => {
+      initializeLoginForm();
       const form = document.getElementById("login-form");
       form.addEventListener("submit", (e) => {
         e.preventDefault();
         e.stopPropagation();
-        const password = document.getElementById("password").value;
-        login(password);
+        if (isInitialized) {
+          const password = document.getElementById("password").value;
+          login(password);
+        }
       });
     });
   </script>

From 36a33f5108a2b7d41574311dffd41c5c65ae25fc Mon Sep 17 00:00:00 2001
From: dr-frmr <docterformer@protonmail.com>
Date: Tue, 13 Aug 2024 20:05:31 +0300
Subject: [PATCH 2/6] wallet-using pages: show connect popup, render page
 content regardless

---
 .../src/register-ui/src/pages/CommitDotOsName.tsx  | 10 ++++++++--
 kinode/src/register-ui/src/pages/MintCustom.tsx    | 10 ++++++++--
 kinode/src/register-ui/src/pages/MintDotOsName.tsx | 10 ++++++++--
 .../src/register-ui/src/pages/ResetDotOsName.tsx   | 14 +++++++-------
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/kinode/src/register-ui/src/pages/CommitDotOsName.tsx b/kinode/src/register-ui/src/pages/CommitDotOsName.tsx
index 8b09ce24b..d63381e8c 100644
--- a/kinode/src/register-ui/src/pages/CommitDotOsName.tsx
+++ b/kinode/src/register-ui/src/pages/CommitDotOsName.tsx
@@ -53,6 +53,12 @@ function CommitDotOsName({
 
     const enterOsNameProps = { name, setName, nameValidities, setNameValidities, triggerNameCheck }
 
+    useEffect(() => {
+        if (!address) {
+            openConnectModal?.();
+        }
+    }, [address, openConnectModal]);
+
     let handleCommit = useCallback(async (e: FormEvent) => {
         e.preventDefault()
         e.stopPropagation()
@@ -88,7 +94,7 @@ function CommitDotOsName({
     return (
         <div className="container fade-in">
             <div className="section">
-                {Boolean(address) && (
+                {
                     <form className="form" onSubmit={handleCommit}>
                         {isPending || isConfirming ? (
                             <Loader msg={isConfirming ? 'Pre-committing to chosen ID...' : 'Please confirm the transaction in your wallet'} />
@@ -121,7 +127,7 @@ function CommitDotOsName({
                             </p>
                         )}
                     </form>
-                )}
+                }
             </div>
         </div>
     );
diff --git a/kinode/src/register-ui/src/pages/MintCustom.tsx b/kinode/src/register-ui/src/pages/MintCustom.tsx
index 7c2754a9b..b2580f623 100644
--- a/kinode/src/register-ui/src/pages/MintCustom.tsx
+++ b/kinode/src/register-ui/src/pages/MintCustom.tsx
@@ -48,6 +48,12 @@ function MintCustom({
 
     useEffect(() => setTriggerNameCheck(!triggerNameCheck), [address])
 
+    useEffect(() => {
+        if (!address) {
+            openConnectModal?.();
+        }
+    }, [address, openConnectModal]);
+
     let handleMint = useCallback(async (e: FormEvent) => {
         e.preventDefault()
         e.stopPropagation()
@@ -113,7 +119,7 @@ function MintCustom({
     return (
         <div className="container fade-in">
             <div className="section">
-                {Boolean(address) && (
+                {
                     <form className="form" onSubmit={handleMint}>
                         {isPending || isConfirming ? (
                             <Loader msg={isConfirming ? 'Minting name...' : 'Please confirm the transaction in your wallet'} />
@@ -136,7 +142,7 @@ function MintCustom({
                             </p>
                         )}
                     </form>
-                )}
+                }
             </div>
         </div>
     );
diff --git a/kinode/src/register-ui/src/pages/MintDotOsName.tsx b/kinode/src/register-ui/src/pages/MintDotOsName.tsx
index daf94befe..c95c8362c 100644
--- a/kinode/src/register-ui/src/pages/MintDotOsName.tsx
+++ b/kinode/src/register-ui/src/pages/MintDotOsName.tsx
@@ -44,6 +44,12 @@ function MintDotOsName({
 
   useEffect(() => setTriggerNameCheck(!triggerNameCheck), [address])
 
+  useEffect(() => {
+    if (!address) {
+      openConnectModal?.();
+    }
+  }, [address, openConnectModal]);
+
   let handleMint = useCallback(async (e: FormEvent) => {
     e.preventDefault()
     e.stopPropagation()
@@ -107,7 +113,7 @@ function MintDotOsName({
   return (
     <div className="container fade-in">
       <div className="section">
-        {Boolean(address) && (
+        {
           <form className="form" onSubmit={handleMint}>
             {isPending || isConfirming ? (
               <Loader msg={isConfirming ? 'Minting .os name...' : 'Please confirm the transaction in your wallet'} />
@@ -126,7 +132,7 @@ function MintDotOsName({
               </p>
             )}
           </form>
-        )}
+        }
       </div>
     </div>
   );
diff --git a/kinode/src/register-ui/src/pages/ResetDotOsName.tsx b/kinode/src/register-ui/src/pages/ResetDotOsName.tsx
index fa926b2fb..698eb9385 100644
--- a/kinode/src/register-ui/src/pages/ResetDotOsName.tsx
+++ b/kinode/src/register-ui/src/pages/ResetDotOsName.tsx
@@ -67,9 +67,11 @@ function ResetKnsName({
   // so inputs will validate once wallet is connected
   useEffect(() => setTriggerNameCheck(!triggerNameCheck), [address]); // eslint-disable-line react-hooks/exhaustive-deps
 
-
-  // TODO: separate this whole namechecking thing into helper function
-  // boolean to branch whether to check for occupied or to match against our_address.
+  useEffect(() => {
+    if (!address) {
+      openConnectModal?.();
+    }
+  }, [address, openConnectModal]);
 
   const nameDebouncer = useRef<NodeJS.Timeout | null>(null);
   useEffect(() => {
@@ -152,8 +154,6 @@ function ResetKnsName({
         return;
       }
 
-
-
       try {
         const data = await generateNetworkingKeys({
           direct,
@@ -202,7 +202,7 @@ function ResetKnsName({
   return (
     <div className="container fade-in">
       <div className="section">
-        {Boolean(address) && (
+        {
           <form className="form" onSubmit={handleResetRecords}>
             {isPending || isConfirming ? (
               <Loader msg={isConfirming ? "Resetting Networking Information..." : "Please confirm the transaction in your wallet"} />
@@ -230,7 +230,7 @@ function ResetKnsName({
               </p>
             )}
           </form>
-        )}
+        }
       </div>
     </div>
   );

From 3ba1a2e53d596f165fae026ef35241707910e45b Mon Sep 17 00:00:00 2001
From: dr-frmr <docterformer@protonmail.com>
Date: Tue, 13 Aug 2024 21:15:58 +0300
Subject: [PATCH 3/6] styling fixes, kinode.css and register-ui

---
 css/kinode.css                                     | 14 +++++++++++---
 kinode/src/register-ui/index.html                  |  1 +
 .../register-ui/src/components/DirectTooltip.tsx   |  4 +++-
 kinode/src/register-ui/src/index.css               |  8 ++++++++
 kinode/src/register-ui/src/pages/Login.tsx         |  6 ++++--
 .../src/register-ui/src/pages/ResetDotOsName.tsx   |  7 +++++--
 6 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/css/kinode.css b/css/kinode.css
index d2370582a..9c61482dd 100644
--- a/css/kinode.css
+++ b/css/kinode.css
@@ -20,7 +20,7 @@ input,
 button,
 textarea,
 select {
-    font: inherit;
+    font-family: var(--font-family-main);
 }
 
 /* Variables */
@@ -38,6 +38,8 @@ select {
     --maroon: #4f0000;
     --gray: #657b83;
     --tasteful-dark: #1f1f1f;
+
+    --font-family-main: 'Kode Mono', monospace;
 }
 
 /* Typography */
@@ -49,10 +51,16 @@ h5,
 h6,
 p,
 label,
-li {
+li,
+span {
+    font-family: var(--font-family-main);
     color: light-dark(var(--off-black), var(--off-white));
 }
 
+p {
+    font-size: 0.8em;
+}
+
 h1 {
     font-size: 2em;
 }
@@ -78,6 +86,7 @@ h6 {
 }
 
 a {
+    font-family: var(--font-family-main);
     color: light-dark(var(--blue), var(--orange));
     text-decoration: none;
 }
@@ -89,7 +98,6 @@ a:hover {
 
 /* Layout */
 body {
-    font-family: var(--font-family-main, sans-serif);
     line-height: 1.6;
     -webkit-font-smoothing: antialiased;
     background-color: light-dark(var(--tan), var(--tasteful-dark));
diff --git a/kinode/src/register-ui/index.html b/kinode/src/register-ui/index.html
index ad784d8a0..c31db166e 100644
--- a/kinode/src/register-ui/index.html
+++ b/kinode/src/register-ui/index.html
@@ -11,6 +11,7 @@
   <meta httpEquiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport"
     content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1.00001, viewport-fit=cover" />
+  <link href="https://fonts.googleapis.com/css2?family=Kode+Mono:wght@700&display=swap" rel="stylesheet">
 </head>
 
 <body>
diff --git a/kinode/src/register-ui/src/components/DirectTooltip.tsx b/kinode/src/register-ui/src/components/DirectTooltip.tsx
index 4958e7c74..f41cb7252 100644
--- a/kinode/src/register-ui/src/components/DirectTooltip.tsx
+++ b/kinode/src/register-ui/src/components/DirectTooltip.tsx
@@ -1,3 +1,5 @@
 import { Tooltip } from "./Tooltip";
 
-export const DirectTooltip: React.FC = () => <Tooltip text={`A direct node publishes its own networking information on-chain: IP, port, so on. An indirect node relies on the service of routers, which are themselves direct nodes. Only register a direct node if you know what you’re doing and have a public, static IP address.`} />
\ No newline at end of file
+export const DirectTooltip: React.FC = () => <Tooltip text={`A direct node publishes its own networking information on-chain: IP, port, so on. An indirect node relies on the service of routers, which are themselves direct nodes. Only register a direct node if you know what you're doing and have a public, static IP address.`}>
+    <span>ⓘ</span>
+</Tooltip>
\ No newline at end of file
diff --git a/kinode/src/register-ui/src/index.css b/kinode/src/register-ui/src/index.css
index ae0dbf510..0439292f2 100644
--- a/kinode/src/register-ui/src/index.css
+++ b/kinode/src/register-ui/src/index.css
@@ -29,6 +29,7 @@
 }
 
 .tooltip-text {
+    font-size: 0.8em;
     visibility: hidden;
     width: 200px;
     background-color: #555;
@@ -127,6 +128,7 @@
 .kns-input {
     flex-grow: 1;
     padding: 0.5rem;
+    font-size: 1.2em;
     border: 1px solid var(--gray);
     border-radius: 4px 0 0 4px;
 }
@@ -215,6 +217,7 @@
 
 .checkbox-label {
     margin-left: 10px;
+    font-size: 0.9em;
 }
 
 .file-input-label {
@@ -235,4 +238,9 @@
 .file-input-label:hover .button {
     background-color: var(--dark-orange);
     color: var(--off-white);
+}
+
+button.clear {
+    width: 100%;
+    background-color: var(--ansi-red);
 }
\ No newline at end of file
diff --git a/kinode/src/register-ui/src/pages/Login.tsx b/kinode/src/register-ui/src/pages/Login.tsx
index e4f021e09..482887f06 100644
--- a/kinode/src/register-ui/src/pages/Login.tsx
+++ b/kinode/src/register-ui/src/pages/Login.tsx
@@ -3,6 +3,7 @@ import { PageProps, UnencryptedIdentity } from "../lib/types";
 import Loader from "../components/Loader";
 import { useNavigate } from "react-router-dom";
 import { sha256, toBytes } from "viem";
+import { Tooltip } from "../components/Tooltip";
 
 interface LoginProps extends PageProps { }
 
@@ -89,8 +90,9 @@ function Login({
         >
           <div className="form-group">
             <div className="form-header">
-              <h3>{knsName}</h3>
-              <span>({isDirect ? "direct" : "indirect"} node)</span>
+              <Tooltip text={`(${isDirect ? "direct" : "indirect"} node)`}>
+                <h3>{knsName}</h3>
+              </Tooltip>
             </div>
             <input
               type="password"
diff --git a/kinode/src/register-ui/src/pages/ResetDotOsName.tsx b/kinode/src/register-ui/src/pages/ResetDotOsName.tsx
index 698eb9385..df3860784 100644
--- a/kinode/src/register-ui/src/pages/ResetDotOsName.tsx
+++ b/kinode/src/register-ui/src/pages/ResetDotOsName.tsx
@@ -209,12 +209,15 @@ function ResetKnsName({
             ) : (
               <>
                 <h3 className="form-label">
-                  <Tooltip text="Kinodes use a .os name in order to identify themselves to other nodes in the network.">
-                    Specify the node ID to reset
+                  <Tooltip text="Kinodes use an onchain username in order to identify themselves to other nodes in the network.">
+                    Node ID to reset:
                   </Tooltip>
                 </h3>
                 <EnterKnsName {...{ name, setName, nameVets, triggerNameCheck, nameValidities, setNameValidities, isReset: true }} />
                 <DirectCheckbox {...{ direct, setDirect }} />
+                <p>
+                  A reset will not delete any data. It only updates the networking information that your node publishes onchain.
+                </p>
                 <button
                   type="submit"
                   className="button mt-2"

From c9f056695520cc5d34a0425d2a73ad97129f8bf6 Mon Sep 17 00:00:00 2001
From: dr-frmr <docterformer@protonmail.com>
Date: Tue, 13 Aug 2024 23:26:34 +0300
Subject: [PATCH 4/6] fixes to name entry, error handling, visuals

---
 .../src/components/EnterKnsName.tsx           | 41 ++++++---
 kinode/src/register-ui/src/index.css          |  5 +-
 .../register-ui/src/pages/CommitDotOsName.tsx |  4 +-
 kinode/src/register-ui/src/pages/Login.tsx    |  2 +-
 .../register-ui/src/pages/ResetDotOsName.tsx  | 90 +------------------
 5 files changed, 38 insertions(+), 104 deletions(-)

diff --git a/kinode/src/register-ui/src/components/EnterKnsName.tsx b/kinode/src/register-ui/src/components/EnterKnsName.tsx
index a12f07952..952e2614f 100644
--- a/kinode/src/register-ui/src/components/EnterKnsName.tsx
+++ b/kinode/src/register-ui/src/components/EnterKnsName.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import isValidDomain from "is-valid-domain";
 import { toAscii } from "idna-uts46-hx";
 import { usePublicClient } from 'wagmi'
@@ -14,33 +14,38 @@ export const NAME_NOT_OWNER = "Name already exists and does not belong to this w
 export const NAME_NOT_REGISTERED = "Name is not registered";
 
 type ClaimOsNameProps = {
+  address?: `0x${string}`;
   name: string;
   setName: React.Dispatch<React.SetStateAction<string>>;
   nameValidities: string[];
   setNameValidities: React.Dispatch<React.SetStateAction<string[]>>;
   triggerNameCheck: boolean;
+  setTba?: React.Dispatch<React.SetStateAction<string>>;
   isReset?: boolean;
 };
 
 function EnterKnsName({
+  address,
   name,
   setName,
   nameValidities,
   setNameValidities,
   triggerNameCheck,
+  setTba,
   isReset = false,
 }: ClaimOsNameProps) {
   const client = usePublicClient();
   const debouncer = useRef<NodeJS.Timeout | null>(null);
 
-  useEffect(() => {
-    if (isReset) return;
+  const [isPunyfied, setIsPunyfied] = useState('');
 
+  useEffect(() => {
     if (debouncer.current) clearTimeout(debouncer.current);
 
     debouncer.current = setTimeout(async () => {
       let index: number;
-      let validities = [...nameValidities];
+      let validities: string[] = [];
+      setIsPunyfied('');
 
       const len = [...name].length;
       index = validities.indexOf(NAME_LENGTH);
@@ -57,6 +62,8 @@ function EnterKnsName({
         if (index === -1) validities.push(NAME_INVALID_PUNY);
       }
 
+      if (normalized !== (name + ".os")) setIsPunyfied(normalized);
+
       // only check if name is valid punycode
       if (normalized && normalized !== '.os') {
         index = validities.indexOf(NAME_URL);
@@ -66,6 +73,7 @@ function EnterKnsName({
 
         index = validities.indexOf(NAME_CLAIMED);
 
+        // only check if name is valid and long enough
         if (validities.length === 0 || index !== -1 && normalized.length > 2) {
           try {
             const namehash = kinohash(normalized)
@@ -78,34 +86,44 @@ function EnterKnsName({
               args: [namehash]
             })
 
+            const tba = data?.[0];
+            if (tba !== undefined) {
+              setTba ? (setTba(tba)) : null;
+            } else {
+              validities.push(NAME_NOT_REGISTERED);
+            }
+
             const owner = data?.[1];
             const owner_is_zero = owner === "0x0000000000000000000000000000000000000000";
 
-            if (!owner_is_zero && index === -1) validities.push(NAME_CLAIMED);
+            if (!owner_is_zero && !isReset) validities.push(NAME_CLAIMED);
+
+            if (!owner_is_zero && isReset && address && owner !== address) validities.push(NAME_NOT_OWNER);
+
+            if (isReset && owner_is_zero) validities.push(NAME_NOT_REGISTERED);
           } catch (e) {
             console.error({ e })
             if (index !== -1) validities.splice(index, 1);
           }
         }
       }
-
       setNameValidities(validities);
-    }, 100);
+    }, 500);
   }, [name, triggerNameCheck, isReset]);
 
-  const noDots = (e: any) =>
-    e.target.value.indexOf(".") === -1 && setName(e.target.value);
+  const noDotsOrSpaces = (e: any) =>
+    e.target.value.indexOf(".") === -1 && e.target.value.indexOf(" ") === -1 && setName(e.target.value);
 
   return (
     <div className="enter-kns-name">
       <div className="input-wrapper">
         <input
           value={name}
-          onChange={noDots}
+          onChange={noDotsOrSpaces}
           type="text"
           required
           name="dot-os-name"
-          placeholder="e.g. myname"
+          placeholder="mynode123"
           className="kns-input"
         />
         <span className="kns-suffix">.os</span>
@@ -113,6 +131,7 @@ function EnterKnsName({
       {nameValidities.map((x, i) => (
         <p key={i} className="error-message">{x}</p>
       ))}
+      {isPunyfied !== '' && <p className="puny-warning">special characters will be converted to punycode: {isPunyfied}</p>}
     </div>
   );
 }
diff --git a/kinode/src/register-ui/src/index.css b/kinode/src/register-ui/src/index.css
index 0439292f2..e6fad2cae 100644
--- a/kinode/src/register-ui/src/index.css
+++ b/kinode/src/register-ui/src/index.css
@@ -135,7 +135,7 @@
 
 .kns-suffix {
     padding: 0.5rem;
-    background-color: var(--gray);
+    background-color: var(--blue);
     border: 1px solid var(--tasteful-dark);
     border-left: none;
     border-radius: 0 4px 4px 0;
@@ -240,7 +240,6 @@
     color: var(--off-white);
 }
 
-button.clear {
+button.secondary {
     width: 100%;
-    background-color: var(--ansi-red);
 }
\ No newline at end of file
diff --git a/kinode/src/register-ui/src/pages/CommitDotOsName.tsx b/kinode/src/register-ui/src/pages/CommitDotOsName.tsx
index d63381e8c..836aca21f 100644
--- a/kinode/src/register-ui/src/pages/CommitDotOsName.tsx
+++ b/kinode/src/register-ui/src/pages/CommitDotOsName.tsx
@@ -51,7 +51,7 @@ function CommitDotOsName({
 
     useEffect(() => setTriggerNameCheck(!triggerNameCheck), [address])
 
-    const enterOsNameProps = { name, setName, nameValidities, setNameValidities, triggerNameCheck }
+    const enterOsNameProps = { address, name, setName, nameValidities, setNameValidities, triggerNameCheck }
 
     useEffect(() => {
         if (!address) {
@@ -102,7 +102,7 @@ function CommitDotOsName({
                             <>
                                 <h3 className="form-label">
                                     <Tooltip text="Kinodes need an onchain node identity in order to communicate with other nodes in the network.">
-                                        Choose a name for your Kinode
+                                        Choose a name for your computer
                                     </Tooltip>
                                 </h3>
                                 <EnterKnsName {...enterOsNameProps} />
diff --git a/kinode/src/register-ui/src/pages/Login.tsx b/kinode/src/register-ui/src/pages/Login.tsx
index 482887f06..719b05140 100644
--- a/kinode/src/register-ui/src/pages/Login.tsx
+++ b/kinode/src/register-ui/src/pages/Login.tsx
@@ -119,7 +119,7 @@ function Login({
 
           <div className="additional-options">
             <button
-              className="clear"
+              className="secondary"
               onClick={() => navigate('/reset')}
             >
               Reset Node & Networking Info
diff --git a/kinode/src/register-ui/src/pages/ResetDotOsName.tsx b/kinode/src/register-ui/src/pages/ResetDotOsName.tsx
index df3860784..42d96c821 100644
--- a/kinode/src/register-ui/src/pages/ResetDotOsName.tsx
+++ b/kinode/src/register-ui/src/pages/ResetDotOsName.tsx
@@ -2,24 +2,18 @@ import {
   FormEvent,
   useCallback,
   useEffect,
-  useRef,
   useState,
 } from "react";
 import { useNavigate } from "react-router-dom";
-import { toAscii } from "idna-uts46-hx";
-import isValidDomain from "is-valid-domain";
 import Loader from "../components/Loader";
 import { PageProps } from "../lib/types";
-import { KINOMAP, MULTICALL, generateNetworkingKeys, kinomapAbi, mechAbi } from "../abis";
+import { MULTICALL, generateNetworkingKeys, mechAbi } from "../abis";
 import { Tooltip } from "../components/Tooltip";
 import DirectCheckbox from "../components/DirectCheckbox";
 import EnterKnsName from "../components/EnterKnsName";
 
-import { useAccount, usePublicClient, useWaitForTransactionReceipt, useWriteContract } from "wagmi";
+import { useAccount, useWaitForTransactionReceipt, useWriteContract } from "wagmi";
 import { useConnectModal, useAddRecentTransaction } from "@rainbow-me/rainbowkit";
-import { kinohash } from "../utils/kinohash";
-
-import { NAME_URL, NAME_INVALID_PUNY, NAME_NOT_OWNER, NAME_NOT_REGISTERED } from "../components/EnterKnsName";
 
 interface ResetProps extends PageProps { }
 
@@ -28,7 +22,6 @@ function ResetKnsName({
   setDirect,
   setReset,
   knsName,
-  setKnsName,
   setNetworkingKey,
   setIpAddress,
   setWsPort,
@@ -37,7 +30,6 @@ function ResetKnsName({
 }: ResetProps) {
   const { address } = useAccount();
   const navigate = useNavigate();
-  const client = usePublicClient();
   const { openConnectModal } = useConnectModal();
 
   const { data: hash, writeContract, isPending, isError, error } = useWriteContract({
@@ -54,7 +46,6 @@ function ResetKnsName({
   const addRecentTransaction = useAddRecentTransaction();
 
   const [name, setName] = useState<string>(knsName.slice(0, -3));
-  const [nameVets, setNameVets] = useState<string[]>([]);
   const [nameValidities, setNameValidities] = useState<string[]>([])
   const [tba, setTba] = useState<string>("");
   const [triggerNameCheck, setTriggerNameCheck] = useState<boolean>(false);
@@ -73,77 +64,6 @@ function ResetKnsName({
     }
   }, [address, openConnectModal]);
 
-  const nameDebouncer = useRef<NodeJS.Timeout | null>(null);
-  useEffect(() => {
-    if (nameDebouncer.current) clearTimeout(nameDebouncer.current);
-
-    nameDebouncer.current = setTimeout(async () => {
-      setNameVets([]);
-
-
-      if (name === "") return;
-
-      let index: number;
-      let vets = [...nameVets];
-
-      let normalized: string;
-      index = vets.indexOf(NAME_INVALID_PUNY);
-      try {
-        normalized = toAscii(name + ".os");
-        if (index !== -1) vets.splice(index, 1);
-      } catch (e) {
-        if (index === -1) vets.push(NAME_INVALID_PUNY);
-      }
-
-      // only check if name is valid punycode
-      if (normalized! !== undefined) {
-        index = vets.indexOf(NAME_URL);
-        if (name !== "" && !isValidDomain(normalized)) {
-          if (index === -1) vets.push(NAME_URL);
-        } else if (index !== -1) vets.splice(index, 1);
-
-        try {
-          const namehash = kinohash(normalized)
-          console.log('normalized', normalized)
-          console.log('namehash', namehash)
-          // maybe separate into helper function for readability?
-          // also note picking the right chain ID & address!
-          const data = await client?.readContract({
-            address: KINOMAP,
-            abi: kinomapAbi,
-            functionName: "get",
-            args: [namehash]
-          })
-          const tba = data?.[0];
-          const owner = data?.[1];
-
-
-          console.log('GOT data', data)
-          console.log('GOT tba', tba)
-
-          index = vets.indexOf(NAME_NOT_OWNER);
-          if (owner === address && index !== -1) vets.splice(index, 1);
-          else if (index === -1 && owner !== address)
-            vets.push(NAME_NOT_OWNER);
-
-          index = vets.indexOf(NAME_NOT_REGISTERED);
-          if (index !== -1) vets.splice(index, 1);
-
-          if (tba !== undefined) {
-            setTba(tba);
-          }
-        } catch (e) {
-          index = vets.indexOf(NAME_NOT_REGISTERED);
-          if (index === -1) vets.push(NAME_NOT_REGISTERED);
-        }
-
-        if (nameVets.length === 0) setKnsName(normalized);
-      }
-
-      setNameVets(vets);
-    }, 500);
-  }, [name, triggerNameCheck]); // eslint-disable-line react-hooks/exhaustive-deps
-
   const handleResetRecords = useCallback(
     async (e: FormEvent) => {
       e.preventDefault();
@@ -167,10 +87,6 @@ function ResetKnsName({
           reset: true,
         });
 
-        console.log('data', data)
-
-        console.log('tba', tba)
-
         writeContract({
           address: tba as `0x${string}`,
           abi: mechAbi,
@@ -213,7 +129,7 @@ function ResetKnsName({
                     Node ID to reset:
                   </Tooltip>
                 </h3>
-                <EnterKnsName {...{ name, setName, nameVets, triggerNameCheck, nameValidities, setNameValidities, isReset: true }} />
+                <EnterKnsName {...{ address, name, setName, triggerNameCheck, nameValidities, setNameValidities, setTba, isReset: true }} />
                 <DirectCheckbox {...{ direct, setDirect }} />
                 <p>
                   A reset will not delete any data. It only updates the networking information that your node publishes onchain.

From 652dc760631751f50c32a43b74b35105202c6779 Mon Sep 17 00:00:00 2001
From: dr-frmr <docterformer@protonmail.com>
Date: Tue, 13 Aug 2024 23:55:36 +0300
Subject: [PATCH 5/6] copy changes, kinomap->kimap

---
 css/kinode.css                                |  2 +-
 .../packages/app_store/ui/src/abis/helpers.ts | 12 ++++-----
 .../packages/app_store/ui/src/abis/index.ts   |  4 +--
 .../app_store/ui/src/pages/PublishPage.tsx    | 20 +++++++-------
 kinode/src/register-ui/src/abis/helpers.ts    | 26 +++++++++----------
 kinode/src/register-ui/src/abis/index.ts      |  4 +--
 .../src/components/EnterKnsName.tsx           |  6 ++---
 .../register-ui/src/pages/CommitDotOsName.tsx |  2 +-
 .../register-ui/src/pages/ImportKeyfile.tsx   |  6 ++---
 .../src/register-ui/src/pages/KinodeHome.tsx  | 12 ++++-----
 kinode/src/register-ui/src/pages/Login.tsx    |  4 +--
 .../src/register-ui/src/pages/MintCustom.tsx  |  3 +++
 .../register-ui/src/pages/MintDotOsName.tsx   |  6 ++---
 .../src/register-ui/src/pages/SetPassword.tsx | 12 ++++-----
 14 files changed, 61 insertions(+), 58 deletions(-)

diff --git a/css/kinode.css b/css/kinode.css
index 9c61482dd..c1911dd44 100644
--- a/css/kinode.css
+++ b/css/kinode.css
@@ -170,7 +170,7 @@ button:disabled {
 }
 
 button.secondary {
-    background-color: white;
+    background-color: light-dark(var(--off-white), var(--off-black));
     color: var(--orange);
     border: 2px solid var(--orange);
 }
diff --git a/kinode/packages/app_store/ui/src/abis/helpers.ts b/kinode/packages/app_store/ui/src/abis/helpers.ts
index 099227f2f..9917108e6 100644
--- a/kinode/packages/app_store/ui/src/abis/helpers.ts
+++ b/kinode/packages/app_store/ui/src/abis/helpers.ts
@@ -1,9 +1,9 @@
-import { multicallAbi, kinomapAbi, mechAbi, KINOMAP, MULTICALL, KINO_ACCOUNT_IMPL } from "./";
+import { multicallAbi, kimapAbi, mechAbi, KIMAP, MULTICALL, KINO_ACCOUNT_IMPL } from "./";
 import { encodeFunctionData, encodePacked, stringToHex } from "viem";
 
 export function encodeMulticalls(metadataUri: string, metadataHash: string) {
     const metadataHashCall = encodeFunctionData({
-        abi: kinomapAbi,
+        abi: kimapAbi,
         functionName: 'note',
         args: [
             encodePacked(["bytes"], [stringToHex("~metadata-hash")]),
@@ -12,7 +12,7 @@ export function encodeMulticalls(metadataUri: string, metadataHash: string) {
     })
 
     const metadataUriCall = encodeFunctionData({
-        abi: kinomapAbi,
+        abi: kimapAbi,
         functionName: 'note',
         args: [
             encodePacked(["bytes"], [stringToHex("~metadata-uri")]),
@@ -21,8 +21,8 @@ export function encodeMulticalls(metadataUri: string, metadataHash: string) {
     })
 
     const calls = [
-        { target: KINOMAP, callData: metadataHashCall },
-        { target: KINOMAP, callData: metadataUriCall },
+        { target: KIMAP, callData: metadataHashCall },
+        { target: KIMAP, callData: metadataUriCall },
     ];
 
     const multicall = encodeFunctionData({
@@ -46,7 +46,7 @@ export function encodeIntoMintCall(multicalls: `0x${string}`, our_address: `0x${
     });
 
     const mintCall = encodeFunctionData({
-        abi: kinomapAbi,
+        abi: kimapAbi,
         functionName: 'mint',
         args: [
             our_address,
diff --git a/kinode/packages/app_store/ui/src/abis/index.ts b/kinode/packages/app_store/ui/src/abis/index.ts
index 9bab299de..d54a900f5 100644
--- a/kinode/packages/app_store/ui/src/abis/index.ts
+++ b/kinode/packages/app_store/ui/src/abis/index.ts
@@ -2,7 +2,7 @@ import { parseAbi } from "viem";
 
 export { encodeMulticalls, encodeIntoMintCall } from "./helpers";
 
-export const KINOMAP: `0x${string}` = "0xAfA2e57D3cBA08169b416457C14eBA2D6021c4b5";
+export const KIMAP: `0x${string}` = "0xAfA2e57D3cBA08169b416457C14eBA2D6021c4b5";
 export const MULTICALL: `0x${string}` = "0xcA11bde05977b3631167028862bE2a173976CA11";
 export const KINO_ACCOUNT_IMPL: `0x${string}` = "0xd30217e86A4910f4D7cB3E73fC3CfD28a2C33e4e";
 
@@ -12,7 +12,7 @@ export const multicallAbi = parseAbi([
     `struct Call { address target; bytes callData; }`,
 ]);
 
-export const kinomapAbi = parseAbi([
+export const kimapAbi = parseAbi([
     "function mint(address, bytes calldata, bytes calldata, bytes calldata, address) external returns (address tba)",
     "function note(bytes calldata,bytes calldata) external returns (bytes32)",
     "function get(bytes32 node) external view returns (address tokenBoundAccount, address tokenOwner, bytes memory note)",
diff --git a/kinode/packages/app_store/ui/src/pages/PublishPage.tsx b/kinode/packages/app_store/ui/src/pages/PublishPage.tsx
index 16bf642e6..57fa0a05d 100644
--- a/kinode/packages/app_store/ui/src/pages/PublishPage.tsx
+++ b/kinode/packages/app_store/ui/src/pages/PublishPage.tsx
@@ -3,7 +3,7 @@ import { useLocation } from "react-router-dom";
 import { useAccount, useWriteContract, useWaitForTransactionReceipt, usePublicClient } from 'wagmi'
 import { ConnectButton, useConnectModal } from '@rainbow-me/rainbowkit';
 import { keccak256, toBytes } from 'viem';
-import { mechAbi, KINOMAP, encodeIntoMintCall, encodeMulticalls, kinomapAbi, MULTICALL } from "../abis";
+import { mechAbi, KIMAP, encodeIntoMintCall, encodeMulticalls, kimapAbi, MULTICALL } from "../abis";
 import { kinohash } from '../utils/kinohash';
 import useAppsStore from "../store";
 import { AppInfo } from "../types/Apps";
@@ -71,8 +71,8 @@ export default function PublishPage() {
       try {
         // Check if the package already exists and get its TBA
         let data = await publicClient.readContract({
-          abi: kinomapAbi,
-          address: KINOMAP,
+          abi: kimapAbi,
+          address: KIMAP,
           functionName: 'get',
           args: [kinohash(`${packageName}.${publisherId}`)]
         });
@@ -84,8 +84,8 @@ export default function PublishPage() {
         // If the package doesn't exist, check for the publisher's TBA
         if (!currentTBA) {
           data = await publicClient.readContract({
-            abi: kinomapAbi,
-            address: KINOMAP,
+            abi: kimapAbi,
+            address: KIMAP,
             functionName: 'get',
             args: [kinohash(publisherId)]
           });
@@ -108,10 +108,10 @@ export default function PublishPage() {
 
         writeContract({
           abi: mechAbi,
-          address: currentTBA || KINOMAP,
+          address: currentTBA || KIMAP,
           functionName: 'execute',
           args: [
-            isUpdate ? MULTICALL : KINOMAP,
+            isUpdate ? MULTICALL : KIMAP,
             BigInt(0),
             args,
             isUpdate ? 1 : 0
@@ -141,8 +141,8 @@ export default function PublishPage() {
         }
 
         const data = await publicClient.readContract({
-          abi: kinomapAbi,
-          address: KINOMAP,
+          abi: kimapAbi,
+          address: KIMAP,
           functionName: 'get',
           args: [kinohash(`${packageName}.${publisherName}`)]
         });
@@ -161,7 +161,7 @@ export default function PublishPage() {
           address: tba as `0x${string}`,
           functionName: 'execute',
           args: [
-            KINOMAP,
+            KIMAP,
             BigInt(0),
             multicall,
             1
diff --git a/kinode/src/register-ui/src/abis/helpers.ts b/kinode/src/register-ui/src/abis/helpers.ts
index 7846b29b9..f96fdc965 100644
--- a/kinode/src/register-ui/src/abis/helpers.ts
+++ b/kinode/src/register-ui/src/abis/helpers.ts
@@ -2,7 +2,7 @@
 import { NetworkingInfo } from "../lib/types";
 import { kinohash } from "../utils/kinohash";
 import { ipToBytes, portToBytes } from "../utils/kns_encoding";
-import { multicallAbi, kinomapAbi, mechAbi, KINOMAP, MULTICALL } from "./";
+import { multicallAbi, kimapAbi, mechAbi, KIMAP, MULTICALL } from "./";
 import { encodeFunctionData, encodePacked, stringToHex, bytesToHex } from "viem";
 
 // Function to encode router names into keccak256 hashes
@@ -58,7 +58,7 @@ export const generateNetworkingKeys = async ({
     console.log("networking_key: ", networking_key);
 
     const netkeycall = encodeFunctionData({
-        abi: kinomapAbi,
+        abi: kimapAbi,
         functionName: 'note',
         args: [
             encodePacked(["bytes"], [stringToHex("~net-key")]),
@@ -68,7 +68,7 @@ export const generateNetworkingKeys = async ({
 
     const ws_port_call =
         encodeFunctionData({
-            abi: kinomapAbi,
+            abi: kimapAbi,
             functionName: 'note',
             args: [
                 encodePacked(["bytes"], [stringToHex("~ws-port")]),
@@ -78,7 +78,7 @@ export const generateNetworkingKeys = async ({
 
     const tcp_port_call =
         encodeFunctionData({
-            abi: kinomapAbi,
+            abi: kimapAbi,
             functionName: 'note',
             args: [
                 encodePacked(["bytes"], [stringToHex("~tcp-port")]),
@@ -88,7 +88,7 @@ export const generateNetworkingKeys = async ({
 
     const ip_address_call =
         encodeFunctionData({
-            abi: kinomapAbi,
+            abi: kimapAbi,
             functionName: 'note',
             args: [
                 encodePacked(["bytes"], [stringToHex("~ip")]),
@@ -100,7 +100,7 @@ export const generateNetworkingKeys = async ({
 
     const router_call =
         encodeFunctionData({
-            abi: kinomapAbi,
+            abi: kimapAbi,
             functionName: 'note',
             args: [
                 encodePacked(["bytes"], [stringToHex("~routers")]),
@@ -111,13 +111,13 @@ export const generateNetworkingKeys = async ({
         });
 
     const calls = direct ? [
-        { target: KINOMAP, callData: netkeycall },
-        { target: KINOMAP, callData: ws_port_call },
-        { target: KINOMAP, callData: tcp_port_call },
-        { target: KINOMAP, callData: ip_address_call },
+        { target: KIMAP, callData: netkeycall },
+        { target: KIMAP, callData: ws_port_call },
+        { target: KIMAP, callData: tcp_port_call },
+        { target: KIMAP, callData: ip_address_call },
     ] : [
-        { target: KINOMAP, callData: netkeycall },
-        { target: KINOMAP, callData: router_call },
+        { target: KIMAP, callData: netkeycall },
+        { target: KIMAP, callData: router_call },
     ];
 
     const multicalls = encodeFunctionData({
@@ -143,7 +143,7 @@ export const generateNetworkingKeys = async ({
 
     // to mint a subname of your own, you would do something like this.
     // const mintCall = encodeFunctionData({
-    //     abi: kinomapAbi,
+    //     abi: kimapAbi,
     //     functionName: 'mint',
     //     args: [
     //         our_address,
diff --git a/kinode/src/register-ui/src/abis/index.ts b/kinode/src/register-ui/src/abis/index.ts
index 2a7430f3d..bffab2480 100644
--- a/kinode/src/register-ui/src/abis/index.ts
+++ b/kinode/src/register-ui/src/abis/index.ts
@@ -3,7 +3,7 @@ import { parseAbi } from "viem";
 export { generateNetworkingKeys } from "./helpers";
 
 // move to constants? // also for anvil/optimism
-export const KINOMAP: `0x${string}` = "0xcA92476B2483aBD5D82AEBF0b56701Bb2e9be658";
+export const KIMAP: `0x${string}` = "0xcA92476B2483aBD5D82AEBF0b56701Bb2e9be658";
 export const MULTICALL: `0x${string}` = "0xcA11bde05977b3631167028862bE2a173976CA11";
 export const KINO_ACCOUNT_IMPL: `0x${string}` = "0x38766C70a4FB2f23137D9251a1aA12b1143fC716";
 export const DOTOS: `0x${string}` = "0x9BD054E4c7753791FA0C138b9713319F62ed235D";
@@ -13,7 +13,7 @@ export const multicallAbi = parseAbi([
     `struct Call { address target; bytes callData; }`,
 ]);
 
-export const kinomapAbi = parseAbi([
+export const kimapAbi = parseAbi([
     "function mint(address, bytes calldata, bytes calldata, bytes calldata, address) external returns (address tba)",
     "function note(bytes calldata,bytes calldata) external returns (bytes32)",
     "function get(bytes32 node) external view returns (address tokenBoundAccount, address tokenOwner, bytes memory note)",
diff --git a/kinode/src/register-ui/src/components/EnterKnsName.tsx b/kinode/src/register-ui/src/components/EnterKnsName.tsx
index 952e2614f..61bcd07de 100644
--- a/kinode/src/register-ui/src/components/EnterKnsName.tsx
+++ b/kinode/src/register-ui/src/components/EnterKnsName.tsx
@@ -3,7 +3,7 @@ import isValidDomain from "is-valid-domain";
 import { toAscii } from "idna-uts46-hx";
 import { usePublicClient } from 'wagmi'
 
-import { KINOMAP, kinomapAbi } from '../abis'
+import { KIMAP, kimapAbi } from '../abis'
 import { kinohash } from "../utils/kinohash";
 
 export const NAME_URL = "Name must contain only valid characters (a-z, 0-9, and -)";
@@ -80,8 +80,8 @@ function EnterKnsName({
             // maybe separate into helper function for readability?
             // also note picking the right chain ID & address!
             const data = await client?.readContract({
-              address: KINOMAP,
-              abi: kinomapAbi,
+              address: KIMAP,
+              abi: kimapAbi,
               functionName: "get",
               args: [namehash]
             })
diff --git a/kinode/src/register-ui/src/pages/CommitDotOsName.tsx b/kinode/src/register-ui/src/pages/CommitDotOsName.tsx
index 836aca21f..f6c8ee24d 100644
--- a/kinode/src/register-ui/src/pages/CommitDotOsName.tsx
+++ b/kinode/src/register-ui/src/pages/CommitDotOsName.tsx
@@ -102,7 +102,7 @@ function CommitDotOsName({
                             <>
                                 <h3 className="form-label">
                                     <Tooltip text="Kinodes need an onchain node identity in order to communicate with other nodes in the network.">
-                                        Choose a name for your computer
+                                        Choose a name for your node
                                     </Tooltip>
                                 </h3>
                                 <EnterKnsName {...enterOsNameProps} />
diff --git a/kinode/src/register-ui/src/pages/ImportKeyfile.tsx b/kinode/src/register-ui/src/pages/ImportKeyfile.tsx
index 79b2491fa..4021e9544 100644
--- a/kinode/src/register-ui/src/pages/ImportKeyfile.tsx
+++ b/kinode/src/register-ui/src/pages/ImportKeyfile.tsx
@@ -118,13 +118,13 @@ function ImportKeyfile({
                 required
                 minLength={6}
                 name="password"
-                placeholder="Min 6 characters"
+                placeholder=""
                 value={pw}
                 onChange={(e) => setPw(e.target.value)}
               />
               {pwErr && <p className="error-message">{pwErr}</p>}
               {pwDebounced && !pwVet && 6 <= pw.length && (
-                <p className="error-message">Password is incorrect</p>
+                <p className="error-message">Password is incorrect!</p>
               )}
             </div>
 
@@ -132,7 +132,7 @@ function ImportKeyfile({
               {keyErrs.map((x, i) => (
                 <p key={i} className="error-message">{x}</p>
               ))}
-              <button type="submit" className="button">Import Keyfile</button>
+              <button type="submit" className="button">Boot Node</button>
             </div>
             <p className="text-sm mt-2">
               Please note: if the original node was booted as a direct node
diff --git a/kinode/src/register-ui/src/pages/KinodeHome.tsx b/kinode/src/register-ui/src/pages/KinodeHome.tsx
index 172909f7a..621cef203 100644
--- a/kinode/src/register-ui/src/pages/KinodeHome.tsx
+++ b/kinode/src/register-ui/src/pages/KinodeHome.tsx
@@ -27,12 +27,12 @@ function KinodeHome({ knsName }: OsHomeProps) {
                         {previouslyBooted ? (
                             <div className="text-center">
                                 <h2 className="mb-2">Welcome back!</h2>
-                                <button onClick={loginRedir} className="button">Login</button>
+                                <button onClick={loginRedir} className="button">Log in</button>
                             </div>
                         ) : (
                             <>
                                 <h2 className="text-center mb-2">Welcome to Kinode</h2>
-                                <h4 className="text-center mb-2">New here? Register a username to get started</h4>
+                                <h4 className="text-center mb-2">New here? Register a name to get started</h4>
                                 <div className="button-group">
                                     <button onClick={registerRedir} className="button">
                                         Register .os Name
@@ -40,14 +40,14 @@ function KinodeHome({ knsName }: OsHomeProps) {
                                 </div>
                                 <h4 className="text-center mt-2 mb-2">Other options</h4>
                                 <div className="button-group">
-                                    <button onClick={resetRedir} className="button secondary">
-                                        Reset Kinode Name
-                                    </button>
                                     <button onClick={importKeyfileRedir} className="button secondary">
                                         Import Keyfile
                                     </button>
+                                    <button onClick={resetRedir} className="button secondary">
+                                        Reset Existing Name
+                                    </button>
                                     <button onClick={customRegisterRedir} className="button secondary">
-                                        Register non-.os Name (Advanced)
+                                        Register Non-.os Name (Advanced)
                                     </button>
                                 </div>
                             </>
diff --git a/kinode/src/register-ui/src/pages/Login.tsx b/kinode/src/register-ui/src/pages/Login.tsx
index 719b05140..f8a22c8dc 100644
--- a/kinode/src/register-ui/src/pages/Login.tsx
+++ b/kinode/src/register-ui/src/pages/Login.tsx
@@ -115,14 +115,14 @@ function Login({
             </div>
           )}
 
-          <button type="submit">Login</button>
+          <button type="submit">Log in</button>
 
           <div className="additional-options">
             <button
               className="secondary"
               onClick={() => navigate('/reset')}
             >
-              Reset Node & Networking Info
+              Reset Password & Networking Info
             </button>
           </div>
         </form>
diff --git a/kinode/src/register-ui/src/pages/MintCustom.tsx b/kinode/src/register-ui/src/pages/MintCustom.tsx
index b2580f623..6ab4b9f46 100644
--- a/kinode/src/register-ui/src/pages/MintCustom.tsx
+++ b/kinode/src/register-ui/src/pages/MintCustom.tsx
@@ -125,6 +125,9 @@ function MintCustom({
                             <Loader msg={isConfirming ? 'Minting name...' : 'Please confirm the transaction in your wallet'} />
                         ) : (
                             <>
+                                <p className="form-label">
+                                    Register a name on a different top-level zone -- this will likely fail if that zone's requirements are not met
+                                </p>
                                 <input type="text" name="name" placeholder="Enter kimap name" />
                                 <input type="text" name="full-kns-name" placeholder="Enter full KNS name" />
                                 <input type="text" name="tba" placeholder="Enter TBA to mint under" />
diff --git a/kinode/src/register-ui/src/pages/MintDotOsName.tsx b/kinode/src/register-ui/src/pages/MintDotOsName.tsx
index c95c8362c..246521725 100644
--- a/kinode/src/register-ui/src/pages/MintDotOsName.tsx
+++ b/kinode/src/register-ui/src/pages/MintDotOsName.tsx
@@ -116,19 +116,19 @@ function MintDotOsName({
         {
           <form className="form" onSubmit={handleMint}>
             {isPending || isConfirming ? (
-              <Loader msg={isConfirming ? 'Minting .os name...' : 'Please confirm the transaction in your wallet'} />
+              <Loader msg={isConfirming ? 'Minting name...' : 'Please confirm the transaction in your wallet'} />
             ) : (
               <>
                 <div className="button-group">
                   <button type="submit" className="button">
-                    Mint pre-committed .os name
+                    Mint name {knsName}
                   </button>
                 </div>
               </>
             )}
             {isError && (
               <p className="error-message">
-                Error: {error?.message || 'There was an error minting your dot-os-name, please try again.'}
+                Error: {error?.message || 'There was an error minting your name, please try again.'}
               </p>
             )}
           </form>
diff --git a/kinode/src/register-ui/src/pages/SetPassword.tsx b/kinode/src/register-ui/src/pages/SetPassword.tsx
index 285e3536b..279a1732a 100644
--- a/kinode/src/register-ui/src/pages/SetPassword.tsx
+++ b/kinode/src/register-ui/src/pages/SetPassword.tsx
@@ -4,7 +4,7 @@ import { downloadKeyfile } from "../utils/download-keyfile";
 import { Tooltip } from "../components/Tooltip";
 import { sha256, toBytes } from "viem";
 import { useSignTypedData, useAccount, useChainId } from 'wagmi'
-import { KINOMAP } from "../abis";
+import { KIMAP } from "../abis";
 
 type SetPasswordProps = {
   direct: boolean;
@@ -61,7 +61,7 @@ function SetPassword({
             name: "Kimap",
             version: "1",
             chainId: chainId,
-            verifyingContract: KINOMAP,
+            verifyingContract: KIMAP,
           },
           types: {
             Boot: [
@@ -131,8 +131,8 @@ function SetPassword({
       ) : (
         <form className="form" onSubmit={handleSubmit}>
           <div className="form-group">
-            <Tooltip text="This password will be used to log in if you restart your node or switch browsers.">
-              <label className="form-label" htmlFor="password">New Password</label>
+            <Tooltip text="This password will be used to log in when you restart your node or switch browsers.">
+              <label className="form-label" htmlFor="password">Set Password</label>
             </Tooltip>
             <input
               type="password"
@@ -140,7 +140,7 @@ function SetPassword({
               required
               minLength={6}
               name="password"
-              placeholder="Min 6 characters"
+              placeholder="6 characters minimum"
               value={pw}
               onChange={(e) => setPw(e.target.value)}
               autoFocus
@@ -154,7 +154,7 @@ function SetPassword({
               required
               minLength={6}
               name="confirm-password"
-              placeholder="Min 6 characters"
+              placeholder="6 characters minimum"
               value={pw2}
               onChange={(e) => setPw2(e.target.value)}
             />

From 50c752455a70d56108494695196b26fa3fd04cfb Mon Sep 17 00:00:00 2001
From: dr-frmr <docterformer@protonmail.com>
Date: Wed, 14 Aug 2024 00:07:37 +0300
Subject: [PATCH 6/6] style fixes

---
 kinode/src/register-ui/src/index.css                 | 1 +
 kinode/src/register-ui/src/pages/CommitDotOsName.tsx | 9 +++++----
 kinode/src/register-ui/src/pages/MintDotOsName.tsx   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/kinode/src/register-ui/src/index.css b/kinode/src/register-ui/src/index.css
index e6fad2cae..6a14edeb7 100644
--- a/kinode/src/register-ui/src/index.css
+++ b/kinode/src/register-ui/src/index.css
@@ -150,6 +150,7 @@
 .error-message {
     color: var(--ansi-red);
     margin-top: 0.5rem;
+    overflow-wrap: break-word;
 }
 
 .direct-checkbox {
diff --git a/kinode/src/register-ui/src/pages/CommitDotOsName.tsx b/kinode/src/register-ui/src/pages/CommitDotOsName.tsx
index f6c8ee24d..8cb8b97ef 100644
--- a/kinode/src/register-ui/src/pages/CommitDotOsName.tsx
+++ b/kinode/src/register-ui/src/pages/CommitDotOsName.tsx
@@ -97,7 +97,7 @@ function CommitDotOsName({
                 {
                     <form className="form" onSubmit={handleCommit}>
                         {isPending || isConfirming ? (
-                            <Loader msg={isConfirming ? 'Pre-committing to chosen ID...' : 'Please confirm the transaction in your wallet'} />
+                            <Loader msg={isConfirming ? 'Pre-committing to chosen name...' : 'Please confirm the transaction in your wallet'} />
                         ) : (
                             <>
                                 <h3 className="form-label">
@@ -113,17 +113,18 @@ function CommitDotOsName({
                                         type="submit"
                                         className="button"
                                     >
-                                        Register .os name
+                                        Register name
                                     </button>
+                                    <p>This will confirm availability of the name and reserve it, then on the next screen you will be prompted to mint.</p>
                                     <Link to="/reset" className="button secondary">
-                                        Already have a dot-os-name?
+                                        Already have a node?
                                     </Link>
                                 </div>
                             </>
                         )}
                         {isError && (
                             <p className="error-message">
-                                Error: {error?.message || 'There was an error registering your dot-os-name, please try again.'}
+                                Error: {error?.message || 'There was an error registering your name, please try again.'}
                             </p>
                         )}
                     </form>
diff --git a/kinode/src/register-ui/src/pages/MintDotOsName.tsx b/kinode/src/register-ui/src/pages/MintDotOsName.tsx
index 246521725..a60e14bb0 100644
--- a/kinode/src/register-ui/src/pages/MintDotOsName.tsx
+++ b/kinode/src/register-ui/src/pages/MintDotOsName.tsx
@@ -121,7 +121,7 @@ function MintDotOsName({
               <>
                 <div className="button-group">
                   <button type="submit" className="button">
-                    Mint name {knsName}
+                    Mint {knsName}
                   </button>
                 </div>
               </>