Commit Graph

1585 Commits

Author SHA1 Message Date
Jason Clark abefcc9612 more eslint fixes 2017-11-25 15:57:54 -07:00
Jason Clark fc46a16a32 toggle wired up to preferences property store 2017-11-24 10:35:17 -07:00
Clark, Jason (Contractor) 90fc4812bc incremental commit 2017-11-23 18:33:44 -07:00
Chi Kei Chan 03968ffafe Version Bump 2017-11-15 12:23:39 -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
Thomas Huang 86e88dc813
Merge pull request #2519 from danjm/NewUI-flat-lintfixes
[NewUI-flat] New ui flat lintfixes
2017-11-02 10:02:09 -07:00
Dan 5a94775b3f Lint fixes for NewUI-flat. 2017-11-02 00:00:33 -02:30
Kevin Serrano e0030a8bf8
Merge pull request #2291 from MetaMask/gasPriceSpecified
Add boolean for specified gas price
2017-10-27 14:01:08 -07:00
Kevin Serrano 1e9c0a9db2
Resolve merge conflicts 2017-10-26 16:22:08 -07:00
kumavis c1d2a1226c 4.0.3 2017-10-25 20:13:05 -07:00
kumavis a7424f0c0d 3.12.0 2017-10-25 20:06:26 -07:00
Chi Kei Chan db5326dfc2 Merge branch 'NewUI-flat' into uat 2017-10-25 19:46:42 -07:00
Chi Kei Chan 5aecce908f Merge branch 'master' into NewUI-flat 2017-10-25 18:49:02 -07:00
Chi Kei Chan fa95303e1e Sign Typed Request styling fixes 2017-10-25 18:05:52 -07:00
Dan ddf11011c9 Signature request fixes. 2017-10-25 17:40:48 -07:00
Kevin Serrano b9bbf8f329
Resolving that ugly merge. 2017-10-25 15:45:26 -07:00
Alexander Tseung 3d8182f5d5 Add Info section 2017-10-25 12:16:47 -07:00
Chi Kei Chan 311ca1f3ca Fix styling on notification view 2017-10-25 00:10:09 -07:00
Chi Kei Chan 301c737bbc Merge branch 'master' into NewUI-flat 2017-10-24 16:56:49 -07:00
Kevin Serrano 1767dceba4 Merge pull request #2422 from watilde/fixes-lint
Fixes lint warnings
2017-10-24 16:53:54 -07:00
Chi Kei Chan 7c20011023 Merge branch 'master' into NewUI-flat 2017-10-24 16:50:25 -07:00
tmashuang 91b23246cd Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin into firsttimeflow 2017-10-24 08:36:02 -07:00
Chi Kei Chan 4401800a42 Account menu white check mark 2017-10-24 00:13:49 -07:00
Dan Finlay 6d05238469 Try to fix intermittent test failure in NonceTracker tests 2017-10-22 22:24:50 -07:00
Dan Finlay e564ed8d4c Version 3.11.2 2017-10-21 15:40:57 -07:00
Daijiro Wachi 43b1cb9100 Fix lint warnings
Fixed warnings:
```md
app/scripts/controllers/computed-balances.js
+ 35:27  warning  Missing space before function parentheses            space-before-function-paren
+ 41:14  warning  'address' is never reassigned. Use 'const' instead   prefer-const
+ 61:9   warning  'updater' is never reassigned. Use 'const' instead   prefer-const
+ 68:11  warning  'newState' is never reassigned. Use 'const' instead  prefer-const

app/scripts/controllers/network.js
+ 104:29  warning  Missing space before function parentheses  space-before-function-paren

app/scripts/lib/createLoggerMiddleware.js
+ 4:32  warning  Missing space before function parentheses      space-before-function-paren
+ 15:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/createOriginMiddleware.js
+ 4:32  warning  Missing space before function parentheses      space-before-function-paren
+ 9:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/createProviderMiddleware.js
+ 5:34  warning  Missing space before function parentheses      space-before-function-paren
+ 13:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/events-proxy.js
+ 1:50  warning  Missing space before function parentheses      space-before-function-paren
+ 31:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/nodeify.js
+ 2:22  warning  Missing space before function parentheses  space-before-function-paren
+ 2:24  warning  Missing space before opening brace         space-before-blocks
+ 5:18  warning  Missing space before function parentheses  space-before-function-paren
+ 5:20  warning  Missing space before opening brace         space-before-blocks

app/scripts/lib/pending-balance-calculator.js
+ 16:19  warning  Missing space before function parentheses  space-before-function-paren

app/scripts/lib/pending-tx-tracker.js
+ 85:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 87:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 88:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 90:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 91:11  warning  '||' should be placed at the end of the line  operator-linebreak

app/scripts/lib/port-stream.js
+ 3:22  warning  Missing space before function parentheses  space-before-function-paren
+ 3:24  warning  Missing space before opening brace         space-before-blocks

app/scripts/lib/tx-gas-utils.js
+ 84:2  warning  Newline required at end of file but not found  eol-last

app/scripts/lib/tx-state-history-helper.js
+ 12:37  warning  Missing space before function parentheses      space-before-function-paren
+ 23:30  warning  Missing space before function parentheses      space-before-function-paren
+ 30:23  warning  Missing space before function parentheses      space-before-function-paren
+ 35:28  warning  Missing space before function parentheses      space-before-function-paren
+ 41:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/tx-state-manager.js
+ 94:13  warning  'value' is never reassigned. Use 'const' instead  prefer-const

ui/app/reducers.js
+ 45:7  warning  'state' is never reassigned. Use 'const' instead        prefer-const
+ 53:7  warning  'stateString' is never reassigned. Use 'const' instead  prefer-const

ui/lib/tx-helper.js
+ 27:2  warning  Newline required at end of file but not found  eol-last

ui/app/components/account-dropdowns.js
+ 163:1  warning  More than 2 blank lines not allowed  no-multiple-empty-lines

ui/app/components/menu-droppo.js
+ 22:7  warning  'style' is never reassigned. Use 'const' instead  prefer-const

ui/app/components/shapeshift-form.js
+ 135:11  warning  '&&' should be placed at the end of the line  operator-linebreak

ui/app/components/typed-message-renderer.js
+ 35:25  warning  Missing space before function parentheses      space-before-function-paren
+ 42:2   warning  Newline required at end of file but not found  eol-last

mascara/server/index.js
+ 11:42  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 12:36  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 13:33  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 14:40  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 20:29  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 21:29  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 26:40  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
```
2017-10-21 21:06:39 +02:00
Chi Kei Chan 5aaa2d679b Add ShapeShift UI 2017-10-20 21:51:37 -07:00
kumavis a9a841ba01 4.0.2 2017-10-20 19:33:15 -07:00
Dan Finlay 56dcf7c011 Version 3.11.1 2017-10-20 14:07:54 -07:00
kumavis 48f348e729 4.0.1 2017-10-20 11:30:56 -07:00
Chi Kei Chan 344b467d03 Merge branch 'master' into NewUI-flat 2017-10-20 11:05:10 -07:00
Dan Finlay a10a600cce Linted 2017-10-19 12:33:43 -07:00
Dan Finlay 3b4c679ffc Fix bug where new account was not immediately selected 2017-10-19 12:15:26 -07:00
Dan Finlay 0ae406e489 Allow computed balances to enumerate its own view 2017-10-19 09:59:57 -07:00
Chi Kei Chan c8c773d641 Merge branch 'NewUI-flat' into merge 2017-10-18 22:58:46 -07:00
Dan Finlay 21bde66e16 Remove account-tracker from keyringController 2017-10-18 17:14:26 -07:00
Dan Finlay bbe2c9f48d Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault 2017-10-18 17:07:25 -07:00
Dan Finlay d89394a7c9 Make account tracking much more reactive 2017-10-18 17:07:22 -07:00
kumavis 8da0d0b28a Revert "NetworkController refactor for new EthClient interface" 2017-10-18 15:09:32 -07:00
Dan Finlay 75177ce34c Make account tracking more reactive
We were doing a lot of conditional observation & updating.
Pulled out a bunch of that for generic observer/syncers.
2017-10-18 15:08:34 -07:00
Dan Finlay 9cc1e8a6d8 Refresh computed balances controller when restoring vault 2017-10-18 14:22:04 -07:00
Dan Finlay ea79eca8eb Add validation to balance constructor 2017-10-18 12:21:22 -07:00
Dan Finlay 7032edf32b Stop tracking old account balances after restore vault
Per @kgserrano note
2017-10-18 11:13:14 -07:00
Dan Finlay 50e8599988 Promisify metamask-controller vault creating methods 2017-10-17 13:25:27 -07:00
Dan Finlay d7f384485d Select first account when restoring seed
Fixes #2348
2017-10-17 13:19:57 -07:00
Dan Finlay ab31eb6a17 Select first account on new vault creation 2017-10-17 13:09:41 -07:00
Chi Kei Chan 81f62a7443 Adding Account Dropdown V2 2017-10-13 02:11:01 -04:00
kumavis 53a360b65d contentscript - fix inpage require and bundling 2017-10-12 12:51:48 -07:00
Dan Finlay c9a984a237 Break up inpage file read into multiple lines 2017-10-12 14:16:40 -04:00