Esteban MIno e743f44150 fix conflicts

2018-08-28 15:20:30 -03:00

..

confirm-remove-account

…

confirm-reset-account

…

customize-gas

…

notification

…

qr-scanner

add submit button type

2018-08-08 12:22:48 -04:00

transaction-confirmed

…

welcome-beta

…

account-details-modal.js

Handle case where keyring is missing in AccountDetailsModal

2018-08-22 15:38:09 -02:30

account-modal-container.js

Update AccountModalContainer to accept a selectedIdentity prop

2018-08-22 15:38:34 -02:30

buy-options-modal.js

…

deposit-ether-modal.js

…

edit-account-name-modal.js

…

export-private-key-modal.js

Merge pull request #5102 from whymarrh/fix-account-export-pw-bug

2018-08-22 16:28:33 -02:30

hide-token-confirmation-modal.js

typo watchAsset imageUrl to image

2018-08-23 15:54:40 -03:00

index.js

…

index.scss

clean up css

2018-07-30 18:34:00 -04:00

modal.js

use existing modals

2018-07-30 17:50:05 -04:00

new-account-modal.js

…

notification-modal.js

…

shapeshift-deposit-tx-modal.js

…