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.

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

feat: Hook in Portfolio Entry Points #27607

Merged
merged 54 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
a8a8a86
feat: hook in portfolio spending caps touch points
Oct 3, 2024
e741d11
chore: fix messages
Oct 3, 2024
6a0809a
fix: failing unit tests
Oct 3, 2024
b7bf815
Merge branch 'develop' into MMPD-1363
julesat22 Oct 3, 2024
15d3fae
chore: move fn to inside click event
Oct 3, 2024
5a8d22a
Merge branch 'MMPD-1363' of github.com:MetaMask/metamask-extension in…
Oct 3, 2024
4a41262
chore: remove unused import
Oct 3, 2024
4810377
Merge branch 'develop' into MMPD-1363
julesat22 Oct 4, 2024
1d9fc12
Merge branch 'develop' into MMPD-1363
julesat22 Oct 4, 2024
72392f5
Merge branch 'develop' into MMPD-1363
legobeat Oct 8, 2024
7c81878
chore: fix spacing
Oct 15, 2024
58054b9
Merge branch 'MMPD-1363' of github.com:MetaMask/metamask-extension in…
Oct 15, 2024
de2f157
chore: add unit test to on click event
Oct 15, 2024
abeeaf8
Merge branch 'develop' into MMPD-1363
julesat22 Oct 15, 2024
60544fb
chore: update snapshot
Oct 15, 2024
97293eb
Merge branch 'MMPD-1363' of github.com:MetaMask/metamask-extension in…
Oct 15, 2024
85ae859
fix: import order
Oct 15, 2024
534d945
Merge branch 'develop' into MMPD-1363
julesat22 Oct 16, 2024
c200ec4
Merge branch 'develop' into MMPD-1363
julesat22 Oct 17, 2024
c03fd00
Merge branch 'develop' into MMPD-1363
julesat22 Oct 18, 2024
c16b5fc
Merge branch 'develop' into MMPD-1363
julesat22 Oct 21, 2024
8a2c396
Merge branch 'develop' into MMPD-1363
julesat22 Oct 21, 2024
2519c64
Merge branch 'develop' into MMPD-1363
julesat22 Oct 24, 2024
643171d
Merge remote-tracking branch 'origin/develop' into MMPD-1363
ziad-saab Nov 1, 2024
faf7da1
Add "View in portfolio" to account list item menu
ziad-saab Nov 1, 2024
cad57b2
Merge remote-tracking branch 'origin/develop' into MMPD-1363
ziad-saab Nov 1, 2024
43ac058
Add "View In Portfolio" link to global menu
ziad-saab Nov 1, 2024
ca4c9ec
Merge remote-tracking branch 'origin/develop' into MMPD-1363
ziad-saab Nov 1, 2024
17fdf23
Merge branch 'develop' into MMPD-1363
ziad-saab Nov 1, 2024
84eaae8
Merge branch 'develop' into MMPD-1363
ziad-saab Nov 4, 2024
face2f8
Merge branch 'develop' into MMPD-1363
ziad-saab Nov 4, 2024
8c498cd
Merge remote-tracking branch 'origin/develop' into MMPD-1363
ziad-saab Nov 6, 2024
126f370
Merge remote-tracking branch 'origin/develop' into MMPD-1363
ziad-saab Nov 6, 2024
913e059
Merge branch 'develop' into MMPD-1363
ziad-saab Nov 6, 2024
4f464b0
Merge branch 'develop' into MMPD-1363
ziad-saab Nov 6, 2024
165e2f3
Merge branch 'develop' into MMPD-1363
ziad-saab Nov 6, 2024
8b9e1d0
Merge remote-tracking branch 'origin/develop' into MMPD-1363
ziad-saab Nov 6, 2024
a9dd3d1
fix: remove "View in Portfolio" from global menu due to height concerns
ziad-saab Nov 6, 2024
9fc714c
Revert changes to global menu
ziad-saab Nov 6, 2024
62043b7
Merge remote-tracking branch 'origin/develop' into MMPD-1363
ziad-saab Nov 7, 2024
4ea1623
Rollback "view in portfolio" changes
ziad-saab Nov 7, 2024
4b14945
Merge remote-tracking branch 'origin/develop' into MMPD-1363
ziad-saab Nov 7, 2024
cf58ea0
Merge branch 'develop' into MMPD-1363
ziad-saab Nov 7, 2024
2a70fe6
Merge branch 'develop' into MMPD-1363
ziad-saab Nov 7, 2024
5455723
Merge branch 'develop' into MMPD-1363
ziad-saab Nov 12, 2024
91ec2ef
Merge branch 'develop' into MMPD-1363
ziad-saab Nov 13, 2024
9efca78
Merge branch 'develop' into MMPD-1363
ziad-saab Nov 13, 2024
286d1bc
Merge branch 'develop' into MMPD-1363
ziad-saab Nov 14, 2024
adac4da
pr feedback
ziad-saab Nov 14, 2024
a498e91
update AssetPage snapshots
ziad-saab Nov 14, 2024
05d9935
Merge branch 'develop' into MMPD-1363
ziad-saab Nov 14, 2024
f781e65
Merge branch 'develop' into MMPD-1363
ziad-saab Nov 19, 2024
36f216b
chore: updating text component to button link to align with design sy…
georgewrmarshall Nov 19, 2024
0681cc4
chore: updating snapshots
georgewrmarshall Nov 19, 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
6 changes: 6 additions & 0 deletions app/_locales/en/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 17 additions & 3 deletions ui/pages/asset/asset.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "design-system";
@use 'design-system';

