1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-29 15:50:28 +01:00
Commit Graph

1528 Commits

Author SHA1 Message Date
Vinicius Stevam
5736e670f7
Approval flow adding success and error pages (#19778) 2023-07-12 09:29:54 +01:00
David Walsh
a8ad19da32
UX: Use System Theme for tooltip (#19954) 2023-07-11 13:23:07 -05:00
David Walsh
145280374d
Fix #19393 - Add indicator for Refresh list on tokens screen (#19952) 2023-07-11 10:43:39 -05:00
Niranjana Binoy
129f6f3f64
Token allowance flow update (#19666) 2023-07-11 10:57:59 -04:00
David Walsh
f9b1514914
UX: Ensure NFT Options Menu is Same Size as Tokens (#19953) 2023-07-11 09:11:31 -05:00
David Walsh
4b38a2f054
UX: Multichain: Convert Networks Menu to Modal (#19803)
* UX: Multichain: Convert Networks Menu to Modal

* Fix padding

* Remove dead CSS

* moved show network to bottom

* updated snapshot

---------

Co-authored-by: NidhiKJha <menidhikjha@gmail.com>
Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
2023-07-07 19:38:24 +05:30
David Walsh
64813fb660
UX: Multichain: Use Modal for AccountListMenu (#19809)
* UX: Multichain: Use Modal for AccountListMenu

* Update ui/components/multichain/account-list-menu/account-list-menu.js

Co-authored-by: George Marshall <george.marshall@consensys.net>

---------

Co-authored-by: George Marshall <george.marshall@consensys.net>
Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
2023-07-07 19:18:26 +05:30
Nidhi Kumari
a2730d46fb
updated background color (#19891) 2023-07-07 18:52:23 +05:30
Frederik Bolding
4918aa4c34
[FLASK] Fix Snaps UI divider (#19919) 2023-07-07 15:10:58 +02:00
Frederik Bolding
f829f0069d
[FLASK] Allow Snaps to use eth_accounts as a revokable permission (#19306)
* Add support for snap authorship component at the top of PermissionConnect

* Add PermissionCellOptions

* Add details popover

* Add action for revoking dynamic permissions

* Improve UI and revoke logic

* Better eth_accounts screen support

* Fix tests

* Fix lint

* More linting fixes

* Fix missing fence

* Add another fence

* Unnest permission page to fix weird CSS issues

* Hide footer on permissions connect when using a snap
2023-07-06 22:54:27 +02:00
António Regadas
2c22e85947
[MMI] personal sign and sign typed logic (#19892)
* adds missing logic

* lint fixes
2023-07-06 16:10:03 +01:00
David Walsh
1247e03a33
Fix #19856 - Don't autoclose Modals when Popover items are clicked (#19857) 2023-07-05 10:11:49 -07:00
David Walsh
945508c895
UX: Multichain: Convert AccountDetails Popover to Modal (#19811)
* UX: Multichain: Convert AccountDetails Popover to Modal

* Fix E2E

* updated spec file

---------

Co-authored-by: NidhiKJha <menidhikjha@gmail.com>
2023-07-05 18:27:02 +05:30
David Walsh
fdac94e361
Fix #19832 - UX: Multichain: Move location of test networks (#19812)
* UX: Multichain: Move location of test networks

* Re-add Linea
2023-07-05 15:31:45 +05:30
António Regadas
ecea2d7506
[MMI] fix note to trader (#19868)
* update styles

* updates snapshot

* prettier

* clean up
2023-07-05 11:00:15 +01:00
David Walsh
98c571e90d
UX: Multichain: Use new Box component (#19794)
Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
2023-07-04 20:47:05 +05:30
David Walsh
aa95fe838a
Fix #19764 - Move Token Options Menu (#19765) 2023-07-04 18:06:58 +05:30
David Walsh
e05aec8502
Fix #19830 - UX: Multichain test linting (#19792)
* Fix address-copy-button.test.js

* Fix connected-site-menu.js

* Fix app-header.test.js

* Fix product-tour-popover.test.js
2023-07-04 17:30:09 +05:30
George Marshall
7c014896e8
Fix hold to reveal button on mobile browsers (#19847)
* Replacing MouseDown/Up events with PointerDown/Up so works on mobile browsers

* More test updates

* More test updates
2023-06-30 14:11:29 -07:00
Garrett Bear
a41219ceb8
Update Design Tokens & Add New Text Variants (#19853)
* update button font weight to medium

* update design-tokens and add new Text medium

* undo button base weight change

* fix unused import

* update snapshot

* fix yarn dedupe

* update readme
2023-06-30 11:35:43 -07:00
Albert Olivé
17c5964735
[MMI] Removed institutional portfolio dashboard (#19842)
* Removed institutional portfolio dashboard

* Fixed eslint

* Removed unused key
2023-06-30 15:19:59 +02:00
Monte Lai
af2c87d777
[FLASK] Add Snaps Keyring (#19710)
* flask - add restricted snap_manageAccounts

* snap keyring: use local snap keyring instead of package

* mvp snap-keyring

* fixed the easier lint errors

* fix missing permission text

* add removal function

* update snap keyring

* update dep

* update git link

* update messages and remove snap keyring from lib

* set snapprovider as soon as possible

* chore: update snap keyring dependency

* chore: pass SnapController to SnapKeyring constructor

* chore: update deps and comment line (wip)

* fix latest update for snaps and remove setController

* update yarn lock

* add routes

* add messages

* add message

* add snap account detail page

* add snap account card

* add snap account page

* update route

* add background

* use css grid

* update snap text styling

* fix lint

* remove unused import

* change manage link to go to snap

* add types for react-router-dom

* add link to settings

* add breadcrumb to header

* add popover

* add prop types

* add link to propTypes

* fix icon in header and tag

* update popover

* update yarn.lock

* add link to account list menu

* update from deprecated

* add add-snap-popup

* use popoverheader

* fix lint

* update to use modal instead of popup

* add install snap

* remove export of DeferredPromise

* change snap keyring to its own enum

* update imports and fences

* fix snapId and route

* fix header and button for snapCard

* hide app header on AddSnapAccountPage

* update icon

* match path to SnapAccountDetail

* set getting started button to close modal

* fix key prop warning

* add By Metamask message

* fix label

* add fence to snapkeyringtype

* update yarn.lock

* refactor removeAccount and static snap list

* update removeSnap

* feat: remove associated accounts when snap is removed

* add get snaps installed to snaps page

* fix updateAvailable

* add tests to ui components

* update test

* update scss

* udpate config snap popup style

* fixed https://www.notion.so/Show-pop-up-only-once-c6aa8494486a4ece8a5c5e35fea56ab5

* update accountListMenu click to open tab or push depending on environment

* update yark.lock

* remove unused uuid

* update lock

* update eth-snap-keyring

* udpate install from snap page

* update to install to use popup

* use release versino of eth-snap-keyring

* chore: bump snaps-utils version to `0.34.1-flask.1`

* update configure snap

* chore: update eth-snap-keyring

* chore: update policies

* fix: remove unused

* fix: fix snap-account-detail-page test

* fix: fix styles

* chore: remove swappable-obj-proxy

* fix: fix duplicate entry

* fix: disable export private key for snaps account

* feat: shuffle snap lists on every reload

* fix: configure not popping up

* refactor: snapsAddSnapAccountModalDismissal into action and selector

* fix: E2BIG when running prettier

* fix: lint default export or add-snap-account-modal

* fix: lint, remove vendor prefix

* fix: fix snapCreatedByMetamask to snapCreatedByMetaMask

* Add `manageAccounts` RPC method (#19724)

* Update dependencies

* Remove snap-keyring-permissions

* Update dependencies

* Update dependencies

* Update imports

* removed portfolio link from wallet view (#19716)

* removed portfolio link from wallet view

* removed unused code

* updated test

* updated spec file

* updated test

* Validate LavaMoat policies on each PR (#19703)

* Validate LavaMoat policies on each PR

The LavaMoat policies are now validated on every PR. This makes it
easier to validate policy changes, as they should always correspond
with the changes made in the PR (unlike today, when they could be due
to a change in platform or a previous PR).

Closes #19680

* Update LavaMoat policies

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>

* fix(action): add required permissions to remove labels (#19728)

* Fix dependencies

* signature approved metrics e2e test (#19628)

* Update dependencies

* Integrate Snow with LavaMoat scuttling protection (#17969)

* Update lavamoat policies

* Security Provider cleanup (#19694)

* security-prov: isFlaggedSecurityProviderResponse

* security-prov: create shared/modules/util

* security prov: rn isFlagged -> isSuspcious
- util fn returns true if response is not verified and flagged

* security prov: add util test
and support undefined param

* security prov: reorg util fn
- no logic changes

* Update LavaMoat policies (#19744)

Update LavaMoat policies to match what CI expects.

* Replacing deprecated constants & creating stories (#19686)

* Replacing deprecated constants & creating stories

* updating snapshot

* fix: fix imports

* chore: update policy.json

* fix: move SmartTransactionController out of snaps code fence

* fix: yarn.lock dedupe

* fix: lavamoat policy

* fix: update test

* fix: remove snapshot, the list of snaps are always randomized.

* fix: resole snaps-controller to use flask

---------

Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
Co-authored-by: Gauthier Petetin <gauthierpetetin@hotmail.com>
Co-authored-by: Brad Decker <bhdecker84@gmail.com>
Co-authored-by: weizman <weizmangal@gmail.com>
Co-authored-by: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Co-authored-by: Dhruv <79097544+dhruvv173@users.noreply.github.com>
Co-authored-by: Monte Lai <monte.lai@consensys.net>

* Update LavaMoat policies

* chore: fix webapp policy.json

* feat: add snap label test

* feat: test to disable export private key for snap accounts

* feat: add snap account link test in account-list-menu

* fix: add fence for setSnapsAddSnapAccountModalDismissed

* fix: remove comments

* fix: move routes into snaps fence

* feat: use snap registry

* fix: account snap identification

* chore: add `keyring-snaps` feature flag

* fix: remove unneeded spread

* Disable warn logs in content-script (#19754)

* Use Yarn caching in GitHub Actions (#19662)

GitHub actions that install dependencies will now also cache those
dependencies using the standard strategy for Yarn (which is to hash the
lockfile).

This matches the module template (see https://github.com/MetaMask/metamask-module-template/pull/145
for details).

This should have no functional impact except that this action will run
faster when dependencies are unchanged.

* Fixing misspelling in 10.28.0 changelog notes (#19756)

* Add `tokenId` type validation in `wallet_watchAsset` middleware (#19738)

* Remove unused GitHub Action workflow (#19660)

This GitHub action workflow was disabled, but was still running setup
steps. It has now been removed entirely. We can re-introduce it again
later once the problem that led to it being disabled has been fixed.

The associated npm script and JavaScript module have been removed as
well.

* Fix #847 - Don't show account address on token pages (#19740)

Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>

* Deprecating FormField and fixing console error (#19739)

* Deprecating FormField and fixing console error

* Updating snapshots

* updated linea image for token and badge (#19717)

* updated linea image for token and badge

* replaced hardcoded string with constant

* UI updates for contacts Page (#19646)

* updated contacts flow update

* json file updates

* updated contacts edit and view list

* keep contacts tab selected

* lint fix

* replaced hardcoded strings with constant

* updated padding in box

* Replacing deprecated components and fixing prop errors (#19745)

* Use `snaps@0.35.2-flask.1` and `snaps@1.0.0-prerelease.1` (#19734)

* snaps@0.35.0-flask.1

* Update LavaMoat policies

* Update stable snaps packages to 1.0.0-prerelease.1

* Update LavaMoat policies

* Fix lint

* snaps@0.35.2

* Exclude snap_manageAccounts

* Code fencing

* Revert removing endowment:keyring exclusion

* Bump iframe URLs

* UX: Ensure multichain native token name is always shown (#19705)

* UX: Ensure multichain native token name is always shown

* Fix lint

* UX Multichain: fixed padding for edit screen (#19707)

* fixed padding for edit screen

* Use network picker for header trigger

* Fix swaps display

* updated snapshot

---------

Co-authored-by: David Walsh <davidwalsh83@gmail.com>

* Bump @metamask/providers to v11.1.0 (#19762)

* Bump @metamask/providers to v11.1.0

---------

Co-authored-by: Alex <adonesky@gmail.com>

* Fix fallback gas estimation (#19746)

* Fix fallback gas estimation

Our fallback gas estimation was failing due to a bug in the
`@metamask/controller-utils` package. This was causing gas estimation
to fail completely on certain networks (those not supported by our gas
estimation APIs and non EIP-1559 compatibile), and it was causing the
fallback gas estimation operation (in case our API was down) to fail
across all networks.

Fixes https://github.com/MetaMask/metamask-extension/issues/19735

* Add e2e tests

E2E tests have been added to capture gas estimation. Cases are added
for our API, for the fallback estimate, and for non-EIP-1559 estimates.

As part of this work, the legacy gas API had to be disabled. This was
being used in e2e tests but was dead code in production. It needed to
be disabled to ensure the code under test was reachable.

* Fix gas API referenced in e2e test

* Update unit test snapshots

* Update Label component font weight from bold to medium (#19731)

* Update Label component font weight from bold to medium

* update snapshot

* fix snapshots

* fix snapshots 2

* Removeing deprecated constants for enums

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>

* Part of #17670: Replace Typography with Text component in CancelSpeedupPopover (#18638)

* create story

* replace Typography with Text component

* review changes

* replace CSS with props styling
* use `Button` from `component-library`
* tooltip HTML refactor with `component-library` components
* remove whitespace in story

* strong tag support within Text component

* addresses #18651
* taken from #18752 as suggested in https://github.com/MetaMask/metamask-extension/pull/18638#discussion_r1176334805

* replace `strong` with new `Text as="strong"`

* remove unneccessary css from fa564e3f036f1439f9f220cca23595b508760614

* add text variant definition

* Updating text variant of button

* restrore proper spacing between elements

* Quick fix for test

* Adding key

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
Co-authored-by: Garrett Bear <gwhisten@gmail.com>

* Issue 17670 replace typography with text (#19433)

* Replace Typograph with Text component in numeric-input-component.js

* Replace Typography with Text component in signature-request-message.js

* Replace Typography with Text component in signature-request.component.js

* Replacing deprecating constants and fixing some signature story warnings

* Updating snapshot

* Fixing import

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
Co-authored-by: Garrett Bear <gwhisten@gmail.com>

* Part of #18714: Replacing deprecated constants in `confirm-subtitle` folder (#19699)

* repalcing deprecated constants

* resolve issue

* lint fixes

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>

* Part of #17670: Replace Typography with Text component in: callout.js (#18912)

* Part of #17670: Replace Typography with Text component in: callout.js

* Update ui/components/ui/callout/callout.js

Co-authored-by: Danica Shen <zhaodanica@gmail.com>

* Update callout.js

* Updating snapshot and deprecating component

* Updating snapshot and deprecating component

---------

Co-authored-by: Danica Shen <zhaodanica@gmail.com>
Co-authored-by: George Marshall <george.marshall@consensys.net>
Co-authored-by: Garrett Bear <gwhisten@gmail.com>

* [MMI] Added code fences in whats new popup (#19581)

* added code fences in whats new popup

* Improved code

* Added missing prop

* Update LavaMoat policies

* updated functions by using an options object for the rendering functions in order to bypass possible typsecript issues

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>

* Updated action list in token, NFTs and activity view (#19702)

* updated ui for nft import button

* updated no nft image found in the center

* updated footer for all screens in tabs

* removed no nft state from nft tab

* updated snapshot

* lint fix

* fixed e2e tests

* fixed prep build error

* removed no nfts yet test

* updated tabs

* fixed prod error

* updated no nft screen

* changed button size to md

* fix: change 'M' to '?'

* fix: update fence to keyring-snaps

* chore: rename folder

* fix: typo

* chore: remove logs

* feat: add metamask developer constant

* fix: sass keyring-snap path

* chore: update yarn.lock

* fix: remove alias

* feat: add KEYRING_SNAPS_REGISTRY_URL env

* fix: nested fence

* feat: add snap manageAccount e2e (#19777)

* feat: add snap manageAccount e2e

* feat: update link

* fix: lint

* fix: get values of restrictedMethodPermissionBuilders

* fix: add fence to perferences

* fix: stop shuffle

* fix: remove KEYRING_SNAPS_REGISTRY_URL from metamaskRc

* fix: use permissions to determine account snaps

* fix: remove shuffle

* fix: add comments to fences in excluded snap permission.

* chore: fix policy.json

* fix: fix snap-account-detail test

* fix: lint

* fix: snap accoutn detail page test

* Update LavaMoat policies

* Update ui/pages/keyring-snaps/snap-account-detail-page/snap-account-detail-page.test.tsx

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* Update ui/pages/keyring-snaps/snap-account-detail-page/snap-account-detail-page.test.tsx

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* fix: remove fence from isAbleToExportAccount

* chore: remove comment line

* fix: dismiss snap modal

* fix: try catch for scroll

* fix: icon for manageAccount

* fix: update `handleSnapRequest` to make `params` optional and add `id`

* fix: lint for uuid

* fix: remove arg in saveSnapKeyring

* fix: add fence for uuidV4

* chore: bump dep

* fix: permission_manageAccounts message and icon

* chore: update registry link

* chore: convert address to lowercase

* fix: change icon

* chore: bump eth-snap-keyring

* chore: update webapp policy.json

* Update ui/pages/keyring-snaps/new-snap-account-page/new-snap-account-page.test.tsx

Co-authored-by: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com>

* fix: update fences

* fix: nested fence

* Update app/_locales/en/messages.json

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* Update app/_locales/en/messages.json

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* Update app/_locales/en/messages.json

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* Update app/_locales/en/messages.json

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* Update ui/components/multichain/account-details/account-details-display.js

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* Update ui/pages/keyring-snaps/snap-account-detail-page/header.tsx

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* Update ui/pages/keyring-snaps/snap-account-detail-page/snap-account-detail-page.tsx

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* fix: rename and added jsdoc

* fix: add fence to snap label

* fix: remove comment

* fix: change pixel to int and remove unused class

* fix: lint

* fix: create two tests for main and flask restricted methods

* fix: remove fence in test

* fix: lint header

* feat: allow `metamask.github.io` in manifest

* fix: remove comment

* fix: rename isAbleToExportAccount

* chore: use a more restrictive registry URL

* fix: change to && not ||

* fix: remove unused

* fix: move keyring snaps URL to Flask's base manifest

* fix: use fetch instead of fetchWithCache

* fix: lint

---------

Co-authored-by: kumavis <aaron@kumavis.me>
Co-authored-by: Howard Braham <howrad@gmail.com>
Co-authored-by: Daniel Rocha <68558152+danroc@users.noreply.github.com>
Co-authored-by: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com>
Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
Co-authored-by: Gauthier Petetin <gauthierpetetin@hotmail.com>
Co-authored-by: Brad Decker <bhdecker84@gmail.com>
Co-authored-by: weizman <weizmangal@gmail.com>
Co-authored-by: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Co-authored-by: Dhruv <79097544+dhruvv173@users.noreply.github.com>
Co-authored-by: ryanml <ryanlanese@gmail.com>
Co-authored-by: Alex Donesky <adonesky@gmail.com>
Co-authored-by: David Walsh <davidwalsh83@gmail.com>
Co-authored-by: George Marshall <george.marshall@consensys.net>
Co-authored-by: Frederik Bolding <frederik.bolding@gmail.com>
Co-authored-by: jiexi <jiexiluan@gmail.com>
Co-authored-by: jainex <jainexp017@gmail.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: Garrett Bear <gwhisten@gmail.com>
Co-authored-by: Ujwal Kumar <ujwalkumar95@gmail.com>
Co-authored-by: rohit kerkar <129620973+rohiiittttt@users.noreply.github.com>
Co-authored-by: Harsh Shukla <125105825+PrgrmrHarshShukla@users.noreply.github.com>
Co-authored-by: Danica Shen <zhaodanica@gmail.com>
Co-authored-by: Albert Olivé <albertolivecorbella@gmail.com>
Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>
2023-06-29 09:24:08 -04:00
Nidhi Kumari
b9bca5feca
removed margin for popup view (#19804) 2023-06-28 20:41:19 +05:30
David Walsh
7e7b4f018c
UX: Multichain: Update deprecated variables (#19795) 2023-06-28 10:03:50 -05:00
David Walsh
fd20f48e2c
UX: Multichain: Make imports consistent (#19793) 2023-06-28 08:37:03 -05:00
Frederik Bolding
c8f26d8c24
Fix design inconsistencies in the connect flow (#19800) 2023-06-28 14:36:20 +02:00
Albert Olivé
9271cfd7bf
[MMI] The add custody token view needs a styles tweak (#19779)
* fixing styles

* Fixing styles and snapshots

* fixed eslint rule

* Removed unnecessary test
2023-06-27 15:49:15 +02:00
Nidhi Kumari
af56e34d5f
Updated action list in token, NFTs and activity view (#19702)
* updated ui for nft import button

* updated no nft image found in the center

* updated footer for all screens in tabs

* removed no nft state from nft tab

* updated snapshot

* lint fix

* fixed e2e tests

* fixed prep build error

* removed no nfts yet test

* updated tabs

* fixed prod error

* updated no nft screen

* changed button size to md
2023-06-27 12:05:31 +05:30
Albert Olivé
1e56fdbf66
[MMI] Added code fences in whats new popup (#19581)
* added code fences in whats new popup

* Improved code

* Added missing prop

* Update LavaMoat policies

* updated functions by using an options object for the rendering functions in order to bypass possible typsecript issues

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
2023-06-27 08:30:42 +02:00
Harsh Shukla
ec4c4050e6
Part of #17670: Replace Typography with Text component in: callout.js (#18912)
* Part of #17670: Replace Typography with Text component in: callout.js

* Update ui/components/ui/callout/callout.js

Co-authored-by: Danica Shen <zhaodanica@gmail.com>

* Update callout.js

* Updating snapshot and deprecating component

* Updating snapshot and deprecating component

---------

Co-authored-by: Danica Shen <zhaodanica@gmail.com>
Co-authored-by: George Marshall <george.marshall@consensys.net>
Co-authored-by: Garrett Bear <gwhisten@gmail.com>
2023-06-26 19:36:01 -07:00
rohit kerkar
deabc3ed5f
Part of #18714: Replacing deprecated constants in confirm-subtitle folder (#19699)
* repalcing deprecated constants

* resolve issue

* lint fixes

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
2023-06-26 19:35:45 -07:00
Ujwal Kumar
04839a250d
Issue 17670 replace typography with text (#19433)
* Replace Typograph with Text component in numeric-input-component.js

* Replace Typography with Text component in signature-request-message.js

* Replace Typography with Text component in signature-request.component.js

* Replacing deprecating constants and fixing some signature story warnings

* Updating snapshot

* Fixing import

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
Co-authored-by: Garrett Bear <gwhisten@gmail.com>
2023-06-26 15:50:08 -07:00
113fdc189c
Part of #17670: Replace Typography with Text component in CancelSpeedupPopover (#18638)
* create story

* replace Typography with Text component

* review changes

* replace CSS with props styling
* use `Button` from `component-library`
* tooltip HTML refactor with `component-library` components
* remove whitespace in story

* strong tag support within Text component

* addresses #18651
* taken from #18752 as suggested in https://github.com/MetaMask/metamask-extension/pull/18638#discussion_r1176334805

* replace `strong` with new `Text as="strong"`

* remove unneccessary css from fa564e3f036f1439f9f220cca23595b508760614

* add text variant definition

* Updating text variant of button

* restrore proper spacing between elements

* Quick fix for test

* Adding key

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
Co-authored-by: Garrett Bear <gwhisten@gmail.com>
2023-06-26 13:52:54 -07:00
jainex
c1c6c8237a
Update Label component font weight from bold to medium (#19731)
* Update Label component font weight from bold to medium

* update snapshot

* fix snapshots

* fix snapshots 2

* Removeing deprecated constants for enums

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
2023-06-27 01:29:04 +05:30
Mark Stacey
ec7e7fdf6d
Fix fallback gas estimation (#19746)
* Fix fallback gas estimation

Our fallback gas estimation was failing due to a bug in the
`@metamask/controller-utils` package. This was causing gas estimation
to fail completely on certain networks (those not supported by our gas
estimation APIs and non EIP-1559 compatibile), and it was causing the
fallback gas estimation operation (in case our API was down) to fail
across all networks.

Fixes https://github.com/MetaMask/metamask-extension/issues/19735

* Add e2e tests

E2E tests have been added to capture gas estimation. Cases are added
for our API, for the fallback estimate, and for non-EIP-1559 estimates.

As part of this work, the legacy gas API had to be disabled. This was
being used in e2e tests but was dead code in production. It needed to
be disabled to ensure the code under test was reachable.

* Fix gas API referenced in e2e test

* Update unit test snapshots
2023-06-26 16:13:16 -02:30
Nidhi Kumari
eb506a5694
UX Multichain: fixed padding for edit screen (#19707)
* fixed padding for edit screen

* Use network picker for header trigger

* Fix swaps display

* updated snapshot

---------

Co-authored-by: David Walsh <davidwalsh83@gmail.com>
2023-06-26 23:27:56 +05:30
David Walsh
9a9625d96c
UX: Ensure multichain native token name is always shown (#19705)
* UX: Ensure multichain native token name is always shown

* Fix lint
2023-06-26 12:54:32 -05:00
Nidhi Kumari
e9423be894
updated linea image for token and badge (#19717)
* updated linea image for token and badge

* replaced hardcoded string with constant
2023-06-26 22:07:20 +05:30
George Marshall
48f61dcf61
Deprecating FormField and fixing console error (#19739)
* Deprecating FormField and fixing console error

* Updating snapshots
2023-06-26 09:29:33 -07:00
David Walsh
e37e570b2e
Fix #847 - Don't show account address on token pages (#19740)
Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
2023-06-26 11:13:26 -05:00
Dhruv
1c7c89abcb
Replacing deprecated constants & creating stories (#19686)
* Replacing deprecated constants & creating stories

* updating snapshot
2023-06-23 14:38:40 -07:00
Ariella Vu
34375a57e5
Security Provider cleanup (#19694)
* security-prov: isFlaggedSecurityProviderResponse

* security-prov: create shared/modules/util

* security prov: rn isFlagged -> isSuspcious
- util fn returns true if response is not verified and flagged

* security prov: add util test
and support undefined param

* security prov: reorg util fn
- no logic changes
2023-06-23 20:08:22 +02:00
Nidhi Kumari
dfb830e862
removed portfolio link from wallet view (#19716)
* removed portfolio link from wallet view

* removed unused code

* updated test

* updated spec file

* updated test
2023-06-23 17:28:41 +05:30
António Regadas
80bfb5b501
[MMI] rearrange mmi account menu options (#19635)
* adds the portfolio dashboard option and compliance to the global menu

* undo change
2023-06-23 11:55:31 +02:00
António Regadas
93704a8479
fixes the stake a portfolio icons not showing (#19633) 2023-06-23 11:54:59 +02:00
António Regadas
adc02dd534
adds MMI blue fox svg (#19632) 2023-06-23 11:54:04 +02:00
Dhruv
bc1a15a0a3
Creating stories for LoadingHeartBeat and LoadingIndicator (#19495)
* Creating stories

* lint fix

* Updating LoadingHeartbeat story

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
2023-06-20 15:16:19 -07:00
Dhruv
ab0374d48a
Part of #18714: Replacing deprecated constants with enums (#19516)
* replacing deprecated constants with enums

* Removing redundant properties
2023-06-20 15:14:45 -07:00
rohit kerkar
639de748fb
Adding story for CancelButton (#19566)
Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
2023-06-20 13:44:54 -07:00
rohit kerkar
4a8a4aa01b
creating story for multilayer-fee-message & nft-options (#19567)
* creating story for multilayer fee message

* add story for nftoptions

* lint fixed

* suggestion

* Updating function props to actions in storybook

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
2023-06-20 13:43:27 -07:00
Howard Braham
9acd4b4ea1
feat(srp): add a quiz to the SRP reveal (#19283)
* feat(srp): add a quiz to the SRP reveal

* fixed the popover header centering

* lint fixes

* converted from `ui/components/ui/popover` to `ui/components/component-library/modal`

* responded to @darkwing review

* added unit tests

* renamed the folder to 'srp-quiz-modal'

* responded to Monte's review

* using i18n-helper in the test suite

* small improvement to JSXDict comments

* wrote a new webdriver.holdMouseDownOnElement() to assist with testing the "Hold to reveal SRP" button

* Updating layout and some storybook naming and migrating to tsx

* Apply suggestions from @georgewrmarshall

Co-authored-by: George Marshall <george.marshall@consensys.net>

* Unit test searches by data-testid instead of by text

* new layout and copy for the Settings->Security page

* now with 100% test coverage for /ui/pages/settings/security-tab
fixes #16871
fixes #18140

* e2e tests to reveal SRP after quiz

* e2e- Fix lint, remove unneeded extras

* @coreyjanssen and @georgewrmarshall compromise

Co-authored-by: George Marshall <george.marshall@consensys.net>
Co-authored-by: Corey Janssen <corey.janssen@consensys.net>

* trying isRequired again

* transparent background on PNG

* [e2e] moving functions to helpers and adding testid for SRP reveal quiz (#19481)

* moving functions to helpers and adding testid

* fix lint error

* took out the IPFS gateway fixes

* lint fix

* translations of SRP Reveal Quiz

* new Spanish translation from Guto

* Update describe for e2e tests

* Apply suggestion from @georgewrmarshall

Co-authored-by: George Marshall <george.marshall@consensys.net>

* fixed the Tab key problem

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
Co-authored-by: Plasma Corral <32695229+plasmacorral@users.noreply.github.com>
Co-authored-by: Corey Janssen <corey.janssen@consensys.net>
2023-06-20 14:27:10 -04:00
David Walsh
ba3f86400c
Fix #19609 - Prevent rounded corners in account menu (#19615) 2023-06-20 08:38:24 -05:00
OGPoyraz
39089e0f4c
Accept SignController approval request from frontend (#19184) 2023-06-20 15:37:09 +02:00
jainex
6bc6cba6d5
remove Unused CSS (#19602)
Co-authored-by: Brad Decker <bhdecker84@gmail.com>
Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
2023-06-19 23:29:52 +05:30
Victorien Gauch
e4923399a9
feat: add new linea mainnet network (#19326)
* feat: add new linea mainnet network

* fix: removed unused condition + lint code

* fix: update tests + fix network tab issue

* feat: add feature toggle for linea mainnet

* fix: add feature toggle for linea mainnet

* feat: add linea mainnet logo

* update @metamask/eth-json-rpc-infura package to support linea networks

* update linea mainnet block explorer url

* fix: refactor linea mainnet feature toggle

* fix: update linea mainnet chain id and rpc url

* fix: update settings-search unit test

* fix: update linea mainnet feature flag

* fix: remove useless async function keyword for linea mainnet feature flag
2023-06-16 14:05:33 -02:30
Garrett Bear
70d86ee67c
Feat/19274/ds popover update account list menu (#19534)
* update account list menu to use ds popover and fix accessibility issue

* close popover if user continues to tab to next items

* remove disable logic not doing anything

* add stylesheet

* add refs to track last menuitem

* cleaned up ref version for MenuItems

* fix test

* add click away option and fix test

* fix e2e test

* undo e2e test

* add account e2e

* fix click outside component

* remove additional line break

* remove commented out code

* add isOpen to story

* set width to 225px
2023-06-16 09:25:13 -07:00
David Walsh
bc2a5aaf96
Fix #19619 - Submit the account creation form when pressing enter (#19620) 2023-06-16 08:13:08 -05:00
Alex Donesky
c16b35c029
Extend wallet_watchAsset to support ERC721 and ERC1155 tokens (#19454)
* Extend wallet_watchAsset to support ERC721 and ERC1155 tokens
2023-06-15 15:18:12 -05:00
Daniel
8b3e3c8a58
Swaps UI update (#19169) 2023-06-15 20:17:21 +02:00
Olusegun Akintayo
a0e6737848
Fix unknown processing time not showing in warning color (#19527) 2023-06-15 10:52:08 -05:00
David Walsh
276d9c74c6
Fix #19437 - Prevent Connected Sites global menu item from being clicked during confirmation (#19598)
* Fix #19437 - Prevent Connected Sites global menu item from being clicked during confirmation

* Add tests
2023-06-15 08:36:28 -05:00
David Walsh
b6f42bacf7
UX: Add portfolio button in overview (#19601) 2023-06-15 08:17:29 -05:00
Victorien Gauch
1fca9255c1
fix: refactor linea goerli testnet implementation (#19321)
* fix: refactor linea goerli testnet implementation

* fix: rename linea goerli network

* feat: add linea testnet logo

* update linea goerli block explorer url

* update @metamask/eth-json-rpc-infura package to version 8.1.0

* fix: refactor ticker map object in shared/constants/networks.ts files
2023-06-15 09:08:07 -02:30
David Walsh
875bad125f
Fix #19439 - Allow Account Picker during Send flow (#19522)
* Fix #19439 - Allow Account Picker during Send flow

* Disable any network change with confirmations pending

* Disable the settings menu during an unconfirmed transaction
2023-06-14 13:49:14 -05:00
George Marshall
f4f80c223e
Adding deprecation tags to popover and old modals (#19556)
Co-authored-by: Garrett Bear <gwhisten@gmail.com>
2023-06-14 09:47:16 -07:00
Nidhi Kumari
bdb26b04fc
updated components with Multichain Prefix (#19593) 2023-06-14 21:21:19 +05:30
Nidhi Kumari
cc0b30776a
UX Multichain: updated enums for multichain token list item (#19575)
* updated enums for multichain token list iteam

* updated snapshot
2023-06-13 20:47:21 +05:30
George Marshall
6c3f31d382
Adding background/default to BorderColor enum to prevent propType error and updating tests (#19571) 2023-06-13 08:11:21 -07:00
David Walsh
28137798b6
UX: Multichain: Move Add Account and Import Account into Account Menu Popover (#19346)
* UX: Multichain: Move Add Account and Import Account into Account Menu Popover

* Create a new CreateAccount component for the Account Menu

* Add actions for import form

* Use separate actions for cancel vs. submit

* Fix jest tests

* Remove commented route navigation

* Accommodate for failing import

* Fix tests

* Remove routes for new account and import

* Remove old create account page

* Move import-account files to multichain directory

* Fix paths on the import files

* Remove deprecated component library variables

* Fix error property of add form

* Fix user-actions-benchmark
2023-06-13 10:07:01 -05:00
Elliot Winkler
f77b1f65e2
Upgrade assets-controllers to v9 (#19472) 2023-06-09 15:48:48 -05:00
Nidhi Kumari
f11596710c
UX Multichain: Updated header to use picker network in popup view (#19514)
* updated avatar network to use picker network in popup view

* removed unused locale

* fixed the extra gap

* fixed css

* fixed lint error

* updated aria label
2023-06-09 21:30:11 +05:30
Hassan Malik
ff36e32fb0
[FLASK] Improve snaps connect flow (#19461)
* add todo comments

* add snaps-connect component

* added new messages

* added component scss files to main scss files

* remove dead code and add snap-connect-cell

* update snaps connect

* updated messages and styling

* update messages and css

* update css

* moved snaps privacy warning into snaps connect, moved snaps connect error into snap install

* added story and removed unused import

* fix style linting and move snaps connect error css

* removed unused message

* ran lavamoat policy generation

* fix fencing

* some more css changes

* Fix scrolling and box shadow

* added comment, fixed quote

* Align more with Figma

* Regen LavaMoat policies

* bring back privacy logic to permission page container

* Revert scrolling changes + fix snaps icon

* fix linting, reintroduced dedupe logic and additionally addressed a corner case

* made some fixes

* Fix scrolling with multiple snaps

* add dedupe logic to snaps connect and fix spacing issue

* policy regen

* lint fix

* fix fencing

* replaced with new icon design, trimmed origin urls in certain places

* remove unused imports

* badge icon size

* Revert LM policy changes

* Use SnapAvatar for snaps-connect

* Use InstallError for connection failed

* Delete unused CSS file

* Remove unused CSS

* Use useOriginMetadata

* addressed PR comments

* fix linting errors

* add explicit condition

* fix fencing

* fix some more fencing

* fix util fencing issue

* fix storybook file, prevent null destructuring

* Fix storybook origin URLs

* Fix wrong prop name

---------

Co-authored-by: Frederik Bolding <frederik.bolding@gmail.com>
Co-authored-by: Guillaume Roux <guillaumeroux123@gmail.com>
Co-authored-by: Erik Nilsson <eriks@mail.se>
2023-06-09 10:36:38 -04:00
David Drazic
8eff1fc1ff
[FLASK] Update Snaps privacy notice (#19501)
* Update Snaps privacy notice

* Add changes to finalize update requirements

* Update scroll icon color

* Fix unit tests

* Update link

* Address small change requests

* Fix unit test

* move terms of use link to variable

---------

Co-authored-by: Guillaume Roux <guillaumeroux123@gmail.com>
2023-06-09 14:22:31 +02:00
George Marshall
006d90fee7
Deprecate JS version of Box in favor of TS version (#19530)
* Initail deprecation messages and updates

* Updating spelling of favour to US spelling favor
2023-06-08 13:37:09 -07:00
George Marshall
35ae06d824
Adding Box component in TS to component-library (#19363)
* Adding TS version of Box to component-library

* Updates to types and comments
2023-06-08 11:12:16 -07:00
Binij Shrestha
fa70aec286
added validTag string literal union (#19258)
* added validTag string literal union

* Adding deprecation message

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
Co-authored-by: Garrett Bear <gwhisten@gmail.com>
2023-06-08 11:01:00 -07:00
Nidhi Kumari
c0afc4d2a9
update icons for add-network (#19513) 2023-06-08 22:56:20 +05:30
Nidhi Kumari
a8e194a8f6
Send flow UI update (#19465)
* removed recents and added accounts in send flow

* updated add contact button and fixed full screen view

* updated ui for contacts

* fixed lint errors and test

* fixed lint errors

* fixed lint errors

* updated spec files

* fixed lint errors

* updated snapshot

* fixed edit in spec files

* removed unused console statement

* updated snapshot

* added userInput check

* updated snapshot and added hover
2023-06-08 22:39:39 +05:30
Suraj Jadhav
6ede0422ca
issue-18714: Replaced deprecated constants with enum in EthSignModal and HoldToRevealModal Component (#19499)
* issue-18714: Replaced deprecated constants with enum in eth-sign-modal.js

* issue-18714: Replaced deprecated constants with enum in hold-to-reveal-modal.js
2023-06-08 16:35:16 +05:30
aleksandar-mihajlovic
f3147bcfb7
Added the ability to navigate multiple SIWE notifications (#18103) 2023-06-08 13:02:08 +02:00
David Drazic
2e856894cc
[FLASK] Update snap installation permission warning UI (#19494)
* Update snap installation permission warning UI

* Fix font size (TextVariant)

* Fix vertical margins between labels

* Update font weight in warning top description

* Update snapName for warning modal on update flow
2023-06-08 12:32:47 +02:00
Olusegun Akintayo
e2c4e93ab0
When gas fees suggested by dapp is too high, show warning color and icon (#19088)
* When gas fees suggested by dapp is too high, show warning color and icon

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

tests

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

Fix tests

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

set a default for high gas fees

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

Fix test cases where transaction is undefined.

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

Fix locale error

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

Fix error where dappSuggestedGasFees is null

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

Fix icon for site suggested

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

Fix unit tests snapshot

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* Fix QA Comments

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* lint:fix

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* Fix unit tests

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* Fix PR comments

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* Lint fix

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* Fix PR comment. - call setEstimateUsed only once.

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* use constants for Priority levels.

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

---------

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>
2023-06-08 13:26:18 +03:00
Suraj Jadhav
e7adf7ac22
issue-18714: Replaced deprecated constants with enum in confirmation-warning-modal.js (#19477) 2023-06-07 16:19:32 -07:00
Dhruv
58f6cf96cf
Creating story for icon-border (#19467)
* Creating story for icon-border

* Adding deprecation message

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
2023-06-07 16:18:33 -07:00
Dhruv
29e6c2d34e
Creating story for account-mismatch-warning (#19460)
* Creating story for account-mismatch-warning

* Removed line break

---------

Co-authored-by: George Marshall <george.marshall@consensys.net>
2023-06-07 16:17:08 -07:00
Frederik Bolding
789779f4d5
[FLASK] Rework Snaps headers and footers (#19442)
* Add new snap header and footer to snap install

* Add new snap header and footer to snap result and snap update

* Fix loading state

* Fix lint

* Add required scrolling

* Adjust avatar component

* Apply new headers and footers to snaps confirmations

* Rename previous SnapAuthorship component to SnapAuthorshipExpanded

* Fix lint

* Fix font weight

* Fix fencing

* Fix a test

* Fix lint after rebase

* Fix E2E

* Fix locale lint

* Fix another E2E

* Fix test ID

* Address PR comments

* Better scroll button centering

* Address design comments

* Fix unit test

* Fix E2Es
2023-06-07 15:18:49 +02:00
Dhruv
2b95d7b242
Creating story for asset-list (#19450)
* Creating story for asset-list component

* lint fix

* lint-fix
2023-06-06 11:31:18 -07:00
David Walsh
7d7d09e469
UX: Multichain: Restore Flask support link and text (#19198)
* UX: Multichain: Restore Flask support link and text

* Update test
2023-06-06 11:02:00 -05:00
Niranjana Binoy
b5b3f67b4b
Using NetworkAccountBalanceHeader component on SIWE screen (#19361) 2023-06-06 09:53:28 -04:00
David Drazic
354788510e
[FLASK] Update UI (for audit) (UI facelift) (#19388)
* Update UI (for audit)

Revert yarn.lock change

Update e2e tests with new copy for a button

Make UI changes to custom Snap UI

Update UI on snap installation success page

Fix icon on installation success

Fix snap name font weight in installation page

Add UI changes for Snap installation failed page

Add new copy for snap installation screen

Update e2e tests OK button name

Update OK button names in e2e tests

Return previous functionality of update flow

Add error message handling for update screens

* Fix after rebase

* Fix messages.json update message

* Revert SCSS changes

* Refactor failed and success screen rendering
2023-06-06 12:15:20 +02:00
Frederik Bolding
c66d65921c
[FLASK] Limit notification count display to 99+ (#19449) 2023-06-06 11:00:42 +02:00
rohit kerkar
15bdb32bb6
replacing depricated constants (#19448)
Co-authored-by: George Marshall <george.marshall@consensys.net>
2023-06-06 14:21:27 +05:30
rohit kerkar
b40b4c6239
replacing depricated constants (#19447) 2023-06-06 14:20:45 +05:30
Dhruv
61e952bad0
Replacing deprecated constants with enums (#19242) 2023-06-05 21:25:20 +05:30
Dhruv
5c5de03846
Updating component-library readme storybook render (#19359)
Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
Co-authored-by: Garrett Bear <gwhisten@gmail.com>
2023-06-05 21:23:25 +05:30
rohit kerkar
3ec2c189b0
Part of #18714: Replacing deprecated constants in Avatar-Base folder (#19408)
Co-authored-by: George Marshall <george.marshall@consensys.net>
Co-authored-by: Brad Decker <bhdecker84@gmail.com>
2023-06-05 10:43:23 -05:00
Frederik Bolding
3b9e2eb5e5
[FLASK] Update snap tweaks (#19410)
* Sort revoked permissions before existing permissions

* Simplify update screen logic and update copy

* Remove approve and update copy

* Reduce nesting
2023-06-05 14:31:11 +02:00
vthomas13
1726fb3fd0
Remove MULTICHAIN flag for NFT badges (#19416) 2023-06-04 12:28:48 -04:00
David Walsh
931b126831
UX: Multichain: Make MetaFox logo more accessible (#19395)
* UX: Multichain: Make MetaFox logo more accessible

* Fix jest snapshots
2023-06-02 11:43:20 -05:00
vthomas13
4f8c4820d2
Multichain NFT network badges (#19029)
* adding badges for nfts

* fixing default nft styling issue

* adding multichain flag, making borderRadius inline

* Apply suggestions from code review

Co-authored-by: George Marshall <george.marshall@consensys.net>

* fixing imports

* removing nullcheck for guaranteed fields

* moving badgewrapper UI into multichain component

* using Box for button, removing inline style, border-radius for NFT default image

* adding nft badges to NFT Details page

* nits, snap update

* fixing/refactoring nftdefaultimage display, adding clickable, removing handleimageclick, refactor NFTItem, required props

* editing nft-default-image story, test, and snap

* Updating to fix positioning, use Box props to reduce CSS and BEM naming conventions

* moving minor styling to Box props, adding comment

* display block typo

---------

Co-authored-by: George Marshall <george.marshall@consensys.net>
2023-06-02 11:01:51 -04:00