Merge pull request #23 from CudoVentures/cudos-dev

Merge cudos-dev
cudoventures · Jun 16, 2022 · 2eb61ab · 2eb61ab
2 parents 2bab99b + 7553047
commit 2eb61ab
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/config/.env.example b/config/.env.example
@@ -1,4 +1,5 @@
 NODE_ENV=production|dev
+NETWORK_TYPE=mainnet/testnet
 BACKEND_PORT= (port on which server will be accessed from browser)
 FRONTEND_PORT=
 URL=http://ip/localhost/domain

diff --git a/config/config.js b/config/config.js
@@ -35,6 +35,7 @@ const envVariables = [
     'STAKING',
     'PARAMS_ENDPOINT',
     'BLOCK_EXPLORER',
+    'NETWORK_TYPE'
 ];
 
 if (process.env.NODE_ENV === 'production') {
@@ -201,6 +202,7 @@ const Config = {
         API: `${URL_ROOT}/api`,
     },
     CUDOS_NETWORK: {
+        NETWORK_TYPE: process.env.NETWORK_TYPE,
         CHAIN_NAME: process.env.CHAIN_NAME,
         CHAIN_ID: process.env.CHAIN_ID,
         GRAVITY_MODULE_ADDRESS: process.env.GRAVITY_MODULE_ADDRESS,
@@ -221,6 +223,8 @@ const Config = {
     ETHEREUM: {
         ETHEREUM_GAS: process.env.ETHEREUM_GAS,
         ETHEREUM_RPC: process.env.ETHEREUM_RPC,
+        ETHERSCAN_RINKEBY: 'https://rinkeby.etherscan.io/tx',
+        ETHERSCAN_MAINNET: 'https://etherscan.io/tx'
     },
 };
 

diff --git a/src/frontend/resources/common/js/components-popups/SummaryModal.tsx b/src/frontend/resources/common/js/components-popups/SummaryModal.tsx
@@ -37,8 +37,10 @@ const SummaryModal = ({
     const fromNetwork = selectedFromNetwork ? 'CUDOS' : 'Ethereum';
     const ToNetwork = selectedToNetwork ? 'CUDOS' : 'Ethereum';
 
-    const ETHERSCAN_RINKEBY = 'https://rinkeby.etherscan.io/tx';
-    const ETHERSCAN_MAINNET = 'https://etherscan.io/tx';
+    const ETHERSCAN_EXPLORER = 
+        Config.CUDOS_NETWORK.NETWORK_TYPE === "mainnet"?
+            Config.ETHEREUM.ETHERSCAN_MAINNET:
+            Config.ETHEREUM.ETHERSCAN_RINKEBY
     const CUDOS_EXPLORER = Config.CUDOS_NETWORK.BLOCK_EXPLORER;
 
     const onCloseModal = async () => {
@@ -102,7 +104,7 @@ const SummaryModal = ({
                                 <div>Transaction</div>
                             </div>
                             <div className={'Row Spacing LinkWrapper'}>
-                                <div className={'LinkContent'}><a href= {`${selectedFromNetwork ? CUDOS_EXPLORER : ETHERSCAN_RINKEBY}/${txHash}`} rel='noreferrer' target='_blank'>
+                                <div className={'LinkContent'}><a href= {`${selectedFromNetwork ? CUDOS_EXPLORER : ETHERSCAN_EXPLORER}/${txHash}`} rel='noreferrer' target='_blank'>
                                     Bridge transaction link</a>
                                 <div className={'LinkIcon'} style={ProjectUtils.makeBgImgStyle(linkIcon)} />
                                 </div>