.asset {
&__container {
Expand Down Expand Up @@ -42,5 +42,19 @@
}
}

.chart-up { stroke: var(--color-success-default); }
.chart-down { stroke: var(--color-error-default); }
.chart-up {
stroke: var(--color-success-default);
}

.chart-down {
stroke: var(--color-error-default);
}

.asset-page__spending-caps {
text-decoration: none;

&:hover {
color: var(--color-primary-alternative);
text-decoration: underline;
}
}
224 changes: 152 additions & 72 deletions ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,36 @@ exports[`AssetPage should render a native asset 1`] = `
<div
class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--gap-7 mm-box--flex-direction-column"
>
<div
class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column"
>
<h3
class="mm-box mm-text mm-text--heading-md mm-box--padding-bottom-4 mm-box--color-text-default"
>
Token details
</h3>
<div
class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-column"
>
<div
class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
>
<p
class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-alternative"
>
Spending caps
</p>
<a
class="mm-box mm-text mm-button-base asset-page__spending-caps mm-text--body-md-medium mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
href="https://portfolio.test/?metamaskEntry=asset_page&metametricsId=&metricsEnabled=false&marketingEnabled=false&accountAddress=0x1&tab=spending-caps"
rel="noopener noreferrer"
target="_blank"
>
Edit in Portfolio
</a>
</div>
</div>
</div>
<div
class="mm-box mm-box--margin-bottom-8"
>
Expand Down Expand Up @@ -555,59 +585,84 @@ exports[`AssetPage should render an ERC20 asset without prices 1`] = `
Token details
</h3>
<div
class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-column"
>
<p
class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-alternative"
<div
class="mm-box"
>
Contract address
</p>
<div>
<div
aria-describedby="tippy-tooltip-9"
class=""
data-original-title="Copy to clipboard"
data-tooltipped=""
style="display: inline;"
tabindex="0"
class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
>
<button
class="mm-box mm-text mm-button-base mm-button-base--size-sm multichain-address-copy-button mm-text--body-sm 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-default mm-box--background-color-primary-muted mm-box--rounded-pill"
data-testid="address-copy-button-text"
<p
class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-alternative"
>
<span
class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
Contract address
</p>
<div>
<div
aria-describedby="tippy-tooltip-9"
class=""
data-original-title="Copy to clipboard"
data-tooltipped=""
style="display: inline;"
tabindex="0"
>
<div
class="mm-box mm-box--display-flex"
<button
class="mm-box mm-text mm-button-base mm-button-base--size-sm multichain-address-copy-button mm-text--body-sm 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-default mm-box--background-color-primary-muted mm-box--rounded-pill"
data-testid="address-copy-button-text"
>
0x30937...C4936
</div>
</span>
<span
class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-start-1 mm-box--display-inline-block mm-box--color-inherit"
style="mask-image: url('./images/icons/copy.svg');"
/>
</button>
<span
class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
>
<div
class="mm-box mm-box--display-flex"
>
0x30937...C4936
</div>
</span>
<span
class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-start-1 mm-box--display-inline-block mm-box--color-inherit"
style="mask-image: url('./images/icons/copy.svg');"
/>
</button>
</div>
</div>
</div>
<div
class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-column"
>
<div
class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
>
<p
class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-alternative"
>
Token decimal
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
>
18
</p>
</div>
</div>
</div>
</div>
<div
class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-column"
>
<div
class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
>
<p
class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-alternative"
>
Token decimal
Spending caps
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
<a
class="mm-box mm-text mm-button-base asset-page__spending-caps mm-text--body-md-medium mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
href="https://portfolio.test/?metamaskEntry=asset_page&metametricsId=&metricsEnabled=false&marketingEnabled=false&accountAddress=0x1&tab=spending-caps"
rel="noopener noreferrer"
target="_blank"
>
18
</p>
Edit in Portfolio
</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -1038,59 +1093,84 @@ exports[`AssetPage should render an ERC20 token with prices 1`] = `
Token details
</h3>
<div
class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-column"
>
<p
class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-alternative"
<div
class="mm-box"
>
Contract address
</p>
<div>
<div
aria-describedby="tippy-tooltip-10"
class=""
data-original-title="Copy to clipboard"
data-tooltipped=""
style="display: inline;"
tabindex="0"
class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
>
<button
class="mm-box mm-text mm-button-base mm-button-base--size-sm multichain-address-copy-button mm-text--body-sm 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-default mm-box--background-color-primary-muted mm-box--rounded-pill"
data-testid="address-copy-button-text"
<p
class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-alternative"
>
<span
class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
Contract address
</p>
<div>
<div
aria-describedby="tippy-tooltip-10"
class=""
data-original-title="Copy to clipboard"
data-tooltipped=""
style="display: inline;"
tabindex="0"
>
<div
class="mm-box mm-box--display-flex"
<button
class="mm-box mm-text mm-button-base mm-button-base--size-sm multichain-address-copy-button mm-text--body-sm 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-default mm-box--background-color-primary-muted mm-box--rounded-pill"
data-testid="address-copy-button-text"
>
0xe4246...85f55
</div>
</span>
<span
class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-start-1 mm-box--display-inline-block mm-box--color-inherit"
style="mask-image: url('./images/icons/copy.svg');"
/>
</button>
<span
class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
>
<div
class="mm-box mm-box--display-flex"
>
0xe4246...85f55
</div>
</span>
<span
class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-start-1 mm-box--display-inline-block mm-box--color-inherit"
style="mask-image: url('./images/icons/copy.svg');"
/>
</button>
</div>
</div>
</div>
<div
class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-column"
>
<div
class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
>
<p
class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-alternative"
>
Token decimal
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
>
18
</p>
</div>
</div>
</div>
</div>
<div
class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-column"
>
<div
class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
>
<p
class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-alternative"
>
Token decimal
Spending caps
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
<a
class="mm-box mm-text mm-button-base asset-page__spending-caps mm-text--body-md-medium mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
href="https://portfolio.test/?metamaskEntry=asset_page&metametricsId=&metricsEnabled=false&marketingEnabled=false&accountAddress=0x1&tab=spending-caps"
rel="noopener noreferrer"
target="_blank"
>
18
</p>
Edit in Portfolio
</a>
</div>
</div>
</div>
Expand Down
Loading