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

Jump to bottom

fix: allow signing on permissioned account #11612

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+2 −9
Open

fix: allow signing on permissioned account #11612

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0f840e
chore: remove unused variables
elefantel Oct 3, 2024
42de529
Merge branch 'main' into account-signing
christopherferreira9 Oct 9, 2024
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
11 changes: 2 additions & 9 deletions app/core/SDKConnect/SDKDeeplinkProtocol/DeeplinkProtocolService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,21 +635,17 @@ export default class DeeplinkProtocolService {
scheme: string;
account: string; // account@chainid
}) {
let walletSelectedAddress = '';
let walletSelectedChainId = '';
let dappAccountChainId = '';
let dappAccountAddress = '';

if (!params.account?.includes('@')) {
DevLogger.log(
`DeeplinkProtocolService:: handleMessage invalid params.account format ${params.account}`,
);
} else {
const account = params.account.split('@');
walletSelectedAddress = this.getSelectedAddress();
walletSelectedChainId = this.getChainId();
dappAccountChainId = account[1];
dappAccountAddress = account[0];
}

DevLogger.log(
Expand Down Expand Up @@ -696,7 +692,6 @@ export default class DeeplinkProtocolService {
DevLogger.log('DeeplinkProtocolService:: parsed message:-', message);
data = message;

const isAccountChanged = dappAccountAddress !== walletSelectedAddress;
const isChainChanged = dappAccountChainId !== walletSelectedChainId;

const rpcMethod = data.method;
Expand Down Expand Up @@ -726,10 +721,8 @@ export default class DeeplinkProtocolService {

const isRpcMethodToSkip = checkForRpcMethodToSkip();

if (isAccountChanged || (!isRpcMethodToSkip && isChainChanged)) {
const dynamicErrorMessage = `The selected ${
isAccountChanged ? 'account' : 'chain'
} has changed. Please try again.`;
if (!isRpcMethodToSkip && isChainChanged) {
const dynamicErrorMessage = `The selected chain has changed. Please try again.`;

this.sendMessage(
{
Expand Down
Loading