ryanml 1739ed9710 conflict fixes

2021-06-10 14:42:59 -07:00

..

__mocks__

remove the ui/app and ui/lib folders (#10911)

2021-06-06 12:45:27 -02:30

components

conflict fixes

2021-06-10 14:42:59 -07:00

contexts

remove the ui/app and ui/lib folders (#10911)

2021-06-06 12:45:27 -02:30

css

Fix #10173 - Prevent lag in external monitors when using Mac + Chrome (#10952)

2021-06-07 09:58:45 -02:30

ducks

conflict fixes

2021-06-10 14:42:59 -07:00

helpers

Using values from shared/constants/time to represent timing values (#11241)

2021-06-10 12:27:03 -07:00

hooks

Using values from shared/constants/time to represent timing values (#11241)

2021-06-10 12:27:03 -07:00

pages

conflict fixes

2021-06-10 14:42:59 -07:00

selectors

Relocate send state into send duck from metamask duck (#11252)

2021-06-10 12:53:15 -05:00

store

Relocate send state into send duck from metamask duck (#11252)

2021-06-10 12:53:15 -05:00

index.js

remove the ui/app and ui/lib folders (#10911)

2021-06-06 12:45:27 -02:30