Merge pull request #482 from provenance-io/jarryd/update-wcjs-and-wal…

…let-utils-versions

Update for proposals and voting

.npmrc

@@ -1 +1,2 @@
-save-exact=true
+save-exact=true
+legacy-peer-deps=true

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Bug Fixes
 
 ### Features
+- Update wcjs and wallet utils versions #481
 
 ## 3.5.0
 

package.json

@@ -11,8 +11,8 @@
   "private": false,
   "sideEffects": false,
   "dependencies": {
-    "@provenanceio/wallet-utils": "2.3.0",
-    "@provenanceio/walletconnect-js": "2.0.5",
+    "@provenanceio/wallet-utils": "2.6.0",
+    "@provenanceio/walletconnect-js": "2.1.1",
     "@reduxjs/toolkit": "1.8.1",
     "bech32": "2.0.0",
     "big.js": "6.1.1",
@@ -21,7 +21,6 @@
     "echarts": "5.2.2",
     "format-number": "3.0.0",
     "formik": "2.2.9",
-    "let-it-snow": "1.1.6",
     "query-string": "7.0.1",
     "react": "17.0.2",
     "react-datepicker": "4.1.1",

src/Components/Summary/Summary.tsx

@@ -262,12 +262,12 @@ const buildSummaryValue = (rowData: RowDataProps, theme: string) => {
   return finalValue;
 };
 
-const buildSummaryRow = (rowData: RowDataProps, theme: string) => {
+const buildSummaryRow = (rowData: RowDataProps, theme: string, index: number) => {
   const { isJson, nobreak = false, title, value, hover = '', table } = rowData;
   const valueMissing = value === undefined || value === null || value === '';
 
   return (
-    <SummaryRow key={title} isJson={isJson || false} nobreak={nobreak}>
+    <SummaryRow key={`${title} ${index}`} isJson={isJson || false} nobreak={nobreak}>
       <SummaryTitle>{title}:</SummaryTitle>
       {table && (
         <Table
@@ -308,5 +308,5 @@ export interface SummaryDataProps {
 
 export const Summary = ({ data }: SummaryDataProps) => {
   const { themeName } = useColorScheme();
-  return <>{data.map((rowData) => buildSummaryRow(rowData, themeName))}</>;
+  return <>{data.map((rowData, index) => buildSummaryRow(rowData, themeName, index))}</>;
 };

src/Pages/Proposals/Components/ManageProposalModal.tsx

@@ -120,6 +120,7 @@ const ManageProposalModal = ({
 
   const handleModalClose = () => {
     setSubmitted(false);
+
     onClose();
     setProposalType('text');
   };
@@ -189,6 +190,10 @@ const ManageProposalModal = ({
           // Set proposal type back to default
           setProposalType('text');
           // Clear the form
+          // Set initial deposit back to zero.
+          proposalContent(values as unknown as ContentProps).initialDeposit = [
+            { amount: '0', denom: 'nhash' },
+          ];
           resetForm();
         }}
       >

src/consts/proposals.tsx

@@ -1,17 +1,22 @@
+// TO-DO: Re-allow Instantiate/Params when available
+
 export const PROPOSAL_TYPES: { [key: string]: string } = {
   TEXT: 'text',
   SOFTWARE_UPGRADE: 'software upgrade',
   CANCEL_SOFTWARE_UPGRADE: 'cancel upgrade',
   STORE_CODE: 'store code',
-  INSTANTIATE_CODE: 'instantiate contract',
-  PARAMS_CHANGE: 'parameter change',
+  // INSTANTIATE_CODE: 'instantiate contract',
+  // PARAMS_CHANGE: 'parameter change',
   //TO-DOS:
   //COMMUNITY_POOL_SPEND: 'community pool spend',
   //COMMUNITY_POOL_SPEND_WITH_DEPOSIT: 'community pool spend with deposit',
 };
 
 export const ACCESS_TYPES = {
-  NOBODY: 'nobody',
-  ONLY_ADDRESS: 'only address',
-  EVERYBODY: 'everybody',
+  ACCESS_TYPE_UNSPECIFIED: 'ACCESS_TYPE_UNSPECIFIED',
+  ACCESS_TYPE_NOBODY: 'ACCESS_TYPE_NOBODY',
+  ACCESS_TYPE_ONLY_ADDRESS: 'ACCESS_TYPE_ONLY_ADDRESS',
+  ACCESS_TYPE_EVERYBODY: 'ACCESS_TYPE_EVERYBODY',
+  // TO-DO: incorporate this option
+  // ACCESS_TYPE_ANY_OF_ADDRESSES: '',
 };

src/utils/proposals/proposalContent.tsx

@@ -18,10 +18,8 @@ export interface ContentProps {
   height?: number;
   info?: string;
   runAs?: string;
-  accessConfig?: {
-    type: string;
-    address: string | null;
-  };
+  accessType?: string;
+  address?: string;
   admin?: string;
   codeId?: number;
   label?: string;
@@ -42,7 +40,8 @@ export const proposalContent = ({
   height,
   info,
   runAs,
-  accessConfig,
+  accessType,
+  address,
   admin,
   codeId,
   label,
@@ -57,7 +56,8 @@ export const proposalContent = ({
     height ||
     info ||
     runAs ||
-    accessConfig ||
+    accessType ||
+    address ||
     admin ||
     codeId ||
     label ||
@@ -69,7 +69,10 @@ export const proposalContent = ({
           height,
           info,
           runAs,
-          accessConfig,
+          ...(accessType &&
+            accessType !== 'ACCESS_TYPE_UNSPECIFIED' && {
+              accessConfig: { type: accessType, address },
+            }),
           admin,
           codeId,
           label,

src/utils/proposals/proposalData.tsx

@@ -74,13 +74,14 @@ export const proposalData = (proposalType: string) => {
           label: 'WASM Byte Code',
           field: 'file',
         },
-        {
-          type: 'dropdown',
-          dropdown: ACCESS_TYPES,
-          initialValue: ACCESS_TYPES.NOBODY,
-          label: 'access type',
-          field: 'accessType',
-        },
+        // TODO: Re-allow once proposals are discussed
+        // {
+        //   type: 'dropdown',
+        //   dropdown: ACCESS_TYPES,
+        //   initialValue: ACCESS_TYPES.ACCESS_TYPE_UNSPECIFIED,
+        //   label: 'access type',
+        //   field: 'accessType',
+        // },
         // This is conditional based on the access type ONLY_ADDRESS
         {
           type: 'text',

src/utils/proposals/proposalValidations.tsx

@@ -50,7 +50,7 @@ export const proposalValidations = (proposalType: string, blocksHeight: number)
           )
           .test('fileSize', 'Files must be less than 1MB', checkMaxFileSize),
         address: yup.string().when(['accessType'], {
-          is: (accessType: string) => accessType === ACCESS_TYPES.ONLY_ADDRESS,
+          is: (accessType: string) => accessType === ACCESS_TYPES.ACCESS_TYPE_NOBODY,
           then: yup.string().required('Address is required for "address only" access type'),
         }),
         initialDeposit,

src/utils/table/formatTableData.js

@@ -263,7 +263,8 @@ export const formatTableData = (data = [], tableHeaders) => {
         case 'votingTime.endTime': //fallthrough
         case 'votingTime.startTime': {
           const value = serverValue
-            ? getUTCTime(serverValue).slice(0, 4) !== '1901'
+            ? getUTCTime(serverValue).slice(0, 4) !== '1901' &&
+              getUTCTime(serverValue).slice(0, 4) !== '1970'
               ? `${getUTCTime(serverValue)}+UTC`
               : '--'
             : 'N/A';