Skip to content
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

Develop #217

Merged
merged 8 commits into from
Mar 5, 2021
+35 −14
Merged

Develop #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a7b55ce
wallet select on multisig
jernejpregelj Mar 3, 2021
1d48ece
cancel on not found
jernejpregelj Mar 3, 2021
70f31f3
v1.3.4
josepablofm78 Mar 3, 2021
9332fdc
signers check
jernejpregelj Mar 4, 2021
f0f423b
merge
jernejpregelj Mar 4, 2021
a4019b3
v1.3.5
josepablofm78 Mar 4, 2021
7b80b87
wallet index fix
jernejpregelj Mar 5, 2021
b20fd5a
Merge branch 'master' into develop
josepablofm78 Mar 5, 2021
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "filecoin-verifier-frontend",
"version": "1.3.4",
"version": "1.3.5",
"private": true,
"dependencies": {
"@emotion/react": "^11.0.0-next.13",
Expand Down
47 changes: 34 additions & 13 deletions src/context/Wallet/WalletProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ interface WalletProviderStates {
dispatchNotification: any
multisig: boolean
multisigAddress: string
multisigActor: string
multisigID: string
}

Expand Down Expand Up @@ -65,18 +64,17 @@ class WalletProvider extends React.Component<Props, WalletProviderStates> {
const { cookies } = this.props;
const walletCookie = cookies.get('wallet')
let lastWallet
let walletCookieIndex = - 1
let walletIndex = - 1
if (walletCookie) {
for (let index = 0; index < accounts.length; index++) {
if (accounts[index] === walletCookie) {
lastWallet = accounts[index]
walletCookieIndex = index
walletIndex = index
break;
}
}
}
let multisigInfo: any = {}
let multisigActor: string = ''
let multisigID: string = ''
if (options.multisig) {
try {
Expand All @@ -86,7 +84,20 @@ class WalletProvider extends React.Component<Props, WalletProviderStates> {
multisigID = options.multisigAddress
}
multisigInfo = await wallet.api.multisigInfo(multisigID)
multisigActor = await wallet.api.actorKey(multisigInfo.signers[0])
// select account if found
const multisigActors: any[] = []
for (let index = 0; index < multisigInfo.signers.length; index++) {
const actor = await wallet.api.actorKey(multisigInfo.signers[index])
multisigActors.push(actor)
}
const index = accounts.findIndex((account) => multisigActors.includes(account))
if (index !== -1) {
lastWallet = accounts[index]
walletIndex = index
} else {
this.state.dispatchNotification('Multisig address not found in wallet')
return false
}
} catch (e) {
this.state.dispatchNotification('Multisig not found')
return false
Expand All @@ -97,7 +108,7 @@ class WalletProvider extends React.Component<Props, WalletProviderStates> {
isLoading: false,
wallet: 'ledger',
api: wallet.api,
walletIndex: walletCookieIndex !== -1 ? walletCookieIndex : 0,
walletIndex: walletIndex !== -1 ? walletIndex : 0,
sign: async (param1: any, param2: any) => {
try {
const ret = await wallet.sign(param1, param2)
Expand All @@ -119,7 +130,6 @@ class WalletProvider extends React.Component<Props, WalletProviderStates> {
accountsActive,
multisig: options.multisig ? true : false,
multisigAddress: options.multisig ? options.multisigAddress : '',
multisigActor: options.multisig ? multisigActor : '',
multisigID: multisigID
})
// this.loadGithub()
Expand All @@ -143,18 +153,17 @@ class WalletProvider extends React.Component<Props, WalletProviderStates> {
const { cookies } = this.props;
const walletCookie = cookies.get('wallet')
let lastWallet
let walletCookieIndex = - 1
let walletIndex = - 1
if (walletCookie) {
for (let index = 0; index < accounts.length; index++) {
if (accounts[index] === walletCookie) {
lastWallet = accounts[index]
walletCookieIndex = index
walletIndex = index
break;
}
}
}
let multisigInfo: any = {}
let multisigActor: string = ''
let multisigID: string = ''
if (options.multisig) {
try {
Expand All @@ -164,7 +173,20 @@ class WalletProvider extends React.Component<Props, WalletProviderStates> {
multisigID = options.multisigAddress
}
multisigInfo = await wallet.api.multisigInfo(multisigID)
multisigActor = await wallet.api.actorKey(multisigInfo.signers[0])
// select account if found
const multisigActors: any[] = []
for (let index = 0; index < multisigInfo.signers.length; index++) {
const actor = await wallet.api.actorKey(multisigInfo.signers[index])
multisigActors.push(actor)
}
const index = accounts.findIndex((account) => multisigActors.includes(account))
if (index !== -1) {
lastWallet = accounts[index]
walletIndex = index
} else {
this.state.dispatchNotification('Multisig address not found in wallet')
return false
}
} catch (e) {
this.state.dispatchNotification('Multisig not found')
return false
Expand All @@ -177,13 +199,12 @@ class WalletProvider extends React.Component<Props, WalletProviderStates> {
api: wallet.api,
sign: wallet.sign,
getAccounts: wallet.getAccounts,
walletIndex: walletCookieIndex !== -1 ? walletCookieIndex : 0,
walletIndex: walletIndex !== -1 ? walletIndex : 0,
activeAccount: lastWallet ? lastWallet : accounts[0],
accounts,
accountsActive,
multisig: options.multisig ? true : false,
multisigAddress: options.multisig ? options.multisigAddress : '',
multisigActor: options.multisig ? multisigActor : '',
multisigID: multisigID
})
return true
Expand Down