Merge pull request #443 from provenance-io/jarryd/442/upgrade-to-wcjs…

…-2.0.0

Upgrade to wcjs 2.0.4

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG | <img src="./public/logo.svg" style="height: 36px; margin: 0 0 -7px 4px;" alt="Provenance Explorer"/>
 
+## Unreleased
+
+### Bugs
+
+### Features
+- Upgrade to wcjs 2.0.0 #442
+
 ## 3.4.0
 
 ### Release Name: Saint Brendan

package.json

@@ -11,8 +11,8 @@
   "private": false,
   "sideEffects": false,
   "dependencies": {
-    "@provenanceio/wallet-utils": "2.0.0",
-    "@provenanceio/walletconnect-js": "1.2.9",
+    "@provenanceio/wallet-utils": "2.3.0",
+    "@provenanceio/walletconnect-js": "2.0.4",
     "@reduxjs/toolkit": "1.8.1",
     "axios": "0.21.2",
     "bech32": "2.0.0",

src/Pages/Proposal/Components/ManageVotingModal/ManageVotingModal.tsx

@@ -241,7 +241,7 @@ const ManageVotingModal = ({
                 voter: voterId,
                 votes,
               });
-              wcs.customAction({
+              wcs.sendMessage({
                 description: 'Submit Proposal',
                 message: data.base64,
               });

src/Pages/Proposals/Components/ManageProposalModal.tsx

@@ -182,7 +182,7 @@ const ManageProposalModal = ({
           });
 
           // Submit via walletconnect-js
-          wcs.customAction({
+          wcs.sendMessage({
             description: 'Submit Proposal',
             message: data.base64,
           });

src/Pages/Validators/Components/ManageStakingModal.tsx

@@ -208,7 +208,7 @@ export const ManageStakingModal = ({
     const { action, data: submissionData } = actionSelector(amount);
     const { data } = await action(submissionData as any);
     // Submit via walletconnect-js
-    wcs.customAction({
+    wcs.sendMessage({
       description: 'Submit Delegation',
       message: data.base64,
     });

src/index.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
 import { WalletConnectContextProvider } from '@provenanceio/walletconnect-js';
@@ -7,10 +6,7 @@ import App from './App';
 
 ReactDOM.render(
   <Provider store={store()}>
-    <WalletConnectContextProvider
-      network={process.env.REACT_APP_ENV === 'test' ? 'testnet' : 'mainnet'}
-      timeout={process.env.REACT_APP_ENV === 'test' ? 86400 : 1800}
-    >
+    <WalletConnectContextProvider>
       <App />
     </WalletConnectContextProvider>
   </Provider>,

src/redux/hooks/useProposal.tsx

@@ -33,19 +33,19 @@ export const useProposal = () => {
       setShouldPull(true);
       setSubmitted(true);
     };
-    wcs.addListener(WINDOW_MESSAGES.CUSTOM_ACTION_COMPLETE, submitSuccess);
+    wcs.addListener(WINDOW_MESSAGES.SEND_MESSAGE_COMPLETE, submitSuccess);
 
     // Fail message for transaction messages
     const submitFailure = (result: BroadcastResults) => {
       setSubmitted(false);
       deactivateModalOpen();
     };
-    wcs.addListener(WINDOW_MESSAGES.CUSTOM_ACTION_FAILED, submitFailure);
+    wcs.addListener(WINDOW_MESSAGES.SEND_MESSAGE_FAILED, submitFailure);
 
     // Remove event listeners when no longer needed
     return () => {
-      wcs.removeListener(WINDOW_MESSAGES.CUSTOM_ACTION_COMPLETE, submitSuccess);
-      wcs.removeListener(WINDOW_MESSAGES.CUSTOM_ACTION_FAILED, submitFailure);
+      wcs.removeListener(WINDOW_MESSAGES.SEND_MESSAGE_COMPLETE, submitSuccess);
+      wcs.removeListener(WINDOW_MESSAGES.SEND_MESSAGE_FAILED, submitFailure);
       wcs.removeAllListeners();
     };
   }, [wcs, deactivateModalOpen]);

src/redux/hooks/useStaking.tsx

@@ -100,18 +100,18 @@ export const useStaking = () => {
       setShouldPull(true);
       deactivateModalOpen();
     };
-    wcs.addListener(WINDOW_MESSAGES.CUSTOM_ACTION_COMPLETE, submitSuccess);
+    wcs.addListener(WINDOW_MESSAGES.SEND_MESSAGE_COMPLETE, submitSuccess);
 
     // Fail message for transaction messages
     const submitFailure = (result: BroadcastResults) => {
       setShouldPull(false);
     };
-    wcs.addListener(WINDOW_MESSAGES.CUSTOM_ACTION_FAILED, submitFailure);
+    wcs.addListener(WINDOW_MESSAGES.SEND_MESSAGE_FAILED, submitFailure);
 
     // Remove event listeners when no longer needed
     return () => {
-      wcs.removeListener(WINDOW_MESSAGES.CUSTOM_ACTION_COMPLETE, submitSuccess);
-      wcs.removeListener(WINDOW_MESSAGES.CUSTOM_ACTION_FAILED, submitFailure);
+      wcs.removeListener(WINDOW_MESSAGES.SEND_MESSAGE_COMPLETE, submitSuccess);
+      wcs.removeListener(WINDOW_MESSAGES.SEND_MESSAGE_FAILED, submitFailure);
       wcs.removeAllListeners();
     };
   }, [wcs, deactivateModalOpen]);

src/redux/hooks/useVoting.tsx

@@ -35,19 +35,19 @@ export const useVoting = () => {
     const submitSuccess = (result: BroadcastResults) => {
       setVoted(true);
     };
-    wcs.addListener(WINDOW_MESSAGES.CUSTOM_ACTION_COMPLETE, submitSuccess);
+    wcs.addListener(WINDOW_MESSAGES.SEND_MESSAGE_COMPLETE, submitSuccess);
 
     // Fail message for transaction messages
     const submitFailure = (result: BroadcastResults) => {
       setVoted(false);
       deactivateModalOpen();
     };
-    wcs.addListener(WINDOW_MESSAGES.CUSTOM_ACTION_FAILED, submitFailure);
+    wcs.addListener(WINDOW_MESSAGES.SEND_MESSAGE_FAILED, submitFailure);
 
     // Remove event listeners when no longer needed
     return () => {
-      wcs.removeListener(WINDOW_MESSAGES.CUSTOM_ACTION_COMPLETE, submitSuccess);
-      wcs.removeListener(WINDOW_MESSAGES.CUSTOM_ACTION_FAILED, submitFailure);
+      wcs.removeListener(WINDOW_MESSAGES.SEND_MESSAGE_COMPLETE, submitSuccess);
+      wcs.removeListener(WINDOW_MESSAGES.SEND_MESSAGE_FAILED, submitFailure);
       wcs.removeAllListeners();
     };
   }, [wcs, deactivateModalOpen]);