[go: nahoru, domu]

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

Merge Metamask extension dev-test branch #42

Merged
merged 218 commits into from
May 24, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
218 commits
Select commit Hold shift + click to select a range
99f2568
Create dir
MitchellTesla May 24, 2021
6dfd797
♻️ update metamask-extension/ui/contexts
MitchellTesla May 24, 2021
c64f9f9
Create dir
MitchellTesla May 24, 2021
854f9fc
♻️ update metamask-extension/ui/css/itcss/tools
MitchellTesla May 24, 2021
26c70de
Create dir
MitchellTesla May 24, 2021
51a2745
Create dir
MitchellTesla May 24, 2021
b71113a
♻️ update metamask-extension/ui/css/itcss main
MitchellTesla May 24, 2021
1a50445
Create dir
MitchellTesla May 24, 2021
94a5d12
♻️ update metamask-extension/ui/css/utilities
MitchellTesla May 24, 2021
e68ddff
Create dir
MitchellTesla May 24, 2021
d7e1c33
♻️ update metamask-extension/ui/css/design-system
MitchellTesla May 24, 2021
218716e
♻️ update metamask-extension/ui/css
MitchellTesla May 24, 2021
9b9400c
Create dir
MitchellTesla May 24, 2021
5d6d87b
Create dir
MitchellTesla May 24, 2021
a868594
Create dir
MitchellTesla May 24, 2021
df73e0e
Create dir
MitchellTesla May 24, 2021
4d22682
Create dir
MitchellTesla May 24, 2021
66eea26
Create dir
MitchellTesla May 24, 2021
d722c44
Create dir
MitchellTesla May 24, 2021
b95eed7
Create dir
MitchellTesla May 24, 2021
c695444
Create dir
MitchellTesla May 24, 2021
09bf4f1
♻️ update metamask-extension/ui/ducks main
MitchellTesla May 24, 2021
27369ca
♻️ update metamask-extension/ui/ducks/swaps
MitchellTesla May 24, 2021
5fccf60
♻️ update metamask-extension/ui/ducks/send
MitchellTesla May 24, 2021
6fef77f
♻️ update metamask-extension/ui/ducks/metamask
MitchellTesla May 24, 2021
4f559fa
♻️ update metamask-extension/ui/ducks/locale
MitchellTesla May 24, 2021
cc74309
♻️ update metamask-extension/ui/ducks/history
MitchellTesla May 24, 2021
3969e5c
♻️ update metamask-extension/ui/ducks/gas
MitchellTesla May 24, 2021
2bb1328
♻️ update metamask-extension/ui/ducks/confirm-transaction
MitchellTesla May 24, 2021
8d3810a
♻️ update metamask-extension/ui/ducks/app
MitchellTesla May 24, 2021
dd6b9a5
♻️ update metamask-extension/ui/ducks/alerts
MitchellTesla May 24, 2021
6864966
Create dir
MitchellTesla May 24, 2021
c6b0f21
♻️ update metamask-extension/ui/helpers/constants
MitchellTesla May 24, 2021
5fb883d
Create dir
MitchellTesla May 24, 2021
55685a7
♻️ update metamask-extension/ui/helpers/utils
MitchellTesla May 24, 2021
e34d604
Create dir
MitchellTesla May 24, 2021
59703f2
♻️ update metamask-extension/ui/helpers/higher-order-components/initi…
MitchellTesla May 24, 2021
e215866
Create dir
MitchellTesla May 24, 2021
5c318f4
♻️ update metamask-extension/ui/helpers/higher-order-components/with-…
MitchellTesla May 24, 2021
6826914
Create dir
MitchellTesla May 24, 2021
65af9f5
♻️ update metamask-extension/ui/helpers/authenticated
MitchellTesla May 24, 2021
588bb98
♻️ update metamask-extension/ui/helpers
MitchellTesla May 24, 2021
d5aeafb
Create dir
MitchellTesla May 24, 2021
76dbc79
♻️ update metamask-extension/ui/hooks
MitchellTesla May 24, 2021
241832f
Create dir
MitchellTesla May 24, 2021
db3aa61
♻️ update metamask-extension/ui/selectors
MitchellTesla May 24, 2021
a526f8b
Create dir
MitchellTesla May 24, 2021
057e69e
♻️ update metamask-extension/ui/store
MitchellTesla May 24, 2021
01b542d
Create dir
MitchellTesla May 24, 2021
a3d30c6
♻️ update metamask-extension/ui/pages/add-token/token-list/token-list…
MitchellTesla May 24, 2021
49d7f6a
♻️ update metamask-extension/ui/pages/add-token/token-list
MitchellTesla May 24, 2021
4829b4f
Create dir
MitchellTesla May 24, 2021
79f87b0
♻️ update metamask-extension/ui/pages/add-token/token-search
MitchellTesla May 24, 2021
7f6dfe4
♻️ update metamask-extension/ui/pages/add-token
MitchellTesla May 24, 2021
7da83ea
Create dir
MitchellTesla May 24, 2021
9128b76
♻️ update metamask-extension/ui/pages/asset/components
MitchellTesla May 24, 2021
6319efd
♻️ update metamask-extension/ui/pages/asset
MitchellTesla May 24, 2021
c13980f
Create dir
MitchellTesla May 24, 2021
fddd779
♻️ update metamask-extension/ui/pages/confirm-add-token
MitchellTesla May 24, 2021
4bb8b63
Create dir
MitchellTesla May 24, 2021
d2f9855
♻️ update metamask-extension/ui/pages/confirm-approve/confirm-approve…
MitchellTesla May 24, 2021
8cabe2a
♻️ update metamask-extension/ui/pages/confirm-approve
MitchellTesla May 24, 2021
7438b0e
Create dir
MitchellTesla May 24, 2021
1e2ffe6
♻️ update metamask-extension/ui/pages/confirm-add-suggested-token
MitchellTesla May 24, 2021
5a8110f
Create dir
MitchellTesla May 24, 2021
3e40d4d
♻️ update metamask-extension/ui/pages/confirm-decrypt-message
MitchellTesla May 24, 2021
8eb3c2e
Create dir
MitchellTesla May 24, 2021
182d7cf
♻️ update metamask-extension/ui/pages/confirm-deploy-contract
MitchellTesla May 24, 2021
826e762
Create dir
MitchellTesla May 24, 2021
3711d29
♻️ update metamask-extension/ui/pages/confirm-encryption-public-key
MitchellTesla May 24, 2021
1dd158a
Create dir
MitchellTesla May 24, 2021
abf226d
♻️ update metamask-extension/ui/pages/confirm-send-ether
MitchellTesla May 24, 2021
5278bce
Create dir
MitchellTesla May 24, 2021
b95ee13
♻️ update metamask-extension/ui/pages/confirm-send-token
MitchellTesla May 24, 2021
57b5319
Create dir
MitchellTesla May 24, 2021
779e887
♻️ update metamask-extension/ui/pages/confirm-token-transaction-base
MitchellTesla May 24, 2021
cf8eea4
Create dir
MitchellTesla May 24, 2021
359c1f5
♻️ update metamask-extension/ui/pages/confirm-transaction
MitchellTesla May 24, 2021
8416dd4
Create dir
MitchellTesla May 24, 2021
532f801
♻️ update metamask-extension/ui/pages/confirm-transaction-base
MitchellTesla May 24, 2021
26a439b
Create dir
MitchellTesla May 24, 2021
058cee3
♻️ update metamask-extension/ui/pages/confirm-transaction-switch
MitchellTesla May 24, 2021
f170e4c
Create dir
MitchellTesla May 24, 2021
699c114
♻️ update metamask-extension/ui/pages/confirmation/components/confirm…
MitchellTesla May 24, 2021
40133ca
Create dir
MitchellTesla May 24, 2021
5be267e
♻️ update metamask-extension/ui/pages/confirmation/templates
MitchellTesla May 24, 2021
95f53cd
♻️ update metamask-extension/ui/pages/confirmation
MitchellTesla May 24, 2021
8c9ffaf
Create dir
MitchellTesla May 24, 2021
ce6358c
♻️ update metamask-extension/ui/pages/connected-accounts
MitchellTesla May 24, 2021
bbbece5
Create dir
MitchellTesla May 24, 2021
6049d87
♻️ update metamask-extension/ui/pages/connected-sites
MitchellTesla May 24, 2021
5d10a3e
Create dir
MitchellTesla May 24, 2021
0ecbfd5
♻️ update metamask-extension/ui/pages/create-account/connect-hardware
MitchellTesla May 24, 2021
538f1fa
Create dir
MitchellTesla May 24, 2021
a805a41
♻️ update metamask-extension/ui/pages/create-account/import-account
MitchellTesla May 24, 2021
244bf8b
♻️ update metamask-extension/ui/pages/create-account
MitchellTesla May 24, 2021
34fd19b
Create dir
MitchellTesla May 24, 2021
375b6e9
♻️ update metamask-extension/ui/pages/error
MitchellTesla May 24, 2021
82d1adb
Create dir
MitchellTesla May 24, 2021
5de7d15
♻️ update metamask-extension/ui/pages/home
MitchellTesla May 24, 2021
0bb6679
Create dir
MitchellTesla May 24, 2021
4a482f4
♻️ update metamask-extension/ui/pages/keychains
MitchellTesla May 24, 2021
75c85be
Create dir
MitchellTesla May 24, 2021
2b07192
♻️ update metamask-extension/ui/pages/lock
MitchellTesla May 24, 2021
614724e
Create dir
MitchellTesla May 24, 2021
84bccf1
♻️ update metamask-extension/ui/pages/mobile-sync
MitchellTesla May 24, 2021
b209b70
Create dir
MitchellTesla May 24, 2021
a94ff17
♻️ update metamask-extension/ui/pages/permission-connect
MitchellTesla May 24, 2021
2443019
Create dir
MitchellTesla May 24, 2021
07d59a6
♻️ update metamask-extension/ui/pages/permissions-connect/choose-account
MitchellTesla May 24, 2021
774ef9e
Create dir
MitchellTesla May 24, 2021
8e5962d
♻️ update metamask-extension/ui/pages/permission-connect/redirect
MitchellTesla May 24, 2021
bd1afcd
Create dir
MitchellTesla May 24, 2021
d78dc59
♻️ update metamask-extension/ui/pages/routes
MitchellTesla May 24, 2021
181b884
Create dir
MitchellTesla May 24, 2021
b86c631
♻️ update metamask-extension/ui/pages/send
MitchellTesla May 24, 2021
5b1c97b
Create dir
MitchellTesla May 24, 2021
16b8df8
♻️ update metamask-extension/ui/pages/send/send-content/add-recipient
MitchellTesla May 24, 2021
b7ebf84
Create dir
MitchellTesla May 24, 2021
e516686
♻️ update metamask-extension/ui/pages/send/send-content/send-amount-row
MitchellTesla May 24, 2021
4445fb6
Create dir
MitchellTesla May 24, 2021
84b9c77
♻️ update metamask-extension/ui/pages/send/send-content/send-amount-r…
MitchellTesla May 24, 2021
b7f90ce
Create dir
MitchellTesla May 24, 2021
06c4b8f
♻️ update metamask-extension/ui/pages/send/send-content/send-asset-row
MitchellTesla May 24, 2021
d7c56e5
Create dir
MitchellTesla May 24, 2021
79a3b82
♻️ update metamask-extension/ui/pages/send/send-content/send-gas-row/…
MitchellTesla May 24, 2021
98c9080
♻️ update metamask-extension/ui/pages/send/send-content/send-gas-row
MitchellTesla May 24, 2021
b6ebbee
Create dir
MitchellTesla May 24, 2021
288fc39
♻️ update metamask-extension/ui/pages/send/send-content/send-hex-data…
MitchellTesla May 24, 2021
d509391
Create dir
MitchellTesla May 24, 2021
74af0f6
♻️ update metamask-extension/ui/pages/send/send-content/send-row-wrap…
MitchellTesla May 24, 2021
b833e76
♻️ update metamask-extension/ui/pages/send/send-content/send-row-wrapper
MitchellTesla May 24, 2021
0165fda
♻️ update metamask-extension/ui/pages/send/send-content
MitchellTesla May 24, 2021
b75f847
Create dir
MitchellTesla May 24, 2021
9961558
♻️ update metamask-extension/ui/pages/send/send-footer
MitchellTesla May 24, 2021
3a00484
Create dir
MitchellTesla May 24, 2021
a161416
♻️ update metamask-extension/ui/pages/send/send-header
MitchellTesla May 24, 2021
fecce03
Create dir
MitchellTesla May 24, 2021
87d0982
♻️ update metamask-extension/ui/pages/settings/settings-tab
MitchellTesla May 24, 2021
a753750
♻️ update metamask-extension/ui/pages/settings
MitchellTesla May 24, 2021
deadb1c
Create dir
MitchellTesla May 24, 2021
d930517
♻️ update metamask-extension/ui/pages/settings/security-tab
MitchellTesla May 24, 2021
dc12dee
Create dir
MitchellTesla May 24, 2021
1fc3e05
Create dir
MitchellTesla May 24, 2021
512192e
♻️ update metamask-extension/ui/pages/settings/networks-tab/network-form
MitchellTesla May 24, 2021
fefd2a2
♻️ update metamask-extension/ui/pages/settings/networks-tab
MitchellTesla May 24, 2021
a8fe417
Create dir
MitchellTesla May 24, 2021
1c49cbf
♻️ update metamask-extension/ui/pages/settings/info-tab
MitchellTesla May 24, 2021
0e045e8
Create dir
MitchellTesla May 24, 2021
1917aeb
♻️ update metamask-extension/ui/pages/settings/contacts-list-tab/add-…
MitchellTesla May 24, 2021
78b0aba
Create dir
MitchellTesla May 24, 2021
9af30da
♻️ update metamask-extension/ui/pages/settings/contact-list-tab/edit-…
MitchellTesla May 24, 2021
a3d4539
Create dir
MitchellTesla May 24, 2021
131344c
♻️ update metamask-extension/ui/pages/settings/contacts-list-tab/view…
MitchellTesla May 24, 2021
02e8f3e
♻️ update metamask-extension/ui/pages/settings/contacts-list-tab
MitchellTesla May 24, 2021
6046a38
Create dir
MitchellTesla May 24, 2021
475b088
♻️ update metamask-extension/ui/pages/settings/alerts-tab
MitchellTesla May 24, 2021
c981c96
Create dir
MitchellTesla May 24, 2021
a97ea59
♻️ update metamask-extension/ui/pages/settings/advanced-tab
MitchellTesla May 24, 2021
ca63cb5
Create dir
MitchellTesla May 24, 2021
614653a
♻️ update metamask-extension/ui/pages/unlock-page
MitchellTesla May 24, 2021
e3f675a
♻️ update metamask-extension/ui/pages main
MitchellTesla May 24, 2021
47e57c9
Create dir
MitchellTesla May 24, 2021
9cf11c3
♻️ update metamask-extension/ui/pages/swaps/__snapshots__
MitchellTesla May 24, 2021
f35881a
♻️ update metamask-extension/ui/pages/swaps main
MitchellTesla May 24, 2021
8b973b1
Create dir
MitchellTesla May 24, 2021
7388abb
♻️ update metamask-extension/ui/pages/swaps/actionable-message/__snap…
MitchellTesla May 24, 2021
eb01e74
♻️ update metamask-extension/ui/pages/swaps/actionable-message
MitchellTesla May 24, 2021
ebefd9e
Create dir
MitchellTesla May 24, 2021
52821f8
♻️ update metamask-extension/ui/pages/swaps/awaiting-signatures/__sna…
MitchellTesla May 24, 2021
8ae67c6
♻️ update metamask-extension/ui/pages/swaps/awaiting-signatures
MitchellTesla May 24, 2021
303aa56
Create dir
MitchellTesla May 24, 2021
6b5320e
♻️ update metamask-extension/test/data
MitchellTesla May 24, 2021
7b7c835
Create dir
MitchellTesla May 24, 2021
2c857f7
♻️ update metamask-extension/test/e2e/webdriver
MitchellTesla May 24, 2021
988d42f
Create dir
MitchellTesla May 24, 2021
75059d1
♻️ update metamask-extension/test/e2e/tests
MitchellTesla May 24, 2021
21c85f6
Create dir
MitchellTesla May 24, 2021
0154a6d
♻️ update metamask-extension/test/e2e/send-eth-with-private-key-test
MitchellTesla May 24, 2021
f396306
Create dir
MitchellTesla May 24, 2021
d3242a9
♻️ update metamask-extension/test/e2e/mock-3box
MitchellTesla May 24, 2021
e3bf6ae
♻️ update metamask-extension/test/e2e main
MitchellTesla May 24, 2021
d76be5e
Create dir
MitchellTesla May 24, 2021
4be2712
♻️ update metamask-extension/test/helpers
MitchellTesla May 24, 2021
faf3ea3
Create dir
MitchellTesla May 24, 2021
0a4a29a
♻️ update metamask-extension/test/jest
MitchellTesla May 24, 2021
d9e1a1b
Create dir
MitchellTesla May 24, 2021
3ad1b13
♻️ update metamask-extension/test/lib/migrations
MitchellTesla May 24, 2021
72dcb1a
♻️ update metamask-extension/test/lib
MitchellTesla May 24, 2021
32e9781
Create dir
MitchellTesla May 24, 2021
8bd710d
♻️ update metamask-extension/test/mocks
MitchellTesla May 24, 2021
4135794
♻️ update metamask-extension/test main
MitchellTesla May 24, 2021
0ef2f00
Create dir
MitchellTesla May 24, 2021
959c39d
♻️ update metamask-extension/test/stub
MitchellTesla May 24, 2021
5741c6b
Create dir
MitchellTesla May 24, 2021
979c654
♻️ update metamask-extension/test/unit-global
MitchellTesla May 24, 2021
6522f2f
Create dir
MitchellTesla May 24, 2021
1e31df2
♻️ update metamask-extension/test/e2e/fixtures
MitchellTesla May 24, 2021
d93dbac
Create dir
MitchellTesla May 24, 2021
c156393
♻️ update metamask-extension/test/e2e/fixtures/address-entry
MitchellTesla May 24, 2021
6eb1168
Create dir
MitchellTesla May 24, 2021
6f43fe0
♻️ update metamask-extension/test/e2e/fixtures/connected-state
MitchellTesla May 24, 2021
ea78445
Create dir
MitchellTesla May 24, 2021
079271e
♻️ update metamask-extension/test/e2e/fixtures/custom-rpc
MitchellTesla May 24, 2021
b7ef686
Create dir
MitchellTesla May 24, 2021
65316df
♻️ update metamask-extension/test/e2e/fixtures/import-ui
MitchellTesla May 24, 2021
120641e
Create dir
MitchellTesla May 24, 2021
7b713bb
♻️ update metamask-extension/test/e2e/fixtures/imported-account
MitchellTesla May 24, 2021
3be59e4
Create dir
MitchellTesla May 24, 2021
b83b4d6
♻️ update metamask-extension/test/e2e/fixtures/localization
MitchellTesla May 24, 2021
55b5150
Create dir
MitchellTesla May 24, 2021
5b0cbab
♻️ update metamask-extension/test/e2e/fixtures/metrics-enabled
MitchellTesla May 24, 2021
304daa2
Create dir
MitchellTesla May 24, 2021
433be14
♻️ update metamask-extension/test/e2e/fixtures/onboarding
MitchellTesla May 24, 2021
af8fb5a
Create dir
MitchellTesla May 24, 2021
8e8bb96
♻️ update metamask-extension/test/e2e/fixtures/send-edit
MitchellTesla May 24, 2021
15eb689
Create dir
MitchellTesla May 24, 2021
3053705
♻️ update metamask-extension/test/e2e/fixtures/threebox-enabled
MitchellTesla May 24, 2021
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
Prev Previous commit
Next Next commit
♻️ update metamask-extension/ui/pages main
  • Loading branch information
