From 767114592e43b028fe96f0b2ada9fe69041a7044 Mon Sep 17 00:00:00 2001 From: Kelvin Takyi-Bobi <52892093+KELs7@users.noreply.github.com> Date: Tue, 12 Jul 2022 00:27:17 +0000 Subject: [PATCH 1/2] get user custom network --- .../backgroundControllers/networkController.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/js/backgroundControllers/networkController.js b/src/js/backgroundControllers/networkController.js index ed6cb7a1..e1f6ac67 100644 --- a/src/js/backgroundControllers/networkController.js +++ b/src/js/backgroundControllers/networkController.js @@ -70,12 +70,22 @@ export const networkController = (utils, services) => { } const getLamdenNetwork = (networkType) => { - const foundNetwork = networksStore.lamden.find(network => network.type === networkType.toLowerCase()) - if (!foundNetwork) return false; - return addExtras(new utils.Lamden.Network(foundNetwork)) + if(['mainnet','testnet'].includes(networkType)){ + const foundNetwork = networksStore.lamden.find(network => network.type === networkType.toLowerCase()) + if (!foundNetwork) return false; + return addExtras(new utils.Lamden.Network(foundNetwork)) + }else{ + const foundNetwork = networksStore.user.find(network => network.name === networkType.toLowerCase()) + if (!foundNetwork) return false; + return addExtras(new utils.Lamden.Network(foundNetwork)) + } } const isAcceptedNetwork = (networkType) => { + const foundNetwork = networksStore.user.find(network => network.name === networkType.toLowerCase()) + if(foundNetwork){ + LamdenNetworkTypes.push(foundNetwork.name) + } return LamdenNetworkTypes.includes(networkType) } @@ -99,4 +109,4 @@ export const networkController = (utils, services) => { getLastetBlock, LamdenNetworkTypes } -} \ No newline at end of file +} From 28a77adf49b61ddececf9c28f7bded81b559d7d5 Mon Sep 17 00:00:00 2001 From: Kelvin Takyi-Bobi <52892093+KELs7@users.noreply.github.com> Date: Tue, 12 Jul 2022 00:51:46 +0000 Subject: [PATCH 2/2] find user custom network to send tx dapps of custom networks are stored with their networkType names hence find the network by txInfo.networkType --- .../backgroundControllers/masterController.js | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/src/js/backgroundControllers/masterController.js b/src/js/backgroundControllers/masterController.js index 333d7e78..6d1c8393 100644 --- a/src/js/backgroundControllers/masterController.js +++ b/src/js/backgroundControllers/masterController.js @@ -337,16 +337,29 @@ export const masterController = () => { if (approvalRequest) { promptCurrencyApproval(sender, { txData, wallet, dappInfo: info }); } else { - if (dappInfo[txBuilder.type].trustedApp && !forceTxApproval) { - transactions.sendLamdenTx(txBuilder, dappInfo.url); - } else { - promptApproveTransaction(sender, { - txData, - wallet, - dappInfo: info, - network, - }); - } + if(['mainnet','testnet'].includes(txBuilder.type)){ + if (dappInfo[txBuilder.type].trustedApp && !forceTxApproval) { + transactions.sendLamdenTx(txBuilder, dappInfo.url); + } else { + promptApproveTransaction(sender, { + txData, + wallet, + dappInfo: info, + network, + }); + } + }else{ + if (dappInfo[txInfo.networkType].trustedApp && !forceTxApproval) { + transactions.sendLamdenTx(txBuilder, dappInfo.url); + } else { + promptApproveTransaction(sender, { + txData, + wallet, + dappInfo: info, + network, + }); + } + } } return callback("ok"); } catch (err) {