Alexander Tseung 6f367a5a6b Fix merge conflicts

2018-03-27 00:20:35 -07:00

..

account-list-item.js

Cursor pointer and hover background on from and to dropdown items.

2017-11-10 14:14:07 -08:00

currency-display.js

Create single action for updating all of send in redux state.

2017-11-14 16:18:00 -08:00

from-dropdown.js

Cursor pointer and hover background on from and to dropdown items.

2017-11-10 14:14:07 -08:00

gas-fee-display-v2.js

Merge branch 'master' into retry-tx-refractor

2018-03-20 09:27:27 -02:30

gas-tooltip.js

get t imported in all files currently using i18n

2018-01-24 19:41:29 -10:00

memo-textarea.js

…

send-constants.js

Add constanst for token transfer function signature.

2017-12-20 17:37:18 -08:00

send-utils.js

…

send-v2-container.js

Fix merge conflicts

2018-03-27 00:20:35 -07:00

to-autocomplete.js

get t imported in all files currently using i18n

2018-01-24 19:41:29 -10:00