Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: MetaMask/metamask-extension
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ead4ad978fcc1840cd82302eb6954324b1e494a2
Choose a base ref
..
head repository: MetaMask/metamask-extension
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6ff357498dcbef3c4aaaf2784ad0c8bbb21d4d96
Choose a head ref
Showing with 44 additions and 4 deletions.
  1. +1 −1 ui/pages/error/error-component.test.tsx
  2. +43 −3 ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap
2 changes: 1 addition & 1 deletion ui/pages/error/error-component.test.tsx
View file
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ describe('ErrorPage', () => {
).toMatchInlineSnapshot(`"Code: 500"`);
expect(
getByTestId('error-page-error-name').textContent,
).toMatchInlineSnapshot(`"Code: TypeError"`);
).toMatchInlineSnapshot(`"Code: Error"`);
});

it('should not render error details if no error information is provided', () => {
46 changes: 43 additions & 3 deletions ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap
View file
Original file line number Diff line number Diff line change
@@ -319,7 +319,7 @@ exports[`Develop options tab should match snapshot 1`] = `
class="settings-page__content-item-col"
>
<button
class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-primary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
data-theme="light"
>
Generate UI Error
@@ -362,7 +362,7 @@ exports[`Develop options tab should match snapshot 1`] = `
class="settings-page__content-item-col"
>
<button
class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-primary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
data-theme="light"
>
Generate Background Error
@@ -405,7 +405,7 @@ exports[`Develop options tab should match snapshot 1`] = `
class="settings-page__content-item-col"
>
<button
class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-primary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
data-theme="light"
>
Generate Trace
@@ -426,6 +426,46 @@ exports[`Develop options tab should match snapshot 1`] = `
</div>
</div>
</div>
<div
class="mm-box settings-page__content-row mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--justify-content-space-between"
>
<div
class="settings-page__content-item"
>
<div
class="settings-page__content-description"
>
<span>
Trigger the crash on extension to send user feedback to sentry. You can click "Try again" to reload extension
</span>
</div>
</div>
<div
class="settings-page__content-item-col"
>
<button
class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-primary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
data-testid="developer-options-generate-page-crash-button"
data-theme="light"
>
Generate A Page Crash
</button>
</div>
<div
class="settings-page__content-item-col"
>
<div
class="mm-box mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--align-items-center"
style="height: 40px; width: 40px;"
>
<span
class="mm-box settings-page-developer-options__icon-check mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-success-default"
hidden=""
style="mask-image: url('./images/icons/check.svg');"
/>
</div>
</div>
</div>
</div>
</div>
</div>