From 9c921633ec837fe239a1e40d38752587b3d4795d Mon Sep 17 00:00:00 2001
From: Ion Vrinceanu <vrinceanuion@gmail.com>
Date: Fri, 29 Apr 2022 17:49:25 +0300
Subject: [PATCH 1/2] improvements: use `environment` variable from config file
 instead of hardcoded `devnet`; fallback to `devnet` if `network.id` is
 undefined

---
 src/App.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/App.tsx b/src/App.tsx
index 4e6b0aa..ba17b9c 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -12,6 +12,7 @@ import { store, persistor } from 'redux/store';
 import Layout from './components/Layout';
 import PageNotFound from './components/PageNotFound';
 
+import { network } from './config';
 import routes from './routes';
 
 import '@elrondnetwork/dapp-core/build/index.css';
@@ -36,7 +37,7 @@ i18n.use(initReactI18next).init({
 export default function App() {
   return (
     <ReduxProvider store={store}>
-      <DappProvider environment={'devnet'}>
+      <DappProvider environment={network.id || 'devnet'}>
         <>
           <DappUI.SignTransactionsModals />
           <DappUI.TransactionsToastList />

From b2c0ae4b57704706420b0b6fb72e9af52abc76ea Mon Sep 17 00:00:00 2001
From: Ion Vrinceanu <vrinceanuion@gmail.com>
Date: Fri, 29 Apr 2022 18:04:50 +0300
Subject: [PATCH 2/2] token issue proposal: - fixed js error caused by
 `token.decimals` when token  is undefined

To reproduce:
- login as proposer / board member
- issue a token
- refresh the page -> js error in console

(cherry picked from commit 19c2681efc9efec43a530abf67753df5258b1e29)
---
 src/pages/MultisigDetails/MultisigDetailsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/MultisigDetails/MultisigDetailsPage.tsx b/src/pages/MultisigDetails/MultisigDetailsPage.tsx
index dddd111..af2960b 100644
--- a/src/pages/MultisigDetails/MultisigDetailsPage.tsx
+++ b/src/pages/MultisigDetails/MultisigDetailsPage.tsx
@@ -212,7 +212,7 @@ const MultisigDetailsPage = () => {
 
           return {
             action: item,
-            description: item.action.description(token.decimals)
+            description: item.action.description(token ? token.decimals : 0)
           };
         } else {
           return {