Commit Graph

87 Commits

Author SHA1 Message Date
Dan J Miller 41057a76c5 [NewUI] Build mascara with uglification and gzipping. (#2735)
* Adds uglification and gzipping.

* Build mascara with uglification and gzipping.

* Remove gzipping from extension build.
2018-01-11 18:15:22 -08:00
Alexander Tseung be398500de
Merge pull request #2848 from MetaMask/NewUI-flat
[NewUI] Merge NewUI-flat into uat
2018-01-03 13:24:17 -08:00
Alexander Tseung 3f17abd43b Fix mascara first time flow button colors 2017-12-29 13:17:01 -08:00
Alexander Tseung 409d1d30e9
Merge pull request #2799 from MetaMask/NewUI-flat
Update UAT to version 4.0.5
2017-12-22 11:40:20 -08:00
Dan ec6c3c33bd Merge branch 'master' into NewUI-flat-merge-with-master 2017-12-06 21:11:52 -08:00
frankiebee a89b682dec mascara:create-password - use less words in metamask explanation 2017-11-06 12:48:58 -05:00
frankiebee 910c69f655 mascara - fix words and enviroment vars 2017-11-02 12:24:50 -05:00
frankiebee 81af91371d mascara:first-time - fix wording 2017-10-31 14:26:17 -05:00
frankiebee 032582afda mascara:first-time - add alpha warning and a about metamask and mascot 2017-10-31 14:02:02 -05:00
Chi Kei Chan 5aecce908f Merge branch 'master' into NewUI-flat 2017-10-25 18:49:02 -07:00
tmashuang 81d11ecd59 Fix X-Frame-Options for mascara 2017-10-25 08:50:58 -07:00
Chi Kei Chan e89ae877aa Add BuyEtherWidget for future use in buy ether modal 2017-10-24 22:21:30 -07:00
Kevin Serrano 1767dceba4 Merge pull request #2422 from watilde/fixes-lint
Fixes lint warnings
2017-10-24 16:53:54 -07:00
tmashuang 099078d13b Add error messages when importing an account 2017-10-24 08:40:07 -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 f503120b82 Add Import With Seed Phrase 2017-10-20 22:31:59 -07:00
Chi Kei Chan 2b26496826 Add mobile responsiveness 2017-10-20 21:51:37 -07:00
Chi Kei Chan 213cf6aa09 Remove import option 2017-10-20 21:51:37 -07:00
Chi Kei Chan 63a5eca967 Fix import 2017-10-20 21:51:37 -07:00
Chi Kei Chan 25f4f69706 Fix capitialization 2017-10-20 21:51:37 -07:00
Chi Kei Chan 5484e68896 Add Integration Tests 2017-10-20 21:51:37 -07:00
Chi Kei Chan 5cbbb476b3 ShapeShift Integration 2017-10-20 21:51:37 -07:00
Chi Kei Chan 5aaa2d679b Add ShapeShift UI 2017-10-20 21:51:37 -07:00
Chi Kei Chan c6a3d00d80 Fix merge conflict; separate onboarding buy screen 2017-10-20 21:51:37 -07:00
Jacky Chan ad647050d6 Move "Skip this step" to side panel 2017-10-20 21:51:37 -07:00
Jacky Chan a4ad88c331 Disable CTA unless notice is scrolled to bottom 2017-10-20 21:51:37 -07:00
Jacky Chan 945cc5d18d Fix Buy Ether flow 2017-10-20 21:51:37 -07:00
Jacky Chan 638bbe0428 Shuffle tokens 2017-10-20 21:51:37 -07:00
Jacky Chan 85e485128f Add Go to Coinbase; Show Buy Ether after signup 2017-10-20 21:51:37 -07:00
Jacky Chan 4ecd28ca9b Hide Warning after changing import options 2017-10-20 21:51:37 -07:00
Jacky Chan 0cc521e130 Implement Buy Ether Screen UI 2017-10-20 21:51:37 -07:00
Jacky Chan 449bce5eea Implement Import Account Screen 2017-10-20 21:51:37 -07:00
Jacky Chan 1a9b217558 Add BackupPhraseScreen 2017-10-20 21:51:37 -07:00
Jacky Chan fd4fbdc0cd Add NoticeScreen 2017-10-20 21:51:37 -07:00
Jacky Chan e1497fafa6 Add UniqueImageScreen 2017-10-20 21:51:37 -07:00
Jacky Chan 4e446410eb Add Breadcrumbs 2017-10-20 21:51:37 -07:00
Jacky Chan 537f8a6ce1 CreatePasswordScreen 2017-10-20 21:51:37 -07:00
Jacky Chan 0264ecaad7 Adding CreatePasswordScreen 2017-10-20 21:51:37 -07:00
frankiebee 5c902423d9 mascara - set x-frame-options header to DENY 2017-10-20 02:30:46 -07:00
frankiebee 7ec068d279 mascara/background: use async await 2017-10-04 23:26:56 -07:00
frankiebee 5eca4223b2 use log.debug 2017-10-04 23:07:40 -07:00
frankiebee 7a9e2aa4f0 mascara: linting and code clean up 2017-10-04 23:03:47 -07:00
frankiebee e7589a099f mascara:exampl/app - add a send tx button 2017-10-04 22:09:37 -07:00
frankiebee 418f01411e mascara: turn off background 2017-09-19 16:48:42 -07:00
frankiebee 29dd81d029 require metamascara 2017-09-18 19:08:02 -07:00
kumavis a9900be085 test - mascara - move skip reload test flag 2017-09-15 13:13:53 -07:00
kumavis 0ab37b52c0 mascara - proxy - small cleanup 2017-09-15 13:13:13 -07:00
kumavis 779e973b45 tests - integration - mascara - small cleanup and timeout adjustments 2017-09-15 12:19:52 -07:00
frankiebee c5a2527c17 set time if platform is mascara 2017-09-15 11:57:25 -07:00
frankiebee 7bcca782cb remove testem files 2017-09-15 11:33:55 -07:00