Thomas Huang
1fb408f62e
Merge pull request #4512 from MetaMask/test-metamask-no-diagnostics
...
test - metamask-controller - disable diagnostics
2018-06-06 11:54:59 -07:00
kumavis
d30f03dcbf
Merge pull request #4414 from scsaba/recipient-blacklist
...
Disallow sending to ganache default accounts on main net
2018-06-06 11:54:01 -07:00
kumavis
9d77b0a196
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine
2018-06-06 11:08:29 -07:00
kumavis
da938ded5c
test - metamask-controller - disable diagnostics
2018-06-05 13:31:34 -07:00
kumavis
20bdba3d17
diagnostics - rewrite bug-notifier as diagnostics-reporter
2018-06-05 11:51:27 -07:00
Dan Finlay
ae156e1087
Mock notifier in test
2018-06-04 15:26:01 -07:00
Dan Finlay
797e63b37b
Add failing test for unknown identity entry
2018-06-04 13:28:46 -07:00
Csaba Solya
1dda0c6469
remove generating blocked accounts and use a config file instead
2018-05-30 21:15:59 +02:00
Csaba Solya
cf73581c0e
adding tests for recipient blacklist checker
2018-05-30 17:38:27 +02:00
Csaba Solya
6affd8f949
adding transaction controller tests
2018-05-30 16:24:40 +02:00
kumavis
32293a959c
test - unit - tx-controller - fix blockTracker stub
2018-05-29 01:08:55 -07:00
kumavis
31f47a7a42
test - unit - pending-tx-tracker - update method name
2018-05-28 16:00:35 -07:00
kumavis
686d5cf825
test - unit - nonce-tracker - fix blockTracker stub
2018-05-28 15:59:34 -07:00
kumavis
5be154ea20
controllers - transactions - merge @frankiebee's work with mine
2018-05-28 14:29:31 -07:00
kumavis
a0fe5b9190
test - unit - metamask-controller - remove log
2018-05-25 11:09:19 -07:00
kumavis
deab195772
test - unit - code style nitpick
2018-05-24 23:19:54 -07:00
kumavis
da5be0812a
test - unit - metamask-controller - fix many bugs in tests
2018-05-24 23:19:39 -07:00
kumavis
afdefc58e9
test - unit - tx-controller-test - add history object to txMeta when using internal calls
2018-05-24 22:41:09 -07:00
kumavis
630e2300f4
test - unit - move fetch polyfill to helper
2018-05-24 22:10:17 -07:00
kumavis
380964a687
test - unit - metamask-controller - polyfill global.fetch
2018-05-24 21:17:56 -07:00
kumavis
2b54d948da
test - remove .only from unit tests
2018-05-24 15:53:06 -07:00
frankiebee
61caee9d94
Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/metamask-extension into transactions-use-new-block-tracker
2018-05-22 16:45:20 -07:00
frankiebee
c4b09da34e
transactions - update pending-tx-tracker to use the new block tracker
2018-05-22 16:42:06 -07:00
frankiebee
60bc28bf3c
test pending-tx-tracker - update tests to reflect new block tracker behavior and remove tx:confirmed event tests
2018-05-22 16:37:43 -07:00
kumavis
3a80f3dd83
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine
2018-05-22 13:20:04 -07:00
tmashuang
238f2eb179
Merge branch 'develop' into testing
2018-05-21 16:36:48 -07:00
Frankie
e8b2e11c56
Reveal get filtered tx list ( #4332 )
...
* add getFilteredTxList from txController to getApi
* transactions - remove dead code (isNonceTaken)
2018-05-21 16:00:44 -07:00
tmashuang
58b9afff4f
Merge branch 'develop' into testing
2018-05-21 14:57:57 -07:00
tmashuang
13ebb0b455
Moved loose some loose test files to sub folders
2018-05-21 05:59:26 -07:00
Thomas
f279a8e61a
signMessage and signPersonalMessage
2018-05-17 16:26:08 -07:00
Whymarrh Whitby
67310e151e
Fix migration 026 to produce the correct shape for state.identities
2018-05-17 13:35:38 -02:30
Whymarrh Whitby
e546f4b904
Update MetaMaskController vault restoration test for new KC api
2018-05-17 12:57:39 -02:30
Whymarrh Whitby
2d13fac476
Add migration to move identities from KeyringController
2018-05-17 12:57:39 -02:30
Whymarrh Whitby
50af02e74b
Add test case for PreferencesController#setAccountLabel
2018-05-17 12:57:39 -02:30
Whymarrh Whitby
c54e4c7191
Add PreferencesController#setAddresses to update ids
2018-05-17 12:57:39 -02:30
Whymarrh Whitby
cbe4d0d88c
Update AddressBookController to read from preferences store
2018-05-17 12:57:39 -02:30
Whymarrh Whitby
924cc1fcf7
Move setAccountLabel into PreferencesController
2018-05-17 12:57:39 -02:30
Thomas
770379c3da
Merge branch 'develop' into testing
2018-05-17 00:01:36 -07:00
kumavis
eaa5a48c91
test - unit - network - get providerProxy via public method
2018-05-16 23:54:17 -07:00
kumavis
088d7930e0
network - create provider and block-tracker via json-rpc-engine
2018-05-16 20:46:34 -07:00
kumavis
44f31f9a7e
Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-transaction-history-timestamps
2018-05-16 13:56:32 -07:00
kumavis
c27d9162d7
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-controller-remove-setNetworkEndpoints
2018-05-16 11:57:07 -07:00
Csaba Solya
9026651224
add time stamps to transaction history log entries
2018-05-10 13:26:02 +02:00
Thomas
f441153211
console.log -> assert.equal
2018-05-09 01:58:43 -07:00
Thomas
9a1661918f
ImportAccountWithStrategies Json and Keystore
2018-05-09 01:51:55 -07:00
Thomas
f2e1cb9302
Remove approvePersonalMessage test
2018-05-07 14:56:33 -07:00
Thomas
8250fd9d6d
Merge branch 'develop' into testing
2018-05-07 14:30:43 -07:00
kumavis
d2aa36f866
test - network controller - remove tests for deprecated APIs + update tests
2018-05-02 18:07:29 -07:00
frankiebee
a45cb75435
transactions - add a nonce check utility for ui use
2018-05-01 13:57:43 -07:00
Thomas Huang
2601aa594e
Merge pull request #4116 from MetaMask/test-unit-ganache
...
Test - Move unit tests to ganache-core
2018-04-30 10:35:17 -07:00
Paul Bouchon
daaaab3ab0
Verify identities state after restoring new accounts ( #4091 )
2018-04-29 23:18:34 -04:00
kumavis
b8a18feb51
test - unit - send from test accounts to avoid not-enough-balance error from ganache
2018-04-27 17:12:52 -07:00
kumavis
dcd04091cc
Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3
...
docs and file organization for txController
2018-04-25 16:52:46 -06:00
Thomas
629457ea54
setupUntrustedCommunication and setupTrustedCommunication
2018-04-24 13:33:31 -07:00
Thomas
0100923129
Merge branch 'master' into testing
2018-04-23 11:22:24 -07:00
Thomas
ddece0cc11
ConfigManager markAccountsFound, markPasswordForgotten, unMarkPasswordForgotten
2018-04-23 11:21:48 -07:00
Alexander Tseung
9e41f58af2
Clean up network config
2018-04-23 10:18:05 -07:00
Thomas
2a1912642c
resetAccount and addNewAccount
2018-04-19 14:36:33 -07:00
frankiebee
c20c97ce62
Merge branch 'master' into tx-controller-rewrite-v3
2018-04-19 11:49:11 -07:00
Thomas
30df8b7995
newUnsignedMessage and newUnsignedPersonalMessage
2018-04-18 11:26:49 -07:00
Dan Finlay
6ee57dcad7
Merge branch 'master' into i3580-InternationalizeCurrency
2018-04-17 13:36:21 -07:00
bitpshr
b4912f29cd
Disable token price polling when no client is active
2018-04-16 18:12:05 -04:00
bitpshr
d0447f9058
Maintain token prices using a background service
2018-04-16 11:47:06 -04:00
frankiebee
88f4212363
meta - transactions - code clean up and jsDoc
2018-04-13 12:38:07 -07:00
bitpshr
8974f933fc
Add tests for ComposableObservableStore
2018-04-13 14:32:58 -04:00
Thomas
f82c51c2c4
Merge branch 'master' into testing
2018-04-11 08:35:31 -07:00
Thomas
30474ccd35
MM-controlller tests
2018-04-11 08:34:35 -07:00
frankiebee
2d7c3c2b00
meta - transactions - create a transactions dir in controller and move relevant files into it
2018-04-10 14:28:05 -07:00
Dan
2c4426e4de
Merge branch 'master' into i3580-InternationalizeCurrency
2018-04-09 16:52:26 -02:30
frankiebee
d4e30040a2
migrations - back fixes
2018-04-05 19:33:10 -07:00
frankiebee
7d243aacf9
create migration 25
2018-04-05 18:05:03 -07:00
frankiebee
1ba74c1566
test - run live migrations over first time state
2018-04-05 17:49:50 -07:00
frankiebee
b9243cd8b9
meta - create a migration template
2018-04-05 16:25:13 -07:00
kumavis
741c6097a2
Merge pull request #3887 from MetaMask/i#3886
...
transactions - remove unnecessary keys on txParams
2018-04-05 15:06:29 -07:00
frankiebee
c02da0f27c
transactions - _normalizeTxParams will now return a new object for txParams
2018-04-05 12:12:02 -07:00
frankiebee
4efc718074
make migration-24 compat with first-time-state
2018-04-05 11:28:25 -07:00
frankiebee
343f0e9e80
transactions - remove unnecessary keys on txParams
2018-04-04 22:29:43 -07:00
frankiebee
245c01bc0f
transactions - make #_validateTxParams not async and "linting" wink wink nudge nudge
2018-04-04 14:57:27 -07:00
frankiebee
8243824c6a
hot-fix - migrate unaproved txParams so that the from is lowercase
2018-04-04 14:27:28 -07:00
frankiebee
457a47bf62
transactions - normalize txParams
2018-04-04 14:27:20 -07:00
Thomas
7aa54916d8
Update Sinon methods. sinon.sandbox.create() -> sandbox.createSandbox()
2018-04-04 14:26:18 -07:00
Dan Finlay
c75918493d
Fix and improve test
2018-04-03 14:03:56 -07:00
Dan Finlay
74049c19fc
Internationalize currency
...
Fixes #3580
2018-04-03 13:58:26 -07:00
frankiebee
b58ca99b61
tests - fix txController tests so that txMetas have a from feild
2018-04-02 15:44:03 -07:00
frankiebee
e8a480aac4
transactions validationt - valdate from field on txParams
2018-04-02 13:17:54 -07:00
Thomas
68808c8e24
Merge branch 'testing' of https://github.com/tmashuang/metamask-extension into testing
2018-04-02 10:04:53 -07:00
Dan Finlay
f50a7a8fe8
Rename variable to be more understandable
2018-03-28 14:18:03 -07:00
Dan Finlay
47039cc3a9
Add test to reproduce issue behavior
2018-03-28 14:07:56 -07:00
frankiebee
f0f45e6fe1
migration for removing unnecessary transactions from state
2018-03-27 16:49:13 -07:00
Thomas
f66dbec0a4
Metamask controller methods
2018-03-27 14:02:00 -07:00
Thomas
ecbb59495a
Remove console.log
2018-03-27 13:59:54 -07:00
Frankie
5a61a6d57a
migration for adding submittedTime to the txMeta ( #3727 )
...
* test for migration 022
* write migration 022 adding submittedTime to txMetas whove been submitted
2018-03-26 14:24:12 -07:00
Dan
d8788af9b8
Merge branch 'master' into retry-tx-refractor
2018-03-19 15:30:47 -02:30
anticlimactic
a1db40047c
Remove unused files from ui folder. ( #3577 )
...
* Removed unused UI files. Fixes #3434 .
* Reverted the deletion of "feature-toggle-utils.js". Reverted the deletion of the test files and modified the paths so they referred to the old-ui.
2018-03-19 12:41:24 -02:30
frankiebee
cd721f52cb
Merge branch 'master' into retry-tx-refractor
2018-03-15 08:07:16 -07:00
kumavis
39a831e2a0
deps - use pify instead of util.promisify
2018-03-14 10:32:55 -07:00
Dan
798988597b
Merge branch 'master' into retry-tx-refractor
2018-03-14 00:02:27 -02:30
frankiebee
c6dff98ee1
tests - add tests for transactions#retryTransaction and transactions#_markNonceDuplicatesDropped
2018-03-13 14:30:59 -07:00
kumavis
7d0363e950
Merge pull request #3497 from MetaMask/testing
...
Persist rinkeby.infura.io and clean nock after
2018-03-09 11:49:48 -08:00
Thomas
ae795c9770
Persist rinkeby.infura.io and clean nock after
2018-03-09 11:20:18 -08:00
Dan Finlay
f4e5dd37b1
Merge pull request #3409 from scsaba/seed-phrase-verification
...
Add seed phrase verification script into background process
2018-03-07 16:47:13 -08:00
Jeffrey Tong
cad5f5f000
fix typo in tests and tx-state-manager
2018-03-07 10:24:36 -08:00
kumavis
8a444ec96f
Merge pull request #3259 from MetaMask/controllerStubs
...
Offline testing
2018-03-06 17:21:36 -08:00
Dan Finlay
dd9cac69ae
Merge pull request #3309 from scsaba/edge-support
...
Add Edge Support
2018-03-06 09:39:57 -08:00
Csaba Solya
8fde208f0b
move more test code to beforeEach
2018-03-04 08:57:55 +01:00
Csaba Solya
2b86d65d0c
verify seedwords on log in
2018-03-03 22:08:10 +01:00
Csaba Solya
3e05b693db
verify addresses regardless case
2018-03-03 14:11:02 +01:00
Csaba Solya
92453f8715
seed phrase verifier
2018-03-03 00:32:57 +01:00
Dan Finlay
3a9b3794eb
Remove logs
2018-03-02 14:01:53 -08:00
Dan Finlay
bf17d7e115
Add version bumping script
...
One step towards automating our deploy process is automating our version
bumping scheme. This PR does that.
2018-03-02 13:55:56 -08:00
Thomas
f9de87af51
Using noop to not lose it
2018-02-27 15:51:14 -08:00
Thomas
b2f53fa354
Revert initializing first-time-state
2018-02-27 15:50:49 -08:00
Csaba Solya
1b367bc215
fix test
2018-02-23 11:11:14 +01:00
Csaba Solya
8292dabed5
add negative decrypt test
2018-02-23 11:03:53 +01:00
Csaba Solya
cd05d77c3f
fix tests
2018-02-23 10:49:56 +01:00
Csaba Solya
c1aa59f6ed
adding tests
2018-02-23 10:08:23 +01:00
Thomas Huang
8f7094a73d
Network controller nock
2018-02-15 09:54:22 -08:00
Thomas Huang
33182efb13
Offline testing
2018-02-15 08:34:31 -08:00
Dan
6f14dc4702
Point add-token unit test to old-ui component.
2018-02-07 20:55:21 -03:30
Dan
d8896a8c31
Merge branch 'master' into uat
2018-02-07 16:32:47 -03:30
Frankie
1a93b1ade2
Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputs
...
Set address to default with empty string, add test validation.
2018-01-31 14:18:47 -08:00
Frankie
201e0579a5
Merge branch 'master' into localStorage-clean-up
2018-01-31 11:57:38 -08:00
frankiebee
c3adbda5f5
remove RecentBlocks from disk
2018-01-31 10:49:58 -08:00
Bruno Barbieri
94dd77d194
clean up
2018-01-31 13:34:14 -05:00
Bruno Barbieri
a70eda3651
add test for wipeTransactions
2018-01-31 13:29:30 -05:00
frankiebee
e0caeae06d
test for migration 021
2018-01-30 15:03:42 -08:00
Thomas
0f10aa3729
Clean up test, remove react & mountWithStore
2018-01-30 13:29:05 -08:00
Thomas
c2cef0f815
Set address to default with empty string, add test validation.
2018-01-30 13:26:37 -08:00
Chi Kei Chan
77c545336b
Merge branch 'uat' into newmaster
2018-01-19 15:29:36 -08:00
kumavis
899e839e7c
test - createTestProviderTools includes block tracker layer
2018-01-17 21:43:34 -08:00
kumavis
d7c8ec22a4
test - tx controller - fix txGasUtil reference
2018-01-17 20:09:13 -08:00
kumavis
d1d745eef4
test - typo - fix spelling of word stubbed
2018-01-17 19:47:35 -08:00
kumavis
3cbf2b7e3e
test - remove createEthJsQueryStub
2018-01-17 19:44:11 -08:00
Alexander Tseung
81f86cfab6
Merge branch 'uat' into uat-master-011618
2018-01-16 18:17:28 -08:00
frankiebee
7a30950e4d
test - fix to match expected behavior
2018-01-14 14:10:16 -08:00
Dan Finlay
943befef91
Add test for gas estimate default
2018-01-08 15:16:08 -08:00
Thomas Huang
0fbecb9f7c
Merge pull request #2891 from MetaMask/i2621-0xRecipientAddress
...
Account for 0x/empty string recipient
2018-01-08 11:47:47 -08:00
Kevin Serrano
0cf5c22178
Merge pull request #2851 from MetaMask/i2812-seedworderrorfix
...
Fix condition where failing seed word checks would infinite-spin future attempts.
2018-01-08 11:43:43 -08:00
Dan Finlay
d11ec81f49
Merge branch 'master' into i2621-0xRecipientAddress
2018-01-08 11:21:41 -08:00
Thomas
39b700bf87
Account for 0x/empty string address and contract creation
2018-01-08 03:16:20 -08:00
Dan Finlay
aec24ec81e
Fix feature to work
2018-01-05 22:08:03 -08:00
Dan Finlay
571f6723a6
Add test for better gas estimation
2018-01-05 21:24:10 -08:00
Kevin Serrano
4b63ec8f1d
Test for failure of the async methods.
2018-01-03 16:44:14 -08:00
Alexander Tseung
a6f062a686
Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c
2018-01-03 11:06:08 -08:00
Frankie
b2e4f913ba
Merge pull request #2817 from MetaMask/i#2810
...
only check nonces of transactions who's from address match the txMeta
2017-12-28 16:34:24 -08:00
frankiebee
0c54efdfc7
tests - be more verbose in test messages
2017-12-28 15:48:22 -08:00
frankiebee
8bd942d406
add tests for #_checkIfNonceIsTaken
2017-12-27 17:45:03 -08:00
Kevin Serrano
adf4b89804
Add additional test to ui utils to account for exact wei values.
2017-12-27 17:33:28 -08:00
Kevin Serrano
3d627e869b
Add test for edge case.
2017-12-27 17:26:38 -08:00
Dan J Miller
4acd48966e
[NewUI] Fixes tests and sends user to NewUI after registering. ( #2788 )
...
* Fixes tests and sends user to NewUI after registering.
* Karma config?
* Empty commit
* Remove unneeded json state mock file.
2017-12-21 19:03:01 -08:00
Dan
7915e62d65
Merge branch 'master' into NewUI-flat
2017-12-20 19:16:12 -03:30
Dan Finlay
9bb701f063
Add failing test for updating token details
2017-12-18 15:56:50 -08:00
Chi Kei Chan
373f8b72d0
Merge branch 'master' into NewUI-flat
2017-12-06 21:13:29 -08:00
Dan
ec6c3c33bd
Merge branch 'master' into NewUI-flat-merge-with-master
2017-12-06 21:11:52 -08:00
Dan
3356c15d04
Add tests for exponential backoff code in _resubmitTx
2017-12-06 14:11:14 -03:30
Dan
af8fcb6777
Update resubmitPendingTxs tests.
2017-12-06 14:10:11 -03:30
Thomas Huang
cefe6cded6
Update to Enzyme 3.2.0
2017-11-25 18:37:12 -06:00
Dan Finlay
8dd0093184
Remove logs
2017-11-20 14:46:36 -08:00
Dan Finlay
764a5bac56
Get test passing
2017-11-20 14:44:12 -08:00
Dan Finlay
884f203564
Add failing test for #2577 Seed Phrase Bug
2017-11-20 14:15:00 -08:00
Chi Kei Chan
e61ba93194
Merge branch 'master' into merge-master
2017-11-15 12:03:13 -08:00
Dora E. Mondrian
41fea44af3
newUnaprovedTx => newUnapprovedTx
...
This typo tripped me up when I was reading through the code and trying to understand what's going on.
2017-11-06 04:35:51 -08:00
Dan
b7653e8207
Get current NewUI-flat tests working.
2017-11-02 15:16:43 -07:00
Chi Kei Chan
7c20011023
Merge branch 'master' into NewUI-flat
2017-10-24 16:50:25 -07:00
Chi Kei Chan
996523c790
Fix unit test
2017-10-20 21:51:37 -07:00
Chi Kei Chan
c8c773d641
Merge branch 'NewUI-flat' into merge
2017-10-18 22:58:46 -07:00
kumavis
8da0d0b28a
Revert "NetworkController refactor for new EthClient interface"
2017-10-18 15:09:32 -07:00
Dan Finlay
06094c914b
Move etherscan link logic into module
2017-10-14 11:23:44 -04:00
kumavis
dcf10f3d75
nonce-tracker - use blockTracker directly
2017-10-11 18:33:36 -07:00
kumavis
0f8d7dacb1
network-controller - use obj-proxy for providerProxy
2017-10-10 17:26:44 -07:00
Kevin Serrano
d82d9215fb
Make modification
2017-10-09 13:02:52 -07:00
Kevin Serrano
c12d56063d
Fix to actually fail in earlier versions.
2017-10-09 13:01:58 -07:00
Kevin Serrano
6f0c0e8374
Add test to look for wei precision.
2017-10-09 12:12:54 -07:00
Frankie
4a4338c1f4
Merge pull request #2305 from MetaMask/nodeify
...
nodeify - allow callback to be optional
2017-10-06 14:08:58 -07:00
kumavis
3b3120c5f8
nodeify - fix test
2017-10-06 13:16:44 -07:00
Dan Finlay
94513cae7b
Provide method for tx tracker to refer to all txs
2017-10-06 12:50:33 -07:00
Dan Finlay
a32d71e8ed
Add failing test for issue #2294
2017-10-06 12:29:27 -07:00
Chi Kei Chan
bd99bc2e88
Merge branch 'master' into NewUI-flat
2017-10-03 16:02:58 -07:00
kumavis
25a80932a6
pending tx tracker - test - expect warning event on resubmit failure
2017-10-02 15:20:18 -07:00
kumavis
a86f6d6d90
pending tx tracker - test - rename tests to match event name
2017-10-02 15:14:15 -07:00
kumavis
167ad729fd
Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into history-notes
2017-10-02 13:45:47 -07:00
kumavis
c9c0e6f674
tx state history - test - fix format of history entries
2017-10-02 13:43:26 -07:00
kumavis
d29b5f10ef
tx state history - fix bug where initial snapshot was mutated on updateTx
2017-10-02 13:14:42 -07:00
frankiebee
ac80eaca1f
pending-tx - dont check the balance to rebrodcast
2017-09-29 12:54:05 -07:00
Chi Kei Chan
5a1d50cd43
Merge branch 'master' into mmn
2017-09-27 22:32:07 -07:00
kumavis
cdf41c2857
Merge pull request #2124 from MetaMask/breakout-mascara
...
require metamascara
2017-09-27 16:27:01 -07:00
kumavis
15b2823e54
Merge branch 'master' into new-currency-test
2017-09-27 16:04:51 -07:00
kumavis
ecf909e140
Merge pull request #2194 from MetaMask/network-controller-refactor
...
Network controller refactor
2017-09-27 15:56:23 -07:00
kumavis
f2d9b75e94
network controller - refactor to use _setProvider
2017-09-27 14:44:13 -07:00
kumavis
4404dfc5d3
Merge branch 'master' into direct-block-tracker
2017-09-27 13:58:54 -07:00
kumavis
5bbea78306
Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3
...
Transaction controller refractor pt3
2017-09-27 13:57:04 -07:00
kumavis
b41aad6d1a
style - small whitespace nitpick
2017-09-27 12:33:46 -07:00
Dan Finlay
e72083f6e8
Merge branch 'master' into filter-fixes-moar
2017-09-27 10:57:02 -07:00
frankiebee
0a94ec41d3
pending-tx - move incrementing of the retryCount on the txMeta outside pending-tx-tracker
2017-09-26 22:42:59 -07:00
kumavis
1877c0766c
Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController
2017-09-26 21:42:30 -07:00
frankiebee
b05a6f89cb
fix tests
2017-09-26 18:19:44 -07:00
frankiebee
36ddaf220d
Merge branch 'transactionControllerRefractorPt3' of https://github.com/MetaMask/metamask-extension into transactionControllerRefractorPt3
2017-09-26 18:16:00 -07:00
frankiebee
80c98b1653
transactions: make evnt names pretty and eaiser to read
2017-09-26 16:55:11 -07:00
frankiebee
9fd5458112
transactions: lint fixes and reveal status-update event for balance controller
2017-09-26 16:54:04 -07:00
frankiebee
8ab23c713d
Merge branch 'master' into transactionControllerRefractorPt3
2017-09-26 16:24:43 -07:00
