Merge pull request #2074 from JoinColony/fix/token-move-dialog

Fix Token Move Dialog

Author: rdig

src/modules/admin/components/Tokens/TokensMoveDialog.tsx

@@ -14,8 +14,8 @@ import { useColonyTokensQuery } from '~data/index';
 import DialogForm from './TokensMoveDialogForm';
 
 export interface FormValues {
-  fromDomain?: number;
-  toDomain?: number;
+  fromDomain?: string;
+  toDomain?: string;
   amount: string;
   tokenAddress?: Address;
 }
@@ -60,7 +60,13 @@ const TokensMoveDialog = ({
         // Convert amount string with decimals to BigInt (eth to wei)
         const amount = new BigNumber(moveDecimal(payload.amount, decimals));
 
-        return { ...payload, colonyAddress, amount };
+        return {
+          ...payload,
+          colonyAddress,
+          amount,
+          fromDomain: parseInt(payload.fromDomain, 10),
+          toDomain: parseInt(payload.toDomain, 10),
+        };
       }),
       withKey(colonyAddress),
     ),

src/modules/admin/components/Tokens/TokensMoveDialogForm.tsx

@@ -89,6 +89,14 @@ const TokensMoveDialogForm = ({
   tokens,
   values,
 }: Props & FormikProps<FormValues>) => {
+  const { tokenAddress, amount } = values;
+  const fromDomain = values.fromDomain
+    ? parseInt(values.fromDomain, 10)
+    : ROOT_DOMAIN;
+  const toDomain = values.toDomain
+    ? parseInt(values.toDomain, 10)
+    : ROOT_DOMAIN;
+
   const selectedToken = useMemo(
     () => tokens.find(token => token.address === values.tokenAddress),
     [tokens, values.tokenAddress],
@@ -113,13 +121,13 @@ const TokensMoveDialogForm = ({
 
   const fromDomainRoles = useTransformer(getUserRoles, [
     domains,
-    values.fromDomain || ROOT_DOMAIN,
+    fromDomain,
     walletAddress,
   ]);
 
   const toDomainRoles = useTransformer(getUserRoles, [
     domains,
-    values.toDomain || ROOT_DOMAIN,
+    toDomain,
     walletAddress,
   ]);
 
@@ -136,12 +144,6 @@ const TokensMoveDialogForm = ({
     [domains],
   );
 
-  const {
-    fromDomain = ROOT_DOMAIN,
-    toDomain = ROOT_DOMAIN,
-    tokenAddress,
-    amount,
-  } = values;
   const [
     loadTokenBalances,
     { data: tokenBalancesData },