Skip to content

Added support for a working custom network connection with extension wallet #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KELs7 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added support for a working custom network connection with extension wallet #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7671145
get user custom network
KELs7 Jul 12, 2022
28a77ad
find user custom network to send tx
KELs7 Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions src/js/backgroundControllers/masterController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
18 changes: 14 additions & 4 deletions src/js/backgroundControllers/networkController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand All @@ -99,4 +109,4 @@ export const networkController = (utils, services) => {
getLastetBlock,
LamdenNetworkTypes
}
}
}