Merge pull request #173 from Severino/master

Fixed And Improved Abi Viewer Return Params

src/components/ui/AbiParam.tsx

@@ -0,0 +1,51 @@
+import { Box, TextInput } from "grommet";
+import { palette } from "src/theme";
+import styled from "styled-components";
+
+
+interface IAbiParam {
+    name?: string;
+    readonly?: boolean;
+    type: string;
+    value: string;
+}
+
+const SmallTextInput = styled(TextInput)`
+  font-size: 14px;
+  font-weight: 400;
+
+  ::placeholder {
+    font-size: 14px;
+  }
+`;
+
+const HeaderBox = styled(Box)`
+  font-size:12px;
+`
+const NameLabel = styled.div`
+    color: ${palette.ElectricBlue};
+    margin-right: 20px;
+`
+
+
+export const AbiParam = (props: IAbiParam) => {
+    const {
+        name,
+        readonly,
+        type,
+        value,
+    } = props;
+
+    function valueInput() {
+        return <SmallTextInput value={value} readOnly={readonly} />
+    }
+
+    return <Box className="param-box" direction="column" pad="none">
+        <HeaderBox direction="row" align="center">
+            {name && <NameLabel>{name}</NameLabel>}
+            <i>{type}</i>
+        </HeaderBox>
+
+        {valueInput()}
+    </Box>
+};

src/pages/AddressPage/ContractDetails/AbiMethodView.tsx

@@ -7,6 +7,7 @@ import {AbiItem} from 'web3-utils';
 import {convertInputs} from './helpers';
 import {uniqid} from 'src/pages/VerifyContract/VerifyContract';
 import detectEthereumProvider from '@metamask/detect-provider';
+import {AbiParam} from 'src/components/ui/AbiParam';
 
 const Field = styled(Box)``;
 
@@ -83,8 +84,8 @@ export const AbiMethodsView = (props: {
       const web3URL = props.isRead
         ? process.env.REACT_APP_RPC_URL_SHARD0
         : web3
-        ? web3
+          ? web3
-        : process.env.REACT_APP_RPC_URL_SHARD0;
+          : process.env.REACT_APP_RPC_URL_SHARD0;
 
       const hmyWeb3 = new Web3(web3URL);
 
@@ -119,8 +120,8 @@ export const AbiMethodsView = (props: {
           Array.isArray(res)
             ? res
             : typeof res === 'object'
-            ? Object.values(res)
+              ? Object.values(res)
-            : [res.toString()]
+              : [res.toString()]
         );
       }
     } catch (e) {
@@ -147,7 +148,7 @@ export const AbiMethodsView = (props: {
   };
 
   return (
-    <ViewWrapper direction='column' margin={{bottom: 'medium'}}>
+    <ViewWrapper className='abi-view-wrapper' direction='column' margin={{bottom: 'medium'}}>
       <NameWrapper background={'backgroundBack'}>
         <Text size='small'>
           {index + 1}. {abiMethod.name}
@@ -293,30 +294,14 @@ export const AbiMethodsView = (props: {
         ) : null}
 
         {abiMethod.outputs
-          ? abiMethod.outputs.map((input) => {
+          ? abiMethod.outputs.map((input, idx) => {
-              return (
+            return (<AbiParam
-                <Box>
+              readonly={true}
-                  {result.length ? (
+              type={input.type}
-                    <Text size='small'>
+              name={input.name}
-                      <GreySpan>
+              value={result[idx]}
-                        {input.name}
+            />)
-                        {` (${input.type})`}
+          })
-                      </GreySpan>{' '}
-                      {'-> '}
-                      {result.length === 1 ? [result] : result.toString()}
-                    </Text>
-                  ) : (
-                    <Text size='small'>
-                      <GreySpan>
-                        {input.name}
-                        {` (${input.type})`}
-                      </GreySpan>{' '}
-                      {'-> '}
-                    </Text>
-                  )}
-                </Box>
-              );
-            })
           : null}
 
         {error && (