settings: network preferences

src/components/Dashboard/Balance.js

@@ -47,7 +47,7 @@ const Balance = React.memo(function Balance({
         `}
       >
         {loading ? (
-          <Loading height={150} />
+          <Loading height={86} />
         ) : (
           <animated.div
             style={springProps}

src/components/GlobalPreferences/Network/Network.js

@@ -64,7 +64,7 @@ function Network() {
                   )}`
                 }
                 if (networkError instanceof InvalidURI) {
-                  return 'Must provide WebSocket endpoint to node'
+                  return 'Must provide Http endpoint to node'
                 }
                 if (networkError instanceof NoConnection) {
                   return 'Could not connect to node'

src/hooks/useCourtContracts.js

@@ -65,14 +65,6 @@ function useCourtContract(moduleType, abi) {
   return useContract(contractAddress, abi)
 }
 
-function useCourtContractReadOnly(moduleType, abi) {
-  const { modules } = useCourtConfig()
-
-  const contractAddress = getModuleAddress(modules, moduleType)
-
-  return useContractReadOnly(contractAddress, abi)
-}
-
 /**
  * All ANJ interactions
  * @returns {Object} all available functions around ANJ balances
@@ -633,57 +625,3 @@ export function useTotalANTStakedPolling(timeout = 1000) {
 
   return [totalANTStaked, error]
 }
-
-export function useTotalANTStaked() {
-  const [totalANTStaked, setTotalANTStaked] = useState(bigNum(-1))
-
-  const jurorRegistryContract = useCourtContractReadOnly(
-    CourtModuleType.JurorsRegistry,
-    jurorRegistryAbi
-  )
-  useEffect(() => {
-    if (!jurorRegistryContract) {
-      return
-    }
-    const getTotalANTStaked = async () => {
-      retryMax(() => jurorRegistryContract.totalStaked())
-        .then(totalStaked => {
-          setTotalANTStaked(totalStaked)
-        })
-        .catch(err => {
-          console.error(`Error fetching ANT staked: ${err}`)
-        })
-    }
-
-    getTotalANTStaked()
-  }, [jurorRegistryContract])
-
-  return totalANTStaked
-}
-
-export function useTotalActiveBalance() {
-  const [totalActiveBalance, setTotalActiveBalance] = useState(bigNum(-1))
-  const jurorRegistryContract = useCourtContractReadOnly(
-    CourtModuleType.JurorsRegistry,
-    jurorRegistryAbi
-  )
-
-  useEffect(() => {
-    if (!jurorRegistryContract) {
-      return
-    }
-    const getTotalActiveBalance = async () => {
-      retryMax(() => jurorRegistryContract.totalActiveBalance())
-        .then(totalActive => {
-          setTotalActiveBalance(totalActive)
-        })
-        .catch(err => {
-          console.error(`Error fetching ANT staked: ${err}`)
-        })
-    }
-
-    getTotalActiveBalance()
-  }, [jurorRegistryContract])
-
-  return totalActiveBalance
-}

src/lib/web3-utils.js

@@ -9,7 +9,7 @@ export const ETH_FAKE_ADDRESS = `0x${''.padEnd(40, '0')}`
 
 const ETH_ADDRESS_SPLIT_REGEX = /(0x[a-fA-F0-9]{40}(?:\b|\.|,|\?|!|;))/g
 const ETH_ADDRESS_TEST_REGEX = /(0x[a-fA-F0-9]{40}(?:\b|\.|,|\?|!|;))/g
-const websocketRegex = /^wss?:\/\/.+/
+const httpRegex = /^(http|https):\/\//
 
 export function getFunctionSignature(func) {
   return keccak256(func).slice(0, 10)
@@ -172,10 +172,9 @@ export function transformAddresses(str, callback) {
 export async function checkValidEthNode(uri) {
   // Must be websocket connection
   const isLocalOrUnknown = isLocalOrUnknownNetwork(env('CHAIN_ID'))
-  if (!isLocalOrUnknown) {
-    if (!websocketRegex.test(uri)) {
-      throw new InvalidURI('The URI must use the WebSocket protocol')
-    }
+
+  if (!httpRegex.test(uri)) {
+    throw new InvalidURI('The URI must use the Http protocol')
   }
 
   try {