From 6d714d95571edf20dd1476cf052ad5a265eeeea5 Mon Sep 17 00:00:00 2001
From: William Martin <williamajmartin@gmail.com>
Date: Tue, 31 Jan 2023 12:12:39 +0100
Subject: [PATCH] Misc: tidy

---
 src/Entry.tsx                                 |  4 +---
 .../shared/Fields/InputLabel/InputLabel.tsx   | 20 +++++++-----------
 src/utils/web3/index.ts                       | 21 ++++++-------------
 3 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/Entry.tsx b/src/Entry.tsx
index 9122886856a..c84517cbe81 100644
--- a/src/Entry.tsx
+++ b/src/Entry.tsx
@@ -8,14 +8,13 @@ import layout from '~styles/layout.css';
 import '~utils/yup/customMethods'; // ensures custom yup methods are available when components load
 import { DialogProvider } from '~shared/Dialog';
 // import { TokenActivationProvider } from '~users/TokenActivationProvider';
+import { AppContextProvider, getContext, ContextModule } from '~context';
 
 import messages from './i18n/en.json';
 import actionMessages from './i18n/en-actions';
 import eventsMessages from './i18n/en-events';
-import motionMessages from './i18n/en-motions';
 import systemMessages from './i18n/en-system-messages';
 import Routes from './routes';
-import { AppContextProvider, getContext, ContextModule } from '~context';
 
 // @ts-ignore
 if (!Intl.RelativeTimeFormat) {
@@ -41,7 +40,6 @@ const Entry = ({ store }: Props) => {
         ...actionMessages,
         ...eventsMessages,
         ...systemMessages,
-        ...motionMessages,
       }}
     >
       <ApolloProvider client={apolloClient}>
diff --git a/src/components/shared/Fields/InputLabel/InputLabel.tsx b/src/components/shared/Fields/InputLabel/InputLabel.tsx
index 4466642d297..0d734a7431f 100644
--- a/src/components/shared/Fields/InputLabel/InputLabel.tsx
+++ b/src/components/shared/Fields/InputLabel/InputLabel.tsx
@@ -1,8 +1,8 @@
 import React, { ReactNode } from 'react';
-import { MessageDescriptor, useIntl } from 'react-intl';
 
-import { Message, SimpleMessageValues } from '~types';
+import { Message, UniversalMessageValues } from '~types';
 import { getMainClasses } from '~utils/css';
+import { formatText } from '~utils/intl';
 
 import { InputComponentAppearance as Appearance } from '../Input';
 import styles from './InputLabel.css';
@@ -17,10 +17,10 @@ interface Props {
   extra?: ReactNode;
 
   /** Help text (will appear next to label text) */
-  help?: string | MessageDescriptor;
+  help?: Message;
 
   /** Values for help text (react-intl interpolation) */
-  helpValues?: SimpleMessageValues;
+  helpValues?: UniversalMessageValues;
 
   /** `id` attribute value of accompanied input field */
   inputId?: string;
@@ -29,7 +29,7 @@ interface Props {
   label: Message;
 
   /** Values for label text (react-intl interpolation) */
-  labelValues?: SimpleMessageValues;
+  labelValues?: UniversalMessageValues;
 
   /** Should only be visible for screenreaders, but not for display users */
   screenReaderOnly?: boolean;
@@ -45,14 +45,8 @@ const InputLabel = ({
   labelValues,
   screenReaderOnly = false,
 }: Props) => {
-  const { formatMessage } = useIntl();
-
-  const helpText =
-    typeof help === 'object' ? formatMessage(help, helpValues) : help;
-  const labelText =
-    typeof inputLabel === 'object'
-      ? formatMessage(inputLabel, labelValues)
-      : inputLabel;
+  const helpText = formatText(help, helpValues);
+  const labelText = formatText(inputLabel, labelValues);
 
   return (
     <label
diff --git a/src/utils/web3/index.ts b/src/utils/web3/index.ts
index b971419a2cc..90519231e26 100644
--- a/src/utils/web3/index.ts
+++ b/src/utils/web3/index.ts
@@ -1,24 +1,15 @@
 import BN from 'bn.js';
-import { getAddress, hexlify } from 'ethers/lib.esm/utils';
 import { ClientType, TokenClientType } from '@colony/colony-js';
 
-import { Address, ExtendedClientType } from '~types';
+import { ExtendedClientType } from '~types';
 import { TransactionError } from '~redux/immutable/Transaction';
 import { NETWORK_DATA } from '~constants';
 
-export const createAddress = (address: string): Address => getAddress(address);
-
-// @TODO ethers v5 will have an isAddress utility function
-export const isAddress = (address: string) => {
-  try {
-    getAddress(address);
-  } catch {
-    return false;
-  }
-  return true;
-};
-
-export const toHex = hexlify;
+export {
+  isAddress,
+  hexlify as toHex,
+  getAddress as createAddress,
+} from 'ethers/lib.esm/utils';
 
 export type Unit =
   | 'noether'