Connor Bryan a6a8865ea5 Fix merge conflict

2018-06-25 18:10:25 -05:00

..

addressBook

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

config

EthersocialNetwork Support (ESN) (#1881) (#1881)

2018-06-25 12:59:39 -05:00

customTokens

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

deterministicWallets

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

ens

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

gas

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

message

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

notifications

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

onboardStatus

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

paritySigner

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

rates

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

schedule

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

swap

Add monero swap support

2018-06-25 17:46:04 -05:00

transaction

Adjust the TransactionActions enum (#1980)

2018-06-21 23:35:39 -05:00

transactions

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

wallet

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

configAndTokens.ts

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

configureStore.ts

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

helpers.ts

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

index.ts

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

reducers.ts

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

rehydrateAddressBook.ts

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

sagas.ts

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

selectors.ts

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

store.ts

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

testHelpers.ts

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00

types.ts

Refactor redux pattern from top-level to ducks (#1936)

2018-06-17 20:53:00 -05:00