brunobar79 69f4c8c336 fix merge conflicts

2018-07-26 21:04:03 -04:00

..

accounts/new-account

…

components

fix merge conflicts

2018-07-26 21:04:03 -04:00

constants

Various fixes from PR comments

2018-07-06 16:27:08 -07:00

css

fix spinner and qr icon

2018-07-24 22:34:15 -04:00

ducks

Add unit tests for confirmTransaction duck and util

2018-07-10 00:18:37 -07:00

first-time

…

helpers

Add close window support to signature requests. Move logic to actions

2018-07-23 20:25:04 -07:00

img

…

keychains/hd

…

reducers

working without injection

2018-07-24 20:32:20 -04:00

selectors

Add close window support to signature requests. Move logic to actions

2018-07-23 20:25:04 -07:00

account-and-transaction-details.js

…

actions.js

fix merge conflicts

2018-07-26 21:04:03 -04:00

app.js

working without injection

2018-07-24 20:32:20 -04:00

conf-tx.js

Remove unused confirm transaction files

2018-07-17 13:38:14 -07:00

conversion-util.js

Various fixes from PR comments

2018-07-06 16:27:08 -07:00

conversion-util.test.js

lint

2018-06-29 16:19:45 +08:00

i18n-provider.js

Fallback to English and then the key for I18nProvider#t

2018-07-11 16:50:37 -02:30

infura-conversion.json

…

main-container.js

Prevent users from submitting password multiple times on the unlock screen

2018-07-10 20:00:06 -07:00

new-keychain.js

…

reducers.js

Refactor and redesign confirm transaction views

2018-07-06 16:27:08 -07:00

root.js

…

routes.js

Merge pull request #4625 from MetaMask/initial-trezor-support

2018-07-19 15:00:59 -04:00

select-app.js

…

selectors.js

working without injection

2018-07-24 20:32:20 -04:00

store.js

…

token-util.js

fix type

2018-07-23 17:23:34 +09:00

util.js

Add fallback options for displaying recipient name in the Confirm screen

2018-07-20 14:23:53 -07:00

welcome-screen.js

…