Alexander Tseung ba23843f91 Fix merge conflicts

2018-03-30 16:18:48 -07:00

..

accounts/new-account

Fix merge conflicts

2018-03-30 16:18:48 -07:00

components

Fix merge conflicts

2018-03-30 16:18:48 -07:00

css

Fix merge conflicts

2018-03-30 16:18:48 -07:00

first-time

Fix merge conflicts

2018-03-30 16:18:48 -07:00

img

Move responsive ui into its own folder for easier merges

2017-07-20 12:38:38 -07:00

keychains/hd

Removes t from props via metamask-connect and instead places it on context via a provider.

2018-03-29 12:42:38 -02:30

reducers

Merge branch 'master' into i18n-translator-redux

2018-03-26 16:13:49 -02:30

account-and-transaction-details.js

Wallet view supports screen sizes between 576px and 667px (#3193)

2018-02-05 18:31:21 -08:00

actions.js

Fix i18n merge conflicts

2018-03-29 09:37:29 -07:00

app.js

Fix merge conflicts

2018-03-30 16:18:48 -07:00

conf-tx.js

Fix merge conflicts

2018-03-30 16:18:48 -07:00

conversion-util.js

Retry transaction logic added to tx-list-item, confirm-send-ether, customize-gas-modal, and dependents.

2018-03-09 00:19:26 -03:30

i18n-provider.js

Stopping wrapping provider children in div; stop wrapping old-ui in provider.

2018-03-29 20:16:45 -02:30

infura-conversion.json

Add AUD, HKD, SGD, IDR, PHP to currency conversion list

2017-09-27 11:16:38 -07:00

main-container.js

Fix merge conflicts

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

metamask-connect.js

Memoize t function in metamask-connect

2018-03-23 14:21:32 -02:30

new-keychain.js

Removes t from props via metamask-connect and instead places it on context via a provider.

2018-03-29 12:42:38 -02:30

reducers.js

Handle i18n with redux.

2018-03-15 21:59:45 -02:30

root.js

Stopping wrapping provider children in div; stop wrapping old-ui in provider.

2018-03-29 20:16:45 -02:30

routes.js

Fix merge conflicts. Refactor renderPrimary into Home component

2018-03-30 15:07:00 -07:00

select-app.js

Fix merge conflicts

2018-03-30 16:18:48 -07:00

selectors.js

Merge branch 'i3554-fix-editing-dapp-token-txs' of https://github.com/danjm/metamask-extension into danjm-i3554-fix-editing-dapp-token-txs

2018-03-21 12:53:28 -07:00

send-v2.js

Fix merge conflicts

2018-03-30 16:18:48 -07:00

store.js

Updated commonjs require path for redux-logger and redux-thunk modules

2017-08-08 14:15:45 -07:00

token-util.js

Token balance in send state; validating sufficient tokens, validation updates on 'from' switching.

2017-11-06 15:57:57 -03:30

unlock.js

Removes t from props via metamask-connect and instead places it on context via a provider.

2018-03-29 12:42:38 -02:30

util.js

Adding one or more tokens sets the selected token before returning the user to the main screen. (#2995)

2018-01-16 12:14:03 -08:00

welcome-screen.js

Fix merge conflicts. Refactor onboarding flow.

2018-03-28 13:23:50 -07:00