From d2037ff1f49901e6451ae58b4ae6ae6804547871 Mon Sep 17 00:00:00 2001
From: Maxwell Lasky <mlasky46@gmail.com>
Date: Fri, 6 Aug 2021 11:23:42 -0600
Subject: [PATCH] Final release enhancements and minor bug fixes

---
 app/actions/balancesActions.js                      |  1 +
 .../Modals/ReleaseNotesModal/ReleaseNotesModal.jsx  |  2 +-
 app/containers/App/Sidebar/Sidebar.jsx              |  4 ++--
 app/hocs/auth/withLogoutReset.js                    |  2 +-
 app/modules/claim.js                                | 12 ++++++++++--
 app/modules/transactions.js                         | 13 +++++++++++--
 6 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/app/actions/balancesActions.js b/app/actions/balancesActions.js
index d8e12198d..2b5fd524f 100644
--- a/app/actions/balancesActions.js
+++ b/app/actions/balancesActions.js
@@ -146,6 +146,7 @@ async function getBalances({ net, address, isRetry = false, chain }: Props) {
     tokens: [],
     soundEnabled: true,
   }
+
   const network = findNetworkByDeprecatedLabel(net)
 
   let endpoint = await getNode(net, isRetry)
diff --git a/app/components/Modals/ReleaseNotesModal/ReleaseNotesModal.jsx b/app/components/Modals/ReleaseNotesModal/ReleaseNotesModal.jsx
index 049e5703a..1bff52ba0 100644
--- a/app/components/Modals/ReleaseNotesModal/ReleaseNotesModal.jsx
+++ b/app/components/Modals/ReleaseNotesModal/ReleaseNotesModal.jsx
@@ -55,7 +55,7 @@ const ReleaseNotesModal = ({ hideModal, theme }: Props) => (
               <br />
               <br />
               {/* eslint-disable-next-line */}
-              <li>Support for N3 main and test nets 🎉🎉</li>
+              <li>Support for Neo (N3) MainNet and TestNet 🎉🎉</li>
               <li>Under the hood dependency updates</li>
               <li>Performance enhancements</li>
               <br />
diff --git a/app/containers/App/Sidebar/Sidebar.jsx b/app/containers/App/Sidebar/Sidebar.jsx
index 86ad2d436..dfd116590 100644
--- a/app/containers/App/Sidebar/Sidebar.jsx
+++ b/app/containers/App/Sidebar/Sidebar.jsx
@@ -142,7 +142,7 @@ const Sidebar = ({
         </div>
       </NavLink>
 
-      {chain === 'neo2' && (
+      {/* {chain === 'neo2' && (
         <NavLink
           id="mobile"
           to={ROUTES.MOBILE}
@@ -152,7 +152,7 @@ const Sidebar = ({
           <MobileIcon />
           <div> Mobile app</div>
         </NavLink>
-      )}
+      )} */}
     </div>
 
     <Logout
diff --git a/app/hocs/auth/withLogoutReset.js b/app/hocs/auth/withLogoutReset.js
index 5f41ec76d..090439de1 100644
--- a/app/hocs/auth/withLogoutReset.js
+++ b/app/hocs/auth/withLogoutReset.js
@@ -24,6 +24,6 @@ export default function withLogoutReset(
   return compose(
     withData(authActions, mapAuthDataToProps),
     withReset(actions, shouldReset),
-    // withoutProps(propName),
+    withoutProps(propName),
   )
 }
diff --git a/app/modules/claim.js b/app/modules/claim.js
index 7c78c7cc0..b5191355a 100644
--- a/app/modules/claim.js
+++ b/app/modules/claim.js
@@ -142,11 +142,19 @@ export const handleN3GasClaim = async ({
     endpoint = await getRPCEndpoint(net)
   }
 
+  const rpcClient = new n3Rpc.RPCClient(endpoint)
+  const version = await rpcClient.execute(
+    new n3Rpc.Query({
+      method: 'getversion',
+      params: [],
+    }),
+  )
+  const networkMagic = version.network || version.magic || 844378958
+
   const CONFIG = {
     account: FROM_ACCOUNT,
     rpcAddress: endpoint,
-    // TODO: this will have to by dynamic based on test/mainnets
-    networkMagic: 844378958,
+    networkMagic,
   }
   const facade = await n3Api.NetworkFacade.fromConfig({
     node: endpoint,
diff --git a/app/modules/transactions.js b/app/modules/transactions.js
index 06f016c9a..6003659a0 100644
--- a/app/modules/transactions.js
+++ b/app/modules/transactions.js
@@ -334,13 +334,22 @@ export const sendTransaction = ({
             endpoint = await getRPCEndpoint(net)
           }
 
+          const rpcClient = new n3Rpc.RPCClient(endpoint)
+          const version = await rpcClient.execute(
+            new n3Rpc.Query({
+              method: 'getversion',
+              params: [],
+            }),
+          )
+
+          const networkMagic = version.network || version.magic || 844378958
+
           const FROM_ACCOUNT = new n3Wallet.Account(wif)
 
           const CONFIG = {
             account: FROM_ACCOUNT,
             rpcAddress: endpoint,
-            // TODO: this will have to by dynamic based on test/mainnets
-            networkMagic: 844378958,
+            networkMagic,
           }
 
           const facade = await n3Api.NetworkFacade.fromConfig({