diff options
| author | kumavis <aaron@kumavis.me> | 2018-06-08 01:07:36 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2018-06-08 01:07:36 +0800 |
| commit | 66b703b1a4ba25ddaf8278f020967b4d20351027 (patch) | |
| tree | 41520dbc3ad35b3c9968cfc390ecb99db5456a33 /ui/app/app.js | |
| parent | 2198276bd533bec767cad954ef8b21c47c0f8c09 (diff) | |
| parent | 988283778a2be52640b27a359ef3fb1130e95711 (diff) | |
| download | tangerine-wallet-browser-66b703b1a4ba25ddaf8278f020967b4d20351027.tar.gz tangerine-wallet-browser-66b703b1a4ba25ddaf8278f020967b4d20351027.tar.zst tangerine-wallet-browser-66b703b1a4ba25ddaf8278f020967b4d20351027.zip | |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine
Diffstat (limited to 'ui/app/app.js')
| -rw-r--r-- | ui/app/app.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index 7005adb7f..ec2329463 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -11,7 +11,7 @@ const log = require('loglevel') // init const InitializeScreen = require('../../mascara/src/app/first-time').default // accounts -const SendTransactionScreen2 = require('./components/send/send-v2-container') +const SendTransactionScreen = require('./components/send_/send.container') const ConfirmTxScreen = require('./conf-tx') // slideout menu @@ -77,7 +77,7 @@ class App extends Component { h(Authenticated, { path: SETTINGS_ROUTE, component: Settings }), h(Authenticated, { path: NOTICE_ROUTE, exact, component: NoticeScreen }), h(Authenticated, { path: `${CONFIRM_TRANSACTION_ROUTE}/:id?`, component: ConfirmTxScreen }), - h(Authenticated, { path: SEND_ROUTE, exact, component: SendTransactionScreen2 }), + h(Authenticated, { path: SEND_ROUTE, exact, component: SendTransactionScreen }), h(Authenticated, { path: ADD_TOKEN_ROUTE, exact, component: AddTokenPage }), h(Authenticated, { path: CONFIRM_ADD_TOKEN_ROUTE, exact, component: ConfirmAddTokenPage }), h(Authenticated, { path: NEW_ACCOUNT_ROUTE, component: CreateAccountPage }), |