From c2192fc86e181d1ea97a76f7687148061eeefe1e Mon Sep 17 00:00:00 2001
From: mannynotfound <manny@art404.com>
Date: Mon, 3 Oct 2022 10:04:18 -0700
Subject: [PATCH 1/3] update any instance of address validation to use
 InputAddress

---
 .../client/src/components/SafeContacts.js     |  1 +
 packages/client/src/components/SafeOwners.js  | 48 +++++--------------
 .../components/Assets/AddCollection.js        |  1 +
 .../components/Owners/AddSafeOwner.js         | 42 +++++-----------
 .../src/library/components/InputAddress.js    | 19 ++++++--
 packages/client/src/pages/CreateSafe.js       | 42 ++++------------
 packages/client/src/pages/LoadSafe.js         | 47 +++++-------------
 7 files changed, 62 insertions(+), 138 deletions(-)

diff --git a/packages/client/src/components/SafeContacts.js b/packages/client/src/components/SafeContacts.js
index c4e1e2f..cedc610 100644
--- a/packages/client/src/components/SafeContacts.js
+++ b/packages/client/src/components/SafeContacts.js
@@ -44,6 +44,7 @@ function EditContactModal({
             value={currentAddr}
             isValid={addressValid}
             onChange={onAddressChange}
+            className="mt-2"
           />
           {!addressNew && (
             <p className="has-text-red mt-2">
diff --git a/packages/client/src/components/SafeOwners.js b/packages/client/src/components/SafeOwners.js
index e426d2d..c4efd9a 100644
--- a/packages/client/src/components/SafeOwners.js
+++ b/packages/client/src/components/SafeOwners.js
@@ -1,21 +1,18 @@
 import React from 'react';
+import { InputAddress } from 'library/components';
 import Svg from 'library/Svg';
 
-function SafeOwners({
-  address,
-  safeOwners,
-  safeOwnersValidByAddress,
-  setSafeOwners,
-}) {
+function SafeOwners({ address, safeOwners, setSafeOwners }) {
   const onOwnerNameChange = (value, idx) => {
     const newOwners = safeOwners.slice(0);
     newOwners[idx].name = value;
     setSafeOwners([...newOwners]);
   };
 
-  const onOwnerAddressChange = (value, idx) => {
+  const onOwnerAddressChange = (value, isValid, idx) => {
     const newOwners = safeOwners.slice(0);
     newOwners[idx].address = value;
+    newOwners[idx].isValid = isValid;
     setSafeOwners([...newOwners]);
   };
 
@@ -33,18 +30,7 @@ function SafeOwners({
       </div>
       <div className="flex-1 is-flex is-flex-direction-column">
         <label className="has-text-grey mb-2">Owner Address</label>
-        <div style={{ position: 'relative' }}>
-          <input
-            className="p-4 rounded-sm column is-full"
-            type="text"
-            placeholder="Enter user's FLOW address"
-            value={address}
-            disabled
-          />
-          <div style={{ position: 'absolute', right: 17, top: 14 }}>
-            <Svg name="Check" />
-          </div>
-        </div>
+        <InputAddress value={address} isValid readOnly />
       </div>
     </div>,
   ];
@@ -70,22 +56,14 @@ function SafeOwners({
               <span className="has-text-red">*</span>
             </label>
             <div className="is-flex">
-              <div className="flex-1" style={{ position: 'relative' }}>
-                <input
-                  className="p-4 rounded-sm column is-full"
-                  type="text"
-                  placeholder="Enter user's FLOW address"
-                  value={so?.address}
-                  onChange={(e) =>
-                    onOwnerAddressChange(e.target.value, idx + 1)
-                  }
-                />
-                {safeOwnersValidByAddress[so.address] && (
-                  <div style={{ position: 'absolute', right: 17, top: 14 }}>
-                    <Svg name="Check" />
-                  </div>
-                )}
-              </div>
+              <InputAddress
+                className="flex-1"
+                value={so?.address}
+                onChange={({ value, isValid }) =>
+                  onOwnerAddressChange(value, isValid, idx + 1)
+                }
+                isValid={so?.isValid}
+              />
               <button
                 className="button is-border ml-2 p-4"
                 onClick={() => {
diff --git a/packages/client/src/components/SafeSettings/components/Assets/AddCollection.js b/packages/client/src/components/SafeSettings/components/Assets/AddCollection.js
index 47edaf5..6ca3c47 100644
--- a/packages/client/src/components/SafeSettings/components/Assets/AddCollection.js
+++ b/packages/client/src/components/SafeSettings/components/Assets/AddCollection.js
@@ -26,6 +26,7 @@ const AddCollection = ({ onCancel, onNext }) => {
       <div className="p-5 flex-1 is-flex is-flex-direction-column">
         <label className="has-text-grey mb-2">NFT Contract Address</label>
         <InputAddress
+          className="mt-2"
           value={address}
           isValid={addressValid}
           onChange={onAddressChange}
diff --git a/packages/client/src/components/SafeSettings/components/Owners/AddSafeOwner.js b/packages/client/src/components/SafeSettings/components/Owners/AddSafeOwner.js
index 38fdd3e..27a04fe 100644
--- a/packages/client/src/components/SafeSettings/components/Owners/AddSafeOwner.js
+++ b/packages/client/src/components/SafeSettings/components/Owners/AddSafeOwner.js
@@ -1,34 +1,24 @@
-import React, { useContext, useState } from 'react';
+import React, { useState } from 'react';
 import { useModalContext } from 'contexts';
-import { Web3Context } from 'contexts/Web3';
-import { useAddressValidation } from 'hooks';
-import { formatAddress, isAddr } from 'utils';
+import { InputAddress } from 'library/components';
+import { formatAddress } from 'utils';
 import Svg from 'library/Svg';
 import EditThreshold from '../EditThreshold';
 
 const AddSafeOwner = ({ treasury, safeOwners }) => {
-  const web3 = useContext(Web3Context);
   const { openModal, closeModal } = useModalContext();
-  const { isAddressValid } = useAddressValidation(web3.injectedProvider);
   const [name, setName] = useState('');
   const [address, setAddress] = useState('');
   const [addressValid, setAddressValid] = useState(false);
 
   const addressValidClass = addressValid ? 'is-success' : 'is-error';
-  const addrInputClasses = `input p-4 rounded-sm column is-full is-size-6 ${
-    address.length > 0 ? addressValidClass : ''
-  }`;
   const nextButtonClasses = `button flex-1 is-primary ${
     addressValid ? 'has-text-weight-bold' : 'disabled'
   }`;
 
-  const onAddressChange = async (newAddress) => {
-    setAddress(newAddress);
-    const isValid =
-      isAddr(newAddress) &&
-      (await isAddressValid(newAddress)) &&
-      !isAddressExisting(safeOwners, newAddress);
-    setAddressValid(isValid);
+  const onAddressChange = async ({ value, isValid }) => {
+    setAddress(value);
+    setAddressValid(isValid && !isAddressExisting(safeOwners, value));
   };
 
   const isAddressExisting = (safeOwners, newAddress) => {
@@ -57,20 +47,12 @@ const AddSafeOwner = ({ treasury, safeOwners }) => {
             <span className="has-text-red">*</span>{' '}
             <Svg name="QuestionMark" className="ml-1" />
           </label>
-          <div style={{ position: 'relative' }}>
-            <input
-              className={addrInputClasses}
-              type="text"
-              placeholder=""
-              value={address}
-              onChange={(e) => onAddressChange(e.target.value)}
-            />
-            {addressValid && (
-              <div style={{ position: 'absolute', right: 17, top: 19 }}>
-                <Svg name="Check" height="15" width="15" />
-              </div>
-            )}
-          </div>
+          <InputAddress
+            className={addressValidClass}
+            value={address}
+            onChange={onAddressChange}
+            isValid={addressValid}
+          />
         </div>
         <div className="flex-1 is-flex is-flex-direction-column">
           <label className="has-text-grey mb-2 is-flex is-align-items-center">
diff --git a/packages/client/src/library/components/InputAddress.js b/packages/client/src/library/components/InputAddress.js
index 713eeae..83aecb9 100644
--- a/packages/client/src/library/components/InputAddress.js
+++ b/packages/client/src/library/components/InputAddress.js
@@ -4,7 +4,14 @@ import { useAddressValidation } from 'hooks';
 import { formatAddress, isAddr } from 'utils';
 import Svg from 'library/Svg';
 
-const InputAddress = ({ web3, value, isValid, onChange }) => {
+const InputAddress = ({
+  web3,
+  value,
+  isValid,
+  onChange,
+  className = '',
+  readOnly = false,
+}) => {
   const { isAddressValid } = useAddressValidation(web3.injectedProvider);
 
   const onValueChange = async (e) => {
@@ -18,16 +25,20 @@ const InputAddress = ({ web3, value, isValid, onChange }) => {
   };
 
   return (
-    <div className="is-flex">
+    <div className={`is-flex ${className}`}>
       <div className="flex-1" style={{ position: 'relative' }}>
         <input
-          className="border-light rounded-sm column is-full p-2 mt-2"
+          className="border-light rounded-sm column is-full p-4"
           type="text"
           value={value}
           onChange={onValueChange}
+          disabled={readOnly}
         />
         {isValid && (
-          <div style={{ position: 'absolute', right: 17, top: 20 }}>
+          <div
+            className="is-flex is-align-items-center"
+            style={{ position: 'absolute', right: 15, top: 0, height: '100%' }}
+          >
             <Svg name="Check" />
           </div>
         )}
diff --git a/packages/client/src/pages/CreateSafe.js b/packages/client/src/pages/CreateSafe.js
index 421ed57..27e328d 100644
--- a/packages/client/src/pages/CreateSafe.js
+++ b/packages/client/src/pages/CreateSafe.js
@@ -1,22 +1,18 @@
 import React, { useState } from 'react';
 import { NavLink, useHistory } from 'react-router-dom';
-import { Web3Consumer } from '../contexts/Web3';
+import { Web3Consumer } from 'contexts/Web3';
 import {
   Loading,
   SafeDetails,
   SafeOwners,
   SignatureRequirements,
-  WalletPrompt,
-} from '../components';
-import { useAddressValidation } from '../hooks';
-import { SAFE_TYPES } from 'constants/enums';
+} from 'components';
 
 const AuthorizeTreasury = ({
   address,
   safeName,
   safeType,
   safeOwners,
-  safeOwnersValidByAddress,
   createTreasury,
   creatingTreasury,
   createdTreasury,
@@ -25,9 +21,9 @@ const AuthorizeTreasury = ({
   let isAuthorizeReady = false;
   const history = useHistory();
   if (safeName.trim().length && safeType) {
-    const everyOwnerHasValidAddress = Object.values(
-      safeOwnersValidByAddress
-    ).every((isValid) => isValid);
+    const everyOwnerHasValidAddress = safeOwners.every(
+      ({ isValid }) => isValid
+    );
 
     if (everyOwnerHasValidAddress) {
       safeOwners.map((so) => (so.verified = true));
@@ -107,40 +103,20 @@ function CreateSafe({ web3 }) {
   const [signersAmount, setSignersAmount] = useState(1);
   const [creatingTreasury, setCreatingTreasury] = useState(false);
   const [createdTreasury, setCreatedTreasury] = useState(false);
-  const {
-    injectedProvider,
-    address,
-    loadingTreasuries,
-    submittedTransaction,
-    createTreasury,
-  } = web3;
+  const { address, loadingTreasuries, submittedTransaction, createTreasury } =
+    web3;
   const [safeOwners, setSafeOwners] = useState([
     { name: '', address, verified: true },
   ]);
-  const [safeOwnersValidByAddress, setSafeOwnersValidByAddress] = useState({});
-  const { isAddressValid } = useAddressValidation(injectedProvider);
-
-  const checkSafeOwnerAddressesValidity = async (newSafeOwners) => {
-    const newSafeOwnersValidByAddress = {};
-
-    for (const so of newSafeOwners) {
-      newSafeOwnersValidByAddress[so.address] = await isAddressValid(
-        so.address
-      );
-    }
-
-    setSafeOwnersValidByAddress(newSafeOwnersValidByAddress);
-  };
 
   const onSafeOwnersChange = (newSafeOwners) => {
     setSafeOwners(newSafeOwners);
-    // skip first safe owner since it's the connected user and won't have an address
-    checkSafeOwnerAddressesValidity(newSafeOwners.slice(1));
     // force signer amount to not exceed amount of safe owners
     if (newSafeOwners.length < signersAmount) {
       setSignersAmount(newSafeOwners.length);
     }
   };
+
   const onCreateTreasuryClick = async (treasuryData) => {
     setCreatingTreasury(true);
     await createTreasury(treasuryData);
@@ -249,7 +225,6 @@ function CreateSafe({ web3 }) {
       <SafeOwners
         address={address}
         safeOwners={safeOwners}
-        safeOwnersValidByAddress={safeOwnersValidByAddress}
         setSafeOwners={onSafeOwnersChange}
       />
       <SignatureRequirements
@@ -267,7 +242,6 @@ function CreateSafe({ web3 }) {
         safeName={safeName}
         safeType={safeType}
         safeOwners={safeOwners}
-        safeOwnersValidByAddress={safeOwnersValidByAddress}
         signersAmount={signersAmount}
         createTreasury={onCreateTreasuryClick}
         creatingTreasury={creatingTreasury}
diff --git a/packages/client/src/pages/LoadSafe.js b/packages/client/src/pages/LoadSafe.js
index ca0a201..e994afc 100644
--- a/packages/client/src/pages/LoadSafe.js
+++ b/packages/client/src/pages/LoadSafe.js
@@ -2,9 +2,9 @@ import React, { useState } from 'react';
 import { NavLink, useHistory } from 'react-router-dom';
 import { Web3Consumer } from '../contexts/Web3';
 import { WalletPrompt } from '../components';
-import { ProgressBar } from 'library/components';
+import { InputAddress, ProgressBar } from 'library/components';
 import { useAddressValidation } from '../hooks';
-import { getProgressPercentageForSignersAmount, isAddr } from '../utils';
+import { getProgressPercentageForSignersAmount } from '../utils';
 import Svg from 'library/Svg';
 import { isEmpty } from 'lodash';
 
@@ -78,11 +78,10 @@ function LoadSafe({ web3 }) {
     setSafeOwnersValidByAddress(newSafeOwnersValidByAddress);
   };
 
-  const onAddressChange = async (e) => {
-    setSafeAddress(e.target.value);
-    const maybeValid = isAddr(e.target.value);
-    if (maybeValid) {
-      const treasury = await getTreasury(e.target.value);
+  const onAddressChange = async ({ value, isValid }) => {
+    setSafeAddress(value);
+    if (isValid) {
+      const treasury = await getTreasury(value);
       const newSafeOwners = Object.keys(treasury?.signers ?? {}).map(
         (signerAddr) => ({
           name: '',
@@ -142,20 +141,7 @@ function LoadSafe({ web3 }) {
           </div>
           <div className="flex-1 is-flex is-flex-direction-column">
             <label className="has-text-grey mb-2">Owner Address</label>
-            <div style={{ position: 'relative' }}>
-              <input
-                className="p-4 rounded-sm column is-full"
-                type="text"
-                placeholder="Enter user's FLOW address"
-                value={so.address}
-                disabled
-              />
-              {safeOwnersValidByAddress[so.address] && (
-                <div style={{ position: 'absolute', right: 17, top: 14 }}>
-                  <Svg name="Check" />
-                </div>
-              )}
-            </div>
+            <InputAddress value={so.address} readOnly isValid />
           </div>
         </div>
       );
@@ -197,20 +183,11 @@ function LoadSafe({ web3 }) {
             Safe Address
             <span className="has-text-red">*</span>
           </label>
-          <div style={{ position: 'relative' }}>
-            <input
-              className="p-4 rounded-sm column is-full"
-              type="text"
-              placeholder="16-character safe address"
-              value={safeAddress}
-              onChange={onAddressChange}
-            />
-            {!isEmpty(safeOwners) && (
-              <div style={{ position: 'absolute', right: 17, top: 14 }}>
-                <Svg name="Check" />
-              </div>
-            )}
-          </div>
+          <InputAddress
+            value={safeAddress}
+            onChange={onAddressChange}
+            isValid={!isEmpty(safeOwners)}
+          />
         </div>
       </div>
       <div className="column is-flex is-full">

From 19899fafb0a7ae98d0fd80a184531c88779725ba Mon Sep 17 00:00:00 2001
From: mannynotfound <manny@art404.com>
Date: Mon, 3 Oct 2022 12:25:16 -0700
Subject: [PATCH 2/3] input validation color for all

---
 .../SafeSettings/components/Owners/AddSafeOwner.js           | 2 --
 packages/client/src/library/components/InputAddress.js       | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/SafeSettings/components/Owners/AddSafeOwner.js b/packages/client/src/components/SafeSettings/components/Owners/AddSafeOwner.js
index 27a04fe..938dd7e 100644
--- a/packages/client/src/components/SafeSettings/components/Owners/AddSafeOwner.js
+++ b/packages/client/src/components/SafeSettings/components/Owners/AddSafeOwner.js
@@ -11,7 +11,6 @@ const AddSafeOwner = ({ treasury, safeOwners }) => {
   const [address, setAddress] = useState('');
   const [addressValid, setAddressValid] = useState(false);
 
-  const addressValidClass = addressValid ? 'is-success' : 'is-error';
   const nextButtonClasses = `button flex-1 is-primary ${
     addressValid ? 'has-text-weight-bold' : 'disabled'
   }`;
@@ -48,7 +47,6 @@ const AddSafeOwner = ({ treasury, safeOwners }) => {
             <Svg name="QuestionMark" className="ml-1" />
           </label>
           <InputAddress
-            className={addressValidClass}
             value={address}
             onChange={onAddressChange}
             isValid={addressValid}
diff --git a/packages/client/src/library/components/InputAddress.js b/packages/client/src/library/components/InputAddress.js
index 83aecb9..4e41e48 100644
--- a/packages/client/src/library/components/InputAddress.js
+++ b/packages/client/src/library/components/InputAddress.js
@@ -24,11 +24,14 @@ const InputAddress = ({
     onChange({ value: isValid ? formatAddress(value) : value, isValid });
   };
 
+  const addressValidClass = isValid ? "is-success" : "is-error";
+  const inputClassName = value.length ? addressValidClass : "";
+
   return (
     <div className={`is-flex ${className}`}>
       <div className="flex-1" style={{ position: 'relative' }}>
         <input
-          className="border-light rounded-sm column is-full p-4"
+          className={`border-light rounded-sm column is-full p-4 ${inputClassName}`}
           type="text"
           value={value}
           onChange={onValueChange}

From bb2ec7c07712d9f3577f86acbf8c60251628d14e Mon Sep 17 00:00:00 2001
From: manny404 <manny@art404.com>
Date: Wed, 26 Oct 2022 12:10:07 -0400
Subject: [PATCH 3/3] rebase and fix create safe

---
 packages/client/src/pages/CreateSafe.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/pages/CreateSafe.js b/packages/client/src/pages/CreateSafe.js
index 27e328d..bc9e2ca 100644
--- a/packages/client/src/pages/CreateSafe.js
+++ b/packages/client/src/pages/CreateSafe.js
@@ -7,6 +7,7 @@ import {
   SafeOwners,
   SignatureRequirements,
 } from 'components';
+import { SAFE_TYPES } from 'constants/enums';
 
 const AuthorizeTreasury = ({
   address,
@@ -26,7 +27,6 @@ const AuthorizeTreasury = ({
     );
 
     if (everyOwnerHasValidAddress) {
-      safeOwners.map((so) => (so.verified = true));
       isAuthorizeReady = true;
     }
   }
@@ -106,7 +106,7 @@ function CreateSafe({ web3 }) {
   const { address, loadingTreasuries, submittedTransaction, createTreasury } =
     web3;
   const [safeOwners, setSafeOwners] = useState([
-    { name: '', address, verified: true },
+    { name: '', address, isValid: true },
   ]);
 
   const onSafeOwnersChange = (newSafeOwners) => {