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

chore: update the 'sendMessage' method in the 'DeeplinkProtocolService' class #10304

Merged
merged 6 commits into from
Jul 17, 2024
Merged

chore: update the 'sendMessage' method in the 'DeeplinkProtocolService' class #10304

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a2deeb1
chore: update the sendMessage method on the DeeplinkProtocolService
omridan159 Jul 15, 2024
69b1866
chore: add RPC_METHODS_TO_SKIP in the 'handleMessage' method on the '…
omridan159 Jul 16, 2024
a978758
chore: handle the case of 'METAMASK_BATCH' req includes a method to skip
omridan159 Jul 16, 2024
4c251db
chore: fix tests
omridan159 Jul 16, 2024
c167726
chore: update unit tests
omridan159 Jul 16, 2024
3dadfe4
chore: cleanup
omridan159 Jul 16, 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
44 changes: 17 additions & 27 deletions app/core/SDKConnect/SDKDeeplinkProtocol/DeeplinkProtocolService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,7 @@ export default class DeeplinkProtocolService {
isRemoteConn: true,
// TODO: Replace "any" with type
// eslint-disable-next-line @typescript-eslint/no-explicit-any
sendMessage: (msg: any) => {
const response = {
...msg,
data: {
...msg.data,
chainId: this.getChainId(),
accounts: this.getSelectedAccounts(),
},
};

return this.sendMessage(response);
},
sendMessage: (msg: any) => this.sendMessage(msg),
...defaultBridgeParams,
});

Expand All @@ -121,6 +110,15 @@ export default class DeeplinkProtocolService {
// TODO: Replace "any" with type
// eslint-disable-next-line @typescript-eslint/no-explicit-any
async sendMessage(message: any, forceRedirect?: boolean) {
const messageWithMetadata = {
...message,
data: {
...message.data,
chainId: this.getChainId(),
accounts: this.getSelectedAccounts(),
},
};

const id = message?.data?.id;

DevLogger.log(`DeeplinkProtocolService::sendMessage id=${id}`);
Expand All @@ -129,14 +127,14 @@ export default class DeeplinkProtocolService {

DevLogger.log(
`DeeplinkProtocolService::sendMessage method=${rpcMethod}`,
message,
messageWithMetadata,
);
// handle multichain rpc call responses separately
const chainRPCs = this.batchRPCManager.getById(id);
if (chainRPCs) {
const isLastRpcOrError = await handleBatchRpcResponse({
chainRpcs: chainRPCs,
msg: message,
msg: messageWithMetadata,
backgroundBridge: this.bridgeByClientId[this.currentClientId ?? ''],
batchRPCManager: this.batchRPCManager,
sendMessage: ({ msg }) => this.sendMessage(msg),
Expand All @@ -155,7 +153,7 @@ export default class DeeplinkProtocolService {

if (hasError) {
this.openDeeplink({
message,
message: messageWithMetadata,
clientId: this.currentClientId ?? '',
});
return;
Expand Down Expand Up @@ -201,12 +199,12 @@ export default class DeeplinkProtocolService {

DevLogger.log(
`DeeplinkProtocolService::sendMessage sending deeplink message=${JSON.stringify(
message,
messageWithMetadata,
)}`,
);

this.openDeeplink({
message,
message: messageWithMetadata,
clientId: this.currentClientId ?? '',
});
} catch (error) {
Expand Down Expand Up @@ -328,10 +326,7 @@ export default class DeeplinkProtocolService {
} else {
this.sendMessage(
{
data: {
chainId: this.getChainId(),
accounts: this.getSelectedAccounts(),
},
data: {},
},
true,
).catch((err) => {
Expand Down Expand Up @@ -407,10 +402,7 @@ export default class DeeplinkProtocolService {

this.sendMessage(
{
data: {
chainId: this.getChainId(),
accounts: this.getSelectedAccounts(),
},
data: {},
},
true,
).catch((err) => {
Expand Down Expand Up @@ -671,8 +663,6 @@ export default class DeeplinkProtocolService {
{
data: {
id: data.id,
accounts: this.getSelectedAccounts(),
chainId: this.getChainId(),
error: {
code: -32602,
message:
Expand Down
Loading