MitchellTesla authored May 24, 2021
commit e3f675a90763b67949fec45f21ae87e6a8d39577
71 changes: 71 additions & 0 deletions metamask/metamask-extension/ui/pages/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import React, { PureComponent } from 'react';
import PropTypes from 'prop-types';
import { Provider } from 'react-redux';
import { HashRouter } from 'react-router-dom';
import * as Sentry from '@sentry/browser';
import { I18nProvider, LegacyI18nProvider } from '../contexts/i18n';
import {
MetaMetricsProvider,
LegacyMetaMetricsProvider,
} from '../contexts/metametrics';
import {
MetaMetricsProvider as NewMetaMetricsProvider,
LegacyMetaMetricsProvider as NewLegacyMetaMetricsProvider,
} from '../contexts/metametrics.new';
import ErrorPage from './error';
import Routes from './routes';

class Index extends PureComponent {
state = {};

static getDerivedStateFromError(error) {
return { error };
}

componentDidCatch(error) {
Sentry.captureException(error);
}

render() {
const { error, errorId } = this.state;
const { store } = this.props;

if (error) {
return (
<Provider store={store}>
<I18nProvider>
<LegacyI18nProvider>
<ErrorPage error={error} errorId={errorId} />
</LegacyI18nProvider>
</I18nProvider>
</Provider>
);
}

return (
<Provider store={store}>
<HashRouter hashType="noslash">
<MetaMetricsProvider>
<LegacyMetaMetricsProvider>
<NewMetaMetricsProvider>
<NewLegacyMetaMetricsProvider>
<I18nProvider>
<LegacyI18nProvider>
<Routes />
</LegacyI18nProvider>
</I18nProvider>
</NewLegacyMetaMetricsProvider>
</NewMetaMetricsProvider>
</LegacyMetaMetricsProvider>
</MetaMetricsProvider>
</HashRouter>
</Provider>
);
}
}

Index.propTypes = {
store: PropTypes.object,
};

export default Index;
21 changes: 21 additions & 0 deletions metamask/metamask-extension/ui/pages/pages.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/** Please import your files in alphabetical order **/
@import 'add-token/index';
@import 'asset/asset';
@import 'confirm-add-token/index';
@import 'confirm-approve/index';
@import 'confirm-decrypt-message/confirm-decrypt-message';
@import 'confirm-encryption-public-key/confirm-encryption-public-key';
@import 'confirmation/confirmation';
@import 'connected-sites/index';
@import 'connected-accounts/index';
@import 'connected-sites/index';
@import 'create-account/index';
@import 'error/index';
@import 'first-time-flow/index';
@import 'home/index';
@import 'keychains/index';
@import 'permissions-connect/index';
@import 'send/send';
@import 'settings/index';
@import 'swaps/index';
@import 'unlock-page/index';