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

fix: user rejection bug #1202

Merged
merged 2 commits into from
Jan 20, 2025
Merged

fix: user rejection bug #1202

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
7f18042
fix: user rejection bug
chakra-guy Jan 20, 2025
8b5fc81
Merge branch 'main' into fix-wagmi-user-rejection-bug
chakra-guy Jan 20, 2025
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
4 changes: 2 additions & 2 deletions packages/sdk-install-modal-web/src/components.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export interface MmSelectModalCustomEvent<T> extends CustomEvent<T> {
}
declare global {
interface HTMLMmInstallModalElementEventMap {
"close": any;
"close": { shouldTerminate?: boolean };
"startDesktopOnboarding": any;
"trackAnalytics": { event: TrackingEvents, params?: Record<string, unknown> };
}
Expand Down Expand Up @@ -114,7 +114,7 @@ declare namespace LocalJSX {
* The QR code link
*/
"link"?: string;
"onClose"?: (event: MmInstallModalCustomEvent<any>) => void;
"onClose"?: (event: MmInstallModalCustomEvent<{ shouldTerminate?: boolean }>) => void;
"onStartDesktopOnboarding"?: (event: MmInstallModalCustomEvent<any>) => void;
"onTrackAnalytics"?: (event: MmInstallModalCustomEvent<{ event: TrackingEvents, params?: Record<string, unknown> }>) => void;
"preferDesktop"?: boolean;
Expand Down
10 changes: 5 additions & 5 deletions packages/sdk-install-modal-web/src/components/mm-install-modal/mm-install-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class InstallModal {

private i18nInstance: SimpleI18n;

@Event() close: EventEmitter;
@Event() close: EventEmitter<{ shouldTerminate?: boolean }>;

@Event() startDesktopOnboarding: EventEmitter;

Expand Down Expand Up @@ -79,8 +79,8 @@ export class InstallModal {
}
}

onClose() {
this.close.emit();
onClose(shouldTerminate = false) {
this.close.emit({ shouldTerminate });
}

onStartDesktopOnboardingHandler() {
Expand Down Expand Up @@ -123,11 +123,11 @@ export class InstallModal {

return (
<WidgetWrapper className="install-model">
<div class='backdrop' onClick={() => this.onClose()}></div>
<div class='backdrop' onClick={() => this.onClose(true)}></div>
<div class='modal'>
<div class='closeButtonContainer'>
<div class='right'>
<span class='closeButton' onClick={() => this.onClose()}>
<span class='closeButton' onClick={() => this.onClose(true)}>
<CloseButton />
</span>
</div>
Expand Down
7 changes: 5 additions & 2 deletions packages/sdk/src/ui/InstallModal/Modal-web.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

export interface InstallWidgetProps extends Components.MmInstallModal {
parentElement: Element;
onClose: () => void;
onClose: (shouldTerminate?: boolean) => void;
metaMaskInstaller: {
startDesktopOnboarding: () => void;
};
Expand Down Expand Up @@ -80,7 +80,10 @@
modal.link = props.link;
modal.preferDesktop = props.preferDesktop;
modal.sdkVersion = props.sdkVersion ?? this.sdkVersion;
modal.addEventListener('close', props.onClose);
modal.addEventListener('close', ({ detail: { shouldTerminate } }) =>
props.onClose(shouldTerminate),

Check warning on line 84 in packages/sdk/src/ui/InstallModal/Modal-web.ts

View check run for this annotation

Codecov / codecov/patch

packages/sdk/src/ui/InstallModal/Modal-web.ts#L83-L84 

Added lines #L83 - L84 were not covered by tests
);

modal.addEventListener(
'startDesktopOnboarding',
props.metaMaskInstaller.startDesktopOnboarding,
Expand Down
Loading