Skip to content

Commit

Permalink
Remove privateKey login
Browse files Browse the repository at this point in the history
  • Loading branch information
bobcoin98 committed Nov 21, 2023
1 parent 839fc83 commit 2313c47
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 29 deletions.
5 changes: 4 additions & 1 deletion app/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,10 @@
<b-dropdown-divider />
<b-dropdown-item
target="_bank"
href="https://bit.ly/2B6p29o">Help</b-dropdown-item>
href="https://docs.viction.xyz/faq/masternode-and-voting/masternode"
>
Help
</b-dropdown-item>
<b-dropdown-item to="/setting">Settings/Withdraws</b-dropdown-item>
<b-dropdown-divider />
<b-dropdown-item
Expand Down
34 changes: 17 additions & 17 deletions app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ Vue.prototype.getAccount = async function () {
}
account = (await wjs.eth.getAccounts())[0]
break
case 'pantograph':
// Request account access if needed - for metamask
if (window.tomochain) {
await window.tomochain.enable()
}
account = (await wjs.eth.getAccounts())[0]
break
// case 'pantograph':
// // Request account access if needed - for metamask
// if (window.tomochain) {
// await window.tomochain.enable()
// }
// account = (await wjs.eth.getAccounts())[0]
// break
case 'tomowalletDapp':
account = (await wjs.eth.getAccounts())[0]
break
Expand Down Expand Up @@ -340,16 +340,16 @@ Vue.prototype.detectNetwork = async function (provider) {
}
}
break
case 'pantograph':
if (window.tomoWeb3) {
if (window.tomoWeb3.currentProvider) {
let pp = window.tomoWeb3.currentProvider
wjs = new Web3(pp)
} else {
wjs = window.tomoWeb3
}
}
break
// case 'pantograph':
// if (window.tomoWeb3) {
// if (window.tomoWeb3.currentProvider) {
// let pp = window.tomoWeb3.currentProvider
// wjs = new Web3(pp)
// } else {
// wjs = window.tomoWeb3
// }
// }
// break
case 'tomowallet':
wjs = new Web3(new HDWalletProvider(
'',
Expand Down
20 changes: 10 additions & 10 deletions app/components/Setting.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
value="metamask">Metamask/DApp Wallets</option>
<!-- <option
value="tomowallet">TomoWallet (Recommended)</option> -->
<option
value="custom">PrivateKey/MNEMONIC</option>
<!-- <option
value="custom">PrivateKey/MNEMONIC</option> -->
<option
value="ledger">Ledger Wallet</option>
<option
Expand Down Expand Up @@ -59,7 +59,7 @@
v-else-if="$v.networks.custom.$dirty && !$v.networks.custom.localhostUrl"
class="text-danger">Wrong URL format</span>
</b-form-group> -->
<b-form-group
<!-- <b-form-group
v-if="provider === 'custom'"
class="mb-4"
label="Privatekey/MNEMONIC"
Expand All @@ -72,7 +72,7 @@
<span
v-if="$v.mnemonic.$dirty && !$v.mnemonic.required"
class="text-danger">Required field</span>
</b-form-group>
</b-form-group> -->
<b-form-group
v-if="provider === 'custom'"
class="mb-4"
Expand Down Expand Up @@ -626,12 +626,12 @@ export default {
wjs = new Web3(p)
}
break
case 'pantograph':
if (window.tomoWeb3) {
var pp = window.tomoWeb3.currentProvider
wjs = new Web3(pp)
}
break
// case 'pantograph':
// if (window.tomoWeb3) {
// var pp = window.tomoWeb3.currentProvider
// wjs = new Web3(pp)
// }
// break
case 'ledger':
// Object - HttpProvider
wjs = new Web3(new Web3.providers.HttpProvider(self.networks.rpc))
Expand Down
2 changes: 1 addition & 1 deletion app/components/candidates/Update.vue
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ export default {
self.signHash = await self.web3.eth.sign(self.message, self.account)
break
case 'metamask':
case 'pantograph':
// case 'pantograph':
self.signHash = await self.web3.eth.personal.sign(self.message, self.account, '')
break
case 'trezor':
Expand Down

0 comments on commit 2313c47

Please sign in to comment.