diff options
author | Alexander Tseung <alextsg@gmail.com> | 2018-01-04 03:06:08 +0800 |
---|---|---|
committer | Alexander Tseung <alextsg@gmail.com> | 2018-01-04 03:06:08 +0800 |
commit | a6f062a6865d3e1e5ceb98885ab4b38713e4293d (patch) | |
tree | ea379a341cc19f8942536b1800c309f7d79b3583 | |
parent | 313b3c087a09bcc4462da15ff3caeac515967cf5 (diff) | |
parent | dfb22471087f040d8345a5a17321e1462842045c (diff) | |
download | tangerine-wallet-browser-a6f062a6865d3e1e5ceb98885ab4b38713e4293d.tar.gz tangerine-wallet-browser-a6f062a6865d3e1e5ceb98885ab4b38713e4293d.tar.zst tangerine-wallet-browser-a6f062a6865d3e1e5ceb98885ab4b38713e4293d.zip |
Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c
338 files changed, 38277 insertions, 3279 deletions
diff --git a/.eslintignore b/.eslintignore index b96f79011..e4cade21c 100644 --- a/.eslintignore +++ b/.eslintignore @@ -2,4 +2,5 @@ app/scripts/lib/extension-instance.js test/integration/bundle.js test/integration/jquery-3.1.0.min.js test/integration/helpers.js -test/integration/lib/first-time.js
\ No newline at end of file +test/integration/lib/first-time.js +ui/lib/blockies.js
\ No newline at end of file diff --git a/.gitignore b/.gitignore index 1806b1932..92b3f2875 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ app/bower_components test/bower_components package +.idea + temp .tmp .sass-cache @@ -24,6 +26,9 @@ test/background.js test/bundle.js test/test-bundle.js +#ignore css output and sourcemaps +ui/app/css/output/ + notes.txt .coveralls.yml diff --git a/.stylelintignore b/.stylelintignore new file mode 100644 index 000000000..854829a54 --- /dev/null +++ b/.stylelintignore @@ -0,0 +1,10 @@ +app/ +development/ +dist/ +docs/ +fonts/ +images/ +mascara/ +node_modules/ +notices/ +test/ diff --git a/.stylelintrc b/.stylelintrc new file mode 100644 index 000000000..d080d68d9 --- /dev/null +++ b/.stylelintrc @@ -0,0 +1,50 @@ +{ + "extends": "stylelint-config-standard", + "rules": { + "color-named": "never", + "font-family-name-quotes": "always-where-recommended", + "font-weight-notation": "numeric", + "function-url-quotes": "always", + "number-leading-zero": "never", + "value-no-vendor-prefix": true, + "value-list-comma-newline-before": "never-multi-line", + "custom-property-empty-line-before": "never", + "property-no-unknown": [ + true, + { + "ignoreProperties": [ + "composes", + "all", + "-webkit-appearance" + ] + } + ], + "declaration-block-semicolon-newline-after": "always", + "block-opening-brace-newline-after": "always", + "selector-attribute-quotes": "always", + "selector-max-specificity": "0,5,2", + "selector-pseudo-class-no-unknown": [ + true, + { + "ignorePseudoClasses": ["local", "global"] + } + ], + "at-rule-empty-line-before": [ + "always", + { + "ignore": [ + "after-comment", + ] + } + ], + "indentation": [ + 2, + { + "indentInsideParens": "once-at-root-twice-in-block" + } + ], + "max-nesting-depth": 3, + "no-duplicate-selectors": true, + "no-unknown-animations": true + } +} diff --git a/app/fonts/DIN Next/DIN Next W01 Bold.otf b/app/fonts/DIN Next/DIN Next W01 Bold.otf Binary files differnew file mode 100644 index 000000000..2b78d1ff4 --- /dev/null +++ b/app/fonts/DIN Next/DIN Next W01 Bold.otf diff --git a/app/fonts/DIN Next/DIN Next W01 Regular.otf b/app/fonts/DIN Next/DIN Next W01 Regular.otf Binary files differnew file mode 100644 index 000000000..09f6ee297 --- /dev/null +++ b/app/fonts/DIN Next/DIN Next W01 Regular.otf diff --git a/app/fonts/DIN Next/DIN Next W10 Black.otf b/app/fonts/DIN Next/DIN Next W10 Black.otf Binary files differnew file mode 100644 index 000000000..08eb73373 --- /dev/null +++ b/app/fonts/DIN Next/DIN Next W10 Black.otf diff --git a/app/fonts/DIN Next/DIN Next W10 Italic.otf b/app/fonts/DIN Next/DIN Next W10 Italic.otf Binary files differnew file mode 100644 index 000000000..73f2b9e8c --- /dev/null +++ b/app/fonts/DIN Next/DIN Next W10 Italic.otf diff --git a/app/fonts/DIN Next/DIN Next W10 Light.otf b/app/fonts/DIN Next/DIN Next W10 Light.otf Binary files differnew file mode 100644 index 000000000..700450e49 --- /dev/null +++ b/app/fonts/DIN Next/DIN Next W10 Light.otf diff --git a/app/fonts/DIN Next/DIN Next W10 Medium.otf b/app/fonts/DIN Next/DIN Next W10 Medium.otf Binary files differnew file mode 100644 index 000000000..b73f2e43f --- /dev/null +++ b/app/fonts/DIN Next/DIN Next W10 Medium.otf diff --git a/app/fonts/DIN_OT/DINOT-2.otf b/app/fonts/DIN_OT/DINOT-2.otf Binary files differnew file mode 100644 index 000000000..4a5e13127 --- /dev/null +++ b/app/fonts/DIN_OT/DINOT-2.otf diff --git a/app/fonts/DIN_OT/DINOT-Bold 2.otf b/app/fonts/DIN_OT/DINOT-Bold 2.otf Binary files differnew file mode 100644 index 000000000..6ed5b6c3d --- /dev/null +++ b/app/fonts/DIN_OT/DINOT-Bold 2.otf diff --git a/app/fonts/DIN_OT/DINOT-BoldItalic.otf b/app/fonts/DIN_OT/DINOT-BoldItalic.otf Binary files differnew file mode 100644 index 000000000..148c90588 --- /dev/null +++ b/app/fonts/DIN_OT/DINOT-BoldItalic.otf diff --git a/app/fonts/DIN_OT/DINOT-Italic 2.otf b/app/fonts/DIN_OT/DINOT-Italic 2.otf Binary files differnew file mode 100644 index 000000000..e365e77ab --- /dev/null +++ b/app/fonts/DIN_OT/DINOT-Italic 2.otf diff --git a/app/fonts/DIN_OT/DINOT-Medium 2.otf b/app/fonts/DIN_OT/DINOT-Medium 2.otf Binary files differnew file mode 100644 index 000000000..a87a2df37 --- /dev/null +++ b/app/fonts/DIN_OT/DINOT-Medium 2.otf diff --git a/app/fonts/DIN_OT/DINOT-MediumItalic 2.otf b/app/fonts/DIN_OT/DINOT-MediumItalic 2.otf Binary files differnew file mode 100644 index 000000000..14eddfc76 --- /dev/null +++ b/app/fonts/DIN_OT/DINOT-MediumItalic 2.otf diff --git a/app/fonts/Lato/Lato-Black.ttf b/app/fonts/Lato/Lato-Black.ttf Binary files differnew file mode 100755 index 000000000..6848db0d1 --- /dev/null +++ b/app/fonts/Lato/Lato-Black.ttf diff --git a/app/fonts/Lato/Lato-BlackItalic.ttf b/app/fonts/Lato/Lato-BlackItalic.ttf Binary files differnew file mode 100755 index 000000000..5decf1297 --- /dev/null +++ b/app/fonts/Lato/Lato-BlackItalic.ttf diff --git a/app/fonts/Lato/Lato-Bold.ttf b/app/fonts/Lato/Lato-Bold.ttf Binary files differnew file mode 100755 index 000000000..74343694e --- /dev/null +++ b/app/fonts/Lato/Lato-Bold.ttf diff --git a/app/fonts/Lato/Lato-BoldItalic.ttf b/app/fonts/Lato/Lato-BoldItalic.ttf Binary files differnew file mode 100755 index 000000000..684aacf5b --- /dev/null +++ b/app/fonts/Lato/Lato-BoldItalic.ttf diff --git a/app/fonts/Lato/Lato-Hairline.ttf b/app/fonts/Lato/Lato-Hairline.ttf Binary files differnew file mode 100755 index 000000000..288be2955 --- /dev/null +++ b/app/fonts/Lato/Lato-Hairline.ttf diff --git a/app/fonts/Lato/Lato-HairlineItalic.ttf b/app/fonts/Lato/Lato-HairlineItalic.ttf Binary files differnew file mode 100755 index 000000000..c2bfd3353 --- /dev/null +++ b/app/fonts/Lato/Lato-HairlineItalic.ttf diff --git a/app/fonts/Lato/Lato-Italic.ttf b/app/fonts/Lato/Lato-Italic.ttf Binary files differnew file mode 100755 index 000000000..3d3b7a298 --- /dev/null +++ b/app/fonts/Lato/Lato-Italic.ttf diff --git a/app/fonts/Lato/Lato-Light.ttf b/app/fonts/Lato/Lato-Light.ttf Binary files differnew file mode 100755 index 000000000..a958067a8 --- /dev/null +++ b/app/fonts/Lato/Lato-Light.ttf diff --git a/app/fonts/Lato/Lato-LightItalic.ttf b/app/fonts/Lato/Lato-LightItalic.ttf Binary files differnew file mode 100755 index 000000000..5e45ad9a6 --- /dev/null +++ b/app/fonts/Lato/Lato-LightItalic.ttf diff --git a/app/fonts/Lato/Lato-Regular.ttf b/app/fonts/Lato/Lato-Regular.ttf Binary files differnew file mode 100755 index 000000000..04ea8efb1 --- /dev/null +++ b/app/fonts/Lato/Lato-Regular.ttf diff --git a/app/fonts/Lato/OFL.txt b/app/fonts/Lato/OFL.txt new file mode 100755 index 000000000..dfca0da4b --- /dev/null +++ b/app/fonts/Lato/OFL.txt @@ -0,0 +1,93 @@ +Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato"
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/app/fonts/Roboto/Roboto-Black.ttf b/app/fonts/Roboto/Roboto-Black.ttf Binary files differnew file mode 100644 index 000000000..71f01ac2b --- /dev/null +++ b/app/fonts/Roboto/Roboto-Black.ttf diff --git a/app/fonts/Roboto/Roboto-BlackItalic.ttf b/app/fonts/Roboto/Roboto-BlackItalic.ttf Binary files differnew file mode 100644 index 000000000..ec309c785 --- /dev/null +++ b/app/fonts/Roboto/Roboto-BlackItalic.ttf diff --git a/app/fonts/Roboto/Roboto-Bold.ttf b/app/fonts/Roboto/Roboto-Bold.ttf Binary files differnew file mode 100644 index 000000000..aaf374d2c --- /dev/null +++ b/app/fonts/Roboto/Roboto-Bold.ttf diff --git a/app/fonts/Roboto/Roboto-BoldItalic.ttf b/app/fonts/Roboto/Roboto-BoldItalic.ttf Binary files differnew file mode 100644 index 000000000..dcd0f8007 --- /dev/null +++ b/app/fonts/Roboto/Roboto-BoldItalic.ttf diff --git a/app/fonts/Roboto/Roboto-Italic.ttf b/app/fonts/Roboto/Roboto-Italic.ttf Binary files differnew file mode 100644 index 000000000..f382c6874 --- /dev/null +++ b/app/fonts/Roboto/Roboto-Italic.ttf diff --git a/app/fonts/Roboto/Roboto-Light.ttf b/app/fonts/Roboto/Roboto-Light.ttf Binary files differnew file mode 100644 index 000000000..664e1b2f9 --- /dev/null +++ b/app/fonts/Roboto/Roboto-Light.ttf diff --git a/app/fonts/Roboto/Roboto-LightItalic.ttf b/app/fonts/Roboto/Roboto-LightItalic.ttf Binary files differnew file mode 100644 index 000000000..b8f529637 --- /dev/null +++ b/app/fonts/Roboto/Roboto-LightItalic.ttf diff --git a/app/fonts/Roboto/Roboto-Medium.ttf b/app/fonts/Roboto/Roboto-Medium.ttf Binary files differnew file mode 100644 index 000000000..aa00de0ef --- /dev/null +++ b/app/fonts/Roboto/Roboto-Medium.ttf diff --git a/app/fonts/Roboto/Roboto-MediumItalic.ttf b/app/fonts/Roboto/Roboto-MediumItalic.ttf Binary files differnew file mode 100644 index 000000000..67e25f019 --- /dev/null +++ b/app/fonts/Roboto/Roboto-MediumItalic.ttf diff --git a/app/fonts/Roboto/Roboto-Regular.ttf b/app/fonts/Roboto/Roboto-Regular.ttf Binary files differnew file mode 100644 index 000000000..3e6e2e761 --- /dev/null +++ b/app/fonts/Roboto/Roboto-Regular.ttf diff --git a/app/fonts/Roboto/Roboto-Thin.ttf b/app/fonts/Roboto/Roboto-Thin.ttf Binary files differnew file mode 100644 index 000000000..d262d1446 --- /dev/null +++ b/app/fonts/Roboto/Roboto-Thin.ttf diff --git a/app/fonts/Roboto/Roboto-ThinItalic.ttf b/app/fonts/Roboto/Roboto-ThinItalic.ttf Binary files differnew file mode 100644 index 000000000..63e9f9718 --- /dev/null +++ b/app/fonts/Roboto/Roboto-ThinItalic.ttf diff --git a/app/fonts/Roboto/RobotoCondensed-Bold.ttf b/app/fonts/Roboto/RobotoCondensed-Bold.ttf Binary files differnew file mode 100644 index 000000000..48dd63534 --- /dev/null +++ b/app/fonts/Roboto/RobotoCondensed-Bold.ttf diff --git a/app/fonts/Roboto/RobotoCondensed-BoldItalic.ttf b/app/fonts/Roboto/RobotoCondensed-BoldItalic.ttf Binary files differnew file mode 100644 index 000000000..ad728646a --- /dev/null +++ b/app/fonts/Roboto/RobotoCondensed-BoldItalic.ttf diff --git a/app/fonts/Roboto/RobotoCondensed-Italic.ttf b/app/fonts/Roboto/RobotoCondensed-Italic.ttf Binary files differnew file mode 100644 index 000000000..a232513d5 --- /dev/null +++ b/app/fonts/Roboto/RobotoCondensed-Italic.ttf diff --git a/app/fonts/Roboto/RobotoCondensed-Light.ttf b/app/fonts/Roboto/RobotoCondensed-Light.ttf Binary files differnew file mode 100644 index 000000000..a6e368d40 --- /dev/null +++ b/app/fonts/Roboto/RobotoCondensed-Light.ttf diff --git a/app/fonts/Roboto/RobotoCondensed-LightItalic.ttf b/app/fonts/Roboto/RobotoCondensed-LightItalic.ttf Binary files differnew file mode 100644 index 000000000..5b2b6ae08 --- /dev/null +++ b/app/fonts/Roboto/RobotoCondensed-LightItalic.ttf diff --git a/app/fonts/Roboto/RobotoCondensed-Regular.ttf b/app/fonts/Roboto/RobotoCondensed-Regular.ttf Binary files differnew file mode 100644 index 000000000..65bf32a19 --- /dev/null +++ b/app/fonts/Roboto/RobotoCondensed-Regular.ttf diff --git a/app/images/.DS_Store b/app/images/.DS_Store Binary files differdeleted file mode 100644 index d28ef2089..000000000 --- a/app/images/.DS_Store +++ /dev/null diff --git a/app/images/check-white.svg b/app/images/check-white.svg new file mode 100644 index 000000000..0f15667da --- /dev/null +++ b/app/images/check-white.svg @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="13px" viewBox="0 0 16 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <!-- Generator: Sketch 47 (45396) - http://www.bohemiancoding.com/sketch --> + <title>check-white</title> + <desc>Created with Sketch.</desc> + <defs></defs> + <g id="MetaMascara-v2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="account-dropdown-top-bar-IXD" transform="translate(-17.000000, -80.000000)" fill-rule="nonzero" fill="#FFFFFF"> + <g id="Group-11" transform="translate(18.000000, 74.000000)"> + <polygon id="check-white" points="4.2 15.5712828 0.714212839 12.0143571 -0.714212839 13.4142143 4.2 18.4287172 14.7142128 7.69992858 13.2857872 6.30007142"></polygon> + </g> + </g> + </g> +</svg>
\ No newline at end of file diff --git a/app/images/eth_logo.svg b/app/images/eth_logo.svg new file mode 100644 index 000000000..894bd70dd --- /dev/null +++ b/app/images/eth_logo.svg @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg width="256px" height="417px" viewBox="0 0 256 417" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid"> + <g> + <polygon fill="#343434" points="127.9611 0 125.1661 9.5 125.1661 285.168 127.9611 287.958 255.9231 212.32"/> + <polygon fill="#8C8C8C" points="127.962 0 0 212.32 127.962 287.959 127.962 154.158"/> + <polygon fill="#3C3C3B" points="127.9611 312.1866 126.3861 314.1066 126.3861 412.3056 127.9611 416.9066 255.9991 236.5866"/> + <polygon fill="#8C8C8C" points="127.962 416.9052 127.962 312.1852 0 236.5852"/> + <polygon fill="#141414" points="127.9611 287.9577 255.9211 212.3207 127.9611 154.1587"/> + <polygon fill="#393939" points="0.0009 212.3208 127.9609 287.9578 127.9609 154.1588"/> + </g> +</svg>
\ No newline at end of file diff --git a/app/images/import-account.svg b/app/images/import-account.svg new file mode 100644 index 000000000..d6a81b70c --- /dev/null +++ b/app/images/import-account.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="15px" height="15px" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <!-- Generator: Sketch 47 (45396) - http://www.bohemiancoding.com/sketch --> + <title>import-account</title> + <desc>Created with Sketch.</desc> + <defs></defs> + <g id="MetaMascara-v2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="account-dropdown-top-bar-IXD" transform="translate(-25.000000, -718.000000)"> + <g id="Group-6" transform="translate(4.000000, 646.000000)"> + <g id="import-account" transform="translate(21.000000, 72.000000)"> + <rect id="Rectangle-49" fill="#FFFFFF" x="0" y="13.1721326" width="14.4893459" height="1.08397642"></rect> + <rect id="Rectangle" fill="#FFFFFF" x="6.5860663" y="0" width="1.08397642" height="10.5377061"></rect> + <polyline id="Path-12" stroke="#FFFFFF" points="2.63442652 6.5860663 7.24467293 10.5377061 11.8549193 6.5860663"></polyline> + </g> + </g> + </g> + </g> +</svg>
\ No newline at end of file diff --git a/app/images/info-logo.png b/app/images/info-logo.png Binary files differnew file mode 100644 index 000000000..f654ed5b1 --- /dev/null +++ b/app/images/info-logo.png diff --git a/app/images/mm-bolt.svg b/app/images/mm-bolt.svg new file mode 100644 index 000000000..bbf0abcc7 --- /dev/null +++ b/app/images/mm-bolt.svg @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 252 251.7" style="enable-background:new 0 0 252 251.7;" xml:space="preserve"> +<style type="text/css"> + .st0{fill:#757575;} +</style> +<path class="st0" d="M211.3,103.9h-60.7c-2,0-3.6-1.6-3.6-3.6V3.6c0-3.5-4.5-5-6.6-2.2l-102.7,140c-1.8,2.4,0,5.8,2.9,5.8h60.7 + c2,0,3.6,1.6,3.6,3.6v96.6c0,3.5,4.5,5,6.6,2.2l102.7-140C216,107.3,214.3,103.9,211.3,103.9z"/> +</svg> diff --git a/app/images/mm-info-icon.svg b/app/images/mm-info-icon.svg new file mode 100644 index 000000000..825f0f200 --- /dev/null +++ b/app/images/mm-info-icon.svg @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 10 10" style="enable-background:new 0 0 10 10;" xml:space="preserve"> +<style type="text/css"> + .st0{fill:#B8B8B8;} +</style> +<path class="st0" d="M5,0C2.2,0,0,2.2,0,5s2.2,5,5,5s5-2.2,5-5S7.8,0,5,0z M5,2c0.4,0,0.7,0.3,0.7,0.7c0,0.4-0.3,0.7-0.7,0.7 + S4.3,3.2,4.3,2.8C4.3,2.4,4.6,2,5,2z M5.7,8H4.3V4.3h1.5V8z"/> +</svg> diff --git a/app/images/open.svg b/app/images/open.svg new file mode 100644 index 000000000..2957ce43d --- /dev/null +++ b/app/images/open.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch --> + <title>open</title> + <desc>Created with Sketch.</desc> + <defs></defs> + <g id="Mobile-screens" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="MetaMascara-Mobile---structured" transform="translate(-329.000000, -93.000000)"> + <g id="open" transform="translate(330.000000, 94.000000)"> + <path d="M26,13 C26,20.1799 20.1799,26 13,26 C5.8201,26 0,20.1799 0,13 C0,5.8201 5.8201,0 13,0 C20.1799,0 26,5.8201 26,13 Z" id="Stroke-3" stroke="#4A4A4A"></path> + <path d="M6,17 C6,17 7.78735344,10.8360387 13.7616996,10.8360387 L13.7616996,8 L19,12.3733433 L13.7616996,17 L13.7616996,14.1639613 C13.7616996,14.1639613 9.54083576,13.4629933 6,17" id="Fill-5" fill="#4A4A4A"></path> + </g> + </g> + </g> +</svg>
\ No newline at end of file diff --git a/app/images/plus-btn-white.svg b/app/images/plus-btn-white.svg new file mode 100644 index 000000000..2672d39dd --- /dev/null +++ b/app/images/plus-btn-white.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <!-- Generator: Sketch 47 (45396) - http://www.bohemiancoding.com/sketch --> + <title>plus-btn-white</title> + <desc>Created with Sketch.</desc> + <defs></defs> + <g id="MetaMascara-v2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="account-dropdown-top-bar-IXD" transform="translate(-24.000000, -669.000000)" fill="#FFFFFF"> + <g id="Group-6" transform="translate(4.000000, 646.000000)"> + <g id="plus-btn-white" transform="translate(20.000000, 23.000000)"> + <rect id="Rectangle-48" x="7.38461538" y="0" width="1.23076923" height="16"></rect> + <rect id="Rectangle-48" transform="translate(8.000000, 8.000000) rotate(-90.000000) translate(-8.000000, -8.000000) " x="7.38461538" y="0" width="1.23076923" height="16"></rect> + </g> + </g> + </g> + </g> +</svg>
\ No newline at end of file diff --git a/app/images/settings.svg b/app/images/settings.svg index fe61320a5..cf9b298dd 100644 --- a/app/images/settings.svg +++ b/app/images/settings.svg @@ -1,24 +1,22 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="24.088px" height="24px" viewBox="0 0 24.088 24" enable-background="new 0 0 24.088 24" xml:space="preserve"> -<path d="M21.525,10.147c-0.41-0.059-0.847-0.428-0.974-0.82l-0.608-1.481c-0.191-0.365-0.146-0.935,0.1-1.264l0.99-1.318 - c0.246-0.33,0.227-0.854-0.047-1.162l-1.084-1.086c-0.31-0.272-0.832-0.293-1.164-0.045l-1.316,0.988 - c-0.33,0.248-0.898,0.293-1.264,0.101l-1.48-0.609c-0.395-0.126-0.764-0.562-0.82-0.971l-0.233-1.629 - c-0.058-0.409-0.44-0.778-0.851-0.822c0,0-0.254-0.026-0.77-0.026c-0.514,0-0.77,0.026-0.77,0.026 - c-0.41,0.044-0.793,0.413-0.852,0.822L10.15,2.48c-0.059,0.409-0.428,0.845-0.82,0.971L7.85,4.06 - C7.484,4.251,6.916,4.207,6.586,3.959L5.268,2.97c-0.33-0.248-0.854-0.228-1.162,0.045L3.021,4.101 - C2.749,4.41,2.727,4.933,2.975,5.263l0.988,1.318c0.249,0.33,0.293,0.899,0.102,1.264l-0.61,1.482 - c-0.125,0.393-0.562,0.762-0.972,0.82l-1.629,0.231c-0.408,0.059-0.776,0.442-0.82,0.853c0,0-0.026,0.255-0.026,0.77 - c0,0.516,0.026,0.77,0.026,0.77c0.044,0.412,0.412,0.793,0.82,0.853l1.629,0.231c0.408,0.06,0.847,0.429,0.972,0.82l0.61,1.48 - c0.191,0.365,0.146,0.936-0.102,1.264l-0.988,1.318c-0.248,0.33-0.308,0.779-0.132,0.994c0.175,0.217,0.677,0.752,0.679,0.754 - c0,0.002,0.17,0.156,0.375,0.344c0.203,0.188,1.041,0.449,1.371,0.203l1.317-0.99c0.33-0.246,0.897-0.293,1.265-0.1l1.479,0.608 - c0.394,0.125,0.763,0.562,0.819,0.972l0.233,1.629c0.058,0.408,0.44,0.779,0.853,0.822c0,0,0.254,0.026,0.769,0.026 - s0.771-0.026,0.771-0.026c0.408-0.043,0.793-0.414,0.85-0.822l0.234-1.629c0.057-0.408,0.426-0.847,0.819-0.972l1.479-0.61 - c0.365-0.191,0.935-0.146,1.265,0.102l1.317,0.99c0.332,0.246,0.854,0.227,1.164-0.047l1.082-1.084 - c0.273-0.312,0.293-0.834,0.047-1.164l-0.989-1.318c-0.246-0.328-0.291-0.898-0.101-1.264l0.609-1.48 - c0.127-0.393,0.562-0.762,0.973-0.82l1.627-0.231c0.41-0.06,0.779-0.44,0.822-0.853c0,0,0.027-0.254,0.027-0.77 - c0-0.515-0.027-0.77-0.027-0.77c-0.043-0.41-0.412-0.794-0.822-0.853L21.525,10.147z M12.004,15.001c-1.657,0-3-1.344-3-3 - c0-1.657,1.343-3,3-3s3,1.344,3,3S13.66,15.001,12.004,15.001z"/> -</svg> +<?xml version="1.0" encoding="UTF-8"?> +<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <!-- Generator: Sketch 47 (45396) - http://www.bohemiancoding.com/sketch --> + <title>settings</title> + <desc>Created with Sketch.</desc> + <defs> + <polygon id="path-1" points="20 10 20 19.9998 0 19.9998 0 10 0 0.0002 20 0.0002"></polygon> + </defs> + <g id="MetaMascara-v2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="account-dropdown-top-bar-IXD" transform="translate(-25.000000, -826.000000)"> + <g id="Group-6" transform="translate(4.000000, 646.000000)"> + <g id="settings" transform="translate(21.000000, 180.000000)"> + <mask id="mask-2" fill="white"> + <use xlink:href="#path-1"></use> + </mask> + <g id="Clip-2"></g> + <path d="M10,13.6602 C7.979,13.6602 6.34,12.0212 6.34,10.0002 C6.34,7.9782 7.979,6.3402 10,6.3402 C12.021,6.3402 13.66,7.9782 13.66,10.0002 C13.66,12.0212 12.021,13.6602 10,13.6602 L10,13.6602 Z M19.157,11.8112 C19.53,11.8112 19.878,11.5092 19.929,11.1392 C19.929,11.1392 20,10.6182 20,10.0002 C20,9.3822 19.929,8.8622 19.929,8.8622 C19.878,8.4922 19.53,8.1892 19.157,8.1892 L17.228,8.1892 C16.854,8.1892 16.466,7.9512 16.365,7.6602 C16.265,7.3682 16.127,6.4352 16.391,6.1712 L17.755,4.8072 C18.019,4.5432 18.039,4.0922 17.8,3.8052 L16.195,2.2002 C15.908,1.9602 15.458,1.9812 15.193,2.2452 L13.829,3.6092 C13.565,3.8732 13.125,3.9802 12.852,3.8462 C12.578,3.7122 11.812,3.1462 11.812,2.7732 L11.812,0.8432 C11.812,0.4702 11.509,0.1222 11.139,0.0722 C11.139,0.0722 10.619,0.0002 10,0.0002 C9.382,0.0002 8.862,0.0722 8.862,0.0722 C8.492,0.1222 8.189,0.4702 8.189,0.8432 L8.189,2.7732 C8.189,3.1462 7.951,3.5352 7.66,3.6352 C7.369,3.7352 6.435,3.8732 6.171,3.6092 L4.807,2.2452 C4.542,1.9812 4.092,1.9612 3.805,2.2002 L2.2,3.8052 C1.96,4.0922 1.981,4.5432 2.245,4.8072 L3.609,6.1712 C3.873,6.4352 3.98,6.8752 3.846,7.1482 C3.711,7.4222 3.146,8.1892 2.773,8.1892 L0.843,8.1892 C0.47,8.1892 0.123,8.4922 0.072,8.8622 C0.072,8.8622 0,9.3822 0,10.0002 C0,10.6182 0.072,11.1392 0.072,11.1392 C0.123,11.5092 0.47,11.8112 0.843,11.8112 L2.773,11.8112 C3.146,11.8112 3.535,12.0502 3.635,12.3412 C3.735,12.6322 3.874,13.5642 3.609,13.8292 L2.246,15.1932 C1.981,15.4572 1.961,15.9082 2.2,16.1952 L3.805,17.8002 C4.092,18.0392 4.542,18.0192 4.807,17.7552 L6.171,16.3902 C6.435,16.1272 6.875,16.0202 7.148,16.1542 C7.422,16.2882 8.189,16.8532 8.189,17.2272 L8.189,19.1572 C8.189,19.5302 8.492,19.8782 8.862,19.9292 C8.862,19.9292 9.382,20.0002 10,20.0002 C10.619,20.0002 11.139,19.9292 11.139,19.9292 C11.509,19.8772 11.812,19.5302 11.812,19.1572 L11.812,17.2272 C11.812,16.8532 12.05,16.4662 12.341,16.3652 C12.632,16.2642 13.565,16.1272 13.829,16.3902 L15.193,17.7552 C15.458,18.0182 15.908,18.0392 16.195,17.8002 L17.8,16.1952 C18.039,15.9082 18.02,15.4582 17.755,15.1932 L16.391,13.8292 C16.127,13.5652 16.021,13.1252 16.154,12.8512 C16.288,12.5782 16.854,11.8112 17.228,11.8112 L19.157,11.8112 Z" id="Fill-1" fill="#B3B3B3" mask="url(#mask-2)"></path> + </g> + </g> + </g> + </g> +</svg>
\ No newline at end of file diff --git a/app/manifest.json b/app/manifest.json index d6c57d681..8ae27fe8b 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "3.13.3", + "version": "4.0.5", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", diff --git a/app/notification.html b/app/notification.html index cc485da7f..f10cbbf41 100644 --- a/app/notification.html +++ b/app/notification.html @@ -1,5 +1,5 @@ <!doctype html> -<html> +<html style="height:600px;"> <head> <meta charset="utf-8"> <title>MetaMask Notification</title> @@ -9,7 +9,7 @@ } </style> </head> - <body> + <body class="notification" style="height:600px;"> <div id="app-content"></div> <script src="./scripts/popup.js" type="text/javascript" charset="utf-8"></script> </body> diff --git a/app/popup.html b/app/popup.html index d09b09315..c4e5188e5 100644 --- a/app/popup.html +++ b/app/popup.html @@ -1,11 +1,11 @@ <!doctype html> -<html> +<html style="width:350px; height:600px;"> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no"> <title>MetaMask Plugin</title> </head> - <body style="width:357px; height:500px;"> + <body style="width:350px; height:600px;"> <div id="app-content"></div> <script src="./scripts/popup.js" type="text/javascript" charset="utf-8"></script> </body> diff --git a/app/scripts/config.js b/app/scripts/config.js index 1d4ff7c0d..74c5b576e 100644 --- a/app/scripts/config.js +++ b/app/scripts/config.js @@ -4,6 +4,15 @@ const KOVAN_RPC_URL = 'https://kovan.infura.io/metamask' const RINKEBY_RPC_URL = 'https://rinkeby.infura.io/metamask' const LOCALHOST_RPC_URL = 'http://localhost:8545' +const MAINET_RPC_URL_BETA = 'https://mainnet.infura.io/metamask2' +const ROPSTEN_RPC_URL_BETA = 'https://ropsten.infura.io/metamask2' +const KOVAN_RPC_URL_BETA = 'https://kovan.infura.io/metamask2' +const RINKEBY_RPC_URL_BETA = 'https://rinkeby.infura.io/metamask2' + +const DEFAULT_RPC = 'rinkeby' +const OLD_UI_NETWORK_TYPE = 'network' +const BETA_UI_NETWORK_TYPE = 'networkBeta' + global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG' module.exports = { @@ -14,9 +23,22 @@ module.exports = { kovan: KOVAN_RPC_URL, rinkeby: RINKEBY_RPC_URL, }, + // Used for beta UI + networkBeta: { + localhost: LOCALHOST_RPC_URL, + mainnet: MAINET_RPC_URL_BETA, + ropsten: ROPSTEN_RPC_URL_BETA, + kovan: KOVAN_RPC_URL_BETA, + rinkeby: RINKEBY_RPC_URL_BETA, + }, networkNames: { 3: 'Ropsten', 4: 'Rinkeby', 42: 'Kovan', }, + enums: { + DEFAULT_RPC, + OLD_UI_NETWORK_TYPE, + BETA_UI_NETWORK_TYPE, + }, } diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js index 377ba6eca..db1a5b374 100644 --- a/app/scripts/controllers/network.js +++ b/app/scripts/controllers/network.js @@ -7,14 +7,19 @@ const ComposedStore = require('obs-store/lib/composed') const extend = require('xtend') const EthQuery = require('eth-query') const createEventEmitterProxy = require('../lib/events-proxy.js') -const RPC_ADDRESS_LIST = require('../config.js').network -const DEFAULT_RPC = RPC_ADDRESS_LIST['rinkeby'] +const networkConfig = require('../config.js') +const { OLD_UI_NETWORK_TYPE, DEFAULT_RPC } = networkConfig.enums const INFURA_PROVIDER_TYPES = ['ropsten', 'rinkeby', 'kovan', 'mainnet'] module.exports = class NetworkController extends EventEmitter { constructor (config) { super() + + this._networkEndpointVersion = OLD_UI_NETWORK_TYPE + this._networkEndpoints = this.getNetworkEndpoints(OLD_UI_NETWORK_TYPE) + this._defaultRpc = this._networkEndpoints[DEFAULT_RPC] + config.provider.rpcTarget = this.getRpcAddressForType(config.provider.type, config.provider) this.networkStore = new ObservableStore('loading') this.providerStore = new ObservableStore(config.provider) @@ -24,6 +29,23 @@ module.exports = class NetworkController extends EventEmitter { this.on('networkDidChange', this.lookupNetwork) } + async setNetworkEndpoints (version) { + if (version === this._networkEndpointVersion) { + return + } + + this._networkEndpointVersion = version + this._networkEndpoints = this.getNetworkEndpoints(version) + this._defaultRpc = this._networkEndpoints[DEFAULT_RPC] + const { type } = this.getProviderConfig() + + return this.setProviderType(type, true) + } + + getNetworkEndpoints (version = OLD_UI_NETWORK_TYPE) { + return networkConfig[version] + } + initializeProvider (_providerParams) { this._baseProviderParams = _providerParams const { type, rpcTarget } = this.providerStore.getState() @@ -83,10 +105,13 @@ module.exports = class NetworkController extends EventEmitter { return this.getRpcAddressForType(provider.type) } - async setProviderType (type) { + async setProviderType (type, forceUpdate = false) { assert(type !== 'rpc', `NetworkController.setProviderType - cannot connect by type "rpc"`) // skip if type already matches - if (type === this.getProviderConfig().type) return + if (type === this.getProviderConfig().type && !forceUpdate) { + return + } + const rpcTarget = this.getRpcAddressForType(type) assert(rpcTarget, `NetworkController - unknown rpc address for type "${type}"`) this.providerStore.updateState({ type, rpcTarget }) @@ -98,8 +123,11 @@ module.exports = class NetworkController extends EventEmitter { } getRpcAddressForType (type, provider = this.getProviderConfig()) { - if (RPC_ADDRESS_LIST[type]) return RPC_ADDRESS_LIST[type] - return provider && provider.rpcTarget ? provider.rpcTarget : DEFAULT_RPC + if (this._networkEndpoints[type]) { + return this._networkEndpoints[type] + } + + return provider && provider.rpcTarget ? provider.rpcTarget : this._defaultRpc } // diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js index c42f47037..39d15fd83 100644 --- a/app/scripts/controllers/preferences.js +++ b/app/scripts/controllers/preferences.js @@ -9,11 +9,21 @@ class PreferencesController { frequentRpcList: [], currentAccountTab: 'history', tokens: [], + useBlockie: false, + featureFlags: {}, }, opts.initState) this.store = new ObservableStore(initState) } // PUBLIC METHODS + setUseBlockie (val) { + this.store.updateState({ useBlockie: val }) + } + + getUseBlockie () { + return this.store.getState().useBlockie + } + setSelectedAddress (_address) { return new Promise((resolve, reject) => { const address = normalizeAddress(_address) @@ -43,6 +53,17 @@ class PreferencesController { } this.store.updateState({ tokens }) + + return Promise.resolve(tokens) + } + + removeToken (rawAddress) { + const tokens = this.store.getState().tokens + + const updatedTokens = tokens.filter(token => token.address !== rawAddress) + + this.store.updateState({ tokens: updatedTokens }) + return Promise.resolve(updatedTokens) } getTokens () { @@ -82,6 +103,22 @@ class PreferencesController { getFrequentRpcList () { return this.store.getState().frequentRpcList } + + setFeatureFlag (feature, activated) { + const currentFeatureFlags = this.store.getState().featureFlags + const updatedFeatureFlags = { + ...currentFeatureFlags, + [feature]: activated, + } + + this.store.updateState({ featureFlags: updatedFeatureFlags }) + + return Promise.resolve(updatedFeatureFlags) + } + + getFeatureFlags () { + return this.store.getState().featureFlags + } // // PRIVATE METHODS // diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index 7c7efb84d..7f3130540 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -193,6 +193,10 @@ module.exports = class TransactionController extends EventEmitter { this.txStateManager.updateTx(txMeta, 'retryTransaction: manual retry') } + async updateTransaction (txMeta) { + this.txStateManager.updateTx(txMeta, 'confTx: user updated transaction') + } + async updateAndApproveTransaction (txMeta) { this.txStateManager.updateTx(txMeta, 'confTx: user approved transaction') await this.approveTransaction(txMeta.id) diff --git a/app/scripts/lib/environment-type.js b/app/scripts/lib/environment-type.js new file mode 100644 index 000000000..7966926eb --- /dev/null +++ b/app/scripts/lib/environment-type.js @@ -0,0 +1,10 @@ +module.exports = function environmentType () { + const url = window.location.href + if (url.match(/popup.html$/)) { + return 'popup' + } else if (url.match(/home.html$/)) { + return 'responsive' + } else { + return 'notification' + } +} diff --git a/app/scripts/lib/is-popup-or-notification.js b/app/scripts/lib/is-popup-or-notification.js index 693fa8751..e2999411f 100644 --- a/app/scripts/lib/is-popup-or-notification.js +++ b/app/scripts/lib/is-popup-or-notification.js @@ -1,6 +1,9 @@ module.exports = function isPopupOrNotification () { const url = window.location.href - if (url.match(/popup.html$/)) { + // if (url.match(/popup.html$/) || url.match(/home.html$/)) { + // Below regexes needed for feature toggles (e.g. see line ~340 in ui/app/app.js) + // Revert below regexes to above commented out regexes before merge to master + if (url.match(/popup.html(?:\?.+)*$/) || url.match(/home.html(?:\?.+)*$/)) { return 'popup' } else { return 'notification' diff --git a/app/scripts/lib/notification-manager.js b/app/scripts/lib/notification-manager.js index 7846ef7f0..adaf60c65 100644 --- a/app/scripts/lib/notification-manager.js +++ b/app/scripts/lib/notification-manager.js @@ -1,5 +1,5 @@ const extension = require('extensionizer') -const height = 520 +const height = 620 const width = 360 diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 23f2a1598..b50a04703 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -335,6 +335,7 @@ module.exports = class MetamaskController extends EventEmitter { // etc getState: (cb) => cb(null, this.getState()), setCurrentCurrency: this.setCurrentCurrency.bind(this), + setUseBlockie: this.setUseBlockie.bind(this), markAccountsFound: this.markAccountsFound.bind(this), // coinbase @@ -352,13 +353,16 @@ module.exports = class MetamaskController extends EventEmitter { submitPassword: nodeify(keyringController.submitPassword, keyringController), // network management + setNetworkEndpoints: nodeify(networkController.setNetworkEndpoints, networkController), setProviderType: nodeify(networkController.setProviderType, networkController), setCustomRpc: nodeify(this.setCustomRpc, this), // PreferencesController setSelectedAddress: nodeify(preferencesController.setSelectedAddress, preferencesController), addToken: nodeify(preferencesController.addToken, preferencesController), + removeToken: nodeify(preferencesController.removeToken, preferencesController), setCurrentAccountTab: nodeify(preferencesController.setCurrentAccountTab, preferencesController), + setFeatureFlag: nodeify(preferencesController.setFeatureFlag, preferencesController), // AddressController setAddressBook: nodeify(addressBookController.setAddressBook, addressBookController), @@ -373,6 +377,7 @@ module.exports = class MetamaskController extends EventEmitter { // txController cancelTransaction: nodeify(txController.cancelTransaction, txController), + updateTransaction: nodeify(txController.updateTransaction, txController), updateAndApproveTransaction: nodeify(txController.updateAndApproveTransaction, txController), retryTransaction: nodeify(this.retryTransaction, this), @@ -821,6 +826,15 @@ module.exports = class MetamaskController extends EventEmitter { return rpcTarget } + setUseBlockie (val, cb) { + try { + this.preferencesController.setUseBlockie(val) + cb(null) + } catch (err) { + cb(err) + } + } + recordFirstTimeInfo (initState) { if (!('firstTimeInfo' in initState)) { initState.firstTimeInfo = { diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js index 2f47512eb..f5cc255d1 100644 --- a/app/scripts/platforms/extension.js +++ b/app/scripts/platforms/extension.js @@ -17,6 +17,11 @@ class ExtensionPlatform { return extension.runtime.getManifest().version } + openExtensionInBrowser () { + const extensionURL = extension.runtime.getURL('home.html') + this.openWindow({ url: extensionURL }) + } + getPlatformInfo (cb) { try { extension.runtime.getPlatformInfo((platform) => { diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js index f1eb394d7..2e4334bb1 100644 --- a/app/scripts/popup-core.js +++ b/app/scripts/popup-core.js @@ -1,6 +1,7 @@ const EventEmitter = require('events').EventEmitter const async = require('async') const Dnode = require('dnode') +const Eth = require('ethjs') const EthQuery = require('eth-query') const launchMetamaskUi = require('../../ui') const StreamProvider = require('web3-stream-provider') @@ -34,6 +35,7 @@ function setupWeb3Connection (connectionStream) { providerStream.on('error', console.error.bind(console)) global.ethereumProvider = providerStream global.ethQuery = new EthQuery(providerStream) + global.eth = new Eth(providerStream) } function setupControllerConnection (connectionStream, cb) { diff --git a/app/scripts/popup.js b/app/scripts/popup.js index 5f17f0651..d0952af6a 100644 --- a/app/scripts/popup.js +++ b/app/scripts/popup.js @@ -1,5 +1,6 @@ const injectCss = require('inject-css') -const MetaMaskUiCss = require('../../ui/css') +const OldMetaMaskUiCss = require('../../old-ui/css') +const NewMetaMaskUiCss = require('../../ui/css') const startPopup = require('./popup-core') const PortStream = require('./lib/port-stream.js') const isPopupOrNotification = require('./lib/is-popup-or-notification') @@ -11,10 +12,6 @@ const notificationManager = new NotificationManager() // create platform global global.platform = new ExtensionPlatform() -// inject css -const css = MetaMaskUiCss() -injectCss(css) - // identify window type (popup, notification) const windowType = isPopupOrNotification() global.METAMASK_UI_TYPE = windowType @@ -28,8 +25,21 @@ const connectionStream = new PortStream(extensionPort) const container = document.getElementById('app-content') startPopup({ container, connectionStream }, (err, store) => { if (err) return displayCriticalError(err) + + let betaUIState = store.getState().metamask.featureFlags.betaUI + let css = betaUIState ? NewMetaMaskUiCss() : OldMetaMaskUiCss() + let deleteInjectedCss = injectCss(css) + let newBetaUIState + store.subscribe(() => { const state = store.getState() + newBetaUIState = state.metamask.featureFlags.betaUI + if (newBetaUIState !== betaUIState) { + deleteInjectedCss() + betaUIState = newBetaUIState + css = betaUIState ? NewMetaMaskUiCss() : OldMetaMaskUiCss() + deleteInjectedCss = injectCss(css) + } if (state.appState.shouldClose) notificationManager.closePopup() }) }) diff --git a/development/states/first-time.json b/development/states/first-time.json index b2cc8ef8f..480839d59 100644 --- a/development/states/first-time.json +++ b/development/states/first-time.json @@ -8,6 +8,7 @@ "frequentRpcList": [], "unapprovedTxs": {}, "currentCurrency": "USD", + "featureFlags": {"betaUI": true}, "conversionRate": 12.7527416, "conversionDate": 1487624341, "noActiveNotices": false, diff --git a/gulpfile.js b/gulpfile.js index 293179892..195e3f3ca 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -19,10 +19,16 @@ var manifest = require('./app/manifest.json') var gulpif = require('gulp-if') var replace = require('gulp-replace') var mkdirp = require('mkdirp') +var sass = require('gulp-sass') +var autoprefixer = require('gulp-autoprefixer') +var gulpStylelint = require('gulp-stylelint') +var stylefmt = require('gulp-stylefmt') + var disableDebugTools = gutil.env.disableDebugTools var debug = gutil.env.debug + // browser reload gulp.task('dev:reload', function() { @@ -189,6 +195,37 @@ const jsFiles = [ 'popup', ] +// scss compilation and autoprefixing tasks + +gulp.task('build:scss', function () { + return gulp.src('ui/app/css/index.scss') + .pipe(sourcemaps.init()) + .pipe(sass().on('error', sass.logError)) + .pipe(sourcemaps.write()) + .pipe(autoprefixer()) + .pipe(gulp.dest('ui/app/css/output')) +}) +gulp.task('watch:scss', function() { + gulp.watch(['ui/app/css/**/*.scss'], gulp.series(['build:scss'])) +}) + +gulp.task('lint-scss', function() { + return gulp + .src('ui/app/css/itcss/**/*.scss') + .pipe(gulpStylelint({ + reporters: [ + {formatter: 'string', console: true} + ], + fix: true, + })); +}); + +gulp.task('fmt-scss', function () { + return gulp.src('ui/app/css/itcss/**/*.scss') + .pipe(stylefmt()) + .pipe(gulp.dest('ui/app/css/itcss')); +}); + // bundle tasks var jsDevStrings = jsFiles.map(jsFile => `dev:js:${jsFile}`) @@ -232,9 +269,9 @@ gulp.task('zip', gulp.parallel('zip:chrome', 'zip:firefox', 'zip:edge', 'zip:ope // high level tasks -gulp.task('dev', gulp.series('dev:js', 'copy', gulp.parallel('copy:watch', 'dev:reload'))) +gulp.task('dev', gulp.series('build:scss', 'dev:js', 'copy', gulp.parallel('watch:scss', 'copy:watch', 'dev:reload'))) -gulp.task('build', gulp.series('clean', gulp.parallel('build:js', 'copy'))) +gulp.task('build', gulp.series('clean', 'build:scss', gulp.parallel('build:js', 'copy'))) gulp.task('dist', gulp.series('build', 'zip')) // task generators @@ -262,7 +299,7 @@ function zipTask(target) { return () => { return gulp.src(`dist/${target}/**`) .pipe(zip(`metamask-${target}-${manifest.version}.zip`)) - .pipe(gulp.dest('builds')); + .pipe(gulp.dest('builds')) } } diff --git a/mascara/src/app/buy-ether-widget/index.js b/mascara/src/app/buy-ether-widget/index.js new file mode 100644 index 000000000..9fe659daa --- /dev/null +++ b/mascara/src/app/buy-ether-widget/index.js @@ -0,0 +1,197 @@ +import React, {Component, PropTypes} from 'react' +import classnames from 'classnames' +import {connect} from 'react-redux' +import {qrcode} from 'qrcode-npm' +import copyToClipboard from 'copy-to-clipboard' +import ShapeShiftForm from '../shapeshift-form' +import {buyEth, showAccountDetail} from '../../../../ui/app/actions' + +const OPTION_VALUES = { + COINBASE: 'coinbase', + SHAPESHIFT: 'shapeshift', + QR_CODE: 'qr_code', +} + +const OPTIONS = [ + { + name: 'Direct Deposit', + value: OPTION_VALUES.QR_CODE, + }, + { + name: 'Buy with Dollars', + value: OPTION_VALUES.COINBASE, + }, + { + name: 'Buy with Cryptos', + value: OPTION_VALUES.SHAPESHIFT, + }, +] + +class BuyEtherWidget extends Component { + + static propTypes = { + address: PropTypes.string, + skipText: PropTypes.string, + className: PropTypes.string, + onSkip: PropTypes.func, + goToCoinbase: PropTypes.func, + showAccountDetail: PropTypes.func, + }; + + state = { + selectedOption: OPTION_VALUES.QR_CODE, + }; + + + copyToClipboard = () => { + const { address } = this.props + + this.setState({ justCopied: true }, () => copyToClipboard(address)) + + setTimeout(() => this.setState({ justCopied: false }), 1000) + } + + renderSkip () { + const {showAccountDetail, address, skipText, onSkip} = this.props + + return ( + <div + className="buy-ether__do-it-later" + onClick={() => { + if (onSkip) return onSkip() + showAccountDetail(address) + }} + > + {skipText || 'Do it later'} + </div> + ) + } + + renderCoinbaseLogo () { + return ( + <svg width="140px" height="49px" viewBox="0 0 579 126" version="1.1"> + <g id="Page-1" stroke="none" strokeWidth={1} fill="none" fillRule="evenodd"> + <g id="Imported-Layers" fill="#0081C9"> + <path d="M37.752,125.873 C18.824,125.873 0.369,112.307 0.369,81.549 C0.369,50.79 18.824,37.382 37.752,37.382 C47.059,37.382 54.315,39.749 59.52,43.219 L53.841,55.68 C50.371,53.156 45.166,51.579 39.961,51.579 C28.604,51.579 18.193,60.57 18.193,81.391 C18.193,102.212 28.919,111.361 39.961,111.361 C45.166,111.361 50.371,109.783 53.841,107.26 L59.52,120.036 C54.157,123.664 47.059,125.873 37.752,125.873" id="Fill-1" /> + <path d="M102.898,125.873 C78.765,125.873 65.515,106.786 65.515,81.549 C65.515,56.311 78.765,37.382 102.898,37.382 C127.032,37.382 140.282,56.311 140.282,81.549 C140.282,106.786 127.032,125.873 102.898,125.873 L102.898,125.873 Z M102.898,51.105 C89.491,51.105 82.866,63.093 82.866,81.391 C82.866,99.688 89.491,111.834 102.898,111.834 C116.306,111.834 122.931,99.688 122.931,81.391 C122.931,63.093 116.306,51.105 102.898,51.105 L102.898,51.105 Z" id="Fill-2" /> + <path d="M163.468,23.659 C157.79,23.659 153.215,19.243 153.215,13.88 C153.215,8.517 157.79,4.1 163.468,4.1 C169.146,4.1 173.721,8.517 173.721,13.88 C173.721,19.243 169.146,23.659 163.468,23.659 L163.468,23.659 Z M154.793,39.118 L172.144,39.118 L172.144,124.138 L154.793,124.138 L154.793,39.118 Z" id="Fill-3" /> + <path d="M240.443,124.137 L240.443,67.352 C240.443,57.415 234.449,51.263 222.619,51.263 C216.31,51.263 210.473,52.367 207.003,53.787 L207.003,124.137 L189.81,124.137 L189.81,43.376 C198.328,39.906 209.212,37.382 222.461,37.382 C246.28,37.382 257.794,47.793 257.794,65.775 L257.794,124.137 L240.443,124.137" id="Fill-4" /> + <path d="M303.536,125.873 C292.494,125.873 281.611,123.191 274.986,119.879 L274.986,0.314 L292.179,0.314 L292.179,41.326 C296.28,39.433 302.905,37.856 308.741,37.856 C330.667,37.856 345.494,53.629 345.494,79.656 C345.494,111.676 328.931,125.873 303.536,125.873 L303.536,125.873 Z M305.744,51.263 C301.012,51.263 295.491,52.367 292.179,54.103 L292.179,109.941 C294.703,111.045 299.593,112.149 304.482,112.149 C318.205,112.149 328.301,102.685 328.301,80.918 C328.301,62.305 319.467,51.263 305.744,51.263 L305.744,51.263 Z" id="Fill-5" /> + <path d="M392.341,125.873 C367.892,125.873 355.589,115.935 355.589,99.215 C355.589,75.555 380.826,71.296 406.537,69.876 L406.537,64.513 C406.537,53.787 399.439,50.001 388.555,50.001 C380.511,50.001 370.731,52.525 365.053,55.207 L360.636,43.376 C367.419,40.379 378.933,37.382 390.29,37.382 C410.638,37.382 422.942,45.269 422.942,66.248 L422.942,119.879 C416.79,123.191 404.329,125.873 392.341,125.873 L392.341,125.873 Z M406.537,81.391 C389.186,82.337 371.835,83.757 371.835,98.9 C371.835,107.89 378.776,113.411 391.868,113.411 C397.389,113.411 403.856,112.465 406.537,111.203 L406.537,81.391 L406.537,81.391 Z" id="Fill-6" /> + <path d="M461.743,125.873 C451.806,125.873 441.395,123.191 435.244,119.879 L441.08,106.629 C445.496,109.31 454.803,112.149 461.27,112.149 C470.576,112.149 476.728,107.575 476.728,100.477 C476.728,92.748 470.261,89.751 461.586,86.596 C450.228,82.337 437.452,77.132 437.452,61.201 C437.452,47.162 448.336,37.382 467.264,37.382 C477.517,37.382 486.035,39.906 492.029,43.376 L486.665,55.364 C482.88,52.998 475.309,50.317 469.157,50.317 C460.166,50.317 455.118,55.049 455.118,61.201 C455.118,68.93 461.428,71.611 469.788,74.766 C481.618,79.183 494.71,84.072 494.71,100.635 C494.71,115.935 483.038,125.873 461.743,125.873" id="Fill-7" /> + <path d="M578.625,81.233 L522.155,89.12 C523.89,104.42 533.828,112.149 548.182,112.149 C556.699,112.149 565.848,110.099 571.684,106.944 L576.732,119.879 C570.107,123.349 558.75,125.873 547.078,125.873 C520.262,125.873 505.277,108.679 505.277,81.549 C505.277,55.522 519.789,37.382 543.607,37.382 C565.69,37.382 578.782,51.894 578.782,74.766 C578.782,76.816 578.782,79.025 578.625,81.233 L578.625,81.233 Z M543.292,50.001 C530.042,50.001 521.367,60.097 521.051,77.763 L562.22,72.084 C562.062,57.257 554.649,50.001 543.292,50.001 L543.292,50.001 Z" id="Fill-8" /> + </g> + </g> + </svg> + ) + } + + renderCoinbaseForm () { + const {goToCoinbase, address} = this.props + + return ( + <div className="buy-ether__action-content-wrapper"> + <div>{this.renderCoinbaseLogo()}</div> + <div className="buy-ether__body-text">Coinbase is the world’s most popular way to buy and sell bitcoin, ethereum, and litecoin.</div> + <a className="first-time-flow__link buy-ether__faq-link">What is Ethereum?</a> + <div className="buy-ether__buttons"> + <button + className="first-time-flow__button" + onClick={() => goToCoinbase(address)} + > + Buy + </button> + </div> + </div> + ) + } + + renderContent () { + const { address } = this.props + const { justCopied } = this.state + const qrImage = qrcode(4, 'M') + qrImage.addData(address) + qrImage.make() + + switch (this.state.selectedOption) { + case OPTION_VALUES.COINBASE: + return this.renderCoinbaseForm() + case OPTION_VALUES.SHAPESHIFT: + return ( + <div className="buy-ether__action-content-wrapper"> + <div className="shapeshift-logo" /> + <div className="buy-ether__body-text"> + Trade any leading blockchain asset for any other. Protection by Design. No Account Needed. + </div> + <ShapeShiftForm btnClass="first-time-flow__button" /> + </div> + ) + case OPTION_VALUES.QR_CODE: + return ( + <div className="buy-ether__action-content-wrapper"> + <div dangerouslySetInnerHTML={{ __html: qrImage.createTableTag(4) }} /> + <div className="buy-ether__body-text">Deposit Ether directly into your account.</div> + <div className="buy-ether__small-body-text">(This is the account address that MetaMask created for you to recieve funds.)</div> + <div className="buy-ether__buttons"> + <button + className="first-time-flow__button" + onClick={this.copyToClipboard} + disabled={justCopied} + > + { justCopied ? 'Copied' : 'Copy' } + </button> + </div> + </div> + ) + default: + return null + } + } + + render () { + const { className = '' } = this.props + const { selectedOption } = this.state + + return ( + <div className={`${className} buy-ether__content-wrapper`}> + <div className="buy-ether__content-headline-wrapper"> + <div className="buy-ether__content-headline">Deposit Options</div> + {this.renderSkip()} + </div> + <div className="buy-ether__content"> + <div className="buy-ether__side-panel"> + {OPTIONS.map(({ name, value }) => ( + <div + key={value} + className={classnames('buy-ether__side-panel-item', { + 'buy-ether__side-panel-item--selected': value === selectedOption, + })} + onClick={() => this.setState({ selectedOption: value })} + > + <div className="buy-ether__side-panel-item-name">{name}</div> + {value === selectedOption && ( + <svg viewBox="0 0 574 1024" id="si-ant-right" width="15px" height="15px"> + <path d="M10 9Q0 19 0 32t10 23l482 457L10 969Q0 979 0 992t10 23q10 9 24 9t24-9l506-480q10-10 10-23t-10-23L58 9Q48 0 34 0T10 9z" /> + </svg> + )} + </div> + ))} + </div> + <div className="buy-ether__action-content"> + {this.renderContent()} + </div> + </div> + </div> + ) + } +} + +export default connect( + ({ metamask: { selectedAddress } }) => ({ + address: selectedAddress, + }), + dispatch => ({ + goToCoinbase: address => dispatch(buyEth({ network: '1', address, amount: 0 })), + showAccountDetail: address => dispatch(showAccountDetail(address)), + }) +)(BuyEtherWidget) diff --git a/mascara/src/app/first-time/index.css b/mascara/src/app/first-time/index.css index 28aa3060a..2248c0438 100644 --- a/mascara/src/app/first-time/index.css +++ b/mascara/src/app/first-time/index.css @@ -75,7 +75,7 @@ .backup-phrase__tips { margin: 40px 0 !important; - width: initial !important; + width: initial !important; } .backup-phrase__confirm-secret, @@ -337,7 +337,7 @@ button.backup-phrase__confirm-seed-option:hover { padding: 14px 21px; appearance: none; -webkit-appearance: none; - -moz-appearance: none; + -moz-appearance: none; cursor: pointer; } @@ -540,10 +540,10 @@ button.backup-phrase__confirm-seed-option:hover { text-transform: uppercase; margin: 35px 0 14px; transition: 200ms ease-in-out; + background-color: rgba(247, 134, 28, 0.9); } button.first-time-flow__button[disabled] { - background-color: rgba(247, 134, 28, 0.9); opacity: .6; } diff --git a/old-ui/.gitignore b/old-ui/.gitignore new file mode 100644 index 000000000..c6b1254b5 --- /dev/null +++ b/old-ui/.gitignore @@ -0,0 +1,66 @@ + +# Created by https://www.gitignore.io/api/osx,node + +### OSX ### +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon
+ +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + + +### Node ### +# Logs +logs +*.log +npm-debug.log* + +# Runtime data +pids +*.pid +*.seed + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directory +# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git +node_modules + +# Optional npm cache directory +.npm + +# Optional REPL history +.node_repl_history + diff --git a/old-ui/app/account-detail.js b/old-ui/app/account-detail.js new file mode 100644 index 000000000..ee7eb1258 --- /dev/null +++ b/old-ui/app/account-detail.js @@ -0,0 +1,289 @@ +const inherits = require('util').inherits +const extend = require('xtend') +const Component = require('react').Component +const h = require('react-hyperscript') +const connect = require('react-redux').connect +const actions = require('../../ui/app/actions') +const valuesFor = require('./util').valuesFor +const Identicon = require('./components/identicon') +const EthBalance = require('./components/eth-balance') +const TransactionList = require('./components/transaction-list') +const ExportAccountView = require('./components/account-export') +const ethUtil = require('ethereumjs-util') +const EditableLabel = require('./components/editable-label') +const TabBar = require('./components/tab-bar') +const TokenList = require('./components/token-list') +const AccountDropdowns = require('./components/account-dropdowns').AccountDropdowns + +module.exports = connect(mapStateToProps)(AccountDetailScreen) + +function mapStateToProps (state) { + return { + metamask: state.metamask, + identities: state.metamask.identities, + accounts: state.metamask.accounts, + address: state.metamask.selectedAddress, + accountDetail: state.appState.accountDetail, + network: state.metamask.network, + unapprovedMsgs: valuesFor(state.metamask.unapprovedMsgs), + shapeShiftTxList: state.metamask.shapeShiftTxList, + transactions: state.metamask.selectedAddressTxList || [], + conversionRate: state.metamask.conversionRate, + currentCurrency: state.metamask.currentCurrency, + currentAccountTab: state.metamask.currentAccountTab, + tokens: state.metamask.tokens, + computedBalances: state.metamask.computedBalances, + } +} + +inherits(AccountDetailScreen, Component) +function AccountDetailScreen () { + Component.call(this) +} + +AccountDetailScreen.prototype.render = function () { + var props = this.props + var selected = props.address || Object.keys(props.accounts)[0] + var checksumAddress = selected && ethUtil.toChecksumAddress(selected) + var identity = props.identities[selected] + var account = props.accounts[selected] + const { network, conversionRate, currentCurrency } = props + + return ( + + h('.account-detail-section.full-flex-height', [ + + // identicon, label, balance, etc + h('.account-data-subsection', { + style: { + margin: '0 20px', + flex: '1 0 auto', + }, + }, [ + + // header - identicon + nav + h('div', { + style: { + paddingTop: '20px', + display: 'flex', + justifyContent: 'flex-start', + alignItems: 'flex-start', + }, + }, [ + + // large identicon and addresses + h('.identicon-wrapper.select-none', [ + h(Identicon, { + diameter: 62, + address: selected, + }), + ]), + h('div.flex-column', { + style: { + lineHeight: '10px', + width: '100%', + }, + }, [ + h(EditableLabel, { + textValue: identity ? identity.name : '', + state: { + isEditingLabel: false, + }, + saveText: (text) => { + props.dispatch(actions.saveAccountLabel(selected, text)) + }, + }, [ + + // What is shown when not editing + edit text: + h('label.editing-label', [h('.edit-text', 'edit')]), + h( + 'div', + { + style: { + display: 'flex', + justifyContent: 'space-between', + alignItems: 'center', + }, + }, + [ + h( + 'div.font-medium.color-forest', + { + name: 'edit', + style: { + }, + }, + [ + h('h2', { + style: { + maxWidth: '180px', + overflow: 'hidden', + textOverflow: 'ellipsis', + padding: '5px 0px', + lineHeight: '25px', + }, + }, [ + identity && identity.name, + ]), + ] + ), + h( + AccountDropdowns, + { + style: { + cursor: 'pointer', + }, + selected, + network, + identities: props.identities, + enableAccountOptions: true, + }, + ), + ] + ), + ]), + h('.flex-row', { + style: { + justifyContent: 'space-between', + alignItems: 'baseline', + }, + }, [ + + // address + + h('div', { + style: { + overflow: 'hidden', + textOverflow: 'ellipsis', + paddingTop: '3px', + width: '5em', + fontSize: '13px', + fontFamily: 'Montserrat Light', + textRendering: 'geometricPrecision', + marginTop: '15px', + marginBottom: '15px', + color: '#AEAEAE', + }, + }, checksumAddress), + ]), + + // account ballence + + ]), + ]), + h('.flex-row', { + style: { + justifyContent: 'space-between', + alignItems: 'flex-start', + }, + }, [ + + h(EthBalance, { + value: account && account.balance, + conversionRate, + currentCurrency, + style: { + lineHeight: '7px', + marginTop: '10px', + }, + }), + + h('div', {}, [ + + h('button', { + onClick: () => props.dispatch(actions.buyEthView(selected)), + style: { marginRight: '10px' }, + }, 'BUY'), + + h('button', { + onClick: () => props.dispatch(actions.showSendPage()), + style: { + marginBottom: '20px', + }, + }, 'SEND'), + + ]), + + ]), + ]), + + // subview (tx history, pk export confirm, buy eth warning) + this.subview(), + + ]) + ) +} + +AccountDetailScreen.prototype.subview = function () { + var subview + try { + subview = this.props.accountDetail.subview + } catch (e) { + subview = null + } + + switch (subview) { + case 'transactions': + return this.tabSections() + case 'export': + var state = extend({key: 'export'}, this.props) + return h(ExportAccountView, state) + default: + return this.tabSections() + } +} + +AccountDetailScreen.prototype.tabSections = function () { + const { currentAccountTab } = this.props + + return h('section.tabSection.full-flex-height.grow-tenx', [ + + h(TabBar, { + tabs: [ + { content: 'Sent', key: 'history' }, + { content: 'Tokens', key: 'tokens' }, + ], + defaultTab: currentAccountTab || 'history', + tabSelected: (key) => { + this.props.dispatch(actions.setCurrentAccountTab(key)) + }, + }), + + this.tabSwitchView(), + ]) +} + +AccountDetailScreen.prototype.tabSwitchView = function () { + const props = this.props + const { address, network } = props + const { currentAccountTab, tokens } = this.props + + switch (currentAccountTab) { + case 'tokens': + return h(TokenList, { + userAddress: address, + network, + tokens, + addToken: () => this.props.dispatch(actions.showAddTokenPage()), + }) + default: + return this.transactionList() + } +} + +AccountDetailScreen.prototype.transactionList = function () { + const {transactions, unapprovedMsgs, address, + network, shapeShiftTxList, conversionRate } = this.props + + return h(TransactionList, { + transactions: transactions.sort((a, b) => b.time - a.time), + network, + unapprovedMsgs, + conversionRate, + address, + shapeShiftTxList, + viewPendingTx: (txId) => { + this.props.dispatch(actions.viewPendingTx(txId)) + }, + }) +} diff --git a/old-ui/app/accounts/import/index.js b/old-ui/app/accounts/import/index.js new file mode 100644 index 000000000..3502efe93 --- /dev/null +++ b/old-ui/app/accounts/import/index.js @@ -0,0 +1,101 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') +const connect = require('react-redux').connect +const actions = require('../../../../ui/app/actions') +import Select from 'react-select' + +// Subviews +const JsonImportView = require('./json.js') +const PrivateKeyImportView = require('./private-key.js') + +const menuItems = [ + 'Private Key', + 'JSON File', +] + +module.exports = connect(mapStateToProps)(AccountImportSubview) + +function mapStateToProps (state) { + return { + menuItems, + } +} + +inherits(AccountImportSubview, Component) +function AccountImportSubview () { + Component.call(this) +} + +AccountImportSubview.prototype.render = function () { + const props = this.props + const state = this.state || {} + const { menuItems } = props + const { type } = state + + return ( + h('div', { + style: { + }, + }, [ + h('.section-title.flex-row.flex-center', [ + h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { + onClick: (event) => { + props.dispatch(actions.goHome()) + }, + }), + h('h2.page-subtitle', 'Import Accounts'), + ]), + h('div', { + style: { + padding: '10px', + color: 'rgb(174, 174, 174)', + }, + }, [ + + h('h3', { style: { padding: '3px' } }, 'SELECT TYPE'), + + h('style', ` + .has-value.Select--single > .Select-control .Select-value .Select-value-label, .Select-value-label { + color: rgb(174,174,174); + } + `), + + h(Select, { + name: 'import-type-select', + clearable: false, + value: type || menuItems[0], + options: menuItems.map((type) => { + return { + value: type, + label: type, + } + }), + onChange: (opt) => { + props.dispatch(actions.showImportPage()) + this.setState({ type: opt.value }) + }, + }), + ]), + + this.renderImportView(), + ]) + ) +} + +AccountImportSubview.prototype.renderImportView = function () { + const props = this.props + const state = this.state || {} + const { type } = state + const { menuItems } = props + const current = type || menuItems[0] + + switch (current) { + case 'Private Key': + return h(PrivateKeyImportView) + case 'JSON File': + return h(JsonImportView) + default: + return h(JsonImportView) + } +} diff --git a/old-ui/app/accounts/import/json.js b/old-ui/app/accounts/import/json.js new file mode 100644 index 000000000..8d6bd7f7b --- /dev/null +++ b/old-ui/app/accounts/import/json.js @@ -0,0 +1,100 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') +const connect = require('react-redux').connect +const actions = require('../../../../ui/app/actions') +const FileInput = require('react-simple-file-input').default + +const HELP_LINK = 'https://github.com/MetaMask/faq/blob/master/README.md#q-i-cant-use-the-import-feature-for-uploading-a-json-file-the-window-keeps-closing-when-i-try-to-select-a-file' + +module.exports = connect(mapStateToProps)(JsonImportSubview) + +function mapStateToProps (state) { + return { + error: state.appState.warning, + } +} + +inherits(JsonImportSubview, Component) +function JsonImportSubview () { + Component.call(this) +} + +JsonImportSubview.prototype.render = function () { + const { error } = this.props + + return ( + h('div', { + style: { + display: 'flex', + flexDirection: 'column', + alignItems: 'center', + padding: '5px 15px 0px 15px', + }, + }, [ + + h('p', 'Used by a variety of different clients'), + h('a.warning', { href: HELP_LINK, target: '_blank' }, 'File import not working? Click here!'), + + h(FileInput, { + readAs: 'text', + onLoad: this.onLoad.bind(this), + style: { + margin: '20px 0px 12px 20px', + fontSize: '15px', + }, + }), + + h('input.large-input.letter-spacey', { + type: 'password', + placeholder: 'Enter password', + id: 'json-password-box', + onKeyPress: this.createKeyringOnEnter.bind(this), + style: { + width: 260, + marginTop: 12, + }, + }), + + h('button.primary', { + onClick: this.createNewKeychain.bind(this), + style: { + margin: 12, + }, + }, 'Import'), + + error ? h('span.error', error) : null, + ]) + ) +} + +JsonImportSubview.prototype.onLoad = function (event, file) { + this.setState({file: file, fileContents: event.target.result}) +} + +JsonImportSubview.prototype.createKeyringOnEnter = function (event) { + if (event.key === 'Enter') { + event.preventDefault() + this.createNewKeychain() + } +} + +JsonImportSubview.prototype.createNewKeychain = function () { + const state = this.state + const { fileContents } = state + + if (!fileContents) { + const message = 'You must select a file to import.' + return this.props.dispatch(actions.displayWarning(message)) + } + + const passwordInput = document.getElementById('json-password-box') + const password = passwordInput.value + + if (!password) { + const message = 'You must enter a password for the selected file.' + return this.props.dispatch(actions.displayWarning(message)) + } + + this.props.dispatch(actions.importNewAccount('JSON File', [ fileContents, password ])) +} diff --git a/old-ui/app/accounts/import/private-key.js b/old-ui/app/accounts/import/private-key.js new file mode 100644 index 000000000..105191105 --- /dev/null +++ b/old-ui/app/accounts/import/private-key.js @@ -0,0 +1,67 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') +const connect = require('react-redux').connect +const actions = require('../../../../ui/app/actions') + +module.exports = connect(mapStateToProps)(PrivateKeyImportView) + +function mapStateToProps (state) { + return { + error: state.appState.warning, + } +} + +inherits(PrivateKeyImportView, Component) +function PrivateKeyImportView () { + Component.call(this) +} + +PrivateKeyImportView.prototype.render = function () { + const { error } = this.props + + return ( + h('div', { + style: { + display: 'flex', + flexDirection: 'column', + alignItems: 'center', + padding: '5px 15px 0px 15px', + }, + }, [ + h('span', 'Paste your private key string here'), + + h('input.large-input.letter-spacey', { + type: 'password', + id: 'private-key-box', + onKeyPress: this.createKeyringOnEnter.bind(this), + style: { + width: 260, + marginTop: 12, + }, + }), + + h('button.primary', { + onClick: this.createNewKeychain.bind(this), + style: { + margin: 12, + }, + }, 'Import'), + + error ? h('span.error', error) : null, + ]) + ) +} + +PrivateKeyImportView.prototype.createKeyringOnEnter = function (event) { + if (event.key === 'Enter') { + event.preventDefault() + this.createNewKeychain() + } +} + +PrivateKeyImportView.prototype.createNewKeychain = function () { + const input = document.getElementById('private-key-box') + const privateKey = input.value + this.props.dispatch(actions.importNewAccount('Private Key', [ privateKey ])) +} diff --git a/old-ui/app/accounts/import/seed.js b/old-ui/app/accounts/import/seed.js new file mode 100644 index 000000000..b4a7c0afa --- /dev/null +++ b/old-ui/app/accounts/import/seed.js @@ -0,0 +1,30 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') +const connect = require('react-redux').connect + +module.exports = connect(mapStateToProps)(SeedImportSubview) + +function mapStateToProps (state) { + return {} +} + +inherits(SeedImportSubview, Component) +function SeedImportSubview () { + Component.call(this) +} + +SeedImportSubview.prototype.render = function () { + return ( + h('div', { + style: { + }, + }, [ + `Paste your seed phrase here!`, + h('textarea'), + h('br'), + h('button', 'Submit'), + ]) + ) +} + diff --git a/old-ui/app/add-token.js b/old-ui/app/add-token.js new file mode 100644 index 000000000..8778f312e --- /dev/null +++ b/old-ui/app/add-token.js @@ -0,0 +1,238 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') +const connect = require('react-redux').connect +const actions = require('../../ui/app/actions') +const Tooltip = require('./components/tooltip.js') + + +const ethUtil = require('ethereumjs-util') +const abi = require('human-standard-token-abi') +const Eth = require('ethjs-query') +const EthContract = require('ethjs-contract') + +const emptyAddr = '0x0000000000000000000000000000000000000000' + +module.exports = connect(mapStateToProps)(AddTokenScreen) + +function mapStateToProps (state) { + return { + identities: state.metamask.identities, + } +} + +inherits(AddTokenScreen, Component) +function AddTokenScreen () { + this.state = { + warning: null, + address: null, + symbol: 'TOKEN', + decimals: 18, + } + Component.call(this) +} + +AddTokenScreen.prototype.render = function () { + const state = this.state + const props = this.props + const { warning, symbol, decimals } = state + + return ( + h('.flex-column.flex-grow', [ + + // subtitle and nav + h('.section-title.flex-row.flex-center', [ + h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { + onClick: (event) => { + props.dispatch(actions.goHome()) + }, + }), + h('h2.page-subtitle', 'Add Token'), + ]), + + h('.error', { + style: { + display: warning ? 'block' : 'none', + padding: '0 20px', + textAlign: 'center', + }, + }, warning), + + // conf view + h('.flex-column.flex-justify-center.flex-grow.select-none', [ + h('.flex-space-around', { + style: { + padding: '20px', + }, + }, [ + + h('div', [ + h(Tooltip, { + position: 'top', + title: 'The contract of the actual token contract. Click for more info.', + }, [ + h('a', { + style: { fontWeight: 'bold', paddingRight: '10px'}, + href: 'https://support.metamask.io/kb/article/24-what-is-a-token-contract-address', + target: '_blank', + }, [ + h('span', 'Token Contract Address '), + h('i.fa.fa-question-circle'), + ]), + ]), + ]), + + h('section.flex-row.flex-center', [ + h('input#token-address', { + name: 'address', + placeholder: 'Token Contract Address', + onChange: this.tokenAddressDidChange.bind(this), + style: { + width: 'inherit', + flex: '1 0 auto', + height: '30px', + margin: '8px', + }, + }), + ]), + + h('div', [ + h('span', { + style: { fontWeight: 'bold', paddingRight: '10px'}, + }, 'Token Symbol'), + ]), + + h('div', { style: {display: 'flex'} }, [ + h('input#token_symbol', { + placeholder: `Like "ETH"`, + value: symbol, + style: { + width: 'inherit', + flex: '1 0 auto', + height: '30px', + margin: '8px', + }, + onChange: (event) => { + var element = event.target + var symbol = element.value + this.setState({ symbol }) + }, + }), + ]), + + h('div', [ + h('span', { + style: { fontWeight: 'bold', paddingRight: '10px'}, + }, 'Decimals of Precision'), + ]), + + h('div', { style: {display: 'flex'} }, [ + h('input#token_decimals', { + value: decimals, + type: 'number', + min: 0, + max: 36, + style: { + width: 'inherit', + flex: '1 0 auto', + height: '30px', + margin: '8px', + }, + onChange: (event) => { + var element = event.target + var decimals = element.value.trim() + this.setState({ decimals }) + }, + }), + ]), + + h('button', { + style: { + alignSelf: 'center', + }, + onClick: (event) => { + const valid = this.validateInputs() + if (!valid) return + + const { address, symbol, decimals } = this.state + this.props.dispatch(actions.addToken(address.trim(), symbol.trim(), decimals)) + }, + }, 'Add'), + ]), + ]), + ]) + ) +} + +AddTokenScreen.prototype.componentWillMount = function () { + if (typeof global.ethereumProvider === 'undefined') return + + this.eth = new Eth(global.ethereumProvider) + this.contract = new EthContract(this.eth) + this.TokenContract = this.contract(abi) +} + +AddTokenScreen.prototype.tokenAddressDidChange = function (event) { + const el = event.target + const address = el.value.trim() + if (ethUtil.isValidAddress(address) && address !== emptyAddr) { + this.setState({ address }) + this.attemptToAutoFillTokenParams(address) + } +} + +AddTokenScreen.prototype.validateInputs = function () { + let msg = '' + const state = this.state + const identitiesList = Object.keys(this.props.identities) + const { address, symbol, decimals } = state + const standardAddress = ethUtil.addHexPrefix(address).toLowerCase() + + const validAddress = ethUtil.isValidAddress(address) + if (!validAddress) { + msg += 'Address is invalid. ' + } + + const validDecimals = decimals >= 0 && decimals < 36 + if (!validDecimals) { + msg += 'Decimals must be at least 0, and not over 36. ' + } + + const symbolLen = symbol.trim().length + const validSymbol = symbolLen > 0 && symbolLen < 10 + if (!validSymbol) { + msg += 'Symbol must be between 0 and 10 characters.' + } + + const ownAddress = identitiesList.includes(standardAddress) + if (ownAddress) { + msg = 'Personal address detected. Input the token contract address.' + } + + const isValid = validAddress && validDecimals && !ownAddress + + if (!isValid) { + this.setState({ + warning: msg, + }) + } else { + this.setState({ warning: null }) + } + + return isValid +} + +AddTokenScreen.prototype.attemptToAutoFillTokenParams = async function (address) { + const contract = this.TokenContract.at(address) + + const results = await Promise.all([ + contract.symbol(), + contract.decimals(), + ]) + + const [ symbol, decimals ] = results + if (symbol && decimals) { + console.log('SETTING SYMBOL AND DECIMALS', { symbol, decimals }) + this.setState({ symbol: symbol[0], decimals: decimals[0].toString() }) + } +} diff --git a/old-ui/app/app.js b/old-ui/app/app.js new file mode 100644 index 000000000..4869bf72e --- /dev/null +++ b/old-ui/app/app.js @@ -0,0 +1,684 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const connect = require('react-redux').connect +const h = require('react-hyperscript') +const actions = require('../../ui/app/actions') +// mascara +const MascaraFirstTime = require('../../mascara/src/app/first-time').default +const MascaraBuyEtherScreen = require('../../mascara/src/app/first-time/buy-ether-screen').default +// init +const InitializeMenuScreen = require('./first-time/init-menu') +const NewKeyChainScreen = require('./new-keychain') +// unlock +const UnlockScreen = require('./unlock') +// accounts +const AccountDetailScreen = require('./account-detail') +const SendTransactionScreen = require('./send') +const ConfirmTxScreen = require('./conf-tx') +// notice +const NoticeScreen = require('./components/notice') +const generateLostAccountsNotice = require('../lib/lost-accounts-notice') +// other views +const ConfigScreen = require('./config') +const AddTokenScreen = require('./add-token') +const Import = require('./accounts/import') +const InfoScreen = require('./info') +const Loading = require('./components/loading') +const SandwichExpando = require('sandwich-expando') +const Dropdown = require('./components/dropdown').Dropdown +const DropdownMenuItem = require('./components/dropdown').DropdownMenuItem +const NetworkIndicator = require('./components/network') +const BuyView = require('./components/buy-button-subview') +const QrView = require('./components/qr-code') +const HDCreateVaultComplete = require('./keychains/hd/create-vault-complete') +const HDRestoreVaultScreen = require('./keychains/hd/restore-vault') +const RevealSeedConfirmation = require('./keychains/hd/recover-seed/confirmation') +const AccountDropdowns = require('./components/account-dropdowns').AccountDropdowns +const { BETA_UI_NETWORK_TYPE } = require('../../app/scripts/config').enums + +module.exports = connect(mapStateToProps)(App) + +inherits(App, Component) +function App () { Component.call(this) } + +function mapStateToProps (state) { + const { + identities, + accounts, + address, + keyrings, + isInitialized, + noActiveNotices, + seedWords, + featureFlags, + } = state.metamask + const selected = address || Object.keys(accounts)[0] + + return { + // state from plugin + isLoading: state.appState.isLoading, + loadingMessage: state.appState.loadingMessage, + noActiveNotices: state.metamask.noActiveNotices, + isInitialized: state.metamask.isInitialized, + isUnlocked: state.metamask.isUnlocked, + currentView: state.appState.currentView, + activeAddress: state.appState.activeAddress, + transForward: state.appState.transForward, + isMascara: state.metamask.isMascara, + isOnboarding: Boolean(!noActiveNotices || seedWords || !isInitialized), + seedWords: state.metamask.seedWords, + unapprovedTxs: state.metamask.unapprovedTxs, + unapprovedMsgs: state.metamask.unapprovedMsgs, + menuOpen: state.appState.menuOpen, + network: state.metamask.network, + provider: state.metamask.provider, + forgottenPassword: state.appState.forgottenPassword, + lastUnreadNotice: state.metamask.lastUnreadNotice, + lostAccounts: state.metamask.lostAccounts, + frequentRpcList: state.metamask.frequentRpcList || [], + featureFlags, + + // state needed to get account dropdown temporarily rendering from app bar + identities, + selected, + keyrings, + } +} + +App.prototype.render = function () { + var props = this.props + const { isLoading, loadingMessage, transForward, network } = props + const isLoadingNetwork = network === 'loading' && props.currentView.name !== 'config' + const loadMessage = loadingMessage || isLoadingNetwork ? + `Connecting to ${this.getNetworkName()}` : null + log.debug('Main ui render function') + + return ( + h('.flex-column.full-height', { + style: { + // Windows was showing a vertical scroll bar: + overflow: 'hidden', + position: 'relative', + alignItems: 'center', + }, + }, [ + + // app bar + this.renderAppBar(), + this.renderNetworkDropdown(), + this.renderDropdown(), + + this.renderLoadingIndicator({ isLoading, isLoadingNetwork, loadMessage }), + + // panel content + h('.app-primary' + (transForward ? '.from-right' : '.from-left'), { + style: { + width: '100%', + }, + }, [ + this.renderPrimary(), + ]), + ]) + ) +} + +App.prototype.renderAppBar = function () { + if (window.METAMASK_UI_TYPE === 'notification') { + return null + } + + const props = this.props + const state = this.state || {} + const isNetworkMenuOpen = state.isNetworkMenuOpen || false + const {isMascara, isOnboarding} = props + + // Do not render header if user is in mascara onboarding + if (isMascara && isOnboarding) { + return null + } + + // Do not render header if user is in mascara buy ether + if (isMascara && props.currentView.name === 'buyEth') { + return null + } + + return ( + + h('.full-width', { + height: '38px', + }, [ + + h('.app-header.flex-row.flex-space-between', { + style: { + alignItems: 'center', + visibility: props.isUnlocked ? 'visible' : 'none', + background: props.isUnlocked ? 'white' : 'none', + height: '38px', + position: 'relative', + zIndex: 12, + }, + }, [ + + h('div.left-menu-section', { + style: { + display: 'flex', + flexDirection: 'row', + alignItems: 'center', + }, + }, [ + + // mini logo + h('img', { + height: 24, + width: 24, + src: '/images/icon-128.png', + }), + + h(NetworkIndicator, { + network: this.props.network, + provider: this.props.provider, + onClick: (event) => { + event.preventDefault() + event.stopPropagation() + this.setState({ isNetworkMenuOpen: !isNetworkMenuOpen }) + }, + }), + ]), + + props.isUnlocked && h('div', { + style: { + display: 'flex', + flexDirection: 'row', + alignItems: 'center', + }, + }, [ + + props.isUnlocked && h(AccountDropdowns, { + style: {}, + enableAccountsSelector: true, + identities: this.props.identities, + selected: this.props.currentView.context, + network: this.props.network, + keyrings: this.props.keyrings, + }, []), + + // hamburger + props.isUnlocked && h(SandwichExpando, { + className: 'sandwich-expando', + width: 16, + barHeight: 2, + padding: 0, + isOpen: state.isMainMenuOpen, + color: 'rgb(247,146,30)', + onClick: () => { + this.setState({ + isMainMenuOpen: !state.isMainMenuOpen, + }) + }, + }), + ]), + ]), + ]) + ) +} + +App.prototype.renderNetworkDropdown = function () { + const props = this.props + const { provider: { type: providerType, rpcTarget: activeNetwork } } = props + const rpcList = props.frequentRpcList + const state = this.state || {} + const isOpen = state.isNetworkMenuOpen + + return h(Dropdown, { + useCssTransition: true, + isOpen, + onClickOutside: (event) => { + const { classList } = event.target + const isNotToggleElement = [ + classList.contains('menu-icon'), + classList.contains('network-name'), + classList.contains('network-indicator'), + ].filter(bool => bool).length === 0 + // classes from three constituent nodes of the toggle element + + if (isNotToggleElement) { + this.setState({ isNetworkMenuOpen: false }) + } + }, + zIndex: 11, + style: { + position: 'absolute', + left: '2px', + top: '36px', + }, + innerStyle: { + padding: '2px 16px 2px 0px', + }, + }, [ + + h( + DropdownMenuItem, + { + key: 'main', + closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), + onClick: () => props.dispatch(actions.setProviderType('mainnet')), + style: { + fontSize: '18px', + }, + }, + [ + h('.menu-icon.diamond'), + 'Main Ethereum Network', + providerType === 'mainnet' ? h('.check', '✓') : null, + ] + ), + + h( + DropdownMenuItem, + { + key: 'ropsten', + closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), + onClick: () => props.dispatch(actions.setProviderType('ropsten')), + style: { + fontSize: '18px', + }, + }, + [ + h('.menu-icon.red-dot'), + 'Ropsten Test Network', + providerType === 'ropsten' ? h('.check', '✓') : null, + ] + ), + + h( + DropdownMenuItem, + { + key: 'kovan', + closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), + onClick: () => props.dispatch(actions.setProviderType('kovan')), + style: { + fontSize: '18px', + }, + }, + [ + h('.menu-icon.hollow-diamond'), + 'Kovan Test Network', + providerType === 'kovan' ? h('.check', '✓') : null, + ] + ), + + h( + DropdownMenuItem, + { + key: 'rinkeby', + closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), + onClick: () => props.dispatch(actions.setProviderType('rinkeby')), + style: { + fontSize: '18px', + }, + }, + [ + h('.menu-icon.golden-square'), + 'Rinkeby Test Network', + providerType === 'rinkeby' ? h('.check', '✓') : null, + ] + ), + + h( + DropdownMenuItem, + { + key: 'default', + closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), + onClick: () => props.dispatch(actions.setProviderType('localhost')), + style: { + fontSize: '18px', + }, + }, + [ + h('i.fa.fa-question-circle.fa-lg.menu-icon'), + 'Localhost 8545', + activeNetwork === 'http://localhost:8545' ? h('.check', '✓') : null, + ] + ), + + this.renderCustomOption(props.provider), + this.renderCommonRpc(rpcList, props.provider), + + h( + DropdownMenuItem, + { + closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), + onClick: () => this.props.dispatch(actions.showConfigPage()), + style: { + fontSize: '18px', + }, + }, + [ + h('i.fa.fa-question-circle.fa-lg.menu-icon'), + 'Custom RPC', + activeNetwork === 'custom' ? h('.check', '✓') : null, + ] + ), + + ]) +} + +App.prototype.renderDropdown = function () { + const state = this.state || {} + const isOpen = state.isMainMenuOpen + + return h(Dropdown, { + useCssTransition: true, + isOpen: isOpen, + zIndex: 11, + onClickOutside: (event) => { + const classList = event.target.classList + const parentClassList = event.target.parentElement.classList + + const isToggleElement = classList.contains('sandwich-expando') || + parentClassList.contains('sandwich-expando') + + if (isOpen && !isToggleElement) { + this.setState({ isMainMenuOpen: false }) + } + }, + style: { + position: 'absolute', + right: '2px', + top: '38px', + }, + innerStyle: {}, + }, [ + h(DropdownMenuItem, { + closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }), + onClick: () => { this.props.dispatch(actions.showConfigPage()) }, + }, 'Settings'), + + h(DropdownMenuItem, { + closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }), + onClick: () => { this.props.dispatch(actions.lockMetamask()) }, + }, 'Lock'), + + h(DropdownMenuItem, { + closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }), + onClick: () => { this.props.dispatch(actions.showInfoPage()) }, + }, 'Info/Help'), + + h(DropdownMenuItem, { + closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }), + onClick: () => { + this.props.dispatch(actions.setFeatureFlag('betaUI', true, 'BETA_UI_NOTIFICATION_MODAL')) + .then(() => this.props.dispatch(actions.setNetworkEndpoints(BETA_UI_NETWORK_TYPE))) + }, + }, 'Try Beta!'), + ]) +} + +App.prototype.renderLoadingIndicator = function ({ isLoading, isLoadingNetwork, loadMessage }) { + const { isMascara } = this.props + + return isMascara + ? null + : h(Loading, { + isLoading: isLoading || isLoadingNetwork, + loadingMessage: loadMessage, + }) +} + +App.prototype.renderBackButton = function (style, justArrow = false) { + var props = this.props + return ( + h('.flex-row', { + key: 'leftArrow', + style: style, + onClick: () => props.dispatch(actions.goBackToInitView()), + }, [ + h('i.fa.fa-arrow-left.cursor-pointer'), + justArrow ? null : h('div.cursor-pointer', { + style: { + marginLeft: '3px', + }, + onClick: () => props.dispatch(actions.goBackToInitView()), + }, 'BACK'), + ]) + ) +} + +App.prototype.renderPrimary = function () { + log.debug('rendering primary') + var props = this.props + const {isMascara, isOnboarding} = props + + if (isMascara && isOnboarding) { + return h(MascaraFirstTime) + } + + // notices + if (!props.noActiveNotices) { + log.debug('rendering notice screen for unread notices.') + return h(NoticeScreen, { + notice: props.lastUnreadNotice, + key: 'NoticeScreen', + onConfirm: () => props.dispatch(actions.markNoticeRead(props.lastUnreadNotice)), + }) + } else if (props.lostAccounts && props.lostAccounts.length > 0) { + log.debug('rendering notice screen for lost accounts view.') + return h(NoticeScreen, { + notice: generateLostAccountsNotice(props.lostAccounts), + key: 'LostAccountsNotice', + onConfirm: () => props.dispatch(actions.markAccountsFound()), + }) + } + + if (props.seedWords) { + log.debug('rendering seed words') + return h(HDCreateVaultComplete, {key: 'HDCreateVaultComplete'}) + } + + // show initialize screen + if (!props.isInitialized || props.forgottenPassword) { + // show current view + log.debug('rendering an initialize screen') + switch (props.currentView.name) { + + case 'restoreVault': + log.debug('rendering restore vault screen') + return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'}) + + default: + log.debug('rendering menu screen') + return h(InitializeMenuScreen, {key: 'menuScreenInit'}) + } + } + + // show unlock screen + if (!props.isUnlocked) { + switch (props.currentView.name) { + + case 'restoreVault': + log.debug('rendering restore vault screen') + return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'}) + + case 'config': + log.debug('rendering config screen from unlock screen.') + return h(ConfigScreen, {key: 'config'}) + + default: + log.debug('rendering locked screen') + return h(UnlockScreen, {key: 'locked'}) + } + } + + // show current view + switch (props.currentView.name) { + + case 'accountDetail': + log.debug('rendering account detail screen') + return h(AccountDetailScreen, {key: 'account-detail'}) + + case 'sendTransaction': + log.debug('rendering send tx screen') + return h(SendTransactionScreen, {key: 'send-transaction'}) + + case 'newKeychain': + log.debug('rendering new keychain screen') + return h(NewKeyChainScreen, {key: 'new-keychain'}) + + case 'confTx': + log.debug('rendering confirm tx screen') + return h(ConfirmTxScreen, {key: 'confirm-tx'}) + + case 'add-token': + log.debug('rendering add-token screen from unlock screen.') + return h(AddTokenScreen, {key: 'add-token'}) + + case 'config': + log.debug('rendering config screen') + return h(ConfigScreen, {key: 'config'}) + + case 'import-menu': + log.debug('rendering import screen') + return h(Import, {key: 'import-menu'}) + + case 'reveal-seed-conf': + log.debug('rendering reveal seed confirmation screen') + return h(RevealSeedConfirmation, {key: 'reveal-seed-conf'}) + + case 'info': + log.debug('rendering info screen') + return h(InfoScreen, {key: 'info'}) + + case 'buyEth': + log.debug('rendering buy ether screen') + return h(BuyView, {key: 'buyEthView'}) + + case 'onboardingBuyEth': + log.debug('rendering onboarding buy ether screen') + return h(MascaraBuyEtherScreen, {key: 'buyEthView'}) + + case 'qr': + log.debug('rendering show qr screen') + console.log(`QrView`, QrView); + return h('div', { + style: { + position: 'absolute', + height: '100%', + top: '0px', + left: '0px', + }, + }, [ + h('i.fa.fa-arrow-left.fa-lg.cursor-pointer.color-orange', { + onClick: () => props.dispatch(actions.backToAccountDetail(props.activeAddress)), + style: { + marginLeft: '10px', + marginTop: '50px', + }, + }), + h('div', { + style: { + position: 'absolute', + left: '44px', + width: '285px', + }, + }, [ + h(QrView, {key: 'qr'}), + ]), + ]) + + default: + log.debug('rendering default, account detail screen') + return h(AccountDetailScreen, {key: 'account-detail'}) + } +} + +App.prototype.toggleMetamaskActive = function () { + if (!this.props.isUnlocked) { + // currently inactive: redirect to password box + var passwordBox = document.querySelector('input[type=password]') + if (!passwordBox) return + passwordBox.focus() + } else { + // currently active: deactivate + this.props.dispatch(actions.lockMetamask(false)) + } +} + +App.prototype.renderCustomOption = function (provider) { + const { rpcTarget, type } = provider + const props = this.props + + if (type !== 'rpc') return null + + // Concatenate long URLs + let label = rpcTarget + if (rpcTarget.length > 31) { + label = label.substr(0, 34) + '...' + } + + switch (rpcTarget) { + + case 'http://localhost:8545': + return null + + default: + return h( + DropdownMenuItem, + { + key: rpcTarget, + onClick: () => props.dispatch(actions.setRpcTarget(rpcTarget)), + closeMenu: () => this.setState({ isNetworkMenuOpen: false }), + }, + [ + h('i.fa.fa-question-circle.fa-lg.menu-icon'), + label, + h('.check', '✓'), + ] + ) + } +} + +App.prototype.getNetworkName = function () { + const { provider } = this.props + const providerName = provider.type + + let name + + if (providerName === 'mainnet') { + name = 'Main Ethereum Network' + } else if (providerName === 'ropsten') { + name = 'Ropsten Test Network' + } else if (providerName === 'kovan') { + name = 'Kovan Test Network' + } else if (providerName === 'rinkeby') { + name = 'Rinkeby Test Network' + } else { + name = 'Unknown Private Network' + } + + return name +} + +App.prototype.renderCommonRpc = function (rpcList, provider) { + const props = this.props + const rpcTarget = provider.rpcTarget + + return rpcList.map((rpc) => { + if ((rpc === 'http://localhost:8545') || (rpc === rpcTarget)) { + return null + } else { + return h( + DropdownMenuItem, + { + key: `common${rpc}`, + closeMenu: () => this.setState({ isNetworkMenuOpen: false }), + onClick: () => props.dispatch(actions.setRpcTarget(rpc)), + }, + [ + h('i.fa.fa-question-circle.fa-lg.menu-icon'), + rpc, + rpcTarget === rpc ? h('.check', '✓') : null, + ] + ) + } + }) +} diff --git a/old-ui/app/components/account-dropdowns.js b/old-ui/app/components/account-dropdowns.js new file mode 100644 index 000000000..a3908f45d --- /dev/null +++ b/old-ui/app/components/account-dropdowns.js @@ -0,0 +1,319 @@ +const Component = require('react').Component +const PropTypes = require('react').PropTypes +const h = require('react-hyperscript') +const actions = require('../../../ui/app/actions') +const genAccountLink = require('etherscan-link').createAccountLink +const connect = require('react-redux').connect +const Dropdown = require('./dropdown').Dropdown +const DropdownMenuItem = require('./dropdown').DropdownMenuItem +const Identicon = require('./identicon') +const ethUtil = require('ethereumjs-util') +const copyToClipboard = require('copy-to-clipboard') + +class AccountDropdowns extends Component { + constructor (props) { + super(props) + this.state = { + accountSelectorActive: false, + optionsMenuActive: false, + } + this.accountSelectorToggleClassName = 'accounts-selector' + this.optionsMenuToggleClassName = 'fa-ellipsis-h' + } + + renderAccounts () { + const { identities, selected, keyrings } = this.props + + return Object.keys(identities).map((key, index) => { + const identity = identities[key] + const isSelected = identity.address === selected + + const simpleAddress = identity.address.substring(2).toLowerCase() + + const keyring = keyrings.find((kr) => { + return kr.accounts.includes(simpleAddress) || + kr.accounts.includes(identity.address) + }) + + return h( + DropdownMenuItem, + { + closeMenu: () => {}, + onClick: () => { + this.props.actions.showAccountDetail(identity.address) + }, + style: { + marginTop: index === 0 ? '5px' : '', + fontSize: '24px', + }, + }, + [ + h( + Identicon, + { + address: identity.address, + diameter: 32, + style: { + marginLeft: '10px', + }, + }, + ), + this.indicateIfLoose(keyring), + h('span', { + style: { + marginLeft: '20px', + fontSize: '24px', + maxWidth: '145px', + whiteSpace: 'nowrap', + overflow: 'hidden', + textOverflow: 'ellipsis', + }, + }, identity.name || ''), + h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, isSelected ? h('.check', '✓') : null), + ] + ) + }) + } + + indicateIfLoose (keyring) { + try { // Sometimes keyrings aren't loaded yet: + const type = keyring.type + const isLoose = type !== 'HD Key Tree' + return isLoose ? h('.keyring-label', 'LOOSE') : null + } catch (e) { return } + } + + renderAccountSelector () { + const { actions } = this.props + const { accountSelectorActive } = this.state + + return h( + Dropdown, + { + useCssTransition: true, // Hardcoded because account selector is temporarily in app-header + style: { + marginLeft: '-238px', + marginTop: '38px', + minWidth: '180px', + overflowY: 'auto', + maxHeight: '300px', + width: '300px', + }, + innerStyle: { + padding: '8px 25px', + }, + isOpen: accountSelectorActive, + onClickOutside: (event) => { + const { classList } = event.target + const isNotToggleElement = !classList.contains(this.accountSelectorToggleClassName) + if (accountSelectorActive && isNotToggleElement) { + this.setState({ accountSelectorActive: false }) + } + }, + }, + [ + ...this.renderAccounts(), + h( + DropdownMenuItem, + { + closeMenu: () => {}, + onClick: () => actions.addNewAccount(), + }, + [ + h( + Identicon, + { + style: { + marginLeft: '10px', + }, + diameter: 32, + }, + ), + h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, 'Create Account'), + ], + ), + h( + DropdownMenuItem, + { + closeMenu: () => {}, + onClick: () => actions.showImportPage(), + }, + [ + h( + Identicon, + { + style: { + marginLeft: '10px', + }, + diameter: 32, + }, + ), + h('span', { + style: { + marginLeft: '20px', + fontSize: '24px', + marginBottom: '5px', + }, + }, 'Import Account'), + ] + ), + ] + ) + } + + renderAccountOptions () { + const { actions } = this.props + const { optionsMenuActive } = this.state + + return h( + Dropdown, + { + style: { + marginLeft: '-215px', + minWidth: '180px', + }, + isOpen: optionsMenuActive, + onClickOutside: () => { + const { classList } = event.target + const isNotToggleElement = !classList.contains(this.optionsMenuToggleClassName) + if (optionsMenuActive && isNotToggleElement) { + this.setState({ optionsMenuActive: false }) + } + }, + }, + [ + h( + DropdownMenuItem, + { + closeMenu: () => {}, + onClick: () => { + const { selected, network } = this.props + const url = genAccountLink(selected, network) + global.platform.openWindow({ url }) + }, + }, + 'View account on Etherscan', + ), + h( + DropdownMenuItem, + { + closeMenu: () => {}, + onClick: () => { + const { selected, identities } = this.props + var identity = identities[selected] + actions.showQrView(selected, identity ? identity.name : '') + }, + }, + 'Show QR Code', + ), + h( + DropdownMenuItem, + { + closeMenu: () => {}, + onClick: () => { + const { selected } = this.props + const checkSumAddress = selected && ethUtil.toChecksumAddress(selected) + copyToClipboard(checkSumAddress) + }, + }, + 'Copy Address to clipboard', + ), + h( + DropdownMenuItem, + { + closeMenu: () => {}, + onClick: () => { + actions.requestAccountExport() + }, + }, + 'Export Private Key', + ), + ] + ) + } + + render () { + const { style, enableAccountsSelector, enableAccountOptions } = this.props + const { optionsMenuActive, accountSelectorActive } = this.state + + return h( + 'span', + { + style: style, + }, + [ + enableAccountsSelector && h( + // 'i.fa.fa-angle-down', + 'div.cursor-pointer.color-orange.accounts-selector', + { + style: { + // fontSize: '1.8em', + background: 'url(images/switch_acc.svg) white center center no-repeat', + height: '25px', + width: '25px', + transform: 'scale(0.75)', + marginRight: '3px', + }, + onClick: (event) => { + event.stopPropagation() + this.setState({ + accountSelectorActive: !accountSelectorActive, + optionsMenuActive: false, + }) + }, + }, + this.renderAccountSelector(), + ), + enableAccountOptions && h( + 'i.fa.fa-ellipsis-h', + { + style: { + fontSize: '1.8em', + }, + onClick: (event) => { + event.stopPropagation() + this.setState({ + accountSelectorActive: false, + optionsMenuActive: !optionsMenuActive, + }) + }, + }, + this.renderAccountOptions() + ), + ] + ) + } +} + +AccountDropdowns.defaultProps = { + enableAccountsSelector: false, + enableAccountOptions: false, +} + +AccountDropdowns.propTypes = { + identities: PropTypes.objectOf(PropTypes.object), + selected: PropTypes.string, + keyrings: PropTypes.array, + actions: PropTypes.objectOf(PropTypes.func), + network: PropTypes.string, + style: PropTypes.object, + enableAccountOptions: PropTypes.bool, + enableAccountsSelector: PropTypes.bool, +} + +const mapDispatchToProps = (dispatch) => { + return { + actions: { + showConfigPage: () => dispatch(actions.showConfigPage()), + requestAccountExport: () => dispatch(actions.requestExportAccount()), + showAccountDetail: (address) => dispatch(actions.showAccountDetail(address)), + addNewAccount: () => dispatch(actions.addNewAccount()), + showImportPage: () => dispatch(actions.showImportPage()), + showQrView: (selected, identity) => dispatch(actions.showQrView(selected, identity)), + }, + } +} + +module.exports = { + AccountDropdowns: connect(null, mapDispatchToProps)(AccountDropdowns), +} diff --git a/old-ui/app/components/account-export.js b/old-ui/app/components/account-export.js new file mode 100644 index 000000000..51b85b786 --- /dev/null +++ b/old-ui/app/components/account-export.js @@ -0,0 +1,132 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const exportAsFile = require('../util').exportAsFile +const copyToClipboard = require('copy-to-clipboard') +const actions = require('../../../ui/app/actions') +const ethUtil = require('ethereumjs-util') +const connect = require('react-redux').connect + +module.exports = connect(mapStateToProps)(ExportAccountView) + +inherits(ExportAccountView, Component) +function ExportAccountView () { + Component.call(this) +} + +function mapStateToProps (state) { + return { + warning: state.appState.warning, + } +} + +ExportAccountView.prototype.render = function () { + const state = this.props + const accountDetail = state.accountDetail + const nickname = state.identities[state.address].name + + if (!accountDetail) return h('div') + const accountExport = accountDetail.accountExport + + const notExporting = accountExport === 'none' + const exportRequested = accountExport === 'requested' + const accountExported = accountExport === 'completed' + + if (notExporting) return h('div') + + if (exportRequested) { + const warning = `Export private keys at your own risk.` + return ( + h('div', { + style: { + display: 'inline-block', + textAlign: 'center', + }, + }, + [ + h('div', { + key: 'exporting', + style: { + margin: '0 20px', + }, + }, [ + h('p.error', warning), + h('input#exportAccount.sizing-input', { + type: 'password', + placeholder: 'confirm password', + onKeyPress: this.onExportKeyPress.bind(this), + style: { + position: 'relative', + top: '1.5px', + marginBottom: '7px', + }, + }), + ]), + h('div', { + key: 'buttons', + style: { + margin: '0 20px', + }, + }, + [ + h('button', { + onClick: () => this.onExportKeyPress({ key: 'Enter', preventDefault: () => {} }), + style: { + marginRight: '10px', + }, + }, 'Submit'), + h('button', { + onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)), + }, 'Cancel'), + ]), + (this.props.warning) && ( + h('span.error', { + style: { + margin: '20px', + }, + }, this.props.warning.split('-')) + ), + ]) + ) + } + + if (accountExported) { + const plainKey = ethUtil.stripHexPrefix(accountDetail.privateKey) + + return h('div.privateKey', { + style: { + margin: '0 20px', + }, + }, [ + h('label', 'Your private key (click to copy):'), + h('p.error.cursor-pointer', { + style: { + textOverflow: 'ellipsis', + overflow: 'hidden', + webkitUserSelect: 'text', + maxWidth: '275px', + }, + onClick: function (event) { + copyToClipboard(ethUtil.stripHexPrefix(accountDetail.privateKey)) + }, + }, plainKey), + h('button', { + onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)), + }, 'Done'), + h('button', { + style: { + marginLeft: '10px', + }, + onClick: () => exportAsFile(`MetaMask ${nickname} Private Key`, plainKey), + }, 'Save as File'), + ]) + } +} + +ExportAccountView.prototype.onExportKeyPress = function (event) { + if (event.key !== 'Enter') return + event.preventDefault() + + const input = document.getElementById('exportAccount').value + this.props.dispatch(actions.exportAccount(input, this.props.address)) +} diff --git a/old-ui/app/components/account-panel.js b/old-ui/app/components/account-panel.js new file mode 100644 index 000000000..abaaf8163 --- /dev/null +++ b/old-ui/app/components/account-panel.js @@ -0,0 +1,86 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') +const Identicon = require('./identicon') +const formatBalance = require('../util').formatBalance +const addressSummary = require('../util').addressSummary + +module.exports = AccountPanel + + +inherits(AccountPanel, Component) +function AccountPanel () { + Component.call(this) +} + +AccountPanel.prototype.render = function () { + var state = this.props + var identity = state.identity || {} + var account = state.account || {} + var isFauceting = state.isFauceting + + var panelState = { + key: `accountPanel${identity.address}`, + identiconKey: identity.address, + identiconLabel: identity.name || '', + attributes: [ + { + key: 'ADDRESS', + value: addressSummary(identity.address), + }, + balanceOrFaucetingIndication(account, isFauceting), + ], + } + + return ( + + h('.identity-panel.flex-row.flex-space-between', { + style: { + flex: '1 0 auto', + cursor: panelState.onClick ? 'pointer' : undefined, + }, + onClick: panelState.onClick, + }, [ + + // account identicon + h('.identicon-wrapper.flex-column.select-none', [ + h(Identicon, { + address: panelState.identiconKey, + imageify: state.imageifyIdenticons, + }), + h('span.font-small', panelState.identiconLabel.substring(0, 7) + '...'), + ]), + + // account address, balance + h('.identity-data.flex-column.flex-justify-center.flex-grow.select-none', [ + + panelState.attributes.map((attr) => { + return h('.flex-row.flex-space-between', { + key: '' + Math.round(Math.random() * 1000000), + }, [ + h('label.font-small.no-select', attr.key), + h('span.font-small', attr.value), + ]) + }), + ]), + + ]) + + ) +} + +function balanceOrFaucetingIndication (account, isFauceting) { + // Temporarily deactivating isFauceting indication + // because it shows fauceting for empty restored accounts. + if (/* isFauceting*/ false) { + return { + key: 'Account is auto-funding.', + value: 'Please wait.', + } + } else { + return { + key: 'BALANCE', + value: formatBalance(account.balance), + } + } +} diff --git a/old-ui/app/components/balance.js b/old-ui/app/components/balance.js new file mode 100644 index 000000000..57ca84564 --- /dev/null +++ b/old-ui/app/components/balance.js @@ -0,0 +1,89 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const formatBalance = require('../util').formatBalance +const generateBalanceObject = require('../util').generateBalanceObject +const Tooltip = require('./tooltip.js') +const FiatValue = require('./fiat-value.js') + +module.exports = EthBalanceComponent + +inherits(EthBalanceComponent, Component) +function EthBalanceComponent () { + Component.call(this) +} + +EthBalanceComponent.prototype.render = function () { + var props = this.props + let { value } = props + var style = props.style + var needsParse = this.props.needsParse !== undefined ? this.props.needsParse : true + value = value ? formatBalance(value, 6, needsParse) : '...' + var width = props.width + + return ( + + h('.ether-balance.ether-balance-amount', { + style: style, + }, [ + h('div', { + style: { + display: 'inline', + width: width, + }, + }, this.renderBalance(value)), + ]) + + ) +} +EthBalanceComponent.prototype.renderBalance = function (value) { + var props = this.props + if (value === 'None') return value + if (value === '...') return value + var balanceObj = generateBalanceObject(value, props.shorten ? 1 : 3) + var balance + var splitBalance = value.split(' ') + var ethNumber = splitBalance[0] + var ethSuffix = splitBalance[1] + const showFiat = 'showFiat' in props ? props.showFiat : true + + if (props.shorten) { + balance = balanceObj.shortBalance + } else { + balance = balanceObj.balance + } + + var label = balanceObj.label + + return ( + h(Tooltip, { + position: 'bottom', + title: `${ethNumber} ${ethSuffix}`, + }, h('div.flex-column', [ + h('.flex-row', { + style: { + alignItems: 'flex-end', + lineHeight: '13px', + fontFamily: 'Montserrat Light', + textRendering: 'geometricPrecision', + }, + }, [ + h('div', { + style: { + width: '100%', + textAlign: 'right', + }, + }, this.props.incoming ? `+${balance}` : balance), + h('div', { + style: { + color: ' #AEAEAE', + fontSize: '12px', + marginLeft: '5px', + }, + }, label), + ]), + + showFiat ? h(FiatValue, { value: props.value }) : null, + ])) + ) +} diff --git a/old-ui/app/components/binary-renderer.js b/old-ui/app/components/binary-renderer.js new file mode 100644 index 000000000..0b6a1f5c2 --- /dev/null +++ b/old-ui/app/components/binary-renderer.js @@ -0,0 +1,46 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const ethUtil = require('ethereumjs-util') +const extend = require('xtend') + +module.exports = BinaryRenderer + +inherits(BinaryRenderer, Component) +function BinaryRenderer () { + Component.call(this) +} + +BinaryRenderer.prototype.render = function () { + const props = this.props + const { value, style } = props + const text = this.hexToText(value) + + const defaultStyle = extend({ + width: '315px', + maxHeight: '210px', + resize: 'none', + border: 'none', + background: 'white', + padding: '3px', + }, style) + + return ( + h('textarea.font-small', { + readOnly: true, + style: defaultStyle, + defaultValue: text, + }) + ) +} + +BinaryRenderer.prototype.hexToText = function (hex) { + try { + const stripped = ethUtil.stripHexPrefix(hex) + const buff = Buffer.from(stripped, 'hex') + return buff.toString('utf8') + } catch (e) { + return hex + } +} + diff --git a/old-ui/app/components/bn-as-decimal-input.js b/old-ui/app/components/bn-as-decimal-input.js new file mode 100644 index 000000000..22e37602e --- /dev/null +++ b/old-ui/app/components/bn-as-decimal-input.js @@ -0,0 +1,181 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const ethUtil = require('ethereumjs-util') +const BN = ethUtil.BN +const extend = require('xtend') + +module.exports = BnAsDecimalInput + +inherits(BnAsDecimalInput, Component) +function BnAsDecimalInput () { + this.state = { invalid: null } + Component.call(this) +} + +/* Bn as Decimal Input + * + * A component for allowing easy, decimal editing + * of a passed in bn string value. + * + * On change, calls back its `onChange` function parameter + * and passes it an updated bn string. + */ + +BnAsDecimalInput.prototype.render = function () { + const props = this.props + const state = this.state + + const { value, scale, precision, onChange, min, max } = props + + const suffix = props.suffix + const style = props.style + const valueString = value.toString(10) + const newMin = min && this.downsize(min.toString(10), scale) + const newMax = max && this.downsize(max.toString(10), scale) + const newValue = this.downsize(valueString, scale) + + return ( + h('.flex-column', [ + h('.flex-row', { + style: { + alignItems: 'flex-end', + lineHeight: '13px', + fontFamily: 'Montserrat Light', + textRendering: 'geometricPrecision', + }, + }, [ + h('input.hex-input', { + type: 'number', + step: 'any', + required: true, + min: newMin, + max: newMax, + style: extend({ + display: 'block', + textAlign: 'right', + backgroundColor: 'transparent', + border: '1px solid #bdbdbd', + + }, style), + value: newValue, + onBlur: (event) => { + this.updateValidity(event) + }, + onChange: (event) => { + this.updateValidity(event) + const value = (event.target.value === '') ? '' : event.target.value + + + const scaledNumber = this.upsize(value, scale, precision) + const precisionBN = new BN(scaledNumber, 10) + onChange(precisionBN, event.target.checkValidity()) + }, + onInvalid: (event) => { + const msg = this.constructWarning() + if (msg === state.invalid) { + return + } + this.setState({ invalid: msg }) + event.preventDefault() + return false + }, + }), + h('div', { + style: { + color: ' #AEAEAE', + fontSize: '12px', + marginLeft: '5px', + marginRight: '6px', + width: '20px', + }, + }, suffix), + ]), + + state.invalid ? h('span.error', { + style: { + position: 'absolute', + right: '0px', + textAlign: 'right', + transform: 'translateY(26px)', + padding: '3px', + background: 'rgba(255,255,255,0.85)', + zIndex: '1', + textTransform: 'capitalize', + border: '2px solid #E20202', + }, + }, state.invalid) : null, + ]) + ) +} + +BnAsDecimalInput.prototype.setValid = function (message) { + this.setState({ invalid: null }) +} + +BnAsDecimalInput.prototype.updateValidity = function (event) { + const target = event.target + const value = this.props.value + const newValue = target.value + + if (value === newValue) { + return + } + + const valid = target.checkValidity() + + if (valid) { + this.setState({ invalid: null }) + } +} + +BnAsDecimalInput.prototype.constructWarning = function () { + const { name, min, max, scale, suffix } = this.props + const newMin = min && this.downsize(min.toString(10), scale) + const newMax = max && this.downsize(max.toString(10), scale) + let message = name ? name + ' ' : '' + + if (min && max) { + message += `must be greater than or equal to ${newMin} ${suffix} and less than or equal to ${newMax} ${suffix}.` + } else if (min) { + message += `must be greater than or equal to ${newMin} ${suffix}.` + } else if (max) { + message += `must be less than or equal to ${newMax} ${suffix}.` + } else { + message += 'Invalid input.' + } + + return message +} + + +BnAsDecimalInput.prototype.downsize = function (number, scale) { + // if there is no scaling, simply return the number + if (scale === 0) { + return Number(number) + } else { + // if the scale is the same as the precision, account for this edge case. + var adjustedNumber = number + while (adjustedNumber.length < scale) { + adjustedNumber = '0' + adjustedNumber + } + return Number(adjustedNumber.slice(0, -scale) + '.' + adjustedNumber.slice(-scale)) + } +} + +BnAsDecimalInput.prototype.upsize = function (number, scale, precision) { + var stringArray = number.toString().split('.') + var decimalLength = stringArray[1] ? stringArray[1].length : 0 + var newString = stringArray[0] + + // If there is scaling and decimal parts exist, integrate them in. + if ((scale !== 0) && (decimalLength !== 0)) { + newString += stringArray[1].slice(0, precision) + } + + // Add 0s to account for the upscaling. + for (var i = decimalLength; i < scale; i++) { + newString += '0' + } + return newString +} diff --git a/old-ui/app/components/buy-button-subview.js b/old-ui/app/components/buy-button-subview.js new file mode 100644 index 000000000..843627c33 --- /dev/null +++ b/old-ui/app/components/buy-button-subview.js @@ -0,0 +1,262 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const connect = require('react-redux').connect +const actions = require('../../../ui/app/actions') +const CoinbaseForm = require('./coinbase-form') +const ShapeshiftForm = require('./shapeshift-form') +const Loading = require('./loading') +const AccountPanel = require('./account-panel') +const RadioList = require('./custom-radio-list') +const networkNames = require('../../../app/scripts/config.js').networkNames + +module.exports = connect(mapStateToProps)(BuyButtonSubview) + +function mapStateToProps (state) { + return { + identity: state.appState.identity, + account: state.metamask.accounts[state.appState.buyView.buyAddress], + warning: state.appState.warning, + buyView: state.appState.buyView, + network: state.metamask.network, + provider: state.metamask.provider, + context: state.appState.currentView.context, + isSubLoading: state.appState.isSubLoading, + } +} + +inherits(BuyButtonSubview, Component) +function BuyButtonSubview () { + Component.call(this) +} + +BuyButtonSubview.prototype.render = function () { + return ( + h('div', { + style: { + width: '100%', + }, + }, [ + this.headerSubview(), + this.primarySubview(), + ]) + ) +} + +BuyButtonSubview.prototype.headerSubview = function () { + const props = this.props + const isLoading = props.isSubLoading + return ( + + h('.flex-column', { + style: { + alignItems: 'center', + }, + }, [ + + // header bar (back button, label) + h('.flex-row', { + style: { + alignItems: 'center', + justifyContent: 'center', + }, + }, [ + h('i.fa.fa-arrow-left.fa-lg.cursor-pointer.color-orange', { + onClick: this.backButtonContext.bind(this), + style: { + position: 'absolute', + left: '10px', + }, + }), + h('h2.text-transform-uppercase.flex-center', { + style: { + width: '100vw', + background: 'rgb(235, 235, 235)', + color: 'rgb(174, 174, 174)', + paddingTop: '4px', + paddingBottom: '4px', + }, + }, 'Buy Eth'), + ]), + + // loading indication + h('div', { + style: { + position: 'absolute', + top: '57vh', + left: '49vw', + }, + }, [ + h(Loading, { isLoading }), + ]), + + // account panel + h('div', { + style: { + width: '80%', + }, + }, [ + h(AccountPanel, { + showFullAddress: true, + identity: props.identity, + account: props.account, + }), + ]), + + h('.flex-row', { + style: { + alignItems: 'center', + justifyContent: 'center', + }, + }, [ + h('h3.text-transform-uppercase.flex-center', { + style: { + paddingLeft: '15px', + width: '100vw', + background: 'rgb(235, 235, 235)', + color: 'rgb(174, 174, 174)', + paddingTop: '4px', + paddingBottom: '4px', + }, + }, 'Select Service'), + ]), + + ]) + + ) +} + + +BuyButtonSubview.prototype.primarySubview = function () { + const props = this.props + const network = props.network + + switch (network) { + case 'loading': + return + + case '1': + return this.mainnetSubview() + + // Ropsten, Rinkeby, Kovan + case '3': + case '4': + case '42': + const networkName = networkNames[network] + const label = `${networkName} Test Faucet` + return ( + h('div.flex-column', { + style: { + alignItems: 'center', + margin: '20px 50px', + }, + }, [ + h('button.text-transform-uppercase', { + onClick: () => this.props.dispatch(actions.buyEth({ network })), + style: { + marginTop: '15px', + }, + }, label), + // Kovan only: Dharma loans beta + network === '42' ? ( + h('button.text-transform-uppercase', { + onClick: () => this.navigateTo('https://borrow.dharma.io/'), + style: { + marginTop: '15px', + }, + }, 'Borrow With Dharma (Beta)') + ) : null, + ]) + ) + + default: + return ( + h('h2.error', 'Unknown network ID') + ) + + } +} + +BuyButtonSubview.prototype.mainnetSubview = function () { + const props = this.props + + return ( + + h('.flex-column', { + style: { + alignItems: 'center', + }, + }, [ + + h('.flex-row.selected-exchange', { + style: { + position: 'relative', + right: '35px', + marginTop: '20px', + marginBottom: '20px', + }, + }, [ + h(RadioList, { + defaultFocus: props.buyView.subview, + labels: [ + 'Coinbase', + 'ShapeShift', + ], + subtext: { + 'Coinbase': 'Crypto/FIAT (USA only)', + 'ShapeShift': 'Crypto', + }, + onClick: this.radioHandler.bind(this), + }), + ]), + + h('h3.text-transform-uppercase', { + style: { + paddingLeft: '15px', + fontFamily: 'Montserrat Light', + width: '100vw', + background: 'rgb(235, 235, 235)', + color: 'rgb(174, 174, 174)', + paddingTop: '4px', + paddingBottom: '4px', + }, + }, props.buyView.subview), + + this.formVersionSubview(), + ]) + + ) +} + +BuyButtonSubview.prototype.formVersionSubview = function () { + const network = this.props.network + if (network === '1') { + if (this.props.buyView.formView.coinbase) { + return h(CoinbaseForm, this.props) + } else if (this.props.buyView.formView.shapeshift) { + return h(ShapeshiftForm, this.props) + } + } +} + +BuyButtonSubview.prototype.navigateTo = function (url) { + global.platform.openWindow({ url }) +} + +BuyButtonSubview.prototype.backButtonContext = function () { + if (this.props.context === 'confTx') { + this.props.dispatch(actions.showConfTxPage(false)) + } else { + console.log(`actions.goHome`, actions.goHome); + this.props.dispatch(actions.goHome()) + } +} + +BuyButtonSubview.prototype.radioHandler = function (event) { + switch (event.target.title) { + case 'Coinbase': + return this.props.dispatch(actions.coinBaseSubview()) + case 'ShapeShift': + return this.props.dispatch(actions.shapeShiftSubview(this.props.provider.type)) + } +} diff --git a/old-ui/app/components/coinbase-form.js b/old-ui/app/components/coinbase-form.js new file mode 100644 index 000000000..35b2111ff --- /dev/null +++ b/old-ui/app/components/coinbase-form.js @@ -0,0 +1,63 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const connect = require('react-redux').connect +const actions = require('../../../ui/app/actions') + +module.exports = connect(mapStateToProps)(CoinbaseForm) + +function mapStateToProps (state) { + return { + warning: state.appState.warning, + } +} + +inherits(CoinbaseForm, Component) + +function CoinbaseForm () { + Component.call(this) +} + +CoinbaseForm.prototype.render = function () { + var props = this.props + + return h('.flex-column', { + style: { + marginTop: '35px', + padding: '25px', + width: '100%', + }, + }, [ + h('.flex-row', { + style: { + justifyContent: 'space-around', + margin: '33px', + marginTop: '0px', + }, + }, [ + h('button.btn-green', { + onClick: this.toCoinbase.bind(this), + }, 'Continue to Coinbase'), + + h('button.btn-red', { + onClick: () => props.dispatch(actions.backTobuyView(props.accounts.address)), + }, 'Cancel'), + ]), + ]) +} + +CoinbaseForm.prototype.toCoinbase = function () { + const props = this.props + const address = props.buyView.buyAddress + props.dispatch(actions.buyEth({ network: '1', address, amount: 0 })) +} + +CoinbaseForm.prototype.renderLoading = function () { + return h('img', { + style: { + width: '27px', + marginRight: '-27px', + }, + src: 'images/loading.svg', + }) +} diff --git a/old-ui/app/components/copyButton.js b/old-ui/app/components/copyButton.js new file mode 100644 index 000000000..a25d0719c --- /dev/null +++ b/old-ui/app/components/copyButton.js @@ -0,0 +1,59 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const copyToClipboard = require('copy-to-clipboard') + +const Tooltip = require('./tooltip') + +module.exports = CopyButton + +inherits(CopyButton, Component) +function CopyButton () { + Component.call(this) +} + +// As parameters, accepts: +// "value", which is the value to copy (mandatory) +// "title", which is the text to show on hover (optional, defaults to 'Copy') +CopyButton.prototype.render = function () { + const props = this.props + const state = this.state || {} + + const value = props.value + const copied = state.copied + + const message = copied ? 'Copied' : props.title || ' Copy ' + + return h('.copy-button', { + style: { + display: 'flex', + alignItems: 'center', + }, + }, [ + + h(Tooltip, { + title: message, + }, [ + h('i.fa.fa-clipboard.cursor-pointer.color-orange', { + style: { + margin: '5px', + }, + onClick: (event) => { + event.preventDefault() + event.stopPropagation() + copyToClipboard(value) + this.debounceRestore() + }, + }), + ]), + + ]) +} + +CopyButton.prototype.debounceRestore = function () { + this.setState({ copied: true }) + clearTimeout(this.timeout) + this.timeout = setTimeout(() => { + this.setState({ copied: false }) + }, 850) +} diff --git a/old-ui/app/components/copyable.js b/old-ui/app/components/copyable.js new file mode 100644 index 000000000..a4f6f4bc6 --- /dev/null +++ b/old-ui/app/components/copyable.js @@ -0,0 +1,46 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits + +const Tooltip = require('./tooltip') +const copyToClipboard = require('copy-to-clipboard') + +module.exports = Copyable + +inherits(Copyable, Component) +function Copyable () { + Component.call(this) + this.state = { + copied: false, + } +} + +Copyable.prototype.render = function () { + const props = this.props + const state = this.state + const { value, children } = props + const { copied } = state + + return h(Tooltip, { + title: copied ? 'Copied!' : 'Copy', + position: 'bottom', + }, h('span', { + style: { + cursor: 'pointer', + }, + onClick: (event) => { + event.preventDefault() + event.stopPropagation() + copyToClipboard(value) + this.debounceRestore() + }, + }, children)) +} + +Copyable.prototype.debounceRestore = function () { + this.setState({ copied: true }) + clearTimeout(this.timeout) + this.timeout = setTimeout(() => { + this.setState({ copied: false }) + }, 850) +} diff --git a/old-ui/app/components/custom-radio-list.js b/old-ui/app/components/custom-radio-list.js new file mode 100644 index 000000000..a4c525396 --- /dev/null +++ b/old-ui/app/components/custom-radio-list.js @@ -0,0 +1,60 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits + +module.exports = RadioList + +inherits(RadioList, Component) +function RadioList () { + Component.call(this) +} + +RadioList.prototype.render = function () { + const props = this.props + const activeClass = '.custom-radio-selected' + const inactiveClass = '.custom-radio-inactive' + const { + labels, + defaultFocus, + } = props + + + return ( + h('.flex-row', { + style: { + fontSize: '12px', + }, + }, [ + h('.flex-column.custom-radios', { + style: { + marginRight: '5px', + }, + }, + labels.map((lable, i) => { + let isSelcted = (this.state !== null) + isSelcted = isSelcted ? (this.state.selected === lable) : (defaultFocus === lable) + return h(isSelcted ? activeClass : inactiveClass, { + title: lable, + onClick: (event) => { + this.setState({selected: event.target.title}) + props.onClick(event) + }, + }) + }) + ), + h('.text', {}, + labels.map((lable) => { + if (props.subtext) { + return h('.flex-row', {}, [ + h('.radio-titles', lable), + h('.radio-titles-subtext', `- ${props.subtext[lable]}`), + ]) + } else { + return h('.radio-titles', lable) + } + }) + ), + ]) + ) +} + diff --git a/ui/app/components/dropdown.js b/old-ui/app/components/dropdown.js index cdd864cc3..cdd864cc3 100644 --- a/ui/app/components/dropdown.js +++ b/old-ui/app/components/dropdown.js diff --git a/old-ui/app/components/editable-label.js b/old-ui/app/components/editable-label.js new file mode 100644 index 000000000..8a5c8954f --- /dev/null +++ b/old-ui/app/components/editable-label.js @@ -0,0 +1,57 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const findDOMNode = require('react-dom').findDOMNode + +module.exports = EditableLabel + +inherits(EditableLabel, Component) +function EditableLabel () { + Component.call(this) +} + +EditableLabel.prototype.render = function () { + const props = this.props + const state = this.state + + if (state && state.isEditingLabel) { + return h('div.editable-label', [ + h('input.sizing-input', { + defaultValue: props.textValue, + maxLength: '20', + onKeyPress: (event) => { + this.saveIfEnter(event) + }, + }), + h('button.editable-button', { + onClick: () => this.saveText(), + }, 'Save'), + ]) + } else { + return h('div.name-label', { + onClick: (event) => { + const nameAttribute = event.target.getAttribute('name') + // checks for class to handle smaller CTA above the account name + const classAttribute = event.target.getAttribute('class') + if (nameAttribute === 'edit' || classAttribute === 'edit-text') { + this.setState({ isEditingLabel: true }) + } + }, + }, this.props.children) + } +} + +EditableLabel.prototype.saveIfEnter = function (event) { + if (event.key === 'Enter') { + this.saveText() + } +} + +EditableLabel.prototype.saveText = function () { + // eslint-disable-next-line react/no-find-dom-node + var container = findDOMNode(this) + var text = container.querySelector('.editable-label input').value + var truncatedText = text.substring(0, 20) + this.props.saveText(truncatedText) + this.setState({ isEditingLabel: false, textLabel: truncatedText }) +} diff --git a/old-ui/app/components/ens-input.js b/old-ui/app/components/ens-input.js new file mode 100644 index 000000000..c85a23514 --- /dev/null +++ b/old-ui/app/components/ens-input.js @@ -0,0 +1,170 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const extend = require('xtend') +const debounce = require('debounce') +const copyToClipboard = require('copy-to-clipboard') +const ENS = require('ethjs-ens') +const networkMap = require('ethjs-ens/lib/network-map.json') +const ensRE = /.+\..+$/ +const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000' + + +module.exports = EnsInput + +inherits(EnsInput, Component) +function EnsInput () { + Component.call(this) +} + +EnsInput.prototype.render = function () { + const props = this.props + const opts = extend(props, { + list: 'addresses', + onChange: () => { + const network = this.props.network + const networkHasEnsSupport = getNetworkEnsSupport(network) + if (!networkHasEnsSupport) return + + const recipient = document.querySelector('input[name="address"]').value + if (recipient.match(ensRE) === null) { + return this.setState({ + loadingEns: false, + ensResolution: null, + ensFailure: null, + }) + } + + this.setState({ + loadingEns: true, + }) + this.checkName() + }, + }) + return h('div', { + style: { width: '100%' }, + }, [ + h('input.large-input', opts), + // The address book functionality. + h('datalist#addresses', + [ + // Corresponds to the addresses owned. + Object.keys(props.identities).map((key) => { + const identity = props.identities[key] + return h('option', { + value: identity.address, + label: identity.name, + key: identity.address, + }) + }), + // Corresponds to previously sent-to addresses. + props.addressBook.map((identity) => { + return h('option', { + value: identity.address, + label: identity.name, + key: identity.address, + }) + }), + ]), + this.ensIcon(), + ]) +} + +EnsInput.prototype.componentDidMount = function () { + const network = this.props.network + const networkHasEnsSupport = getNetworkEnsSupport(network) + this.setState({ ensResolution: ZERO_ADDRESS }) + + if (networkHasEnsSupport) { + const provider = global.ethereumProvider + this.ens = new ENS({ provider, network }) + this.checkName = debounce(this.lookupEnsName.bind(this), 200) + } +} + +EnsInput.prototype.lookupEnsName = function () { + const recipient = document.querySelector('input[name="address"]').value + const { ensResolution } = this.state + + log.info(`ENS attempting to resolve name: ${recipient}`) + this.ens.lookup(recipient.trim()) + .then((address) => { + if (address === ZERO_ADDRESS) throw new Error('No address has been set for this name.') + if (address !== ensResolution) { + this.setState({ + loadingEns: false, + ensResolution: address, + nickname: recipient.trim(), + hoverText: address + '\nClick to Copy', + ensFailure: false, + }) + } + }) + .catch((reason) => { + log.error(reason) + return this.setState({ + loadingEns: false, + ensResolution: ZERO_ADDRESS, + ensFailure: true, + hoverText: reason.message, + }) + }) +} + +EnsInput.prototype.componentDidUpdate = function (prevProps, prevState) { + const state = this.state || {} + const ensResolution = state.ensResolution + // If an address is sent without a nickname, meaning not from ENS or from + // the user's own accounts, a default of a one-space string is used. + const nickname = state.nickname || ' ' + if (prevState && ensResolution && this.props.onChange && + ensResolution !== prevState.ensResolution) { + this.props.onChange(ensResolution, nickname) + } +} + +EnsInput.prototype.ensIcon = function (recipient) { + const { hoverText } = this.state || {} + return h('span', { + title: hoverText, + style: { + position: 'absolute', + padding: '9px', + transform: 'translatex(-40px)', + }, + }, this.ensIconContents(recipient)) +} + +EnsInput.prototype.ensIconContents = function (recipient) { + const { loadingEns, ensFailure, ensResolution } = this.state || { ensResolution: ZERO_ADDRESS} + + if (loadingEns) { + return h('img', { + src: 'images/loading.svg', + style: { + width: '30px', + height: '30px', + transform: 'translateY(-6px)', + }, + }) + } + + if (ensFailure) { + return h('i.fa.fa-warning.fa-lg.warning') + } + + if (ensResolution && (ensResolution !== ZERO_ADDRESS)) { + return h('i.fa.fa-check-circle.fa-lg.cursor-pointer', { + style: { color: 'green' }, + onClick: (event) => { + event.preventDefault() + event.stopPropagation() + copyToClipboard(ensResolution) + }, + }) + } +} + +function getNetworkEnsSupport (network) { + return Boolean(networkMap[network]) +} diff --git a/old-ui/app/components/eth-balance.js b/old-ui/app/components/eth-balance.js new file mode 100644 index 000000000..4f538fd31 --- /dev/null +++ b/old-ui/app/components/eth-balance.js @@ -0,0 +1,89 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const formatBalance = require('../util').formatBalance +const generateBalanceObject = require('../util').generateBalanceObject +const Tooltip = require('./tooltip.js') +const FiatValue = require('./fiat-value.js') + +module.exports = EthBalanceComponent + +inherits(EthBalanceComponent, Component) +function EthBalanceComponent () { + Component.call(this) +} + +EthBalanceComponent.prototype.render = function () { + var props = this.props + let { value } = props + const { style, width } = props + var needsParse = this.props.needsParse !== undefined ? this.props.needsParse : true + value = value ? formatBalance(value, 6, needsParse) : '...' + + return ( + + h('.ether-balance.ether-balance-amount', { + style, + }, [ + h('div', { + style: { + display: 'inline', + width, + }, + }, this.renderBalance(value)), + ]) + + ) +} +EthBalanceComponent.prototype.renderBalance = function (value) { + var props = this.props + const { conversionRate, shorten, incoming, currentCurrency } = props + if (value === 'None') return value + if (value === '...') return value + var balanceObj = generateBalanceObject(value, shorten ? 1 : 3) + var balance + var splitBalance = value.split(' ') + var ethNumber = splitBalance[0] + var ethSuffix = splitBalance[1] + const showFiat = 'showFiat' in props ? props.showFiat : true + + if (shorten) { + balance = balanceObj.shortBalance + } else { + balance = balanceObj.balance + } + + var label = balanceObj.label + + return ( + h(Tooltip, { + position: 'bottom', + title: `${ethNumber} ${ethSuffix}`, + }, h('div.flex-column', [ + h('.flex-row', { + style: { + alignItems: 'flex-end', + lineHeight: '13px', + fontFamily: 'Montserrat Light', + textRendering: 'geometricPrecision', + }, + }, [ + h('div', { + style: { + width: '100%', + textAlign: 'right', + }, + }, incoming ? `+${balance}` : balance), + h('div', { + style: { + color: ' #AEAEAE', + fontSize: '12px', + marginLeft: '5px', + }, + }, label), + ]), + + showFiat ? h(FiatValue, { value: props.value, conversionRate, currentCurrency }) : null, + ])) + ) +} diff --git a/old-ui/app/components/fiat-value.js b/old-ui/app/components/fiat-value.js new file mode 100644 index 000000000..d69f41d11 --- /dev/null +++ b/old-ui/app/components/fiat-value.js @@ -0,0 +1,64 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const formatBalance = require('../util').formatBalance + +module.exports = FiatValue + +inherits(FiatValue, Component) +function FiatValue () { + Component.call(this) +} + +FiatValue.prototype.render = function () { + const props = this.props + const { conversionRate, currentCurrency } = props + const renderedCurrency = currentCurrency || '' + + const value = formatBalance(props.value, 6) + + if (value === 'None') return value + var fiatDisplayNumber, fiatTooltipNumber + var splitBalance = value.split(' ') + + if (conversionRate !== 0) { + fiatTooltipNumber = Number(splitBalance[0]) * conversionRate + fiatDisplayNumber = fiatTooltipNumber.toFixed(2) + } else { + fiatDisplayNumber = 'N/A' + fiatTooltipNumber = 'Unknown' + } + + return fiatDisplay(fiatDisplayNumber, renderedCurrency.toUpperCase()) +} + +function fiatDisplay (fiatDisplayNumber, fiatSuffix) { + if (fiatDisplayNumber !== 'N/A') { + return h('.flex-row', { + style: { + alignItems: 'flex-end', + lineHeight: '13px', + fontFamily: 'Montserrat Light', + textRendering: 'geometricPrecision', + }, + }, [ + h('div', { + style: { + width: '100%', + textAlign: 'right', + fontSize: '12px', + color: '#333333', + }, + }, fiatDisplayNumber), + h('div', { + style: { + color: '#AEAEAE', + marginLeft: '5px', + fontSize: '12px', + }, + }, fiatSuffix), + ]) + } else { + return h('div') + } +} diff --git a/old-ui/app/components/hex-as-decimal-input.js b/old-ui/app/components/hex-as-decimal-input.js new file mode 100644 index 000000000..4a71e9585 --- /dev/null +++ b/old-ui/app/components/hex-as-decimal-input.js @@ -0,0 +1,154 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const ethUtil = require('ethereumjs-util') +const BN = ethUtil.BN +const extend = require('xtend') + +module.exports = HexAsDecimalInput + +inherits(HexAsDecimalInput, Component) +function HexAsDecimalInput () { + this.state = { invalid: null } + Component.call(this) +} + +/* Hex as Decimal Input + * + * A component for allowing easy, decimal editing + * of a passed in hex string value. + * + * On change, calls back its `onChange` function parameter + * and passes it an updated hex string. + */ + +HexAsDecimalInput.prototype.render = function () { + const props = this.props + const state = this.state + + const { value, onChange, min, max } = props + + const toEth = props.toEth + const suffix = props.suffix + const decimalValue = decimalize(value, toEth) + const style = props.style + + return ( + h('.flex-column', [ + h('.flex-row', { + style: { + alignItems: 'flex-end', + lineHeight: '13px', + fontFamily: 'Montserrat Light', + textRendering: 'geometricPrecision', + }, + }, [ + h('input.hex-input', { + type: 'number', + required: true, + min: min, + max: max, + style: extend({ + display: 'block', + textAlign: 'right', + backgroundColor: 'transparent', + border: '1px solid #bdbdbd', + + }, style), + value: parseInt(decimalValue), + onBlur: (event) => { + this.updateValidity(event) + }, + onChange: (event) => { + this.updateValidity(event) + const hexString = (event.target.value === '') ? '' : hexify(event.target.value) + onChange(hexString) + }, + onInvalid: (event) => { + const msg = this.constructWarning() + if (msg === state.invalid) { + return + } + this.setState({ invalid: msg }) + event.preventDefault() + return false + }, + }), + h('div', { + style: { + color: ' #AEAEAE', + fontSize: '12px', + marginLeft: '5px', + marginRight: '6px', + width: '20px', + }, + }, suffix), + ]), + + state.invalid ? h('span.error', { + style: { + position: 'absolute', + right: '0px', + textAlign: 'right', + transform: 'translateY(26px)', + padding: '3px', + background: 'rgba(255,255,255,0.85)', + zIndex: '1', + textTransform: 'capitalize', + border: '2px solid #E20202', + }, + }, state.invalid) : null, + ]) + ) +} + +HexAsDecimalInput.prototype.setValid = function (message) { + this.setState({ invalid: null }) +} + +HexAsDecimalInput.prototype.updateValidity = function (event) { + const target = event.target + const value = this.props.value + const newValue = target.value + + if (value === newValue) { + return + } + + const valid = target.checkValidity() + if (valid) { + this.setState({ invalid: null }) + } +} + +HexAsDecimalInput.prototype.constructWarning = function () { + const { name, min, max } = this.props + let message = name ? name + ' ' : '' + + if (min && max) { + message += `must be greater than or equal to ${min} and less than or equal to ${max}.` + } else if (min) { + message += `must be greater than or equal to ${min}.` + } else if (max) { + message += `must be less than or equal to ${max}.` + } else { + message += 'Invalid input.' + } + + return message +} + +function hexify (decimalString) { + const hexBN = new BN(parseInt(decimalString), 10) + return '0x' + hexBN.toString('hex') +} + +function decimalize (input, toEth) { + if (input === '') { + return '' + } else { + const strippedInput = ethUtil.stripHexPrefix(input) + const inputBN = new BN(strippedInput, 'hex') + return inputBN.toString(10) + } +} diff --git a/old-ui/app/components/identicon.js b/old-ui/app/components/identicon.js new file mode 100644 index 000000000..bb476ca7b --- /dev/null +++ b/old-ui/app/components/identicon.js @@ -0,0 +1,74 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const isNode = require('detect-node') +const findDOMNode = require('react-dom').findDOMNode +const jazzicon = require('jazzicon') +const iconFactoryGen = require('../../lib/icon-factory') +const iconFactory = iconFactoryGen(jazzicon) + +module.exports = IdenticonComponent + +inherits(IdenticonComponent, Component) +function IdenticonComponent () { + Component.call(this) + + this.defaultDiameter = 46 +} + +IdenticonComponent.prototype.render = function () { + var props = this.props + var diameter = props.diameter || this.defaultDiameter + return ( + h('div', { + key: 'identicon-' + this.props.address, + style: { + display: 'flex', + alignItems: 'center', + justifyContent: 'center', + height: diameter, + width: diameter, + borderRadius: diameter / 2, + overflow: 'hidden', + }, + }) + ) +} + +IdenticonComponent.prototype.componentDidMount = function () { + var props = this.props + const { address } = props + + if (!address) return + + // eslint-disable-next-line react/no-find-dom-node + var container = findDOMNode(this) + + var diameter = props.diameter || this.defaultDiameter + if (!isNode) { + var img = iconFactory.iconForAddress(address, diameter) + container.appendChild(img) + } +} + +IdenticonComponent.prototype.componentDidUpdate = function () { + var props = this.props + const { address } = props + + if (!address) return + + // eslint-disable-next-line react/no-find-dom-node + var container = findDOMNode(this) + + var children = container.children + for (var i = 0; i < children.length; i++) { + container.removeChild(children[i]) + } + + var diameter = props.diameter || this.defaultDiameter + if (!isNode) { + var img = iconFactory.iconForAddress(address, diameter) + container.appendChild(img) + } +} + diff --git a/old-ui/app/components/loading.js b/old-ui/app/components/loading.js new file mode 100644 index 000000000..163792584 --- /dev/null +++ b/old-ui/app/components/loading.js @@ -0,0 +1,45 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') + + +inherits(LoadingIndicator, Component) +module.exports = LoadingIndicator + +function LoadingIndicator () { + Component.call(this) +} + +LoadingIndicator.prototype.render = function () { + const { isLoading, loadingMessage } = this.props + + return ( + isLoading ? h('.full-flex-height', { + style: { + left: '0px', + zIndex: 10, + position: 'absolute', + flexDirection: 'column', + display: 'flex', + justifyContent: 'center', + alignItems: 'center', + height: '100%', + width: '100%', + background: 'rgba(255, 255, 255, 0.8)', + }, + }, [ + h('img', { + src: 'images/loading.svg', + }), + + h('br'), + + showMessageIfAny(loadingMessage), + ]) : null + ) +} + +function showMessageIfAny (loadingMessage) { + if (!loadingMessage) return null + return h('span', loadingMessage) +} diff --git a/old-ui/app/components/mascot.js b/old-ui/app/components/mascot.js new file mode 100644 index 000000000..973ec2cad --- /dev/null +++ b/old-ui/app/components/mascot.js @@ -0,0 +1,59 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') +const metamaskLogo = require('metamask-logo') +const debounce = require('debounce') + +module.exports = Mascot + +inherits(Mascot, Component) +function Mascot () { + Component.call(this) + this.logo = metamaskLogo({ + followMouse: true, + pxNotRatio: true, + width: 200, + height: 200, + }) + + this.refollowMouse = debounce(this.logo.setFollowMouse.bind(this.logo, true), 1000) + this.unfollowMouse = this.logo.setFollowMouse.bind(this.logo, false) +} + +Mascot.prototype.render = function () { + // this is a bit hacky + // the event emitter is on `this.props` + // and we dont get that until render + this.handleAnimationEvents() + + return h('#metamask-mascot-container', { + style: { zIndex: 0 }, + }) +} + +Mascot.prototype.componentDidMount = function () { + var targetDivId = 'metamask-mascot-container' + var container = document.getElementById(targetDivId) + container.appendChild(this.logo.container) +} + +Mascot.prototype.componentWillUnmount = function () { + this.animations = this.props.animationEventEmitter + this.animations.removeAllListeners() + this.logo.container.remove() + this.logo.stopAnimation() +} + +Mascot.prototype.handleAnimationEvents = function () { + // only setup listeners once + if (this.animations) return + this.animations = this.props.animationEventEmitter + this.animations.on('point', this.lookAt.bind(this)) + this.animations.on('setFollowMouse', this.logo.setFollowMouse.bind(this.logo)) +} + +Mascot.prototype.lookAt = function (target) { + this.unfollowMouse() + this.logo.lookAt(target) + this.refollowMouse() +} diff --git a/old-ui/app/components/menu-droppo.js b/old-ui/app/components/menu-droppo.js new file mode 100644 index 000000000..e6276f3b1 --- /dev/null +++ b/old-ui/app/components/menu-droppo.js @@ -0,0 +1,132 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const findDOMNode = require('react-dom').findDOMNode +const ReactCSSTransitionGroup = require('react-addons-css-transition-group') + +module.exports = MenuDroppoComponent + + +inherits(MenuDroppoComponent, Component) +function MenuDroppoComponent () { + Component.call(this) +} + +MenuDroppoComponent.prototype.render = function () { + const speed = this.props.speed || '300ms' + const useCssTransition = this.props.useCssTransition + const zIndex = ('zIndex' in this.props) ? this.props.zIndex : 0 + + this.manageListeners() + + const style = this.props.style || {} + if (!('position' in style)) { + style.position = 'fixed' + } + style.zIndex = zIndex + + return ( + h('.menu-droppo-container', { + style, + }, [ + h('style', ` + .menu-droppo-enter { + transition: transform ${speed} ease-in-out; + transform: translateY(-200%); + } + + .menu-droppo-enter.menu-droppo-enter-active { + transition: transform ${speed} ease-in-out; + transform: translateY(0%); + } + + .menu-droppo-leave { + transition: transform ${speed} ease-in-out; + transform: translateY(0%); + } + + .menu-droppo-leave.menu-droppo-leave-active { + transition: transform ${speed} ease-in-out; + transform: translateY(-200%); + } + `), + + useCssTransition + ? h(ReactCSSTransitionGroup, { + className: 'css-transition-group', + transitionName: 'menu-droppo', + transitionEnterTimeout: parseInt(speed), + transitionLeaveTimeout: parseInt(speed), + }, this.renderPrimary()) + : this.renderPrimary(), + ]) + ) +} + +MenuDroppoComponent.prototype.renderPrimary = function () { + const isOpen = this.props.isOpen + if (!isOpen) { + return null + } + + const innerStyle = this.props.innerStyle || {} + + return ( + h('.menu-droppo', { + key: 'menu-droppo-drawer', + style: innerStyle, + }, + [ this.props.children ]) + ) +} + +MenuDroppoComponent.prototype.manageListeners = function () { + const isOpen = this.props.isOpen + const onClickOutside = this.props.onClickOutside + + if (isOpen) { + this.outsideClickHandler = onClickOutside + } else if (isOpen) { + this.outsideClickHandler = null + } +} + +MenuDroppoComponent.prototype.componentDidMount = function () { + if (this && document.body) { + this.globalClickHandler = this.globalClickOccurred.bind(this) + document.body.addEventListener('click', this.globalClickHandler) + // eslint-disable-next-line react/no-find-dom-node + var container = findDOMNode(this) + this.container = container + } +} + +MenuDroppoComponent.prototype.componentWillUnmount = function () { + if (this && document.body) { + document.body.removeEventListener('click', this.globalClickHandler) + } +} + +MenuDroppoComponent.prototype.globalClickOccurred = function (event) { + const target = event.target + // eslint-disable-next-line react/no-find-dom-node + const container = findDOMNode(this) + + if (target !== container && + !isDescendant(this.container, event.target) && + this.outsideClickHandler) { + this.outsideClickHandler(event) + } +} + +function isDescendant (parent, child) { + var node = child.parentNode + while (node !== null) { + if (node === parent) { + return true + } + node = node.parentNode + } + + return false +} diff --git a/old-ui/app/components/mini-account-panel.js b/old-ui/app/components/mini-account-panel.js new file mode 100644 index 000000000..c09cf5b7a --- /dev/null +++ b/old-ui/app/components/mini-account-panel.js @@ -0,0 +1,74 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') +const Identicon = require('./identicon') + +module.exports = AccountPanel + + +inherits(AccountPanel, Component) +function AccountPanel () { + Component.call(this) +} + +AccountPanel.prototype.render = function () { + var props = this.props + var picOrder = props.picOrder || 'left' + const { imageSeed } = props + + return ( + + h('.identity-panel.flex-row.flex-left', { + style: { + cursor: props.onClick ? 'pointer' : undefined, + }, + onClick: props.onClick, + }, [ + + this.genIcon(imageSeed, picOrder), + + h('div.flex-column.flex-justify-center', { + style: { + lineHeight: '15px', + order: 2, + display: 'flex', + alignItems: picOrder === 'left' ? 'flex-begin' : 'flex-end', + }, + }, this.props.children), + ]) + ) +} + +AccountPanel.prototype.genIcon = function (seed, picOrder) { + const props = this.props + + // When there is no seed value, this is a contract creation. + // We then show the contract icon. + if (!seed) { + return h('.identicon-wrapper.flex-column.select-none', { + style: { + order: picOrder === 'left' ? 1 : 3, + }, + }, [ + h('i.fa.fa-file-text-o.fa-lg', { + style: { + fontSize: '42px', + transform: 'translate(0px, -16px)', + }, + }), + ]) + } + + // If there was a seed, we return an identicon for that address. + return h('.identicon-wrapper.flex-column.select-none', { + style: { + order: picOrder === 'left' ? 1 : 3, + }, + }, [ + h(Identicon, { + address: seed, + imageify: props.imageifyIdenticons, + }), + ]) +} + diff --git a/old-ui/app/components/network.js b/old-ui/app/components/network.js new file mode 100644 index 000000000..0dbe37cdd --- /dev/null +++ b/old-ui/app/components/network.js @@ -0,0 +1,129 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits + +module.exports = Network + +inherits(Network, Component) + +function Network () { + Component.call(this) +} + +Network.prototype.render = function () { + const props = this.props + const networkNumber = props.network + let providerName + try { + providerName = props.provider.type + } catch (e) { + providerName = null + } + let iconName, hoverText + + if (networkNumber === 'loading') { + return h('span.pointer', { + style: { + display: 'flex', + alignItems: 'center', + flexDirection: 'row', + }, + onClick: (event) => this.props.onClick(event), + }, [ + h('img', { + title: 'Attempting to connect to blockchain.', + style: { + width: '27px', + }, + src: 'images/loading.svg', + }), + h('i.fa.fa-caret-down'), + ]) + } else if (providerName === 'mainnet') { + hoverText = 'Main Ethereum Network' + iconName = 'ethereum-network' + } else if (providerName === 'ropsten') { + hoverText = 'Ropsten Test Network' + iconName = 'ropsten-test-network' + } else if (parseInt(networkNumber) === 3) { + hoverText = 'Ropsten Test Network' + iconName = 'ropsten-test-network' + } else if (providerName === 'kovan') { + hoverText = 'Kovan Test Network' + iconName = 'kovan-test-network' + } else if (providerName === 'rinkeby') { + hoverText = 'Rinkeby Test Network' + iconName = 'rinkeby-test-network' + } else { + hoverText = 'Unknown Private Network' + iconName = 'unknown-private-network' + } + + return ( + h('#network_component.pointer', { + title: hoverText, + onClick: (event) => this.props.onClick(event), + }, [ + (function () { + switch (iconName) { + case 'ethereum-network': + return h('.network-indicator', [ + h('.menu-icon.diamond'), + h('.network-name', { + style: { + color: '#039396', + }}, + 'Main Network'), + h('i.fa.fa-caret-down.fa-lg'), + ]) + case 'ropsten-test-network': + return h('.network-indicator', [ + h('.menu-icon.red-dot'), + h('.network-name', { + style: { + color: '#ff6666', + }}, + 'Ropsten Test Net'), + h('i.fa.fa-caret-down.fa-lg'), + ]) + case 'kovan-test-network': + return h('.network-indicator', [ + h('.menu-icon.hollow-diamond'), + h('.network-name', { + style: { + color: '#690496', + }}, + 'Kovan Test Net'), + h('i.fa.fa-caret-down.fa-lg'), + ]) + case 'rinkeby-test-network': + return h('.network-indicator', [ + h('.menu-icon.golden-square'), + h('.network-name', { + style: { + color: '#e7a218', + }}, + 'Rinkeby Test Net'), + h('i.fa.fa-caret-down.fa-lg'), + ]) + default: + return h('.network-indicator', [ + h('i.fa.fa-question-circle.fa-lg', { + style: { + margin: '10px', + color: 'rgb(125, 128, 130)', + }, + }), + + h('.network-name', { + style: { + color: '#AEAEAE', + }}, + 'Private Network'), + h('i.fa.fa-caret-down.fa-lg'), + ]) + } + })(), + ]) + ) +} diff --git a/old-ui/app/components/notice.js b/old-ui/app/components/notice.js new file mode 100644 index 000000000..09d461c7b --- /dev/null +++ b/old-ui/app/components/notice.js @@ -0,0 +1,132 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') +const ReactMarkdown = require('react-markdown') +const linker = require('extension-link-enabler') +const findDOMNode = require('react-dom').findDOMNode + +module.exports = Notice + +inherits(Notice, Component) +function Notice () { + Component.call(this) +} + +Notice.prototype.render = function () { + const { notice, onConfirm } = this.props + const { title, date, body } = notice + const state = this.state || { disclaimerDisabled: true } + const disabled = state.disclaimerDisabled + + return ( + h('.flex-column.flex-center.flex-grow', { + style: { + width: '100%', + }, + }, [ + h('h3.flex-center.text-transform-uppercase.terms-header', { + style: { + background: '#EBEBEB', + color: '#AEAEAE', + width: '100%', + fontSize: '20px', + textAlign: 'center', + padding: 6, + }, + }, [ + title, + ]), + + h('h5.flex-center.text-transform-uppercase.terms-header', { + style: { + background: '#EBEBEB', + color: '#AEAEAE', + marginBottom: 24, + width: '100%', + fontSize: '20px', + textAlign: 'center', + padding: 6, + }, + }, [ + date, + ]), + + h('style', ` + + .markdown { + overflow-x: hidden; + } + + .markdown h1, .markdown h2, .markdown h3 { + margin: 10px 0; + font-weight: bold; + } + + .markdown strong { + font-weight: bold; + } + .markdown em { + font-style: italic; + } + + .markdown p { + margin: 10px 0; + } + + .markdown a { + color: #df6b0e; + } + + `), + + h('div.markdown', { + onScroll: (e) => { + var object = e.currentTarget + if (object.offsetHeight + object.scrollTop + 100 >= object.scrollHeight) { + this.setState({disclaimerDisabled: false}) + } + }, + style: { + background: 'rgb(235, 235, 235)', + height: '310px', + padding: '6px', + width: '90%', + overflowY: 'scroll', + scroll: 'auto', + }, + }, [ + h(ReactMarkdown, { + className: 'notice-box', + source: body, + skipHtml: true, + }), + ]), + + h('button', { + disabled, + onClick: () => { + this.setState({disclaimerDisabled: true}) + onConfirm() + }, + style: { + marginTop: '18px', + }, + }, 'Accept'), + ]) + ) +} + +Notice.prototype.componentDidMount = function () { + // eslint-disable-next-line react/no-find-dom-node + var node = findDOMNode(this) + linker.setupListener(node) + if (document.getElementsByClassName('notice-box')[0].clientHeight < 310) { + this.setState({disclaimerDisabled: false}) + } +} + +Notice.prototype.componentWillUnmount = function () { + // eslint-disable-next-line react/no-find-dom-node + var node = findDOMNode(this) + linker.teardownListener(node) +} diff --git a/old-ui/app/components/pending-msg-details.js b/old-ui/app/components/pending-msg-details.js new file mode 100644 index 000000000..718a22de0 --- /dev/null +++ b/old-ui/app/components/pending-msg-details.js @@ -0,0 +1,50 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits + +const AccountPanel = require('./account-panel') + +module.exports = PendingMsgDetails + +inherits(PendingMsgDetails, Component) +function PendingMsgDetails () { + Component.call(this) +} + +PendingMsgDetails.prototype.render = function () { + var state = this.props + var msgData = state.txData + + var msgParams = msgData.msgParams || {} + var address = msgParams.from || state.selectedAddress + var identity = state.identities[address] || { address: address } + var account = state.accounts[address] || { address: address } + + return ( + h('div', { + key: msgData.id, + style: { + margin: '10px 20px', + }, + }, [ + + // account that will sign + h(AccountPanel, { + showFullAddress: true, + identity: identity, + account: account, + imageifyIdenticons: state.imageifyIdenticons, + }), + + // message data + h('.tx-data.flex-column.flex-justify-center.flex-grow.select-none', [ + h('.flex-column.flex-space-between', [ + h('label.font-small', 'MESSAGE'), + h('span.font-small', msgParams.data), + ]), + ]), + + ]) + ) +} + diff --git a/old-ui/app/components/pending-msg.js b/old-ui/app/components/pending-msg.js new file mode 100644 index 000000000..834719c53 --- /dev/null +++ b/old-ui/app/components/pending-msg.js @@ -0,0 +1,70 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const PendingTxDetails = require('./pending-msg-details') + +module.exports = PendingMsg + +inherits(PendingMsg, Component) +function PendingMsg () { + Component.call(this) +} + +PendingMsg.prototype.render = function () { + var state = this.props + var msgData = state.txData + + return ( + + h('div', { + key: msgData.id, + style: { + maxWidth: '350px', + }, + }, [ + + // header + h('h3', { + style: { + fontWeight: 'bold', + textAlign: 'center', + }, + }, 'Sign Message'), + + h('.error', { + style: { + margin: '10px', + }, + }, [ + `Signing this message can have + dangerous side effects. Only sign messages from + sites you fully trust with your entire account. + This dangerous method will be removed in a future version. `, + h('a', { + href: 'https://medium.com/metamask/the-new-secure-way-to-sign-data-in-your-browser-6af9dd2a1527', + style: { color: 'rgb(247, 134, 28)' }, + onClick: (event) => { + event.preventDefault() + const url = 'https://medium.com/metamask/the-new-secure-way-to-sign-data-in-your-browser-6af9dd2a1527' + global.platform.openWindow({ url }) + }, + }, 'Read more here.'), + ]), + + // message details + h(PendingTxDetails, state), + + // sign + cancel + h('.flex-row.flex-space-around', [ + h('button', { + onClick: state.cancelMessage, + }, 'Cancel'), + h('button', { + onClick: state.signMessage, + }, 'Sign'), + ]), + ]) + + ) +} + diff --git a/old-ui/app/components/pending-personal-msg-details.js b/old-ui/app/components/pending-personal-msg-details.js new file mode 100644 index 000000000..1050513f2 --- /dev/null +++ b/old-ui/app/components/pending-personal-msg-details.js @@ -0,0 +1,60 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits + +const AccountPanel = require('./account-panel') +const BinaryRenderer = require('./binary-renderer') + +module.exports = PendingMsgDetails + +inherits(PendingMsgDetails, Component) +function PendingMsgDetails () { + Component.call(this) +} + +PendingMsgDetails.prototype.render = function () { + var state = this.props + var msgData = state.txData + + var msgParams = msgData.msgParams || {} + var address = msgParams.from || state.selectedAddress + var identity = state.identities[address] || { address: address } + var account = state.accounts[address] || { address: address } + + var { data } = msgParams + + return ( + h('div', { + key: msgData.id, + style: { + margin: '10px 20px', + }, + }, [ + + // account that will sign + h(AccountPanel, { + showFullAddress: true, + identity: identity, + account: account, + imageifyIdenticons: state.imageifyIdenticons, + }), + + // message data + h('div', { + style: { + height: '260px', + }, + }, [ + h('label.font-small', { style: { display: 'block' } }, 'MESSAGE'), + h(BinaryRenderer, { + value: data, + style: { + height: '215px', + }, + }), + ]), + + ]) + ) +} + diff --git a/ui/app/components/pending-personal-msg.js b/old-ui/app/components/pending-personal-msg.js index 4542adb28..4542adb28 100644 --- a/ui/app/components/pending-personal-msg.js +++ b/old-ui/app/components/pending-personal-msg.js diff --git a/ui/app/components/pending-tx.js b/old-ui/app/components/pending-tx.js index 32d54902e..10208b5ce 100644 --- a/ui/app/components/pending-tx.js +++ b/old-ui/app/components/pending-tx.js @@ -1,7 +1,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits -const actions = require('../actions') +const actions = require('../../../ui/app/actions') const clone = require('clone') const ethUtil = require('ethereumjs-util') diff --git a/old-ui/app/components/pending-typed-msg-details.js b/old-ui/app/components/pending-typed-msg-details.js new file mode 100644 index 000000000..b5fd29f71 --- /dev/null +++ b/old-ui/app/components/pending-typed-msg-details.js @@ -0,0 +1,59 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits + +const AccountPanel = require('./account-panel') +const TypedMessageRenderer = require('./typed-message-renderer') + +module.exports = PendingMsgDetails + +inherits(PendingMsgDetails, Component) +function PendingMsgDetails () { + Component.call(this) +} + +PendingMsgDetails.prototype.render = function () { + var state = this.props + var msgData = state.txData + + var msgParams = msgData.msgParams || {} + var address = msgParams.from || state.selectedAddress + var identity = state.identities[address] || { address: address } + var account = state.accounts[address] || { address: address } + + var { data } = msgParams + + return ( + h('div', { + key: msgData.id, + style: { + margin: '10px 20px', + }, + }, [ + + // account that will sign + h(AccountPanel, { + showFullAddress: true, + identity: identity, + account: account, + imageifyIdenticons: state.imageifyIdenticons, + }), + + // message data + h('div', { + style: { + height: '260px', + }, + }, [ + h('label.font-small', { style: { display: 'block' } }, 'YOU ARE SIGNING'), + h(TypedMessageRenderer, { + value: data, + style: { + height: '215px', + }, + }), + ]), + + ]) + ) +} diff --git a/old-ui/app/components/pending-typed-msg.js b/old-ui/app/components/pending-typed-msg.js new file mode 100644 index 000000000..f8926d0a3 --- /dev/null +++ b/old-ui/app/components/pending-typed-msg.js @@ -0,0 +1,46 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const PendingTxDetails = require('./pending-typed-msg-details') + +module.exports = PendingMsg + +inherits(PendingMsg, Component) +function PendingMsg () { + Component.call(this) +} + +PendingMsg.prototype.render = function () { + var state = this.props + var msgData = state.txData + + return ( + + h('div', { + key: msgData.id, + }, [ + + // header + h('h3', { + style: { + fontWeight: 'bold', + textAlign: 'center', + }, + }, 'Sign Message'), + + // message details + h(PendingTxDetails, state), + + // sign + cancel + h('.flex-row.flex-space-around', [ + h('button', { + onClick: state.cancelTypedMessage, + }, 'Cancel'), + h('button', { + onClick: state.signTypedMessage, + }, 'Sign'), + ]), + ]) + + ) +} diff --git a/old-ui/app/components/qr-code.js b/old-ui/app/components/qr-code.js new file mode 100644 index 000000000..fa38dcd92 --- /dev/null +++ b/old-ui/app/components/qr-code.js @@ -0,0 +1,80 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const qrCode = require('qrcode-npm').qrcode +const inherits = require('util').inherits +const connect = require('react-redux').connect +const isHexPrefixed = require('ethereumjs-util').isHexPrefixed +const CopyButton = require('./copyButton') + +module.exports = connect(mapStateToProps)(QrCodeView) + +function mapStateToProps (state) { + return { + Qr: state.appState.Qr, + buyView: state.appState.buyView, + warning: state.appState.warning, + } +} + +inherits(QrCodeView, Component) + +function QrCodeView () { + Component.call(this) +} + +QrCodeView.prototype.render = function () { + const props = this.props + const Qr = props.Qr + console.log(`QrCodeView Qr`, Qr); + const address = `${isHexPrefixed(Qr.data) ? 'ethereum:' : ''}${Qr.data}` + const qrImage = qrCode(4, 'M') + qrImage.addData(address) + qrImage.make() + return h('.main-container.flex-column', { + key: 'qr', + style: { + justifyContent: 'center', + paddingBottom: '45px', + paddingLeft: '45px', + paddingRight: '45px', + alignItems: 'center', + }, + }, [ + Array.isArray(Qr.message) ? h('.message-container', this.renderMultiMessage()) : h('.qr-header', Qr.message), + + this.props.warning ? this.props.warning && h('span.error.flex-center', { + style: { + textAlign: 'center', + width: '229px', + height: '82px', + }, + }, + this.props.warning) : null, + + h('#qr-container.flex-column', { + style: { + marginTop: '25px', + marginBottom: '15px', + }, + dangerouslySetInnerHTML: { + __html: qrImage.createTableTag(4), + }, + }), + h('.flex-row', [ + h('h3.ellip-address', { + style: { + width: '247px', + }, + }, Qr.data), + h(CopyButton, { + value: Qr.data, + }), + ]), + ]) +} + +QrCodeView.prototype.renderMultiMessage = function () { + var Qr = this.props.Qr + var multiMessage = Qr.message.map((message) => h('.qr-message', message)) + return multiMessage +} diff --git a/old-ui/app/components/range-slider.js b/old-ui/app/components/range-slider.js new file mode 100644 index 000000000..823f5eb01 --- /dev/null +++ b/old-ui/app/components/range-slider.js @@ -0,0 +1,58 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits + +module.exports = RangeSlider + +inherits(RangeSlider, Component) +function RangeSlider () { + Component.call(this) +} + +RangeSlider.prototype.render = function () { + const state = this.state || {} + const props = this.props + const onInput = props.onInput || function () {} + const name = props.name + const { + min = 0, + max = 100, + increment = 1, + defaultValue = 50, + mirrorInput = false, + } = this.props.options + const {container, input, range} = props.style + + return ( + h('.flex-row', { + style: container, + }, [ + h('input', { + type: 'range', + name: name, + min: min, + max: max, + step: increment, + style: range, + value: state.value || defaultValue, + onChange: mirrorInput ? this.mirrorInputs.bind(this, event) : onInput, + }), + + // Mirrored input for range + mirrorInput ? h('input.large-input', { + type: 'number', + name: `${name}Mirror`, + min: min, + max: max, + value: state.value || defaultValue, + step: increment, + style: input, + onChange: this.mirrorInputs.bind(this, event), + }) : null, + ]) + ) +} + +RangeSlider.prototype.mirrorInputs = function (event) { + this.setState({value: event.target.value}) +} diff --git a/old-ui/app/components/shapeshift-form.js b/old-ui/app/components/shapeshift-form.js new file mode 100644 index 000000000..a54987c04 --- /dev/null +++ b/old-ui/app/components/shapeshift-form.js @@ -0,0 +1,308 @@ +const PersistentForm = require('../../lib/persistent-form') +const h = require('react-hyperscript') +const inherits = require('util').inherits +const connect = require('react-redux').connect +const actions = require('../../../ui/app/actions') +const Qr = require('./qr-code') +const isValidAddress = require('../util').isValidAddress +module.exports = connect(mapStateToProps)(ShapeshiftForm) + +function mapStateToProps (state) { + return { + warning: state.appState.warning, + isSubLoading: state.appState.isSubLoading, + qrRequested: state.appState.qrRequested, + } +} + +inherits(ShapeshiftForm, PersistentForm) + +function ShapeshiftForm () { + PersistentForm.call(this) + this.persistentFormParentId = 'shapeshift-buy-form' +} + +ShapeshiftForm.prototype.render = function () { + return this.props.qrRequested ? h(Qr, {key: 'qr'}) : this.renderMain() +} + +ShapeshiftForm.prototype.renderMain = function () { + const marketinfo = this.props.buyView.formView.marketinfo + const coinOptions = this.props.buyView.formView.coinOptions + var coin = marketinfo.pair.split('_')[0].toUpperCase() + + return h('.flex-column', { + style: { + position: 'relative', + padding: '25px', + paddingTop: '5px', + width: '90%', + minHeight: '215px', + alignItems: 'center', + overflowY: 'auto', + }, + }, [ + h('.flex-row', { + style: { + justifyContent: 'center', + alignItems: 'baseline', + height: '42px', + }, + }, [ + h('img', { + src: coinOptions[coin].image, + width: '25px', + height: '25px', + style: { + marginRight: '5px', + }, + }), + + h('.input-container', { + position: 'relative', + }, [ + h('input#fromCoin.buy-inputs.ex-coins', { + type: 'text', + list: 'coinList', + autoFocus: true, + dataset: { + persistentFormId: 'input-coin', + }, + style: { + boxSizing: 'border-box', + }, + onChange: this.handleLiveInput.bind(this), + defaultValue: 'BTC', + }), + + this.renderCoinList(), + + h('i.fa.fa-pencil-square-o.edit-text', { + style: { + fontSize: '12px', + color: '#F7861C', + position: 'absolute', + }, + }), + ]), + + h('.icon-control', { + style: { + position: 'relative', + }, + }, [ + // Not visible on the screen, can't see it on master. + + // h('i.fa.fa-refresh.fa-4.orange', { + // style: { + // bottom: '5px', + // left: '5px', + // color: '#F7861C', + // }, + // onClick: this.updateCoin.bind(this), + // }), + h('i.fa.fa-chevron-right.fa-4.orange', { + style: { + position: 'absolute', + bottom: '35%', + left: '0%', + color: '#F7861C', + }, + onClick: this.updateCoin.bind(this), + }), + ]), + + h('#toCoin.ex-coins', marketinfo.pair.split('_')[1].toUpperCase()), + + h('img', { + src: coinOptions[marketinfo.pair.split('_')[1].toUpperCase()].image, + width: '25px', + height: '25px', + style: { + marginLeft: '5px', + }, + }), + ]), + + h('.flex-column', { + style: { + marginTop: '1%', + alignItems: 'flex-start', + }, + }, [ + this.props.warning ? + this.props.warning && + h('span.error.flex-center', { + style: { + textAlign: 'center', + width: '229px', + height: '82px', + }, + }, this.props.warning) + : this.renderInfo(), + + this.renderRefundAddressForCoin(coin), + ]), + + ]) +} + +ShapeshiftForm.prototype.renderRefundAddressForCoin = function (coin) { + return h(this.activeToggle('.input-container'), { + style: { + marginTop: '1%', + }, + }, [ + + h('div', `${coin} Address:`), + + h('input#fromCoinAddress.buy-inputs', { + type: 'text', + placeholder: `Your ${coin} Refund Address`, + dataset: { + persistentFormId: 'refund-address', + + }, + style: { + boxSizing: 'border-box', + width: '227px', + height: '30px', + padding: ' 5px ', + }, + }), + + h('i.fa.fa-pencil-square-o.edit-text', { + style: { + fontSize: '12px', + color: '#F7861C', + position: 'absolute', + }, + }), + h('div.flex-row', { + style: { + justifyContent: 'flex-start', + }, + }, [ + h('button', { + onClick: this.shift.bind(this), + style: { + marginTop: '1%', + }, + }, + 'Submit'), + ]), + ]) +} + +ShapeshiftForm.prototype.shift = function () { + var props = this.props + var withdrawal = this.props.buyView.buyAddress + var returnAddress = document.getElementById('fromCoinAddress').value + var pair = this.props.buyView.formView.marketinfo.pair + var data = { + 'withdrawal': withdrawal, + 'pair': pair, + 'returnAddress': returnAddress, + // Public api key + 'apiKey': '803d1f5df2ed1b1476e4b9e6bcd089e34d8874595dda6a23b67d93c56ea9cc2445e98a6748b219b2b6ad654d9f075f1f1db139abfa93158c04e825db122c14b6', + } + var message = [ + `Deposit Limit: ${props.buyView.formView.marketinfo.limit}`, + `Deposit Minimum:${props.buyView.formView.marketinfo.minimum}`, + ] + if (isValidAddress(withdrawal)) { + this.props.dispatch(actions.coinShiftRquest(data, message)) + } +} + +ShapeshiftForm.prototype.renderCoinList = function () { + var list = Object.keys(this.props.buyView.formView.coinOptions).map((item) => { + return h('option', { + value: item, + }, item) + }) + + return h('datalist#coinList', { + onClick: (event) => { + event.preventDefault() + }, + }, list) +} + +ShapeshiftForm.prototype.updateCoin = function (event) { + event.preventDefault() + const props = this.props + var coinOptions = this.props.buyView.formView.coinOptions + var coin = document.getElementById('fromCoin').value + + if (!coinOptions[coin.toUpperCase()] || coin.toUpperCase() === 'ETH') { + var message = 'Not a valid coin' + return props.dispatch(actions.displayWarning(message)) + } else { + return props.dispatch(actions.pairUpdate(coin)) + } +} + +ShapeshiftForm.prototype.handleLiveInput = function () { + const props = this.props + var coinOptions = this.props.buyView.formView.coinOptions + var coin = document.getElementById('fromCoin').value + + if (!coinOptions[coin.toUpperCase()] || coin.toUpperCase() === 'ETH') { + return null + } else { + return props.dispatch(actions.pairUpdate(coin)) + } +} + +ShapeshiftForm.prototype.renderInfo = function () { + const marketinfo = this.props.buyView.formView.marketinfo + const coinOptions = this.props.buyView.formView.coinOptions + var coin = marketinfo.pair.split('_')[0].toUpperCase() + + return h('span', { + style: { + }, + }, [ + h('h3.flex-row.text-transform-uppercase', { + style: { + color: '#868686', + paddingTop: '4px', + justifyContent: 'space-around', + textAlign: 'center', + fontSize: '17px', + }, + }, `Market Info for ${marketinfo.pair.replace('_', ' to ').toUpperCase()}:`), + h('.marketinfo', ['Status : ', `${coinOptions[coin].status}`]), + h('.marketinfo', ['Exchange Rate: ', `${marketinfo.rate}`]), + h('.marketinfo', ['Limit: ', `${marketinfo.limit}`]), + h('.marketinfo', ['Minimum : ', `${marketinfo.minimum}`]), + ]) +} + +ShapeshiftForm.prototype.activeToggle = function (elementType) { + if (!this.props.buyView.formView.response || this.props.warning) return elementType + return `${elementType}.inactive` +} + +ShapeshiftForm.prototype.renderLoading = function () { + return h('span', { + style: { + position: 'absolute', + left: '70px', + bottom: '194px', + background: 'transparent', + width: '229px', + height: '82px', + display: 'flex', + justifyContent: 'center', + }, + }, [ + h('img', { + style: { + width: '60px', + }, + src: 'images/loading.svg', + }), + ]) +} diff --git a/old-ui/app/components/shift-list-item.js b/old-ui/app/components/shift-list-item.js new file mode 100644 index 000000000..5454a90bc --- /dev/null +++ b/old-ui/app/components/shift-list-item.js @@ -0,0 +1,204 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') +const connect = require('react-redux').connect +const vreme = new (require('vreme'))() +const explorerLink = require('etherscan-link').createExplorerLink +const actions = require('../../../ui/app/actions') +const addressSummary = require('../util').addressSummary + +const CopyButton = require('./copyButton') +const EthBalance = require('./eth-balance') +const Tooltip = require('./tooltip') + + +module.exports = connect(mapStateToProps)(ShiftListItem) + +function mapStateToProps (state) { + return { + conversionRate: state.metamask.conversionRate, + currentCurrency: state.metamask.currentCurrency, + } +} + +inherits(ShiftListItem, Component) + +function ShiftListItem () { + Component.call(this) +} + +ShiftListItem.prototype.render = function () { + return ( + h('.transaction-list-item.flex-row', { + style: { + paddingTop: '20px', + paddingBottom: '20px', + justifyContent: 'space-around', + alignItems: 'center', + }, + }, [ + h('div', { + style: { + width: '0px', + position: 'relative', + bottom: '19px', + }, + }, [ + h('img', { + src: 'https://info.shapeshift.io/sites/default/files/logo.png', + style: { + height: '35px', + width: '132px', + position: 'absolute', + clip: 'rect(0px,23px,34px,0px)', + }, + }), + ]), + + this.renderInfo(), + this.renderUtilComponents(), + ]) + ) +} + +function formatDate (date) { + return vreme.format(new Date(date), 'March 16 2014 14:30') +} + +ShiftListItem.prototype.renderUtilComponents = function () { + var props = this.props + const { conversionRate, currentCurrency } = props + + switch (props.response.status) { + case 'no_deposits': + return h('.flex-row', [ + h(CopyButton, { + value: this.props.depositAddress, + }), + h(Tooltip, { + title: 'QR Code', + }, [ + h('i.fa.fa-qrcode.pointer.pop-hover', { + onClick: () => props.dispatch(actions.reshowQrCode(props.depositAddress, props.depositType)), + style: { + margin: '5px', + marginLeft: '23px', + marginRight: '12px', + fontSize: '20px', + color: '#F7861C', + }, + }), + ]), + ]) + case 'received': + return h('.flex-row') + + case 'complete': + return h('.flex-row', [ + h(CopyButton, { + value: this.props.response.transaction, + }), + h(EthBalance, { + value: `${props.response.outgoingCoin}`, + conversionRate, + currentCurrency, + width: '55px', + shorten: true, + needsParse: false, + incoming: true, + style: { + fontSize: '15px', + color: '#01888C', + }, + }), + ]) + + case 'failed': + return '' + default: + return '' + } +} + +ShiftListItem.prototype.renderInfo = function () { + var props = this.props + switch (props.response.status) { + case 'no_deposits': + return h('.flex-column', { + style: { + width: '200px', + overflow: 'hidden', + }, + }, [ + h('div', { + style: { + fontSize: 'x-small', + color: '#ABA9AA', + width: '100%', + }, + }, `${props.depositType} to ETH via ShapeShift`), + h('div', 'No deposits received'), + h('div', { + style: { + fontSize: 'x-small', + color: '#ABA9AA', + width: '100%', + }, + }, formatDate(props.time)), + ]) + case 'received': + return h('.flex-column', { + style: { + width: '200px', + overflow: 'hidden', + }, + }, [ + h('div', { + style: { + fontSize: 'x-small', + color: '#ABA9AA', + width: '100%', + }, + }, `${props.depositType} to ETH via ShapeShift`), + h('div', 'Conversion in progress'), + h('div', { + style: { + fontSize: 'x-small', + color: '#ABA9AA', + width: '100%', + }, + }, formatDate(props.time)), + ]) + case 'complete': + var url = explorerLink(props.response.transaction, parseInt('1')) + + return h('.flex-column.pointer', { + style: { + width: '200px', + overflow: 'hidden', + }, + onClick: () => global.platform.openWindow({ url }), + }, [ + h('div', { + style: { + fontSize: 'x-small', + color: '#ABA9AA', + width: '100%', + }, + }, 'From ShapeShift'), + h('div', formatDate(props.time)), + h('div', { + style: { + fontSize: 'x-small', + color: '#ABA9AA', + width: '100%', + }, + }, addressSummary(props.response.transaction)), + ]) + + case 'failed': + return h('span.error', '(Failed)') + default: + return '' + } +} diff --git a/old-ui/app/components/tab-bar.js b/old-ui/app/components/tab-bar.js new file mode 100644 index 000000000..bef444a48 --- /dev/null +++ b/old-ui/app/components/tab-bar.js @@ -0,0 +1,37 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits + +module.exports = TabBar + +inherits(TabBar, Component) +function TabBar () { + Component.call(this) +} + +TabBar.prototype.render = function () { + const props = this.props + const state = this.state || {} + const { tabs = [], defaultTab, tabSelected } = props + const { subview = defaultTab } = state + + return ( + h('.flex-row.space-around.text-transform-uppercase', { + style: { + background: '#EBEBEB', + color: '#AEAEAE', + paddingTop: '4px', + minHeight: '30px', + }, + }, tabs.map((tab) => { + const { key, content } = tab + return h(subview === key ? '.activeForm' : '.inactiveForm.pointer', { + onClick: () => { + this.setState({ subview: key }) + tabSelected(key) + }, + }, content) + })) + ) +} + diff --git a/old-ui/app/components/template.js b/old-ui/app/components/template.js new file mode 100644 index 000000000..b6ed8eaa0 --- /dev/null +++ b/old-ui/app/components/template.js @@ -0,0 +1,18 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits + +module.exports = NewComponent + +inherits(NewComponent, Component) +function NewComponent () { + Component.call(this) +} + +NewComponent.prototype.render = function () { + const props = this.props + + return ( + h('span', props.message) + ) +} diff --git a/old-ui/app/components/token-cell.js b/old-ui/app/components/token-cell.js new file mode 100644 index 000000000..19d7139bb --- /dev/null +++ b/old-ui/app/components/token-cell.js @@ -0,0 +1,72 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const Identicon = require('./identicon') +const prefixForNetwork = require('../../lib/etherscan-prefix-for-network') + +module.exports = TokenCell + +inherits(TokenCell, Component) +function TokenCell () { + Component.call(this) +} + +TokenCell.prototype.render = function () { + const props = this.props + const { address, symbol, string, network, userAddress } = props + + return ( + h('li.token-cell', { + style: { cursor: network === '1' ? 'pointer' : 'default' }, + onClick: this.view.bind(this, address, userAddress, network), + }, [ + + h(Identicon, { + diameter: 50, + address, + network, + }), + + h('h3', `${string || 0} ${symbol}`), + + h('span', { style: { flex: '1 0 auto' } }), + + /* + h('button', { + onClick: this.send.bind(this, address), + }, 'SEND'), + */ + + ]) + ) +} + +TokenCell.prototype.send = function (address, event) { + event.preventDefault() + event.stopPropagation() + const url = tokenFactoryFor(address) + if (url) { + navigateTo(url) + } +} + +TokenCell.prototype.view = function (address, userAddress, network, event) { + const url = etherscanLinkFor(address, userAddress, network) + if (url) { + navigateTo(url) + } +} + +function navigateTo (url) { + global.platform.openWindow({ url }) +} + +function etherscanLinkFor (tokenAddress, address, network) { + const prefix = prefixForNetwork(network) + return `https://${prefix}etherscan.io/token/${tokenAddress}?a=${address}` +} + +function tokenFactoryFor (tokenAddress) { + return `https://tokenfactory.surge.sh/#/token/${tokenAddress}` +} + diff --git a/old-ui/app/components/token-list.js b/old-ui/app/components/token-list.js new file mode 100644 index 000000000..998ec901d --- /dev/null +++ b/old-ui/app/components/token-list.js @@ -0,0 +1,207 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const TokenTracker = require('eth-token-tracker') +const TokenCell = require('./token-cell.js') + +module.exports = TokenList + +inherits(TokenList, Component) +function TokenList () { + this.state = { + tokens: [], + isLoading: true, + network: null, + } + Component.call(this) +} + +TokenList.prototype.render = function () { + const state = this.state + const { tokens, isLoading, error } = state + const { userAddress, network } = this.props + + if (isLoading) { + return this.message('Loading') + } + + if (error) { + log.error(error) + return h('.hotFix', { + style: { + padding: '80px', + }, + }, [ + 'We had trouble loading your token balances. You can view them ', + h('span.hotFix', { + style: { + color: 'rgba(247, 134, 28, 1)', + cursor: 'pointer', + }, + onClick: () => { + global.platform.openWindow({ + url: `https://ethplorer.io/address/${userAddress}`, + }) + }, + }, 'here'), + ]) + } + + const tokenViews = tokens.map((tokenData) => { + tokenData.network = network + tokenData.userAddress = userAddress + return h(TokenCell, tokenData) + }) + + return h('.full-flex-height', [ + this.renderTokenStatusBar(), + + h('ol.full-flex-height.flex-column', { + style: { + overflowY: 'auto', + display: 'flex', + flexDirection: 'column', + }, + }, [ + h('style', ` + + li.token-cell { + display: flex; + flex-direction: row; + align-items: center; + padding: 10px; + min-height: 50px; + } + + li.token-cell > h3 { + margin-left: 12px; + } + + li.token-cell:hover { + background: white; + cursor: pointer; + } + + `), + ...tokenViews, + h('.flex-grow'), + ]), + ]) +} + +TokenList.prototype.renderTokenStatusBar = function () { + const { tokens } = this.state + + let msg + if (tokens.length === 1) { + msg = `You own 1 token` + } else if (tokens.length > 1) { + msg = `You own ${tokens.length} tokens` + } else { + msg = `No tokens found` + } + + return h('div', { + style: { + display: 'flex', + justifyContent: 'space-between', + alignItems: 'center', + minHeight: '70px', + padding: '10px', + }, + }, [ + h('span', msg), + h('button', { + key: 'reveal-account-bar', + onClick: (event) => { + event.preventDefault() + this.props.addToken() + }, + style: { + display: 'flex', + height: '40px', + padding: '10px', + justifyContent: 'center', + alignItems: 'center', + }, + }, [ + 'ADD TOKEN', + ]), + ]) +} + +TokenList.prototype.message = function (body) { + return h('div', { + style: { + display: 'flex', + height: '250px', + alignItems: 'center', + justifyContent: 'center', + padding: '30px', + }, + }, body) +} + +TokenList.prototype.componentDidMount = function () { + this.createFreshTokenTracker() +} + +TokenList.prototype.createFreshTokenTracker = function () { + if (this.tracker) { + // Clean up old trackers when refreshing: + this.tracker.stop() + this.tracker.removeListener('update', this.balanceUpdater) + this.tracker.removeListener('error', this.showError) + } + + if (!global.ethereumProvider) return + const { userAddress } = this.props + this.tracker = new TokenTracker({ + userAddress, + provider: global.ethereumProvider, + tokens: this.props.tokens, + pollingInterval: 8000, + }) + + + // Set up listener instances for cleaning up + this.balanceUpdater = this.updateBalances.bind(this) + this.showError = (error) => { + this.setState({ error, isLoading: false }) + } + this.tracker.on('update', this.balanceUpdater) + this.tracker.on('error', this.showError) + + this.tracker.updateBalances() + .then(() => { + this.updateBalances(this.tracker.serialize()) + }) + .catch((reason) => { + log.error(`Problem updating balances`, reason) + this.setState({ isLoading: false }) + }) +} + +TokenList.prototype.componentWillUpdate = function (nextProps) { + if (nextProps.network === 'loading') return + const oldNet = this.props.network + const newNet = nextProps.network + + if (oldNet && newNet && newNet !== oldNet) { + this.setState({ isLoading: true }) + this.createFreshTokenTracker() + } +} + +TokenList.prototype.updateBalances = function (tokens) { + const heldTokens = tokens.filter(token => { + return token.balance !== '0' && token.string !== '0.000' + }) + this.setState({ tokens: heldTokens, isLoading: false }) +} + +TokenList.prototype.componentWillUnmount = function () { + if (!this.tracker) return + this.tracker.stop() +} + diff --git a/old-ui/app/components/tooltip.js b/old-ui/app/components/tooltip.js new file mode 100644 index 000000000..efab2c497 --- /dev/null +++ b/old-ui/app/components/tooltip.js @@ -0,0 +1,22 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const ReactTooltip = require('react-tooltip-component') + +module.exports = Tooltip + +inherits(Tooltip, Component) +function Tooltip () { + Component.call(this) +} + +Tooltip.prototype.render = function () { + const props = this.props + const { position, title, children } = props + + return h(ReactTooltip, { + position: position || 'left', + title, + fixed: true, + }, children) +} diff --git a/old-ui/app/components/transaction-list-item-icon.js b/old-ui/app/components/transaction-list-item-icon.js new file mode 100644 index 000000000..f442b05af --- /dev/null +++ b/old-ui/app/components/transaction-list-item-icon.js @@ -0,0 +1,68 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const Tooltip = require('./tooltip') + +const Identicon = require('./identicon') + +module.exports = TransactionIcon + +inherits(TransactionIcon, Component) +function TransactionIcon () { + Component.call(this) +} + +TransactionIcon.prototype.render = function () { + const { transaction, txParams, isMsg } = this.props + switch (transaction.status) { + case 'unapproved': + return h(!isMsg ? '.unapproved-tx-icon' : 'i.fa.fa-certificate.fa-lg') + + case 'rejected': + return h('i.fa.fa-exclamation-triangle.fa-lg.warning', { + style: { + width: '24px', + }, + }) + + case 'failed': + return h('i.fa.fa-exclamation-triangle.fa-lg.error', { + style: { + width: '24px', + }, + }) + + case 'submitted': + return h(Tooltip, { + title: 'Pending', + position: 'right', + }, [ + h('i.fa.fa-ellipsis-h', { + style: { + fontSize: '27px', + }, + }), + ]) + } + + if (isMsg) { + return h('i.fa.fa-certificate.fa-lg', { + style: { + width: '24px', + }, + }) + } + + if (txParams.to) { + return h(Identicon, { + diameter: 24, + address: txParams.to || transaction.hash, + }) + } else { + return h('i.fa.fa-file-text-o.fa-lg', { + style: { + width: '24px', + }, + }) + } +} diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js new file mode 100644 index 000000000..76a456d3f --- /dev/null +++ b/old-ui/app/components/transaction-list-item.js @@ -0,0 +1,175 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits + +const EthBalance = require('./eth-balance') +const addressSummary = require('../util').addressSummary +const explorerLink = require('etherscan-link').createExplorerLink +const CopyButton = require('./copyButton') +const vreme = new (require('vreme'))() +const Tooltip = require('./tooltip') +const numberToBN = require('number-to-bn') + +const TransactionIcon = require('./transaction-list-item-icon') +const ShiftListItem = require('./shift-list-item') +module.exports = TransactionListItem + +inherits(TransactionListItem, Component) +function TransactionListItem () { + Component.call(this) +} + +TransactionListItem.prototype.render = function () { + const { transaction, network, conversionRate, currentCurrency } = this.props + if (transaction.key === 'shapeshift') { + if (network === '1') return h(ShiftListItem, transaction) + } + var date = formatDate(transaction.time) + + let isLinkable = false + const numericNet = parseInt(network) + isLinkable = numericNet === 1 || numericNet === 3 || numericNet === 4 || numericNet === 42 + + var isMsg = ('msgParams' in transaction) + var isTx = ('txParams' in transaction) + var isPending = transaction.status === 'unapproved' + let txParams + if (isTx) { + txParams = transaction.txParams + } else if (isMsg) { + txParams = transaction.msgParams + } + + const nonce = txParams.nonce ? numberToBN(txParams.nonce).toString(10) : '' + + const isClickable = ('hash' in transaction && isLinkable) || isPending + return ( + h(`.transaction-list-item.flex-row.flex-space-between${isClickable ? '.pointer' : ''}`, { + onClick: (event) => { + if (isPending) { + this.props.showTx(transaction.id) + } + event.stopPropagation() + if (!transaction.hash || !isLinkable) return + var url = explorerLink(transaction.hash, parseInt(network)) + global.platform.openWindow({ url }) + }, + style: { + padding: '20px 0', + display: 'flex', + justifyContent: 'space-between', + }, + }, [ + + h('.identicon-wrapper.flex-column.flex-center.select-none', [ + h(TransactionIcon, { txParams, transaction, isTx, isMsg }), + ]), + + h(Tooltip, { + title: 'Transaction Number', + position: 'right', + }, [ + h('span', { + style: { + display: 'flex', + cursor: 'normal', + flexDirection: 'column', + alignItems: 'center', + justifyContent: 'center', + }, + }, nonce), + ]), + + h('.flex-column', {style: {width: '150px', overflow: 'hidden'}}, [ + domainField(txParams), + h('div', date), + recipientField(txParams, transaction, isTx, isMsg), + ]), + + // Places a copy button if tx is successful, else places a placeholder empty div. + transaction.hash ? h(CopyButton, { value: transaction.hash }) : h('div', {style: { display: 'flex', alignItems: 'center', width: '26px' }}), + + isTx ? h(EthBalance, { + value: txParams.value, + conversionRate, + currentCurrency, + shorten: true, + showFiat: false, + style: {fontSize: '15px'}, + }) : h('.flex-column'), + ]) + ) +} + +function domainField (txParams) { + return h('div', { + style: { + fontSize: 'x-small', + color: '#ABA9AA', + overflow: 'hidden', + textOverflow: 'ellipsis', + width: '100%', + }, + }, [ + txParams.origin, + ]) +} + +function recipientField (txParams, transaction, isTx, isMsg) { + let message + + if (isMsg) { + message = 'Signature Requested' + } else if (txParams.to) { + message = addressSummary(txParams.to) + } else { + message = 'Contract Published' + } + + return h('div', { + style: { + fontSize: 'x-small', + color: '#ABA9AA', + }, + }, [ + message, + renderErrorOrWarning(transaction), + ]) +} + +function formatDate (date) { + return vreme.format(new Date(date), 'March 16 2014 14:30') +} + +function renderErrorOrWarning (transaction) { + const { status, err, warning } = transaction + + // show rejected + if (status === 'rejected') { + return h('span.error', ' (Rejected)') + } + + // show error + if (err) { + const message = err.message || '' + return ( + h(Tooltip, { + title: message, + position: 'bottom', + }, [ + h(`span.error`, ` (Failed)`), + ]) + ) + } + + // show warning + if (warning) { + const message = warning.message + return h(Tooltip, { + title: message, + position: 'bottom', + }, [ + h(`span.warning`, ` (Warning)`), + ]) + } +} diff --git a/old-ui/app/components/transaction-list.js b/old-ui/app/components/transaction-list.js new file mode 100644 index 000000000..345e3ca16 --- /dev/null +++ b/old-ui/app/components/transaction-list.js @@ -0,0 +1,87 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits + +const TransactionListItem = require('./transaction-list-item') + +module.exports = TransactionList + + +inherits(TransactionList, Component) +function TransactionList () { + Component.call(this) +} + +TransactionList.prototype.render = function () { + const { transactions, network, unapprovedMsgs, conversionRate } = this.props + + var shapeShiftTxList + if (network === '1') { + shapeShiftTxList = this.props.shapeShiftTxList + } + const txsToRender = !shapeShiftTxList ? transactions.concat(unapprovedMsgs) : transactions.concat(unapprovedMsgs, shapeShiftTxList) + .sort((a, b) => b.time - a.time) + + return ( + + h('section.transaction-list.full-flex-height', { + style: { + justifyContent: 'center', + }, + }, [ + + h('style', ` + .transaction-list .transaction-list-item:not(:last-of-type) { + border-bottom: 1px solid #D4D4D4; + } + .transaction-list .transaction-list-item .ether-balance-label { + display: block !important; + font-size: small; + } + `), + + h('.tx-list', { + style: { + overflowY: 'auto', + height: '100%', + padding: '0 25px 0 15px', + textAlign: 'center', + }, + }, [ + + txsToRender.length + ? txsToRender.map((transaction, i) => { + let key + switch (transaction.key) { + case 'shapeshift': + const { depositAddress, time } = transaction + key = `shift-tx-${depositAddress}-${time}-${i}` + break + default: + key = `tx-${transaction.id}-${i}` + } + return h(TransactionListItem, { + transaction, i, network, key, + conversionRate, + showTx: (txId) => { + this.props.viewPendingTx(txId) + }, + }) + }) + : h('.flex-center.full-flex-height', { + style: { + flexDirection: 'column', + justifyContent: 'center', + }, + }, [ + h('p', { + style: { + marginTop: '50px', + }, + }, 'No transaction history.'), + ]), + ]), + ]) + ) +} + diff --git a/old-ui/app/components/typed-message-renderer.js b/old-ui/app/components/typed-message-renderer.js new file mode 100644 index 000000000..d170d63b7 --- /dev/null +++ b/old-ui/app/components/typed-message-renderer.js @@ -0,0 +1,42 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const extend = require('xtend') + +module.exports = TypedMessageRenderer + +inherits(TypedMessageRenderer, Component) +function TypedMessageRenderer () { + Component.call(this) +} + +TypedMessageRenderer.prototype.render = function () { + const props = this.props + const { value, style } = props + const text = renderTypedData(value) + + const defaultStyle = extend({ + width: '315px', + maxHeight: '210px', + resize: 'none', + border: 'none', + background: 'white', + padding: '3px', + overflow: 'scroll', + }, style) + + return ( + h('div.font-small', { + style: defaultStyle, + }, text) + ) +} + +function renderTypedData (values) { + return values.map(function (value) { + return h('div', {}, [ + h('strong', {style: {display: 'block', fontWeight: 'bold'}}, String(value.name) + ':'), + h('div', {}, value.value), + ]) + }) +} diff --git a/old-ui/app/conf-tx.js b/old-ui/app/conf-tx.js new file mode 100644 index 000000000..15c937b1c --- /dev/null +++ b/old-ui/app/conf-tx.js @@ -0,0 +1,235 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') +const connect = require('react-redux').connect +const actions = require('../../ui/app/actions') +const NetworkIndicator = require('./components/network') +const txHelper = require('../lib/tx-helper') +const isPopupOrNotification = require('../../app/scripts/lib/is-popup-or-notification') + +const PendingTx = require('./components/pending-tx') +const PendingMsg = require('./components/pending-msg') +const PendingPersonalMsg = require('./components/pending-personal-msg') +const PendingTypedMsg = require('./components/pending-typed-msg') +const Loading = require('./components/loading') + +module.exports = connect(mapStateToProps)(ConfirmTxScreen) + +function mapStateToProps (state) { + return { + identities: state.metamask.identities, + accounts: state.metamask.accounts, + selectedAddress: state.metamask.selectedAddress, + unapprovedTxs: state.metamask.unapprovedTxs, + unapprovedMsgs: state.metamask.unapprovedMsgs, + unapprovedPersonalMsgs: state.metamask.unapprovedPersonalMsgs, + unapprovedTypedMessages: state.metamask.unapprovedTypedMessages, + index: state.appState.currentView.context, + warning: state.appState.warning, + network: state.metamask.network, + provider: state.metamask.provider, + conversionRate: state.metamask.conversionRate, + currentCurrency: state.metamask.currentCurrency, + blockGasLimit: state.metamask.currentBlockGasLimit, + computedBalances: state.metamask.computedBalances, + } +} + +inherits(ConfirmTxScreen, Component) +function ConfirmTxScreen () { + Component.call(this) +} + +ConfirmTxScreen.prototype.render = function () { + const props = this.props + const { network, provider, unapprovedTxs, currentCurrency, computedBalances, + unapprovedMsgs, unapprovedPersonalMsgs, unapprovedTypedMessages, conversionRate, blockGasLimit } = props + + var unconfTxList = txHelper(unapprovedTxs, unapprovedMsgs, unapprovedPersonalMsgs, unapprovedTypedMessages, network) + + var txData = unconfTxList[props.index] || {} + var txParams = txData.params || {} + var isNotification = isPopupOrNotification() === 'notification' + + log.info(`rendering a combined ${unconfTxList.length} unconf msg & txs`) + if (unconfTxList.length === 0) return h(Loading, { isLoading: true }) + + const unconfTxListLength = unconfTxList.length + + return ( + + h('.flex-column.flex-grow', [ + + // subtitle and nav + h('.section-title.flex-row.flex-center', [ + !isNotification ? h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { + onClick: this.goHome.bind(this), + }) : null, + h('h2.page-subtitle', 'Confirm Transaction'), + isNotification ? h(NetworkIndicator, { + network: network, + provider: provider, + }) : null, + ]), + + h('h3', { + style: { + alignSelf: 'center', + display: unconfTxList.length > 1 ? 'block' : 'none', + }, + }, [ + h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { + style: { + display: props.index === 0 ? 'none' : 'inline-block', + }, + onClick: () => props.dispatch(actions.previousTx()), + }), + ` ${props.index + 1} of ${unconfTxList.length} `, + h('i.fa.fa-arrow-right.fa-lg.cursor-pointer', { + style: { + display: props.index + 1 === unconfTxList.length ? 'none' : 'inline-block', + }, + onClick: () => props.dispatch(actions.nextTx()), + }), + ]), + + warningIfExists(props.warning), + + currentTxView({ + // Properties + txData: txData, + key: txData.id, + selectedAddress: props.selectedAddress, + accounts: props.accounts, + identities: props.identities, + conversionRate, + currentCurrency, + blockGasLimit, + unconfTxListLength, + computedBalances, + // Actions + buyEth: this.buyEth.bind(this, txParams.from || props.selectedAddress), + sendTransaction: this.sendTransaction.bind(this), + cancelTransaction: this.cancelTransaction.bind(this, txData), + cancelAllTransactions: this.cancelAllTransactions.bind(this, unconfTxList), + signMessage: this.signMessage.bind(this, txData), + signPersonalMessage: this.signPersonalMessage.bind(this, txData), + signTypedMessage: this.signTypedMessage.bind(this, txData), + cancelMessage: this.cancelMessage.bind(this, txData), + cancelPersonalMessage: this.cancelPersonalMessage.bind(this, txData), + cancelTypedMessage: this.cancelTypedMessage.bind(this, txData), + }), + ]) + ) +} + +function currentTxView (opts) { + log.info('rendering current tx view') + const { txData } = opts + const { txParams, msgParams, type } = txData + + if (txParams) { + log.debug('txParams detected, rendering pending tx') + return h(PendingTx, opts) + } else if (msgParams) { + log.debug('msgParams detected, rendering pending msg') + + if (type === 'eth_sign') { + log.debug('rendering eth_sign message') + return h(PendingMsg, opts) + } else if (type === 'personal_sign') { + log.debug('rendering personal_sign message') + return h(PendingPersonalMsg, opts) + } else if (type === 'eth_signTypedData') { + log.debug('rendering eth_signTypedData message') + return h(PendingTypedMsg, opts) + } + } +} + +ConfirmTxScreen.prototype.buyEth = function (address, event) { + event.preventDefault() + this.props.dispatch(actions.buyEthView(address)) +} + +ConfirmTxScreen.prototype.sendTransaction = function (txData, event) { + this.stopPropagation(event) + this.props.dispatch(actions.updateAndApproveTx(txData)) +} + +ConfirmTxScreen.prototype.cancelTransaction = function (txData, event) { + this.stopPropagation(event) + event.preventDefault() + this.props.dispatch(actions.cancelTx(txData)) +} + +ConfirmTxScreen.prototype.cancelAllTransactions = function (unconfTxList, event) { + this.stopPropagation(event) + event.preventDefault() + this.props.dispatch(actions.cancelAllTx(unconfTxList)) +} + +ConfirmTxScreen.prototype.signMessage = function (msgData, event) { + log.info('conf-tx.js: signing message') + var params = msgData.msgParams + params.metamaskId = msgData.id + this.stopPropagation(event) + this.props.dispatch(actions.signMsg(params)) +} + +ConfirmTxScreen.prototype.stopPropagation = function (event) { + if (event.stopPropagation) { + event.stopPropagation() + } +} + +ConfirmTxScreen.prototype.signPersonalMessage = function (msgData, event) { + log.info('conf-tx.js: signing personal message') + var params = msgData.msgParams + params.metamaskId = msgData.id + this.stopPropagation(event) + this.props.dispatch(actions.signPersonalMsg(params)) +} + +ConfirmTxScreen.prototype.signTypedMessage = function (msgData, event) { + log.info('conf-tx.js: signing typed message') + var params = msgData.msgParams + params.metamaskId = msgData.id + this.stopPropagation(event) + this.props.dispatch(actions.signTypedMsg(params)) +} + +ConfirmTxScreen.prototype.cancelMessage = function (msgData, event) { + log.info('canceling message') + this.stopPropagation(event) + this.props.dispatch(actions.cancelMsg(msgData)) +} + +ConfirmTxScreen.prototype.cancelPersonalMessage = function (msgData, event) { + log.info('canceling personal message') + this.stopPropagation(event) + this.props.dispatch(actions.cancelPersonalMsg(msgData)) +} + +ConfirmTxScreen.prototype.cancelTypedMessage = function (msgData, event) { + log.info('canceling typed message') + this.stopPropagation(event) + this.props.dispatch(actions.cancelTypedMsg(msgData)) +} + +ConfirmTxScreen.prototype.goHome = function (event) { + this.stopPropagation(event) + this.props.dispatch(actions.goHome()) +} + +function warningIfExists (warning) { + if (warning && + // Do not display user rejections on this screen: + warning.indexOf('User denied transaction signature') === -1) { + return h('.error', { + style: { + margin: 'auto', + }, + }, warning) + } +} diff --git a/ui/app/config.js b/old-ui/app/config.js index 9cb2a0aad..75198fba5 100644 --- a/ui/app/config.js +++ b/old-ui/app/config.js @@ -2,13 +2,13 @@ const inherits = require('util').inherits const Component = require('react').Component const h = require('react-hyperscript') const connect = require('react-redux').connect -const actions = require('./actions') +const actions = require('../../ui/app/actions') const infuraCurrencies = require('./infura-conversion.json').objects.sort((a, b) => { return a.quote.name.toLocaleLowerCase().localeCompare(b.quote.name.toLocaleLowerCase()) }) const validUrl = require('valid-url') const exportAsFile = require('./util').exportAsFile - +const Modal = require('../../ui/app/components/modals/index').Modal module.exports = connect(mapStateToProps)(ConfigScreen) @@ -32,6 +32,8 @@ ConfigScreen.prototype.render = function () { return ( h('.flex-column.flex-grow', [ + h(Modal, {}, []), + // subtitle and nav h('.section-title.flex-row.flex-center', [ h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { diff --git a/ui/app/css/debug.css b/old-ui/app/css/debug.css index 3e125bcd4..3e125bcd4 100644 --- a/ui/app/css/debug.css +++ b/old-ui/app/css/debug.css diff --git a/ui/app/css/fonts.css b/old-ui/app/css/fonts.css index 3b9f581b9..3b9f581b9 100644 --- a/ui/app/css/fonts.css +++ b/old-ui/app/css/fonts.css diff --git a/ui/app/css/index.css b/old-ui/app/css/index.css index c0bf18c23..3cbf20e98 100644 --- a/ui/app/css/index.css +++ b/old-ui/app/css/index.css @@ -61,7 +61,6 @@ input:focus, textarea:focus { #app-content { overflow-x: hidden; - min-width: 357px; height: 100%; display: flex; flex-direction: column; @@ -443,6 +442,10 @@ input.large-input { flex-wrap: wrap; overflow-y: auto; flex-direction: inherit; + + .name-label { + margin-left: 15px; + } } .grow-tenx { @@ -709,3 +712,50 @@ div.message-container > div:first-child { .pop-hover:hover { transform: scale(1.1); } + +//Notification Modal + +.notification-modal-wrapper { + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: center; + position: relative; + border: 1px solid #dedede; + box-shadow: 0 0 2px 2px #dedede; + font-family: Roboto; +} + +.notification-modal-header { + background: #f6f6f6; + width: 100%; + display: flex; + justify-content: center; + padding: 30px; + font-size: 22px; + color: #1b344d; + height: 79px; +} + +.notification-modal-message { + padding: 20px; +} + +.notification-modal-message { + width: 100%; + display: flex; + justify-content: center; + font-size: 17px; + color: #1b344d; +} + +.modal-close-x::after { + content: '\00D7'; + font-size: 2em; + color: #9b9b9b; + position: absolute; + top: 25px; + right: 17.5px; + font-family: sans-serif; + cursor: pointer; +}
\ No newline at end of file diff --git a/ui/app/css/lib.css b/old-ui/app/css/lib.css index f3acbee76..f3acbee76 100644 --- a/ui/app/css/lib.css +++ b/old-ui/app/css/lib.css diff --git a/old-ui/app/css/output/index.css b/old-ui/app/css/output/index.css new file mode 100644 index 000000000..84ceb3bd7 --- /dev/null +++ b/old-ui/app/css/output/index.css @@ -0,0 +1,5385 @@ +@charset "UTF-8"; +/* + ITCSS + + http://www.creativebloq.com/web-design/manage-large-css-projects-itcss-101517528 + https://www.xfive.co/blog/itcss-scalable-maintainable-css-architecture/ + */ +/* + Variables + */ +/* + Colors + http://chir.ag/projects/name-that-color + */ +/* + Z-Indicies + */ +/* + Z Indicies - Current + app - 11 + hex/bn as decimal input - 1 - remove? + dropdown - 11 + loading - 10 - higher? + mascot - 0 - remove? + */ +/* + Responsive Breakpoints + */ +@import url("https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"); +@import url("https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css"); +@font-face { + font-family: 'Montserrat Regular'; + src: url("/fonts/Montserrat/Montserrat-Regular.woff") format("woff"); + src: url("/fonts/Montserrat/Montserrat-Regular.ttf") format("truetype"); + font-weight: 400; + font-style: normal; + font-size: 'small'; } + +@font-face { + font-family: 'Montserrat Bold'; + src: url("/fonts/Montserrat/Montserrat-Bold.woff") format("woff"); + src: url("/fonts/Montserrat/Montserrat-Bold.ttf") format("truetype"); + font-weight: 400; + font-style: normal; } + +@font-face { + font-family: 'Montserrat Light'; + src: url("/fonts/Montserrat/Montserrat-Light.woff") format("woff"); + src: url("/fonts/Montserrat/Montserrat-Light.ttf") format("truetype"); + font-weight: 400; + font-style: normal; } + +@font-face { + font-family: 'Montserrat UltraLight'; + src: url("/fonts/Montserrat/Montserrat-UltraLight.woff") format("woff"); + src: url("/fonts/Montserrat/Montserrat-UltraLight.ttf") format("truetype"); + font-weight: 400; + font-style: normal; } + +@font-face { + font-family: 'DIN OT'; + src: url("/fonts/DIN_OT/DINOT-2.otf") format("opentype"); + font-weight: 400; + font-style: normal; } + +@font-face { + font-family: 'DIN OT Light'; + src: url("/fonts/DIN_OT/DINOT-2.otf") format("opentype"); + font-weight: 200; + font-style: normal; } + +@font-face { + font-family: 'DIN NEXT'; + src: url("/fonts/DIN NEXT/DIN NEXT W01 Regular.otf") format("opentype"); + font-weight: 400; + font-style: normal; } + +@font-face { + font-family: 'DIN NEXT Light'; + src: url("/fonts/DIN NEXT/DIN NEXT W10 Light.otf") format("opentype"); + font-weight: 400; + font-style: normal; } + +@font-face { + font-family: 'Lato'; + src: url("/fonts/Lato/Lato-Regular.ttf") format("truetype"); + font-weight: 400; + font-style: normal; } + +/* + Utility Classes + */ +/* color */ +.color-orange { + color: #f7861c; } + +.color-forest { + color: #0a5448; } + +/* lib */ +.full-size { + height: 100%; + width: 100%; } + +.full-width { + width: 100%; } + +.full-flex-height { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-flex: 1; + -ms-flex: 1 1 auto; + flex: 1 1 auto; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; } + +.full-height { + height: 100%; } + +.flex-column { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; } + +.space-between { + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; } + +.space-around { + -ms-flex-pack: distribute; + justify-content: space-around; } + +.flex-column-bottom { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: reverse; + -ms-flex-direction: column-reverse; + flex-direction: column-reverse; } + +.flex-row { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; } + +.flex-space-between { + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; } + +.flex-space-around { + -ms-flex-pack: distribute; + justify-content: space-around; } + +.flex-right { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + -webkit-box-pack: end; + -ms-flex-pack: end; + justify-content: flex-end; } + +.flex-left { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; } + +.flex-fixed { + -webkit-box-flex: 0; + -ms-flex: none; + flex: none; } + +.flex-basis-auto { + -ms-flex-preferred-size: auto; + flex-basis: auto; } + +.flex-grow { + -webkit-box-flex: 1; + -ms-flex: 1 1 auto; + flex: 1 1 auto; } + +.flex-wrap { + -ms-flex-wrap: wrap; + flex-wrap: wrap; } + +.flex-center { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + +.flex-justify-center { + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; } + +.flex-align-center { + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + +.flex-self-end { + -ms-flex-item-align: end; + align-self: flex-end; } + +.flex-self-stretch { + -ms-flex-item-align: stretch; + align-self: stretch; } + +.flex-vertical { + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; } + +.z-bump { + z-index: 1; } + +.select-none { + cursor: inherit; + -moz-user-select: none; + -webkit-user-select: none; + -ms-user-select: none; + user-select: none; } + +.pointer { + cursor: pointer; } + +.cursor-pointer { + cursor: pointer; + -webkit-transform-origin: center center; + transform-origin: center center; + -webkit-transition: -webkit-transform 50ms ease-in-out; + transition: -webkit-transform 50ms ease-in-out; + transition: transform 50ms ease-in-out; + transition: transform 50ms ease-in-out, -webkit-transform 50ms ease-in-out; } + +.cursor-pointer:hover { + -webkit-transform: scale(1.1); + transform: scale(1.1); } + +.cursor-pointer:active { + -webkit-transform: scale(0.95); + transform: scale(0.95); } + +.cursor-disabled { + cursor: not-allowed; } + +.margin-bottom-sml { + margin-bottom: 20px; } + +.margin-bottom-med { + margin-bottom: 40px; } + +.margin-right-left { + margin: 0 20px; } + +.bold { + font-weight: 700; } + +.text-transform-uppercase { + text-transform: uppercase; } + +.font-small { + font-size: 12px; } + +.font-medium { + font-size: 1.2em; } + +hr.horizontal-line { + display: block; + height: 1px; + border: 0; + border-top: 1px solid #ccc; + margin: 1em 0; + padding: 0; } + +.hover-white:hover { + background: #fff; } + +.red-dot { + background: #e91550; + color: #fff; + border-radius: 10px; } + +.diamond { + -webkit-transform: rotate(45deg); + transform: rotate(45deg); + background: #038789; } + +.hollow-diamond { + -webkit-transform: rotate(45deg); + transform: rotate(45deg); + border: 3px solid #690496; } + +.golden-square { + background: #ebb33f; } + +.pending-dot { + background: #f00; + left: 14px; + top: 14px; + color: #fff; + border-radius: 10px; + height: 20px; + min-width: 20px; + position: relative; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + padding: 4px; + z-index: 1; } + +.keyring-label { + z-index: 1; + font-size: 8px; + line-height: 8px; + background: rgba(255, 255, 255, 0.4); + color: #fff; + border-radius: 10px; + padding: 4px; + text-align: center; + height: 15px; } + +.ether-balance { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + +.tabSection { + min-width: 350px; } + +.menu-icon { + display: inline-block; + height: 12px; + min-width: 12px; + margin: 13px; } + +.ether-icon { + background: #00a344; + border-radius: 20px; } + +.testnet-icon { + background: #2465e1; } + +.drop-menu-item { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + +.invisible { + visibility: hidden; } + +.one-line-concat { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } + +.critical-error { + text-align: center; + margin-top: 20px; + color: #f00; } + +/* + Misc + */ +.letter-spacey { + letter-spacing: .1em; } + +.active { + color: #909090; } + +.check { + margin-left: 7px; + color: #f7861c; + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: end; + -ms-flex-pack: end; + justify-content: flex-end; } + +/* + Generic + */ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ +html, +body, +div, +span, +applet, +object, +iframe, +h1, +h2, +h3, +h4, +h5, +h6, +p, +blockquote, +pre, +a, +abbr, +acronym, +address, +big, +cite, +code, +del, +dfn, +em, +img, +ins, +kbd, +q, +s, +samp, +small, +strike, +strong, +sub, +sup, +tt, +var, +b, +u, +i, +center, +dl, +dt, +dd, +ol, +ul, +li, +fieldset, +form, +label, +legend, +table, +caption, +tbody, +tfoot, +thead, +tr, +th, +td, +article, +aside, +canvas, +details, +embed, +figure, +figcaption, +footer, +header, +hgroup, +menu, +nav, +output, +ruby, +section, +summary, +time, +mark, +audio, +video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + /* stylelint-disable */ + font: inherit; + /* stylelint-enable */ + vertical-align: baseline; } + +/* HTML5 display-role reset for older browsers */ +/* stylelint-disable */ +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +menu, +nav, +section { + display: block; } + +body { + line-height: 1; } + +ol, +ul { + list-style: none; } + +blockquote, +q { + quotes: none; } + +blockquote:before, +blockquote:after, +q:before, +q:after { + content: ''; + content: none; } + +table { + border-collapse: collapse; + border-spacing: 0; } + +button { + border-style: none; + cursor: pointer; } + +/* stylelint-enable */ +* { + -webkit-box-sizing: border-box; + box-sizing: border-box; } + +html, +body { + font-family: Roboto, Arial; + color: #4d4d4d; + font-weight: 300; + line-height: 1.4em; + background: #f7f7f7; + width: 100%; + height: 100%; + margin: 0; + padding: 0; } + +html { + min-height: 500px; } + +.app-root { + overflow: hidden; + position: relative; } + +.app-primary { + display: -webkit-box; + display: -ms-flexbox; + display: flex; } + +input:focus, +textarea:focus { + outline: none; } + +/* stylelint-disable */ +#app-content { + overflow-x: hidden; + height: 100%; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; } + @media screen and (max-width: 575px) { + #app-content { + background-color: #fff; } } + +/* stylelint-enable */ +a { + text-decoration: none; + color: inherit; } + +a:hover { + color: #df6b0e; } + +input.large-input, +textarea.large-input { + padding: 8px; } + +input.large-input { + height: 36px; } + +/* + Buttons + */ +.btn-green { + background-color: #02c9b1; } + +button.btn-clear { + background: #fff; + border: 1px solid; } + +button[disabled], +input[type="submit"][disabled] { + cursor: not-allowed; + opacity: .5; } + +button.primary { + padding: 8px 12px; + background: #f7861c; + -webkit-box-shadow: 0 3px 6px rgba(247, 134, 28, 0.36); + box-shadow: 0 3px 6px rgba(247, 134, 28, 0.36); + color: #fff; + font-size: 1.1em; + font-family: Roboto; + text-transform: uppercase; } + +.btn-light { + padding: 8px 12px; + -webkit-box-shadow: 0 3px 6px rgba(247, 134, 28, 0.36); + box-shadow: 0 3px 6px rgba(247, 134, 28, 0.36); + color: #585d67; + font-size: 1.1em; + font-family: Roboto; + text-transform: uppercase; + text-align: center; + line-height: 20px; + border-radius: 2px; + border: 1px solid #979797; + opacity: .5; } + +button.btn-thin { + border: 1px solid; + border-color: #4d4d4d; + color: #4d4d4d; + background: #ffae29; + border-radius: 4px; + min-width: 200px; + margin: 12px 0; + padding: 6px; + font-size: 13px; } + +.btn-secondary { + border: 1px solid #979797; + border-radius: 2px; + background-color: #fff; + font-size: 16px; + line-height: 24px; + padding: 16px 42px; } + .btn-secondary[disabled] { + background-color: #fff !important; + opacity: .5; } + +.btn-tertiary { + border: 1px solid transparent; + border-radius: 2px; + background-color: transparent; + font-size: 16px; + line-height: 24px; + padding: 16px 42px; } + +.app-header { + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + visibility: visible; + background: #efefef; + position: relative; + z-index: 12; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; } + @media screen and (max-width: 575px) { + .app-header { + padding: 12px; + width: 100%; + -webkit-box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.08); + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.08); + z-index: 26; } } + @media screen and (min-width: 576px) { + .app-header { + height: 75px; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; } + .app-header::after { + content: ''; + position: absolute; + width: 100%; + height: 32px; + background: #efefef; + bottom: -32px; } } + .app-header .metafox-icon { + cursor: pointer; } + +.app-header-contents { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + width: 100%; + height: 6.9vh; } + @media screen and (max-width: 575px) { + .app-header-contents { + height: 100%; } } + @media screen and (min-width: 576px) { + .app-header-contents { + width: 85vw; } } + @media screen and (min-width: 769px) { + .app-header-contents { + width: 80vw; } } + @media screen and (min-width: 1281px) { + .app-header-contents { + width: 65vw; } } + +.app-header h1 { + font-family: Roboto; + text-transform: uppercase; + font-weight: 400; + color: #22232c; + line-height: 29px; } + @media screen and (max-width: 575px) { + .app-header h1 { + display: none; } } + +h2.page-subtitle { + text-transform: uppercase; + color: #aeaeae; + font-size: 1em; + margin: 12px; } + +.network-component-wrapper { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + +.left-menu-wrapper { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + cursor: pointer; } + +.header__right-actions { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + .header__right-actions .identicon { + cursor: pointer; } + +.app-footer { + padding-bottom: 10px; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + +.network-component--disabled { + cursor: default; } + .network-component--disabled .fa-caret-down { + opacity: 0; } + +.network-component.pointer { + border: 1px solid #22232c; + border-radius: 82px; + padding: 6px; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + .network-component.pointer.ethereum-network { + border-color: #038789; } + .network-component.pointer.ethereum-network .menu-icon-circle div { + background-color: rgba(3, 135, 137, 0.7) !important; } + .network-component.pointer.ropsten-test-network { + border-color: #e91550; } + .network-component.pointer.ropsten-test-network .menu-icon-circle div { + background-color: rgba(233, 21, 80, 0.7) !important; } + .network-component.pointer.kovan-test-network { + border-color: #690496; } + .network-component.pointer.kovan-test-network .menu-icon-circle div { + background-color: rgba(105, 4, 150, 0.7) !important; } + .network-component.pointer.rinkeby-test-network { + border-color: #ebb33f; } + .network-component.pointer.rinkeby-test-network .menu-icon-circle div { + background-color: rgba(235, 179, 63, 0.7) !important; } + +.dropdown-menu-item .menu-icon-circle, +.dropdown-menu-item .menu-icon-circle--active { + margin: 0 14px; } + +.network-indicator { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + font-size: .6em; } + .network-indicator .fa-caret-down { + line-height: 15px; + font-size: 12px; + padding: 0 4px; } + +.network-name { + line-height: 15px; + padding: 0 4px; + font-family: Roboto; + font-size: 12px; + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; } + +.network-droppo { + right: 2px; } + @media screen and (min-width: 576px) { + .network-droppo { + right: calc(((100% - 85vw) / 2) + 2px); } } + @media screen and (min-width: 769px) { + .network-droppo { + right: calc(((100% - 80vw) / 2) + 2px); } } + @media screen and (min-width: 1281px) { + .network-droppo { + right: calc(((100% - 65vw) / 2) + 2px); } } + +.network-name-item { + font-weight: 100; + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; + color: #9b9b9b; } + +.network-check, +.network-check__transparent { + color: #fff; + margin-left: 7px; } + +.network-check__transparent { + opacity: 0; + width: 16px; + margin: 0; } + +.menu-icon-circle, +.menu-icon-circle--active { + background: none; + border-radius: 22px; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + border: 1px solid transparent; + margin: 0 4px; } + +.menu-icon-circle--active { + border: 1px solid #fff; + background: rgba(100, 100, 100, 0.4); } + +.menu-icon-circle div, +.menu-icon-circle--active div { + height: 12px; + width: 12px; + border-radius: 17px; } + +.menu-icon-circle--active div { + opacity: 1; } + +.network-dropdown-header { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + width: 100%; } + +.network-dropdown-divider { + width: 100%; + height: 1px; + margin: 10px 0; + background-color: #5d5d5d; } + +.network-dropdown-title { + height: 25px; + width: 75px; + color: #fff; + font-family: Roboto; + font-size: 18px; + line-height: 25px; + text-align: center; } + +.network-dropdown-content { + height: 36px; + width: 265px; + color: #9b9b9b; + font-family: Roboto; + font-size: 14px; + line-height: 18px; } + +.modal > div:focus { + outline: none !important; } + +.buy-modal-content { + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + text-align: center; + font-family: Roboto; + padding: 0 16px; } + +.buy-modal-content-option { + cursor: pointer; + color: #5B5D67; } + +.qr-ellip-address, .ellip-address { + width: 247px; + border: none; + font-family: Roboto; + font-size: 14px; } + +@media screen and (max-width: 575px) { + .buy-modal-content-title-wrapper { + -ms-flex-pack: distribute; + justify-content: space-around; + width: 100%; + height: 100px; } + .buy-modal-content-title { + font-size: 26px; + margin-top: 15px; } + .buy-modal-content-options { + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + padding: 5% 33%; } + .buy-modal-content-footer { + text-transform: uppercase; + width: 100%; + height: 50px; } + div.buy-modal-content-option { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + width: 80vw; + height: 15vh; + margin: 10px; + text-align: center; + border-radius: 6px; + border: 1px solid #000; + padding: 0% 7%; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; } + div.buy-modal-content-option div.buy-modal-content-option-title { + font-size: 20px; } + div.buy-modal-content-option div.buy-modal-content-option-subtitle { + font-size: 16px; } } + +@media screen and (min-width: 576px) { + .buy-modal-content-title-wrapper { + -ms-flex-pack: distribute; + justify-content: space-around; + width: 100%; + height: 110px; } + .buy-modal-content-title { + font-size: 26px; + margin-top: 15px; } + .buy-modal-content-footer { + text-transform: uppercase; + width: 100%; + height: 50px; } + .buy-modal-content-options { + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + margin: 20px 0 60px; } + div.buy-modal-content-option { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + width: 20vw; + height: 120px; + text-align: center; + border-radius: 6px; + border: 1px solid #000; + margin: 0 8px; + padding: 18px 0; } + div.buy-modal-content-option div.buy-modal-content-option-title { + font-size: 20px; + margin-bottom: 12px; } } + @media screen and (min-width: 576px) and (max-width: 679px) { + div.buy-modal-content-option div.buy-modal-content-option-title { + font-size: 14px; } } + @media screen and (min-width: 576px) and (min-width: 1281px) { + div.buy-modal-content-option div.buy-modal-content-option-title { + font-size: 20px; } } + +@media screen and (min-width: 576px) { + div.buy-modal-content-option div.buy-modal-content-option-subtitle { + font-size: 16px; + padding: 0 10px; + height: 25%; } } + @media screen and (min-width: 576px) and (max-width: 679px) { + div.buy-modal-content-option div.buy-modal-content-option-subtitle { + font-size: 10px; + padding: 0 10px; + margin-bottom: 5px; + line-height: 15px; } } + @media screen and (min-width: 576px) and (min-width: 680px) { + div.buy-modal-content-option div.buy-modal-content-option-subtitle { + font-size: 14px; + padding: 0 4px; + margin-bottom: 2px; } } + @media screen and (min-width: 576px) and (min-width: 1281px) { + div.buy-modal-content-option div.buy-modal-content-option-subtitle { + font-size: 16px; + padding: 0; } } + +@media screen and (min-width: 576px) { + div.buy-modal-content-option div.buy-modal-content-footer { + margin-top: 8vh; } } + +.edit-account-name-modal-content { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + position: relative; } + +.edit-account-name-modal-cancel { + position: absolute; + top: 12px; + right: 20px; + font-size: 25px; } + +.edit-account-name-modal-title { + margin: 15px; } + +.edit-account-name-modal-save-button { + width: 33%; + height: 45px; + margin: 15px; + font-weight: 700; + margin-top: 25px; } + +.edit-account-name-modal-input { + width: 90%; + height: 50px; + text-align: left; + margin: 10px; + padding: 10px; + font-size: 18px; } + +.account-modal-container { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + position: relative; + padding: 5px 0 31px 0; + border: 1px solid #cdcdcd; + border-radius: 4px; + font-family: Roboto; } + .account-modal-container button { + cursor: pointer; } + +.account-modal-back { + color: #9b9b9b; + position: absolute; + top: 13px; + left: 17px; + cursor: pointer; } + .account-modal-back__text { + margin-top: 2px; + font-family: Roboto; + font-size: 14px; + line-height: 18px; } + +.account-modal-close::after { + content: '\00D7'; + font-size: 40px; + color: #9b9b9b; + position: absolute; + top: 10px; + right: 12px; + cursor: pointer; } + +.account-modal-container .identicon { + position: relative; + left: 0; + right: 0; + margin: 0 auto; + top: -32px; + margin-bottom: -32px; } + +.account-modal-container .qr-header { + margin-top: 9px; + font-size: 20px; } + +.account-modal-container .qr-wrapper { + margin-top: 5px; } + +.account-modal-container .ellip-address-wrapper { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + border: 1px solid #dedede; + padding: 5px 10px; + font-family: Roboto; + margin-top: 7px; + width: 286px; } + +.account-modal-container .btn-clear { + min-height: 28px; + font-size: 14px; + border-color: #2f9ae0; + color: #2f9ae0; + border-radius: 2px; + -ms-flex-preferred-size: 100%; + flex-basis: 100%; + width: 75%; + margin-top: 17px; + padding: 10px 22px; + height: 44px; + width: 235px; + font-family: Roboto; } + +.account-modal-divider { + width: 100%; + height: 1px; + margin: 19px 0 8px 0; + background-color: #dedede; } + +.account-modal-container .account-name { + margin-top: 9px; + font-size: 20px; } + +.account-modal-container .modal-body-title { + margin-top: 16px; + margin-bottom: 16px; + font-size: 18px; } + +.account-modal__name { + margin-top: 9px; + font-size: 20px; } + +.private-key-password { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; } + +.private-key-password-label, .private-key-password-error { + color: #5d5d5d; + font-size: 14px; + line-height: 18px; + margin-bottom: 10px; } + +.private-key-password-error { + color: #e91550; + margin-bottom: 0; } + +.private-key-password-input { + padding: 10px 0 13px 17px; + font-size: 16px; + line-height: 21px; + width: 291px; + height: 44px; } + +.private-key-password::-webkit-input-placeholder { + color: #9b9b9b; + font-family: Roboto; } + +.private-key-password-warning { + border-radius: 8px; + background-color: #FFF6F6; + font-size: 12px; + font-weight: 500; + line-height: 15px; + color: #e91550; + width: 292px; + padding: 9px 15px; + margin-top: 18px; + font-family: Roboto; } + +.export-private-key-buttons { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; } + .export-private-key-buttons .btn-clear { + width: 141px; + height: 54px; } + .export-private-key-buttons .btn-cancel { + margin-right: 15px; + border-color: #9b9b9b; + color: #5d5d5d; } + +.private-key-password-display-wrapper { + height: 80px; + width: 291px; + border: 1px solid #cdcdcd; + border-radius: 2px; } + +.private-key-password-display-textarea { + color: #e91550; + font-family: Roboto; + font-size: 16px; + line-height: 21px; + border: none; + height: 75px; + width: 100%; + overflow: hidden; + resize: none; + padding: 9px 13px 8px; + text-transform: uppercase; + font-weight: 300; } + +.new-account-modal-wrapper { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + position: relative; + border: 1px solid #dedede; + -webkit-box-shadow: 0 0 2px 2px #dedede; + box-shadow: 0 0 2px 2px #dedede; + font-family: Roboto; } + +.new-account-modal-header { + background: #f6f6f6; + width: 100%; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + padding: 30px; + font-size: 22px; + color: #1b344d; + height: 79px; } + +.modal-close-x::after { + content: '\00D7'; + font-size: 2em; + color: #9b9b9b; + position: absolute; + top: 25px; + right: 17.5px; + font-family: sans-serif; + cursor: pointer; } + +.new-account-modal-content { + width: 100%; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + margin-top: 15px; + font-size: 17px; + color: #1b344d; } + +.new-account-modal-content.after-input { + margin-top: 15px; + line-height: 25px; } + +.new-account-input-wrapper { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + width: 100%; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + padding-bottom: 2px; + margin-top: 13px; } + +.new-account-input { + padding: 15px; + padding-bottom: 20px; + border-radius: 8px; + border: 1px solid #dedede; + width: 100%; + font-size: 1em; + color: #9b9b9b; + font-family: Roboto; + font-size: 17px; + margin: 0 60px; } + +.new-account-input::-webkit-input-placeholder { + color: #9b9b9b; } + +.new-account-input:-moz-placeholder { + color: #9b9b9b; + opacity: 1; } + +.new-account-input::-moz-placeholder { + color: #9b9b9b; + opacity: 1; } + +.new-account-input:-ms-input-placeholder { + color: #9b9b9b; } + +.new-account-input::-ms-input-placeholder { + color: #9b9b9b; } + +.new-account-modal-content.button { + margin-top: 22px; + margin-bottom: 30px; + width: 113px; + height: 44px; } + +.new-account-modal-wrapper .btn-clear { + font-size: 14px; + font-weight: 700; + background: #fff; + border: 1px solid; + border-radius: 2px; + color: #4d4d4d; + -webkit-box-flex: 1; + -ms-flex: 1; + flex: 1; } + +.hide-token-confirmation { + min-height: 250.72px; + width: 374.49px; + border-radius: 4px; + background-color: #FFFFFF; + -webkit-box-shadow: 0 1px 7px 0 rgba(0, 0, 0, 0.5); + box-shadow: 0 1px 7px 0 rgba(0, 0, 0, 0.5); } + .hide-token-confirmation__container { + padding: 24px 27px 21px; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + .hide-token-confirmation__identicon { + margin-bottom: 10px; } + .hide-token-confirmation__symbol { + color: #4d4d4d; + font-family: Roboto; + font-size: 16px; + line-height: 24px; + text-align: center; + margin-bottom: 7.5px; } + .hide-token-confirmation__title { + height: 30px; + width: 271.28px; + color: #4d4d4d; + font-family: Roboto; + font-size: 22px; + line-height: 30px; + text-align: center; + margin-bottom: 10.5px; } + .hide-token-confirmation__copy { + height: 41px; + width: 318px; + color: #5d5d5d; + font-family: Roboto; + font-size: 14px; + line-height: 18px; + text-align: center; } + .hide-token-confirmation__buttons { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + margin-top: 15px; + width: 100%; } + .hide-token-confirmation__buttons button { + height: 44px; + width: 113px; + border: 1px solid #5d5d5d; + border-radius: 2px; + color: #4d4d4d; + font-family: Roboto; + font-size: 14px; + line-height: 20px; + text-align: center; + margin-left: 4px; + margin-right: 4px; } + +/* + NewUI Container Elements + */ +.main-container { + z-index: 18; + font-family: Roboto; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + -webkit-box-align: stretch; + -ms-flex-align: stretch; + align-items: stretch; } + +.main-container::-webkit-scrollbar { + display: none; } + +.tx-view { + -webkit-box-flex: 63.5; + -ms-flex: 63.5 0 66.5%; + flex: 63.5 0 66.5%; + background: #fff; } + @media screen and (max-width: 575px) { + .tx-view .identicon-wrapper { + display: none; } + .tx-view .account-name { + display: none; } } + +.wallet-view { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + -webkit-box-flex: 33.5; + -ms-flex: 33.5 1 33.5%; + flex: 33.5 1 33.5%; + width: 0; + background: #f6f6f6; + z-index: 200; + position: relative; } + @media screen and (min-width: 576px) { + .wallet-view { + overflow-y: scroll; + overflow-x: hidden; } } + .wallet-view .wallet-view-account-details { + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + .wallet-view__name-container { + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; + cursor: pointer; + width: 100%; } + .wallet-view__keyring-label { + height: 40px; + color: #9b9b9b; + font-family: Roboto; + font-size: 10px; + line-height: 40px; + text-align: right; + padding: 0 20px; } + .wallet-view__details-button { + color: #2f9ae0; + font-size: 10px; + line-height: 13px; + text-align: center; + border: 1px solid #2f9ae0; + border-radius: 10.5px; + background-color: transparent; + margin: 0 auto; + padding: 4px 12px; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + .wallet-view__address { + border-radius: 3px; + background-color: #dedede; + color: #5d5d5d; + font-size: 14px; + line-height: 12px; + padding: 4px 12px; + margin: 24px auto; + font-weight: 300; + cursor: pointer; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + @media screen and (max-width: 575px) { + .wallet-view__sidebar-close::after { + content: '\00D7'; + font-size: 40px; + color: #4d4d4d; + position: absolute; + top: 12px; + left: 12px; + cursor: pointer; } } + .wallet-view__add-token-button { + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; + color: #9b9b9b; + font-size: 14px; + line-height: 19px; + text-align: center; + margin: 36px auto; + border: 1px solid #9b9b9b; + border-radius: 2px; + font-weight: 300; + background: none; + padding: 9px 30px; } + +@media screen and (min-width: 576px) { + .wallet-view::-webkit-scrollbar { + display: none; } } + +.wallet-view-title-wrapper { + -webkit-box-flex: 0; + -ms-flex: 0 0 25px; + flex: 0 0 25px; } + +.wallet-view-title { + margin-left: 15px; + font-size: 16px; } + @media screen and (max-width: 575px) { + .wallet-view-title { + display: none; } } + +.wallet-view.sidebar { + -webkit-box-flex: 1; + -ms-flex: 1 0 230px; + flex: 1 0 230px; + background: #fafafa; + z-index: 26; + position: fixed; + top: 56px; + left: 0; + right: 0; + bottom: 0; + opacity: 1; + visibility: visible; + will-change: transform; + overflow-y: auto; + -webkit-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 4px; + box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 4px; + width: 85%; + height: calc(100% - 56px); } + +.sidebar-overlay { + z-index: 25; + position: fixed; + height: 100%; + width: 100%; + left: 0; + right: 0; + bottom: 0; + opacity: 1; + visibility: visible; + background-color: rgba(0, 0, 0, 0.3); } + +@media screen and (min-width: 576px) { + .lap-visible { + display: -webkit-box; + display: -ms-flexbox; + display: flex; } + .phone-visible { + display: none; } + .main-container { + width: 85%; + height: 90vh; + -webkit-box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08); + box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08); } } + +@media screen and (min-width: 769px) { + .main-container { + width: 80%; + height: 82vh; + -webkit-box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08); + box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08); } } + +@media screen and (min-width: 1281px) { + .main-container { + width: 65%; + height: 82vh; + -webkit-box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08); + box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08); } } + +@media screen and (max-width: 575px) { + .lap-visible { + display: none; } + .phone-visible { + display: -webkit-box; + display: -ms-flexbox; + display: flex; } + .main-container { + height: 100%; + width: 100%; + overflow-y: auto; + background-color: #fff; } + button.btn-clear { + width: 93px; + height: 50px; + font-size: .7em; + background: #fff; + border: 1px solid; } } + +.account-name { + font-size: 24px; + font-weight: 200; + line-height: 20px; + color: #5d5d5d; + margin-top: 8px; + margin-bottom: 24px; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + width: 100%; + padding: 0 8px; + text-align: center; } + +.account-options-menu { + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + margin: 5% 7% 0%; } + +.fiat-amount { + text-transform: uppercase; } + +.token-balance__amount { + padding-right: 6px; } + +.account-dropdown-name { + font-family: Roboto; } + +.account-dropdown-balance { + color: #9b9b9b; + line-height: 19px; } + +.account-dropdown-edit-button { + color: #9b9b9b; + font-family: Roboto; } + .account-dropdown-edit-button:hover { + color: #fff; } + +.account-list-item__top-row { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + margin-top: 10px; + margin-left: 8px; + position: relative; } + +.account-list-item__account-balances { + height: auto; + border: none; + background-color: transparent; + color: #9b9b9b; + margin-left: 34px; + margin-top: 4px; + position: relative; } + +.account-list-item__account-name { + font-size: 16px; + margin-left: 8px; } + +.account-list-item__icon { + position: absolute; + right: 12px; + top: 1px; } + +.account-list-item__account-primary-balance, .account-list-item__account-secondary-balance { + font-family: Roboto; + line-height: 16px; + font-size: 12px; + font-weight: 300; } + +.account-list-item__account-primary-balance { + color: #5d5d5d; + border: none; + outline: 0 !important; } + +.account-list-item__account-secondary-balance { + color: #9b9b9b; } + +.account-list-item__account-address { + margin-left: 35px; + width: 80%; + overflow: hidden; + text-overflow: ellipsis; } + +.account-list-item__dropdown:hover { + background: rgba(222, 222, 222, 0.2); + cursor: pointer; } + .account-list-item__dropdown:hover input { + background: rgba(222, 222, 222, 0.1); } + +.send-screen-wrapper { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + z-index: 25; + font-family: Roboto; } + @media screen and (max-width: 575px) { + .send-screen-wrapper { + width: 100%; + overflow-y: auto; } } + .send-screen-wrapper section { + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + +.send-screen-card { + background-color: #fff; + -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); + padding: 46px 40.5px 26px; + position: relative; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + width: 498px; + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; } + @media screen and (max-width: 575px) { + .send-screen-card { + top: 0; + width: 100%; + -webkit-box-shadow: none; + box-shadow: none; + padding: 12px; } } + +/* Send Screen */ +.send-screen section { + margin: 4px 16px; } + +.send-screen input { + width: 100%; + font-size: 12px; } + +.send-eth-icon { + border-radius: 50%; + width: 70px; + height: 70px; + border: 1px solid #dedede; + -webkit-box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.2); + box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.2); + position: absolute; + top: -35px; + z-index: 25; + padding: 4px; + background-color: #fff; } + @media screen and (max-width: 575px) { + .send-eth-icon { + position: relative; + top: 0; } } + +.send-screen-input-wrapper { + width: 95%; + position: relative; } + .send-screen-input-wrapper .fa-bolt { + padding-right: 4px; } + .send-screen-input-wrapper .large-input { + border: 1px solid #9b9b9b; + border-radius: 4px; + margin: 4px 0 20px; + font-size: 16px; + line-height: 22.4px; + font-family: Roboto; } + .send-screen-input-wrapper .send-screen-gas-input { + border: 1px solid transparent; } + .send-screen-input-wrapper__error-message { + display: none; } + .send-screen-input-wrapper--error input, + .send-screen-input-wrapper--error .send-screen-gas-input { + border-color: #f00 !important; } + .send-screen-input-wrapper--error .send-screen-input-wrapper__error-message { + display: block; + position: absolute; + bottom: 4px; + font-size: 12px; + line-height: 12px; + left: 8px; + color: #f00; } + .send-screen-input-wrapper .send-screen-input-wrapper__error-message { + display: block; + position: absolute; + bottom: 4px; + font-size: 12px; + line-height: 12px; + left: 8px; + color: #f00; } + +.send-screen-input { + width: 100%; } + +.send-screen-gas-input { + width: 100%; + height: 41px; + border-radius: 3px; + background-color: #f3f3f3; + border-width: 0; + border-style: none; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + padding-left: 10px; + padding-right: 12px; + font-size: 16px; + color: #5d5d5d; } + +.send-screen-amount-labels { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; } + +.send-screen-gas-labels { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; } + +.currency-toggle__item { + color: #2f9ae0; + cursor: pointer; } + .currency-toggle__item--selected { + color: #000; + cursor: default; } + +.send-screen-gas-input-customize { + color: #2f9ae0; + font-size: 12px; + cursor: pointer; } + +.gas-tooltip-close-area { + position: fixed; + top: 0; + left: 0; + z-index: 1000; + width: 100%; + height: 100%; } + +.customize-gas-tooltip-container { + position: absolute; + bottom: 50px; + width: 237px; + height: 307px; + background-color: #fff; + opacity: 1; + -webkit-box-shadow: #dedede 0 0 5px; + box-shadow: #dedede 0 0 5px; + z-index: 1050; + padding: 13px 19px; + font-size: 16px; + border-radius: 4px; + font-family: "Lato"; + font-weight: 500; } + +.gas-tooltip-arrow { + height: 25px; + width: 25px; + z-index: 1200; + background: #fff; + position: absolute; + -webkit-transform: rotate(45deg); + transform: rotate(45deg); + left: 107px; + top: 294px; + -webkit-box-shadow: 2px 2px 2px #dedede; + box-shadow: 2px 2px 2px #dedede; } + +.customize-gas-tooltip-container input[type="number"]::-webkit-inner-spin-button { + -webkit-appearance: none; + display: none; } + +.customize-gas-tooltip-container input[type="number"]:hover::-webkit-inner-spin-button { + -webkit-appearance: none; + display: none; } + +.customize-gas-tooltip { + position: relative; } + +.gas-tooltip { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; } + +.gas-tooltip-label { + font-size: 16px; + color: #4d4d4d; } + +.gas-tooltip-header { + padding-bottom: 12px; } + +.gas-tooltip-input-label { + margin-bottom: 5px; } + +.gas-tooltip-input-label i { + color: #aeaeae; + margin-left: 6px; } + +.customize-gas-input { + width: 178px; + height: 28px; + border: 1px solid #dedede; + font-size: 16px; + color: #1b344d; + padding-left: 8px; } + +.customize-gas-input-wrapper { + position: relative; } + +.gas-tooltip-input-detail { + position: absolute; + top: 4px; + right: 26px; + font-size: 12px; + color: #aeaeae; } + +.gas-tooltip-input-arrows { + position: absolute; + top: 0; + right: 4px; + width: 17px; + height: 28px; + border: 1px solid #dadada; + border-left: 0; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + color: #9b9b9b; + font-size: .8em; + padding: 1px 4px; + cursor: pointer; } + +.token-gas__amount { + display: inline-block; + margin-right: 4px; } + +.token-gas__symbol { + display: inline-block; } + +.send-screen__title { + color: #5d5d5d; + font-size: 18px; + line-height: 29px; } + +.send-screen__subtitle { + margin: 10px 0 20px; + font-size: 14px; + line-height: 24px; } + +.send-screen__send-button, .send-screen__cancel-button { + width: 163px; + text-align: center; } + +.send-screen__send-button__disabled { + opacity: .5; + cursor: auto; } + +.send-token { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + z-index: 25; + font-family: Roboto; } + .send-token__content { + width: 498px; + height: 605px; + background-color: #fff; + -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); + padding: 46px 40.5px 26px; + position: relative; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; } + @media screen and (max-width: 575px) { + .send-token__content { + top: 0; + width: 100%; + -webkit-box-shadow: none; + box-shadow: none; + padding: 12px; } } + .send-token .identicon { + position: absolute; + top: -35px; + z-index: 25; } + @media screen and (max-width: 575px) { + .send-token .identicon { + position: relative; + top: 0; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } } + .send-token__title { + color: #5d5d5d; + font-size: 18px; + line-height: 29px; } + .send-token__description, .send-token__balance-text, .send-token__token-symbol { + margin-top: 10px; + font-size: 14px; + line-height: 24px; + text-align: center; } + .send-token__token-balance { + font-size: 40px; + line-height: 40px; + margin-top: 13px; } + .send-token__token-balance .token-balance__amount { + padding-right: 12px; } + .send-token__button-group { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + @media screen and (max-width: 575px) { + .send-token__button-group { + margin-top: 24px; } } + .send-token__button-group button { + width: 163px; } + +.confirm-send-token__hero-amount-wrapper { + width: 100%; } + +.send-v2__container { + width: 380px; + border-radius: 8px; + background-color: #fff; + -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + z-index: 25; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + font-family: Roboto; + position: relative; } + @media screen and (max-width: 575px) { + .send-v2__container { + width: 100%; + top: 0; + -webkit-box-shadow: none; + box-shadow: none; + -webkit-box-flex: 1; + -ms-flex: 1 1 auto; + flex: 1 1 auto; } } + +.send-v2__send-header-icon-container { + z-index: 25; } + @media screen and (max-width: 575px) { + .send-v2__send-header-icon-container { + position: relative; + top: 0; } } + +.send-v2__send-header-icon { + border-radius: 50%; + width: 48px; + height: 48px; + border: 1px solid #dedede; + z-index: 25; + padding: 4px; + background-color: #fff; } + +.send-v2__send-arrow-icon { + color: #f28930; + -webkit-transform: rotate(-45deg); + transform: rotate(-45deg); + position: absolute; + top: -2px; + left: 0; + font-size: 1.12em; } + +.send-v2__arrow-background { + background-color: #fff; + height: 14px; + width: 14px; + position: absolute; + top: 52px; + left: 199px; + border-radius: 50%; + z-index: 100; } + @media screen and (max-width: 575px) { + .send-v2__arrow-background { + top: 36px; } } + +.send-v2__header { + height: 88px; + width: 380px; + background-color: #e9edf0; + position: relative; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + @media screen and (max-width: 575px) { + .send-v2__header { + height: 59px; + width: 100vw; } } + +.send-v2__header-tip { + height: 25px; + width: 25px; + background: #e9edf0; + position: absolute; + -webkit-transform: rotate(45deg); + transform: rotate(45deg); + left: 178px; + top: 75px; } + @media screen and (max-width: 575px) { + .send-v2__header-tip { + top: 46px; + left: 0; + right: 0; + margin: 0 auto; } } + +.send-v2__title { + color: #5d5d5d; + font-size: 22px; + line-height: 29px; + text-align: center; + margin-top: 25px; } + +.send-v2__copy { + color: #808080; + font-size: 14px; + font-weight: 300; + line-height: 19px; + text-align: center; + margin-top: 10px; + width: 287px; } + +.send-v2__error { + font-size: 12px; + line-height: 12px; + left: 8px; + color: #f00; } + +.send-v2__error-border { + color: #f00; } + +.send-v2__form { + margin: 13px 0; + width: 100%; } + @media screen and (max-width: 575px) { + .send-v2__form { + padding: 13px 0; + margin: 0; + height: 0; + overflow-y: auto; + -webkit-box-flex: 1; + -ms-flex: 1 1 auto; + flex: 1 1 auto; } } + +.send-v2__form-header, .send-v2__form-header-copy { + width: 100%; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column; + flex-flow: column; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + +.send-v2__form-row { + margin: 14.5px 18px 0px; + position: relative; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row; + flex-flow: row; + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; } + +.send-v2__form-field { + -webkit-box-flex: 1; + -ms-flex: 1 1 auto; + flex: 1 1 auto; } + +.send-v2__form-label { + color: #5d5d5d; + font-family: Roboto; + font-size: 16px; + line-height: 22px; + width: 88px; } + +.send-v2__from-dropdown { + height: 73px; + width: 100%; + border: 1px solid #dedede; + border-radius: 4px; + background-color: #fff; + font-family: Roboto; + line-height: 16px; + font-size: 12px; + color: #4d4d4d; + position: relative; } + .send-v2__from-dropdown__close-area { + position: fixed; + top: 0; + left: 0; + z-index: 1000; + width: 100%; + height: 100%; } + .send-v2__from-dropdown__list { + z-index: 1050; + position: absolute; + height: 220px; + width: 100%; + border: 1px solid #d2d8dd; + border-radius: 4px; + background-color: #fff; + -webkit-box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.11); + box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.11); + margin-top: 11px; + margin-left: -1px; + overflow-y: scroll; } + +.send-v2__to-autocomplete { + position: relative; } + .send-v2__to-autocomplete__down-caret { + position: absolute; + top: 18px; + right: 12px; } + +.send-v2__to-autocomplete__input, .send-v2__memo-text-area__input { + height: 54px; + width: 100%; + border: 1px solid #dedede; + border-radius: 4px; + background-color: #fff; + color: #9b9b9b; + padding: 10px; + font-family: Roboto; + font-size: 16px; + line-height: 21px; + font-weight: 300; } + +.send-v2__amount-max { + color: #2f9ae0; + font-family: Roboto; + font-size: 12px; + left: 8px; + border: none; + cursor: pointer; } + +.send-v2__gas-fee-display { + width: 100%; } + +.send-v2__sliders-icon-container { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + height: 24px; + width: 24px; + border: 1px solid #2f9ae0; + border-radius: 4px; + background-color: #fff; + padding: 5px; + position: absolute; + right: 15px; + top: 14px; + cursor: pointer; } + +.send-v2__sliders-icon { + color: #2f9ae0; } + +.send-v2__memo-text-area__input { + padding: 6px 10px; } + +.send-v2__footer { + height: 92px; + width: 100%; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: space-evenly; + -ms-flex-pack: space-evenly; + justify-content: space-evenly; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + border-top: 1px solid #dedede; + background: #fff; + padding: 0 12px; } + +.send-v2__next-btn, .send-v2__cancel-btn, .send-v2__next-btn__disabled { + width: 163px; + text-align: center; + height: 55px; + border-radius: 2px; + background-color: #fff; + font-family: Roboto; + font-size: 16px; + font-weight: 300; + line-height: 21px; + border: 1px solid; + margin: 0 4px; } + +.send-v2__next-btn, .send-v2__next-btn__disabled { + color: #2f9ae0; + border-color: #2f9ae0; } + +.send-v2__next-btn__disabled { + opacity: .5; + cursor: auto; } + +.send-v2__cancel-btn { + color: #9b9b9b; + border-color: #9b9b9b; } + +.send-v2__customize-gas { + border: 1px solid #D8D8D8; + border-radius: 4px; + background-color: #FFFFFF; + -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.14); + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.14); + font-family: Roboto; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column; + flex-flow: column; } + @media screen and (max-width: 575px) { + .send-v2__customize-gas { + width: 100vw; + height: 100vh; } } + .send-v2__customize-gas__header { + height: 52px; + border-bottom: 1px solid #dedede; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + font-size: 22px; } + @media screen and (max-width: 575px) { + .send-v2__customize-gas__header { + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } } + .send-v2__customize-gas__title { + margin-left: 19.25px; } + .send-v2__customize-gas__close::after { + content: '\00D7'; + font-size: 1.8em; + color: #9b9b9b; + font-family: sans-serif; + cursor: pointer; + margin-right: 19.25px; } + .send-v2__customize-gas__content { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + height: 100%; } + .send-v2__customize-gas__body { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + margin-bottom: 24px; } + @media screen and (max-width: 575px) { + .send-v2__customize-gas__body { + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column; + flex-flow: column; + -webkit-box-flex: 1; + -ms-flex: 1 1 auto; + flex: 1 1 auto; } } + .send-v2__customize-gas__footer { + height: 75px; + border-top: 1px solid #dedede; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + font-size: 22px; + position: relative; } + @media screen and (max-width: 575px) { + .send-v2__customize-gas__footer { + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } } + .send-v2__customize-gas__buttons { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + width: 181.75px; + margin-right: 21.25px; } + .send-v2__customize-gas__revert, .send-v2__customize-gas__cancel, .send-v2__customize-gas__save, .send-v2__customize-gas__save__error { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + cursor: pointer; } + .send-v2__customize-gas__revert { + color: #aeaeae; + font-size: 16px; + margin-left: 21.25px; } + .send-v2__customize-gas__cancel, .send-v2__customize-gas__save, .send-v2__customize-gas__save__error { + height: 34.64px; + width: 85.74px; + border: 1px solid #9b9b9b; + border-radius: 2px; + font-family: 'DIN OT'; + font-size: 12px; + color: #9b9b9b; } + .send-v2__customize-gas__save__error { + opacity: 0.5; + cursor: auto; } + .send-v2__customize-gas__error-message { + display: block; + position: absolute; + top: 4px; + right: 4px; + font-size: 12px; + line-height: 12px; + color: #f00; } + +.send-v2__gas-modal-card { + width: 360px; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column; + flex-flow: column; + -webkit-box-align: start; + -ms-flex-align: start; + align-items: flex-start; + padding-left: 20px; } + .send-v2__gas-modal-card__title { + height: 26px; + color: #4d4d4d; + font-family: Roboto; + font-size: 20px; + font-weight: 300; + line-height: 26px; + margin-top: 17px; } + .send-v2__gas-modal-card__copy { + height: 38px; + width: 314px; + color: #4d4d4d; + font-family: Roboto; + font-size: 14px; + line-height: 19px; + margin-top: 17px; } + .send-v2__gas-modal-card .customize-gas-input-wrapper { + margin-top: 17px; } + .send-v2__gas-modal-card .customize-gas-input { + height: 54px; + width: 315px; + border: 1px solid #d2d8dd; + background-color: #fff; + padding-left: 15px; } + .send-v2__gas-modal-card .gas-tooltip-input-arrows { + width: 32px; + height: 54px; + border-left: 1px solid #dadada; + font-size: 18px; + color: #4d4d4d; + right: 0px; + padding: 1px 4px; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -ms-flex-pack: distribute; + justify-content: space-around; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + .send-v2__gas-modal-card input[type="number"]::-webkit-inner-spin-button { + -webkit-appearance: none; + display: none; } + .send-v2__gas-modal-card input[type="number"]:hover::-webkit-inner-spin-button { + -webkit-appearance: none; + display: none; } + +.confirm-screen-container { + position: relative; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + font-family: Roboto; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); + border-radius: 8px; } + @media screen and (max-width: 575px) { + .confirm-screen-container { + width: 100%; } } + +@media screen and (max-width: 575px) { + .notification .confirm-screen-wrapper { + height: calc(100vh - 85px); } } + +.confirm-screen-wrapper { + height: 100%; + width: 380px; + background-color: #fff; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + z-index: 25; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + font-family: Roboto; + position: relative; + overflow-y: auto; + overflow-x: hidden; + border-top-left-radius: 8px; + border-top-right-radius: 8px; } + @media screen and (max-width: 575px) { + .confirm-screen-wrapper { + width: 100%; + overflow-x: hidden; + overflow-y: auto; + top: 0; + -webkit-box-shadow: none; + box-shadow: none; + height: calc(100vh - 58px - 85px); + border-top-left-radius: 0; + border-top-right-radius: 0; } } + +.confirm-screen-wrapper > .confirm-screen-total-box { + margin-left: 10px; + margin-right: 10px; } + +.confirm-screen-wrapper > .confirm-memo-wrapper { + margin: 0; } + +.confirm-screen-header { + height: 88px; + background-color: #e9edf0; + position: relative; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + font-size: 22px; + line-height: 29px; + width: 100%; + padding: 25px 0; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + @media screen and (max-width: 575px) { + .confirm-screen-header { + font-size: 20px; } } + +.confirm-screen-header-tip { + height: 25px; + width: 25px; + background: #e9edf0; + position: absolute; + -webkit-transform: rotate(45deg); + transform: rotate(45deg); + top: 71px; + left: 0; + right: 0; + margin: 0 auto; } + +.confirm-screen-title { + line-height: 27px; } + @media screen and (max-width: 575px) { + .confirm-screen-title { + margin-left: 22px; + margin-right: 8px; } } + +.confirm-screen-back-button { + background: transparent; + border: 1px solid #2f9ae0; + left: 24px; + position: absolute; + text-align: center; + color: #2f9ae0; + padding: 6px 13px 7px 12px; + border-radius: 2px; + height: 30px; + width: 54px; } + @media screen and (max-width: 575px) { + .confirm-screen-back-button { + margin-right: 12px; } } + +.confirm-screen-account-wrapper { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + +.confirm-screen-account-name { + margin-top: 12px; + font-size: 14px; + line-height: 19px; + color: #5d5d5d; + text-align: center; } + +.confirm-screen-row-info { + font-size: 16px; + line-height: 21px; } + +.confirm-screen-account-number { + font-size: 10px; + line-height: 16px; + color: #9b9b9b; + text-align: center; + height: 16px; } + +.confirm-send-ether i.fa-arrow-right, +.confirm-send-token i.fa-arrow-right { + -ms-flex-item-align: start; + align-self: start; + margin: 24px 14px 0 !important; } + +.confirm-screen-identicons { + margin-top: 24px; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + .confirm-screen-identicons i.fa-arrow-right { + -ms-flex-item-align: start; + align-self: start; + margin: 42px 14px 0; } + .confirm-screen-identicons i.fa-file-text-o { + font-size: 60px; + margin: 16px 8px 0 8px; + text-align: center; } + +.confirm-screen-sending-to-message { + text-align: center; + font-size: 16px; + margin-top: 30px; + font-family: 'DIN NEXT Light'; } + +.confirm-screen-send-amount { + color: #5d5d5d; + margin-top: 12px; + text-align: center; + font-size: 40px; + font-weight: 300; + line-height: 53px; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + +.confirm-screen-send-amount-currency { + font-size: 20px; + line-height: 20px; + text-align: center; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + +.confirm-memo-wrapper { + min-height: 24px; + width: 100%; + border-bottom: 1px solid #dedede; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + +.confirm-screen-send-memo { + color: #5d5d5d; + font-size: 16px; + line-height: 19px; + font-weight: 400; } + +.confirm-screen-label { + font-size: 18px; + line-height: 40px; + color: #5d5d5d; + text-align: left; } + +section .confirm-screen-account-name, +section .confirm-screen-account-number, +.confirm-screen-row-info, +.confirm-screen-row-detail { + text-align: left; } + +.confirm-screen-rows { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + width: 100%; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + +.confirm-screen-section-column { + -webkit-box-flex: .5; + -ms-flex: .5; + flex: .5; } + +.confirm-screen-row { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + border-bottom: 1px solid #dedede; + width: 100%; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + padding: 12px; + padding-left: 35px; + font-size: 16px; + line-height: 22px; + font-weight: 300; } + +.confirm-screen-row-detail { + font-size: 12px; + line-height: 16px; + color: #9b9b9b; } + +.confirm-screen-total-box { + background-color: #f6f6f6; + padding: 20px; + padding-left: 35px; + border-bottom: 1px solid #dedede; } + .confirm-screen-total-box .confirm-screen-label { + line-height: 18px; } + .confirm-screen-total-box .confirm-screen-row-detail { + color: #5d5d5d; } + .confirm-screen-total-box__subtitle { + font-size: 12px; + line-height: 22px; } + .confirm-screen-total-box .confirm-screen-row-info { + font-size: 16px; + font-weight: 500; + line-height: 21px; } + +.confirm-screen-confirm-button { + height: 62px; + border-radius: 2px; + background-color: #02c9b1; + font-size: 16px; + color: #fff; + text-align: center; + font-family: Roboto; + padding-top: 15px; + padding-bottom: 15px; + border-width: 0; + -webkit-box-shadow: none; + box-shadow: none; + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; + font-weight: 300; + margin: 0 8px; } + +.btn-light.confirm-screen-cancel-button { + height: 62px; + background: none; + border: none; + opacity: 1; + font-family: Roboto; + border-width: 0; + padding-top: 15px; + padding-bottom: 15px; + font-size: 16px; + line-height: 32px; + -webkit-box-shadow: none; + box-shadow: none; + cursor: pointer; + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; + font-weight: 300; + margin: 0 8px; } + +#pending-tx-form { + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; + position: relative; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + background-color: #fff; + padding: 12px 18px; + border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; + width: 100%; } + @media screen and (max-width: 575px) { + #pending-tx-form { + border-top: 1px solid #dedede; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; } } + +.loading-overlay { + left: 0px; + z-index: 50; + position: absolute; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + width: 100%; + background: rgba(255, 255, 255, 0.8); } + @media screen and (max-width: 575px) { + .loading-overlay { + margin-top: 56px; + height: calc(100% - 56px); } } + @media screen and (min-width: 576px) { + .loading-overlay { + margin-top: 75px; + height: calc(100% - 75px); } } + +@media screen and (max-width: 575px) { + .hero-balance { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + margin: .3em .9em 0; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } } + +@media screen and (min-width: 576px) { + .hero-balance { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + margin: 2.8em 2.37em .8em; } } + +.hero-balance .balance-container { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + margin: 0; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + @media screen and (max-width: 575px) { + .hero-balance .balance-container { + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } } + @media screen and (min-width: 576px) { + .hero-balance .balance-container { + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + -webkit-box-flex: 3; + -ms-flex-positive: 3; + flex-grow: 3; } } + +@media screen and (max-width: 575px) { + .hero-balance .balance-display { + text-align: center; } + .hero-balance .balance-display .token-amount { + font-size: 175%; + margin-top: 12.5%; } + .hero-balance .balance-display .fiat-amount { + font-size: 115%; + margin-top: 8.5%; + color: #a0a0a0; } } + +@media screen and (min-width: 576px) { + .hero-balance .balance-display { + margin-left: 3%; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + -webkit-box-align: start; + -ms-flex-align: start; + align-items: flex-start; } + .hero-balance .balance-display .token-amount { + font-size: 135%; } + .hero-balance .balance-display .fiat-amount { + margin-top: .25%; + font-size: 105%; } } + +.hero-balance .balance-icon { + border-radius: 25px; + width: 45px; + height: 45px; + border: 1px solid #dedede; } + +@media screen and (max-width: 575px) { + .hero-balance .hero-balance-buttons { + width: 100%; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; + padding: 16px 0; } } + +@media screen and (min-width: 576px) { + .hero-balance .hero-balance-buttons { + -webkit-box-flex: 2; + -ms-flex-positive: 2; + flex-grow: 2; + -webkit-box-pack: end; + -ms-flex-pack: end; + justify-content: flex-end; } } + +.hero-balance .hero-balance-buttons button.btn-clear { + background: #fff; + border: 1px solid; + border-radius: 2px; + font-size: 12px; } + @media screen and (max-width: 575px) { + .hero-balance .hero-balance-buttons button.btn-clear { + border-color: #2f9ae0; + color: #2f9ae0; + height: 36px; } } + @media screen and (min-width: 576px) { + .hero-balance .hero-balance-buttons button.btn-clear { + border-color: #2f9ae0; + color: #2f9ae0; + padding: 0; + width: 85px; + height: 34px; } } + +.wallet-balance-wrapper { + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; + -webkit-transition: linear 200ms; + transition: linear 200ms; + background: rgba(231, 231, 231, 0); } + .wallet-balance-wrapper--active { + background: #e7e7e7; } + +.wallet-balance { + background: inherit; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; + cursor: pointer; + border-top: 1px solid #e7e7e7; } + .wallet-balance .balance-container { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + margin: 20px 24px; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + -webkit-box-flex: 3; + -ms-flex-positive: 3; + flex-grow: 3; } + @media screen and (min-width: 576px) and (max-width: 890px) { + .wallet-balance .balance-container { + margin: 10% 4%; } } + .wallet-balance .balance-display { + margin-left: 15px; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + -webkit-box-align: start; + -ms-flex-align: start; + align-items: flex-start; } + .wallet-balance .balance-display .token-amount { + font-size: 135%; } + .wallet-balance .balance-display .fiat-amount { + margin-top: .25%; + font-size: 105%; } + @media screen and (min-width: 576px) and (max-width: 890px) { + .wallet-balance .balance-display { + margin-left: 4%; } + .wallet-balance .balance-display .token-amount { + font-size: 105%; } + .wallet-balance .balance-display .fiat-amount { + font-size: 95%; } } + .wallet-balance .balance-icon { + border-radius: 25px; + width: 45px; + height: 45px; + border: 1px solid #dedede; } + +.tx-list-container { + height: 87.5%; } + @media screen and (min-width: 576px) { + .tx-list-container { + overflow-y: scroll; } } + +.tx-list-header { + text-transform: capitalize; } + +@media screen and (max-width: 575px) { + .tx-list-header-wrapper { + margin-top: .2em; + margin-bottom: .6em; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + .tx-list-header { + -ms-flex-item-align: center; + align-self: center; + font-size: 12px; + color: #9b9b9b; + font-family: Roboto; + text-transform: uppercase; } } + +@media screen and (min-width: 576px) { + .tx-list-header-wrapper { + -webkit-box-flex: 0; + -ms-flex: 0 0 55px; + flex: 0 0 55px; } + .tx-list-header { + font-size: 16px; + margin: 1.5em 2.37em; } + .tx-list-container::-webkit-scrollbar { + display: none; } } + +.tx-list-content-divider { + height: 1px; + background: #e7e7e7; + -webkit-box-flex: 0; + -ms-flex: 0 0 1px; + flex: 0 0 1px; } + @media screen and (max-width: 575px) { + .tx-list-content-divider { + margin: .1em 0; } } + @media screen and (min-width: 576px) { + .tx-list-content-divider { + margin: .1em 2.37em; } } + +.tx-list-item-wrapper { + -webkit-box-flex: 1; + -ms-flex: 1 1 auto; + flex: 1 1 auto; + width: 0; + -webkit-box-align: stretch; + -ms-flex-align: stretch; + align-items: stretch; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; } + @media screen and (max-width: 575px) { + .tx-list-item-wrapper { + padding: 0 1.3em .8em; } } + @media screen and (min-width: 576px) { + .tx-list-item-wrapper { + padding-bottom: 12px; } } + +.tx-list-clickable { + cursor: pointer; } + .tx-list-clickable:hover { + background: rgba(222, 222, 222, 0.2); } + +.tx-list-pending-item-container { + cursor: pointer; + opacity: .5; } + +.tx-list-date-wrapper { + -webkit-box-flex: 1; + -ms-flex: 1 1 auto; + flex: 1 1 auto; } + @media screen and (max-width: 575px) { + .tx-list-date-wrapper { + margin-top: 6px; } } + @media screen and (min-width: 576px) { + .tx-list-date-wrapper { + margin-top: 12px; } } + +.tx-list-content-wrapper { + -webkit-box-align: stretch; + -ms-flex-align: stretch; + align-items: stretch; + margin-bottom: 4px; + margin-top: 2px; + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; + width: 100%; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; } + @media screen and (max-width: 575px) { + .tx-list-content-wrapper { + font-size: 12px; } + .tx-list-content-wrapper .tx-list-status { + font-size: 14px !important; } + .tx-list-content-wrapper .tx-list-account { + font-size: 14px !important; } + .tx-list-content-wrapper .tx-list-value { + font-size: 14px; + line-height: 18px; } + .tx-list-content-wrapper .tx-list-fiat-value { + font-size: 12px; + line-height: 16px; } } + +.tx-list-date { + color: #9b9b9b; + font-size: 12px; + font-family: Roboto; } + +.tx-list-identicon-wrapper { + -ms-flex-item-align: center; + align-self: center; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; + margin-right: 16px; } + +.tx-list-account-and-status-wrapper { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-flex: 1; + -ms-flex: 1 1 auto; + flex: 1 1 auto; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row wrap; + flex-flow: row wrap; + width: 0; } + @media screen and (max-width: 575px) { + .tx-list-account-and-status-wrapper { + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + -webkit-box-align: start; + -ms-flex-align: start; + align-items: flex-start; + -ms-flex-item-align: center; + align-self: center; } + .tx-list-account-and-status-wrapper .tx-list-account-wrapper { + height: 18px; } + .tx-list-account-and-status-wrapper .tx-list-account-wrapper .tx-list-account { + line-height: 14px; } } + @media screen and (min-width: 576px) { + .tx-list-account-and-status-wrapper { + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + .tx-list-account-and-status-wrapper .tx-list-account-wrapper { + -webkit-box-flex: 1.3; + -ms-flex: 1.3 2 auto; + flex: 1.3 2 auto; + min-width: 153px; } + .tx-list-account-and-status-wrapper .tx-list-status-wrapper { + -webkit-box-flex: 6; + -ms-flex: 6 6 auto; + flex: 6 6 auto; } } + .tx-list-account-and-status-wrapper .tx-list-account { + font-size: 16px; + color: #5d5d5d; } + .tx-list-account-and-status-wrapper .tx-list-status { + color: #9b9b9b; + font-size: 16px; + text-transform: capitalize; } + .tx-list-account-and-status-wrapper .tx-list-status--rejected, + .tx-list-account-and-status-wrapper .tx-list-status--failed { + color: #d0021b; } + +.tx-list-item { + border-top: 1px solid #e7e7e7; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; } + @media screen and (min-width: 576px) { + .tx-list-item { + margin: 0 2.37em; } } + .tx-list-item:last-of-type { + border-bottom: 1px solid #e7e7e7; + margin-bottom: 32px; } + .tx-list-item__wrapper { + -ms-flex-item-align: center; + align-self: center; + -webkit-box-flex: 2; + -ms-flex: 2 2 auto; + flex: 2 2 auto; + color: #9b9b9b; } + .tx-list-item__wrapper .tx-list-value { + font-size: 16px; + text-align: right; } + .tx-list-item__wrapper .tx-list-value--confirmed { + color: #02c9b1; } + .tx-list-item__wrapper .tx-list-fiat-value { + font-size: 12px; + text-align: right; } + .tx-list-item--empty { + text-align: center; + border-bottom: none !important; + padding: 16px; } + +.tx-list-details-wrapper { + overflow: hidden; + -webkit-box-flex: 0; + -ms-flex: 0 0 35%; + flex: 0 0 35%; } + +.tx-list-value { + font-size: 16px; + text-align: right; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; } + +.tx-list-fiat-value { + text-align: right; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; } + +.tx-list-value--confirmed { + color: #02c9b1; } + +/* stylelint-disable */ +/* +App Sections + TODO: Move into separate files. +*/ +/* initialize */ +textarea.twelve-word-phrase { + padding: 12px; + width: 300px; + height: 140px; + font-size: 16px; + background: #fff; + resize: none; } + +.initialize-screen hr { + width: 60px; + margin: 12px; + border-color: #f7861c; + border-style: solid; } + +.initialize-screen label { + margin-top: 20px; } + +.initialize-screen button.create-vault { + margin-top: 40px; } + +.initialize-screen .warning { + font-size: 14px; + margin: 0 16px; } + +/* unlock */ +.error { + color: #f7861c; + margin-bottom: 9px; } + +.warning { + color: #ffae00; } + +.lock { + width: 50px; + height: 50px; } + +.lock.locked { + -webkit-transform: scale(1.5); + transform: scale(1.5); + opacity: 0; + -webkit-transition: opacity 400ms ease-in, -webkit-transform 400ms ease-in; + transition: opacity 400ms ease-in, -webkit-transform 400ms ease-in; + transition: opacity 400ms ease-in, transform 400ms ease-in; + transition: opacity 400ms ease-in, transform 400ms ease-in, -webkit-transform 400ms ease-in; } + +.lock.unlocked { + -webkit-transform: scale(1); + transform: scale(1); + opacity: 1; + -webkit-transition: opacity 500ms ease-out, background 200ms ease-in, -webkit-transform 500ms ease-out; + transition: opacity 500ms ease-out, background 200ms ease-in, -webkit-transform 500ms ease-out; + transition: opacity 500ms ease-out, transform 500ms ease-out, background 200ms ease-in; + transition: opacity 500ms ease-out, transform 500ms ease-out, background 200ms ease-in, -webkit-transform 500ms ease-out; } + +.lock.locked .lock-top { + -webkit-transform: scaleX(1) translateX(0); + transform: scaleX(1) translateX(0); + -webkit-transition: -webkit-transform 250ms ease-in; + transition: -webkit-transform 250ms ease-in; + transition: transform 250ms ease-in; + transition: transform 250ms ease-in, -webkit-transform 250ms ease-in; } + +.lock.unlocked .lock-top { + -webkit-transform: scaleX(-1) translateX(-12px); + transform: scaleX(-1) translateX(-12px); + -webkit-transition: -webkit-transform 250ms ease-in; + transition: -webkit-transform 250ms ease-in; + transition: transform 250ms ease-in; + transition: transform 250ms ease-in, -webkit-transform 250ms ease-in; } + +.lock.unlocked:hover { + border-radius: 4px; + background: #e5e5e5; + border: 1px solid #b1b1b1; } + +.lock.unlocked:active { + background: #c3c3c3; } + +.section-title .fa-arrow-left { + margin: -2px 8px 0px -8px; } + +.unlock-screen #metamask-mascot-container { + margin-top: 24px; } + +.unlock-screen h1 { + margin-top: -28px; + margin-bottom: 42px; } + +.unlock-screen input[type=password] { + width: 260px; } + +.sizing-input { + font-size: 14px; + height: 30px; + padding-left: 5px; } + +.editable-label { + display: -webkit-box; + display: -ms-flexbox; + display: flex; } + +/* Webkit */ +.unlock-screen input::-webkit-input-placeholder { + text-align: center; + font-size: 1.2em; } + +/* Firefox 18- */ +.unlock-screen input:-moz-placeholder { + text-align: center; + font-size: 1.2em; } + +/* Firefox 19+ */ +.unlock-screen input::-moz-placeholder { + text-align: center; + font-size: 1.2em; } + +/* IE */ +.unlock-screen input:-ms-input-placeholder { + text-align: center; + font-size: 1.2em; } + +/* accounts */ +.accounts-section { + margin: 0 0px; } + +.accounts-section .horizontal-line { + margin: 0 18px; } + +.accounts-list-option { + height: 120px; } + +.accounts-list-option .identicon-wrapper { + width: 100px; } + +.unconftx-link { + margin-top: 24px; + cursor: pointer; } + +.unconftx-link .fa-arrow-right { + margin: 0 -8px 0px 8px; } + +/* identity panel */ +.identity-panel { + font-weight: 500; } + +.identity-panel .identicon-wrapper { + margin: 4px; + margin-top: 8px; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + +.identity-panel .identicon-wrapper span { + margin: 0 auto; } + +.identity-panel .identity-data { + margin: 8px 8px 8px 18px; } + +.identity-panel i { + margin-top: 32px; + margin-right: 6px; + color: #b9b9b9; } + +.identity-panel .arrow-right { + padding-left: 18px; + width: 42px; + min-width: 18px; + height: 100%; } + +.identity-copy.flex-column { + -webkit-box-flex: .25; + -ms-flex: .25 0 auto; + flex: .25 0 auto; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; } + +/* accounts screen */ +.identity-section .identity-panel { + background: #e9e9e9; + border-bottom: 1px solid #b1b1b1; + cursor: pointer; } + +.identity-section .identity-panel.selected { + background: #fff; + color: #f3c83e; } + +.identity-section .identity-panel.selected .identicon { + border-color: #ffa500; } + +.identity-section .accounts-list-option:hover, +.identity-section .accounts-list-option.selected { + background: #fff; } + +/* account detail screen */ +.account-detail-section { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + overflow-y: auto; + -webkit-box-orient: inherit; + -webkit-box-direction: inherit; + -ms-flex-direction: inherit; + flex-direction: inherit; } + +.grow-tenx { + -webkit-box-flex: 10; + -ms-flex-positive: 10; + flex-grow: 10; } + +.unapproved-tx-icon { + height: 16px; + width: 16px; + background: #2faef4; + border-color: #aeaeae; + border-radius: 13px; } + +.edit-text { + height: 100%; + visibility: hidden; } + +.editing-label { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + margin-left: 50px; + margin-bottom: 2px; + font-size: 11px; + text-rendering: geometricPrecision; + color: #f7861c; } + +.name-label:hover .edit-text { + visibility: visible; } + +/* tx confirm */ +.unconftx-section input[type=password] { + height: 22px; + padding: 2px; + margin: 12px; + margin-bottom: 24px; + border-radius: 4px; + border: 2px solid #f3c83e; + background: #faf6f0; } + +/* Ether Balance Widget */ +.ether-balance-amount { + color: #f7861c; } + +.ether-balance-label { + color: #aba9aa; } + +/* Info screen */ +.info-gray { + font-family: Roboto; + text-transform: uppercase; + color: #aeaeae; } + +.icon-size { + width: 20px; } + +.info { + font-family: Roboto, Arial; + padding-bottom: 10px; + display: inline-block; + padding-left: 5px; } + +/* buy eth warning screen */ +.custom-radios { + -ms-flex-pack: distribute; + justify-content: space-around; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + +.custom-radio-selected { + width: 17px; + height: 17px; + border: solid; + border-style: double; + border-radius: 15px; + border-width: 5px; + background: #f7861c; + border-color: #f7f7f7; } + +.custom-radio-inactive { + width: 14px; + height: 14px; + border: solid; + border-width: 1px; + border-radius: 24px; + border-color: #aeaeae; } + +.radio-titles { + color: #f7861c; } + +.eth-warning { + -webkit-transition: opacity 400ms ease-in, -webkit-transform 400ms ease-in; + transition: opacity 400ms ease-in, -webkit-transform 400ms ease-in; + transition: opacity 400ms ease-in, transform 400ms ease-in; + transition: opacity 400ms ease-in, transform 400ms ease-in, -webkit-transform 400ms ease-in; } + +.buy-subview { + -webkit-transition: opacity 400ms ease-in, -webkit-transform 400ms ease-in; + transition: opacity 400ms ease-in, -webkit-transform 400ms ease-in; + transition: opacity 400ms ease-in, transform 400ms ease-in; + transition: opacity 400ms ease-in, transform 400ms ease-in, -webkit-transform 400ms ease-in; } + +.input-container:hover .edit-text { + visibility: visible; } + +.buy-inputs { + font-family: Roboto; + font-size: 13px; + height: 20px; + background: transparent; + -webkit-box-sizing: border-box; + box-sizing: border-box; + border: solid; + border-color: transparent; + border-width: .5px; + border-radius: 2px; } + +.input-container:hover .buy-inputs { + -webkit-box-sizing: inherit; + box-sizing: inherit; + border: solid; + border-color: #f7861c; + border-width: .5px; + border-radius: 2px; } + +.buy-inputs:focus { + border: solid; + border-color: #f7861c; + border-width: .5px; + border-radius: 2px; } + +.activeForm { + background: #f7f7f7; + border: none; + border-radius: 8px 8px 0px 0px; + width: 50%; + text-align: center; + padding-bottom: 4px; } + +.inactiveForm { + border: none; + border-radius: 8px 8px 0px 0px; + width: 50%; + text-align: center; + padding-bottom: 4px; } + +.ex-coins { + font-family: Roboto; + text-transform: uppercase; + text-align: center; + font-size: 33px; + width: 118px; + height: 42px; + padding: 1px; + color: #4d4d4d; } + +.marketinfo { + font-family: Roboto; + color: #aeaeae; + font-size: 15px; + line-height: 17px; } + +#fromCoin::-webkit-calendar-picker-indicator { + display: none; } + +#coinList { + width: 400px; + height: 500px; + overflow: scroll; } + +.icon-control .fa-refresh { + visibility: hidden; } + +.icon-control:hover .fa-refresh { + visibility: visible; } + +.icon-control:hover .fa-chevron-right { + visibility: hidden; } + +.inactive { + color: #aeaeae; } + +.inactive button { + background: #aeaeae; + color: #fff; } + +.qr-ellip-address, .ellip-address { + overflow: hidden; + text-overflow: ellipsis; } + +.qr-header { + font-size: 25px; + margin-top: 40px; } + +.qr-message { + font-size: 12px; + color: #f7861c; } + +div.message-container > div:first-child { + margin-top: 18px; + font-size: 15px; + color: #4d4d4d; } + +.pop-hover:hover { + -webkit-transform: scale(1.1); + transform: scale(1.1); } + +/* stylelint-enable */ +.token-list-item { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + padding: 20px 24px; + cursor: pointer; + -webkit-transition: linear 200ms; + transition: linear 200ms; + background-color: rgba(231, 231, 231, 0); + position: relative; } + .token-list-item__token-balance { + font-size: 130%; } + @media screen and (min-width: 576px) and (max-width: 890px) { + .token-list-item__token-balance { + font-size: 105%; } } + .token-list-item__fiat-amount { + margin-top: .25%; + font-size: 105%; + text-transform: uppercase; } + @media screen and (min-width: 576px) and (max-width: 890px) { + .token-list-item__fiat-amount { + font-size: 95%; } } + @media screen and (min-width: 576px) and (max-width: 890px) { + .token-list-item { + padding: 10% 4%; } } + .token-list-item--active { + background-color: #e7e7e7; } + .token-list-item__identicon { + margin-right: 15px; + border: '1px solid #dedede'; } + @media screen and (min-width: 576px) and (max-width: 890px) { + .token-list-item__identicon { + margin-right: 4%; } } + .token-list-item__ellipsis { + line-height: 45px; } + .token-list-item__balance-wrapper { + -webkit-box-flex: 1; + -ms-flex: 1 1 auto; + flex: 1 1 auto; } + +.token-menu-dropdown { + height: 55px; + width: 191px; + border-radius: 4px; + background-color: rgba(0, 0, 0, 0.82); + -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5); + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5); + position: fixed; + margin-top: 20px; + margin-left: 105px; + z-index: 2000; } + .token-menu-dropdown__close-area { + position: fixed; + top: 0; + left: 0; + z-index: 2100; + width: 100%; + height: 100%; + cursor: default; } + .token-menu-dropdown__container { + padding: 16px 34px 32px; + z-index: 2200; + position: relative; } + .token-menu-dropdown__options { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; } + .token-menu-dropdown__option { + color: #fff; + font-family: Roboto; + font-size: 16px; + line-height: 21px; + text-align: center; } + +.add-token { + width: 498px; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + position: relative; + z-index: 12; + font-family: 'DIN Next Light'; } + .add-token__wrapper { + background-color: #fff; + -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + .add-token__title-container { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + padding: 30px 60px 12px; + border-bottom: 1px solid #efefef; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + .add-token__title { + color: #5d5d5d; + font-size: 20px; + line-height: 26px; + text-align: center; + font-weight: 600; + margin-bottom: 12px; } + .add-token__description { + text-align: center; } + .add-token__description + .add-token__description { + margin-top: 24px; } + .add-token__confirmation-description { + margin: 12px 0; } + .add-token__content-container { + width: 100%; + border-bottom: 1px solid #efefef; } + .add-token__input-container { + padding: 11px 0; + width: 263px; + margin: 0 auto; + position: relative; } + .add-token__search-input-error-message { + position: absolute; + bottom: -10px; + font-size: 12px; + width: 100%; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + color: #f00; } + .add-token__input { + width: 100%; + border: 2px solid #efefef; + border-radius: 4px; + padding: 5px 15px; + font-size: 14px; + line-height: 19px; } + .add-token__input::-webkit-input-placeholder { + color: #cdcdcd; } + .add-token__input:-ms-input-placeholder { + color: #cdcdcd; } + .add-token__input::-ms-input-placeholder { + color: #cdcdcd; } + .add-token__input::placeholder { + color: #cdcdcd; } + .add-token__footers { + width: 100%; } + .add-token__add-custom { + color: #5d5d5d; + font-size: 18px; + line-height: 24px; + text-align: center; + padding: 12px 0; + font-weight: 600; + cursor: pointer; } + .add-token__add-custom:hover { + background-color: rgba(0, 0, 0, 0.05); } + .add-token__add-custom:active { + background-color: rgba(0, 0, 0, 0.1); } + .add-token__add-custom .fa { + position: absolute; + right: 24px; + font-size: 24px; + line-height: 24px; } + .add-token__add-custom-form { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + margin: 8px 0 51px; } + .add-token__add-custom-field { + width: 290px; + margin: 0 auto; + position: relative; } + .add-token__add-custom-field--error .add-token__add-custom-input { + border-color: #f00; } + .add-token__add-custom-error-message { + position: absolute; + bottom: -21px; + font-size: 12px; + width: 100%; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + color: #f00; } + .add-token__add-custom-label { + font-size: 16px; + line-height: 21px; + margin-bottom: 8px; } + .add-token__add-custom-input { + width: 100%; + border: 1px solid #cdcdcd; + padding: 5px 15px; + font-size: 14px; + line-height: 19px; } + .add-token__add-custom-input::-webkit-input-placeholder { + color: #cdcdcd; } + .add-token__add-custom-input:-ms-input-placeholder { + color: #cdcdcd; } + .add-token__add-custom-input::-ms-input-placeholder { + color: #cdcdcd; } + .add-token__add-custom-input::placeholder { + color: #cdcdcd; } + .add-token__add-custom-field + .add-token__add-custom-field { + margin-top: 21px; } + .add-token__buttons { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + margin: 30px 0 51px; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + .add-token__token-icons-container { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row wrap; + flex-flow: row wrap; } + .add-token__token-wrapper { + -webkit-transition: 200ms ease-in-out; + transition: 200ms ease-in-out; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + -webkit-box-flex: 0; + -ms-flex: 0 0 42.5%; + flex: 0 0 42.5%; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + padding: 12px; + margin: 2.5%; + -webkit-box-sizing: border-box; + box-sizing: border-box; + border-radius: 10px; + cursor: pointer; + border: 2px solid transparent; + position: relative; } + .add-token__token-wrapper:hover { + border: 2px solid rgba(122, 201, 253, 0.5); } + .add-token__token-wrapper--selected { + border: 2px solid #7ac9fd !important; } + .add-token__token-wrapper--disabled { + opacity: .4; + pointer-events: none; } + .add-token__token-data { + -ms-flex-item-align: start; + align-self: flex-start; } + .add-token__token-name { + font-size: 14px; + line-height: 19px; } + .add-token__token-symbol { + font-size: 22px; + line-height: 29px; + font-weight: 600; } + .add-token__token-icon { + width: 60px; + height: 60px; + background-repeat: no-repeat; + background-size: contain; + background-position: center; + border-radius: 50%; + background-color: #fff; + -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.24); + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.24); + margin-right: 12px; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + .add-token__token-message { + position: absolute; + color: #02c9b1; + font-size: 11px; + bottom: 0; + left: 85px; } + .add-token__confirmation-token-list { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; } + .add-token__confirmation-token-list .token-balance { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + -webkit-box-align: start; + -ms-flex-align: start; + align-items: flex-start; } + .add-token__confirmation-token-list .token-balance__amount { + color: #5d5d5d; + font-size: 43px; + font-weight: 300; + line-height: 43px; + margin-right: 8px; } + .add-token__confirmation-token-list .token-balance__symbol { + color: #5d5d5d; + font-size: 16px; + line-height: 24px; } + .add-token__confirmation-title { + padding: 30px 120px 12px; } + @media screen and (max-width: 575px) { + .add-token__confirmation-title { + padding: 20px 0; + width: 100%; } } + .add-token__confirmation-content { + padding-bottom: 60px; } + .add-token__confirmation-token-list-item { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + margin: 0 auto; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + .add-token__confirmation-token-list-item + .add-token__confirmation-token-list-item { + margin-top: 30px; } + .add-token__confirmation-token-icon { + margin-right: 18px; } + @media screen and (max-width: 575px) { + .add-token { + top: 0; + width: 100%; + overflow: hidden; + height: 100%; } + .add-token__wrapper { + -webkit-box-shadow: none !important; + box-shadow: none !important; + -webkit-box-flex: 1; + -ms-flex: 1 1 auto; + flex: 1 1 auto; + width: 100%; + overflow-y: auto; } + .add-token__footers { + border-bottom: 1px solid #efefef; } + .add-token__token-icon { + width: 50px; + height: 50px; } + .add-token__token-symbol { + font-size: 18px; + line-height: 24px; } + .add-token__token-name { + font-size: 12px; + line-height: 16px; } + .add-token__buttons { + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + width: 100%; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + padding: 12px 0; + margin: 0; + border-top: 1px solid #efefef; } + .add-token__buttons button { + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; + margin: 0 12px; } } + +.currency-display { + height: 54px; + width: 100%ß; + border: 1px solid #dedede; + border-radius: 4px; + background-color: #fff; + color: #9b9b9b; + font-family: Roboto; + font-size: 16px; + font-weight: 300; + padding: 8px 10px; + position: relative; } + .currency-display__primary-row { + display: -webkit-box; + display: -ms-flexbox; + display: flex; } + .currency-display__input { + color: #5d5d5d; + font-family: Roboto; + font-size: 16px; + line-height: 22px; + border: none; + outline: 0 !important; + max-width: 100%; } + .currency-display__primary-currency { + color: #5d5d5d; + font-weight: 400; + font-family: Roboto; + font-size: 16px; + line-height: 22px; } + .currency-display__converted-row { + display: -webkit-box; + display: -ms-flexbox; + display: flex; } + .currency-display__converted-value, .currency-display__converted-currency { + color: #9b9b9b; + font-family: Roboto; + font-size: 12px; + line-height: 12px; } + .currency-display__input-wrapper { + position: relative; + display: -webkit-box; + display: -ms-flexbox; + display: flex; } + .currency-display__currency-symbol { + margin-top: 1px; } + +.account-menu { + position: fixed; + z-index: 100; + top: 58px; + width: 310px; } + @media screen and (max-width: 575px) { + .account-menu { + right: calc(((100vw - 100%) / 2) + 8px); } } + @media screen and (min-width: 576px) { + .account-menu { + right: calc((100vw - 85vw) / 2); } } + @media screen and (min-width: 769px) { + .account-menu { + right: calc((100vw - 80vw) / 2); } } + @media screen and (min-width: 1281px) { + .account-menu { + right: calc((100vw - 65vw) / 2); } } + .account-menu__icon { + margin-left: 20px; + cursor: pointer; } + .account-menu__header { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; } + .account-menu__logout-button { + border: 1px solid #9b9b9b; + background-color: transparent; + color: #fff; + border-radius: 4px; + font-size: 12px; + line-height: 23px; + padding: 0 24px; + font-weight: 200; } + .account-menu img { + width: 16px; + height: 16px; } + .account-menu__accounts { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + overflow-y: auto; + max-height: 240px; + position: relative; + z-index: 200; } + .account-menu__accounts::-webkit-scrollbar { + display: none; } + @media screen and (max-width: 575px) { + .account-menu__accounts { + max-height: 215px; } } + .account-menu__accounts .keyring-label { + margin-top: 5px; + background-color: #000; + color: #9b9b9b; } + .account-menu__account { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + padding: 16px 14px; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + @media screen and (max-width: 575px) { + .account-menu__account { + padding: 12px 14px; } } + .account-menu__account-info { + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + padding-top: 4px; } + .account-menu__check-mark { + width: 14px; + margin-right: 12px; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + .account-menu__check-mark-icon { + background-image: url("images/check-white.svg"); + height: 18px; + width: 18px; + background-repeat: no-repeat; + background-position: center; + background-size: contain; + margin: 3px 0; } + .account-menu .identicon { + margin: 0 12px 0 0; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + .account-menu__name { + color: #fff; + font-size: 18px; + font-weight: 200; + line-height: 16px; } + .account-menu__balance { + color: #9b9b9b; + font-size: 14px; + line-height: 19px; } + .account-menu__action { + font-size: 16px; + line-height: 18px; + font-weight: 200; + cursor: pointer; } + +.menu { + border-radius: 4px; + background: rgba(0, 0, 0, 0.8); + -webkit-box-shadow: rgba(0, 0, 0, 0.15) 0 2px 2px 2px; + box-shadow: rgba(0, 0, 0, 0.15) 0 2px 2px 2px; + min-width: 150px; + color: #fff; } + .menu__item { + padding: 18px; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + position: relative; + z-index: 200; + font-weight: 200; } + @media screen and (max-width: 575px) { + .menu__item { + padding: 14px; } } + .menu__item--clickable { + cursor: pointer; } + .menu__item--clickable:hover { + background-color: rgba(255, 255, 255, 0.05); } + .menu__item--clickable:active { + background-color: rgba(255, 255, 255, 0.1); } + .menu__item__icon { + height: 16px; + width: 16px; + margin-right: 14px; } + .menu__item__text { + font-size: 16px; + line-height: 21px; } + .menu__divider { + background-color: #5d5d5d; + width: 100%; + height: 1px; } + .menu__close-area { + position: fixed; + width: 100%; + height: 100%; + top: 0; + left: 0; + z-index: 100; } + +.gas-slider { + position: relative; + width: 313px; } + .gas-slider__input { + width: 317px; + margin-left: -2px; + z-index: 2; } + .gas-slider input[type=range] { + -webkit-appearance: none !important; } + .gas-slider input[type=range]::-webkit-slider-thumb { + -webkit-appearance: none !important; + height: 26px; + width: 26px; + border: 2px solid #B8B8B8; + background-color: #FFFFFF; + -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); + border-radius: 50%; + position: relative; + z-index: 10; } + .gas-slider__bar { + height: 6px; + width: 313px; + background: #dedede; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + position: absolute; + top: 11px; + z-index: 0; } + .gas-slider__low, .gas-slider__high { + height: 6px; + width: 49px; + z-index: 1; } + .gas-slider__low { + background-color: #e91550; } + .gas-slider__high { + background-color: #02c9b1; } + +.settings { + position: relative; + background: #fff; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + height: auto; + overflow: auto; } + +.settings__header { + padding: 25px; } + +.settings__close-button::after { + content: '\00D7'; + font-size: 40px; + color: #9b9b9b; + position: absolute; + top: 25px; + right: 30px; + cursor: pointer; } + +.settings__error { + padding-bottom: 20px; + text-align: center; + color: #e91550; } + +.settings__content { + padding: 0 25px; } + +.settings__content-row { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + padding: 10px 0 20px; } + @media screen and (max-width: 575px) { + .settings__content-row { + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + padding: 10px 0; } } + +.settings__content-item { + -webkit-box-flex: 1; + -ms-flex: 1; + flex: 1; + min-width: 0; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + padding: 0 5px; + height: 71px; } + @media screen and (max-width: 575px) { + .settings__content-item { + height: initial; + padding: 5px 0; } } + .settings__content-item--without-height { + height: initial; } + +.settings__content-item-col { + max-width: 300px; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; } + @media screen and (max-width: 575px) { + .settings__content-item-col { + max-width: 100%; + width: 100%; } } + +.settings__content-description { + font-size: 14px; + color: #9b9b9b; + padding-top: 5px; } + +.settings__input { + padding-left: 10px; + font-size: 14px; + height: 40px; + border: 1px solid #dedede; } + +.settings__input::-webkit-input-placeholder { + font-weight: 100; + color: #9b9b9b; } + +.settings__input::-moz-placeholder { + font-weight: 100; + color: #9b9b9b; } + +.settings__input:-ms-input-placeholder { + font-weight: 100; + color: #9b9b9b; } + +.settings__input:-moz-placeholder { + font-weight: 100; + color: #9b9b9b; } + +.settings__provider-wrapper { + font-size: 16px; + border: 1px solid #dedede; + border-radius: 2px; + padding: 15px; + background-color: #fff; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; } + +.settings__provider-icon { + height: 10px; + width: 10px; + margin-right: 10px; + border-radius: 10px; } + +.settings__rpc-save-button { + -ms-flex-item-align: end; + align-self: flex-end; + padding: 5px; + text-transform: uppercase; + color: #9b9b9b; + cursor: pointer; } + +.settings__clear-button { + font-size: 16px; + border: 1px solid #2f9ae0; + color: #2f9ae0; + border-radius: 2px; + padding: 18px; + background-color: #fff; + text-transform: uppercase; } + +.settings__clear-button--red { + border: 1px solid #d0021b; + color: #d0021b; } + +.settings__info-logo-wrapper { + height: 80px; + margin-bottom: 20px; } + +.settings__info-logo { + max-height: 100%; + max-width: 100%; } + +.settings__info-item { + padding: 10px 0; } + +.settings__info-link-header { + padding-bottom: 15px; } + @media screen and (max-width: 575px) { + .settings__info-link-header { + padding-bottom: 5px; } } + +.settings__info-link-item { + padding: 15px 0; } + @media screen and (max-width: 575px) { + .settings__info-link-item { + padding: 5px 0; } } + +.settings__info-version-number { + padding-top: 5px; + font-size: 13px; + color: #9b9b9b; } + +.settings__info-about { + color: #9b9b9b; + margin-bottom: 15px; } + +.settings__info-link { + color: #2f9ae0; } + +.settings__info-separator { + margin: 15px 0; + width: 80px; + border-color: #dedede; + border: none; + height: 1px; + background-color: #dedede; + color: #dedede; } + +.tab-bar { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + -webkit-box-align: end; + -ms-flex-align: end; + align-items: flex-end; } + +.tab-bar__tab { + min-width: 0; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; + padding: 15px 25px; + border-bottom: 1px solid #dedede; + -webkit-box-sizing: border-box; + box-sizing: border-box; + font-size: 18px; } + +.tab-bar__tab--active { + border-color: #000; } + +.tab-bar__grow-tab { + -webkit-box-flex: 1; + -ms-flex-positive: 1; + flex-grow: 1; } + +.simple-dropdown { + height: 56px; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + border: 1px solid #dedede; + border-radius: 4px; + background-color: #fff; + font-size: 16px; + color: #4d4d4d; + cursor: pointer; + position: relative; } + +.simple-dropdown__caret { + color: #cdcdcd; + padding: 0 10px; } + +.simple-dropdown__selected { + -webkit-box-flex: 1; + -ms-flex-positive: 1; + flex-grow: 1; + padding: 0 15px; } + +.simple-dropdown__options { + z-index: 1050; + position: absolute; + height: 220px; + width: 100%; + border: 1px solid #d2d8dd; + border-radius: 4px; + background-color: #fff; + -webkit-box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.11); + box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.11); + margin-top: 10px; + overflow-y: scroll; + left: 0; + top: 100%; } + +.simple-dropdown__option { + padding: 10px; } + .simple-dropdown__option:hover { + background-color: #efefef; } + +.simple-dropdown__option--selected { + background-color: #dedede; } + .simple-dropdown__option--selected:hover { + background-color: #dedede; + cursor: default; } + +.simple-dropdown__close-area { + position: fixed; + top: 0; + left: 0; + z-index: 1000; + width: 100%; + height: 100%; } + +.request-signature__container { + width: 380px; + border-radius: 8px; + background-color: #fff; + -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column nowrap; + flex-flow: column nowrap; + z-index: 25; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + font-family: Roboto; + position: relative; + height: 100%; } + @media screen and (max-width: 575px) { + .request-signature__container { + width: 100%; + top: 0; + -webkit-box-shadow: none; + box-shadow: none; } } + @media screen and (min-width: 576px) { + .request-signature__container { + max-height: 620px; } } + +.request-signature__header { + height: 64px; + width: 100%; + position: relative; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column; + flex-flow: column; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; } + +.request-signature__header-background { + position: absolute; + background-color: #e9edf0; + z-index: 2; + width: 100%; + height: 100%; } + +.request-signature__header__text { + height: 29px; + width: 179px; + color: #5B5D67; + font-family: Roboto; + font-size: 22px; + font-weight: 300; + line-height: 29px; + z-index: 3; } + +.request-signature__header__tip-container { + width: 100%; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; } + +.request-signature__header__tip { + height: 25px; + width: 25px; + background: #e9edf0; + -webkit-transform: rotate(45deg); + transform: rotate(45deg); + position: absolute; + bottom: -8px; + z-index: 1; } + +.request-signature__account-info { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + margin-top: 18px; + margin-bottom: 20px; } + +.request-signature__account { + color: #9b9b9b; + margin-left: 17px; } + +.request-signature__account-text { + font-size: 14px; } + +.request-signature__balance { + color: #9b9b9b; + margin-right: 17px; + width: 124px; } + +.request-signature__balance-text { + text-align: right; + font-size: 14px; } + +.request-signature__balance-value { + text-align: right; + margin-top: 2.5px; } + +.request-signature__request-icon { + margin-top: 25px; } + +.request-signature__body { + width: 100%; + height: 100%; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column; + flex-flow: column; + -webkit-box-flex: 1; + -ms-flex: 1 1 auto; + flex: 1 1 auto; + height: 0; } + +.request-signature__request-info { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; } + +.request-signature__headline { + height: 48px; + width: 240px; + color: #4d4d4d; + font-family: Roboto; + font-size: 18px; + font-weight: 300; + line-height: 24px; + text-align: center; + margin-top: 20px; } + +.request-signature__notice, .request-signature__warning { + font-family: "Avenir Next"; + font-size: 14px; + line-height: 19px; + text-align: center; + margin-top: 41px; + margin-bottom: 11px; + width: 100%; } + +.request-signature__notice { + color: #9b9b9b; } + +.request-signature__warning { + color: #e91550; } + +.request-signature__rows { + height: 100%; + overflow-y: scroll; + overflow-x: hidden; + border-top: 1px solid #d2d8dd; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column; + flex-flow: column; } + +.request-signature__row { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-flow: column; + flex-flow: column; } + +.request-signature__row-title { + width: 80px; + color: #9b9b9b; + font-family: Roboto; + font-size: 16px; + line-height: 22px; + margin-top: 12px; + margin-left: 18px; + width: 100%; } + +.request-signature__row-value { + color: #5d5d5d; + font-family: Roboto; + font-size: 14px; + line-height: 19px; + width: 100%; + overflow-wrap: break-word; + border-bottom: 1px solid #d2d8dd; + padding: 6px 18px 15px; } + +.request-signature__footer { + width: 100%; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: space-evenly; + -ms-flex-pack: space-evenly; + justify-content: space-evenly; + font-size: 22px; + position: relative; + -webkit-box-flex: 0; + -ms-flex: 0 0 auto; + flex: 0 0 auto; + border-top: 1px solid #d2d8dd; } + .request-signature__footer__cancel-button, .request-signature__footer__sign-button { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; + font-family: Roboto; + font-size: 16px; + font-weight: 300; + height: 55px; + line-height: 32px; + cursor: pointer; + border-radius: 2px; + -webkit-box-shadow: none; + box-shadow: none; + max-width: 162px; + margin: 12px; } + .request-signature__footer__cancel-button { + background: none; + border: 1px solid #9b9b9b; + margin-right: 6px; } + .request-signature__footer__sign-button { + background-color: #02c9b1; + border-width: 0; + color: #fff; + margin-left: 6px; } + +.account-dropdown-mini { + height: 22px; + background-color: #fff; + font-family: Roboto; + line-height: 16px; + font-size: 12px; + width: 124px; } + .account-dropdown-mini__close-area { + position: fixed; + top: 0; + left: 0; + z-index: 1000; + width: 100%; + height: 100%; } + .account-dropdown-mini__list { + z-index: 1050; + position: absolute; + height: 180px; + width: 96pxpx; + border: 1px solid #d2d8dd; + border-radius: 4px; + background-color: #fff; + -webkit-box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.11); + box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.11); + overflow-y: scroll; } + .account-dropdown-mini .account-list-item { + margin-top: 6px; } + .account-dropdown-mini .account-list-item__account-name { + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + width: 80px; } + .account-dropdown-mini .account-list-item__top-row { + margin: 0; } + .account-dropdown-mini .account-list-item__icon { + position: initial; } + +.editable-label { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + position: relative; } + .editable-label__value { + max-width: 250px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } + .editable-label__input { + width: 250px; + font-size: 14px; + text-align: center; + border: 1px solid #dedede; } + .editable-label__input--error { + border: 1px solid #d0021b; } + .editable-label__icon-wrapper { + position: absolute; + margin-left: 10px; + left: 100%; } + .editable-label__icon { + cursor: pointer; + color: #9b9b9b; } + +/* + Trumps + */ +/* universal */ +.app-primary .main-enter { + position: absolute; + width: 100%; } + +/* center position */ +.app-primary.from-right .main-enter-active, +.app-primary.from-left .main-enter-active { + overflow-x: hidden; + -webkit-transform: translateX(0); + transform: translateX(0); + -webkit-transition: -webkit-transform 300ms ease-in; + transition: -webkit-transform 300ms ease-in; + transition: transform 300ms ease-in; + transition: transform 300ms ease-in, -webkit-transform 300ms ease-in; } + +/* exited positions */ +.app-primary.from-left .main-leave-active { + -webkit-transform: translateX(360px); + transform: translateX(360px); + -webkit-transition: -webkit-transform 300ms ease-in; + transition: -webkit-transform 300ms ease-in; + transition: transform 300ms ease-in; + transition: transform 300ms ease-in, -webkit-transform 300ms ease-in; } + +.app-primary.from-right .main-leave-active { + -webkit-transform: translateX(-360px); + transform: translateX(-360px); + -webkit-transition: -webkit-transform 300ms ease-in; + transition: -webkit-transform 300ms ease-in; + transition: transform 300ms ease-in; + transition: transform 300ms ease-in, -webkit-transform 300ms ease-in; } + +.sidebar.from-left { + -webkit-transform: translateX(-320px); + transform: translateX(-320px); + -webkit-transition: -webkit-transform 300ms ease-in; + transition: -webkit-transform 300ms ease-in; + transition: transform 300ms ease-in; + transition: transform 300ms ease-in, -webkit-transform 300ms ease-in; } + +/* loader transitions */ +.loader-enter, +.loader-leave-active { + opacity: 0; + -webkit-transition: opacity 150 ease-in; + transition: opacity 150 ease-in; } + +.loader-enter-active, +.loader-leave { + opacity: 1; + -webkit-transition: opacity 150 ease-in; + transition: opacity 150 ease-in; } + +/* entering positions */ +.app-primary.from-right .main-enter:not(.main-enter-active) { + -webkit-transform: translateX(360px); + transform: translateX(360px); } + +.app-primary.from-left .main-enter:not(.main-enter-active) { + -webkit-transform: translateX(-360px); + transform: translateX(-360px); } + +i.fa.fa-question-circle.fa-lg.menu-icon { + font-size: 18px; } + +/* stylelint-disable */ +#buy-modal-content-footer-text { + font-family: 'DIN OT'; + font-size: 16px; } + +/* stylelint-enable */ + +/*# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"file":"index.css","sources":["index.scss","itcss/settings/index.scss","itcss/settings/variables.scss","itcss/settings/typography.scss","itcss/tools/index.scss","itcss/tools/utilities.scss","itcss/generic/index.scss","itcss/generic/reset.scss","itcss/base/index.scss","itcss/objects/index.scss","itcss/components/index.scss","itcss/components/buttons.scss","itcss/components/header.scss","itcss/components/footer.scss","itcss/components/network.scss","itcss/components/modal.scss","itcss/components/newui-sections.scss","itcss/components/account-dropdown.scss","itcss/components/send.scss","itcss/components/confirm.scss","itcss/components/loading-overlay.scss","itcss/components/hero-balance.scss","itcss/components/wallet-balance.scss","itcss/components/transaction-list.scss","itcss/components/sections.scss","itcss/components/token-list.scss","itcss/components/add-token.scss","itcss/components/currency-display.scss","itcss/components/account-menu.scss","itcss/components/menu.scss","itcss/components/gas-slider.scss","itcss/components/settings.scss","itcss/components/tab-bar.scss","itcss/components/simple-dropdown.scss","itcss/components/request-signature.scss","itcss/components/account-dropdown-mini.scss","itcss/components/editable-label.scss","itcss/trumps/index.scss"],"sourcesContent":["/*\n  ITCSS\n\n  http://www.creativebloq.com/web-design/manage-large-css-projects-itcss-101517528\n  https://www.xfive.co/blog/itcss-scalable-maintainable-css-architecture/\n */\n@import './itcss/settings/index.scss';\n@import './itcss/tools/index.scss';\n@import './itcss/generic/index.scss';\n@import './itcss/base/index.scss';\n@import './itcss/objects/index.scss';\n@import './itcss/components/index.scss';\n@import './itcss/trumps/index.scss';\n","@import './variables.scss';\n\n@import './typography.scss';\n","/*\n  Variables\n */\n\n// Base Colors\n$white: #fff;\n$black: #000;\n$orange: #ffa500;\n$red: #f00;\n$gray: #808080;\n\n/*\n  Colors\n  http://chir.ag/projects/name-that-color\n */\n$white-linen: #faf6f0; // formerly 'faint orange (textfield shades)'\n$rajah: #f5c26d; // formerly 'light orange (button shades)'\n$buttercup: #f5a623; // formerly 'dark orange (text)'\n$tundora: #4a4a4a; // formerly 'borders/font/any gray'\n$gallery: #efefef;\n$alabaster: #f7f7f7;\n$shark: #22232c;\n$wild-sand: #f6f6f6;\n$white: #fff;\n$dusty-gray: #9b9b9b;\n$alto: #dedede;\n$alabaster: #fafafa;\n$silver-chalice: #aeaeae;\n$curious-blue: #2f9ae0;\n$concrete: #f3f3f3;\n$tundora: #4d4d4d;\n$nile-blue: #1b344d;\n$scorpion: #5d5d5d;\n$silver: #cdcdcd;\n$caribbean-green: #02c9b1;\n$monzo: #d0021b;\n$crimson: #e91550;\n$blue-lagoon: #038789;\n$purple: #690496;\n$tulip-tree: #ebb33f;\n$malibu-blue: #7ac9fd;\n$athens-grey: #e9edf0;\n$jaffa: #f28930;\n$geyser: #d2d8dd;\n\n/*\n  Z-Indicies\n */\n$dropdown-z-index: 30;\n$token-icon-z-index: 15;\n$container-z-index: 15;\n$header-z-index: 12;\n$mobile-header-z-index: 26;\n$main-container-z-index: 18;\n$send-card-z-index: 20;\n$sidebar-z-index: 26;\n$sidebar-overlay-z-index: 25;\n\n/*\n  Z Indicies - Current\n  app - 11\n  hex/bn as decimal input - 1 - remove?\n  dropdown - 11\n  loading - 10 - higher?\n  mascot - 0 - remove?\n */\n\n/*\n  Responsive Breakpoints\n */\n$break-small: 575px;\n$break-midpoint: 780px;\n$break-large: 576px;\n\n\n$primary-font-type: Roboto;\n\n","@import url('https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900');\n\n@import url('https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css');\n\n@font-face {\n  font-family: 'Montserrat Regular';\n  src: url('/fonts/Montserrat/Montserrat-Regular.woff') format('woff');\n  src: url('/fonts/Montserrat/Montserrat-Regular.ttf') format('truetype');\n  font-weight: 400;\n  font-style: normal;\n  font-size: 'small';\n}\n\n@font-face {\n  font-family: 'Montserrat Bold';\n  src: url('/fonts/Montserrat/Montserrat-Bold.woff') format('woff');\n  src: url('/fonts/Montserrat/Montserrat-Bold.ttf') format('truetype');\n  font-weight: 400;\n  font-style: normal;\n}\n\n@font-face {\n  font-family: 'Montserrat Light';\n  src: url('/fonts/Montserrat/Montserrat-Light.woff') format('woff');\n  src: url('/fonts/Montserrat/Montserrat-Light.ttf') format('truetype');\n  font-weight: 400;\n  font-style: normal;\n}\n\n@font-face {\n  font-family: 'Montserrat UltraLight';\n  src: url('/fonts/Montserrat/Montserrat-UltraLight.woff') format('woff');\n  src: url('/fonts/Montserrat/Montserrat-UltraLight.ttf') format('truetype');\n  font-weight: 400;\n  font-style: normal;\n}\n\n@font-face {\n  font-family: 'DIN OT';\n  src: url('/fonts/DIN_OT/DINOT-2.otf') format('opentype');\n  font-weight: 400;\n  font-style: normal;\n}\n\n@font-face {\n  font-family: 'DIN OT Light';\n  src: url('/fonts/DIN_OT/DINOT-2.otf') format('opentype');\n  font-weight: 200;\n  font-style: normal;\n}\n\n@font-face {\n  font-family: 'DIN NEXT';\n  src: url('/fonts/DIN NEXT/DIN NEXT W01 Regular.otf') format('opentype');\n  font-weight: 400;\n  font-style: normal;\n}\n\n@font-face {\n  font-family: 'DIN NEXT Light';\n  src: url('/fonts/DIN NEXT/DIN NEXT W10 Light.otf') format('opentype');\n  font-weight: 400;\n  font-style: normal;\n}\n\n@font-face {\n  font-family: 'Lato';\n  src: url('/fonts/Lato/Lato-Regular.ttf') format('truetype');\n  font-weight: 400;\n  font-style: normal;\n}\n","@import './utilities.scss';\n","/*\n  Utility Classes\n */\n\n/* color */\n\n.color-orange {\n  color: #f7861c; // TODO: move to settings/variables\n}\n\n.color-forest {\n  color: #0a5448; // TODO: move to settings/variables\n}\n\n/* lib */\n\n.full-size {\n  height: 100%;\n  width: 100%;\n}\n\n.full-width {\n  width: 100%;\n}\n\n.full-flex-height {\n  display: flex;\n  flex: 1 1 auto;\n  flex-direction: column;\n}\n\n.full-height {\n  height: 100%;\n}\n\n.flex-column {\n  display: flex;\n  flex-direction: column;\n}\n\n.space-between {\n  justify-content: space-between;\n}\n\n.space-around {\n  justify-content: space-around;\n}\n\n.flex-column-bottom {\n  display: flex;\n  flex-direction: column-reverse;\n}\n\n.flex-row {\n  display: flex;\n  flex-direction: row;\n}\n\n.flex-space-between {\n  justify-content: space-between;\n}\n\n.flex-space-around {\n  justify-content: space-around;\n}\n\n.flex-right {\n  display: flex;\n  flex-direction: row;\n  justify-content: flex-end;\n}\n\n.flex-left {\n  display: flex;\n  flex-direction: row;\n  justify-content: flex-start;\n}\n\n.flex-fixed {\n  flex: none;\n}\n\n.flex-basis-auto {\n  flex-basis: auto;\n}\n\n.flex-grow {\n  flex: 1 1 auto;\n}\n\n.flex-wrap {\n  flex-wrap: wrap;\n}\n\n.flex-center {\n  display: flex;\n  justify-content: center;\n  align-items: center;\n}\n\n.flex-justify-center {\n  justify-content: center;\n}\n\n.flex-align-center {\n  align-items: center;\n}\n\n.flex-self-end {\n  align-self: flex-end;\n}\n\n.flex-self-stretch {\n  align-self: stretch;\n}\n\n.flex-vertical {\n  flex-direction: column;\n}\n\n.z-bump {\n  z-index: 1;\n}\n\n.select-none {\n  cursor: inherit;\n  -moz-user-select: none;\n  -webkit-user-select: none;\n  -ms-user-select: none;\n  user-select: none;\n}\n\n.pointer {\n  cursor: pointer;\n}\n\n.cursor-pointer {\n  cursor: pointer;\n  transform-origin: center center;\n  transition: transform 50ms ease-in-out;\n}\n\n.cursor-pointer:hover {\n  transform: scale(1.1);\n}\n\n.cursor-pointer:active {\n  transform: scale(.95);\n}\n\n.cursor-disabled {\n  cursor: not-allowed;\n}\n\n.margin-bottom-sml {\n  margin-bottom: 20px;\n}\n\n.margin-bottom-med {\n  margin-bottom: 40px;\n}\n\n.margin-right-left {\n  margin: 0 20px;\n}\n\n.bold {\n  font-weight: 700;\n}\n\n.text-transform-uppercase {\n  text-transform: uppercase;\n}\n\n.font-small {\n  font-size: 12px;\n}\n\n.font-medium {\n  font-size: 1.2em;\n}\n\nhr.horizontal-line {\n  display: block;\n  height: 1px;\n  border: 0;\n  border-top: 1px solid #ccc;\n  margin: 1em 0;\n  padding: 0;\n}\n\n.hover-white:hover {\n  background: $white;\n}\n\n.red-dot {\n  background: #e91550;\n  color: $white;\n  border-radius: 10px;\n}\n\n.diamond {\n  transform: rotate(45deg);\n  background: #038789;\n}\n\n.hollow-diamond {\n  transform: rotate(45deg);\n  border: 3px solid #690496;\n}\n\n.golden-square {\n  background: #ebb33f;\n}\n\n.pending-dot {\n  background: $red;\n  left: 14px;\n  top: 14px;\n  color: $white;\n  border-radius: 10px;\n  height: 20px;\n  min-width: 20px;\n  position: relative;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  padding: 4px;\n  z-index: 1;\n}\n\n.keyring-label {\n  z-index: 1;\n  font-size: 8px;\n  line-height: 8px;\n  background: rgba(255, 255, 255, 0.4);\n  color: #fff;\n  border-radius: 10px;\n  padding: 4px;\n  text-align: center;\n  height: 15px;\n}\n\n.ether-balance {\n  display: flex;\n  align-items: center;\n}\n\n.tabSection {\n  min-width: 350px;\n}\n\n.menu-icon {\n  display: inline-block;\n  height: 12px;\n  min-width: 12px;\n  margin: 13px;\n}\n\n.ether-icon {\n  background: rgb(0, 163, 68);\n  border-radius: 20px;\n}\n\n.testnet-icon {\n  background: #2465e1;\n}\n\n.drop-menu-item {\n  display: flex;\n  align-items: center;\n}\n\n.invisible {\n  visibility: hidden;\n}\n\n.one-line-concat {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n\n.critical-error {\n  text-align: center;\n  margin-top: 20px;\n  color: $red;\n}\n\n/*\n  Misc\n */\n\n// TODO: move into component-level contextual 'active' state\n.letter-spacey {\n  letter-spacing: .1em;\n}\n\n.active {\n  color: #909090;\n}\n\n.check {\n  margin-left: 7px;\n  color: #f7861c;\n  flex: 1 0 auto;\n  display: flex;\n  justify-content: flex-end;\n}\n","/*\n  Generic\n */\n\n@import './reset.scss';\n\n* {\n  box-sizing: border-box;\n}\n\nhtml,\nbody {\n  font-family: Roboto, Arial;\n  color: #4d4d4d;\n  font-weight: 300;\n  line-height: 1.4em;\n  background: #f7f7f7;\n  width: 100%;\n  height: 100%;\n  margin: 0;\n  padding: 0;\n}\n\nhtml {\n  min-height: 500px;\n}\n\n.app-root {\n  overflow: hidden;\n  position: relative;\n}\n\n.app-primary {\n  display: flex;\n}\n\ninput:focus,\ntextarea:focus {\n  outline: none;\n}\n\n/* stylelint-disable */\n#app-content {\n  overflow-x: hidden;\n  height: 100%;\n  display: flex;\n  flex-direction: column;\n\n  @media screen and (max-width: $break-small) {\n    background-color: $white;\n  }\n}\n/* stylelint-enable */\n\na {\n  text-decoration: none;\n  color: inherit;\n}\n\na:hover {\n  color: #df6b0e;\n}\n\ninput.large-input,\ntextarea.large-input {\n  padding: 8px;\n}\n\ninput.large-input {\n  height: 36px;\n}\n","/* http://meyerweb.com/eric/tools/css/reset/\n   v2.0 | 20110126\n   License: none (public domain)\n*/\n\nhtml,\nbody,\ndiv,\nspan,\napplet,\nobject,\niframe,\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\np,\nblockquote,\npre,\na,\nabbr,\nacronym,\naddress,\nbig,\ncite,\ncode,\ndel,\ndfn,\nem,\nimg,\nins,\nkbd,\nq,\ns,\nsamp,\nsmall,\nstrike,\nstrong,\nsub,\nsup,\ntt,\nvar,\nb,\nu,\ni,\ncenter,\ndl,\ndt,\ndd,\nol,\nul,\nli,\nfieldset,\nform,\nlabel,\nlegend,\ntable,\ncaption,\ntbody,\ntfoot,\nthead,\ntr,\nth,\ntd,\narticle,\naside,\ncanvas,\ndetails,\nembed,\nfigure,\nfigcaption,\nfooter,\nheader,\nhgroup,\nmenu,\nnav,\noutput,\nruby,\nsection,\nsummary,\ntime,\nmark,\naudio,\nvideo {\n  margin: 0;\n  padding: 0;\n  border: 0;\n  font-size: 100%;\n  /* stylelint-disable */\n  font: inherit;\n  /* stylelint-enable */\n  vertical-align: baseline;\n}\n\n/* HTML5 display-role reset for older browsers */\n\n/* stylelint-disable */\n\narticle,\naside,\ndetails,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmenu,\nnav,\nsection {\n  display: block;\n}\n\nbody {\n  line-height: 1;\n}\n\nol,\nul {\n  list-style: none;\n}\n\nblockquote,\nq {\n  quotes: none;\n}\n\nblockquote:before,\nblockquote:after,\nq:before,\nq:after {\n  content: '';\n  content: none;\n}\n\ntable {\n  border-collapse: collapse;\n  border-spacing: 0;\n}\n\nbutton {\n  border-style: none;\n  cursor: pointer;\n}\n\n/* stylelint-enable */\n","// Base\n","// Objects\n","@import './buttons.scss';\n\n@import './header.scss';\n\n@import './footer.scss';\n\n@import './network.scss';\n\n@import './modal.scss';\n\n@import './newui-sections.scss';\n\n@import './account-dropdown.scss';\n\n@import './send.scss';\n\n@import './confirm.scss';\n\n@import './loading-overlay.scss';\n\n// Balances\n@import './hero-balance.scss';\n\n@import './wallet-balance.scss';\n\n// Tx List and Sections\n@import './transaction-list.scss';\n\n@import './sections.scss';\n\n@import './token-list.scss';\n\n@import './add-token.scss';\n\n@import './currency-display.scss';\n\n@import './account-menu.scss';\n\n@import './menu.scss';\n\n@import './gas-slider.scss';\n\n@import './settings.scss';\n\n@import './tab-bar.scss';\n\n@import './simple-dropdown.scss';\n\n@import './request-signature.scss';\n\n@import './account-dropdown-mini.scss';\n\n@import './editable-label.scss';\n","/*\n  Buttons\n */\n\n.btn-green {\n  background-color: #02c9b1; // TODO: reusable color in colors.css\n}\n\nbutton.btn-clear {\n  background: $white;\n  border: 1px solid;\n}\n\n// No longer used in flat design, remove when modal buttons done\n// div.wallet-btn {\n//   border: 1px solid rgb(91, 93, 103);\n//   border-radius: 2px;\n//   height: 30px;\n//   width: 75px;\n//   font-size: 0.8em;\n//   text-align: center;\n//   line-height: 25px;\n// }\n\n// .btn-red {\n//   background: rgba(254, 35, 17, 1);\n//   box-shadow: 0px 3px 6px rgba(254, 35, 17, 0.36);\n// }\n\nbutton[disabled],\ninput[type=\"submit\"][disabled] {\n  cursor: not-allowed;\n  opacity: .5;\n  // background: rgba(197, 197, 197, 1);\n  // box-shadow: 0 3px 6px rgba(197, 197, 197, .36);\n}\n\n// button.spaced {\n//   margin: 2px;\n// }\n\n// button:not([disabled]):hover, input[type=\"submit\"]:not([disabled]):hover {\n//   transform: scale(1.1);\n// }\n// button:not([disabled]):active, input[type=\"submit\"]:not([disabled]):active {\n//   transform: scale(0.95);\n// }\n\nbutton.primary {\n  padding: 8px 12px;\n  background: #f7861c;\n  box-shadow: 0 3px 6px rgba(247, 134, 28, .36);\n  color: $white;\n  font-size: 1.1em;\n  font-family: Roboto;\n  text-transform: uppercase;\n}\n\n.btn-light {\n  padding: 8px 12px;\n  // background: #FFFFFF; // $bg-white\n  box-shadow: 0 3px 6px rgba(247, 134, 28, .36);\n  color: #585d67; // TODO: make reusable light button color\n  font-size: 1.1em;\n  font-family: Roboto;\n  text-transform: uppercase;\n  text-align: center;\n  line-height: 20px;\n  border-radius: 2px;\n  border: 1px solid #979797; // #TODO: make reusable light border color\n  opacity: .5;\n}\n\n// TODO: cleanup: not used anywhere\nbutton.btn-thin {\n  border: 1px solid;\n  border-color: #4d4d4d;\n  color: #4d4d4d;\n  background: rgb(255, 174, 41);\n  border-radius: 4px;\n  min-width: 200px;\n  margin: 12px 0;\n  padding: 6px;\n  font-size: 13px;\n}\n\n.btn-secondary {\n  border: 1px solid #979797;\n  border-radius: 2px;\n  background-color: $white;\n  font-size: 16px;\n  line-height: 24px;\n  padding: 16px 42px;\n\n  &[disabled] {\n    background-color: $white !important;\n    opacity: .5;\n  }\n}\n\n.btn-tertiary {\n  border: 1px solid transparent;\n  border-radius: 2px;\n  background-color: transparent;\n  font-size: 16px;\n  line-height: 24px;\n  padding: 16px 42px;\n}\n",".app-header {\n  align-items: center;\n  visibility: visible;\n  background: $gallery;\n  position: relative;\n  z-index: $header-z-index;\n  display: flex;\n  flex-flow: column nowrap;\n\n  @media screen and (max-width: 575px) {\n    padding: 12px;\n    width: 100%;\n    box-shadow: 0 0 0 1px rgba(0, 0, 0, .08);\n    z-index: $mobile-header-z-index;\n  }\n\n  @media screen and (min-width: 576px) {\n    height: 75px;\n    justify-content: center;\n\n    &::after {\n      content: '';\n      position: absolute;\n      width: 100%;\n      height: 32px;\n      background: $gallery;\n      bottom: -32px;\n    }\n  }\n\n  .metafox-icon {\n    cursor: pointer;\n  }\n}\n\n.app-header-contents {\n  display: flex;\n  justify-content: space-between;\n  flex-flow: row nowrap;\n  width: 100%;\n  height: 6.9vh;\n\n  @media screen and (max-width: 575px) {\n    height: 100%;\n  }\n\n  @media screen and (min-width: 576px) {\n    width: 85vw;\n  }\n\n  @media screen and (min-width: 769px) {\n    width: 80vw;\n  }\n\n  @media screen and (min-width: 1281px) {\n    width: 65vw;\n  }\n}\n\n.app-header h1 {\n  font-family: Roboto;\n  text-transform: uppercase;\n  font-weight: 400;\n  color: #22232c; // $shark\n  line-height: 29px;\n\n  @media screen and (max-width: 575px) {\n    display: none;\n  }\n}\n\nh2.page-subtitle {\n  text-transform: uppercase;\n  color: #aeaeae;\n  font-size: 1em;\n  margin: 12px;\n}\n\n.network-component-wrapper {\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n}\n\n.left-menu-wrapper {\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  cursor: pointer;\n}\n\n.header__right-actions {\n  display: flex;\n  flex-flow: row nowrap;\n  align-items: center;\n\n  .identicon {\n    cursor: pointer;\n  }\n}\n",".app-footer {\n  padding-bottom: 10px;\n  align-items: center;\n}\n",".network-component--disabled {\n  // border-color: transparent !important;\n  cursor: default;\n\n  .fa-caret-down {\n    opacity: 0;\n  }\n}\n\n.network-component.pointer {\n  border: 1px solid $shark;\n  border-radius: 82px;\n  padding: 6px;\n  flex: 0 0 auto;\n\n  &.ethereum-network {\n    border-color: rgb(3, 135, 137);\n\n    .menu-icon-circle div {\n      background-color: rgba(3, 135, 137, .7) !important;\n    }\n  }\n\n  &.ropsten-test-network {\n    border-color: rgb(233, 21, 80);\n\n    .menu-icon-circle div {\n      background-color: rgba(233, 21, 80, .7) !important;\n    }\n  }\n\n  &.kovan-test-network {\n    border-color: rgb(105, 4, 150);\n\n    .menu-icon-circle div {\n      background-color: rgba(105, 4, 150, .7) !important;\n    }\n  }\n\n  &.rinkeby-test-network {\n    border-color: rgb(235, 179, 63);\n\n    .menu-icon-circle div {\n      background-color: rgba(235, 179, 63, .7) !important;\n    }\n  }\n}\n\n.dropdown-menu-item {\n  .menu-icon-circle,\n  .menu-icon-circle--active {\n    margin: 0 14px;\n  }\n}\n\n.network-indicator {\n  display: flex;\n  align-items: center;\n  font-size: .6em;\n\n  .fa-caret-down {\n    line-height: 15px;\n    font-size: 12px;\n    padding: 0 4px;\n  }\n}\n\n.network-name {\n  line-height: 15px;\n  padding: 0 4px;\n  font-family: Roboto;\n  font-size: 12px;\n  flex: 1 0 auto;\n}\n\n.network-droppo {\n  right: 2px;\n\n  @media screen and (min-width: 576px) {\n    right: calc(((100% - 85vw) / 2) + 2px);\n  }\n\n  @media screen and (min-width: 769px) {\n    right: calc(((100% - 80vw) / 2) + 2px);\n  }\n\n  @media screen and (min-width: 1281px) {\n    right: calc(((100% - 65vw) / 2) + 2px);\n  }\n}\n\n.network-name-item {\n  font-weight: 100;\n  flex: 1 0 auto;\n  color: $dusty-gray;\n}\n\n.network-check,\n.network-check__transparent {\n  color: $white;\n  margin-left: 7px;\n}\n\n.network-check__transparent {\n  opacity: 0;\n  width: 16px;\n  margin: 0;\n}\n\n.menu-icon-circle,\n.menu-icon-circle--active {\n  background: none;\n  border-radius: 22px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  border: 1px solid transparent;\n  margin: 0 4px;\n}\n\n.menu-icon-circle--active {\n  border: 1px solid $white;\n  background: rgba(100, 100, 100, .4);\n}\n\n.menu-icon-circle div,\n.menu-icon-circle--active div {\n  height: 12px;\n  width: 12px;\n  border-radius: 17px;\n}\n\n.menu-icon-circle--active div {\n  opacity: 1;\n}\n\n.network-dropdown-header {\n  display: flex;\n  flex-direction: column;\n  align-items: center;\n  width: 100%;\n}\n\n.network-dropdown-divider {\n  width: 100%;\n  height: 1px;\n  margin: 10px 0;\n  background-color: $scorpion;\n}\n\n.network-dropdown-title {\n  height: 25px;\n  width: 75px;\n  color: $white;\n  font-family: Roboto;\n  font-size: 18px;\n  line-height: 25px;\n  text-align: center;\n}\n\n.network-dropdown-content {\n  height: 36px;\n  width: 265px;\n  color: $dusty-gray;\n  font-family: Roboto;\n  font-size: 14px;\n  line-height: 18px;\n}\n\n",".modal > div:focus {\n  outline: none !important;\n}\n\n// Buy Modal\n.buy-modal-content {\n  flex-direction: column;\n  align-items: center;\n  justify-content: center;\n  text-align: center;\n  font-family: Roboto;\n  padding: 0 16px;\n}\n\n.buy-modal-content-option {\n  cursor: pointer;\n  color: #5B5D67;\n}\n\n.qr-ellip-address, .ellip-address {\n  width: 247px;\n  border: none;\n  font-family: Roboto;\n  font-size: 14px;\n}\n\n@media screen and (max-width: 575px) {\n  .buy-modal-content-title-wrapper {\n    justify-content: space-around;\n    width: 100%;\n    height: 100px;\n  }\n\n  .buy-modal-content-title {\n    font-size: 26px;\n    margin-top: 15px;\n  }\n\n  .buy-modal-content-options {\n    flex-direction: column;\n    padding: 5% 33%;\n  }\n\n  .buy-modal-content-footer {\n    text-transform: uppercase;\n    width: 100%;\n    height: 50px;\n  }\n\n  div.buy-modal-content-option {\n    display: flex;\n    flex-direction: column;\n    width: 80vw;\n    height: 15vh;\n    margin: 10px;\n    text-align: center;\n    border-radius: 6px;\n    border: 1px solid $black;\n    padding: 0% 7%;\n    justify-content: center;\n\n    div.buy-modal-content-option-title {\n      font-size: 20px;\n    }\n\n    div.buy-modal-content-option-subtitle {\n      font-size: 16px;\n    }\n  }\n}\n\n@media screen and (min-width: 576px) {\n  .buy-modal-content-title-wrapper {\n    justify-content: space-around;\n    width: 100%;\n    height: 110px;\n  }\n\n  .buy-modal-content-title {\n    font-size: 26px;\n    margin-top: 15px;\n  }\n\n  .buy-modal-content-footer {\n    text-transform: uppercase;\n    width: 100%;\n    height: 50px;\n  }\n\n  .buy-modal-content-options {\n    flex-direction: row;\n    margin: 20px 0 60px;\n  }\n\n  div.buy-modal-content-option {\n    display: flex;\n    flex-direction: column;\n    width: 20vw;\n    height: 120px;\n    text-align: center;\n    border-radius: 6px;\n    border: 1px solid $black;\n    margin: 0 8px;\n    padding: 18px 0;\n\n    div.buy-modal-content-option-title {\n      font-size: 20px;\n      margin-bottom: 12px;\n\n      @media screen and (max-width: 679px) {\n        font-size: 14px;\n      }\n\n      @media screen and (min-width: 1281px) {\n        font-size: 20px;\n      }\n    }\n\n    div.buy-modal-content-option-subtitle {\n      font-size: 16px;\n      padding: 0 10px;\n      height: 25%;\n\n      @media screen and (max-width: 679px) {\n        font-size: 10px;\n        padding: 0 10px;\n        margin-bottom: 5px;\n        line-height: 15px;\n      }\n\n      @media screen and (min-width: 680px) {\n        font-size: 14px;\n        padding: 0 4px;\n        margin-bottom: 2px;\n      }\n\n      @media screen and (min-width: 1281px) {\n        font-size: 16px;\n        padding: 0;\n      }\n    }\n\n    div.buy-modal-content-footer {\n      margin-top: 8vh;\n    }\n  }\n}\n\n// Edit Account Name Modal\n.edit-account-name-modal-content {\n  display: flex;\n  flex-direction: column;\n  justify-content: flex-start;\n  align-items: center;\n  position: relative;\n}\n\n.edit-account-name-modal-cancel {\n  position: absolute;\n  top: 12px;\n  right: 20px;\n  font-size: 25px;\n}\n\n.edit-account-name-modal-title {\n  margin: 15px;\n}\n\n.edit-account-name-modal-save-button {\n  width: 33%;\n  height: 45px;\n  margin: 15px;\n  font-weight: 700;\n  margin-top: 25px;\n}\n\n.edit-account-name-modal-input {\n  width: 90%;\n  height: 50px;\n  text-align: left;\n  margin: 10px;\n  padding: 10px;\n  font-size: 18px;\n}\n\n// Account Modal Container\n.account-modal-container {\n  display: flex;\n  flex-direction: column;\n  justify-content: flex-start;\n  align-items: center;\n  position: relative;\n  padding: 5px 0 31px 0;\n  border: 1px solid $silver;\n  border-radius: 4px;\n  font-family: Roboto;\n\n  button {\n    cursor: pointer;\n  }\n}\n\n.account-modal-back {\n  color: $dusty-gray;\n  position: absolute;\n  top: 13px;\n  left: 17px;\n  cursor: pointer;\n\n  &__text {\n    margin-top: 2px;\n    font-family: Roboto;\n    font-size: 14px;\n    line-height: 18px;\n  }\n}\n\n.account-modal-close::after {\n  content: '\\00D7';\n  font-size: 40px;\n  color: $dusty-gray;\n  position: absolute;\n  top: 10px;\n  right: 12px;\n  cursor: pointer;\n}\n\n.account-modal-container .identicon {\n  position: relative;\n  left: 0;\n  right: 0;\n  margin: 0 auto;\n  top: -32px;\n  margin-bottom: -32px;\n}\n\n\n// Account Details Modal\n\n.account-modal-container {\n\n  .qr-header {\n    margin-top: 9px;\n    font-size: 20px;\n  }\n\n  .qr-wrapper {\n    margin-top: 5px;\n  }\n\n  .ellip-address-wrapper {\n    display: flex;\n    justify-content: center;\n    border: 1px solid $alto;\n    padding: 5px 10px;\n    font-family: Roboto;\n    margin-top: 7px;\n    width: 286px;\n  }\n\n  .btn-clear {\n    min-height: 28px;\n    font-size: 14px;\n    border-color: $curious-blue;\n    color: $curious-blue;\n    border-radius: 2px;\n    flex-basis: 100%;\n    width: 75%;\n    margin-top: 17px;\n    padding: 10px 22px;\n    height: 44px;\n    width: 235px;\n    font-family: Roboto;\n  }\n}\n\n.account-modal-divider {\n  width: 100%;\n  height: 1px;\n  margin: 19px 0 8px 0;\n  background-color: $alto;\n}\n\n// Export Private Key Modal\n\n.account-modal-container .account-name {\n  margin-top: 9px;\n  font-size: 20px;\n}\n\n.account-modal-container .modal-body-title {\n  margin-top: 16px;\n  margin-bottom: 16px;\n  font-size: 18px;\n}\n\n.account-modal__name {\n  margin-top: 9px;\n  font-size: 20px;\n}\n\n.private-key-password {\n  display: flex;\n  flex-direction: column;\n}\n\n.private-key-password-label, .private-key-password-error {\n  color: $scorpion;\n  font-size: 14px;\n  line-height: 18px;\n  margin-bottom: 10px;\n}\n\n.private-key-password-error {\n  color: $crimson;\n  margin-bottom: 0;\n}\n\n.private-key-password-input {\n  padding: 10px 0 13px 17px;\n  font-size: 16px;\n  line-height: 21px;\n  width: 291px;\n  height: 44px;\n}\n\n.private-key-password::-webkit-input-placeholder {\n  color: $dusty-gray;\n  font-family: Roboto;\n}\n\n.private-key-password-warning {\n  border-radius: 8px;\n  background-color: #FFF6F6;\n  font-size: 12px;\n  font-weight: 500;\n  line-height: 15px;\n  color: $crimson;\n  width: 292px;\n  padding: 9px 15px;\n  margin-top: 18px;\n  font-family: Roboto;\n}\n\n.export-private-key-buttons {\n  display: flex;\n  flex-direction: row;\n  justify-content: center;\n\n  .btn-clear {\n    width: 141px;\n    height: 54px;\n  }\n\n  .btn-cancel {\n    margin-right: 15px;\n    border-color: $dusty-gray;\n    color: $scorpion;\n  }\n}\n\n.private-key-password-display-wrapper {\n  height: 80px;\n  width: 291px;\n  border: 1px solid $silver;\n  border-radius: 2px;\n}\n\n.private-key-password-display-textarea {\n  color: $crimson;\n  font-family: Roboto;\n  font-size: 16px;\n  line-height: 21px;\n  border: none;\n  height: 75px;\n  width: 100%;\n  overflow: hidden;\n  resize: none;\n  padding: 9px 13px 8px;\n  text-transform: uppercase;\n  font-weight: 300;\n}\n\n\n// New Account Modal\n.new-account-modal-wrapper {\n  display: flex;\n  flex-direction: column;\n  justify-content: flex-start;\n  align-items: center;\n  position: relative;\n  border: 1px solid $alto;\n  box-shadow: 0 0 2px 2px $alto;\n  font-family: Roboto;\n}\n\n.new-account-modal-header {\n  background: $wild-sand;\n  width: 100%;\n  display: flex;\n  justify-content: center;\n  padding: 30px;\n  font-size: 22px;\n  color: $nile-blue;\n  height: 79px;\n}\n\n.modal-close-x::after {\n  content: '\\00D7';\n  font-size: 2em;\n  color: $dusty-gray;\n  position: absolute;\n  top: 25px;\n  right: 17.5px;\n  font-family: sans-serif;\n  cursor: pointer;\n}\n\n.new-account-modal-content {\n  width: 100%;\n  display: flex;\n  justify-content: center;\n  margin-top: 15px;\n  font-size: 17px;\n  color: $nile-blue;\n}\n\n.new-account-modal-content.after-input {\n  margin-top: 15px;\n  line-height: 25px;\n}\n\n.new-account-input-wrapper {\n  display: flex;\n  width: 100%;\n  justify-content: center;\n  padding-bottom: 2px;\n  margin-top: 13px;\n}\n\n.new-account-input {\n  padding: 15px;\n  padding-bottom: 20px;\n  border-radius: 8px;\n  border: 1px solid $alto;\n  width: 100%;\n  font-size: 1em;\n  color: $dusty-gray;\n  font-family: Roboto;\n  font-size: 17px;\n  margin: 0 60px;\n}\n\n// For reference on below placeholder selectors: https://stackoverflow.com/questions/2610497/change-an-html5-inputs-placeholder-color-with-css\n.new-account-input::-webkit-input-placeholder {\n  color: $dusty-gray;\n}\n\n.new-account-input:-moz-placeholder {\n  color: $dusty-gray;\n  opacity: 1;\n}\n\n.new-account-input::-moz-placeholder {\n  color: $dusty-gray;\n  opacity: 1;\n}\n\n.new-account-input:-ms-input-placeholder {\n  color: $dusty-gray;\n}\n\n.new-account-input::-ms-input-placeholder {\n  color: $dusty-gray;\n}\n\n.new-account-modal-content.button {\n  margin-top: 22px;\n  margin-bottom: 30px;\n  width: 113px;\n  height: 44px;\n}\n\n.new-account-modal-wrapper .btn-clear {\n  font-size: 14px;\n  font-weight: 700;\n  background: $white;\n  border: 1px solid;\n  border-radius: 2px;\n  color: $tundora;\n  flex: 1;\n}\n\n// Hide token confirmation\n\n.hide-token-confirmation {\n  min-height: 250.72px;\n  width: 374.49px;\n  border-radius: 4px;\n  background-color: #FFFFFF;\n  box-shadow: 0 1px 7px 0 rgba(0,0,0,0.5);\n\n  &__container {\n    padding: 24px 27px 21px;\n    display: flex;\n    flex-direction: column;\n    align-items: center;\n  }\n\n  &__identicon {\n    margin-bottom: 10px\n  }\n\n  &__symbol {\n    color: $tundora;\n    font-family: Roboto;\n    font-size: 16px;\n    line-height: 24px;\n    text-align: center;\n    margin-bottom: 7.5px;\n  }\n\n  &__title {\n    height: 30px;\n    width: 271.28px;\n    color: $tundora;\n    font-family: Roboto;\n    font-size: 22px;\n    line-height: 30px;\n    text-align: center;\n    margin-bottom: 10.5px;\n  }\n\n  &__copy {\n    height: 41px;\n    width: 318px;\n    color: $scorpion;\n    font-family: Roboto;\n    font-size: 14px;\n    line-height: 18px;\n    text-align: center;\n  }\n\n  &__buttons {\n    display: flex;\n    flex-direction: row;\n    justify-content: center;\n    margin-top: 15px;\n    width: 100%;\n\n    button {\n      height: 44px;\n      width: 113px;\n      border: 1px solid $scorpion;\n      border-radius: 2px;\n      color: $tundora;\n      font-family: Roboto;\n      font-size: 14px;\n      line-height: 20px;\n      text-align: center;\n      margin-left: 4px;\n      margin-right: 4px;\n    }\n  }\n}\n","/*\n  NewUI Container Elements\n */\n\n// Component Colors\n$tx-view-bg: $white;\n$wallet-view-bg: $wild-sand;\n\n// Main container\n.main-container {\n  // position: absolute;\n  z-index: $main-container-z-index;\n  font-family: Roboto;\n  display: flex;\n  flex-wrap: wrap;\n  align-items: stretch;\n}\n\n.main-container::-webkit-scrollbar {\n  display: none;\n}\n\n// tx view\n\n.tx-view {\n  flex: 63.5 0 66.5%;\n  background: $tx-view-bg;\n\n  // No title on mobile\n  @media screen and (max-width: 575px) {\n    .identicon-wrapper {\n      display: none;\n    }\n\n    .account-name {\n      display: none;\n    }\n  }\n}\n\n// wallet view and sidebar\n\n.wallet-view {\n  display: flex;\n  flex-direction: column;\n  flex: 33.5 1 33.5%;\n  width: 0;\n  background: $wallet-view-bg;\n  z-index: 200;\n  position: relative;\n\n  @media screen and (min-width: 576px) {\n    overflow-y: scroll;\n    overflow-x: hidden;\n  }\n\n  .wallet-view-account-details {\n    flex: 0 0 auto;\n  }\n\n  &__name-container {\n    flex: 0 0 auto;\n    cursor: pointer;\n    width: 100%;\n  }\n\n  &__keyring-label {\n    height: 40px;\n    color: $dusty-gray;\n    font-family: Roboto;\n    font-size: 10px;\n    line-height: 40px;\n    text-align: right;\n    padding: 0 20px;\n  }\n\n  &__details-button {\n    color: $curious-blue;\n    font-size: 10px;\n    line-height: 13px;\n    text-align: center;\n    border: 1px solid $curious-blue;\n    border-radius: 10.5px;\n    background-color: transparent;\n    margin: 0 auto;\n    padding: 4px 12px;\n    flex: 0 0 auto;\n  }\n\n  &__address {\n    border-radius: 3px;\n    background-color: $alto;\n    color: $scorpion;\n    font-size: 14px;\n    line-height: 12px;\n    padding: 4px 12px;\n    margin: 24px auto;\n    font-weight: 300;\n    cursor: pointer;\n    flex: 0 0 auto;\n  }\n\n  &__sidebar-close {\n\n    @media screen and (max-width: 575px) {\n      &::after {\n        content: '\\00D7';\n        font-size: 40px;\n        color: $tundora;\n        position: absolute;\n        top: 12px;\n        left: 12px;\n        cursor: pointer;\n      }\n    }\n  }\n\n  &__add-token-button {\n    flex: 0 0 auto;\n    color: $dusty-gray;\n    font-size: 14px;\n    line-height: 19px;\n    text-align: center;\n    margin: 36px auto;\n    border: 1px solid $dusty-gray;\n    border-radius: 2px;\n    font-weight: 300;\n    background: none;\n    padding: 9px 30px;\n  }\n}\n\n@media screen and (min-width: 576px) {\n  .wallet-view::-webkit-scrollbar {\n    display: none;\n  }\n}\n\n.wallet-view-title-wrapper {\n  flex: 0 0 25px;\n}\n\n.wallet-view-title {\n  margin-left: 15px;\n  font-size: 16px;\n\n  // No title on mobile\n  @media screen and (max-width: 575px) {\n    display: none;\n  }\n}\n\n.wallet-view.sidebar {\n  flex: 1 0 230px;\n  background: rgb(250, 250, 250);\n  z-index: $sidebar-z-index;\n  position: fixed;\n  top: 56px;\n  left: 0;\n  right: 0;\n  bottom: 0;\n  opacity: 1;\n  visibility: visible;\n  will-change: transform;\n  overflow-y: auto;\n  box-shadow: rgba(0, 0, 0, .15) 2px 2px 4px;\n  width: 85%;\n  height: calc(100% - 56px);\n}\n\n.sidebar-overlay {\n  z-index: $sidebar-overlay-z-index;\n  position: fixed;\n  // top: 41px;\n  height: 100%;\n  width: 100%;\n  left: 0;\n  right: 0;\n  bottom: 0;\n  opacity: 1;\n  visibility: visible;\n  background-color: rgba(0, 0, 0, .3);\n}\n\n// main-container media queries\n\n@media screen and (min-width: 576px) {\n  .lap-visible {\n    display: flex;\n  }\n\n  .phone-visible {\n    display: none;\n  }\n\n  .main-container {\n    // margin-top: 6.9vh;\n    width: 85%;\n    height: 90vh;\n    box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08);\n  }\n}\n\n@media screen and (min-width: 769px) {\n  .main-container {\n    // margin-top: 6.9vh;\n    width: 80%;\n    height: 82vh;\n    box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08);\n  }\n}\n\n@media screen and (min-width: 1281px) {\n  .main-container {\n    // margin-top: 6.9vh;\n    width: 65%;\n    height: 82vh;\n    box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08);\n  }\n}\n\n@media screen and (max-width: 575px) {\n  .lap-visible {\n    display: none;\n  }\n\n  .phone-visible {\n    display: flex;\n  }\n\n  .main-container {\n    // margin-top: 41px;\n    height: 100%;\n    width: 100%;\n    overflow-y: auto;\n    background-color: $white;\n  }\n\n  button.btn-clear {\n    width: 93px;\n    height: 50px;\n    font-size: .7em;\n    background: $white;\n    border: 1px solid;\n  }\n}\n\n// wallet view\n.account-name {\n  font-size: 24px;\n  font-weight: 200;\n  line-height: 20px;\n  color: $scorpion;\n  margin-top: 8px;\n  margin-bottom: 24px;\n  white-space: nowrap;\n  text-overflow: ellipsis;\n  overflow: hidden;\n  width: 100%;\n  padding: 0 8px;\n  text-align: center;\n}\n\n// account options dropdown\n.account-options-menu {\n  align-items: center;\n  justify-content: flex-start;\n  margin: 5% 7% 0%;\n}\n\n.fiat-amount {\n  text-transform: uppercase;\n}\n\n.token-balance__amount {\n  padding-right: 6px;\n}\n",".account-dropdown-name {\n  font-family: Roboto;\n}\n\n.account-dropdown-balance {\n  color: $dusty-gray;\n  line-height: 19px;\n}\n\n.account-dropdown-edit-button {\n  color: $dusty-gray;\n  font-family: Roboto;\n\n  &:hover {\n    color: $white;\n  }\n}\n\n.account-list-item {\n  &__top-row {\n    display: flex;\n    margin-top: 10px;\n    margin-left: 8px;\n    position: relative;\n  }\n\n  &__account-balances {\n    height: auto;\n    border: none;\n    background-color: transparent;\n    color: #9b9b9b;\n    margin-left: 34px;\n    margin-top: 4px;\n    position: relative;\n  }\n  \n  &__account-name {\n    font-size: 16px;\n    margin-left: 8px;\n  }\n\n  &__icon {\n    position: absolute;\n    right: 12px;\n    top: 1px;\n  }\n\n  &__account-primary-balance,\n  &__account-secondary-balance {\n    font-family: Roboto;\n    line-height: 16px;\n    font-size: 12px;\n    font-weight: 300;\n  }\n\n  &__account-primary-balance {\n    color: $scorpion;\n    border: none;\n    outline: 0 !important;\n  }\n\n  &__account-secondary-balance {\n    color: $dusty-gray;\n  }\n\n  &__account-address {\n    margin-left: 35px;\n    width: 80%;\n    overflow: hidden;\n    text-overflow: ellipsis;\n  }\n\n  &__dropdown {\n    &:hover {\n      background: rgba($alto, .2);\n      cursor: pointer;\n\n      input {\n        background: rgba($alto, .1);\n      }\n    }\n  }\n}\n",".send-screen-wrapper {\n  display: flex;\n  flex-flow: column nowrap;\n  z-index: 25;\n  font-family: Roboto;\n\n  @media screen and (max-width: $break-small) {\n    width: 100%;\n    overflow-y: auto;\n  }\n\n  section {\n    flex: 0 0 auto;\n  }\n}\n\n.send-screen-card {\n  background-color: #fff;\n  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .08);\n  padding: 46px 40.5px 26px;\n  position: relative;\n  // top: -26px;\n  align-items: center;\n  display: flex;\n  flex-flow: column nowrap;\n  width: 498px;\n  flex: 1 0 auto;\n\n  @media screen and (max-width: $break-small) {\n    top: 0;\n    width: 100%;\n    box-shadow: none;\n    padding: 12px;\n  }\n}\n\n/* Send Screen */\n\n.send-screen section {\n  margin: 4px 16px;\n}\n\n.send-screen input {\n  width: 100%;\n  font-size: 12px;\n}\n\n.send-eth-icon {\n  border-radius: 50%;\n  width: 70px;\n  height: 70px;\n  border: 1px solid $alto;\n  box-shadow: 0 0 4px 0 rgba(0, 0, 0, .2);\n  position: absolute;\n  top: -35px;\n  z-index: 25;\n  padding: 4px;\n  background-color: $white;\n\n  @media screen and (max-width: $break-small) {\n    position: relative;\n    top: 0;\n  }\n}\n\n.send-screen-input-wrapper {\n  width: 95%;\n  position: relative;\n\n  .fa-bolt {\n    padding-right: 4px;\n  }\n\n  .large-input {\n    border: 1px solid $dusty-gray;\n    border-radius: 4px;\n    margin: 4px 0 20px;\n    font-size: 16px;\n    line-height: 22.4px;\n    font-family: Roboto;\n  }\n\n  .send-screen-gas-input {\n    border: 1px solid transparent;\n  }\n\n  &__error-message {\n    display: none;\n  }\n\n  &--error {\n    input,\n    .send-screen-gas-input {\n      border-color: $red !important;\n    }\n\n    .send-screen-input-wrapper__error-message {\n      display: block;\n      position: absolute;\n      bottom: 4px;\n      font-size: 12px;\n      line-height: 12px;\n      left: 8px;\n      color: $red;\n    }\n  }\n\n  .send-screen-input-wrapper__error-message {\n    display: block;\n    position: absolute;\n    bottom: 4px;\n    font-size: 12px;\n    line-height: 12px;\n    left: 8px;\n    color: $red;\n  }\n}\n\n.send-screen-input {\n  width: 100%;\n}\n\n.send-screen-gas-input {\n  width: 100%;\n  height: 41px;\n  border-radius: 3px;\n  background-color: #f3f3f3;\n  border-width: 0;\n  border-style: none;\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  padding-left: 10px;\n  padding-right: 12px;\n  font-size: 16px;\n  color: $scorpion;\n}\n\n.send-screen-amount-labels {\n  display: flex;\n  flex-direction: row;\n  justify-content: space-between;\n}\n\n.send-screen-gas-labels {\n  display: flex;\n  flex-direction: row;\n  justify-content: space-between;\n}\n\n.currency-toggle {\n  &__item {\n    color: $curious-blue;\n    cursor: pointer;\n\n    &--selected {\n      color: $black;\n      cursor: default;\n    }\n  }\n}\n\n.send-screen-gas-input-customize {\n  color: $curious-blue;\n  font-size: 12px;\n  cursor: pointer;\n}\n\n.gas-tooltip-close-area {\n  position: fixed;\n  top: 0;\n  left: 0;\n  z-index: 1000;\n  width: 100%;\n  height: 100%;\n}\n\n.customize-gas-tooltip-container {\n  position: absolute;\n  bottom: 50px;\n  width: 237px;\n  height: 307px;\n  background-color: $white;\n  opacity: 1;\n  box-shadow: $alto 0 0 5px;\n  z-index: 1050;\n  padding: 13px 19px;\n  font-size: 16px;\n  border-radius: 4px;\n  font-family: \"Lato\";\n  font-weight: 500;\n}\n\n.gas-tooltip-arrow {\n  height: 25px;\n  width: 25px;\n  z-index: 1200;\n  background: $white;\n  position: absolute;\n  transform: rotate(45deg);\n  left: 107px;\n  top: 294px;\n  box-shadow: 2px 2px 2px $alto;\n}\n\n.customize-gas-tooltip-container input[type=\"number\"]::-webkit-inner-spin-button {\n  -webkit-appearance: none;\n  display: none;\n}\n\n.customize-gas-tooltip-container input[type=\"number\"]:hover::-webkit-inner-spin-button {\n  -webkit-appearance: none;\n  display: none;\n}\n\n.customize-gas-tooltip {\n  position: relative;\n}\n\n.gas-tooltip {\n  display: flex;\n  justify-content: center;\n}\n\n.gas-tooltip-label {\n  font-size: 16px;\n  color: $tundora;\n}\n\n.gas-tooltip-header {\n  padding-bottom: 12px;\n}\n\n.gas-tooltip-input-label {\n  margin-bottom: 5px;\n}\n\n.gas-tooltip-input-label i {\n  color: $silver-chalice;\n  margin-left: 6px;\n}\n\n.customize-gas-input {\n  width: 178px;\n  height: 28px;\n  border: 1px solid $alto;\n  font-size: 16px;\n  color: $nile-blue;\n  padding-left: 8px;\n}\n\n.customize-gas-input-wrapper {\n  position: relative;\n}\n\n.gas-tooltip-input-detail {\n  position: absolute;\n  top: 4px;\n  right: 26px;\n  font-size: 12px;\n  color: $silver-chalice;\n}\n\n.gas-tooltip-input-arrows {\n  position: absolute;\n  top: 0;\n  right: 4px;\n  width: 17px;\n  height: 28px;\n  border: 1px solid #dadada;\n  border-left: 0;\n  display: flex;\n  flex-direction: column;\n  color: #9b9b9b;\n  font-size: .8em;\n  padding: 1px 4px;\n  cursor: pointer;\n}\n\n.token-gas {\n  &__amount {\n    display: inline-block;\n    margin-right: 4px;\n  }\n\n  &__symbol {\n    display: inline-block;\n  }\n}\n\n.send-screen {\n  &__title {\n    color: $scorpion;\n    font-size: 18px;\n    line-height: 29px;\n  }\n\n  &__subtitle {\n    margin: 10px 0 20px;\n    font-size: 14px;\n    line-height: 24px;\n  }\n\n  &__send-button,\n  &__cancel-button {\n    width: 163px;\n    text-align: center;\n  }\n\n  &__send-button__disabled {\n    opacity: .5;\n    cursor: auto;\n  }\n}\n\n.send-token {\n  display: flex;\n  flex-flow: column nowrap;\n  z-index: 25;\n  font-family: Roboto;\n\n  &__content {\n    width: 498px;\n    height: 605px;\n    background-color: #fff;\n    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .08);\n    padding: 46px 40.5px 26px;\n    position: relative;\n    // top: -26px;\n    align-items: center;\n    display: flex;\n    flex-flow: column nowrap;\n    flex: 1 0 auto;\n\n    @media screen and (max-width: $break-small) {\n      top: 0;\n      width: 100%;\n      box-shadow: none;\n      padding: 12px;\n    }\n  }\n\n  .identicon {\n    position: absolute;\n    top: -35px;\n    z-index: 25;\n\n    @media screen and (max-width: $break-small) {\n      position: relative;\n      top: 0;\n      flex: 0 0 auto;\n    }\n  }\n\n  &__title {\n    color: $scorpion;\n    font-size: 18px;\n    line-height: 29px;\n  }\n\n  &__description,\n  &__balance-text,\n  &__token-symbol {\n    margin-top: 10px;\n    font-size: 14px;\n    line-height: 24px;\n    text-align: center;\n  }\n\n  &__token-balance {\n    font-size: 40px;\n    line-height: 40px;\n    margin-top: 13px;\n\n    .token-balance__amount {\n      padding-right: 12px;\n    }\n  }\n\n  &__button-group {\n    display: flex;\n    flex-flow: column nowrap;\n    align-items: center;\n    flex: 0 0 auto;\n\n    @media screen and (max-width: $break-small) {\n      margin-top: 24px;\n    }\n\n    button {\n      width: 163px;\n    }\n  }\n}\n\n.confirm-send-token {\n  &__hero-amount-wrapper {\n    width: 100%;\n  }\n}\n\n.send-v2 {\n  &__container {\n    // height: 701px;\n    width: 380px;\n    border-radius: 8px;\n    background-color: $white;\n    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .08);\n    display: flex;\n    flex-flow: column nowrap;\n    z-index: 25;\n    align-items: center;\n    font-family: Roboto;\n    position: relative;\n\n    @media screen and (max-width: $break-small) {\n      width: 100%;\n      top: 0;\n      box-shadow: none;\n      flex: 1 1 auto;\n    }\n  }\n\n  &__send-header-icon-container {\n    z-index: 25;\n\n    @media screen and (max-width: $break-small) {\n      position: relative;\n      top: 0;\n    }\n  }\n\n  &__send-header-icon {\n    border-radius: 50%;\n    width: 48px;\n    height: 48px;\n    border: 1px solid $alto;\n    z-index: 25;\n    padding: 4px;\n    background-color: $white;\n  }\n\n  &__send-arrow-icon {\n    color: #f28930;\n    transform: rotate(-45deg);\n    position: absolute;\n    top: -2px;\n    left: 0;\n    font-size: 1.12em;\n  }\n\n  &__arrow-background {\n    background-color: $white;\n    height: 14px;\n    width: 14px;\n    position: absolute;\n    top: 52px;\n    left: 199px;\n    border-radius: 50%;\n    z-index: 100;\n\n    @media screen and (max-width: $break-small) {\n      top: 36px;\n    }\n  }\n\n  &__header {\n    height: 88px;\n    width: 380px;\n    background-color: $athens-grey;\n    position: relative;\n    display: flex;\n    justify-content: center;\n    align-items: center;\n\n    @media screen and (max-width: $break-small) {\n      height: 59px;\n      width: 100vw;\n    }\n  }\n\n  &__header-tip {\n    height: 25px;\n    width: 25px;\n    background: $athens-grey;\n    position: absolute;\n    transform: rotate(45deg);\n    left: 178px;\n    top: 75px;\n\n    @media screen and (max-width: $break-small) {\n      top: 46px;\n      left: 0;\n      right: 0;\n      margin: 0 auto;\n    }\n  }\n\n  &__title {\n    color: $scorpion;\n    font-size: 22px;\n    line-height: 29px;\n    text-align: center;\n    margin-top: 25px;\n  }\n\n  &__copy {\n    color: $gray;\n    font-size: 14px;\n    font-weight: 300;\n    line-height: 19px;\n    text-align: center;\n    margin-top: 10px;\n    width: 287px;\n  }\n\n  &__error {\n    font-size: 12px;\n    line-height: 12px;\n    left: 8px;\n    color: $red;\n  }\n\n  &__error-border {\n    color: $red;\n  }\n\n  &__form {\n    margin: 13px 0;\n    width: 100%;\n\n    @media screen and (max-width: $break-small) {\n      padding: 13px 0;\n      margin: 0;\n      height: 0;\n      overflow-y: auto;\n      flex: 1 1 auto;\n    }\n  }\n\n  &__form-header,\n  &__form-header-copy {\n    width: 100%;\n    display: flex;\n    flex-flow: column;\n    align-items: center;\n  }\n\n  &__form-row {\n    margin: 14.5px 18px 0px;\n    position: relative;\n    display: flex;\n    flex-flow: row;\n    flex: 1 0 auto;\n    justify-content: space-between;\n  }\n\n  &__form-field {\n    flex: 1 1 auto;\n  }\n\n  &__form-label {\n    color: $scorpion;\n    font-family: Roboto;\n    font-size: 16px;\n    line-height: 22px;\n    width: 88px;\n  }\n\n  &__from-dropdown {\n    height: 73px;\n    width: 100%;\n    border: 1px solid $alto;\n    border-radius: 4px;\n    background-color: $white;\n    font-family: Roboto;\n    line-height: 16px;\n    font-size: 12px;\n    color: $tundora;\n    position: relative;\n\n    &__close-area {\n      position: fixed;\n      top: 0;\n      left: 0;\n      z-index: 1000;\n      width: 100%;\n      height: 100%;\n    }\n    \n    &__list {\n      z-index: 1050;\n      position: absolute;\n      height: 220px;\n      width: 100%;\n      border: 1px solid $geyser;\n      border-radius: 4px;\n      background-color: $white;\n      box-shadow: 0 3px 6px 0 rgba(0 ,0 ,0 ,.11);\n      margin-top: 11px;\n      margin-left: -1px;\n      overflow-y: scroll;\n    }\n  }\n\n  &__to-autocomplete {\n    position: relative;\n\n    &__down-caret {\n      position: absolute;\n      top: 18px;\n      right: 12px;\n    }\n  }\n\n  &__to-autocomplete, &__memo-text-area {\n    &__input {\n      height: 54px;\n      width: 100%;\n      border: 1px solid $alto;\n      border-radius: 4px;\n      background-color: $white;\n      color: $dusty-gray;\n      padding: 10px;\n      font-family: Roboto;\n      font-size: 16px;\n      line-height: 21px;\n      font-weight: 300;\n    }\n  }\n\n  &__amount-max {\n    color: $curious-blue;\n    font-family: Roboto;\n    font-size: 12px;\n    left: 8px;\n    border: none;\n    cursor: pointer;\n  }\n\n  &__gas-fee-display {\n    width: 100%;\n  }\n\n  &__sliders-icon-container {\n    display: flex;\n    align-items: center;\n    justify-content: center;\n    height: 24px;\n    width: 24px;\n    border: 1px solid $curious-blue;\n    border-radius: 4px;\n    background-color: $white;\n    padding: 5px;\n    position: absolute;\n    right: 15px;\n    top: 14px;\n    cursor: pointer;\n  }\n\n  &__sliders-icon {\n    color: $curious-blue;\n  }\n\n  &__memo-text-area {\n    &__input {\n      padding: 6px 10px;\n    }\n  }\n\n  &__footer {\n    height: 92px;\n    width: 100%;\n    display: flex;\n    justify-content: space-evenly;\n    align-items: center;\n    border-top: 1px solid $alto;\n    background: $white;\n    padding: 0 12px;\n  }\n\n  &__next-btn,\n  &__cancel-btn,\n  &__next-btn__disabled {\n    width: 163px;\n    text-align: center;\n    height: 55px;\n    border-radius: 2px;\n    background-color: $white;\n    font-family: Roboto;\n    font-size: 16px;\n    font-weight: 300;\n    line-height: 21px;\n    border: 1px solid;\n    margin: 0 4px;\n  }\n\n  &__next-btn,\n  &__next-btn__disabled {\n    color: $curious-blue;\n    border-color: $curious-blue;\n  }\n\n  &__next-btn__disabled {\n    opacity: .5;\n    cursor: auto;\n  }\n\n  &__cancel-btn {\n    color: $dusty-gray;\n    border-color: $dusty-gray;\n  }\n\n  &__customize-gas {\n    border: 1px solid #D8D8D8;\n    border-radius: 4px;\n    background-color: #FFFFFF;\n    box-shadow: 0 2px 4px 0 rgba(0,0,0,0.14);\n    font-family: Roboto;\n    display: flex;\n    flex-flow: column;\n\n    @media screen and (max-width: $break-small) {\n      width: 100vw;\n      height: 100vh;\n    }\n\n    &__header {\n      height: 52px;\n      border-bottom: 1px solid $alto;\n      display: flex;\n      align-items: center;\n      justify-content: space-between;\n      font-size: 22px;\n\n      @media screen and (max-width: $break-small) {\n        flex: 0 0 auto;\n      }\n    }\n\n    &__title {\n      margin-left: 19.25px;\n    }\n\n    &__close::after {\n      content: '\\00D7';\n      font-size: 1.8em;\n      color: $dusty-gray;\n      font-family: sans-serif;\n      cursor: pointer;\n      margin-right: 19.25px;\n    }\n\n    &__content {\n      display: flex;\n      flex-flow: column nowrap;\n      height: 100%;\n    }\n\n    &__body {\n      display: flex;\n      margin-bottom: 24px;\n\n      @media screen and (max-width: $break-small) {\n        flex-flow: column;\n        flex: 1 1 auto;\n      }\n    }\n\n    &__footer {\n      height: 75px;\n      border-top: 1px solid $alto;\n      display: flex;\n      align-items: center;\n      justify-content: space-between;\n      font-size: 22px;\n      position: relative;\n\n      @media screen and (max-width: $break-small) {\n        flex: 0 0 auto;\n      }\n    }\n\n    &__buttons {\n      display: flex;\n      justify-content: space-between;\n      width: 181.75px;\n      margin-right: 21.25px;\n    }\n\n    &__revert, &__cancel, &__save, &__save__error {\n      display: flex;\n      justify-content: center;\n      align-items: center;\n      cursor: pointer;\n    }\n\n    &__revert {\n      color: $silver-chalice;\n      font-size: 16px;\n      margin-left: 21.25px;\n    }\n\n    &__cancel, &__save, &__save__error {\n      height: 34.64px;\n      width: 85.74px;\n      border: 1px solid $dusty-gray;\n      border-radius: 2px;\n      font-family: 'DIN OT';\n      font-size: 12px;\n      color: $dusty-gray;\n    }\n\n    &__save__error {\n      opacity: 0.5;\n      cursor: auto;\n    }\n\n    &__error-message {\n      display: block;\n      position: absolute;\n      top: 4px;\n      right: 4px;\n      font-size: 12px;\n      line-height: 12px;\n      color: $red;\n    }\n  }\n\n  &__gas-modal-card {\n    width: 360px;\n    display: flex;\n    flex-flow: column;\n    align-items: flex-start;\n    padding-left: 20px;\n\n    &__title {\n      height: 26px;\n      color: $tundora;\n      font-family: Roboto;\n      font-size: 20px;\n      font-weight: 300;\n      line-height: 26px;\n      margin-top: 17px;\n    }\n\n    &__copy {\n      height: 38px;\n      width: 314px;\n      color: $tundora;\n      font-family: Roboto;\n      font-size: 14px;\n      line-height: 19px;\n      margin-top: 17px;\n    }\n\n    .customize-gas-input-wrapper {\n      margin-top: 17px;\n    }\n\n    .customize-gas-input {\n      height: 54px;\n      width: 315px;\n      border: 1px solid $geyser;\n      background-color: $white;\n      padding-left: 15px;\n    }\n\n    .gas-tooltip-input-arrows {\n      width: 32px;\n      height: 54px;\n      border-left: 1px solid #dadada;\n      font-size: 18px;\n      color: $tundora;\n      right: 0px;\n      padding: 1px 4px;\n      display: flex;\n      justify-content: space-around;\n      align-items: center;\n    }\n\n    input[type=\"number\"]::-webkit-inner-spin-button {\n      -webkit-appearance: none;\n      display: none;\n    }\n\n    input[type=\"number\"]:hover::-webkit-inner-spin-button {\n      -webkit-appearance: none;\n      display: none;\n    }\n  }\n}\n",".confirm-screen-container {\n  position: relative;\n  align-items: center;\n  font-family: Roboto;\n  flex: 0 0 auto;\n  flex-flow: column nowrap;\n  box-shadow: 0 2px 4px 0 rgba($black, .08);\n  border-radius: 8px;\n\n  @media screen and (max-width: 575px) {\n    width: 100%;\n  }\n\n  @media screen and (min-width: 576px) {\n    // top: -26px;\n  }\n}\n\n.notification {\n  .confirm-screen-wrapper {\n\n    @media screen and (max-width: $break-small) {\n      height: calc(100vh - 85px);\n    }\n  }\n}\n\n.confirm-screen-wrapper {\n  height: 100%;\n  width: 380px;\n  background-color: $white;\n  display: flex;\n  flex-flow: column nowrap;\n  z-index: 25;\n  align-items: center;\n  font-family: Roboto;\n  position: relative;\n  overflow-y: auto;\n  overflow-x: hidden;\n  border-top-left-radius: 8px;\n  border-top-right-radius: 8px;\n\n  @media screen and (max-width: $break-small) {\n    width: 100%;\n    overflow-x: hidden;\n    overflow-y: auto;\n    top: 0;\n    box-shadow: none;\n    height: calc(100vh - 58px - 85px);\n    border-top-left-radius: 0;\n    border-top-right-radius: 0;\n  }\n}\n\n.confirm-screen-wrapper > .confirm-screen-total-box {\n  margin-left: 10px;\n  margin-right: 10px;\n}\n\n.confirm-screen-wrapper > .confirm-memo-wrapper {\n  margin: 0;\n}\n\n.confirm-screen-header {\n  height: 88px;\n  background-color: $athens-grey;\n  position: relative;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  font-size: 22px;\n  line-height: 29px;\n  width: 100%;\n  padding: 25px 0;\n  flex: 0 0 auto;\n\n  @media screen and (max-width: $break-small) {\n    font-size: 20px;\n  }\n}\n\n.confirm-screen-header-tip {\n  height: 25px;\n  width: 25px;\n  background: $athens-grey;\n  position: absolute;\n  transform: rotate(45deg);\n  top: 71px;\n  left: 0;\n  right: 0;\n  margin: 0 auto;\n}\n\n.confirm-screen-title {\n  line-height: 27px;\n\n  @media screen and (max-width: $break-small) {\n    margin-left: 22px;\n    margin-right: 8px;\n  }\n}\n\n.confirm-screen-back-button {\n  background: transparent;\n  border: 1px solid $curious-blue;\n  left: 24px;\n  position: absolute;\n  text-align: center;\n  color: $curious-blue;\n  padding: 6px 13px 7px 12px;\n  border-radius: 2px;\n  height: 30px;\n  width: 54px;\n\n  @media screen and (max-width: $break-small) {\n    margin-right: 12px;\n  }\n}\n\n.confirm-screen-account-wrapper {\n  display: flex;\n  flex-direction: column;\n  align-items: center;\n}\n\n.confirm-screen-account-name {\n  margin-top: 12px;\n  font-size: 14px;\n  line-height: 19px;\n  color: $scorpion;\n  text-align: center;\n}\n\n.confirm-screen-row-info {\n  font-size: 16px;\n  line-height: 21px;\n}\n\n.confirm-screen-account-number {\n  font-size: 10px;\n  line-height: 16px;\n  color: $dusty-gray;\n  text-align: center;\n  height: 16px;\n}\n\n.confirm-send-ether,\n.confirm-send-token {\n  i.fa-arrow-right {\n    align-self: start;\n    margin: 24px 14px 0 !important;\n  }\n}\n\n.confirm-screen-identicons {\n  margin-top: 24px;\n  flex: 0 0 auto;\n\n  i.fa-arrow-right {\n    align-self: start;\n    margin: 42px 14px 0;\n  }\n\n  i.fa-file-text-o {\n    font-size: 60px;\n    margin: 16px 8px 0 8px;\n    text-align: center;\n  }\n}\n\n.confirm-screen-sending-to-message {\n  text-align: center;\n  font-size: 16px;\n  margin-top: 30px;\n  font-family: 'DIN NEXT Light';\n}\n\n.confirm-screen-send-amount {\n  color: $scorpion;\n  margin-top: 12px;\n  text-align: center;\n  font-size: 40px;\n  font-weight: 300;\n  line-height: 53px;\n  flex: 0 0 auto;\n}\n\n.confirm-screen-send-amount-currency {\n  font-size: 20px;\n  line-height: 20px;\n  text-align: center;\n  flex: 0 0 auto;\n}\n\n.confirm-memo-wrapper {\n  min-height: 24px;\n  width: 100%;\n  border-bottom: 1px solid $alto;\n  flex: 0 0 auto;\n}\n\n.confirm-screen-send-memo {\n  color: $scorpion;\n  font-size: 16px;\n  line-height: 19px;\n  font-weight: 400;\n}\n\n.confirm-screen-label {\n  font-size: 18px;\n  line-height: 40px;\n  color: $scorpion;\n  text-align: left;\n}\n\nsection .confirm-screen-account-name,\nsection .confirm-screen-account-number,\n.confirm-screen-row-info,\n.confirm-screen-row-detail {\n  text-align: left;\n}\n\n.confirm-screen-rows {\n  display: flex;\n  flex-flow: column nowrap;\n  width: 100%;\n  flex: 0 0 auto;\n}\n\n.confirm-screen-section-column {\n  flex: .5;\n}\n\n.confirm-screen-row {\n  display: flex;\n  flex-flow: row nowrap;\n  border-bottom: 1px solid $alto;\n  width: 100%;\n  align-items: center;\n  padding: 12px;\n  padding-left: 35px;\n  font-size: 16px;\n  line-height: 22px;\n  font-weight: 300;\n}\n\n.confirm-screen-row-detail {\n  font-size: 12px;\n  line-height: 16px;\n  color: $dusty-gray;\n}\n\n.confirm-screen-total-box {\n  background-color: $wild-sand;\n  padding: 20px;\n  padding-left: 35px;\n  border-bottom: 1px solid $alto;\n\n  .confirm-screen-label {\n    line-height: 18px;\n  }\n\n  .confirm-screen-row-detail {\n    color: $scorpion;\n  }\n\n  &__subtitle {\n    font-size: 12px;\n    line-height: 22px;\n  }\n\n  .confirm-screen-row-info {\n    font-size: 16px;\n    font-weight: 500;\n    line-height: 21px;\n  }\n}\n\n.confirm-screen-confirm-button {\n  height: 62px;\n  border-radius: 2px;\n  background-color: #02c9b1;\n  font-size: 16px;\n  color: $white;\n  text-align: center;\n  font-family: Roboto;\n  padding-top: 15px;\n  padding-bottom: 15px;\n  border-width: 0;\n  box-shadow: none;\n  flex: 1 0 auto;\n  font-weight: 300;\n  margin: 0 8px;\n}\n\n.btn-light.confirm-screen-cancel-button {\n  height: 62px;\n  background: none;\n  border: none;\n  opacity: 1;\n  font-family: Roboto;\n  border-width: 0;\n  padding-top: 15px;\n  padding-bottom: 15px;\n  font-size: 16px;\n  line-height: 32px;\n  box-shadow: none;\n  cursor: pointer;\n  flex: 1 0 auto;\n  font-weight: 300;\n  margin: 0 8px;\n}\n\n#pending-tx-form {\n  flex: 1 0 auto;\n  position: relative;\n  display: flex;\n  flex-flow: row nowrap;\n  background-color: $white;\n  padding: 12px 18px;\n  border-bottom-left-radius: 8px;\n  border-bottom-right-radius: 8px;\n  width: 100%;\n\n  @media screen and (max-width: $break-small) {\n    border-top: 1px solid $alto;\n    border-bottom-left-radius: 0;\n    border-bottom-right-radius: 0;\n  }\n}\n",".loading-overlay {\n  left: 0px;\n  z-index: 50;\n  position: absolute;\n  flex-direction: column;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  width: 100%;\n  background: rgba(255, 255, 255, 0.8);\n\n  @media screen and (max-width: 575px) {\n    margin-top: 56px;\n    height: calc(100% - 56px);\n  }\n\n  @media screen and (min-width: 576px) {\n    margin-top: 75px;\n    height: calc(100% - 75px);\n  }\n}\n",".hero-balance {\n\n  @media screen and (max-width: $break-small) {\n    display: flex;\n    flex-direction: column;\n    justify-content: flex-start;\n    align-items: center;\n    margin: .3em .9em 0;\n    // height: 80vh;\n    // max-height: 225px;\n    flex: 0 0 auto;\n  }\n\n  @media screen and (min-width: $break-large) {\n    display: flex;\n    flex-direction: row;\n    justify-content: flex-start;\n    align-items: center;\n    margin: 2.8em 2.37em .8em;\n  }\n\n  .balance-container {\n    display: flex;\n    margin: 0;\n    justify-content: flex-start;\n    align-items: center;\n\n    @media screen and (max-width: $break-small) {\n      flex-direction: column;\n      flex: 0 0 auto;\n    }\n\n    @media screen and (min-width: $break-large) {\n      flex-direction: row;\n      flex-grow: 3;\n    }\n  }\n\n  .balance-display {\n\n    @media screen and (max-width: $break-small) {\n      text-align: center;\n\n      .token-amount {\n        font-size: 175%;\n        margin-top: 12.5%;\n      }\n\n      .fiat-amount {\n        font-size: 115%;\n        margin-top: 8.5%;\n        color: #a0a0a0;\n      }\n    }\n\n    @media screen and (min-width: $break-large) {\n      margin-left: 3%;\n      justify-content: flex-start;\n      align-items: flex-start;\n\n      .token-amount {\n        font-size: 135%;\n      }\n\n      .fiat-amount {\n        margin-top: .25%;\n        font-size: 105%;\n      }\n    }\n  }\n\n  .balance-icon {\n    border-radius: 25px;\n    width: 45px;\n    height: 45px;\n    border: 1px solid $alto;\n  }\n\n  .hero-balance-buttons {\n\n    @media screen and (max-width: $break-small) {\n      width: 100%;\n      // height: 100px; // needed a round number to set the heights of the buttons inside\n      flex: 0 0 auto;\n      padding: 16px 0;\n    }\n\n    @media screen and (min-width: $break-large) {\n      flex-grow: 2;\n      justify-content: flex-end;\n    }\n\n    button.btn-clear {\n      background: $white;\n      border: 1px solid;\n      border-radius: 2px;\n      font-size: 12px;\n\n      @media screen and (max-width: $break-small) {\n        border-color: $curious-blue;\n        color: $curious-blue;\n        height: 36px;\n      }\n\n      @media screen and (min-width: $break-large) {\n        border-color: $curious-blue;\n        color: $curious-blue;\n        padding: 0;\n        width: 85px;\n        height: 34px;\n      }\n    }\n  }\n}\n","$wallet-balance-bg: #e7e7e7;\n$wallet-balance-breakpoint: 890px;\n$wallet-balance-breakpoint-range: \"screen and (min-width: #{$break-large}) and (max-width: #{$wallet-balance-breakpoint})\";\n\n.wallet-balance-wrapper {\n  flex: 0 0 auto;\n  transition: linear 200ms;\n  background: rgba($wallet-balance-bg, 0);\n\n  &--active {\n    background: rgba($wallet-balance-bg, 1);\n  }\n}\n\n.wallet-balance {\n  background: inherit;\n  display: flex;\n  flex-direction: row;\n  justify-content: flex-start;\n  align-items: center;\n  flex: 0 0 auto;\n  cursor: pointer;\n  border-top: 1px solid $wallet-balance-bg;\n\n  .balance-container {\n    display: flex;\n    justify-content: flex-start;\n    align-items: center;\n    margin: 20px 24px;\n    flex-direction: row;\n    flex-grow: 3;\n\n    @media #{$wallet-balance-breakpoint-range} {\n      margin: 10% 4%;\n    }\n  }\n\n  .balance-display {\n    margin-left: 15px;\n    justify-content: flex-start;\n    align-items: flex-start;\n\n    .token-amount {\n      font-size: 135%;\n    }\n\n    .fiat-amount {\n      margin-top: .25%;\n      font-size: 105%;\n    }\n\n    @media #{$wallet-balance-breakpoint-range} {\n      margin-left: 4%;\n\n      .token-amount {\n        font-size: 105%;\n      }\n\n      .fiat-amount {\n        font-size: 95%;\n      }\n    }\n  }\n\n  .balance-icon {\n    border-radius: 25px;\n    width: 45px;\n    height: 45px;\n    border: 1px solid $alto;\n  }\n}\n",".tx-list-container {\n  height: 87.5%;\n\n  @media screen and (min-width: $break-large) {\n    overflow-y: scroll;\n  }\n}\n\n.tx-list-header {\n  text-transform: capitalize;\n}\n\n@media screen and (max-width: $break-small) {\n  .tx-list-header-wrapper {\n    margin-top: .2em;\n    margin-bottom: .6em;\n    // TODO: Resolve Layout Conflicst in Wallet View\n    //  - This fixes txlist \"transactions\" title dispay\n    // margin-top: 0.2em;\n    // margin-bottom: 0.6em;\n    justify-content: center;\n    flex: 0 0 auto;\n  }\n\n  .tx-list-header {\n    align-self: center;\n    font-size: 12px;\n    color: $dusty-gray;\n    font-family: Roboto;\n    text-transform: uppercase;\n  }\n}\n\n@media screen and (min-width: $break-large) {\n  .tx-list-header-wrapper {\n    flex: 0 0 55px;\n  }\n\n  .tx-list-header {\n    font-size: 16px;\n    margin: 1.5em 2.37em;\n  }\n\n  .tx-list-container::-webkit-scrollbar {\n    display: none;\n  }\n}\n\n.tx-list-content-divider {\n  height: 1px;\n  background: rgb(231, 231, 231);\n  flex: 0 0 1px;\n\n  @media screen and (max-width: $break-small) {\n    margin: .1em 0;\n  }\n\n  @media screen and (min-width: $break-large) {\n    margin: .1em 2.37em;\n  }\n}\n\n.tx-list-item-wrapper {\n  flex: 1 1 auto;\n  width: 0;\n  align-items: stretch;\n  justify-content: flex-start;\n  display: flex;\n  flex-flow: column nowrap;\n\n  @media screen and (max-width: $break-small) {\n    padding: 0 1.3em .8em;\n  }\n\n  @media screen and (min-width: $break-large) {\n    padding-bottom: 12px;\n  }\n}\n\n.tx-list-clickable {\n  cursor: pointer;\n\n  &:hover {\n    background: rgba($alto, .2);\n  }\n}\n\n.tx-list-pending-item-container {\n  cursor: pointer;\n  opacity: .5;\n}\n\n.tx-list-date-wrapper {\n  flex: 1 1 auto;\n\n  @media screen and (max-width: $break-small) {\n    margin-top: 6px;\n  }\n\n  @media screen and (min-width: $break-large) {\n    margin-top: 12px;\n  }\n}\n\n.tx-list-content-wrapper {\n  align-items: stretch;\n  margin-bottom: 4px;\n  margin-top: 2px;\n  flex: 1 0 auto;\n  width: 100%;\n  display: flex;\n  flex-flow: row nowrap;\n\n  @media screen and (max-width: $break-small) {\n    font-size: 12px;\n\n    .tx-list-status {\n      font-size: 14px !important;\n    }\n\n    .tx-list-account {\n      font-size: 14px !important;\n    }\n\n    .tx-list-value {\n      font-size: 14px;\n      line-height: 18px;\n    }\n\n    .tx-list-fiat-value {\n      font-size: 12px;\n      line-height: 16px;\n    }\n  }\n}\n\n.tx-list-date {\n  color: $dusty-gray;\n  font-size: 12px;\n  font-family: Roboto;\n}\n\n.tx-list-identicon-wrapper {\n  align-self: center;\n  flex: 0 0 auto;\n  margin-right: 16px;\n}\n\n.tx-list-account-and-status-wrapper {\n  display: flex;\n  flex: 1 1 auto;\n  flex-flow: row wrap;\n  width: 0;\n\n  @media screen and (max-width: $break-small) {\n    flex-direction: column;\n    justify-content: flex-start;\n    align-items: flex-start;\n    align-self: center;\n\n    .tx-list-account-wrapper {\n      height: 18px;\n\n      .tx-list-account {\n        line-height: 14px;\n      }\n    }\n  }\n\n  @media screen and (min-width: $break-large) {\n    flex-direction: row;\n    justify-content: flex-start;\n    align-items: center;\n\n    .tx-list-account-wrapper {\n      flex: 1.3 2 auto;\n      min-width: 153px;\n    }\n\n    .tx-list-status-wrapper {\n      flex: 6 6 auto;\n    }\n  }\n\n  .tx-list-account {\n    font-size: 16px;\n    color: $scorpion;\n  }\n\n  .tx-list-status {\n    color: $dusty-gray;\n    font-size: 16px;\n    text-transform: capitalize;\n  }\n\n  .tx-list-status--rejected,\n  .tx-list-status--failed {\n    color: $monzo;\n  }\n}\n\n.tx-list-item {\n  border-top: 1px solid rgb(231, 231, 231);\n  flex: 0 0 auto;\n  display: flex;\n  flex-flow: row nowrap;\n\n  @media screen and (max-width: $break-small) {\n    // margin: 0 1.3em .95em; !important\n  }\n\n  @media screen and (min-width: $break-large) {\n    margin: 0 2.37em;\n  }\n\n  &:last-of-type {\n    border-bottom: 1px solid rgb(231, 231, 231);\n    margin-bottom: 32px;\n  }\n\n  &__wrapper {\n    align-self: center;\n    flex: 2 2 auto;\n    color: $dusty-gray;\n\n    .tx-list-value {\n      font-size: 16px;\n      text-align: right;\n    }\n\n    .tx-list-value--confirmed {\n      color: $caribbean-green;\n    }\n\n    .tx-list-fiat-value {\n      font-size: 12px;\n      text-align: right;\n    }\n  }\n\n  &--empty {\n    text-align: center;\n    border-bottom: none !important;\n    padding: 16px;\n  }\n}\n\n.tx-list-details-wrapper {\n  overflow: hidden;\n  flex: 0 0 35%;\n}\n\n.tx-list-value {\n  font-size: 16px;\n  text-align: right;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n}\n\n.tx-list-fiat-value {\n  text-align: right;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n}\n\n.tx-list-value--confirmed {\n  color: $caribbean-green;\n}\n","// Old scss, do not lint - clean up later\n/* stylelint-disable */\n\n\n/*\nApp Sections\n  TODO: Move into separate files.\n*/\n\n/* initialize */\ntextarea.twelve-word-phrase {\n  padding: 12px;\n  width: 300px;\n  height: 140px;\n  font-size: 16px;\n  background: $white;\n  resize: none;\n}\n\n.initialize-screen hr {\n  width: 60px;\n  margin: 12px;\n  border-color: #f7861c;\n  border-style: solid;\n}\n\n.initialize-screen label {\n  margin-top: 20px;\n}\n\n.initialize-screen button.create-vault {\n  margin-top: 40px;\n}\n\n.initialize-screen .warning {\n  font-size: 14px;\n  margin: 0 16px;\n}\n\n/* unlock */\n.error {\n  // color: #e20202;\n  color: #f7861c;\n  margin-bottom: 9px;\n}\n\n.warning {\n  color: #ffae00;\n}\n\n.lock {\n  width: 50px;\n  height: 50px;\n}\n\n.lock.locked {\n  transform: scale(1.5);\n  opacity: 0;\n  transition: opacity 400ms ease-in, transform 400ms ease-in;\n}\n\n.lock.unlocked {\n  transform: scale(1);\n  opacity: 1;\n  transition: opacity 500ms ease-out, transform 500ms ease-out, background 200ms ease-in;\n}\n\n.lock.locked .lock-top {\n  transform: scaleX(1) translateX(0);\n  transition: transform 250ms ease-in;\n}\n\n.lock.unlocked .lock-top {\n  transform: scaleX(-1) translateX(-12px);\n  transition: transform 250ms ease-in;\n}\n\n.lock.unlocked:hover {\n  border-radius: 4px;\n  background: #e5e5e5;\n  border: 1px solid #b1b1b1;\n}\n\n.lock.unlocked:active {\n  background: #c3c3c3;\n}\n\n.section-title .fa-arrow-left {\n  margin: -2px 8px 0px -8px;\n}\n\n.unlock-screen #metamask-mascot-container {\n  margin-top: 24px;\n}\n\n.unlock-screen h1 {\n  margin-top: -28px;\n  margin-bottom: 42px;\n}\n\n.unlock-screen input[type=password] {\n  width: 260px;\n}\n\n.sizing-input {\n  font-size: 14px;\n  height: 30px;\n  padding-left: 5px;\n}\n\n.editable-label {\n  display: flex;\n}\n\n/* Webkit */\n\n.unlock-screen input::-webkit-input-placeholder {\n  text-align: center;\n  font-size: 1.2em;\n}\n\n/* Firefox 18- */\n\n.unlock-screen input:-moz-placeholder {\n  text-align: center;\n  font-size: 1.2em;\n}\n\n/* Firefox 19+ */\n\n.unlock-screen input::-moz-placeholder {\n  text-align: center;\n  font-size: 1.2em;\n}\n\n/* IE */\n\n.unlock-screen input:-ms-input-placeholder {\n  text-align: center;\n  font-size: 1.2em;\n}\n\n/* accounts */\n\n.accounts-section {\n  margin: 0 0px;\n}\n\n.accounts-section .horizontal-line {\n  margin: 0 18px;\n}\n\n.accounts-list-option {\n  height: 120px;\n}\n\n.accounts-list-option .identicon-wrapper {\n  width: 100px;\n}\n\n.unconftx-link {\n  margin-top: 24px;\n  cursor: pointer;\n}\n\n.unconftx-link .fa-arrow-right {\n  margin: 0 -8px 0px 8px;\n}\n\n/* identity panel */\n\n.identity-panel {\n  font-weight: 500;\n}\n\n.identity-panel .identicon-wrapper {\n  margin: 4px;\n  margin-top: 8px;\n  display: flex;\n  align-items: center;\n}\n\n.identity-panel .identicon-wrapper span {\n  margin: 0 auto;\n}\n\n.identity-panel .identity-data {\n  margin: 8px 8px 8px 18px;\n}\n\n.identity-panel i {\n  margin-top: 32px;\n  margin-right: 6px;\n  color: #b9b9b9;\n}\n\n.identity-panel .arrow-right {\n  padding-left: 18px;\n  width: 42px;\n  min-width: 18px;\n  height: 100%;\n}\n\n.identity-copy.flex-column {\n  flex: .25 0 auto;\n  justify-content: center;\n}\n\n/* accounts screen */\n\n.identity-section {\n}\n\n.identity-section .identity-panel {\n  background: #e9e9e9;\n  border-bottom: 1px solid #b1b1b1;\n  cursor: pointer;\n}\n\n.identity-section .identity-panel.selected {\n  background: $white;\n  color: #f3c83e;\n}\n\n.identity-section .identity-panel.selected .identicon {\n  border-color: $orange;\n}\n\n.identity-section .accounts-list-option:hover,\n.identity-section .accounts-list-option.selected {\n  background: $white;\n}\n\n/* account detail screen */\n\n.account-detail-section {\n  display: flex;\n  flex-wrap: wrap;\n  overflow-y: auto;\n  flex-direction: inherit;\n}\n\n.grow-tenx {\n  flex-grow: 10;\n}\n\n.name-label {\n}\n\n.unapproved-tx-icon {\n  height: 16px;\n  width: 16px;\n  background: rgb(47, 174, 244);\n  border-color: $silver-chalice;\n  border-radius: 13px;\n}\n\n.edit-text {\n  height: 100%;\n  visibility: hidden;\n}\n\n.editing-label {\n  display: flex;\n  justify-content: flex-start;\n  margin-left: 50px;\n  margin-bottom: 2px;\n  font-size: 11px;\n  text-rendering: geometricPrecision;\n  color: #f7861c;\n}\n\n.name-label:hover .edit-text {\n  visibility: visible;\n}\n/* tx confirm */\n\n.unconftx-section input[type=password] {\n  height: 22px;\n  padding: 2px;\n  margin: 12px;\n  margin-bottom: 24px;\n  border-radius: 4px;\n  border: 2px solid #f3c83e;\n  background: #faf6f0;\n}\n\n/* Ether Balance Widget */\n\n.ether-balance-amount {\n  color: #f7861c;\n}\n\n.ether-balance-label {\n  color: #aba9aa;\n}\n\n/* Info screen */\n.info-gray {\n  font-family: Roboto;\n  text-transform: uppercase;\n  color: $silver-chalice;\n}\n\n.icon-size {\n  width: 20px;\n}\n\n.info {\n  font-family: Roboto, Arial;\n  padding-bottom: 10px;\n  display: inline-block;\n  padding-left: 5px;\n}\n\n/* buy eth warning screen */\n.custom-radios {\n  justify-content: space-around;\n  align-items: center;\n}\n\n.custom-radio-selected {\n  width: 17px;\n  height: 17px;\n  border: solid;\n  border-style: double;\n  border-radius: 15px;\n  border-width: 5px;\n  background: rgba(247, 134, 28, 1);\n  border-color: #f7f7f7;\n}\n\n.custom-radio-inactive {\n  width: 14px;\n  height: 14px;\n  border: solid;\n  border-width: 1px;\n  border-radius: 24px;\n  border-color: $silver-chalice;\n}\n\n.radio-titles {\n  color: rgba(247, 134, 28, 1);\n}\n\n.eth-warning {\n  transition: opacity 400ms ease-in, transform 400ms ease-in;\n}\n\n.buy-subview {\n  transition: opacity 400ms ease-in, transform 400ms ease-in;\n}\n\n.input-container:hover .edit-text {\n  visibility: visible;\n}\n\n.buy-inputs {\n  font-family: Roboto;\n  font-size: 13px;\n  height: 20px;\n  background: transparent;\n  box-sizing: border-box;\n  border: solid;\n  border-color: transparent;\n  border-width: .5px;\n  border-radius: 2px;\n}\n\n.input-container:hover .buy-inputs {\n  box-sizing: inherit;\n  border: solid;\n  border-color: #f7861c;\n  border-width: .5px;\n  border-radius: 2px;\n}\n\n.buy-inputs:focus {\n  border: solid;\n  border-color: #f7861c;\n  border-width: .5px;\n  border-radius: 2px;\n}\n\n.activeForm {\n  background: #f7f7f7;\n  border: none;\n  border-radius: 8px 8px 0px 0px;\n  width: 50%;\n  text-align: center;\n  padding-bottom: 4px;\n}\n\n.inactiveForm {\n  border: none;\n  border-radius: 8px 8px 0px 0px;\n  width: 50%;\n  text-align: center;\n  padding-bottom: 4px;\n}\n\n.ex-coins {\n  font-family: Roboto;\n  text-transform: uppercase;\n  text-align: center;\n  font-size: 33px;\n  width: 118px;\n  height: 42px;\n  padding: 1px;\n  color: #4d4d4d;\n}\n\n.marketinfo {\n  font-family: Roboto;\n  color: $silver-chalice;\n  font-size: 15px;\n  line-height: 17px;\n}\n\n#fromCoin::-webkit-calendar-picker-indicator {\n  display: none;\n}\n\n#coinList {\n  width: 400px;\n  height: 500px;\n  overflow: scroll;\n}\n\n.icon-control .fa-refresh {\n  visibility: hidden;\n}\n\n.icon-control:hover .fa-refresh {\n  visibility: visible;\n}\n\n.icon-control:hover .fa-chevron-right {\n  visibility: hidden;\n}\n\n.inactive {\n  color: $silver-chalice;\n}\n\n.inactive button {\n  background: $silver-chalice;\n  color: $white;\n}\n\n.qr-ellip-address, .ellip-address {\n  overflow: hidden;\n  text-overflow: ellipsis;\n}\n\n.qr-header {\n  font-size: 25px;\n  margin-top: 40px;\n}\n\n.qr-message {\n  font-size: 12px;\n  color: #f7861c;\n}\n\ndiv.message-container > div:first-child {\n  margin-top: 18px;\n  font-size: 15px;\n  color: #4d4d4d;\n}\n\n.pop-hover:hover {\n  transform: scale(1.1);\n}\n\n/* stylelint-enable */\n","$wallet-balance-breakpoint: 890px;\n$wallet-balance-breakpoint-range: \"screen and (min-width: #{$break-large}) and (max-width: #{$wallet-balance-breakpoint})\";\n\n.token-list-item {\n  display: flex;\n  flex-flow: row nowrap;\n  align-items: center;\n  padding: 20px 24px;\n  cursor: pointer;\n  transition: linear 200ms;\n  background-color: rgba($wallet-balance-bg, 0);\n  position: relative;\n\n  &__token-balance {\n    font-size: 130%;\n\n    @media #{$wallet-balance-breakpoint-range} {\n      font-size: 105%;\n    }\n  }\n\n  &__fiat-amount {\n    margin-top: .25%;\n    font-size: 105%;\n    text-transform: uppercase;\n\n    @media #{$wallet-balance-breakpoint-range} {\n      font-size: 95%;\n    }\n  }\n\n  @media #{$wallet-balance-breakpoint-range} {\n    padding: 10% 4%;\n  }\n\n  &--active {\n    background-color: rgba($wallet-balance-bg, 1);\n  }\n\n  &__identicon {\n    margin-right: 15px;\n    border: '1px solid #dedede';\n\n    @media #{$wallet-balance-breakpoint-range} {\n      margin-right: 4%;\n    }\n  }\n\n  &__ellipsis {\n    // position: absolute;\n    // top: 20px;\n    // right: 24px;\n    line-height: 45px;\n  }\n\n  &__balance-wrapper {\n    flex: 1 1 auto;\n  }\n}\n\n.token-menu-dropdown {\n  height: 55px;\n  width: 191px;\n  border-radius: 4px;\n  background-color: rgba(0,0,0,0.82);\n  box-shadow: 0 2px 4px 0 rgba(0,0,0,0.5);\n  position: fixed;\n  margin-top: 20px;\n  margin-left: 105px;\n  z-index: 2000;\n\n  &__close-area {\n    position: fixed;\n    top: 0;\n    left: 0;\n    z-index: 2100;\n    width: 100%;\n    height: 100%;\n    cursor: default;\n  }\n\n  &__container {\n    padding: 16px 34px 32px;\n    z-index: 2200;\n    position: relative;\n  }\n\n  &__options {\n    display: flex;\n    flex-direction: column;\n    justify-content: center;\n  }\n\n  &__option {\n    color: $white;\n    font-family: Roboto;\n    font-size: 16px;\n    line-height: 21px;\n    text-align: center;\n  }\n}",".add-token {\n  width: 498px;\n  display: flex;\n  flex-flow: column nowrap;\n  align-items: center;\n  position: relative;\n  z-index: 12;\n  font-family: 'DIN Next Light';\n\n  &__wrapper {\n    background-color: $white;\n    box-shadow: 0 2px 4px 0 rgba($black, .08);\n    display: flex;\n    flex-flow: column nowrap;\n    align-items: center;\n    flex: 0 0 auto;\n  }\n\n  &__title-container {\n    display: flex;\n    flex-flow: column nowrap;\n    align-items: center;\n    padding: 30px 60px 12px;\n    border-bottom: 1px solid $gallery;\n    flex: 0 0 auto;\n  }\n\n  &__title {\n    color: $scorpion;\n    font-size: 20px;\n    line-height: 26px;\n    text-align: center;\n    font-weight: 600;\n    margin-bottom: 12px;\n  }\n\n  &__description {\n    text-align: center;\n  }\n\n  &__description + &__description {\n    margin-top: 24px;\n  }\n\n  &__confirmation-description {\n    margin: 12px 0;\n  }\n\n  &__content-container {\n    width: 100%;\n    border-bottom: 1px solid $gallery;\n  }\n\n  &__input-container {\n    padding: 11px 0;\n    width: 263px;\n    margin: 0 auto;\n    position: relative;\n  }\n\n  &__search-input-error-message {\n    position: absolute;\n    bottom: -10px;\n    font-size: 12px;\n    width: 100%;\n    text-overflow: ellipsis;\n    overflow: hidden;\n    white-space: nowrap;\n    color: $red;\n  }\n\n  &__input {\n    width: 100%;\n    border: 2px solid $gallery;\n    border-radius: 4px;\n    padding: 5px 15px;\n    font-size: 14px;\n    line-height: 19px;\n\n    &::placeholder {\n      color: $silver;\n    }\n  }\n\n  &__footers {\n    width: 100%;\n  }\n\n  &__add-custom {\n    color: $scorpion;\n    font-size: 18px;\n    line-height: 24px;\n    text-align: center;\n    padding: 12px 0;\n    font-weight: 600;\n    cursor: pointer;\n\n    &:hover {\n      background-color: rgba(0, 0, 0, .05);\n    }\n\n    &:active {\n      background-color: rgba(0, 0, 0, .1);\n    }\n\n    .fa {\n      position: absolute;\n      right: 24px;\n      font-size: 24px;\n      line-height: 24px;\n    }\n  }\n\n  &__add-custom-form {\n    display: flex;\n    flex-flow: column nowrap;\n    margin: 8px 0 51px;\n  }\n\n  &__add-custom-field {\n    width: 290px;\n    margin: 0 auto;\n    position: relative;\n\n    &--error {\n      .add-token__add-custom-input {\n        border-color: $red;\n      }\n    }\n  }\n\n  &__add-custom-error-message {\n    position: absolute;\n    bottom: -21px;\n    font-size: 12px;\n    width: 100%;\n    text-overflow: ellipsis;\n    overflow: hidden;\n    white-space: nowrap;\n    color: $red;\n  }\n\n  &__add-custom-label {\n    font-size: 16px;\n    line-height: 21px;\n    margin-bottom: 8px;\n  }\n\n  &__add-custom-input {\n    width: 100%;\n    border: 1px solid $silver;\n    padding: 5px 15px;\n    font-size: 14px;\n    line-height: 19px;\n\n    &::placeholder {\n      color: $silver;\n    }\n  }\n\n  &__add-custom-field + &__add-custom-field {\n    margin-top: 21px;\n  }\n\n  &__buttons {\n    display: flex;\n    flex-flow: column nowrap;\n    margin: 30px 0 51px;\n    flex: 0 0 auto;\n  }\n\n  &__token-icons-container {\n    display: flex;\n    flex-flow: row wrap;\n  }\n\n  &__token-wrapper {\n    transition: 200ms ease-in-out;\n    display: flex;\n    flex-flow: row nowrap;\n    flex: 0 0 42.5%;\n    align-items: center;\n    padding: 12px;\n    margin: 2.5%;\n    box-sizing: border-box;\n    border-radius: 10px;\n    cursor: pointer;\n    border: 2px solid transparent;\n    position: relative;\n\n    &:hover {\n      border: 2px solid rgba($malibu-blue, .5);\n    }\n\n    &--selected {\n      border: 2px solid $malibu-blue !important;\n    }\n\n    &--disabled {\n      opacity: .4;\n      pointer-events: none;\n    }\n  }\n\n  &__token-data {\n    align-self: flex-start;\n  }\n\n  &__token-name {\n    font-size: 14px;\n    line-height: 19px;\n  }\n\n  &__token-symbol {\n    font-size: 22px;\n    line-height: 29px;\n    font-weight: 600;\n  }\n\n  &__token-icon {\n    width: 60px;\n    height: 60px;\n    background-repeat: no-repeat;\n    background-size: contain;\n    background-position: center;\n    border-radius: 50%;\n    background-color: $white;\n    box-shadow: 0 2px 4px 0 rgba($black, .24);\n    margin-right: 12px;\n    flex: 0 0 auto;\n  }\n\n  &__token-message {\n    position: absolute;\n    color: $caribbean-green;\n    font-size: 11px;\n    bottom: 0;\n    left: 85px;\n  }\n\n  &__confirmation-token-list {\n    display: flex;\n    flex-flow: column nowrap;\n\n    .token-balance {\n      display: flex;\n      flex-flow: row nowrap;\n      align-items: flex-start;\n\n      &__amount {\n        color: $scorpion;\n        font-size: 43px;\n        font-weight: 300;\n        line-height: 43px;\n        margin-right: 8px;\n      }\n\n      &__symbol {\n        color: $scorpion;\n        font-size: 16px;\n        line-height: 24px;\n      }\n    }\n  }\n\n  &__confirmation-title {\n    padding: 30px 120px 12px;\n\n    @media screen and (max-width: $break-small) {\n      padding: 20px 0;\n      width: 100%;\n    }\n  }\n\n  &__confirmation-content {\n    padding-bottom: 60px;\n  }\n\n  &__confirmation-token-list-item {\n    display: flex;\n    flex-flow: row nowrap;\n    margin: 0 auto;\n    align-items: center;\n  }\n\n  &__confirmation-token-list-item + &__confirmation-token-list-item {\n    margin-top: 30px;\n  }\n\n  &__confirmation-token-icon {\n    margin-right: 18px;\n  }\n\n  @media screen and (max-width: $break-small) {\n    top: 0;\n    width: 100%;\n    overflow: hidden;\n    height: 100%;\n\n    &__wrapper {\n      box-shadow: none !important;\n      flex: 1 1 auto;\n      width: 100%;\n      overflow-y: auto;\n    }\n\n    &__footers {\n      border-bottom: 1px solid $gallery;\n    }\n\n    &__token-icon {\n      width: 50px;\n      height: 50px;\n    }\n\n    &__token-symbol {\n      font-size: 18px;\n      line-height: 24px;\n    }\n\n    &__token-name {\n      font-size: 12px;\n      line-height: 16px;\n    }\n\n    &__buttons {\n      flex-flow: row nowrap;\n      width: 100%;\n      align-items: center;\n      justify-content: center;\n      padding: 12px 0;\n      margin: 0;\n      border-top: 1px solid $gallery;\n\n      button {\n        flex: 1 0 auto;\n        margin: 0 12px;\n      }\n    }\n  }\n}\n",".currency-display {\n  height: 54px;\n  width: 100%ß;\n  border: 1px solid $alto;\n  border-radius: 4px;\n  background-color: $white;\n  color: $dusty-gray;\n  font-family: Roboto;\n  font-size: 16px;\n  font-weight: 300;\n  padding: 8px 10px;\n  position: relative;\n\n  &__primary-row {\n    display: flex;\n  }\n\n  &__input {\n    color: $scorpion;\n    font-family: Roboto;\n    font-size: 16px;\n    line-height: 22px;\n    border: none;\n    outline: 0 !important;\n    max-width: 100%;\n  }\n\n  &__primary-currency {\n    color: $scorpion;\n    font-weight: 400;\n    font-family: Roboto;\n    font-size: 16px;\n    line-height: 22px;\n  }\n\n  &__converted-row {\n    display: flex;\n  }\n\n  &__converted-value,\n  &__converted-currency {\n    color: $dusty-gray;\n    font-family: Roboto;\n    font-size: 12px;\n    line-height: 12px;\n  }\n\n  &__input-wrapper {\n    position: relative;\n    display: flex;\n  }\n\n  &__currency-symbol {\n    margin-top: 1px;\n  }\n}",".account-menu {\n  position: fixed;\n  z-index: 100;\n  top: 58px;\n  width: 310px;\n\n  @media screen and (max-width: 575px) {\n    right: calc(((100vw - 100%) / 2) + 8px);\n  }\n\n  @media screen and (min-width: 576px) {\n    right: calc((100vw - 85vw) / 2);\n  }\n\n  @media screen and (min-width: 769px) {\n    right: calc((100vw - 80vw) / 2);\n  }\n\n  @media screen and (min-width: 1281px) {\n    right: calc((100vw - 65vw) / 2);\n  }\n\n  &__icon {\n    margin-left: 20px;\n    cursor: pointer;\n  }\n\n  &__header {\n    display: flex;\n    flex-flow: row nowrap;\n    justify-content: space-between;\n    align-items: center;\n  }\n\n  &__logout-button {\n    border: 1px solid $dusty-gray;\n    background-color: transparent;\n    color: $white;\n    border-radius: 4px;\n    font-size: 12px;\n    line-height: 23px;\n    padding: 0 24px;\n    font-weight: 200;\n  }\n\n  img {\n    width: 16px;\n    height: 16px;\n  }\n\n  &__accounts {\n    display: flex;\n    flex-flow: column nowrap;\n    overflow-y: auto;\n    max-height: 240px;\n    position: relative;\n    z-index: 200;\n\n    &::-webkit-scrollbar {\n      display: none;\n    }\n\n    @media screen and (max-width: 575px) {\n      max-height: 215px;\n    }\n\n    .keyring-label {\n      margin-top: 5px;\n      background-color: $black;\n      color: $dusty-gray;\n    }\n  }\n\n  &__account {\n    display: flex;\n    flex-flow: row nowrap;\n    padding: 16px 14px;\n    flex: 0 0 auto;\n\n    @media screen and (max-width: 575px) {\n      padding: 12px 14px;\n    }\n  }\n\n  &__account-info {\n    flex: 1 0 auto;\n    display: flex;\n    flex-flow: column nowrap;\n    padding-top: 4px;\n  }\n\n  &__check-mark {\n    width: 14px;\n    margin-right: 12px;\n    flex: 0 0 auto;\n  }\n\n  &__check-mark-icon {\n    background-image: url(\"images/check-white.svg\");\n    height: 18px;\n    width: 18px;\n    background-repeat: no-repeat;\n    background-position: center;\n    background-size: contain;\n    margin: 3px 0;\n  }\n\n  .identicon {\n    margin: 0 12px 0 0;\n    flex: 0 0 auto;\n  }\n\n  &__name {\n    color: $white;\n    font-size: 18px;\n    font-weight: 200;\n    line-height: 16px;\n  }\n\n  &__balance {\n    color: $dusty-gray;\n    font-size: 14px;\n    line-height: 19px;\n  }\n\n  &__action {\n    font-size: 16px;\n    line-height: 18px;\n    font-weight: 200;\n    cursor: pointer;\n  }\n}\n",".menu {\n  border-radius: 4px;\n  background: rgba($black, .8);\n  box-shadow: rgba($black, .15) 0 2px 2px 2px;\n  min-width: 150px;\n  color: $white;\n\n  &__item {\n    padding: 18px;\n    display: flex;\n    flex-flow: row nowrap;\n    align-items: center;\n    position: relative;\n    z-index: 200;\n    font-weight: 200;\n\n    @media screen and (max-width: 575px) {\n      padding: 14px;\n    }\n\n    &--clickable {\n      cursor: pointer;\n\n      &:hover {\n        background-color: rgba($white, .05);\n      }\n\n      &:active {\n        background-color: rgba($white, .1);\n      }\n    }\n\n    &__icon {\n      height: 16px;\n      width: 16px;\n      margin-right: 14px;\n    }\n\n    &__text {\n      font-size: 16px;\n      line-height: 21px;\n    }\n  }\n\n  &__divider {\n    background-color: $scorpion;\n    width: 100%;\n    height: 1px;\n  }\n\n  &__close-area {\n    position: fixed;\n    width: 100%;\n    height: 100%;\n    top: 0;\n    left: 0;\n    z-index: 100;\n  }\n}\n",".gas-slider {\n  position: relative;\n  width: 313px;\n\n  &__input {\n    width: 317px;\n    margin-left: -2px;\n    z-index: 2;\n  }\n\n  input[type=range] {\n    -webkit-appearance: none !important;\n  }\n\n  input[type=range]::-webkit-slider-thumb {\n    -webkit-appearance: none !important;\n    height: 26px;\n    width: 26px;\n    border: 2px solid #B8B8B8;\n    background-color: #FFFFFF;\n    box-shadow: 0 2px 4px 0 rgba(0,0,0,0.08);\n    border-radius: 50%;\n    position: relative;\n    z-index: 10;\n  }\n\n  &__bar {\n    height: 6px;\n    width: 313px;\n    background: $alto;\n    display: flex;\n    justify-content: space-between;\n    position: absolute;\n    top: 11px;\n    z-index: 0;\n  }\n\n  &__low, &__high {\n    height: 6px;\n    width: 49px;\n    z-index: 1;\n  }\n\n  &__low {\n    background-color: $crimson;\n  }\n\n  &__high {\n    background-color: $caribbean-green;\n  }\n}",".settings {\n  position: relative;\n  background: $white;\n  display: flex;\n  flex-flow: column nowrap;\n  height: auto;\n  overflow: auto;\n}\n\n.settings__header {\n  padding: 25px;\n}\n\n.settings__close-button::after {\n  content: '\\00D7';\n  font-size: 40px;\n  color: $dusty-gray;\n  position: absolute;\n  top: 25px;\n  right: 30px;\n  cursor: pointer;\n}\n\n.settings__error {\n  padding-bottom: 20px;\n  text-align: center;\n  color: $crimson;\n}\n\n.settings__content {\n  padding: 0 25px;\n}\n\n.settings__content-row {\n  display: flex;\n  flex-direction: row;\n  padding: 10px 0 20px;\n\n  @media screen and (max-width: 575px) {\n    flex-direction: column;\n    padding: 10px 0;\n  }\n}\n\n.settings__content-item {\n  flex: 1;\n  min-width: 0;\n  display: flex;\n  flex-direction: column;\n  padding: 0 5px;\n  height: 71px;\n\n  @media screen and (max-width: 575px) {\n    height: initial;\n    padding: 5px 0;\n  }\n\n  &--without-height {\n    height: initial;\n  }\n}\n\n.settings__content-item-col {\n  max-width: 300px;\n  display: flex;\n  flex-direction: column;\n\n  @media screen and (max-width: 575px) {\n    max-width: 100%;\n    width: 100%;\n  }\n}\n\n.settings__content-description {\n  font-size: 14px;\n  color: $dusty-gray;\n  padding-top: 5px;\n}\n\n.settings__input {\n  padding-left: 10px;\n  font-size: 14px;\n  height: 40px;\n  border: 1px solid $alto;\n}\n\n.settings__input::-webkit-input-placeholder {\n  font-weight: 100;\n  color: $dusty-gray;\n}\n\n.settings__input::-moz-placeholder {\n  font-weight: 100;\n  color: $dusty-gray;\n}\n\n.settings__input:-ms-input-placeholder {\n  font-weight: 100;\n  color: $dusty-gray;\n}\n\n.settings__input:-moz-placeholder {\n  font-weight: 100;\n  color: $dusty-gray;\n}\n\n.settings__provider-wrapper {\n  font-size: 16px;\n  border: 1px solid $alto;\n  border-radius: 2px;\n  padding: 15px;\n  background-color: $white;\n  display: flex;\n  align-items: center;\n  justify-content: flex-start;\n}\n\n.settings__provider-icon {\n  height: 10px;\n  width: 10px;\n  margin-right: 10px;\n  border-radius: 10px;\n}\n\n.settings__rpc-save-button {\n  align-self: flex-end;\n  padding: 5px;\n  text-transform: uppercase;\n  color: $dusty-gray;\n  cursor: pointer;\n}\n\n.settings__clear-button {\n  font-size: 16px;\n  border: 1px solid $curious-blue;\n  color: $curious-blue;\n  border-radius: 2px;\n  padding: 18px;\n  background-color: $white;\n  text-transform: uppercase;\n}\n\n.settings__clear-button--red {\n  border: 1px solid $monzo;\n  color: $monzo;\n}\n\n.settings__info-logo-wrapper {\n  height: 80px;\n  margin-bottom: 20px;\n}\n\n.settings__info-logo {\n  max-height: 100%;\n  max-width: 100%;\n}\n\n.settings__info-item {\n  padding: 10px 0;\n}\n\n.settings__info-link-header {\n  padding-bottom: 15px;\n\n  @media screen and (max-width: 575px) {\n    padding-bottom: 5px;\n  }\n}\n\n.settings__info-link-item {\n  padding: 15px 0;\n\n  @media screen and (max-width: 575px) {\n    padding: 5px 0;\n  }\n}\n\n.settings__info-version-number {\n  padding-top: 5px;\n  font-size: 13px;\n  color: $dusty-gray;\n}\n\n.settings__info-about {\n  color: $dusty-gray;\n  margin-bottom: 15px;\n}\n\n.settings__info-link {\n  color: $curious-blue;\n}\n\n.settings__info-separator {\n  margin: 15px 0;\n  width: 80px;\n  border-color: $alto;\n  border: none;\n  height: 1px;\n  background-color: $alto;\n  color: $alto;\n}\n",".tab-bar {\n  display: flex;\n  flex-direction: row;\n  justify-content: flex-start;\n  align-items: flex-end;\n}\n\n.tab-bar__tab {\n  min-width: 0;\n  flex: 0 0 auto;\n  padding: 15px 25px;\n  border-bottom: 1px solid $alto;\n  box-sizing: border-box;\n  font-size: 18px;\n}\n\n.tab-bar__tab--active {\n  border-color: $black;\n}\n\n.tab-bar__grow-tab {\n  flex-grow: 1;\n}\n",".simple-dropdown {\n  height: 56px;\n  display: flex;\n  justify-content: flex-start;\n  align-items: center;\n  border: 1px solid $alto;\n  border-radius: 4px;\n  background-color: $white;\n  font-size: 16px;\n  color: #4d4d4d;\n  cursor: pointer;\n  position: relative;\n}\n\n.simple-dropdown__caret {\n  color: $silver;\n  padding: 0 10px;\n}\n\n.simple-dropdown__selected {\n  flex-grow: 1;\n  padding: 0 15px;\n}\n\n.simple-dropdown__options {\n  z-index: 1050;\n  position: absolute;\n  height: 220px;\n  width: 100%;\n  border: 1px solid #d2d8dd;\n  border-radius: 4px;\n  background-color: #fff;\n  -webkit-box-shadow: 0 3px 6px 0 rgba(0, 0, 0, .11);\n  box-shadow: 0 3px 6px 0 rgba(0, 0, 0, .11);\n  margin-top: 10px;\n  overflow-y: scroll;\n  left: 0;\n  top: 100%;\n}\n\n.simple-dropdown__option {\n  padding: 10px;\n\n  &:hover {\n    background-color: $gallery;\n  }\n}\n\n.simple-dropdown__option--selected {\n  background-color: $alto;\n\n  &:hover {\n    background-color: $alto;\n    cursor: default;\n  }\n}\n\n.simple-dropdown__close-area {\n  position: fixed;\n  top: 0;\n  left: 0;\n  z-index: 1000;\n  width: 100%;\n  height: 100%;\n}\n",".request-signature {\n  &__container {\n    width: 380px;\n    border-radius: 8px;\n    background-color: $white;\n    box-shadow: 0 2px 4px 0 rgba(0,0,0,0.08);\n    display: flex;\n    flex-flow: column nowrap;\n    z-index: 25;\n    align-items: center;\n    font-family: Roboto;\n    position: relative;\n    height: 100%;\n\n    @media screen and (max-width: $break-small) {\n      width: 100%;\n      top: 0;\n      box-shadow: none;\n    }\n\n    @media screen and (min-width: $break-large) {\n      max-height: 620px;\n    }\n  }\n\n  &__header {\n    height: 64px;\n    width: 100%;\n    position: relative;\n    display: flex;\n    flex-flow: column;\n    justify-content: center;\n    align-items: center;\n    flex: 0 0 auto;\n  }\n\n  &__header-background {\n    position: absolute;\n    background-color: $athens-grey;\n    z-index: 2;\n    width: 100%;\n    height: 100%;\n  }\n\n  &__header__text {\n    height: 29px;\n    width: 179px;\n    color: #5B5D67;\n    font-family: Roboto;\n    font-size: 22px;\n    font-weight: 300;\n    line-height: 29px;\n    z-index: 3;\n  }\n\n  &__header__tip-container {\n    width: 100%;\n    display: flex;\n    justify-content: center;\n  }\n\n  &__header__tip {\n    height: 25px;\n    width: 25px;\n    background: $athens-grey;\n    transform: rotate(45deg);\n    position: absolute;\n    bottom: -8px;\n    z-index: 1;\n  }\n\n  &__account-info {\n    display: flex;\n    justify-content: space-between;\n    margin-top: 18px;\n    margin-bottom: 20px;\n  }\n\n  &__account {\n    color: $dusty-gray;\n    margin-left: 17px;\n  }\n\n  &__account-text {\n    font-size: 14px;\n  }\n\n  &__balance {\n    color: $dusty-gray;\n    margin-right: 17px;\n    width: 124px;\n  }\n\n  &__balance-text {\n    text-align: right;\n    font-size: 14px;\n  }\n\n  &__balance-value {\n    text-align: right;\n    margin-top: 2.5px;\n  }\n\n  &__request-icon {\n    margin-top: 25px;\n  }\n\n  &__body {\n    width: 100%;\n    height: 100%;\n    display: flex;\n    flex-flow: column;\n    flex: 1 1 auto;\n    height: 0;\n  }\n\n  &__request-info {\n    display: flex;\n    justify-content: center;\n  }\n\n  &__headline {\n    height: 48px;\n    width: 240px;\n    color: $tundora;\n    font-family: Roboto;\n    font-size: 18px;\n    font-weight: 300;\n    line-height: 24px;\n    text-align: center;\n    margin-top: 20px;\n  }\n\n  &__notice,\n  &__warning {\n    font-family: \"Avenir Next\";\n    font-size: 14px;\n    line-height: 19px;\n    text-align: center;\n    margin-top: 41px;\n    margin-bottom: 11px;\n    width: 100%;\n  }\n\n  &__notice {\n    color: $dusty-gray;\n  }\n\n  &__warning {\n    color: $crimson;\n  }\n\n  &__rows {\n    height: 100%;\n    overflow-y: scroll;\n    overflow-x: hidden;\n    border-top: 1px solid $geyser;\n    display: flex;\n    flex-flow: column;\n  }\n\n  &__row {\n    display: flex;\n    flex-flow: column;\n  }\n\n  &__row-title {\n    width: 80px;\n    color: $dusty-gray;\n    font-family: Roboto;\n    font-size: 16px;\n    line-height: 22px;\n    margin-top: 12px;\n    margin-left: 18px;\n    width: 100%;\n  }\n\n  &__row-value {\n    color: $scorpion;\n    font-family: Roboto;\n    font-size: 14px;\n    line-height: 19px;\n    width: 100%;\n    overflow-wrap: break-word;\n    border-bottom: 1px solid #d2d8dd;\n    padding: 6px 18px 15px;\n  }\n\n  &__footer {\n    width: 100%;\n    display: flex;\n    align-items: center;\n    justify-content: space-evenly;\n    font-size: 22px;\n    position: relative;\n    flex: 0 0 auto;\n    border-top: 1px solid $geyser;\n\n    &__cancel-button,\n    &__sign-button {\n      display: flex;\n      align-items: center;\n      justify-content: center;\n      flex: 1 0 auto;\n      font-family: Roboto;\n      font-size: 16px;\n      font-weight: 300;\n      height: 55px;\n      line-height: 32px;\n      cursor: pointer;\n      border-radius: 2px;\n      box-shadow: none;\n      max-width: 162px;\n      margin: 12px;\n    }\n\n    &__cancel-button {\n      background: none;\n      border: 1px solid $dusty-gray;\n      margin-right: 6px;\n    }\n\n    &__sign-button {\n      background-color: $caribbean-green;\n      border-width: 0;\n      color: $white;\n      margin-left: 6px;\n    }\n  }\n}",".account-dropdown-mini {\n  height: 22px;\n  background-color: $white;\n  font-family: Roboto;\n  line-height: 16px;\n  font-size: 12px;\n  width: 124px;\n\n  &__close-area {\n    position: fixed;\n    top: 0;\n    left: 0;\n    z-index: 1000;\n    width: 100%;\n    height: 100%;\n  }\n\n  &__list {\n    z-index: 1050;\n    position: absolute;\n    height: 180px;\n    width: 96pxpx;\n    border: 1px solid $geyser;\n    border-radius: 4px;\n    background-color: $white;\n    box-shadow: 0 3px 6px 0 rgba(0 ,0 ,0 ,.11);\n    overflow-y: scroll;\n  }\n\n  .account-list-item {\n    margin-top: 6px;\n  }\n\n  .account-list-item__account-name {\n    text-overflow: ellipsis;\n    overflow: hidden;\n    white-space: nowrap;\n    width: 80px;\n  }\n\n  .account-list-item__top-row {\n    margin: 0;\n  }\n\n  .account-list-item__icon {\n    position: initial;\n  }\n}",".editable-label {\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  position: relative;\n\n  &__value {\n    max-width: 250px;\n    overflow: hidden;\n    white-space: nowrap;\n    text-overflow: ellipsis;\n  }\n\n  &__input {\n    width: 250px;\n    font-size: 14px;\n    text-align: center;\n    border: 1px solid $alto;\n\n    &--error {\n      border: 1px solid $monzo;\n    }\n  }\n\n  &__icon-wrapper {\n    position: absolute;\n    margin-left: 10px;\n    left: 100%;\n  }\n\n  &__icon {\n    cursor: pointer;\n    color: $dusty-gray;\n  }\n}\n","/*\n  Trumps\n */\n\n// Transitions\n\n/* universal */\n.app-primary .main-enter {\n  position: absolute;\n  width: 100%;\n}\n\n/* center position */\n.app-primary.from-right .main-enter-active,\n.app-primary.from-left .main-enter-active {\n  overflow-x: hidden;\n  transform: translateX(0);\n  transition: transform 300ms ease-in;\n}\n\n/* exited positions */\n.app-primary.from-left .main-leave-active {\n  transform: translateX(360px);\n  transition: transform 300ms ease-in;\n}\n\n.app-primary.from-right .main-leave-active {\n  transform: translateX(-360px);\n  transition: transform 300ms ease-in;\n}\n\n.sidebar.from-left {\n  transform: translateX(-320px);\n  transition: transform 300ms ease-in;\n}\n\n/* loader transitions */\n.loader-enter,\n.loader-leave-active {\n  opacity: 0;\n  transition: opacity 150 ease-in;\n}\n\n.loader-enter-active,\n.loader-leave {\n  opacity: 1;\n  transition: opacity 150 ease-in;\n}\n\n/* entering positions */\n.app-primary.from-right .main-enter:not(.main-enter-active) {\n  transform: translateX(360px);\n}\n\n.app-primary.from-left .main-enter:not(.main-enter-active) {\n  transform: translateX(-360px);\n}\n\ni.fa.fa-question-circle.fa-lg.menu-icon {\n  font-size: 18px;\n}\n\n// This text is contained inside a div.\n// ID needed to override user agent stylesheet.\n// See components/modal.scss\n\n/* stylelint-disable */\n#buy-modal-content-footer-text {\n  font-family: 'DIN OT';\n  font-size: 16px;\n}\n/* stylelint-enable */\n"],"names":[],"mappings":";AAAA;;;;;GAKG;AELH;;GAEG;AASH;;;GAGG;AA+BH;;GAEG;AAWH;;;;;;;GAOG;AAEH;;GAEG;ACrEH,OAAO,CAAC,6EAAI;AAEZ,OAAO,CAAC,kFAAI;AAEZ,UAAU;EACR,WAAW,EAAE,oBAAoB;EACjC,GAAG,EAAE,gDAAgD,CAAC,cAAc;EACpE,GAAG,EAAE,+CAA+C,CAAC,kBAAkB;EACvE,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,MAAM;EAClB,SAAS,EAAE,OAAO;;AAGpB,UAAU;EACR,WAAW,EAAE,iBAAiB;EAC9B,GAAG,EAAE,6CAA6C,CAAC,cAAc;EACjE,GAAG,EAAE,4CAA4C,CAAC,kBAAkB;EACpE,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,MAAM;;AAGpB,UAAU;EACR,WAAW,EAAE,kBAAkB;EAC/B,GAAG,EAAE,8CAA8C,CAAC,cAAc;EAClE,GAAG,EAAE,6CAA6C,CAAC,kBAAkB;EACrE,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,MAAM;;AAGpB,UAAU;EACR,WAAW,EAAE,uBAAuB;EACpC,GAAG,EAAE,mDAAmD,CAAC,cAAc;EACvE,GAAG,EAAE,kDAAkD,CAAC,kBAAkB;EAC1E,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,MAAM;;AAGpB,UAAU;EACR,WAAW,EAAE,QAAQ;EACrB,GAAG,EAAE,gCAAgC,CAAC,kBAAkB;EACxD,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,MAAM;;AAGpB,UAAU;EACR,WAAW,EAAE,cAAc;EAC3B,GAAG,EAAE,gCAAgC,CAAC,kBAAkB;EACxD,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,MAAM;;AAGpB,UAAU;EACR,WAAW,EAAE,UAAU;EACvB,GAAG,EAAE,+CAA+C,CAAC,kBAAkB;EACvE,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,MAAM;;AAGpB,UAAU;EACR,WAAW,EAAE,gBAAgB;EAC7B,GAAG,EAAE,6CAA6C,CAAC,kBAAkB;EACrE,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,MAAM;;AAGpB,UAAU;EACR,WAAW,EAAE,MAAM;EACnB,GAAG,EAAE,mCAAmC,CAAC,kBAAkB;EAC3D,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,MAAM;;AErEpB;;GAEG;AAEH,WAAW;AAEX,AAAA,aAAa,CAAC;EACZ,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,aAAa,CAAC;EACZ,KAAK,EAAE,OAAO,GACf;;AAED,SAAS;AAET,AAAA,UAAU,CAAC;EACT,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI,GACZ;;AAED,AAAA,WAAW,CAAC;EACV,KAAK,EAAE,IAAI,GACZ;;AAED,AAAA,iBAAiB,CAAC;EAChB,OAAO,EAAE,IAAI;EACb,IAAI,EAAE,QAAQ;EACd,cAAc,EAAE,MAAM,GACvB;;AAED,AAAA,YAAY,CAAC;EACX,MAAM,EAAE,IAAI,GACb;;AAED,AAAA,YAAY,CAAC;EACX,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM,GACvB;;AAED,AAAA,cAAc,CAAC;EACb,eAAe,EAAE,aAAa,GAC/B;;AAED,AAAA,aAAa,CAAC;EACZ,eAAe,EAAE,YAAY,GAC9B;;AAED,AAAA,mBAAmB,CAAC;EAClB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,cAAc,GAC/B;;AAED,AAAA,SAAS,CAAC;EACR,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG,GACpB;;AAED,AAAA,mBAAmB,CAAC;EAClB,eAAe,EAAE,aAAa,GAC/B;;AAED,AAAA,kBAAkB,CAAC;EACjB,eAAe,EAAE,YAAY,GAC9B;;AAED,AAAA,WAAW,CAAC;EACV,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,eAAe,EAAE,QAAQ,GAC1B;;AAED,AAAA,UAAU,CAAC;EACT,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,eAAe,EAAE,UAAU,GAC5B;;AAED,AAAA,WAAW,CAAC;EACV,IAAI,EAAE,IAAI,GACX;;AAED,AAAA,gBAAgB,CAAC;EACf,UAAU,EAAE,IAAI,GACjB;;AAED,AAAA,UAAU,CAAC;EACT,IAAI,EAAE,QAAQ,GACf;;AAED,AAAA,UAAU,CAAC;EACT,SAAS,EAAE,IAAI,GAChB;;AAED,AAAA,YAAY,CAAC;EACX,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM;EACvB,WAAW,EAAE,MAAM,GACpB;;AAED,AAAA,oBAAoB,CAAC;EACnB,eAAe,EAAE,MAAM,GACxB;;AAED,AAAA,kBAAkB,CAAC;EACjB,WAAW,EAAE,MAAM,GACpB;;AAED,AAAA,cAAc,CAAC;EACb,UAAU,EAAE,QAAQ,GACrB;;AAED,AAAA,kBAAkB,CAAC;EACjB,UAAU,EAAE,OAAO,GACpB;;AAED,AAAA,cAAc,CAAC;EACb,cAAc,EAAE,MAAM,GACvB;;AAED,AAAA,OAAO,CAAC;EACN,OAAO,EAAE,CAAC,GACX;;AAED,AAAA,YAAY,CAAC;EACX,MAAM,EAAE,OAAO;EACf,gBAAgB,EAAE,IAAI;EACtB,mBAAmB,EAAE,IAAI;EACzB,eAAe,EAAE,IAAI;EACrB,WAAW,EAAE,IAAI,GAClB;;AAED,AAAA,QAAQ,CAAC;EACP,MAAM,EAAE,OAAO,GAChB;;AAED,AAAA,eAAe,CAAC;EACd,MAAM,EAAE,OAAO;EACf,gBAAgB,EAAE,aAAa;EAC/B,UAAU,EAAE,0BAA0B,GACvC;;AAED,AAAA,eAAe,AAAA,MAAM,CAAC;EACpB,SAAS,EAAE,UAAU,GACtB;;AAED,AAAA,eAAe,AAAA,OAAO,CAAC;EACrB,SAAS,EAAE,WAAU,GACtB;;AAED,AAAA,gBAAgB,CAAC;EACf,MAAM,EAAE,WAAW,GACpB;;AAED,AAAA,kBAAkB,CAAC;EACjB,aAAa,EAAE,IAAI,GACpB;;AAED,AAAA,kBAAkB,CAAC;EACjB,aAAa,EAAE,IAAI,GACpB;;AAED,AAAA,kBAAkB,CAAC;EACjB,MAAM,EAAE,MAAM,GACf;;AAED,AAAA,KAAK,CAAC;EACJ,WAAW,EAAE,GAAG,GACjB;;AAED,AAAA,yBAAyB,CAAC;EACxB,cAAc,EAAE,SAAS,GAC1B;;AAED,AAAA,WAAW,CAAC;EACV,SAAS,EAAE,IAAI,GAChB;;AAED,AAAA,YAAY,CAAC;EACX,SAAS,EAAE,KAAK,GACjB;;AAED,AAAA,EAAE,AAAA,gBAAgB,CAAC;EACjB,OAAO,EAAE,KAAK;EACd,MAAM,EAAE,GAAG;EACX,MAAM,EAAE,CAAC;EACT,UAAU,EAAE,cAAc;EAC1B,MAAM,EAAE,KAAK;EACb,OAAO,EAAE,CAAC,GACX;;AAED,AAAA,YAAY,AAAA,MAAM,CAAC;EACjB,UAAU,EHzKJ,IAAI,GG0KX;;AAED,AAAA,QAAQ,CAAC;EACP,UAAU,EAAE,OAAO;EACnB,KAAK,EH9KC,IAAI;EG+KV,aAAa,EAAE,IAAI,GACpB;;AAED,AAAA,QAAQ,CAAC;EACP,SAAS,EAAE,aAAa;EACxB,UAAU,EAAE,OAAO,GACpB;;AAED,AAAA,eAAe,CAAC;EACd,SAAS,EAAE,aAAa;EACxB,MAAM,EAAE,iBAAiB,GAC1B;;AAED,AAAA,cAAc,CAAC;EACb,UAAU,EAAE,OAAO,GACpB;;AAED,AAAA,YAAY,CAAC;EACX,UAAU,EHhNN,IAAI;EGiNR,IAAI,EAAE,IAAI;EACV,GAAG,EAAE,IAAI;EACT,KAAK,EHpMC,IAAI;EGqMV,aAAa,EAAE,IAAI;EACnB,MAAM,EAAE,IAAI;EACZ,SAAS,EAAE,IAAI;EACf,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,eAAe,EAAE,MAAM;EACvB,OAAO,EAAE,GAAG;EACZ,OAAO,EAAE,CAAC,GACX;;AAED,AAAA,cAAc,CAAC;EACb,OAAO,EAAE,CAAC;EACV,SAAS,EAAE,GAAG;EACd,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,wBAAwB;EACpC,KAAK,EAAE,IAAI;EACX,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,GAAG;EACZ,UAAU,EAAE,MAAM;EAClB,MAAM,EAAE,IAAI,GACb;;AAED,AAAA,cAAc,CAAC;EACb,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM,GACpB;;AAED,AAAA,WAAW,CAAC;EACV,SAAS,EAAE,KAAK,GACjB;;AAED,AAAA,UAAU,CAAC;EACT,OAAO,EAAE,YAAY;EACrB,MAAM,EAAE,IAAI;EACZ,SAAS,EAAE,IAAI;EACf,MAAM,EAAE,IAAI,GACb;;AAED,AAAA,WAAW,CAAC;EACV,UAAU,EAAE,OAAe;EAC3B,aAAa,EAAE,IAAI,GACpB;;AAED,AAAA,aAAa,CAAC;EACZ,UAAU,EAAE,OAAO,GACpB;;AAED,AAAA,eAAe,CAAC;EACd,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM,GACpB;;AAED,AAAA,UAAU,CAAC;EACT,UAAU,EAAE,MAAM,GACnB;;AAED,AAAA,gBAAgB,CAAC;EACf,QAAQ,EAAE,MAAM;EAChB,aAAa,EAAE,QAAQ;EACvB,WAAW,EAAE,MAAM,GACpB;;AAED,AAAA,eAAe,CAAC;EACd,UAAU,EAAE,MAAM;EAClB,UAAU,EAAE,IAAI;EAChB,KAAK,EHtRD,IAAI,GGuRT;;AAED;;GAEG;AAGH,AAAA,cAAc,CAAC;EACb,cAAc,EAAE,IAAI,GACrB;;AAED,AAAA,OAAO,CAAC;EACN,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,MAAM,CAAC;EACL,WAAW,EAAE,GAAG;EAChB,KAAK,EAAE,OAAO;EACd,IAAI,EAAE,QAAQ;EACd,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,QAAQ,GAC1B;;ACpTD;;GAEG;ACFH;;;EAGE;AAEF,AAAA,IAAI;AACJ,AAAA,IAAI;AACJ,AAAA,GAAG;AACH,AAAA,IAAI;AACJ,AAAA,MAAM;AACN,AAAA,MAAM;AACN,AAAA,MAAM;AACN,AAAA,EAAE;AACF,AAAA,EAAE;AACF,AAAA,EAAE;AACF,AAAA,EAAE;AACF,AAAA,EAAE;AACF,AAAA,EAAE;AACF,AAAA,CAAC;AACD,AAAA,UAAU;AACV,AAAA,GAAG;AACH,AAAA,CAAC;AACD,AAAA,IAAI;AACJ,AAAA,OAAO;AACP,AAAA,OAAO;AACP,AAAA,GAAG;AACH,AAAA,IAAI;AACJ,AAAA,IAAI;AACJ,AAAA,GAAG;AACH,AAAA,GAAG;AACH,AAAA,EAAE;AACF,AAAA,GAAG;AACH,AAAA,GAAG;AACH,AAAA,GAAG;AACH,AAAA,CAAC;AACD,AAAA,CAAC;AACD,AAAA,IAAI;AACJ,AAAA,KAAK;AACL,AAAA,MAAM;AACN,AAAA,MAAM;AACN,AAAA,GAAG;AACH,AAAA,GAAG;AACH,AAAA,EAAE;AACF,AAAA,GAAG;AACH,AAAA,CAAC;AACD,AAAA,CAAC;AACD,AAAA,CAAC;AACD,AAAA,MAAM;AACN,AAAA,EAAE;AACF,AAAA,EAAE;AACF,AAAA,EAAE;AACF,AAAA,EAAE;AACF,AAAA,EAAE;AACF,AAAA,EAAE;AACF,AAAA,QAAQ;AACR,AAAA,IAAI;AACJ,AAAA,KAAK;AACL,AAAA,MAAM;AACN,AAAA,KAAK;AACL,AAAA,OAAO;AACP,AAAA,KAAK;AACL,AAAA,KAAK;AACL,AAAA,KAAK;AACL,AAAA,EAAE;AACF,AAAA,EAAE;AACF,AAAA,EAAE;AACF,AAAA,OAAO;AACP,AAAA,KAAK;AACL,AAAA,MAAM;AACN,AAAA,OAAO;AACP,AAAA,KAAK;AACL,AAAA,MAAM;AACN,AAAA,UAAU;AACV,AAAA,MAAM;AACN,AAAA,MAAM;AACN,AAAA,MAAM;AACN,AAAA,IAAI;AACJ,AAAA,GAAG;AACH,AAAA,MAAM;AACN,AAAA,IAAI;AACJ,AAAA,OAAO;AACP,AAAA,OAAO;AACP,AAAA,IAAI;AACJ,AAAA,IAAI;AACJ,AAAA,KAAK;AACL,AAAA,KAAK,CAAC;EACJ,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,MAAM,EAAE,CAAC;EACT,SAAS,EAAE,IAAI;EACf,uBAAuB;EACvB,IAAI,EAAE,OAAO;EACb,sBAAsB;EACtB,cAAc,EAAE,QAAQ,GACzB;;AAED,iDAAiD;AAEjD,uBAAuB;AAEvB,AAAA,OAAO;AACP,AAAA,KAAK;AACL,AAAA,OAAO;AACP,AAAA,UAAU;AACV,AAAA,MAAM;AACN,AAAA,MAAM;AACN,AAAA,MAAM;AACN,AAAA,MAAM;AACN,AAAA,IAAI;AACJ,AAAA,GAAG;AACH,AAAA,OAAO,CAAC;EACN,OAAO,EAAE,KAAK,GACf;;AAED,AAAA,IAAI,CAAC;EACH,WAAW,EAAE,CAAC,GACf;;AAED,AAAA,EAAE;AACF,AAAA,EAAE,CAAC;EACD,UAAU,EAAE,IAAI,GACjB;;AAED,AAAA,UAAU;AACV,AAAA,CAAC,CAAC;EACA,MAAM,EAAE,IAAI,GACb;;AAED,AAAA,UAAU,AAAA,OAAO;AACjB,AAAA,UAAU,AAAA,MAAM;AAChB,AAAA,CAAC,AAAA,OAAO;AACR,AAAA,CAAC,AAAA,MAAM,CAAC;EACN,OAAO,EAAE,EAAE;EACX,OAAO,EAAE,IAAI,GACd;;AAED,AAAA,KAAK,CAAC;EACJ,eAAe,EAAE,QAAQ;EACzB,cAAc,EAAE,CAAC,GAClB;;AAED,AAAA,MAAM,CAAC;EACL,YAAY,EAAE,IAAI;EAClB,MAAM,EAAE,OAAO,GAChB;;AAED,sBAAsB;AD5ItB,AAAA,CAAC,CAAC;EACA,UAAU,EAAE,UAAU,GACvB;;AAED,AAAA,IAAI;AACJ,AAAA,IAAI,CAAC;EACH,WAAW,EAAE,aAAa;EAC1B,KAAK,EAAE,OAAO;EACd,WAAW,EAAE,GAAG;EAChB,WAAW,EAAE,KAAK;EAClB,UAAU,EAAE,OAAO;EACnB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC,GACX;;AAED,AAAA,IAAI,CAAC;EACH,UAAU,EAAE,KAAK,GAClB;;AAED,AAAA,SAAS,CAAC;EACR,QAAQ,EAAE,MAAM;EAChB,QAAQ,EAAE,QAAQ,GACnB;;AAED,AAAA,YAAY,CAAC;EACX,OAAO,EAAE,IAAI,GACd;;AAED,AAAA,KAAK,AAAA,MAAM;AACX,AAAA,QAAQ,AAAA,MAAM,CAAC;EACb,OAAO,EAAE,IAAI,GACd;;AAED,uBAAuB;AACvB,AAAA,YAAY,CAAC;EACX,UAAU,EAAE,MAAM;EAClB,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM,GAKvB;EAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IANrC,AAAA,YAAY,CAAC;MAOT,gBAAgB,EJ1BZ,IAAI,GI4BX;;AACD,sBAAsB;AAEtB,AAAA,CAAC,CAAC;EACA,eAAe,EAAE,IAAI;EACrB,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,CAAC,AAAA,MAAM,CAAC;EACN,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,KAAK,AAAA,YAAY;AACjB,AAAA,QAAQ,AAAA,YAAY,CAAC;EACnB,OAAO,EAAE,GAAG,GACb;;AAED,AAAA,KAAK,AAAA,YAAY,CAAC;EAChB,MAAM,EAAE,IAAI,GACb;;AKtED;;GAEG;AAEH,AAAA,UAAU,CAAC;EACT,gBAAgB,EAAE,OAAO,GAC1B;;AAED,AAAA,MAAM,AAAA,UAAU,CAAC;EACf,UAAU,ETcJ,IAAI;ESbV,MAAM,EAAE,SAAS,GAClB;;AAkBD,AAAA,MAAM,CAAA,AAAA,QAAC,AAAA;AACP,AAAA,KAAK,CAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,EAAc,AAAA,QAAC,AAAA,EAAU;EAC7B,MAAM,EAAE,WAAW;EACnB,OAAO,EAAE,EAAE,GAGZ;;AAaD,AAAA,MAAM,AAAA,QAAQ,CAAC;EACb,OAAO,EAAE,QAAQ;EACjB,UAAU,EAAE,OAAO;EACnB,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,wBAAuB;EAC7C,KAAK,ET7BC,IAAI;ES8BV,SAAS,EAAE,KAAK;EAChB,WAAW,EAAE,MAAM;EACnB,cAAc,EAAE,SAAS,GAC1B;;AAED,AAAA,UAAU,CAAC;EACT,OAAO,EAAE,QAAQ;EAEjB,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,wBAAuB;EAC7C,KAAK,EAAE,OAAO;EACd,SAAS,EAAE,KAAK;EAChB,WAAW,EAAE,MAAM;EACnB,cAAc,EAAE,SAAS;EACzB,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,IAAI;EACjB,aAAa,EAAE,GAAG;EAClB,MAAM,EAAE,iBAAiB;EACzB,OAAO,EAAE,EAAE,GACZ;;AAGD,AAAA,MAAM,AAAA,SAAS,CAAC;EACd,MAAM,EAAE,SAAS;EACjB,YAAY,EAAE,OAAO;EACrB,KAAK,EAAE,OAAO;EACd,UAAU,EAAE,OAAiB;EAC7B,aAAa,EAAE,GAAG;EAClB,SAAS,EAAE,KAAK;EAChB,MAAM,EAAE,MAAM;EACd,OAAO,EAAE,GAAG;EACZ,SAAS,EAAE,IAAI,GAChB;;AAED,AAAA,cAAc,CAAC;EACb,MAAM,EAAE,iBAAiB;EACzB,aAAa,EAAE,GAAG;EAClB,gBAAgB,ETlEV,IAAI;ESmEV,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,OAAO,EAAE,SAAS,GAMnB;EAZD,AAQE,cARY,CAQZ,AAAA,QAAE,AAAA,EAAU;IACV,gBAAgB,ETxEZ,IAAI,CSwEiB,UAAU;IACnC,OAAO,EAAE,EAAE,GACZ;;AAGH,AAAA,aAAa,CAAC;EACZ,MAAM,EAAE,qBAAqB;EAC7B,aAAa,EAAE,GAAG;EAClB,gBAAgB,EAAE,WAAW;EAC7B,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,OAAO,EAAE,SAAS,GACnB;;AC3GD,AAAA,WAAW,CAAC;EACV,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,OAAO;EACnB,UAAU,EVgBF,OAAO;EUff,QAAQ,EAAE,QAAQ;EAClB,OAAO,EV8CQ,EAAE;EU7CjB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,aAAa,GA0BzB;EAxBC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IATrC,AAAA,WAAW,CAAC;MAUR,OAAO,EAAE,IAAI;MACb,KAAK,EAAE,IAAI;MACX,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,mBAAkB;MACxC,OAAO,EVuCa,EAAE,GUnBzB;EAjBC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAhBrC,AAAA,WAAW,CAAC;MAiBR,MAAM,EAAE,IAAI;MACZ,eAAe,EAAE,MAAM,GAe1B;MAjCD,AAoBI,WApBO,AAoBP,OAAQ,CAAC;QACP,OAAO,EAAE,EAAE;QACX,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;QACZ,UAAU,EVNN,OAAO;QUOX,MAAM,EAAE,KAAK,GACd;EA3BL,AA8BE,WA9BS,CA8BT,aAAa,CAAC;IACZ,MAAM,EAAE,OAAO,GAChB;;AAGH,AAAA,oBAAoB,CAAC;EACnB,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,aAAa;EAC9B,SAAS,EAAE,UAAU;EACrB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,KAAK,GAiBd;EAfC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAPrC,AAAA,oBAAoB,CAAC;MAQjB,MAAM,EAAE,IAAI,GAcf;EAXC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAXrC,AAAA,oBAAoB,CAAC;MAYjB,KAAK,EAAE,IAAI,GAUd;EAPC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAfrC,AAAA,oBAAoB,CAAC;MAgBjB,KAAK,EAAE,IAAI,GAMd;EAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,MAAM;IAnBtC,AAAA,oBAAoB,CAAC;MAoBjB,KAAK,EAAE,IAAI,GAEd;;AAED,AAAY,WAAD,CAAC,EAAE,CAAC;EACb,WAAW,EAAE,MAAM;EACnB,cAAc,EAAE,SAAS;EACzB,WAAW,EAAE,GAAG;EAChB,KAAK,EAAE,OAAO;EACd,WAAW,EAAE,IAAI,GAKlB;EAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAPrC,AAAY,WAAD,CAAC,EAAE,CAAC;MAQX,OAAO,EAAE,IAAI,GAEhB;;AAED,AAAA,EAAE,AAAA,cAAc,CAAC;EACf,cAAc,EAAE,SAAS;EACzB,KAAK,EAAE,OAAO;EACd,SAAS,EAAE,GAAG;EACd,MAAM,EAAE,IAAI,GACb;;AAED,AAAA,0BAA0B,CAAC;EACzB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,WAAW,EAAE,MAAM,GACpB;;AAED,AAAA,kBAAkB,CAAC;EACjB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,OAAO,GAChB;;AAED,AAAA,sBAAsB,CAAC;EACrB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,UAAU;EACrB,WAAW,EAAE,MAAM,GAKpB;EARD,AAKE,sBALoB,CAKpB,UAAU,CAAC;IACT,MAAM,EAAE,OAAO,GAChB;;AClGH,AAAA,WAAW,CAAC;EACV,cAAc,EAAE,IAAI;EACpB,WAAW,EAAE,MAAM,GACpB;;ACHD,AAAA,4BAA4B,CAAC;EAE3B,MAAM,EAAE,OAAO,GAKhB;EAPD,AAIE,4BAJ0B,CAI1B,cAAc,CAAC;IACb,OAAO,EAAE,CAAC,GACX;;AAGH,AAAA,kBAAkB,AAAA,QAAQ,CAAC;EACzB,MAAM,EAAE,GAAG,CAAC,KAAK,CZWX,OAAO;EYVb,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,GAAG;EACZ,IAAI,EAAE,QAAQ,GAiCf;EArCD,AAME,kBANgB,AAAA,QAAQ,AAMxB,iBAAkB,CAAC;IACjB,YAAY,EAAE,OAAgB,GAK/B;IAZH,AASsB,kBATJ,AAAA,QAAQ,AAMxB,iBAAkB,CAGhB,iBAAiB,CAAC,GAAG,CAAC;MACpB,gBAAgB,EAAE,sBAAqB,CAAC,UAAU,GACnD;EAXL,AAcE,kBAdgB,AAAA,QAAQ,AAcxB,qBAAsB,CAAC;IACrB,YAAY,EAAE,OAAgB,GAK/B;IApBH,AAiBsB,kBAjBJ,AAAA,QAAQ,AAcxB,qBAAsB,CAGpB,iBAAiB,CAAC,GAAG,CAAC;MACpB,gBAAgB,EAAE,sBAAqB,CAAC,UAAU,GACnD;EAnBL,AAsBE,kBAtBgB,AAAA,QAAQ,AAsBxB,mBAAoB,CAAC;IACnB,YAAY,EAAE,OAAgB,GAK/B;IA5BH,AAyBsB,kBAzBJ,AAAA,QAAQ,AAsBxB,mBAAoB,CAGlB,iBAAiB,CAAC,GAAG,CAAC;MACpB,gBAAgB,EAAE,sBAAqB,CAAC,UAAU,GACnD;EA3BL,AA8BE,kBA9BgB,AAAA,QAAQ,AA8BxB,qBAAsB,CAAC;IACrB,YAAY,EAAE,OAAiB,GAKhC;IApCH,AAiCsB,kBAjCJ,AAAA,QAAQ,AA8BxB,qBAAsB,CAGpB,iBAAiB,CAAC,GAAG,CAAC;MACpB,gBAAgB,EAAE,uBAAsB,CAAC,UAAU,GACpD;;AAIL,AACE,mBADiB,CACjB,iBAAiB;AADnB,AAEE,mBAFiB,CAEjB,yBAAyB,CAAC;EACxB,MAAM,EAAE,MAAM,GACf;;AAGH,AAAA,kBAAkB,CAAC;EACjB,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI,GAOhB;EAVD,AAKE,kBALgB,CAKhB,cAAc,CAAC;IACb,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,IAAI;IACf,OAAO,EAAE,KAAK,GACf;;AAGH,AAAA,aAAa,CAAC;EACZ,WAAW,EAAE,IAAI;EACjB,OAAO,EAAE,KAAK;EACd,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI;EACf,IAAI,EAAE,QAAQ,GACf;;AAED,AAAA,eAAe,CAAC;EACd,KAAK,EAAE,GAAG,GAaX;EAXC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAHrC,AAAA,eAAe,CAAC;MAIZ,KAAK,EAAE,+BAA+B,GAUzC;EAPC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAPrC,AAAA,eAAe,CAAC;MAQZ,KAAK,EAAE,+BAA+B,GAMzC;EAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,MAAM;IAXtC,AAAA,eAAe,CAAC;MAYZ,KAAK,EAAE,+BAA+B,GAEzC;;AAED,AAAA,kBAAkB,CAAC;EACjB,WAAW,EAAE,GAAG;EAChB,IAAI,EAAE,QAAQ;EACd,KAAK,EZtEM,OAAO,GYuEnB;;AAED,AAAA,cAAc;AACd,AAAA,2BAA2B,CAAC;EAC1B,KAAK,EZ5EC,IAAI;EY6EV,WAAW,EAAE,GAAG,GACjB;;AAED,AAAA,2BAA2B,CAAC;EAC1B,OAAO,EAAE,CAAC;EACV,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,CAAC,GACV;;AAED,AAAA,iBAAiB;AACjB,AAAA,yBAAyB,CAAC;EACxB,UAAU,EAAE,IAAI;EAChB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM;EACvB,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,qBAAqB;EAC7B,MAAM,EAAE,KAAK,GACd;;AAED,AAAA,yBAAyB,CAAC;EACxB,MAAM,EAAE,GAAG,CAAC,KAAK,CZlGX,IAAI;EYmGV,UAAU,EAAE,wBAAuB,GACpC;;AAED,AAAkB,iBAAD,CAAC,GAAG;AACrB,AAA0B,yBAAD,CAAC,GAAG,CAAC;EAC5B,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,aAAa,EAAE,IAAI,GACpB;;AAED,AAA0B,yBAAD,CAAC,GAAG,CAAC;EAC5B,OAAO,EAAE,CAAC,GACX;;AAED,AAAA,wBAAwB,CAAC;EACvB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,WAAW,EAAE,MAAM;EACnB,KAAK,EAAE,IAAI,GACZ;;AAED,AAAA,yBAAyB,CAAC;EACxB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,GAAG;EACX,MAAM,EAAE,MAAM;EACd,gBAAgB,EZnHP,OAAO,GYoHjB;;AAED,AAAA,uBAAuB,CAAC;EACtB,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,KAAK,EZlIC,IAAI;EYmIV,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,MAAM,GACnB;;AAED,AAAA,yBAAyB,CAAC;EACxB,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,KAAK;EACZ,KAAK,EZ3IM,OAAO;EY4IlB,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI,GAClB;;ACvKD,AAAS,MAAH,GAAG,GAAG,AAAA,MAAM,CAAC;EACjB,OAAO,EAAE,eAAe,GACzB;;AAGD,AAAA,kBAAkB,CAAC;EACjB,cAAc,EAAE,MAAM;EACtB,WAAW,EAAE,MAAM;EACnB,eAAe,EAAE,MAAM;EACvB,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,MAAM;EACnB,OAAO,EAAE,MAAM,GAChB;;AAED,AAAA,yBAAyB,CAAC;EACxB,MAAM,EAAE,OAAO;EACf,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,iBAAiB,EAAE,AAAA,cAAc,CAAC;EAChC,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,IAAI;EACZ,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI,GAChB;;AAED,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;EACjC,AAAA,gCAAgC,CAAC;IAC/B,eAAe,EAAE,YAAY;IAC7B,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,KAAK,GACd;EAED,AAAA,wBAAwB,CAAC;IACvB,SAAS,EAAE,IAAI;IACf,UAAU,EAAE,IAAI,GACjB;EAED,AAAA,0BAA0B,CAAC;IACzB,cAAc,EAAE,MAAM;IACtB,OAAO,EAAE,MAAM,GAChB;EAED,AAAA,yBAAyB,CAAC;IACxB,cAAc,EAAE,SAAS;IACzB,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI,GACb;EAED,AAAA,GAAG,AAAA,yBAAyB,CAAC;IAC3B,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,MAAM;IACtB,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,MAAM;IAClB,aAAa,EAAE,GAAG;IAClB,MAAM,EAAE,GAAG,CAAC,KAAK,CbnDb,IAAI;IaoDR,OAAO,EAAE,KAAK;IACd,eAAe,EAAE,MAAM,GASxB;IAnBD,AAYE,GAZC,AAAA,yBAAyB,CAY1B,GAAG,AAAA,+BAA+B,CAAC;MACjC,SAAS,EAAE,IAAI,GAChB;IAdH,AAgBE,GAhBC,AAAA,yBAAyB,CAgB1B,GAAG,AAAA,kCAAkC,CAAC;MACpC,SAAS,EAAE,IAAI,GAChB;;AAIL,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;EACjC,AAAA,gCAAgC,CAAC;IAC/B,eAAe,EAAE,YAAY;IAC7B,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,KAAK,GACd;EAED,AAAA,wBAAwB,CAAC;IACvB,SAAS,EAAE,IAAI;IACf,UAAU,EAAE,IAAI,GACjB;EAED,AAAA,yBAAyB,CAAC;IACxB,cAAc,EAAE,SAAS;IACzB,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI,GACb;EAED,AAAA,0BAA0B,CAAC;IACzB,cAAc,EAAE,GAAG;IACnB,MAAM,EAAE,WAAW,GACpB;EAED,AAAA,GAAG,AAAA,yBAAyB,CAAC;IAC3B,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,MAAM;IACtB,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,KAAK;IACb,UAAU,EAAE,MAAM;IAClB,aAAa,EAAE,GAAG;IAClB,MAAM,EAAE,GAAG,CAAC,KAAK,Cb/Fb,IAAI;IagGR,MAAM,EAAE,KAAK;IACb,OAAO,EAAE,MAAM,GA0ChB;IAnDD,AAWE,GAXC,AAAA,yBAAyB,CAW1B,GAAG,AAAA,+BAA+B,CAAC;MACjC,SAAS,EAAE,IAAI;MACf,aAAa,EAAE,IAAI,GASpB;IAPC,MAAM,CAAC,MAA6B,MAtCvB,SAAS,EAAE,KAAK,OAsCV,SAAS,EAAE,KAAK;MAfvC,AAWE,GAXC,AAAA,yBAAyB,CAW1B,GAAG,AAAA,+BAA+B,CAAC;QAK/B,SAAS,EAAE,IAAI,GAMlB;IAHC,MAAM,CAAC,MAA8B,MA1CxB,SAAS,EAAE,KAAK,OA0CV,SAAS,EAAE,MAAM;MAnBxC,AAWE,GAXC,AAAA,yBAAyB,CAW1B,GAAG,AAAA,+BAA+B,CAAC;QAS/B,SAAS,EAAE,IAAI,GAElB;;AA7CL,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAuBjC,AAwBE,GAxBC,AAAA,yBAAyB,CAwB1B,GAAG,AAAA,kCAAkC,CAAC;MACpC,SAAS,EAAE,IAAI;MACf,OAAO,EAAE,MAAM;MACf,MAAM,EAAE,GAAG,GAmBZ;IAjBC,MAAM,CAAC,MAA6B,MApDvB,SAAS,EAAE,KAAK,OAoDV,SAAS,EAAE,KAAK;MA7BvC,AAwBE,GAxBC,AAAA,yBAAyB,CAwB1B,GAAG,AAAA,kCAAkC,CAAC;QAMlC,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,MAAM;QACf,aAAa,EAAE,GAAG;QAClB,WAAW,EAAE,IAAI,GAapB;IAVC,MAAM,CAAC,MAA6B,MA3DvB,SAAS,EAAE,KAAK,OA2DV,SAAS,EAAE,KAAK;MApCvC,AAwBE,GAxBC,AAAA,yBAAyB,CAwB1B,GAAG,AAAA,kCAAkC,CAAC;QAalC,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,KAAK;QACd,aAAa,EAAE,GAAG,GAOrB;IAJC,MAAM,CAAC,MAA8B,MAjExB,SAAS,EAAE,KAAK,OAiEV,SAAS,EAAE,MAAM;MA1CxC,AAwBE,GAxBC,AAAA,yBAAyB,CAwB1B,GAAG,AAAA,kCAAkC,CAAC;QAmBlC,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,CAAC,GAEb;;AArEL,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAuBjC,AAgDE,GAhDC,AAAA,yBAAyB,CAgD1B,GAAG,AAAA,yBAAyB,CAAC;MAC3B,UAAU,EAAE,GAAG,GAChB;;AAKL,AAAA,gCAAgC,CAAC;EAC/B,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,eAAe,EAAE,UAAU;EAC3B,WAAW,EAAE,MAAM;EACnB,QAAQ,EAAE,QAAQ,GACnB;;AAED,AAAA,+BAA+B,CAAC;EAC9B,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,IAAI;EACT,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,IAAI,GAChB;;AAED,AAAA,8BAA8B,CAAC;EAC7B,MAAM,EAAE,IAAI,GACb;;AAED,AAAA,oCAAoC,CAAC;EACnC,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,IAAI;EACZ,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,IAAI,GACjB;;AAED,AAAA,8BAA8B,CAAC;EAC7B,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,IAAI;EAChB,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI,GAChB;;AAGD,AAAA,wBAAwB,CAAC;EACvB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,eAAe,EAAE,UAAU;EAC3B,WAAW,EAAE,MAAM;EACnB,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,YAAY;EACrB,MAAM,EAAE,GAAG,CAAC,KAAK,CbhKV,OAAO;EaiKd,aAAa,EAAE,GAAG;EAClB,WAAW,EAAE,MAAM,GAKpB;EAdD,AAWE,wBAXsB,CAWtB,MAAM,CAAC;IACL,MAAM,EAAE,OAAO,GAChB;;AAGH,AAAA,mBAAmB,CAAC;EAClB,KAAK,EbnLM,OAAO;EaoLlB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,IAAI;EACT,IAAI,EAAE,IAAI;EACV,MAAM,EAAE,OAAO,GAQhB;EANC,AAAA,yBAAO,CAAC;IACN,UAAU,EAAE,GAAG;IACf,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI,GAClB;;AAGH,AAAA,oBAAoB,AAAA,OAAO,CAAC;EAC1B,OAAO,EAAE,OAAO;EAChB,SAAS,EAAE,IAAI;EACf,KAAK,EbpMM,OAAO;EaqMlB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,IAAI;EACT,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,OAAO,GAChB;;AAED,AAAyB,wBAAD,CAAC,UAAU,CAAC;EAClC,QAAQ,EAAE,QAAQ;EAClB,IAAI,EAAE,CAAC;EACP,KAAK,EAAE,CAAC;EACR,MAAM,EAAE,MAAM;EACd,GAAG,EAAE,KAAK;EACV,aAAa,EAAE,KAAK,GACrB;;AAKD,AAEE,wBAFsB,CAEtB,UAAU,CAAC;EACT,UAAU,EAAE,GAAG;EACf,SAAS,EAAE,IAAI,GAChB;;AALH,AAOE,wBAPsB,CAOtB,WAAW,CAAC;EACV,UAAU,EAAE,GAAG,GAChB;;AATH,AAWE,wBAXsB,CAWtB,sBAAsB,CAAC;EACrB,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM;EACvB,MAAM,EAAE,GAAG,CAAC,KAAK,CbpOd,OAAO;EaqOV,OAAO,EAAE,QAAQ;EACjB,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,GAAG;EACf,KAAK,EAAE,KAAK,GACb;;AAnBH,AAqBE,wBArBsB,CAqBtB,UAAU,CAAC;EACT,UAAU,EAAE,IAAI;EAChB,SAAS,EAAE,IAAI;EACf,YAAY,Eb3OD,OAAO;Ea4OlB,KAAK,Eb5OM,OAAO;Ea6OlB,aAAa,EAAE,GAAG;EAClB,UAAU,EAAE,IAAI;EAChB,KAAK,EAAE,GAAG;EACV,UAAU,EAAE,IAAI;EAChB,OAAO,EAAE,SAAS;EAClB,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,KAAK;EACZ,WAAW,EAAE,MAAM,GACpB;;AAGH,AAAA,sBAAsB,CAAC;EACrB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,GAAG;EACX,MAAM,EAAE,YAAY;EACpB,gBAAgB,Eb/PX,OAAO,GagQb;;AAID,AAAyB,wBAAD,CAAC,aAAa,CAAC;EACrC,UAAU,EAAE,GAAG;EACf,SAAS,EAAE,IAAI,GAChB;;AAED,AAAyB,wBAAD,CAAC,iBAAiB,CAAC;EACzC,UAAU,EAAE,IAAI;EAChB,aAAa,EAAE,IAAI;EACnB,SAAS,EAAE,IAAI,GAChB;;AAED,AAAA,oBAAoB,CAAC;EACnB,UAAU,EAAE,GAAG;EACf,SAAS,EAAE,IAAI,GAChB;;AAED,AAAA,qBAAqB,CAAC;EACpB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM,GACvB;;AAED,AAAA,2BAA2B,EAAE,AAAA,2BAA2B,CAAC;EACvD,KAAK,EbnRI,OAAO;EaoRhB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,aAAa,EAAE,IAAI,GACpB;;AAED,AAAA,2BAA2B,CAAC;EAC1B,KAAK,EbtRG,OAAO;EauRf,aAAa,EAAE,CAAC,GACjB;;AAED,AAAA,2BAA2B,CAAC;EAC1B,OAAO,EAAE,gBAAgB;EACzB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,IAAI,GACb;;AAED,AAAA,qBAAqB,AAAA,2BAA2B,CAAC;EAC/C,KAAK,Eb/SM,OAAO;EagTlB,WAAW,EAAE,MAAM,GACpB;;AAED,AAAA,6BAA6B,CAAC;EAC5B,aAAa,EAAE,GAAG;EAClB,gBAAgB,EAAE,OAAO;EACzB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;EAChB,WAAW,EAAE,IAAI;EACjB,KAAK,Eb7SG,OAAO;Ea8Sf,KAAK,EAAE,KAAK;EACZ,OAAO,EAAE,QAAQ;EACjB,UAAU,EAAE,IAAI;EAChB,WAAW,EAAE,MAAM,GACpB;;AAED,AAAA,2BAA2B,CAAC;EAC1B,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,eAAe,EAAE,MAAM,GAYxB;EAfD,AAKE,2BALyB,CAKzB,UAAU,CAAC;IACT,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,IAAI,GACb;EARH,AAUE,2BAVyB,CAUzB,WAAW,CAAC;IACV,YAAY,EAAE,IAAI;IAClB,YAAY,Eb5UH,OAAO;Ia6UhB,KAAK,EbrUE,OAAO,GasUf;;AAGH,AAAA,qCAAqC,CAAC;EACpC,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,GAAG,CAAC,KAAK,Cb3UV,OAAO;Ea4Ud,aAAa,EAAE,GAAG,GACnB;;AAED,AAAA,sCAAsC,CAAC;EACrC,KAAK,Eb7UG,OAAO;Ea8Uf,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,QAAQ,EAAE,MAAM;EAChB,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,YAAY;EACrB,cAAc,EAAE,SAAS;EACzB,WAAW,EAAE,GAAG,GACjB;;AAID,AAAA,0BAA0B,CAAC;EACzB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,eAAe,EAAE,UAAU;EAC3B,WAAW,EAAE,MAAM;EACnB,QAAQ,EAAE,QAAQ;EAClB,MAAM,EAAE,GAAG,CAAC,KAAK,Cb9WZ,OAAO;Ea+WZ,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,Cb/WlB,OAAO;EagXZ,WAAW,EAAE,MAAM,GACpB;;AAED,AAAA,yBAAyB,CAAC;EACxB,UAAU,EbvXA,OAAO;EawXjB,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM;EACvB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI;EACf,KAAK,EbpXK,OAAO;EaqXjB,MAAM,EAAE,IAAI,GACb;;AAED,AAAA,cAAc,AAAA,OAAO,CAAC;EACpB,OAAO,EAAE,OAAO;EAChB,SAAS,EAAE,GAAG;EACd,KAAK,EblYM,OAAO;EamYlB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,IAAI;EACT,KAAK,EAAE,MAAM;EACb,WAAW,EAAE,UAAU;EACvB,MAAM,EAAE,OAAO,GAChB;;AAED,AAAA,0BAA0B,CAAC;EACzB,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM;EACvB,UAAU,EAAE,IAAI;EAChB,SAAS,EAAE,IAAI;EACf,KAAK,EbzYK,OAAO,Ga0YlB;;AAED,AAAA,0BAA0B,AAAA,YAAY,CAAC;EACrC,UAAU,EAAE,IAAI;EAChB,WAAW,EAAE,IAAI,GAClB;;AAED,AAAA,0BAA0B,CAAC;EACzB,OAAO,EAAE,IAAI;EACb,KAAK,EAAE,IAAI;EACX,eAAe,EAAE,MAAM;EACvB,cAAc,EAAE,GAAG;EACnB,UAAU,EAAE,IAAI,GACjB;;AAED,AAAA,kBAAkB,CAAC;EACjB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,IAAI;EACpB,aAAa,EAAE,GAAG;EAClB,MAAM,EAAE,GAAG,CAAC,KAAK,CbnaZ,OAAO;EaoaZ,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,GAAG;EACd,KAAK,EbvaM,OAAO;EawalB,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI;EACf,MAAM,EAAE,MAAM,GACf;;AAGD,AAAA,kBAAkB,AAAA,2BAA2B,CAAC;EAC5C,KAAK,Eb/aM,OAAO,GagbnB;;AAED,AAAA,kBAAkB,AAAA,iBAAiB,CAAC;EAClC,KAAK,EbnbM,OAAO;EaoblB,OAAO,EAAE,CAAC,GACX;;AAED,AAAA,kBAAkB,AAAA,kBAAkB,CAAC;EACnC,KAAK,EbxbM,OAAO;EayblB,OAAO,EAAE,CAAC,GACX;;AAED,AAAA,kBAAkB,AAAA,sBAAsB,CAAC;EACvC,KAAK,Eb7bM,OAAO,Ga8bnB;;AAED,AAAA,kBAAkB,AAAA,uBAAuB,CAAC;EACxC,KAAK,EbjcM,OAAO,GakcnB;;AAED,AAAA,0BAA0B,AAAA,OAAO,CAAC;EAChC,UAAU,EAAE,IAAI;EAChB,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,IAAI,GACb;;AAED,AAA2B,0BAAD,CAAC,UAAU,CAAC;EACpC,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;EAChB,UAAU,Eb/cJ,IAAI;EagdV,MAAM,EAAE,SAAS;EACjB,aAAa,EAAE,GAAG;EAClB,KAAK,Eb3cG,OAAO;Ea4cf,IAAI,EAAE,CAAC,GACR;;AAID,AAAA,wBAAwB,CAAC;EACvB,UAAU,EAAE,QAAQ;EACpB,KAAK,EAAE,QAAQ;EACf,aAAa,EAAE,GAAG;EAClB,gBAAgB,EAAE,OAAO;EACzB,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,kBAAe,GAgExC;EA9DC,AAAA,mCAAY,CAAC;IACX,OAAO,EAAE,cAAc;IACvB,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,MAAM;IACtB,WAAW,EAAE,MAAM,GACpB;EAED,AAAA,mCAAY,CAAC;IACX,aAAa,EAAE,IACjB,GAAE;EAEF,AAAA,gCAAS,CAAC;IACR,KAAK,EbpeC,OAAO;Iaqeb,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,MAAM;IAClB,aAAa,EAAE,KAAK,GACrB;EAED,AAAA,+BAAQ,CAAC;IACP,MAAM,EAAE,IAAI;IACZ,KAAK,EAAE,QAAQ;IACf,KAAK,Eb/eC,OAAO;Iagfb,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,MAAM;IAClB,aAAa,EAAE,MAAM,GACtB;EAED,AAAA,8BAAO,CAAC;IACN,MAAM,EAAE,IAAI;IACZ,KAAK,EAAE,KAAK;IACZ,KAAK,EbxfE,OAAO;Iayfd,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,MAAM,GACnB;EAED,AAAA,iCAAU,CAAC;IACT,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,GAAG;IACnB,eAAe,EAAE,MAAM;IACvB,UAAU,EAAE,IAAI;IAChB,KAAK,EAAE,IAAI,GAeZ;IApBD,AAOE,iCAPQ,CAOR,MAAM,CAAC;MACL,MAAM,EAAE,IAAI;MACZ,KAAK,EAAE,KAAK;MACZ,MAAM,EAAE,GAAG,CAAC,KAAK,CbzgBZ,OAAO;Ma0gBZ,aAAa,EAAE,GAAG;MAClB,KAAK,Eb7gBD,OAAO;Ma8gBX,WAAW,EAAE,MAAM;MACnB,SAAS,EAAE,IAAI;MACf,WAAW,EAAE,IAAI;MACjB,UAAU,EAAE,MAAM;MAClB,WAAW,EAAE,GAAG;MAChB,YAAY,EAAE,GAAG,GAClB;;ACljBL;;GAEG;AAOH,AAAA,eAAe,CAAC;EAEd,OAAO,Ed0CgB,EAAE;EczCzB,WAAW,EAAE,MAAM;EACnB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,OAAO,GACrB;;AAED,AAAA,eAAe,AAAA,mBAAmB,CAAC;EACjC,OAAO,EAAE,IAAI,GACd;;AAID,AAAA,QAAQ,CAAC;EACP,IAAI,EAAE,YAAY;EAClB,UAAU,EdHJ,IAAI,GceX;EATC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IALrC,AAMI,QANI,CAMJ,kBAAkB,CAAC;MACjB,OAAO,EAAE,IAAI,GACd;IARL,AAUI,QAVI,CAUJ,aAAa,CAAC;MACZ,OAAO,EAAE,IAAI,GACd;;AAML,AAAA,YAAY,CAAC;EACX,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,IAAI,EAAE,YAAY;EAClB,KAAK,EAAE,CAAC;EACR,UAAU,EdzBA,OAAO;Ec0BjB,OAAO,EAAE,GAAG;EACZ,QAAQ,EAAE,QAAQ,GAiFnB;EA/EC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IATrC,AAAA,YAAY,CAAC;MAUT,UAAU,EAAE,MAAM;MAClB,UAAU,EAAE,MAAM,GA6ErB;EAxFD,AAcE,YAdU,CAcV,4BAA4B,CAAC;IAC3B,IAAI,EAAE,QAAQ,GACf;EAED,AAAA,4BAAiB,CAAC;IAChB,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,OAAO;IACf,KAAK,EAAE,IAAI,GACZ;EAED,AAAA,2BAAgB,CAAC;IACf,MAAM,EAAE,IAAI;IACZ,KAAK,Ed5CI,OAAO;Ic6ChB,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,KAAK;IACjB,OAAO,EAAE,MAAM,GAChB;EAED,AAAA,4BAAiB,CAAC;IAChB,KAAK,EdjDM,OAAO;IckDlB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,MAAM;IAClB,MAAM,EAAE,GAAG,CAAC,KAAK,CdrDN,OAAO;IcsDlB,aAAa,EAAE,MAAM;IACrB,gBAAgB,EAAE,WAAW;IAC7B,MAAM,EAAE,MAAM;IACd,OAAO,EAAE,QAAQ;IACjB,IAAI,EAAE,QAAQ,GACf;EAED,AAAA,qBAAU,CAAC;IACT,aAAa,EAAE,GAAG;IAClB,gBAAgB,EdlEb,OAAO;IcmEV,KAAK,Ed5DE,OAAO;Ic6Dd,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,OAAO,EAAE,QAAQ;IACjB,MAAM,EAAE,SAAS;IACjB,WAAW,EAAE,GAAG;IAChB,MAAM,EAAE,OAAO;IACf,IAAI,EAAE,QAAQ,GACf;EAIC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAFrC,AAGI,2BAHY,AAGZ,OAAQ,CAAC;MACP,OAAO,EAAE,OAAO;MAChB,SAAS,EAAE,IAAI;MACf,KAAK,Ed9EH,OAAO;Mc+ET,QAAQ,EAAE,QAAQ;MAClB,GAAG,EAAE,IAAI;MACT,IAAI,EAAE,IAAI;MACV,MAAM,EAAE,OAAO,GAChB;EAIL,AAAA,8BAAmB,CAAC;IAClB,IAAI,EAAE,QAAQ;IACd,KAAK,Ed/FI,OAAO;IcgGhB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,MAAM;IAClB,MAAM,EAAE,SAAS;IACjB,MAAM,EAAE,GAAG,CAAC,KAAK,CdpGR,OAAO;IcqGhB,aAAa,EAAE,GAAG;IAClB,WAAW,EAAE,GAAG;IAChB,UAAU,EAAE,IAAI;IAChB,OAAO,EAAE,QAAQ,GAClB;;AAGH,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;EACjC,AAAA,YAAY,AAAA,mBAAmB,CAAC;IAC9B,OAAO,EAAE,IAAI,GACd;;AAGH,AAAA,0BAA0B,CAAC;EACzB,IAAI,EAAE,QAAQ,GACf;;AAED,AAAA,kBAAkB,CAAC;EACjB,WAAW,EAAE,IAAI;EACjB,SAAS,EAAE,IAAI,GAMhB;EAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IALrC,AAAA,kBAAkB,CAAC;MAMf,OAAO,EAAE,IAAI,GAEhB;;AAED,AAAA,YAAY,AAAA,QAAQ,CAAC;EACnB,IAAI,EAAE,SAAS;EACf,UAAU,EAAE,OAAkB;EAC9B,OAAO,EdpGS,EAAE;EcqGlB,QAAQ,EAAE,KAAK;EACf,GAAG,EAAE,IAAI;EACT,IAAI,EAAE,CAAC;EACP,KAAK,EAAE,CAAC;EACR,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,OAAO;EACnB,WAAW,EAAE,SAAS;EACtB,UAAU,EAAE,IAAI;EAChB,UAAU,EAAE,mBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG;EAC1C,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,iBAAiB,GAC1B;;AAED,AAAA,gBAAgB,CAAC;EACf,OAAO,EdnHiB,EAAE;EcoH1B,QAAQ,EAAE,KAAK;EAEf,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,IAAI,EAAE,CAAC;EACP,KAAK,EAAE,CAAC;EACR,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,OAAO;EACnB,gBAAgB,EAAE,kBAAiB,GACpC;;AAID,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;EACjC,AAAA,YAAY,CAAC;IACX,OAAO,EAAE,IAAI,GACd;EAED,AAAA,cAAc,CAAC;IACb,OAAO,EAAE,IAAI,GACd;EAED,AAAA,eAAe,CAAC;IAEd,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAkB,GACzC;;AAGH,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;EACjC,AAAA,eAAe,CAAC;IAEd,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAkB,GACzC;;AAGH,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,MAAM;EAClC,AAAA,eAAe,CAAC;IAEd,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAkB,GACzC;;AAGH,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;EACjC,AAAA,YAAY,CAAC;IACX,OAAO,EAAE,IAAI,GACd;EAED,AAAA,cAAc,CAAC;IACb,OAAO,EAAE,IAAI,GACd;EAED,AAAA,eAAe,CAAC;IAEd,MAAM,EAAE,IAAI;IACZ,KAAK,EAAE,IAAI;IACX,UAAU,EAAE,IAAI;IAChB,gBAAgB,EdpNZ,IAAI,GcqNT;EAED,AAAA,MAAM,AAAA,UAAU,CAAC;IACf,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,IAAI;IACf,UAAU,Ed3NN,IAAI;Ic4NR,MAAM,EAAE,SAAS,GAClB;;AAIH,AAAA,aAAa,CAAC;EACZ,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;EAChB,WAAW,EAAE,IAAI;EACjB,KAAK,Ed5NI,OAAO;Ec6NhB,UAAU,EAAE,GAAG;EACf,aAAa,EAAE,IAAI;EACnB,WAAW,EAAE,MAAM;EACnB,aAAa,EAAE,QAAQ;EACvB,QAAQ,EAAE,MAAM;EAChB,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,KAAK;EACd,UAAU,EAAE,MAAM,GACnB;;AAGD,AAAA,qBAAqB,CAAC;EACpB,WAAW,EAAE,MAAM;EACnB,eAAe,EAAE,UAAU;EAC3B,MAAM,EAAE,QAAQ,GACjB;;AAED,AAAA,YAAY,CAAC;EACX,cAAc,EAAE,SAAS,GAC1B;;AAED,AAAA,sBAAsB,CAAC;EACrB,aAAa,EAAE,GAAG,GACnB;;ACpRD,AAAA,sBAAsB,CAAC;EACrB,WAAW,EAAE,MAAM,GACpB;;AAED,AAAA,yBAAyB,CAAC;EACxB,KAAK,EfmBM,OAAO;EelBlB,WAAW,EAAE,IAAI,GAClB;;AAED,AAAA,6BAA6B,CAAC;EAC5B,KAAK,EfcM,OAAO;EeblB,WAAW,EAAE,MAAM,GAKpB;EAPD,AAIE,6BAJ2B,AAI3B,MAAO,CAAC;IACN,KAAK,EfSD,IAAI,GeRT;;AAID,AAAA,2BAAU,CAAC;EACT,OAAO,EAAE,IAAI;EACb,UAAU,EAAE,IAAI;EAChB,WAAW,EAAE,GAAG;EAChB,QAAQ,EAAE,QAAQ,GACnB;;AAED,AAAA,oCAAmB,CAAC;EAClB,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,IAAI;EACZ,gBAAgB,EAAE,WAAW;EAC7B,KAAK,EAAE,OAAO;EACd,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,GAAG;EACf,QAAQ,EAAE,QAAQ,GACnB;;AAED,AAAA,gCAAe,CAAC;EACd,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG,GACjB;;AAED,AAAA,wBAAO,CAAC;EACN,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,GAAG,EAAE,GAAG,GACT;;AAED,AAAA,2CAA0B,EAC1B,AAAA,6CAA4B,CAAC;EAC3B,WAAW,EAAE,MAAM;EACnB,WAAW,EAAE,IAAI;EACjB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG,GACjB;;AAED,AAAA,2CAA0B,CAAC;EACzB,KAAK,EfxBE,OAAO;EeyBd,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,YAAY,GACtB;;AAED,AAAA,6CAA4B,CAAC;EAC3B,KAAK,EftCI,OAAO,GeuCjB;;AAED,AAAA,mCAAkB,CAAC;EACjB,WAAW,EAAE,IAAI;EACjB,KAAK,EAAE,GAAG;EACV,QAAQ,EAAE,MAAM;EAChB,aAAa,EAAE,QAAQ,GACxB;;AAED,AACE,4BADS,AACT,MAAO,CAAC;EACN,UAAU,EfjDT,wBAAO;EekDR,MAAM,EAAE,OAAO,GAKhB;EARH,AAKI,4BALO,AACT,MAAO,CAIL,KAAK,CAAC;IACJ,UAAU,EfrDX,wBAAO,GesDP;;AC/EP,AAAA,oBAAoB,CAAC;EACnB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,aAAa;EACxB,OAAO,EAAE,EAAE;EACX,WAAW,EAAE,MAAM,GAUpB;EARC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IANrC,AAAA,oBAAoB,CAAC;MAOjB,KAAK,EAAE,IAAI;MACX,UAAU,EAAE,IAAI,GAMnB;EAdD,AAWE,oBAXkB,CAWlB,OAAO,CAAC;IACN,IAAI,EAAE,QAAQ,GACf;;AAGH,AAAA,iBAAiB,CAAC;EAChB,gBAAgB,EAAE,IAAI;EACtB,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAkB;EAC1C,OAAO,EAAE,gBAAgB;EACzB,QAAQ,EAAE,QAAQ;EAElB,WAAW,EAAE,MAAM;EACnB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,aAAa;EACxB,KAAK,EAAE,KAAK;EACZ,IAAI,EAAE,QAAQ,GAQf;EANC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAZrC,AAAA,iBAAiB,CAAC;MAad,GAAG,EAAE,CAAC;MACN,KAAK,EAAE,IAAI;MACX,UAAU,EAAE,IAAI;MAChB,OAAO,EAAE,IAAI,GAEhB;;AAED,iBAAiB;AAEjB,AAAa,YAAD,CAAC,OAAO,CAAC;EACnB,MAAM,EAAE,QAAQ,GACjB;;AAED,AAAa,YAAD,CAAC,KAAK,CAAC;EACjB,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,IAAI,GAChB;;AAED,AAAA,cAAc,CAAC;EACb,aAAa,EAAE,GAAG;EAClB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,GAAG,CAAC,KAAK,ChB1BZ,OAAO;EgB2BZ,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,kBAAiB;EACvC,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,KAAK;EACV,OAAO,EAAE,EAAE;EACX,OAAO,EAAE,GAAG;EACZ,gBAAgB,EhBlCV,IAAI,GgBwCX;EAJC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAZrC,AAAA,cAAc,CAAC;MAaX,QAAQ,EAAE,QAAQ;MAClB,GAAG,EAAE,CAAC,GAET;;AAED,AAAA,0BAA0B,CAAC;EACzB,KAAK,EAAE,GAAG;EACV,QAAQ,EAAE,QAAQ,GAiDnB;EAnDD,AAIE,0BAJwB,CAIxB,QAAQ,CAAC;IACP,aAAa,EAAE,GAAG,GACnB;EANH,AAQE,0BARwB,CAQxB,YAAY,CAAC;IACX,MAAM,EAAE,GAAG,CAAC,KAAK,ChBlDR,OAAO;IgBmDhB,aAAa,EAAE,GAAG;IAClB,MAAM,EAAE,UAAU;IAClB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,MAAM;IACnB,WAAW,EAAE,MAAM,GACpB;EAfH,AAiBE,0BAjBwB,CAiBxB,sBAAsB,CAAC;IACrB,MAAM,EAAE,qBAAqB,GAC9B;EAED,AAAA,yCAAgB,CAAC;IACf,OAAO,EAAE,IAAI,GACd;EAED,AACE,iCADM,CACN,KAAK;EADP,AAEE,iCAFM,CAEN,sBAAsB,CAAC;IACrB,YAAY,EhBrFZ,IAAI,CgBqFe,UAAU,GAC9B;EAJH,AAME,iCANM,CAMN,yCAAyC,CAAC;IACxC,OAAO,EAAE,KAAK;IACd,QAAQ,EAAE,QAAQ;IAClB,MAAM,EAAE,GAAG;IACX,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,IAAI,EAAE,GAAG;IACT,KAAK,EhB/FL,IAAI,GgBgGL;EAvCL,AA0CE,0BA1CwB,CA0CxB,yCAAyC,CAAC;IACxC,OAAO,EAAE,KAAK;IACd,QAAQ,EAAE,QAAQ;IAClB,MAAM,EAAE,GAAG;IACX,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,IAAI,EAAE,GAAG;IACT,KAAK,EhB1GH,IAAI,GgB2GP;;AAGH,AAAA,kBAAkB,CAAC;EACjB,KAAK,EAAE,IAAI,GACZ;;AAED,AAAA,sBAAsB,CAAC;EACrB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,GAAG;EAClB,gBAAgB,EAAE,OAAO;EACzB,YAAY,EAAE,CAAC;EACf,YAAY,EAAE,IAAI;EAClB,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,aAAa;EAC9B,WAAW,EAAE,MAAM;EACnB,YAAY,EAAE,IAAI;EAClB,aAAa,EAAE,IAAI;EACnB,SAAS,EAAE,IAAI;EACf,KAAK,EhBvGI,OAAO,GgBwGjB;;AAED,AAAA,0BAA0B,CAAC;EACzB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,eAAe,EAAE,aAAa,GAC/B;;AAED,AAAA,uBAAuB,CAAC;EACtB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,eAAe,EAAE,aAAa,GAC/B;;AAGC,AAAA,sBAAO,CAAC;EACN,KAAK,EhB5HM,OAAO;EgB6HlB,MAAM,EAAE,OAAO,GAMhB;EAJC,AAAA,gCAAW,CAAC;IACV,KAAK,EhBtJH,IAAI;IgBuJN,MAAM,EAAE,OAAO,GAChB;;AAIL,AAAA,gCAAgC,CAAC;EAC/B,KAAK,EhBvIQ,OAAO;EgBwIpB,SAAS,EAAE,IAAI;EACf,MAAM,EAAE,OAAO,GAChB;;AAED,AAAA,uBAAuB,CAAC;EACtB,QAAQ,EAAE,KAAK;EACf,GAAG,EAAE,CAAC;EACN,IAAI,EAAE,CAAC;EACP,OAAO,EAAE,IAAI;EACb,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI,GACb;;AAED,AAAA,gCAAgC,CAAC;EAC/B,QAAQ,EAAE,QAAQ;EAClB,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,KAAK;EACb,gBAAgB,EhB/JV,IAAI;EgBgKV,OAAO,EAAE,CAAC;EACV,UAAU,EhB/JL,OAAO,CgB+JM,CAAC,CAAC,CAAC,CAAC,GAAG;EACzB,OAAO,EAAE,IAAI;EACb,OAAO,EAAE,SAAS;EAClB,SAAS,EAAE,IAAI;EACf,aAAa,EAAE,GAAG;EAClB,WAAW,EAAE,MAAM;EACnB,WAAW,EAAE,GAAG,GACjB;;AAED,AAAA,kBAAkB,CAAC;EACjB,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,IAAI;EACb,UAAU,EhB9KJ,IAAI;EgB+KV,QAAQ,EAAE,QAAQ;EAClB,SAAS,EAAE,aAAa;EACxB,IAAI,EAAE,KAAK;EACX,GAAG,EAAE,KAAK;EACV,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,ChBjLlB,OAAO,GgBkLb;;AAED,AAAiC,gCAAD,CAAC,KAAK,CAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,CAAc,2BAA2B,CAAC;EAC/E,kBAAkB,EAAE,IAAI;EACxB,OAAO,EAAE,IAAI,GACd;;AAED,AAAiC,gCAAD,CAAC,KAAK,CAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,CAAc,MAAM,AAAA,2BAA2B,CAAC;EACrF,kBAAkB,EAAE,IAAI;EACxB,OAAO,EAAE,IAAI,GACd;;AAED,AAAA,sBAAsB,CAAC;EACrB,QAAQ,EAAE,QAAQ,GACnB;;AAED,AAAA,YAAY,CAAC;EACX,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM,GACxB;;AAED,AAAA,kBAAkB,CAAC;EACjB,SAAS,EAAE,IAAI;EACf,KAAK,EhBpMG,OAAO,GgBqMhB;;AAED,AAAA,mBAAmB,CAAC;EAClB,cAAc,EAAE,IAAI,GACrB;;AAED,AAAA,wBAAwB,CAAC;EACvB,aAAa,EAAE,GAAG,GACnB;;AAED,AAAyB,wBAAD,CAAC,CAAC,CAAC;EACzB,KAAK,EhBnNU,OAAO;EgBoNtB,WAAW,EAAE,GAAG,GACjB;;AAED,AAAA,oBAAoB,CAAC;EACnB,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,GAAG,CAAC,KAAK,ChB5NZ,OAAO;EgB6NZ,SAAS,EAAE,IAAI;EACf,KAAK,EhBxNK,OAAO;EgByNjB,YAAY,EAAE,GAAG,GAClB;;AAED,AAAA,4BAA4B,CAAC;EAC3B,QAAQ,EAAE,QAAQ,GACnB;;AAED,AAAA,yBAAyB,CAAC;EACxB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,GAAG;EACR,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,IAAI;EACf,KAAK,EhBzOU,OAAO,GgB0OvB;;AAED,AAAA,yBAAyB,CAAC;EACxB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,CAAC;EACN,KAAK,EAAE,GAAG;EACV,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,iBAAiB;EACzB,WAAW,EAAE,CAAC;EACd,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,KAAK,EAAE,OAAO;EACd,SAAS,EAAE,IAAI;EACf,OAAO,EAAE,OAAO;EAChB,MAAM,EAAE,OAAO,GAChB;;AAGC,AAAA,kBAAS,CAAC;EACR,OAAO,EAAE,YAAY;EACrB,YAAY,EAAE,GAAG,GAClB;;AAED,AAAA,kBAAS,CAAC;EACR,OAAO,EAAE,YAAY,GACtB;;AAID,AAAA,mBAAQ,CAAC;EACP,KAAK,EhBpQE,OAAO;EgBqQd,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI,GAClB;;AAED,AAAA,sBAAW,CAAC;EACV,MAAM,EAAE,WAAW;EACnB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI,GAClB;;AAED,AAAA,yBAAc,EACd,AAAA,2BAAgB,CAAC;EACf,KAAK,EAAE,KAAK;EACZ,UAAU,EAAE,MAAM,GACnB;;AAED,AAAA,mCAAwB,CAAC;EACvB,OAAO,EAAE,EAAE;EACX,MAAM,EAAE,IAAI,GACb;;AAGH,AAAA,WAAW,CAAC;EACV,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,aAAa;EACxB,OAAO,EAAE,EAAE;EACX,WAAW,EAAE,MAAM,GA0EpB;EAxEC,AAAA,oBAAU,CAAC;IACT,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,KAAK;IACb,gBAAgB,EAAE,IAAI;IACtB,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAkB;IAC1C,OAAO,EAAE,gBAAgB;IACzB,QAAQ,EAAE,QAAQ;IAElB,WAAW,EAAE,MAAM;IACnB,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,aAAa;IACxB,IAAI,EAAE,QAAQ,GAQf;IANC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;MAbrC,AAAA,oBAAU,CAAC;QAcP,GAAG,EAAE,CAAC;QACN,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE,IAAI,GAEhB;EAzBH,AA2BE,WA3BS,CA2BT,UAAU,CAAC;IACT,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,KAAK;IACV,OAAO,EAAE,EAAE,GAOZ;IALC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;MAhCvC,AA2BE,WA3BS,CA2BT,UAAU,CAAC;QAMP,QAAQ,EAAE,QAAQ;QAClB,GAAG,EAAE,CAAC;QACN,IAAI,EAAE,QAAQ,GAEjB;EAED,AAAA,kBAAQ,CAAC;IACP,KAAK,EhBnUE,OAAO;IgBoUd,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI,GAClB;EAED,AAAA,wBAAc,EACd,AAAA,yBAAe,EACf,AAAA,yBAAe,CAAC;IACd,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,MAAM,GACnB;EAED,AAAA,0BAAgB,CAAC;IACf,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,IAAI,GAKjB;IARD,AAKE,0BALc,CAKd,sBAAsB,CAAC;MACrB,aAAa,EAAE,IAAI,GACpB;EAGH,AAAA,yBAAe,CAAC;IACd,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,aAAa;IACxB,WAAW,EAAE,MAAM;IACnB,IAAI,EAAE,QAAQ,GASf;IAPC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;MANrC,AAAA,yBAAe,CAAC;QAOZ,UAAU,EAAE,IAAI,GAMnB;IAbD,AAUE,yBAVa,CAUb,MAAM,CAAC;MACL,KAAK,EAAE,KAAK,GACb;;AAKH,AAAA,wCAAsB,CAAC;EACrB,KAAK,EAAE,IAAI,GACZ;;AAID,AAAA,mBAAY,CAAC;EAEX,KAAK,EAAE,KAAK;EACZ,aAAa,EAAE,GAAG;EAClB,gBAAgB,EhB/XZ,IAAI;EgBgYR,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAkB;EAC1C,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,aAAa;EACxB,OAAO,EAAE,EAAE;EACX,WAAW,EAAE,MAAM;EACnB,WAAW,EAAE,MAAM;EACnB,QAAQ,EAAE,QAAQ,GAQnB;EANC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAbrC,AAAA,mBAAY,CAAC;MAcT,KAAK,EAAE,IAAI;MACX,GAAG,EAAE,CAAC;MACN,UAAU,EAAE,IAAI;MAChB,IAAI,EAAE,QAAQ,GAEjB;;AAED,AAAA,oCAA6B,CAAC;EAC5B,OAAO,EAAE,EAAE,GAMZ;EAJC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAHrC,AAAA,oCAA6B,CAAC;MAI1B,QAAQ,EAAE,QAAQ;MAClB,GAAG,EAAE,CAAC,GAET;;AAED,AAAA,0BAAmB,CAAC;EAClB,aAAa,EAAE,GAAG;EAClB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,GAAG,CAAC,KAAK,ChB3Zd,OAAO;EgB4ZV,OAAO,EAAE,EAAE;EACX,OAAO,EAAE,GAAG;EACZ,gBAAgB,EhBhaZ,IAAI,GgBiaT;;AAED,AAAA,yBAAkB,CAAC;EACjB,KAAK,EAAE,OAAO;EACd,SAAS,EAAE,cAAc;EACzB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,IAAI;EACT,IAAI,EAAE,CAAC;EACP,SAAS,EAAE,MAAM,GAClB;;AAED,AAAA,0BAAmB,CAAC;EAClB,gBAAgB,EhB7aZ,IAAI;EgB8aR,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,IAAI;EACT,IAAI,EAAE,KAAK;EACX,aAAa,EAAE,GAAG;EAClB,OAAO,EAAE,GAAG,GAKb;EAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAVrC,AAAA,0BAAmB,CAAC;MAWhB,GAAG,EAAE,IAAI,GAEZ;;AAED,AAAA,gBAAS,CAAC;EACR,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,KAAK;EACZ,gBAAgB,EhB5aN,OAAO;EgB6ajB,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM;EACvB,WAAW,EAAE,MAAM,GAMpB;EAJC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IATrC,AAAA,gBAAS,CAAC;MAUN,MAAM,EAAE,IAAI;MACZ,KAAK,EAAE,KAAK,GAEf;;AAED,AAAA,oBAAa,CAAC;EACZ,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,UAAU,EhB3bA,OAAO;EgB4bjB,QAAQ,EAAE,QAAQ;EAClB,SAAS,EAAE,aAAa;EACxB,IAAI,EAAE,KAAK;EACX,GAAG,EAAE,IAAI,GAQV;EANC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IATrC,AAAA,oBAAa,CAAC;MAUV,GAAG,EAAE,IAAI;MACT,IAAI,EAAE,CAAC;MACP,KAAK,EAAE,CAAC;MACR,MAAM,EAAE,MAAM,GAEjB;;AAED,AAAA,eAAQ,CAAC;EACP,KAAK,EhBndE,OAAO;EgBodd,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,MAAM;EAClB,UAAU,EAAE,IAAI,GACjB;;AAED,AAAA,cAAO,CAAC;EACN,KAAK,EhBlfF,OAAO;EgBmfV,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;EAChB,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,MAAM;EAClB,UAAU,EAAE,IAAI;EAChB,KAAK,EAAE,KAAK,GACb;;AAED,AAAA,eAAQ,CAAC;EACP,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,IAAI,EAAE,GAAG;EACT,KAAK,EhBhgBH,IAAI,GgBigBP;;AAED,AAAA,sBAAe,CAAC;EACd,KAAK,EhBpgBH,IAAI,GgBqgBP;;AAED,AAAA,cAAO,CAAC;EACN,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,IAAI,GASZ;EAPC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAJrC,AAAA,cAAO,CAAC;MAKJ,OAAO,EAAE,MAAM;MACf,MAAM,EAAE,CAAC;MACT,MAAM,EAAE,CAAC;MACT,UAAU,EAAE,IAAI;MAChB,IAAI,EAAE,QAAQ,GAEjB;;AAED,AAAA,qBAAc,EACd,AAAA,0BAAmB,CAAC;EAClB,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,MAAM;EACjB,WAAW,EAAE,MAAM,GACpB;;AAED,AAAA,kBAAW,CAAC;EACV,MAAM,EAAE,eAAe;EACvB,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,GAAG;EACd,IAAI,EAAE,QAAQ;EACd,eAAe,EAAE,aAAa,GAC/B;;AAED,AAAA,oBAAa,CAAC;EACZ,IAAI,EAAE,QAAQ,GACf;;AAED,AAAA,oBAAa,CAAC;EACZ,KAAK,EhBlhBE,OAAO;EgBmhBd,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,KAAK,EAAE,IAAI,GACZ;;AAED,AAAA,uBAAgB,CAAC;EACf,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,GAAG,CAAC,KAAK,ChBniBd,OAAO;EgBoiBV,aAAa,EAAE,GAAG;EAClB,gBAAgB,EhBviBZ,IAAI;EgBwiBR,WAAW,EAAE,MAAM;EACnB,WAAW,EAAE,IAAI;EACjB,SAAS,EAAE,IAAI;EACf,KAAK,EhBpiBC,OAAO;EgBqiBb,QAAQ,EAAE,QAAQ,GAwBnB;EAtBC,AAAA,mCAAa,CAAC;IACZ,QAAQ,EAAE,KAAK;IACf,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;IACP,OAAO,EAAE,IAAI;IACb,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI,GACb;EAED,AAAA,6BAAO,CAAC;IACN,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,QAAQ;IAClB,MAAM,EAAE,KAAK;IACb,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,GAAG,CAAC,KAAK,ChBxiBd,OAAO;IgByiBV,aAAa,EAAE,GAAG;IAClB,gBAAgB,EhB9jBd,IAAI;IgB+jBN,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAkB;IAC1C,UAAU,EAAE,IAAI;IAChB,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,MAAM,GACnB;;AAGH,AAAA,yBAAkB,CAAC;EACjB,QAAQ,EAAE,QAAQ,GAOnB;EALC,AAAA,qCAAa,CAAC;IACZ,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,IAAI;IACT,KAAK,EAAE,IAAI,GACZ;;AAID,AAAA,gCAAQ,EAAT,AAAC,+BAAQ,CAAC;EACP,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,GAAG,CAAC,KAAK,ChBllBhB,OAAO;EgBmlBR,aAAa,EAAE,GAAG;EAClB,gBAAgB,EhBtlBd,IAAI;EgBulBN,KAAK,EhBtlBE,OAAO;EgBulBd,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,WAAW,EAAE,GAAG,GACjB;;AAGH,AAAA,oBAAa,CAAC;EACZ,KAAK,EhB5lBM,OAAO;EgB6lBlB,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI;EACf,IAAI,EAAE,GAAG;EACT,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,OAAO,GAChB;;AAED,AAAA,yBAAkB,CAAC;EACjB,KAAK,EAAE,IAAI,GACZ;;AAED,AAAA,gCAAyB,CAAC;EACxB,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,eAAe,EAAE,MAAM;EACvB,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,GAAG,CAAC,KAAK,ChB9mBN,OAAO;EgB+mBlB,aAAa,EAAE,GAAG;EAClB,gBAAgB,EhBrnBZ,IAAI;EgBsnBR,OAAO,EAAE,GAAG;EACZ,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,GAAG,EAAE,IAAI;EACT,MAAM,EAAE,OAAO,GAChB;;AAED,AAAA,sBAAe,CAAC;EACd,KAAK,EhBznBM,OAAO,GgB0nBnB;;AAGC,AAAA,+BAAQ,CAAC;EACP,OAAO,EAAE,QAAQ,GAClB;;AAGH,AAAA,gBAAS,CAAC;EACR,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,YAAY;EAC7B,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,GAAG,CAAC,KAAK,ChB3oBlB,OAAO;EgB4oBV,UAAU,EhB9oBN,IAAI;EgB+oBR,OAAO,EAAE,MAAM,GAChB;;AAED,AAAA,kBAAW,EACX,AAAA,oBAAa,EACb,AAAA,4BAAqB,CAAC;EACpB,KAAK,EAAE,KAAK;EACZ,UAAU,EAAE,MAAM;EAClB,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,GAAG;EAClB,gBAAgB,EhBzpBZ,IAAI;EgB0pBR,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;EAChB,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,SAAS;EACjB,MAAM,EAAE,KAAK,GACd;;AAED,AAAA,kBAAW,EACX,AAAA,4BAAqB,CAAC;EACpB,KAAK,EhB/pBM,OAAO;EgBgqBlB,YAAY,EhBhqBD,OAAO,GgBiqBnB;;AAED,AAAA,4BAAqB,CAAC;EACpB,OAAO,EAAE,EAAE;EACX,MAAM,EAAE,IAAI,GACb;;AAED,AAAA,oBAAa,CAAC;EACZ,KAAK,EhB7qBI,OAAO;EgB8qBhB,YAAY,EhB9qBH,OAAO,GgB+qBjB;;AAED,AAAA,uBAAgB,CAAC;EACf,MAAM,EAAE,iBAAiB;EACzB,aAAa,EAAE,GAAG;EAClB,gBAAgB,EAAE,OAAO;EACzB,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAgB;EACxC,WAAW,EAAE,MAAM;EACnB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,MAAM,GA2GlB;EAzGC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IATrC,AAAA,uBAAgB,CAAC;MAUb,KAAK,EAAE,KAAK;MACZ,MAAM,EAAE,KAAK,GAuGhB;EApGC,AAAA,+BAAS,CAAC;IACR,MAAM,EAAE,IAAI;IACZ,aAAa,EAAE,GAAG,CAAC,KAAK,ChBhsBvB,OAAO;IgBisBR,OAAO,EAAE,IAAI;IACb,WAAW,EAAE,MAAM;IACnB,eAAe,EAAE,aAAa;IAC9B,SAAS,EAAE,IAAI,GAKhB;IAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;MARrC,AAAA,+BAAS,CAAC;QASN,IAAI,EAAE,QAAQ,GAEjB;EAED,AAAA,8BAAQ,CAAC;IACP,WAAW,EAAE,OAAO,GACrB;EAED,AAAA,8BAAQ,AAAA,OAAO,CAAC;IACd,OAAO,EAAE,OAAO;IAChB,SAAS,EAAE,KAAK;IAChB,KAAK,EhBntBE,OAAO;IgBotBd,WAAW,EAAE,UAAU;IACvB,MAAM,EAAE,OAAO;IACf,YAAY,EAAE,OAAO,GACtB;EAED,AAAA,gCAAU,CAAC;IACT,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,aAAa;IACxB,MAAM,EAAE,IAAI,GACb;EAED,AAAA,6BAAO,CAAC;IACN,OAAO,EAAE,IAAI;IACb,aAAa,EAAE,IAAI,GAMpB;IAJC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;MAJrC,AAAA,6BAAO,CAAC;QAKJ,SAAS,EAAE,MAAM;QACjB,IAAI,EAAE,QAAQ,GAEjB;EAED,AAAA,+BAAS,CAAC;IACR,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,GAAG,CAAC,KAAK,ChB1uBpB,OAAO;IgB2uBR,OAAO,EAAE,IAAI;IACb,WAAW,EAAE,MAAM;IACnB,eAAe,EAAE,aAAa;IAC9B,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,QAAQ,GAKnB;IAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;MATrC,AAAA,+BAAS,CAAC;QAUN,IAAI,EAAE,QAAQ,GAEjB;EAED,AAAA,gCAAU,CAAC;IACT,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,aAAa;IAC9B,KAAK,EAAE,QAAQ;IACf,YAAY,EAAE,OAAO,GACtB;EAED,AAAA,+BAAS,EAAE,AAAA,+BAAS,EAAE,AAAA,6BAAO,EAAE,AAAA,oCAAc,CAAC;IAC5C,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,MAAM;IACvB,WAAW,EAAE,MAAM;IACnB,MAAM,EAAE,OAAO,GAChB;EAED,AAAA,+BAAS,CAAC;IACR,KAAK,EhBnwBM,OAAO;IgBowBlB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,OAAO,GACrB;EAED,AAAA,+BAAS,EAAE,AAAA,6BAAO,EAAE,AAAA,oCAAc,CAAC;IACjC,MAAM,EAAE,OAAO;IACf,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,GAAG,CAAC,KAAK,ChB9wBV,OAAO;IgB+wBd,aAAa,EAAE,GAAG;IAClB,WAAW,EAAE,QAAQ;IACrB,SAAS,EAAE,IAAI;IACf,KAAK,EhBlxBE,OAAO,GgBmxBf;EAED,AAAA,oCAAc,CAAC;IACb,OAAO,EAAE,GAAG;IACZ,MAAM,EAAE,IAAI,GACb;EAED,AAAA,sCAAgB,CAAC;IACf,OAAO,EAAE,KAAK;IACd,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,GAAG;IACR,KAAK,EAAE,GAAG;IACV,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,KAAK,EhBjzBL,IAAI,GgBkzBL;;AAGH,AAAA,wBAAiB,CAAC;EAChB,KAAK,EAAE,KAAK;EACZ,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,MAAM;EACjB,WAAW,EAAE,UAAU;EACvB,YAAY,EAAE,IAAI,GAwDnB;EAtDC,AAAA,+BAAQ,CAAC;IACP,MAAM,EAAE,IAAI;IACZ,KAAK,EhBxyBD,OAAO;IgByyBX,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,GAAG;IAChB,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,IAAI,GACjB;EAED,AAAA,8BAAO,CAAC;IACN,MAAM,EAAE,IAAI;IACZ,KAAK,EAAE,KAAK;IACZ,KAAK,EhBnzBD,OAAO;IgBozBX,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,IAAI,GACjB;EAzBH,AA2BE,wBA3Be,CA2Bf,4BAA4B,CAAC;IAC3B,UAAU,EAAE,IAAI,GACjB;EA7BH,AA+BE,wBA/Be,CA+Bf,oBAAoB,CAAC;IACnB,MAAM,EAAE,IAAI;IACZ,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,GAAG,CAAC,KAAK,ChBpzBd,OAAO;IgBqzBV,gBAAgB,EhBz0Bd,IAAI;IgB00BN,YAAY,EAAE,IAAI,GACnB;EArCH,AAuCE,wBAvCe,CAuCf,yBAAyB,CAAC;IACxB,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IACZ,WAAW,EAAE,iBAAiB;IAC9B,SAAS,EAAE,IAAI;IACf,KAAK,EhB30BD,OAAO;IgB40BX,KAAK,EAAE,GAAG;IACV,OAAO,EAAE,OAAO;IAChB,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,YAAY;IAC7B,WAAW,EAAE,MAAM,GACpB;EAlDH,AAoDE,wBApDe,CAoDf,KAAK,CAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,CAAc,2BAA2B,CAAC;IAC9C,kBAAkB,EAAE,IAAI;IACxB,OAAO,EAAE,IAAI,GACd;EAvDH,AAyDE,wBAzDe,CAyDf,KAAK,CAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,CAAc,MAAM,AAAA,2BAA2B,CAAC;IACpD,kBAAkB,EAAE,IAAI;IACxB,OAAO,EAAE,IAAI,GACd;;ACz3BL,AAAA,yBAAyB,CAAC;EACxB,QAAQ,EAAE,QAAQ;EAClB,WAAW,EAAE,MAAM;EACnB,WAAW,EAAE,MAAM;EACnB,IAAI,EAAE,QAAQ;EACd,SAAS,EAAE,aAAa;EACxB,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CjBAjB,mBAAI;EiBCV,aAAa,EAAE,GAAG,GASnB;EAPC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IATrC,AAAA,yBAAyB,CAAC;MAUtB,KAAK,EAAE,IAAI,GAMd;;AAKG,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;EAHvC,AACE,aADW,CACX,uBAAuB,CAAC;IAGpB,MAAM,EAAE,kBAAkB,GAE7B;;AAGH,AAAA,uBAAuB,CAAC;EACtB,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,KAAK;EACZ,gBAAgB,EjBPV,IAAI;EiBQV,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,aAAa;EACxB,OAAO,EAAE,EAAE;EACX,WAAW,EAAE,MAAM;EACnB,WAAW,EAAE,MAAM;EACnB,QAAQ,EAAE,QAAQ;EAClB,UAAU,EAAE,IAAI;EAChB,UAAU,EAAE,MAAM;EAClB,sBAAsB,EAAE,GAAG;EAC3B,uBAAuB,EAAE,GAAG,GAY7B;EAVC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAfrC,AAAA,uBAAuB,CAAC;MAgBpB,KAAK,EAAE,IAAI;MACX,UAAU,EAAE,MAAM;MAClB,UAAU,EAAE,IAAI;MAChB,GAAG,EAAE,CAAC;MACN,UAAU,EAAE,IAAI;MAChB,MAAM,EAAE,yBAAyB;MACjC,sBAAsB,EAAE,CAAC;MACzB,uBAAuB,EAAE,CAAC,GAE7B;;AAED,AAA0B,uBAAH,GAAG,yBAAyB,CAAC;EAClD,WAAW,EAAE,IAAI;EACjB,YAAY,EAAE,IAAI,GACnB;;AAED,AAA0B,uBAAH,GAAG,qBAAqB,CAAC;EAC9C,MAAM,EAAE,CAAC,GACV;;AAED,AAAA,sBAAsB,CAAC;EACrB,MAAM,EAAE,IAAI;EACZ,gBAAgB,EjBxBJ,OAAO;EiByBnB,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM;EACvB,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,MAAM;EACf,IAAI,EAAE,QAAQ,GAKf;EAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAbrC,AAAA,sBAAsB,CAAC;MAcnB,SAAS,EAAE,IAAI,GAElB;;AAED,AAAA,0BAA0B,CAAC;EACzB,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,UAAU,EjB3CE,OAAO;EiB4CnB,QAAQ,EAAE,QAAQ;EAClB,SAAS,EAAE,aAAa;EACxB,GAAG,EAAE,IAAI;EACT,IAAI,EAAE,CAAC;EACP,KAAK,EAAE,CAAC;EACR,MAAM,EAAE,MAAM,GACf;;AAED,AAAA,qBAAqB,CAAC;EACpB,WAAW,EAAE,IAAI,GAMlB;EAJC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAHrC,AAAA,qBAAqB,CAAC;MAIlB,WAAW,EAAE,IAAI;MACjB,YAAY,EAAE,GAAG,GAEpB;;AAED,AAAA,2BAA2B,CAAC;EAC1B,UAAU,EAAE,WAAW;EACvB,MAAM,EAAE,GAAG,CAAC,KAAK,CjB5EJ,OAAO;EiB6EpB,IAAI,EAAE,IAAI;EACV,QAAQ,EAAE,QAAQ;EAClB,UAAU,EAAE,MAAM;EAClB,KAAK,EjBhFQ,OAAO;EiBiFpB,OAAO,EAAE,iBAAiB;EAC1B,aAAa,EAAE,GAAG;EAClB,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI,GAKZ;EAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAZrC,AAAA,2BAA2B,CAAC;MAaxB,YAAY,EAAE,IAAI,GAErB;;AAED,AAAA,+BAA+B,CAAC;EAC9B,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,WAAW,EAAE,MAAM,GACpB;;AAED,AAAA,4BAA4B,CAAC;EAC3B,UAAU,EAAE,IAAI;EAChB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,KAAK,EjBjGI,OAAO;EiBkGhB,UAAU,EAAE,MAAM,GACnB;;AAED,AAAA,wBAAwB,CAAC;EACvB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI,GAClB;;AAED,AAAA,8BAA8B,CAAC;EAC7B,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,KAAK,EjBrHM,OAAO;EiBsHlB,UAAU,EAAE,MAAM;EAClB,MAAM,EAAE,IAAI,GACb;;AAED,AAEE,mBAFiB,CAEjB,CAAC,AAAA,eAAe;AADlB,AACE,mBADiB,CACjB,CAAC,AAAA,eAAe,CAAC;EACf,UAAU,EAAE,KAAK;EACjB,MAAM,EAAE,sBAAsB,GAC/B;;AAGH,AAAA,0BAA0B,CAAC;EACzB,UAAU,EAAE,IAAI;EAChB,IAAI,EAAE,QAAQ,GAYf;EAdD,AAIE,0BAJwB,CAIxB,CAAC,AAAA,eAAe,CAAC;IACf,UAAU,EAAE,KAAK;IACjB,MAAM,EAAE,WAAW,GACpB;EAPH,AASE,0BATwB,CASxB,CAAC,AAAA,eAAe,CAAC;IACf,SAAS,EAAE,IAAI;IACf,MAAM,EAAE,cAAc;IACtB,UAAU,EAAE,MAAM,GACnB;;AAGH,AAAA,kCAAkC,CAAC;EACjC,UAAU,EAAE,MAAM;EAClB,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,IAAI;EAChB,WAAW,EAAE,gBAAgB,GAC9B;;AAED,AAAA,2BAA2B,CAAC;EAC1B,KAAK,EjBlJI,OAAO;EiBmJhB,UAAU,EAAE,IAAI;EAChB,UAAU,EAAE,MAAM;EAClB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;EAChB,WAAW,EAAE,IAAI;EACjB,IAAI,EAAE,QAAQ,GACf;;AAED,AAAA,oCAAoC,CAAC;EACnC,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,MAAM;EAClB,IAAI,EAAE,QAAQ,GACf;;AAED,AAAA,qBAAqB,CAAC;EACpB,UAAU,EAAE,IAAI;EAChB,KAAK,EAAE,IAAI;EACX,aAAa,EAAE,GAAG,CAAC,KAAK,CjB5KnB,OAAO;EiB6KZ,IAAI,EAAE,QAAQ,GACf;;AAED,AAAA,yBAAyB,CAAC;EACxB,KAAK,EjB1KI,OAAO;EiB2KhB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,WAAW,EAAE,GAAG,GACjB;;AAED,AAAA,qBAAqB,CAAC;EACpB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,KAAK,EjBnLI,OAAO;EiBoLhB,UAAU,EAAE,IAAI,GACjB;;AAED,AAAQ,OAAD,CAAC,4BAA4B;AACpC,AAAQ,OAAD,CAAC,8BAA8B;AACtC,AAAA,wBAAwB;AACxB,AAAA,0BAA0B,CAAC;EACzB,UAAU,EAAE,IAAI,GACjB;;AAED,AAAA,oBAAoB,CAAC;EACnB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,aAAa;EACxB,KAAK,EAAE,IAAI;EACX,IAAI,EAAE,QAAQ,GACf;;AAED,AAAA,8BAA8B,CAAC;EAC7B,IAAI,EAAE,EAAE,GACT;;AAED,AAAA,mBAAmB,CAAC;EAClB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,UAAU;EACrB,aAAa,EAAE,GAAG,CAAC,KAAK,CjBnNnB,OAAO;EiBoNZ,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,MAAM;EACnB,OAAO,EAAE,IAAI;EACb,YAAY,EAAE,IAAI;EAClB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,WAAW,EAAE,GAAG,GACjB;;AAED,AAAA,0BAA0B,CAAC;EACzB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,KAAK,EjBjOM,OAAO,GiBkOnB;;AAED,AAAA,yBAAyB,CAAC;EACxB,gBAAgB,EjBvON,OAAO;EiBwOjB,OAAO,EAAE,IAAI;EACb,YAAY,EAAE,IAAI;EAClB,aAAa,EAAE,GAAG,CAAC,KAAK,CjBvOnB,OAAO,GiB2Pb;EAxBD,AAME,yBANuB,CAMvB,qBAAqB,CAAC;IACpB,WAAW,EAAE,IAAI,GAClB;EARH,AAUE,yBAVuB,CAUvB,0BAA0B,CAAC;IACzB,KAAK,EjBvOE,OAAO,GiBwOf;EAED,AAAA,mCAAW,CAAC;IACV,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI,GAClB;EAjBH,AAmBE,yBAnBuB,CAmBvB,wBAAwB,CAAC;IACvB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,GAAG;IAChB,WAAW,EAAE,IAAI,GAClB;;AAGH,AAAA,8BAA8B,CAAC;EAC7B,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,GAAG;EAClB,gBAAgB,EAAE,OAAO;EACzB,SAAS,EAAE,IAAI;EACf,KAAK,EjBpQC,IAAI;EiBqQV,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,MAAM;EACnB,WAAW,EAAE,IAAI;EACjB,cAAc,EAAE,IAAI;EACpB,YAAY,EAAE,CAAC;EACf,UAAU,EAAE,IAAI;EAChB,IAAI,EAAE,QAAQ;EACd,WAAW,EAAE,GAAG;EAChB,MAAM,EAAE,KAAK,GACd;;AAED,AAAA,UAAU,AAAA,6BAA6B,CAAC;EACtC,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,IAAI;EAChB,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,CAAC;EACV,WAAW,EAAE,MAAM;EACnB,YAAY,EAAE,CAAC;EACf,WAAW,EAAE,IAAI;EACjB,cAAc,EAAE,IAAI;EACpB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,IAAI;EAChB,MAAM,EAAE,OAAO;EACf,IAAI,EAAE,QAAQ;EACd,WAAW,EAAE,GAAG;EAChB,MAAM,EAAE,KAAK,GACd;;AAED,AAAA,gBAAgB,CAAC;EACf,IAAI,EAAE,QAAQ;EACd,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,UAAU;EACrB,gBAAgB,EjBvSV,IAAI;EiBwSV,OAAO,EAAE,SAAS;EAClB,yBAAyB,EAAE,GAAG;EAC9B,0BAA0B,EAAE,GAAG;EAC/B,KAAK,EAAE,IAAI,GAOZ;EALC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAXrC,AAAA,gBAAgB,CAAC;MAYb,UAAU,EAAE,GAAG,CAAC,KAAK,CjB5SlB,OAAO;MiB6SV,yBAAyB,EAAE,CAAC;MAC5B,0BAA0B,EAAE,CAAC,GAEhC;;ACzUD,AAAA,gBAAgB,CAAC;EACf,IAAI,EAAE,GAAG;EACT,OAAO,EAAE,EAAE;EACX,QAAQ,EAAE,QAAQ;EAClB,cAAc,EAAE,MAAM;EACtB,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM;EACvB,WAAW,EAAE,MAAM;EACnB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,wBAAwB,GAWrC;EATC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAXrC,AAAA,gBAAgB,CAAC;MAYb,UAAU,EAAE,IAAI;MAChB,MAAM,EAAE,iBAAiB,GAO5B;EAJC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAhBrC,AAAA,gBAAgB,CAAC;MAiBb,UAAU,EAAE,IAAI;MAChB,MAAM,EAAE,iBAAiB,GAE5B;;AClBC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;EAFrC,AAAA,aAAa,CAAC;IAGV,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,MAAM;IACtB,eAAe,EAAE,UAAU;IAC3B,WAAW,EAAE,MAAM;IACnB,MAAM,EAAE,WAAW;IAGnB,IAAI,EAAE,QAAQ,GAuGjB;;AApGC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;EAbrC,AAAA,aAAa,CAAC;IAcV,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,GAAG;IACnB,eAAe,EAAE,UAAU;IAC3B,WAAW,EAAE,MAAM;IACnB,MAAM,EAAE,iBAAiB,GA+F5B;;AAjHD,AAqBE,aArBW,CAqBX,kBAAkB,CAAC;EACjB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,CAAC;EACT,eAAe,EAAE,UAAU;EAC3B,WAAW,EAAE,MAAM,GAWpB;EATC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IA3BvC,AAqBE,aArBW,CAqBX,kBAAkB,CAAC;MAOf,cAAc,EAAE,MAAM;MACtB,IAAI,EAAE,QAAQ,GAOjB;EAJC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAhCvC,AAqBE,aArBW,CAqBX,kBAAkB,CAAC;MAYf,cAAc,EAAE,GAAG;MACnB,SAAS,EAAE,CAAC,GAEf;;AAIC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;EAxCvC,AAsCE,aAtCW,CAsCX,gBAAgB,CAAC;IAGb,UAAU,EAAE,MAAM,GA4BrB;IArEH,AA2CM,aA3CO,CAsCX,gBAAgB,CAKZ,aAAa,CAAC;MACZ,SAAS,EAAE,IAAI;MACf,UAAU,EAAE,KAAK,GAClB;IA9CP,AAgDM,aAhDO,CAsCX,gBAAgB,CAUZ,YAAY,CAAC;MACX,SAAS,EAAE,IAAI;MACf,UAAU,EAAE,IAAI;MAChB,KAAK,EAAE,OAAO,GACf;;AAGH,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;EAvDvC,AAsCE,aAtCW,CAsCX,gBAAgB,CAAC;IAkBb,WAAW,EAAE,EAAE;IACf,eAAe,EAAE,UAAU;IAC3B,WAAW,EAAE,UAAU,GAW1B;IArEH,AA4DM,aA5DO,CAsCX,gBAAgB,CAsBZ,aAAa,CAAC;MACZ,SAAS,EAAE,IAAI,GAChB;IA9DP,AAgEM,aAhEO,CAsCX,gBAAgB,CA0BZ,YAAY,CAAC;MACX,UAAU,EAAE,IAAI;MAChB,SAAS,EAAE,IAAI,GAChB;;AAnEP,AAuEE,aAvEW,CAuEX,aAAa,CAAC;EACZ,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,GAAG,CAAC,KAAK,CnBlDd,OAAO,GmBmDX;;AAIC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;EAhFvC,AA8EE,aA9EW,CA8EX,qBAAqB,CAAC;IAGlB,KAAK,EAAE,IAAI;IAEX,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,MAAM,GA4BlB;;AAzBC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;EAvFvC,AA8EE,aA9EW,CA8EX,qBAAqB,CAAC;IAUlB,SAAS,EAAE,CAAC;IACZ,eAAe,EAAE,QAAQ,GAuB5B;;AAhHH,AA4FI,aA5FS,CA8EX,qBAAqB,CAcnB,MAAM,AAAA,UAAU,CAAC;EACf,UAAU,EnBtER,IAAI;EmBuEN,MAAM,EAAE,SAAS;EACjB,aAAa,EAAE,GAAG;EAClB,SAAS,EAAE,IAAI,GAehB;EAbC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAlGzC,AA4FI,aA5FS,CA8EX,qBAAqB,CAcnB,MAAM,AAAA,UAAU,CAAC;MAOb,YAAY,EnBvEL,OAAO;MmBwEd,KAAK,EnBxEE,OAAO;MmByEd,MAAM,EAAE,IAAI,GAUf;EAPC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAxGzC,AA4FI,aA5FS,CA8EX,qBAAqB,CAcnB,MAAM,AAAA,UAAU,CAAC;MAab,YAAY,EnB7EL,OAAO;MmB8Ed,KAAK,EnB9EE,OAAO;MmB+Ed,OAAO,EAAE,CAAC;MACV,KAAK,EAAE,IAAI;MACX,MAAM,EAAE,IAAI,GAEf;;AC3GL,AAAA,uBAAuB,CAAC;EACtB,IAAI,EAAE,QAAQ;EACd,UAAU,EAAE,YAAY;EACxB,UAAU,EAPQ,sBAAO,GAY1B;EAHC,AAAA,+BAAS,CAAC;IACR,UAAU,EAVM,OAAO,GAWxB;;AAGH,AAAA,eAAe,CAAC;EACd,UAAU,EAAE,OAAO;EACnB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,eAAe,EAAE,UAAU;EAC3B,WAAW,EAAE,MAAM;EACnB,IAAI,EAAE,QAAQ;EACd,MAAM,EAAE,OAAO;EACf,UAAU,EAAE,GAAG,CAAC,KAAK,CAtBH,OAAO,GAsE1B;EAxDD,AAUE,eAVa,CAUb,kBAAkB,CAAC;IACjB,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,UAAU;IAC3B,WAAW,EAAE,MAAM;IACnB,MAAM,EAAE,SAAS;IACjB,cAAc,EAAE,GAAG;IACnB,SAAS,EAAE,CAAC,GAKb;IAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK,OAAO,SAAS,EAAE,KAAK;MAlB9D,AAUE,eAVa,CAUb,kBAAkB,CAAC;QASf,MAAM,EAAE,MAAM,GAEjB;EArBH,AAuBE,eAvBa,CAuBb,gBAAgB,CAAC;IACf,WAAW,EAAE,IAAI;IACjB,eAAe,EAAE,UAAU;IAC3B,WAAW,EAAE,UAAU,GAsBxB;IAhDH,AA4BI,eA5BW,CAuBb,gBAAgB,CAKd,aAAa,CAAC;MACZ,SAAS,EAAE,IAAI,GAChB;IA9BL,AAgCI,eAhCW,CAuBb,gBAAgB,CASd,YAAY,CAAC;MACX,UAAU,EAAE,IAAI;MAChB,SAAS,EAAE,IAAI,GAChB;IAED,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK,OAAO,SAAS,EAAE,KAAK;MArC9D,AAuBE,eAvBa,CAuBb,gBAAgB,CAAC;QAeb,WAAW,EAAE,EAAE,GAUlB;QAhDH,AAwCM,eAxCS,CAuBb,gBAAgB,CAiBZ,aAAa,CAAC;UACZ,SAAS,EAAE,IAAI,GAChB;QA1CP,AA4CM,eA5CS,CAuBb,gBAAgB,CAqBZ,YAAY,CAAC;UACX,SAAS,EAAE,GAAG,GACf;EA9CP,AAkDE,eAlDa,CAkDb,aAAa,CAAC;IACZ,aAAa,EAAE,IAAI;IACnB,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE,GAAG,CAAC,KAAK,CpB3Cd,OAAO,GoB4CX;;ACrEH,AAAA,kBAAkB,CAAC;EACjB,MAAM,EAAE,KAAK,GAKd;EAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAHrC,AAAA,kBAAkB,CAAC;MAIf,UAAU,EAAE,MAAM,GAErB;;AAED,AAAA,eAAe,CAAC;EACd,cAAc,EAAE,UAAU,GAC3B;;AAED,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;EACjC,AAAA,uBAAuB,CAAC;IACtB,UAAU,EAAE,IAAI;IAChB,aAAa,EAAE,IAAI;IAKnB,eAAe,EAAE,MAAM;IACvB,IAAI,EAAE,QAAQ,GACf;EAED,AAAA,eAAe,CAAC;IACd,UAAU,EAAE,MAAM;IAClB,SAAS,EAAE,IAAI;IACf,KAAK,ErBHI,OAAO;IqBIhB,WAAW,EAAE,MAAM;IACnB,cAAc,EAAE,SAAS,GAC1B;;AAGH,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;EACjC,AAAA,uBAAuB,CAAC;IACtB,IAAI,EAAE,QAAQ,GACf;EAED,AAAA,eAAe,CAAC;IACd,SAAS,EAAE,IAAI;IACf,MAAM,EAAE,YAAY,GACrB;EAED,AAAA,kBAAkB,AAAA,mBAAmB,CAAC;IACpC,OAAO,EAAE,IAAI,GACd;;AAGH,AAAA,wBAAwB,CAAC;EACvB,MAAM,EAAE,GAAG;EACX,UAAU,EAAE,OAAkB;EAC9B,IAAI,EAAE,OAAO,GASd;EAPC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IALrC,AAAA,wBAAwB,CAAC;MAMrB,MAAM,EAAE,MAAM,GAMjB;EAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IATrC,AAAA,wBAAwB,CAAC;MAUrB,MAAM,EAAE,WAAW,GAEtB;;AAED,AAAA,qBAAqB,CAAC;EACpB,IAAI,EAAE,QAAQ;EACd,KAAK,EAAE,CAAC;EACR,WAAW,EAAE,OAAO;EACpB,eAAe,EAAE,UAAU;EAC3B,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,aAAa,GASzB;EAPC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IARrC,AAAA,qBAAqB,CAAC;MASlB,OAAO,EAAE,YAAY,GAMxB;EAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAZrC,AAAA,qBAAqB,CAAC;MAalB,cAAc,EAAE,IAAI,GAEvB;;AAED,AAAA,kBAAkB,CAAC;EACjB,MAAM,EAAE,OAAO,GAKhB;EAND,AAGE,kBAHgB,AAGhB,MAAO,CAAC;IACN,UAAU,ErB1DP,wBAAO,GqB2DX;;AAGH,AAAA,+BAA+B,CAAC;EAC9B,MAAM,EAAE,OAAO;EACf,OAAO,EAAE,EAAE,GACZ;;AAED,AAAA,qBAAqB,CAAC;EACpB,IAAI,EAAE,QAAQ,GASf;EAPC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAHrC,AAAA,qBAAqB,CAAC;MAIlB,UAAU,EAAE,GAAG,GAMlB;EAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAPrC,AAAA,qBAAqB,CAAC;MAQlB,UAAU,EAAE,IAAI,GAEnB;;AAED,AAAA,wBAAwB,CAAC;EACvB,WAAW,EAAE,OAAO;EACpB,aAAa,EAAE,GAAG;EAClB,UAAU,EAAE,GAAG;EACf,IAAI,EAAE,QAAQ;EACd,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,UAAU,GAuBtB;EArBC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IATrC,AAAA,wBAAwB,CAAC;MAUrB,SAAS,EAAE,IAAI,GAoBlB;MA9BD,AAYI,wBAZoB,CAYpB,eAAe,CAAC;QACd,SAAS,EAAE,eAAe,GAC3B;MAdL,AAgBI,wBAhBoB,CAgBpB,gBAAgB,CAAC;QACf,SAAS,EAAE,eAAe,GAC3B;MAlBL,AAoBI,wBApBoB,CAoBpB,cAAc,CAAC;QACb,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,IAAI,GAClB;MAvBL,AAyBI,wBAzBoB,CAyBpB,mBAAmB,CAAC;QAClB,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,IAAI,GAClB;;AAIL,AAAA,aAAa,CAAC;EACZ,KAAK,ErBjHM,OAAO;EqBkHlB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,MAAM,GACpB;;AAED,AAAA,0BAA0B,CAAC;EACzB,UAAU,EAAE,MAAM;EAClB,IAAI,EAAE,QAAQ;EACd,YAAY,EAAE,IAAI,GACnB;;AAED,AAAA,mCAAmC,CAAC;EAClC,OAAO,EAAE,IAAI;EACb,IAAI,EAAE,QAAQ;EACd,SAAS,EAAE,QAAQ;EACnB,KAAK,EAAE,CAAC,GA+CT;EA7CC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IANrC,AAAA,mCAAmC,CAAC;MAOhC,cAAc,EAAE,MAAM;MACtB,eAAe,EAAE,UAAU;MAC3B,WAAW,EAAE,UAAU;MACvB,UAAU,EAAE,MAAM,GAyCrB;MAnDD,AAYI,mCAZ+B,CAY/B,wBAAwB,CAAC;QACvB,MAAM,EAAE,IAAI,GAKb;QAlBL,AAeM,mCAf6B,CAY/B,wBAAwB,CAGtB,gBAAgB,CAAC;UACf,WAAW,EAAE,IAAI,GAClB;EAIL,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IArBrC,AAAA,mCAAmC,CAAC;MAsBhC,cAAc,EAAE,GAAG;MACnB,eAAe,EAAE,UAAU;MAC3B,WAAW,EAAE,MAAM,GA2BtB;MAnDD,AA0BI,mCA1B+B,CA0B/B,wBAAwB,CAAC;QACvB,IAAI,EAAE,UAAU;QAChB,SAAS,EAAE,KAAK,GACjB;MA7BL,AA+BI,mCA/B+B,CA+B/B,uBAAuB,CAAC;QACtB,IAAI,EAAE,QAAQ,GACf;EAjCL,AAoCE,mCApCiC,CAoCjC,gBAAgB,CAAC;IACf,SAAS,EAAE,IAAI;IACf,KAAK,ErB1JE,OAAO,GqB2Jf;EAvCH,AAyCE,mCAzCiC,CAyCjC,eAAe,CAAC;IACd,KAAK,ErBtKI,OAAO;IqBuKhB,SAAS,EAAE,IAAI;IACf,cAAc,EAAE,UAAU,GAC3B;EA7CH,AA+CE,mCA/CiC,CA+CjC,yBAAyB;EA/C3B,AAgDE,mCAhDiC,CAgDjC,uBAAuB,CAAC;IACtB,KAAK,ErBlKD,OAAO,GqBmKZ;;AAGH,AAAA,aAAa,CAAC;EACZ,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,OAAkB;EACxC,IAAI,EAAE,QAAQ;EACd,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,UAAU,GAwCtB;EAlCC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAVrC,AAAA,aAAa,CAAC;MAWV,MAAM,EAAE,QAAQ,GAiCnB;EA5CD,AAcE,aAdW,AAcX,aAAc,CAAC;IACb,aAAa,EAAE,GAAG,CAAC,KAAK,CAAC,OAAkB;IAC3C,aAAa,EAAE,IAAI,GACpB;EAED,AAAA,sBAAU,CAAC;IACT,UAAU,EAAE,MAAM;IAClB,IAAI,EAAE,QAAQ;IACd,KAAK,ErBvMI,OAAO,GqBsNjB;IAlBD,AAKE,sBALQ,CAKR,cAAc,CAAC;MACb,SAAS,EAAE,IAAI;MACf,UAAU,EAAE,KAAK,GAClB;IARH,AAUE,sBAVQ,CAUR,yBAAyB,CAAC;MACxB,KAAK,ErBrMO,OAAO,GqBsMpB;IAZH,AAcE,sBAdQ,CAcR,mBAAmB,CAAC;MAClB,SAAS,EAAE,IAAI;MACf,UAAU,EAAE,KAAK,GAClB;EAGH,AAAA,oBAAQ,CAAC;IACP,UAAU,EAAE,MAAM;IAClB,aAAa,EAAE,eAAe;IAC9B,OAAO,EAAE,IAAI,GACd;;AAGH,AAAA,wBAAwB,CAAC;EACvB,QAAQ,EAAE,MAAM;EAChB,IAAI,EAAE,OAAO,GACd;;AAED,AAAA,cAAc,CAAC;EACb,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,KAAK;EACjB,aAAa,EAAE,QAAQ;EACvB,WAAW,EAAE,MAAM;EACnB,QAAQ,EAAE,MAAM,GACjB;;AAED,AAAA,mBAAmB,CAAC;EAClB,UAAU,EAAE,KAAK;EACjB,aAAa,EAAE,QAAQ;EACvB,WAAW,EAAE,MAAM;EACnB,QAAQ,EAAE,MAAM,GACjB;;AAED,AAAA,yBAAyB,CAAC;EACxB,KAAK,ErB1OW,OAAO,GqB2OxB;;AC5QD,uBAAuB;AAGvB;;;EAGE;AAEF,gBAAgB;AAChB,AAAA,QAAQ,AAAA,mBAAmB,CAAC;EAC1B,OAAO,EAAE,IAAI;EACb,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,KAAK;EACb,SAAS,EAAE,IAAI;EACf,UAAU,EtBQJ,IAAI;EsBPV,MAAM,EAAE,IAAI,GACb;;AAED,AAAmB,kBAAD,CAAC,EAAE,CAAC;EACpB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,YAAY,EAAE,OAAO;EACrB,YAAY,EAAE,KAAK,GACpB;;AAED,AAAmB,kBAAD,CAAC,KAAK,CAAC;EACvB,UAAU,EAAE,IAAI,GACjB;;AAED,AAAmB,kBAAD,CAAC,MAAM,AAAA,aAAa,CAAC;EACrC,UAAU,EAAE,IAAI,GACjB;;AAED,AAAmB,kBAAD,CAAC,QAAQ,CAAC;EAC1B,SAAS,EAAE,IAAI;EACf,MAAM,EAAE,MAAM,GACf;;AAED,YAAY;AACZ,AAAA,MAAM,CAAC;EAEL,KAAK,EAAE,OAAO;EACd,aAAa,EAAE,GAAG,GACnB;;AAED,AAAA,QAAQ,CAAC;EACP,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,KAAK,CAAC;EACJ,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI,GACb;;AAED,AAAA,KAAK,AAAA,OAAO,CAAC;EACX,SAAS,EAAE,UAAU;EACrB,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,8CAA8C,GAC3D;;AAED,AAAA,KAAK,AAAA,SAAS,CAAC;EACb,SAAS,EAAE,QAAQ;EACnB,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,0EAA0E,GACvF;;AAED,AAAa,KAAR,AAAA,OAAO,CAAC,SAAS,CAAC;EACrB,SAAS,EAAE,SAAS,CAAC,aAAa;EAClC,UAAU,EAAE,uBAAuB,GACpC;;AAED,AAAe,KAAV,AAAA,SAAS,CAAC,SAAS,CAAC;EACvB,SAAS,EAAE,UAAU,CAAC,iBAAiB;EACvC,UAAU,EAAE,uBAAuB,GACpC;;AAED,AAAA,KAAK,AAAA,SAAS,AAAA,MAAM,CAAC;EACnB,aAAa,EAAE,GAAG;EAClB,UAAU,EAAE,OAAO;EACnB,MAAM,EAAE,iBAAiB,GAC1B;;AAED,AAAA,KAAK,AAAA,SAAS,AAAA,OAAO,CAAC;EACpB,UAAU,EAAE,OAAO,GACpB;;AAED,AAAe,cAAD,CAAC,cAAc,CAAC;EAC5B,MAAM,EAAE,iBAAiB,GAC1B;;AAED,AAAe,cAAD,CAAC,0BAA0B,CAAC;EACxC,UAAU,EAAE,IAAI,GACjB;;AAED,AAAe,cAAD,CAAC,EAAE,CAAC;EAChB,UAAU,EAAE,KAAK;EACjB,aAAa,EAAE,IAAI,GACpB;;AAED,AAAe,cAAD,CAAC,KAAK,CAAA,AAAA,IAAC,CAAD,QAAC,AAAA,EAAe;EAClC,KAAK,EAAE,KAAK,GACb;;AAED,AAAA,aAAa,CAAC;EACZ,SAAS,EAAE,IAAI;EACf,MAAM,EAAE,IAAI;EACZ,YAAY,EAAE,GAAG,GAClB;;AAED,AAAA,eAAe,CAAC;EACd,OAAO,EAAE,IAAI,GACd;;AAED,YAAY;AAEZ,AAAe,cAAD,CAAC,KAAK,AAAA,2BAA2B,CAAC;EAC9C,UAAU,EAAE,MAAM;EAClB,SAAS,EAAE,KAAK,GACjB;;AAED,iBAAiB;AAEjB,AAAe,cAAD,CAAC,KAAK,AAAA,iBAAiB,CAAC;EACpC,UAAU,EAAE,MAAM;EAClB,SAAS,EAAE,KAAK,GACjB;;AAED,iBAAiB;AAEjB,AAAe,cAAD,CAAC,KAAK,AAAA,kBAAkB,CAAC;EACrC,UAAU,EAAE,MAAM;EAClB,SAAS,EAAE,KAAK,GACjB;;AAED,QAAQ;AAER,AAAe,cAAD,CAAC,KAAK,AAAA,sBAAsB,CAAC;EACzC,UAAU,EAAE,MAAM;EAClB,SAAS,EAAE,KAAK,GACjB;;AAED,cAAc;AAEd,AAAA,iBAAiB,CAAC;EAChB,MAAM,EAAE,KAAK,GACd;;AAED,AAAkB,iBAAD,CAAC,gBAAgB,CAAC;EACjC,MAAM,EAAE,MAAM,GACf;;AAED,AAAA,qBAAqB,CAAC;EACpB,MAAM,EAAE,KAAK,GACd;;AAED,AAAsB,qBAAD,CAAC,kBAAkB,CAAC;EACvC,KAAK,EAAE,KAAK,GACb;;AAED,AAAA,cAAc,CAAC;EACb,UAAU,EAAE,IAAI;EAChB,MAAM,EAAE,OAAO,GAChB;;AAED,AAAe,cAAD,CAAC,eAAe,CAAC;EAC7B,MAAM,EAAE,cAAc,GACvB;;AAED,oBAAoB;AAEpB,AAAA,eAAe,CAAC;EACd,WAAW,EAAE,GAAG,GACjB;;AAED,AAAgB,eAAD,CAAC,kBAAkB,CAAC;EACjC,MAAM,EAAE,GAAG;EACX,UAAU,EAAE,GAAG;EACf,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM,GACpB;;AAED,AAAmC,eAApB,CAAC,kBAAkB,CAAC,IAAI,CAAC;EACtC,MAAM,EAAE,MAAM,GACf;;AAED,AAAgB,eAAD,CAAC,cAAc,CAAC;EAC7B,MAAM,EAAE,gBAAgB,GACzB;;AAED,AAAgB,eAAD,CAAC,CAAC,CAAC;EAChB,UAAU,EAAE,IAAI;EAChB,YAAY,EAAE,GAAG;EACjB,KAAK,EAAE,OAAO,GACf;;AAED,AAAgB,eAAD,CAAC,YAAY,CAAC;EAC3B,YAAY,EAAE,IAAI;EAClB,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,IAAI;EACf,MAAM,EAAE,IAAI,GACb;;AAED,AAAA,cAAc,AAAA,YAAY,CAAC;EACzB,IAAI,EAAE,UAAU;EAChB,eAAe,EAAE,MAAM,GACxB;;AAED,qBAAqB;AAKrB,AAAkB,iBAAD,CAAC,eAAe,CAAC;EAChC,UAAU,EAAE,OAAO;EACnB,aAAa,EAAE,iBAAiB;EAChC,MAAM,EAAE,OAAO,GAChB;;AAED,AAAkB,iBAAD,CAAC,eAAe,AAAA,SAAS,CAAC;EACzC,UAAU,EtBrMJ,IAAI;EsBsMV,KAAK,EAAE,OAAO,GACf;;AAED,AAA2C,iBAA1B,CAAC,eAAe,AAAA,SAAS,CAAC,UAAU,CAAC;EACpD,YAAY,EtB1NL,OAAO,GsB2Nf;;AAED,AAAkB,iBAAD,CAAC,qBAAqB,AAAA,MAAM;AAC7C,AAAkB,iBAAD,CAAC,qBAAqB,AAAA,SAAS,CAAC;EAC/C,UAAU,EtB/MJ,IAAI,GsBgNX;;AAED,2BAA2B;AAE3B,AAAA,uBAAuB,CAAC;EACtB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,IAAI;EAChB,cAAc,EAAE,OAAO,GACxB;;AAED,AAAA,UAAU,CAAC;EACT,SAAS,EAAE,EAAE,GACd;;AAKD,AAAA,mBAAmB,CAAC;EAClB,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAiB;EAC7B,YAAY,EtBlOG,OAAO;EsBmOtB,aAAa,EAAE,IAAI,GACpB;;AAED,AAAA,UAAU,CAAC;EACT,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,MAAM,GACnB;;AAED,AAAA,cAAc,CAAC;EACb,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,UAAU;EAC3B,WAAW,EAAE,IAAI;EACjB,aAAa,EAAE,GAAG;EAClB,SAAS,EAAE,IAAI;EACf,cAAc,EAAE,kBAAkB;EAClC,KAAK,EAAE,OAAO,GACf;;AAED,AAAkB,WAAP,AAAA,MAAM,CAAC,UAAU,CAAC;EAC3B,UAAU,EAAE,OAAO,GACpB;;AACD,gBAAgB;AAEhB,AAAkB,iBAAD,CAAC,KAAK,CAAA,AAAA,IAAC,CAAD,QAAC,AAAA,EAAe;EACrC,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,GAAG;EACZ,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,IAAI;EACnB,aAAa,EAAE,GAAG;EAClB,MAAM,EAAE,iBAAiB;EACzB,UAAU,EAAE,OAAO,GACpB;;AAED,0BAA0B;AAE1B,AAAA,qBAAqB,CAAC;EACpB,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,oBAAoB,CAAC;EACnB,KAAK,EAAE,OAAO,GACf;;AAED,iBAAiB;AACjB,AAAA,UAAU,CAAC;EACT,WAAW,EAAE,MAAM;EACnB,cAAc,EAAE,SAAS;EACzB,KAAK,EtBlRU,OAAO,GsBmRvB;;AAED,AAAA,UAAU,CAAC;EACT,KAAK,EAAE,IAAI,GACZ;;AAED,AAAA,KAAK,CAAC;EACJ,WAAW,EAAE,aAAa;EAC1B,cAAc,EAAE,IAAI;EACpB,OAAO,EAAE,YAAY;EACrB,YAAY,EAAE,GAAG,GAClB;;AAED,4BAA4B;AAC5B,AAAA,cAAc,CAAC;EACb,eAAe,EAAE,YAAY;EAC7B,WAAW,EAAE,MAAM,GACpB;;AAED,AAAA,sBAAsB,CAAC;EACrB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,KAAK;EACb,YAAY,EAAE,MAAM;EACpB,aAAa,EAAE,IAAI;EACnB,YAAY,EAAE,GAAG;EACjB,UAAU,EAAE,OAAqB;EACjC,YAAY,EAAE,OAAO,GACtB;;AAED,AAAA,sBAAsB,CAAC;EACrB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,KAAK;EACb,YAAY,EAAE,GAAG;EACjB,aAAa,EAAE,IAAI;EACnB,YAAY,EtBvTG,OAAO,GsBwTvB;;AAED,AAAA,aAAa,CAAC;EACZ,KAAK,EAAE,OAAqB,GAC7B;;AAED,AAAA,YAAY,CAAC;EACX,UAAU,EAAE,8CAA8C,GAC3D;;AAED,AAAA,YAAY,CAAC;EACX,UAAU,EAAE,8CAA8C,GAC3D;;AAED,AAAuB,gBAAP,AAAA,MAAM,CAAC,UAAU,CAAC;EAChC,UAAU,EAAE,OAAO,GACpB;;AAED,AAAA,WAAW,CAAC;EACV,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI;EACf,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,WAAW;EACvB,UAAU,EAAE,UAAU;EACtB,MAAM,EAAE,KAAK;EACb,YAAY,EAAE,WAAW;EACzB,YAAY,EAAE,IAAI;EAClB,aAAa,EAAE,GAAG,GACnB;;AAED,AAAuB,gBAAP,AAAA,MAAM,CAAC,WAAW,CAAC;EACjC,UAAU,EAAE,OAAO;EACnB,MAAM,EAAE,KAAK;EACb,YAAY,EAAE,OAAO;EACrB,YAAY,EAAE,IAAI;EAClB,aAAa,EAAE,GAAG,GACnB;;AAED,AAAA,WAAW,AAAA,MAAM,CAAC;EAChB,MAAM,EAAE,KAAK;EACb,YAAY,EAAE,OAAO;EACrB,YAAY,EAAE,IAAI;EAClB,aAAa,EAAE,GAAG,GACnB;;AAED,AAAA,WAAW,CAAC;EACV,UAAU,EAAE,OAAO;EACnB,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,eAAe;EAC9B,KAAK,EAAE,GAAG;EACV,UAAU,EAAE,MAAM;EAClB,cAAc,EAAE,GAAG,GACpB;;AAED,AAAA,aAAa,CAAC;EACZ,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,eAAe;EAC9B,KAAK,EAAE,GAAG;EACV,UAAU,EAAE,MAAM;EAClB,cAAc,EAAE,GAAG,GACpB;;AAED,AAAA,SAAS,CAAC;EACR,WAAW,EAAE,MAAM;EACnB,cAAc,EAAE,SAAS;EACzB,UAAU,EAAE,MAAM;EAClB,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,GAAG;EACZ,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,WAAW,CAAC;EACV,WAAW,EAAE,MAAM;EACnB,KAAK,EtBnYU,OAAO;EsBoYtB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI,GAClB;;AAED,AAAA,SAAS,AAAA,mCAAmC,CAAC;EAC3C,OAAO,EAAE,IAAI,GACd;;AAED,AAAA,SAAS,CAAC;EACR,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,KAAK;EACb,QAAQ,EAAE,MAAM,GACjB;;AAED,AAAc,aAAD,CAAC,WAAW,CAAC;EACxB,UAAU,EAAE,MAAM,GACnB;;AAED,AAAoB,aAAP,AAAA,MAAM,CAAC,WAAW,CAAC;EAC9B,UAAU,EAAE,OAAO,GACpB;;AAED,AAAoB,aAAP,AAAA,MAAM,CAAC,iBAAiB,CAAC;EACpC,UAAU,EAAE,MAAM,GACnB;;AAED,AAAA,SAAS,CAAC;EACR,KAAK,EtB/ZU,OAAO,GsBgavB;;AAED,AAAU,SAAD,CAAC,MAAM,CAAC;EACf,UAAU,EtBnaK,OAAO;EsBoatB,KAAK,EtBxaC,IAAI,GsByaX;;AAED,AAAA,iBAAiB,EAAE,AAAA,cAAc,CAAC;EAChC,QAAQ,EAAE,MAAM;EAChB,aAAa,EAAE,QAAQ,GACxB;;AAED,AAAA,UAAU,CAAC;EACT,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,IAAI,GACjB;;AAED,AAAA,WAAW,CAAC;EACV,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,OAAO,GACf;;AAED,AAAwB,GAArB,AAAA,kBAAkB,GAAG,GAAG,AAAA,YAAY,CAAC;EACtC,UAAU,EAAE,IAAI;EAChB,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,UAAU,AAAA,MAAM,CAAC;EACf,SAAS,EAAE,UAAU,GACtB;;AAED,sBAAsB;ACxdtB,AAAA,gBAAgB,CAAC;EACf,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,UAAU;EACrB,WAAW,EAAE,MAAM;EACnB,OAAO,EAAE,SAAS;EAClB,MAAM,EAAE,OAAO;EACf,UAAU,EAAE,YAAY;EACxB,gBAAgB,EHVE,sBAAO;EGWzB,QAAQ,EAAE,QAAQ,GA+CnB;EA7CC,AAAA,+BAAgB,CAAC;IACf,SAAS,EAAE,IAAI,GAKhB;IAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK,OAAO,SAAS,EAAE,KAAK;MAH5D,AAAA,+BAAgB,CAAC;QAIb,SAAS,EAAE,IAAI,GAElB;EAED,AAAA,6BAAc,CAAC;IACb,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,IAAI;IACf,cAAc,EAAE,SAAS,GAK1B;IAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK,OAAO,SAAS,EAAE,KAAK;MAL5D,AAAA,6BAAc,CAAC;QAMX,SAAS,EAAE,GAAG,GAEjB;EAED,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK,OAAO,SAAS,EAAE,KAAK;IA5B5D,AAAA,gBAAgB,CAAC;MA6Bb,OAAO,EAAE,MAAM,GA0BlB;EAvBC,AAAA,wBAAS,CAAC;IACR,gBAAgB,EHpCA,OAAO,GGqCxB;EAED,AAAA,2BAAY,CAAC;IACX,YAAY,EAAE,IAAI;IAClB,MAAM,EAAE,mBAAmB,GAK5B;IAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK,OAAO,SAAS,EAAE,KAAK;MAJ5D,AAAA,2BAAY,CAAC;QAKT,YAAY,EAAE,EAAE,GAEnB;EAED,AAAA,0BAAW,CAAC;IAIV,WAAW,EAAE,IAAI,GAClB;EAED,AAAA,iCAAkB,CAAC;IACjB,IAAI,EAAE,QAAQ,GACf;;AAGH,AAAA,oBAAoB,CAAC;EACnB,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,KAAK;EACZ,aAAa,EAAE,GAAG;EAClB,gBAAgB,EAAE,mBAAgB;EAClC,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,kBAAe;EACvC,QAAQ,EAAE,KAAK;EACf,UAAU,EAAE,IAAI;EAChB,WAAW,EAAE,KAAK;EAClB,OAAO,EAAE,IAAI,GA+Bd;EA7BC,AAAA,gCAAa,CAAC;IACZ,QAAQ,EAAE,KAAK;IACf,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;IACP,OAAO,EAAE,IAAI;IACb,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE,OAAO,GAChB;EAED,AAAA,+BAAY,CAAC;IACX,OAAO,EAAE,cAAc;IACvB,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,QAAQ,GACnB;EAED,AAAA,6BAAU,CAAC;IACT,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,MAAM;IACtB,eAAe,EAAE,MAAM,GACxB;EAED,AAAA,4BAAS,CAAC;IACR,KAAK,EvBvED,IAAI;IuBwER,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,MAAM,GACnB;;ACnGH,AAAA,UAAU,CAAC;EACT,KAAK,EAAE,KAAK;EACZ,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,aAAa;EACxB,WAAW,EAAE,MAAM;EACnB,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,EAAE;EACX,WAAW,EAAE,gBAAgB,GA6U9B;EA3UC,AAAA,mBAAU,CAAC;IACT,gBAAgB,ExBaZ,IAAI;IwBZR,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CxBLnB,mBAAI;IwBMR,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,aAAa;IACxB,WAAW,EAAE,MAAM;IACnB,IAAI,EAAE,QAAQ,GACf;EAED,AAAA,2BAAkB,CAAC;IACjB,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,aAAa;IACxB,WAAW,EAAE,MAAM;IACnB,OAAO,EAAE,cAAc;IACvB,aAAa,EAAE,GAAG,CAAC,KAAK,CxBJlB,OAAO;IwBKb,IAAI,EAAE,QAAQ,GACf;EAED,AAAA,iBAAQ,CAAC;IACP,KAAK,ExBIE,OAAO;IwBHd,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,MAAM;IAClB,WAAW,EAAE,GAAG;IAChB,aAAa,EAAE,IAAI,GACpB;EAED,AAAA,uBAAc,CAAC;IACb,UAAU,EAAE,MAAM,GACnB;EAED,AAAiB,uBAAH,GAAG,uBAAc,CAAC;IAC9B,UAAU,EAAE,IAAI,GACjB;EAED,AAAA,oCAA2B,CAAC;IAC1B,MAAM,EAAE,MAAM,GACf;EAED,AAAA,6BAAoB,CAAC;IACnB,KAAK,EAAE,IAAI;IACX,aAAa,EAAE,GAAG,CAAC,KAAK,CxB/BlB,OAAO,GwBgCd;EAED,AAAA,2BAAkB,CAAC;IACjB,OAAO,EAAE,MAAM;IACf,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,MAAM;IACd,QAAQ,EAAE,QAAQ,GACnB;EAED,AAAA,sCAA6B,CAAC;IAC5B,QAAQ,EAAE,QAAQ;IAClB,MAAM,EAAE,KAAK;IACb,SAAS,EAAE,IAAI;IACf,KAAK,EAAE,IAAI;IACX,aAAa,EAAE,QAAQ;IACvB,QAAQ,EAAE,MAAM;IAChB,WAAW,EAAE,MAAM;IACnB,KAAK,ExB5DH,IAAI,GwB6DP;EAED,AAAA,iBAAQ,CAAC;IACP,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,GAAG,CAAC,KAAK,CxBtDX,OAAO;IwBuDb,aAAa,EAAE,GAAG;IAClB,OAAO,EAAE,QAAQ;IACjB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI,GAKlB;IAXD,AAQE,iBARM,AAQN,aAAc,CAAC;MACb,KAAK,ExB/CF,OAAO,GwBgDX;EAGH,AAAA,mBAAU,CAAC;IACT,KAAK,EAAE,IAAI,GACZ;EAED,AAAA,sBAAa,CAAC;IACZ,KAAK,ExBzDE,OAAO;IwB0Dd,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,MAAM;IAClB,OAAO,EAAE,MAAM;IACf,WAAW,EAAE,GAAG;IAChB,MAAM,EAAE,OAAO,GAgBhB;IAvBD,AASE,sBATW,AASX,MAAO,CAAC;MACN,gBAAgB,EAAE,mBAAkB,GACrC;IAXH,AAaE,sBAbW,AAaX,OAAQ,CAAC;MACP,gBAAgB,EAAE,kBAAiB,GACpC;IAfH,AAiBE,sBAjBW,CAiBX,GAAG,CAAC;MACF,QAAQ,EAAE,QAAQ;MAClB,KAAK,EAAE,IAAI;MACX,SAAS,EAAE,IAAI;MACf,WAAW,EAAE,IAAI,GAClB;EAGH,AAAA,2BAAkB,CAAC;IACjB,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,aAAa;IACxB,MAAM,EAAE,UAAU,GACnB;EAED,AAAA,4BAAmB,CAAC;IAClB,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,MAAM;IACd,QAAQ,EAAE,QAAQ,GAOnB;IALC,AACE,mCADM,CACN,4BAA4B,CAAC;MAC3B,YAAY,ExBtHd,IAAI,GwBuHH;EAIL,AAAA,oCAA2B,CAAC;IAC1B,QAAQ,EAAE,QAAQ;IAClB,MAAM,EAAE,KAAK;IACb,SAAS,EAAE,IAAI;IACf,KAAK,EAAE,IAAI;IACX,aAAa,EAAE,QAAQ;IACvB,QAAQ,EAAE,MAAM;IAChB,WAAW,EAAE,MAAM;IACnB,KAAK,ExBnIH,IAAI,GwBoIP;EAED,AAAA,4BAAmB,CAAC;IAClB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,aAAa,EAAE,GAAG,GACnB;EAED,AAAA,4BAAmB,CAAC;IAClB,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,GAAG,CAAC,KAAK,CxBrHZ,OAAO;IwBsHZ,OAAO,EAAE,QAAQ;IACjB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI,GAKlB;IAVD,AAOE,4BAPiB,AAOjB,aAAc,CAAC;MACb,KAAK,ExB3HF,OAAO,GwB4HX;EAGH,AAAsB,4BAAH,GAAG,4BAAmB,CAAC;IACxC,UAAU,EAAE,IAAI,GACjB;EAED,AAAA,mBAAU,CAAC;IACT,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,aAAa;IACxB,MAAM,EAAE,WAAW;IACnB,IAAI,EAAE,QAAQ,GACf;EAED,AAAA,iCAAwB,CAAC;IACvB,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,QAAQ,GACpB;EAED,AAAA,yBAAgB,CAAC;IACf,UAAU,EAAE,iBAAiB;IAC7B,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,UAAU;IACrB,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,MAAM;IACnB,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,UAAU;IACtB,aAAa,EAAE,IAAI;IACnB,MAAM,EAAE,OAAO;IACf,MAAM,EAAE,qBAAqB;IAC7B,QAAQ,EAAE,QAAQ,GAcnB;IA1BD,AAcE,yBAdc,AAcd,MAAO,CAAC;MACN,MAAM,EAAE,GAAG,CAAC,KAAK,CxBvJT,wBAAO,GwBwJhB;IAED,AAAA,mCAAW,CAAC;MACV,MAAM,EAAE,GAAG,CAAC,KAAK,CxB3JT,OAAO,CwB2JgB,UAAU,GAC1C;IAED,AAAA,mCAAW,CAAC;MACV,OAAO,EAAE,EAAE;MACX,cAAc,EAAE,IAAI,GACrB;EAGH,AAAA,sBAAa,CAAC;IACZ,UAAU,EAAE,UAAU,GACvB;EAED,AAAA,sBAAa,CAAC;IACZ,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI,GAClB;EAED,AAAA,wBAAe,CAAC;IACd,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,GAAG,GACjB;EAED,AAAA,sBAAa,CAAC;IACZ,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IACZ,iBAAiB,EAAE,SAAS;IAC5B,eAAe,EAAE,OAAO;IACxB,mBAAmB,EAAE,MAAM;IAC3B,aAAa,EAAE,GAAG;IAClB,gBAAgB,ExB3MZ,IAAI;IwB4MR,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CxB7NnB,mBAAI;IwB8NR,YAAY,EAAE,IAAI;IAClB,IAAI,EAAE,QAAQ,GACf;EAED,AAAA,yBAAgB,CAAC;IACf,QAAQ,EAAE,QAAQ;IAClB,KAAK,ExBxMS,OAAO;IwByMrB,SAAS,EAAE,IAAI;IACf,MAAM,EAAE,CAAC;IACT,IAAI,EAAE,IAAI,GACX;EAED,AAAA,mCAA0B,CAAC;IACzB,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,aAAa,GAqBzB;IAvBD,AAIE,mCAJwB,CAIxB,cAAc,CAAC;MACb,OAAO,EAAE,IAAI;MACb,SAAS,EAAE,UAAU;MACrB,WAAW,EAAE,UAAU,GAexB;MAtBH,AAIE,mCAJwB,CAStB,sBAAS,CAAC;QACR,KAAK,ExB1NF,OAAO;QwB2NV,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,GAAG;QAChB,WAAW,EAAE,IAAI;QACjB,YAAY,EAAE,GAAG,GAClB;MAfL,AAIE,mCAJwB,CAiBtB,sBAAS,CAAC;QACR,KAAK,ExBlOF,OAAO;QwBmOV,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,IAAI,GAClB;EAIL,AAAA,8BAAqB,CAAC;IACpB,OAAO,EAAE,eAAe,GAMzB;IAJC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;MAHrC,AAAA,8BAAqB,CAAC;QAIlB,OAAO,EAAE,MAAM;QACf,KAAK,EAAE,IAAI,GAEd;EAED,AAAA,gCAAuB,CAAC;IACtB,cAAc,EAAE,IAAI,GACrB;EAED,AAAA,wCAA+B,CAAC;IAC9B,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,UAAU;IACrB,MAAM,EAAE,MAAM;IACd,WAAW,EAAE,MAAM,GACpB;EAED,AAAkC,wCAAH,GAAG,wCAA+B,CAAC;IAChE,UAAU,EAAE,IAAI,GACjB;EAED,AAAA,mCAA0B,CAAC;IACzB,YAAY,EAAE,IAAI,GACnB;EAED,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IArSrC,AAAA,UAAU,CAAC;MAsSP,GAAG,EAAE,CAAC;MACN,KAAK,EAAE,IAAI;MACX,QAAQ,EAAE,MAAM;MAChB,MAAM,EAAE,IAAI,GA2Cf;MAzCG,AAAA,mBAAU,CAAC;QACT,UAAU,EAAE,eAAe;QAC3B,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,IAAI,GACjB;MAED,AAAA,mBAAU,CAAC;QACT,aAAa,EAAE,GAAG,CAAC,KAAK,CxBhSpB,OAAO,GwBiSZ;MAED,AAAA,sBAAa,CAAC;QACZ,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI,GACb;MAED,AAAA,wBAAe,CAAC;QACd,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,IAAI,GAClB;MAED,AAAA,sBAAa,CAAC;QACZ,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,IAAI,GAClB;MAED,AAAA,mBAAU,CAAC;QACT,SAAS,EAAE,UAAU;QACrB,KAAK,EAAE,IAAI;QACX,WAAW,EAAE,MAAM;QACnB,eAAe,EAAE,MAAM;QACvB,OAAO,EAAE,MAAM;QACf,MAAM,EAAE,CAAC;QACT,UAAU,EAAE,GAAG,CAAC,KAAK,CxBzTjB,OAAO,GwB+TZ;QAbD,AASE,mBATQ,CASR,MAAM,CAAC;UACL,IAAI,EAAE,QAAQ;UACd,MAAM,EAAE,MAAM,GACf;;ACjVP,AAAA,iBAAiB,CAAC;EAChB,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,MAAM;EACb,MAAM,EAAE,GAAG,CAAC,KAAK,CzBsBZ,OAAO;EyBrBZ,aAAa,EAAE,GAAG;EAClB,gBAAgB,EzBkBV,IAAI;EyBjBV,KAAK,EzBkBM,OAAO;EyBjBlB,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;EAChB,OAAO,EAAE,QAAQ;EACjB,QAAQ,EAAE,QAAQ,GA4CnB;EA1CC,AAAA,8BAAc,CAAC;IACb,OAAO,EAAE,IAAI,GACd;EAED,AAAA,wBAAQ,CAAC;IACP,KAAK,EzBcE,OAAO;IyBbd,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,YAAY;IACrB,SAAS,EAAE,IAAI,GAChB;EAED,AAAA,mCAAmB,CAAC;IAClB,KAAK,EzBIE,OAAO;IyBHd,WAAW,EAAE,GAAG;IAChB,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI,GAClB;EAED,AAAA,gCAAgB,CAAC;IACf,OAAO,EAAE,IAAI,GACd;EAED,AAAA,kCAAkB,EAClB,AAAA,qCAAqB,CAAC;IACpB,KAAK,EzBjBI,OAAO;IyBkBhB,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI,GAClB;EAED,AAAA,gCAAgB,CAAC;IACf,QAAQ,EAAE,QAAQ;IAClB,OAAO,EAAE,IAAI,GACd;EAED,AAAA,kCAAkB,CAAC;IACjB,UAAU,EAAE,GAAG,GAChB;;ACtDH,AAAA,aAAa,CAAC;EACZ,QAAQ,EAAE,KAAK;EACf,OAAO,EAAE,GAAG;EACZ,GAAG,EAAE,IAAI;EACT,KAAK,EAAE,KAAK,GA+Hb;EA7HC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IANrC,AAAA,aAAa,CAAC;MAOV,KAAK,EAAE,gCAAgC,GA4H1C;EAzHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAVrC,AAAA,aAAa,CAAC;MAWV,KAAK,EAAE,wBAAwB,GAwHlC;EArHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAdrC,AAAA,aAAa,CAAC;MAeV,KAAK,EAAE,wBAAwB,GAoHlC;EAjHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,MAAM;IAlBtC,AAAA,aAAa,CAAC;MAmBV,KAAK,EAAE,wBAAwB,GAgHlC;EA7GC,AAAA,mBAAO,CAAC;IACN,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE,OAAO,GAChB;EAED,AAAA,qBAAS,CAAC;IACR,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,UAAU;IACrB,eAAe,EAAE,aAAa;IAC9B,WAAW,EAAE,MAAM,GACpB;EAED,AAAA,4BAAgB,CAAC;IACf,MAAM,EAAE,GAAG,CAAC,KAAK,C1BXR,OAAO;I0BYhB,gBAAgB,EAAE,WAAW;IAC7B,KAAK,E1BdD,IAAI;I0BeR,aAAa,EAAE,GAAG;IAClB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,OAAO,EAAE,MAAM;IACf,WAAW,EAAE,GAAG,GACjB;EA3CH,AA6CE,aA7CW,CA6CX,GAAG,CAAC;IACF,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI,GACb;EAED,AAAA,uBAAW,CAAC;IACV,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,aAAa;IACxB,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,KAAK;IACjB,QAAQ,EAAE,QAAQ;IAClB,OAAO,EAAE,GAAG,GAeb;IArBD,AAQE,uBARS,AAQT,mBAAoB,CAAC;MACnB,OAAO,EAAE,IAAI,GACd;IAED,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;MAZrC,AAAA,uBAAW,CAAC;QAaR,UAAU,EAAE,KAAK,GAQpB;IArBD,AAgBE,uBAhBS,CAgBT,cAAc,CAAC;MACb,UAAU,EAAE,GAAG;MACf,gBAAgB,E1B9Dd,IAAI;M0B+DN,KAAK,E1B7CE,OAAO,G0B8Cf;EAGH,AAAA,sBAAU,CAAC;IACT,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,UAAU;IACrB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,QAAQ,GAKf;IAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;MANrC,AAAA,sBAAU,CAAC;QAOP,OAAO,EAAE,SAAS,GAErB;EAED,AAAA,2BAAe,CAAC;IACd,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,aAAa;IACxB,WAAW,EAAE,GAAG,GACjB;EAED,AAAA,yBAAa,CAAC;IACZ,KAAK,EAAE,IAAI;IACX,YAAY,EAAE,IAAI;IAClB,IAAI,EAAE,QAAQ,GACf;EAED,AAAA,8BAAkB,CAAC;IACjB,gBAAgB,EAAE,6BAA6B;IAC/C,MAAM,EAAE,IAAI;IACZ,KAAK,EAAE,IAAI;IACX,iBAAiB,EAAE,SAAS;IAC5B,mBAAmB,EAAE,MAAM;IAC3B,eAAe,EAAE,OAAO;IACxB,MAAM,EAAE,KAAK,GACd;EAzGH,AA2GE,aA3GW,CA2GX,UAAU,CAAC;IACT,MAAM,EAAE,UAAU;IAClB,IAAI,EAAE,QAAQ,GACf;EAED,AAAA,mBAAO,CAAC;IACN,KAAK,E1B1FD,IAAI;I0B2FR,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,GAAG;IAChB,WAAW,EAAE,IAAI,GAClB;EAED,AAAA,sBAAU,CAAC;IACT,KAAK,E1BhGI,OAAO;I0BiGhB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI,GAClB;EAED,AAAA,qBAAS,CAAC;IACR,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,GAAG;IAChB,MAAM,EAAE,OAAO,GAChB;;AClIH,AAAA,KAAK,CAAC;EACJ,aAAa,EAAE,GAAG;EAClB,UAAU,E3BIJ,kBAAI;E2BHV,UAAU,E3BGJ,mBAAI,C2BHoB,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG;EAC3C,SAAS,EAAE,KAAK;EAChB,KAAK,E3BkBC,IAAI,G2BmCX;EAnDC,AAAA,WAAO,CAAC;IACN,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,UAAU;IACrB,WAAW,EAAE,MAAM;IACnB,QAAQ,EAAE,QAAQ;IAClB,OAAO,EAAE,GAAG;IACZ,WAAW,EAAE,GAAG,GA4BjB;IA1BC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;MATrC,AAAA,WAAO,CAAC;QAUJ,OAAO,EAAE,IAAI,GAyBhB;IAtBC,AAAA,sBAAY,CAAC;MACX,MAAM,EAAE,OAAO,GAShB;MAVD,AAGE,sBAHU,AAGV,MAAO,CAAC;QACN,gBAAgB,E3BDhB,yBAAI,G2BEL;MALH,AAOE,sBAPU,AAOV,OAAQ,CAAC;QACP,gBAAgB,E3BLhB,wBAAI,G2BML;IAGH,AAAA,iBAAO,CAAC;MACN,MAAM,EAAE,IAAI;MACZ,KAAK,EAAE,IAAI;MACX,YAAY,EAAE,IAAI,GACnB;IAED,AAAA,iBAAO,CAAC;MACN,SAAS,EAAE,IAAI;MACf,WAAW,EAAE,IAAI,GAClB;EAGH,AAAA,cAAU,CAAC;IACT,gBAAgB,E3BbT,OAAO;I2Bcd,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,GAAG,GACZ;EAED,AAAA,iBAAa,CAAC;IACZ,QAAQ,EAAE,KAAK;IACf,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IACZ,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;IACP,OAAO,EAAE,GAAG,GACb;;ACzDH,AAAA,WAAW,CAAC;EACV,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK,GAgDb;EA9CC,AAAA,kBAAQ,CAAC;IACP,KAAK,EAAE,KAAK;IACZ,WAAW,EAAE,IAAI;IACjB,OAAO,EAAE,CAAC,GACX;EARH,AAUE,WAVS,CAUT,KAAK,CAAA,AAAA,IAAC,CAAD,KAAC,AAAA,EAAY;IAChB,kBAAkB,EAAE,eAAe,GACpC;EAZH,AAcE,WAdS,CAcT,KAAK,CAAA,AAAA,IAAC,CAAD,KAAC,AAAA,CAAW,sBAAsB,CAAC;IACtC,kBAAkB,EAAE,eAAe;IACnC,MAAM,EAAE,IAAI;IACZ,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,iBAAiB;IACzB,gBAAgB,EAAE,OAAO;IACzB,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAgB;IACxC,aAAa,EAAE,GAAG;IAClB,QAAQ,EAAE,QAAQ;IAClB,OAAO,EAAE,EAAE,GACZ;EAED,AAAA,gBAAM,CAAC;IACL,MAAM,EAAE,GAAG;IACX,KAAK,EAAE,KAAK;IACZ,UAAU,E5BJP,OAAO;I4BKV,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,aAAa;IAC9B,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,IAAI;IACT,OAAO,EAAE,CAAC,GACX;EAED,AAAA,gBAAM,EAAE,AAAA,iBAAO,CAAC;IACd,MAAM,EAAE,GAAG;IACX,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,CAAC,GACX;EAED,AAAA,gBAAM,CAAC;IACL,gBAAgB,E5BRV,OAAO,G4BSd;EAED,AAAA,iBAAO,CAAC;IACN,gBAAgB,E5BdF,OAAO,G4BetB;;ACjDH,AAAA,SAAS,CAAC;EACR,QAAQ,EAAE,QAAQ;EAClB,UAAU,E7BqBJ,IAAI;E6BpBV,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,aAAa;EACxB,MAAM,EAAE,IAAI;EACZ,QAAQ,EAAE,IAAI,GACf;;AAED,AAAA,iBAAiB,CAAC;EAChB,OAAO,EAAE,IAAI,GACd;;AAED,AAAA,uBAAuB,AAAA,OAAO,CAAC;EAC7B,OAAO,EAAE,OAAO;EAChB,SAAS,EAAE,IAAI;EACf,KAAK,E7BQM,OAAO;E6BPlB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,IAAI;EACT,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,OAAO,GAChB;;AAED,AAAA,gBAAgB,CAAC;EACf,cAAc,EAAE,IAAI;EACpB,UAAU,EAAE,MAAM;EAClB,KAAK,E7BUG,OAAO,G6BThB;;AAED,AAAA,kBAAkB,CAAC;EACjB,OAAO,EAAE,MAAM,GAChB;;AAED,AAAA,sBAAsB,CAAC;EACrB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,OAAO,EAAE,WAAW,GAMrB;EAJC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IALrC,AAAA,sBAAsB,CAAC;MAMnB,cAAc,EAAE,MAAM;MACtB,OAAO,EAAE,MAAM,GAElB;;AAED,AAAA,uBAAuB,CAAC;EACtB,IAAI,EAAE,CAAC;EACP,SAAS,EAAE,CAAC;EACZ,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,OAAO,EAAE,KAAK;EACd,MAAM,EAAE,IAAI,GAUb;EARC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IARrC,AAAA,uBAAuB,CAAC;MASpB,MAAM,EAAE,OAAO;MACf,OAAO,EAAE,KAAK,GAMjB;EAHC,AAAA,uCAAiB,CAAC;IAChB,MAAM,EAAE,OAAO,GAChB;;AAGH,AAAA,2BAA2B,CAAC;EAC1B,SAAS,EAAE,KAAK;EAChB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM,GAMvB;EAJC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IALrC,AAAA,2BAA2B,CAAC;MAMxB,SAAS,EAAE,IAAI;MACf,KAAK,EAAE,IAAI,GAEd;;AAED,AAAA,8BAA8B,CAAC;EAC7B,SAAS,EAAE,IAAI;EACf,KAAK,E7BnDM,OAAO;E6BoDlB,WAAW,EAAE,GAAG,GACjB;;AAED,AAAA,gBAAgB,CAAC;EACf,YAAY,EAAE,IAAI;EAClB,SAAS,EAAE,IAAI;EACf,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,GAAG,CAAC,KAAK,C7B1DZ,OAAO,G6B2Db;;AAED,AAAA,gBAAgB,AAAA,2BAA2B,CAAC;EAC1C,WAAW,EAAE,GAAG;EAChB,KAAK,E7BhEM,OAAO,G6BiEnB;;AAED,AAAA,gBAAgB,AAAA,kBAAkB,CAAC;EACjC,WAAW,EAAE,GAAG;EAChB,KAAK,E7BrEM,OAAO,G6BsEnB;;AAED,AAAA,gBAAgB,AAAA,sBAAsB,CAAC;EACrC,WAAW,EAAE,GAAG;EAChB,KAAK,E7B1EM,OAAO,G6B2EnB;;AAED,AAAA,gBAAgB,AAAA,iBAAiB,CAAC;EAChC,WAAW,EAAE,GAAG;EAChB,KAAK,E7B/EM,OAAO,G6BgFnB;;AAED,AAAA,2BAA2B,CAAC;EAC1B,SAAS,EAAE,IAAI;EACf,MAAM,EAAE,GAAG,CAAC,KAAK,C7BnFZ,OAAO;E6BoFZ,aAAa,EAAE,GAAG;EAClB,OAAO,EAAE,IAAI;EACb,gBAAgB,E7BxFV,IAAI;E6ByFV,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,eAAe,EAAE,UAAU,GAC5B;;AAED,AAAA,wBAAwB,CAAC;EACvB,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,YAAY,EAAE,IAAI;EAClB,aAAa,EAAE,IAAI,GACpB;;AAED,AAAA,0BAA0B,CAAC;EACzB,UAAU,EAAE,QAAQ;EACpB,OAAO,EAAE,GAAG;EACZ,cAAc,EAAE,SAAS;EACzB,KAAK,E7BxGM,OAAO;E6ByGlB,MAAM,EAAE,OAAO,GAChB;;AAED,AAAA,uBAAuB,CAAC;EACtB,SAAS,EAAE,IAAI;EACf,MAAM,EAAE,GAAG,CAAC,KAAK,C7B1GJ,OAAO;E6B2GpB,KAAK,E7B3GQ,OAAO;E6B4GpB,aAAa,EAAE,GAAG;EAClB,OAAO,EAAE,IAAI;EACb,gBAAgB,E7BnHV,IAAI;E6BoHV,cAAc,EAAE,SAAS,GAC1B;;AAED,AAAA,4BAA4B,CAAC;EAC3B,MAAM,EAAE,GAAG,CAAC,KAAK,C7B5GX,OAAO;E6B6Gb,KAAK,E7B7GC,OAAO,G6B8Gd;;AAED,AAAA,4BAA4B,CAAC;EAC3B,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,IAAI,GACpB;;AAED,AAAA,oBAAoB,CAAC;EACnB,UAAU,EAAE,IAAI;EAChB,SAAS,EAAE,IAAI,GAChB;;AAED,AAAA,oBAAoB,CAAC;EACnB,OAAO,EAAE,MAAM,GAChB;;AAED,AAAA,2BAA2B,CAAC;EAC1B,cAAc,EAAE,IAAI,GAKrB;EAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAHrC,AAAA,2BAA2B,CAAC;MAIxB,cAAc,EAAE,GAAG,GAEtB;;AAED,AAAA,yBAAyB,CAAC;EACxB,OAAO,EAAE,MAAM,GAKhB;EAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAHrC,AAAA,yBAAyB,CAAC;MAItB,OAAO,EAAE,KAAK,GAEjB;;AAED,AAAA,8BAA8B,CAAC;EAC7B,WAAW,EAAE,GAAG;EAChB,SAAS,EAAE,IAAI;EACf,KAAK,E7B5JM,OAAO,G6B6JnB;;AAED,AAAA,qBAAqB,CAAC;EACpB,KAAK,E7BhKM,OAAO;E6BiKlB,aAAa,EAAE,IAAI,GACpB;;AAED,AAAA,oBAAoB,CAAC;EACnB,KAAK,E7BjKQ,OAAO,G6BkKrB;;AAED,AAAA,yBAAyB,CAAC;EACxB,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,IAAI;EACX,YAAY,E7B1KP,OAAO;E6B2KZ,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,GAAG;EACX,gBAAgB,E7B7KX,OAAO;E6B8KZ,KAAK,E7B9KA,OAAO,G6B+Kb;;ACxMD,AAAA,QAAQ,CAAC;EACP,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,eAAe,EAAE,UAAU;EAC3B,WAAW,EAAE,QAAQ,GACtB;;AAED,AAAA,aAAa,CAAC;EACZ,SAAS,EAAE,CAAC;EACZ,IAAI,EAAE,QAAQ;EACd,OAAO,EAAE,SAAS;EAClB,aAAa,EAAE,GAAG,CAAC,KAAK,C9BcnB,OAAO;E8BbZ,UAAU,EAAE,UAAU;EACtB,SAAS,EAAE,IAAI,GAChB;;AAED,AAAA,qBAAqB,CAAC;EACpB,YAAY,E9BXN,IAAI,G8BYX;;AAED,AAAA,kBAAkB,CAAC;EACjB,SAAS,EAAE,CAAC,GACb;;ACtBD,AAAA,gBAAgB,CAAC;EACf,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,UAAU;EAC3B,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,GAAG,CAAC,KAAK,C/BoBZ,OAAO;E+BnBZ,aAAa,EAAE,GAAG;EAClB,gBAAgB,E/BgBV,IAAI;E+BfV,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,OAAO;EACd,MAAM,EAAE,OAAO;EACf,QAAQ,EAAE,QAAQ,GACnB;;AAED,AAAA,uBAAuB,CAAC;EACtB,KAAK,E/BkBE,OAAO;E+BjBd,OAAO,EAAE,MAAM,GAChB;;AAED,AAAA,0BAA0B,CAAC;EACzB,SAAS,EAAE,CAAC;EACZ,OAAO,EAAE,MAAM,GAChB;;AAED,AAAA,yBAAyB,CAAC;EACxB,OAAO,EAAE,IAAI;EACb,QAAQ,EAAE,QAAQ;EAClB,MAAM,EAAE,KAAK;EACb,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,iBAAiB;EACzB,aAAa,EAAE,GAAG;EAClB,gBAAgB,EAAE,IAAI;EACtB,kBAAkB,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAkB;EAClD,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAkB;EAC1C,UAAU,EAAE,IAAI;EAChB,UAAU,EAAE,MAAM;EAClB,IAAI,EAAE,CAAC;EACP,GAAG,EAAE,IAAI,GACV;;AAED,AAAA,wBAAwB,CAAC;EACvB,OAAO,EAAE,IAAI,GAKd;EAND,AAGE,wBAHsB,AAGtB,MAAO,CAAC;IACN,gBAAgB,E/BzBV,OAAO,G+B0Bd;;AAGH,AAAA,kCAAkC,CAAC;EACjC,gBAAgB,E/BxBX,OAAO,G+B8Bb;EAPD,AAGE,kCAHgC,AAGhC,MAAO,CAAC;IACN,gBAAgB,E/B3Bb,OAAO;I+B4BV,MAAM,EAAE,OAAO,GAChB;;AAGH,AAAA,4BAA4B,CAAC;EAC3B,QAAQ,EAAE,KAAK;EACf,GAAG,EAAE,CAAC;EACN,IAAI,EAAE,CAAC;EACP,OAAO,EAAE,IAAI;EACb,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI,GACb;;AC/DC,AAAA,6BAAY,CAAC;EACX,KAAK,EAAE,KAAK;EACZ,aAAa,EAAE,GAAG;EAClB,gBAAgB,EhCmBZ,IAAI;EgClBR,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAgB;EACxC,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,aAAa;EACxB,OAAO,EAAE,EAAE;EACX,WAAW,EAAE,MAAM;EACnB,WAAW,EAAE,MAAM;EACnB,QAAQ,EAAE,QAAQ;EAClB,MAAM,EAAE,IAAI,GAWb;EATC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAbrC,AAAA,6BAAY,CAAC;MAcT,KAAK,EAAE,IAAI;MACX,GAAG,EAAE,CAAC;MACN,UAAU,EAAE,IAAI,GAMnB;EAHC,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK;IAnBrC,AAAA,6BAAY,CAAC;MAoBT,UAAU,EAAE,KAAK,GAEpB;;AAED,AAAA,0BAAS,CAAC;EACR,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,MAAM;EACjB,eAAe,EAAE,MAAM;EACvB,WAAW,EAAE,MAAM;EACnB,IAAI,EAAE,QAAQ,GACf;;AAED,AAAA,qCAAoB,CAAC;EACnB,QAAQ,EAAE,QAAQ;EAClB,gBAAgB,EhCGN,OAAO;EgCFjB,OAAO,EAAE,CAAC;EACV,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI,GACb;;AAED,AAAA,gCAAe,CAAC;EACd,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,KAAK;EACZ,KAAK,EAAE,OAAO;EACd,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;EAChB,WAAW,EAAE,IAAI;EACjB,OAAO,EAAE,CAAC,GACX;;AAED,AAAA,yCAAwB,CAAC;EACvB,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM,GACxB;;AAED,AAAA,+BAAc,CAAC;EACb,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,UAAU,EhCvBA,OAAO;EgCwBjB,SAAS,EAAE,aAAa;EACxB,QAAQ,EAAE,QAAQ;EAClB,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,CAAC,GACX;;AAED,AAAA,gCAAe,CAAC;EACd,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,aAAa;EAC9B,UAAU,EAAE,IAAI;EAChB,aAAa,EAAE,IAAI,GACpB;;AAED,AAAA,2BAAU,CAAC;EACT,KAAK,EhCvDI,OAAO;EgCwDhB,WAAW,EAAE,IAAI,GAClB;;AAED,AAAA,gCAAe,CAAC;EACd,SAAS,EAAE,IAAI,GAChB;;AAED,AAAA,2BAAU,CAAC;EACT,KAAK,EhChEI,OAAO;EgCiEhB,YAAY,EAAE,IAAI;EAClB,KAAK,EAAE,KAAK,GACb;;AAED,AAAA,gCAAe,CAAC;EACd,UAAU,EAAE,KAAK;EACjB,SAAS,EAAE,IAAI,GAChB;;AAED,AAAA,iCAAgB,CAAC;EACf,UAAU,EAAE,KAAK;EACjB,UAAU,EAAE,KAAK,GAClB;;AAED,AAAA,gCAAe,CAAC;EACd,UAAU,EAAE,IAAI,GACjB;;AAED,AAAA,wBAAO,CAAC;EACN,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,MAAM;EACjB,IAAI,EAAE,QAAQ;EACd,MAAM,EAAE,CAAC,GACV;;AAED,AAAA,gCAAe,CAAC;EACd,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM,GACxB;;AAED,AAAA,4BAAW,CAAC;EACV,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,KAAK;EACZ,KAAK,EhC9FC,OAAO;EgC+Fb,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;EAChB,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,MAAM;EAClB,UAAU,EAAE,IAAI,GACjB;;AAED,AAAA,0BAAS,EACT,AAAA,2BAAU,CAAC;EACT,WAAW,EAAE,aAAa;EAC1B,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,MAAM;EAClB,UAAU,EAAE,IAAI;EAChB,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,IAAI,GACZ;;AAED,AAAA,0BAAS,CAAC;EACR,KAAK,EhCzHI,OAAO,GgC0HjB;;AAED,AAAA,2BAAU,CAAC;EACT,KAAK,EhCjHC,OAAO,GgCkHd;;AAED,AAAA,wBAAO,CAAC;EACN,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,MAAM;EAClB,UAAU,EAAE,MAAM;EAClB,UAAU,EAAE,GAAG,CAAC,KAAK,ChCjHhB,OAAO;EgCkHZ,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,MAAM,GAClB;;AAED,AAAA,uBAAM,CAAC;EACL,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,MAAM,GAClB;;AAED,AAAA,6BAAY,CAAC;EACX,KAAK,EAAE,IAAI;EACX,KAAK,EhChJI,OAAO;EgCiJhB,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,IAAI;EAChB,WAAW,EAAE,IAAI;EACjB,KAAK,EAAE,IAAI,GACZ;;AAED,AAAA,6BAAY,CAAC;EACX,KAAK,EhClJE,OAAO;EgCmJd,WAAW,EAAE,MAAM;EACnB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,KAAK,EAAE,IAAI;EACX,aAAa,EAAE,UAAU;EACzB,aAAa,EAAE,iBAAiB;EAChC,OAAO,EAAE,aAAa,GACvB;;AAED,AAAA,0BAAS,CAAC;EACR,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,eAAe,EAAE,YAAY;EAC7B,SAAS,EAAE,IAAI;EACf,QAAQ,EAAE,QAAQ;EAClB,IAAI,EAAE,QAAQ;EACd,UAAU,EAAE,GAAG,CAAC,KAAK,ChCzJhB,OAAO,GgCyLb;EA9BC,AAAA,yCAAgB,EAChB,AAAA,uCAAc,CAAC;IACb,OAAO,EAAE,IAAI;IACb,WAAW,EAAE,MAAM;IACnB,eAAe,EAAE,MAAM;IACvB,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,GAAG;IAChB,MAAM,EAAE,IAAI;IACZ,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE,OAAO;IACf,aAAa,EAAE,GAAG;IAClB,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,KAAK;IAChB,MAAM,EAAE,IAAI,GACb;EAED,AAAA,yCAAgB,CAAC;IACf,UAAU,EAAE,IAAI;IAChB,MAAM,EAAE,GAAG,CAAC,KAAK,ChClMV,OAAO;IgCmMd,YAAY,EAAE,GAAG,GAClB;EAED,AAAA,uCAAc,CAAC;IACb,gBAAgB,EhC7LJ,OAAO;IgC8LnB,YAAY,EAAE,CAAC;IACf,KAAK,EhC1MH,IAAI;IgC2MN,WAAW,EAAE,GAAG,GACjB;;ACnOL,AAAA,sBAAsB,CAAC;EACrB,MAAM,EAAE,IAAI;EACZ,gBAAgB,EjCqBV,IAAI;EiCpBV,WAAW,EAAE,MAAM;EACnB,WAAW,EAAE,IAAI;EACjB,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,KAAK,GAyCb;EAvCC,AAAA,kCAAa,CAAC;IACZ,QAAQ,EAAE,KAAK;IACf,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;IACP,OAAO,EAAE,IAAI;IACb,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI,GACb;EAED,AAAA,4BAAO,CAAC;IACN,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,QAAQ;IAClB,MAAM,EAAE,KAAK;IACb,KAAK,EAAE,MAAM;IACb,MAAM,EAAE,GAAG,CAAC,KAAK,CjCqBZ,OAAO;IiCpBZ,aAAa,EAAE,GAAG;IAClB,gBAAgB,EjCDZ,IAAI;IiCER,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAkB;IAC1C,UAAU,EAAE,MAAM,GACnB;EA3BH,AA6BE,sBA7BoB,CA6BpB,kBAAkB,CAAC;IACjB,UAAU,EAAE,GAAG,GAChB;EA/BH,AAiCE,sBAjCoB,CAiCpB,gCAAgC,CAAC;IAC/B,aAAa,EAAE,QAAQ;IACvB,QAAQ,EAAE,MAAM;IAChB,WAAW,EAAE,MAAM;IACnB,KAAK,EAAE,IAAI,GACZ;EAtCH,AAwCE,sBAxCoB,CAwCpB,2BAA2B,CAAC;IAC1B,MAAM,EAAE,CAAC,GACV;EA1CH,AA4CE,sBA5CoB,CA4CpB,wBAAwB,CAAC;IACvB,QAAQ,EAAE,OAAO,GAClB;;AC9CH,AAAA,eAAe,CAAC;EACd,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,eAAe,EAAE,MAAM;EACvB,QAAQ,EAAE,QAAQ,GA8BnB;EA5BC,AAAA,sBAAQ,CAAC;IACP,SAAS,EAAE,KAAK;IAChB,QAAQ,EAAE,MAAM;IAChB,WAAW,EAAE,MAAM;IACnB,aAAa,EAAE,QAAQ,GACxB;EAED,AAAA,sBAAQ,CAAC;IACP,KAAK,EAAE,KAAK;IACZ,SAAS,EAAE,IAAI;IACf,UAAU,EAAE,MAAM;IAClB,MAAM,EAAE,GAAG,CAAC,KAAK,ClCQd,OAAO,GkCHX;IAHC,AAAA,6BAAQ,CAAC;MACP,MAAM,EAAE,GAAG,CAAC,KAAK,ClCef,OAAO,GkCdV;EAGH,AAAA,6BAAe,CAAC;IACd,QAAQ,EAAE,QAAQ;IAClB,WAAW,EAAE,IAAI;IACjB,IAAI,EAAE,IAAI,GACX;EAED,AAAA,qBAAO,CAAC;IACN,MAAM,EAAE,OAAO;IACf,KAAK,ElCRI,OAAO,GkCSjB;;ACjCH;;GAEG;AAIH,eAAe;AACf,AAAa,YAAD,CAAC,WAAW,CAAC;EACvB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI,GACZ;;AAED,qBAAqB;AACrB,AAAwB,YAAZ,AAAA,WAAW,CAAC,kBAAkB;AAC1C,AAAuB,YAAX,AAAA,UAAU,CAAC,kBAAkB,CAAC;EACxC,UAAU,EAAE,MAAM;EAClB,SAAS,EAAE,aAAa;EACxB,UAAU,EAAE,uBAAuB,GACpC;;AAED,sBAAsB;AACtB,AAAuB,YAAX,AAAA,UAAU,CAAC,kBAAkB,CAAC;EACxC,SAAS,EAAE,iBAAiB;EAC5B,UAAU,EAAE,uBAAuB,GACpC;;AAED,AAAwB,YAAZ,AAAA,WAAW,CAAC,kBAAkB,CAAC;EACzC,SAAS,EAAE,kBAAkB;EAC7B,UAAU,EAAE,uBAAuB,GACpC;;AAED,AAAA,QAAQ,AAAA,UAAU,CAAC;EACjB,SAAS,EAAE,kBAAkB;EAC7B,UAAU,EAAE,uBAAuB,GACpC;;AAED,wBAAwB;AACxB,AAAA,aAAa;AACb,AAAA,oBAAoB,CAAC;EACnB,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,mBAAmB,GAChC;;AAED,AAAA,oBAAoB;AACpB,AAAA,aAAa,CAAC;EACZ,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,mBAAmB,GAChC;;AAED,wBAAwB;AACxB,AAAwB,YAAZ,AAAA,WAAW,CAAC,WAAW,AAAA,IAAK,CAAA,AAAA,kBAAkB,EAAE;EAC1D,SAAS,EAAE,iBAAiB,GAC7B;;AAED,AAAuB,YAAX,AAAA,UAAU,CAAC,WAAW,AAAA,IAAK,CAAA,AAAA,kBAAkB,EAAE;EACzD,SAAS,EAAE,kBAAkB,GAC9B;;AAED,AAAA,CAAC,AAAA,GAAG,AAAA,mBAAmB,AAAA,MAAM,AAAA,UAAU,CAAC;EACtC,SAAS,EAAE,IAAI,GAChB;;AAMD,uBAAuB;AACvB,AAAA,8BAA8B,CAAC;EAC7B,WAAW,EAAE,QAAQ;EACrB,SAAS,EAAE,IAAI,GAChB;;AACD,sBAAsB"} */ diff --git a/ui/app/css/reset.css b/old-ui/app/css/reset.css index 9ce89e8bc..9ce89e8bc 100644 --- a/ui/app/css/reset.css +++ b/old-ui/app/css/reset.css diff --git a/ui/app/css/transitions.css b/old-ui/app/css/transitions.css index 393a944f9..393a944f9 100644 --- a/ui/app/css/transitions.css +++ b/old-ui/app/css/transitions.css diff --git a/old-ui/app/first-time/init-menu.js b/old-ui/app/first-time/init-menu.js new file mode 100644 index 000000000..4f1d5d186 --- /dev/null +++ b/old-ui/app/first-time/init-menu.js @@ -0,0 +1,179 @@ +const inherits = require('util').inherits +const EventEmitter = require('events').EventEmitter +const Component = require('react').Component +const connect = require('react-redux').connect +const h = require('react-hyperscript') +const Mascot = require('../components/mascot') +const actions = require('../../../ui/app/actions') +const Tooltip = require('../components/tooltip') +const getCaretCoordinates = require('textarea-caret') + +module.exports = connect(mapStateToProps)(InitializeMenuScreen) + +inherits(InitializeMenuScreen, Component) +function InitializeMenuScreen () { + Component.call(this) + this.animationEventEmitter = new EventEmitter() +} + +function mapStateToProps (state) { + return { + // state from plugin + currentView: state.appState.currentView, + warning: state.appState.warning, + } +} + +InitializeMenuScreen.prototype.render = function () { + var state = this.props + + switch (state.currentView.name) { + + default: + return this.renderMenu(state) + + } +} + +// InitializeMenuScreen.prototype.componentDidMount = function(){ +// document.getElementById('password-box').focus() +// } + +InitializeMenuScreen.prototype.renderMenu = function (state) { + return ( + + h('.initialize-screen.flex-column.flex-center.flex-grow', [ + + h(Mascot, { + animationEventEmitter: this.animationEventEmitter, + }), + + h('h1', { + style: { + fontSize: '1.3em', + textTransform: 'uppercase', + color: '#7F8082', + marginBottom: 10, + }, + }, 'MetaMask'), + + + h('div', [ + h('h3', { + style: { + fontSize: '0.8em', + color: '#7F8082', + display: 'inline', + }, + }, 'Encrypt your new DEN'), + + h(Tooltip, { + title: 'Your DEN is your password-encrypted storage within MetaMask.', + }, [ + h('i.fa.fa-question-circle.pointer', { + style: { + fontSize: '18px', + position: 'relative', + color: 'rgb(247, 134, 28)', + top: '2px', + marginLeft: '4px', + }, + }), + ]), + ]), + + h('span.in-progress-notification', state.warning), + + // password + h('input.large-input.letter-spacey', { + type: 'password', + id: 'password-box', + placeholder: 'New Password (min 8 chars)', + onInput: this.inputChanged.bind(this), + style: { + width: 260, + marginTop: 12, + }, + }), + + // confirm password + h('input.large-input.letter-spacey', { + type: 'password', + id: 'password-box-confirm', + placeholder: 'Confirm Password', + onKeyPress: this.createVaultOnEnter.bind(this), + onInput: this.inputChanged.bind(this), + style: { + width: 260, + marginTop: 16, + }, + }), + + + h('button.primary', { + onClick: this.createNewVaultAndKeychain.bind(this), + style: { + margin: 12, + }, + }, 'Create'), + + h('.flex-row.flex-center.flex-grow', [ + h('p.pointer', { + onClick: this.showRestoreVault.bind(this), + style: { + fontSize: '0.8em', + color: 'rgb(247, 134, 28)', + textDecoration: 'underline', + }, + }, 'Import Existing DEN'), + ]), + + ]) + ) +} + +InitializeMenuScreen.prototype.createVaultOnEnter = function (event) { + if (event.key === 'Enter') { + event.preventDefault() + this.createNewVaultAndKeychain() + } +} + +InitializeMenuScreen.prototype.componentDidMount = function () { + document.getElementById('password-box').focus() +} + +InitializeMenuScreen.prototype.showRestoreVault = function () { + this.props.dispatch(actions.showRestoreVault()) +} + +InitializeMenuScreen.prototype.createNewVaultAndKeychain = function () { + var passwordBox = document.getElementById('password-box') + var password = passwordBox.value + var passwordConfirmBox = document.getElementById('password-box-confirm') + var passwordConfirm = passwordConfirmBox.value + + if (password.length < 8) { + this.warning = 'password not long enough' + this.props.dispatch(actions.displayWarning(this.warning)) + return + } + if (password !== passwordConfirm) { + this.warning = 'passwords don\'t match' + this.props.dispatch(actions.displayWarning(this.warning)) + return + } + + this.props.dispatch(actions.createNewVaultAndKeychain(password)) +} + +InitializeMenuScreen.prototype.inputChanged = function (event) { + // tell mascot to look at page action + var element = event.target + var boundingRect = element.getBoundingClientRect() + var coordinates = getCaretCoordinates(element, element.selectionEnd) + this.animationEventEmitter.emit('point', { + x: boundingRect.left + coordinates.left - element.scrollLeft, + y: boundingRect.top + coordinates.top - element.scrollTop, + }) +} diff --git a/old-ui/app/img/identicon-tardigrade.png b/old-ui/app/img/identicon-tardigrade.png Binary files differnew file mode 100644 index 000000000..1742a32b8 --- /dev/null +++ b/old-ui/app/img/identicon-tardigrade.png diff --git a/old-ui/app/img/identicon-walrus.png b/old-ui/app/img/identicon-walrus.png Binary files differnew file mode 100644 index 000000000..d58fae912 --- /dev/null +++ b/old-ui/app/img/identicon-walrus.png diff --git a/old-ui/app/info.js b/old-ui/app/info.js new file mode 100644 index 000000000..db9f30f23 --- /dev/null +++ b/old-ui/app/info.js @@ -0,0 +1,155 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') +const connect = require('react-redux').connect +const actions = require('../../ui/app/actions') + +module.exports = connect(mapStateToProps)(InfoScreen) + +function mapStateToProps (state) { + return {} +} + +inherits(InfoScreen, Component) +function InfoScreen () { + Component.call(this) +} + +InfoScreen.prototype.render = function () { + const state = this.props + const version = global.platform.getVersion() + + return ( + h('.flex-column.flex-grow', { + style: { + maxWidth: '400px', + }, + }, [ + + // subtitle and nav + h('.section-title.flex-row.flex-center', [ + h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { + onClick: (event) => { + state.dispatch(actions.goHome()) + }, + }), + h('h2.page-subtitle', 'Info'), + ]), + + // main view + h('.flex-column.flex-justify-center.flex-grow.select-none', [ + h('.flex-space-around', { + style: { + padding: '20px', + }, + }, [ + // current version number + + h('.info.info-gray', [ + h('div', 'Metamask'), + h('div', { + style: { + marginBottom: '10px', + }, + }, `Version: ${version}`), + ]), + + h('div', { + style: { + marginBottom: '5px', + }}, + [ + h('div', [ + h('a', { + href: 'https://metamask.io/privacy.html', + target: '_blank', + onClick (event) { this.navigateTo(event.target.href) }, + }, [ + h('div.info', 'Privacy Policy'), + ]), + ]), + h('div', [ + h('a', { + href: 'https://metamask.io/terms.html', + target: '_blank', + onClick (event) { this.navigateTo(event.target.href) }, + }, [ + h('div.info', 'Terms of Use'), + ]), + ]), + h('div', [ + h('a', { + href: 'https://metamask.io/attributions.html', + target: '_blank', + onClick (event) { this.navigateTo(event.target.href) }, + }, [ + h('div.info', 'Attributions'), + ]), + ]), + ] + ), + + h('hr', { + style: { + margin: '10px 0 ', + width: '7em', + }, + }), + + h('div', { + style: { + paddingLeft: '30px', + }}, + [ + h('div.fa.fa-support', [ + h('a.info', { + href: 'https://support.metamask.io', + target: '_blank', + }, 'Visit our Support Center'), + ]), + + h('div', [ + h('a', { + href: 'https://metamask.io/', + target: '_blank', + }, [ + h('img.icon-size', { + src: 'images/icon-128.png', + style: { + // IE6-9 + filter: 'grayscale(100%)', + // Microsoft Edge and Firefox 35+ + WebkitFilter: 'grayscale(100%)', + }, + }), + h('div.info', 'Visit our web site'), + ]), + ]), + + h('div', [ + h('.fa.fa-twitter', [ + h('a.info', { + href: 'https://twitter.com/metamask_io', + target: '_blank', + }, 'Follow us on Twitter'), + ]), + ]), + + h('div.fa.fa-envelope', [ + h('a.info', { + target: '_blank', + style: { width: '85vw' }, + href: 'mailto:help@metamask.io?subject=Feedback', + }, 'Email us!'), + ]), + ]), + ]), + ]), + ]) + ) +} + +InfoScreen.prototype.navigateTo = function (url) { + global.platform.openWindow({ url }) +} + diff --git a/old-ui/app/infura-conversion.json b/old-ui/app/infura-conversion.json new file mode 100644 index 000000000..9a96fe069 --- /dev/null +++ b/old-ui/app/infura-conversion.json @@ -0,0 +1,653 @@ +{ + "objects": [ + { + "symbol": "ethaud", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "aud", + "name": "Australian Dollar" + } + }, + { + "symbol": "ethhkd", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "hkd", + "name": "Hong Kong Dollar" + } + }, + { + "symbol": "ethsgd", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "sgd", + "name": "Singapore Dollar" + } + }, + { + "symbol": "ethidr", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "idr", + "name": "Indonesian Rupiah" + } + }, + { + "symbol": "ethphp", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "php", + "name": "Philippine Peso" + } + }, + { + "symbol": "eth1st", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "1st", + "name": "FirstBlood" + } + }, + { + "symbol": "ethadt", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "adt", + "name": "adToken" + } + }, + { + "symbol": "ethadx", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "adx", + "name": "AdEx" + } + }, + { + "symbol": "ethant", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "ant", + "name": "Aragon" + } + }, + { + "symbol": "ethbat", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "bat", + "name": "Basic Attention Token" + } + }, + { + "symbol": "ethbnt", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "bnt", + "name": "Bancor" + } + }, + { + "symbol": "ethbtc", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "btc", + "name": "Bitcoin" + } + }, + { + "symbol": "ethcad", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "cad", + "name": "Canadian Dollar" + } + }, + { + "symbol": "ethcfi", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "cfi", + "name": "Cofound.it" + } + }, + { + "symbol": "ethcrb", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "crb", + "name": "CreditBit" + } + }, + { + "symbol": "ethcvc", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "cvc", + "name": "Civic" + } + }, + { + "symbol": "ethdash", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "dash", + "name": "Dash" + } + }, + { + "symbol": "ethdgd", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "dgd", + "name": "DigixDAO" + } + }, + { + "symbol": "ethetc", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "etc", + "name": "Ethereum Classic" + } + }, + { + "symbol": "etheur", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "eur", + "name": "Euro" + } + }, + { + "symbol": "ethfun", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "fun", + "name": "FunFair" + } + }, + { + "symbol": "ethgbp", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "gbp", + "name": "Pound Sterling" + } + }, + { + "symbol": "ethgno", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "gno", + "name": "Gnosis" + } + }, + { + "symbol": "ethgnt", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "gnt", + "name": "Golem" + } + }, + { + "symbol": "ethgup", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "gup", + "name": "Matchpool" + } + }, + { + "symbol": "ethhmq", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "hmq", + "name": "Humaniq" + } + }, + { + "symbol": "ethjpy", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "jpy", + "name": "Japanese Yen" + } + }, + { + "symbol": "ethlgd", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "lgd", + "name": "Legends Room" + } + }, + { + "symbol": "ethlsk", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "lsk", + "name": "Lisk" + } + }, + { + "symbol": "ethltc", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "ltc", + "name": "Litecoin" + } + }, + { + "symbol": "ethlun", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "lun", + "name": "Lunyr" + } + }, + { + "symbol": "ethmco", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "mco", + "name": "Monaco" + } + }, + { + "symbol": "ethmtl", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "mtl", + "name": "Metal" + } + }, + { + "symbol": "ethmyst", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "myst", + "name": "Mysterium" + } + }, + { + "symbol": "ethnmr", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "nmr", + "name": "Numeraire" + } + }, + { + "symbol": "ethomg", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "omg", + "name": "OmiseGO" + } + }, + { + "symbol": "ethpay", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "pay", + "name": "TenX" + } + }, + { + "symbol": "ethptoy", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "ptoy", + "name": "Patientory" + } + }, + { + "symbol": "ethqrl", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "qrl", + "name": "Quantum-Resistant Ledger" + } + }, + { + "symbol": "ethqtum", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "qtum", + "name": "Qtum" + } + }, + { + "symbol": "ethrep", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "rep", + "name": "Augur" + } + }, + { + "symbol": "ethrlc", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "rlc", + "name": "iEx.ec" + } + }, + { + "symbol": "ethrub", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "rub", + "name": "Russian Ruble" + } + }, + { + "symbol": "ethsc", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "sc", + "name": "Siacoin" + } + }, + { + "symbol": "ethsngls", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "sngls", + "name": "SingularDTV" + } + }, + { + "symbol": "ethsnt", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "snt", + "name": "Status" + } + }, + { + "symbol": "ethsteem", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "steem", + "name": "Steem" + } + }, + { + "symbol": "ethstorj", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "storj", + "name": "Storj" + } + }, + { + "symbol": "ethtime", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "time", + "name": "ChronoBank" + } + }, + { + "symbol": "ethtkn", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "tkn", + "name": "TokenCard" + } + }, + { + "symbol": "ethtrst", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "trst", + "name": "WeTrust" + } + }, + { + "symbol": "ethuah", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "uah", + "name": "Ukrainian Hryvnia" + } + }, + { + "symbol": "ethusd", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "usd", + "name": "United States Dollar" + } + }, + { + "symbol": "ethwings", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "wings", + "name": "Wings" + } + }, + { + "symbol": "ethxem", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "xem", + "name": "NEM" + } + }, + { + "symbol": "ethxlm", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "xlm", + "name": "Stellar Lumen" + } + }, + { + "symbol": "ethxmr", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "xmr", + "name": "Monero" + } + }, + { + "symbol": "ethxrp", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "xrp", + "name": "Ripple" + } + }, + { + "symbol": "ethzec", + "base": { + "code": "eth", + "name": "Ethereum" + }, + "quote": { + "code": "zec", + "name": "Zcash" + } + } + ] +} diff --git a/old-ui/app/keychains/hd/create-vault-complete.js b/old-ui/app/keychains/hd/create-vault-complete.js new file mode 100644 index 000000000..736e922b7 --- /dev/null +++ b/old-ui/app/keychains/hd/create-vault-complete.js @@ -0,0 +1,91 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const connect = require('react-redux').connect +const h = require('react-hyperscript') +const actions = require('../../../../ui/app/actions') +const exportAsFile = require('../../util').exportAsFile + +module.exports = connect(mapStateToProps)(CreateVaultCompleteScreen) + +inherits(CreateVaultCompleteScreen, Component) +function CreateVaultCompleteScreen () { + Component.call(this) +} + +function mapStateToProps (state) { + return { + seed: state.appState.currentView.seedWords, + cachedSeed: state.metamask.seedWords, + } +} + +CreateVaultCompleteScreen.prototype.render = function () { + var state = this.props + var seed = state.seed || state.cachedSeed || '' + + return ( + + h('.initialize-screen.flex-column.flex-center.flex-grow', [ + + // // subtitle and nav + // h('.section-title.flex-row.flex-center', [ + // h('h2.page-subtitle', 'Vault Created'), + // ]), + + h('h3.flex-center.text-transform-uppercase', { + style: { + background: '#EBEBEB', + color: '#AEAEAE', + marginTop: 36, + marginBottom: 8, + width: '100%', + fontSize: '20px', + padding: 6, + }, + }, [ + 'Vault Created', + ]), + + h('div', { + style: { + fontSize: '1em', + marginTop: '10px', + textAlign: 'center', + }, + }, [ + h('span.error', 'These 12 words are the only way to restore your MetaMask accounts.\nSave them somewhere safe and secret.'), + ]), + + h('textarea.twelve-word-phrase', { + readOnly: true, + value: seed, + }), + + h('button.primary', { + onClick: () => this.confirmSeedWords() + .then(account => this.showAccountDetail(account)), + style: { + margin: '24px', + fontSize: '0.9em', + marginBottom: '10px', + }, + }, 'I\'ve copied it somewhere safe'), + + h('button.primary', { + onClick: () => exportAsFile(`MetaMask Seed Words`, seed), + style: { + margin: '10px', + fontSize: '0.9em', + }, + }, 'Save Seed Words As File'), + ]) + ) +} + +CreateVaultCompleteScreen.prototype.confirmSeedWords = function () { + return this.props.dispatch(actions.confirmSeedWords()) +} + +CreateVaultCompleteScreen.prototype.showAccountDetail = function (account) { + return this.props.dispatch(actions.showAccountDetail(account)) +} diff --git a/old-ui/app/keychains/hd/recover-seed/confirmation.js b/old-ui/app/keychains/hd/recover-seed/confirmation.js new file mode 100644 index 000000000..eb0298a09 --- /dev/null +++ b/old-ui/app/keychains/hd/recover-seed/confirmation.js @@ -0,0 +1,121 @@ +const inherits = require('util').inherits + +const Component = require('react').Component +const connect = require('react-redux').connect +const h = require('react-hyperscript') +const actions = require('../../../../../ui/app/actions') + +module.exports = connect(mapStateToProps)(RevealSeedConfirmation) + +inherits(RevealSeedConfirmation, Component) +function RevealSeedConfirmation () { + Component.call(this) +} + +function mapStateToProps (state) { + return { + warning: state.appState.warning, + } +} + +RevealSeedConfirmation.prototype.render = function () { + const props = this.props + + return ( + + h('.initialize-screen.flex-column.flex-center.flex-grow', { + style: { maxWidth: '420px' }, + }, [ + + h('h3.flex-center.text-transform-uppercase', { + style: { + background: '#EBEBEB', + color: '#AEAEAE', + marginBottom: 24, + width: '100%', + fontSize: '20px', + padding: 6, + }, + }, [ + 'Reveal Seed Words', + ]), + + h('.div', { + style: { + display: 'flex', + flexDirection: 'column', + padding: '20px', + justifyContent: 'center', + }, + }, [ + + h('h4', 'Do not recover your seed words in a public place! These words can be used to steal all your accounts.'), + + // confirmation + h('input.large-input.letter-spacey', { + type: 'password', + id: 'password-box', + placeholder: 'Enter your password to confirm', + onKeyPress: this.checkConfirmation.bind(this), + style: { + width: 260, + marginTop: '12px', + }, + }), + + h('.flex-row.flex-start', { + style: { + marginTop: 30, + width: '50%', + }, + }, [ + // cancel + h('button.primary', { + onClick: this.goHome.bind(this), + }, 'CANCEL'), + + // submit + h('button.primary', { + style: { marginLeft: '10px' }, + onClick: this.revealSeedWords.bind(this), + }, 'OK'), + + ]), + + (props.warning) && ( + h('span.error', { + style: { + margin: '20px', + }, + }, props.warning.split('-')) + ), + + props.inProgress && ( + h('span.in-progress-notification', 'Generating Seed...') + ), + ]), + ]) + ) +} + +RevealSeedConfirmation.prototype.componentDidMount = function () { + document.getElementById('password-box').focus() +} + +RevealSeedConfirmation.prototype.goHome = function () { + this.props.dispatch(actions.showConfigPage(false)) +} + +// create vault + +RevealSeedConfirmation.prototype.checkConfirmation = function (event) { + if (event.key === 'Enter') { + event.preventDefault() + this.revealSeedWords() + } +} + +RevealSeedConfirmation.prototype.revealSeedWords = function () { + var password = document.getElementById('password-box').value + this.props.dispatch(actions.requestRevealSeed(password)) +} diff --git a/old-ui/app/keychains/hd/restore-vault.js b/old-ui/app/keychains/hd/restore-vault.js new file mode 100644 index 000000000..222172dfd --- /dev/null +++ b/old-ui/app/keychains/hd/restore-vault.js @@ -0,0 +1,152 @@ +const inherits = require('util').inherits +const PersistentForm = require('../../../lib/persistent-form') +const connect = require('react-redux').connect +const h = require('react-hyperscript') +const actions = require('../../../../ui/app/actions') + +module.exports = connect(mapStateToProps)(RestoreVaultScreen) + +inherits(RestoreVaultScreen, PersistentForm) +function RestoreVaultScreen () { + PersistentForm.call(this) +} + +function mapStateToProps (state) { + return { + warning: state.appState.warning, + forgottenPassword: state.appState.forgottenPassword, + } +} + +RestoreVaultScreen.prototype.render = function () { + var state = this.props + this.persistentFormParentId = 'restore-vault-form' + + return ( + + h('.initialize-screen.flex-column.flex-center.flex-grow', [ + + h('h3.flex-center.text-transform-uppercase', { + style: { + background: '#EBEBEB', + color: '#AEAEAE', + marginBottom: 24, + width: '100%', + fontSize: '20px', + padding: 6, + }, + }, [ + 'Restore Vault', + ]), + + // wallet seed entry + h('h3', 'Wallet Seed'), + h('textarea.twelve-word-phrase.letter-spacey', { + dataset: { + persistentFormId: 'wallet-seed', + }, + placeholder: 'Enter your secret twelve word phrase here to restore your vault.', + }), + + // password + h('input.large-input.letter-spacey', { + type: 'password', + id: 'password-box', + placeholder: 'New Password (min 8 chars)', + dataset: { + persistentFormId: 'password', + }, + style: { + width: 260, + marginTop: 12, + }, + }), + + // confirm password + h('input.large-input.letter-spacey', { + type: 'password', + id: 'password-box-confirm', + placeholder: 'Confirm Password', + onKeyPress: this.createOnEnter.bind(this), + dataset: { + persistentFormId: 'password-confirmation', + }, + style: { + width: 260, + marginTop: 16, + }, + }), + + (state.warning) && ( + h('span.error.in-progress-notification', state.warning) + ), + + // submit + + h('.flex-row.flex-space-between', { + style: { + marginTop: 30, + width: '50%', + }, + }, [ + + // cancel + h('button.primary', { + onClick: this.showInitializeMenu.bind(this), + }, 'CANCEL'), + + // submit + h('button.primary', { + onClick: this.createNewVaultAndRestore.bind(this), + }, 'OK'), + + ]), + ]) + + ) +} + +RestoreVaultScreen.prototype.showInitializeMenu = function () { + if (this.props.forgottenPassword) { + this.props.dispatch(actions.backToUnlockView()) + } else { + this.props.dispatch(actions.showInitializeMenu()) + } +} + +RestoreVaultScreen.prototype.createOnEnter = function (event) { + if (event.key === 'Enter') { + this.createNewVaultAndRestore() + } +} + +RestoreVaultScreen.prototype.createNewVaultAndRestore = function () { + // check password + var passwordBox = document.getElementById('password-box') + var password = passwordBox.value + var passwordConfirmBox = document.getElementById('password-box-confirm') + var passwordConfirm = passwordConfirmBox.value + if (password.length < 8) { + this.warning = 'Password not long enough' + + this.props.dispatch(actions.displayWarning(this.warning)) + return + } + if (password !== passwordConfirm) { + this.warning = 'Passwords don\'t match' + this.props.dispatch(actions.displayWarning(this.warning)) + return + } + // check seed + var seedBox = document.querySelector('textarea.twelve-word-phrase') + var seed = seedBox.value.trim() + if (seed.split(' ').length !== 12) { + this.warning = 'seed phrases are 12 words long' + this.props.dispatch(actions.displayWarning(this.warning)) + return + } + // submit + this.warning = null + this.props.dispatch(actions.displayWarning(this.warning)) + this.props.dispatch(actions.createNewVaultAndRestore(password, seed)) +} diff --git a/old-ui/app/new-keychain.js b/old-ui/app/new-keychain.js new file mode 100644 index 000000000..cc9633166 --- /dev/null +++ b/old-ui/app/new-keychain.js @@ -0,0 +1,29 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') +const connect = require('react-redux').connect + +module.exports = connect(mapStateToProps)(NewKeychain) + +function mapStateToProps (state) { + return {} +} + +inherits(NewKeychain, Component) +function NewKeychain () { + Component.call(this) +} + +NewKeychain.prototype.render = function () { + // const props = this.props + + return ( + h('div', { + style: { + background: 'blue', + }, + }, [ + h('h1', `Here's a list!!!!`), + ]) + ) +} diff --git a/old-ui/app/send.js b/old-ui/app/send.js new file mode 100644 index 000000000..0dc0fa778 --- /dev/null +++ b/old-ui/app/send.js @@ -0,0 +1,310 @@ +const inherits = require('util').inherits +const PersistentForm = require('../lib/persistent-form') +const h = require('react-hyperscript') +const connect = require('react-redux').connect +const Identicon = require('./components/identicon') +const actions = require('../../ui/app/actions') +const util = require('./util') +const numericBalance = require('./util').numericBalance +const addressSummary = require('./util').addressSummary +const isHex = require('./util').isHex +const EthBalance = require('./components/eth-balance') +const EnsInput = require('./components/ens-input') +const ethUtil = require('ethereumjs-util') +module.exports = connect(mapStateToProps)(SendTransactionScreen) + +function mapStateToProps (state) { + var result = { + address: state.metamask.selectedAddress, + accounts: state.metamask.accounts, + identities: state.metamask.identities, + warning: state.appState.warning, + network: state.metamask.network, + addressBook: state.metamask.addressBook, + conversionRate: state.metamask.conversionRate, + currentCurrency: state.metamask.currentCurrency, + } + + result.error = result.warning && result.warning.split('.')[0] + + result.account = result.accounts[result.address] + result.identity = result.identities[result.address] + result.balance = result.account ? numericBalance(result.account.balance) : null + + return result +} + +inherits(SendTransactionScreen, PersistentForm) +function SendTransactionScreen () { + PersistentForm.call(this) +} + +SendTransactionScreen.prototype.render = function () { + this.persistentFormParentId = 'send-tx-form' + + const props = this.props + const { + address, + account, + identity, + network, + identities, + addressBook, + conversionRate, + currentCurrency, + } = props + + return ( + + h('.send-screen.flex-column.flex-grow', [ + + // + // Sender Profile + // + + h('.account-data-subsection.flex-row.flex-grow', { + style: { + margin: '0 20px', + }, + }, [ + + // header - identicon + nav + h('.flex-row.flex-space-between', { + style: { + marginTop: '15px', + }, + }, [ + // back button + h('i.fa.fa-arrow-left.fa-lg.cursor-pointer.color-orange', { + onClick: this.back.bind(this), + }), + + // large identicon + h('.identicon-wrapper.flex-column.flex-center.select-none', [ + h(Identicon, { + diameter: 62, + address: address, + }), + ]), + + // invisible place holder + h('i.fa.fa-users.fa-lg.invisible', { + style: { + marginTop: '28px', + }, + }), + + ]), + + // account label + + h('.flex-column', { + style: { + marginTop: '10px', + alignItems: 'flex-start', + }, + }, [ + h('h2.font-medium.color-forest.flex-center', { + style: { + paddingTop: '8px', + marginBottom: '8px', + }, + }, identity && identity.name), + + // address and getter actions + h('.flex-row.flex-center', { + style: { + marginBottom: '8px', + }, + }, [ + + h('div', { + style: { + lineHeight: '16px', + }, + }, addressSummary(address)), + + ]), + + // balance + h('.flex-row.flex-center', [ + + h(EthBalance, { + value: account && account.balance, + conversionRate, + currentCurrency, + }), + + ]), + ]), + ]), + + // + // Required Fields + // + + h('h3.flex-center.text-transform-uppercase', { + style: { + background: '#EBEBEB', + color: '#AEAEAE', + marginTop: '15px', + marginBottom: '16px', + }, + }, [ + 'Send Transaction', + ]), + + // error message + props.error && h('span.error.flex-center', props.error), + + // 'to' field + h('section.flex-row.flex-center', [ + h(EnsInput, { + name: 'address', + placeholder: 'Recipient Address', + onChange: this.recipientDidChange.bind(this), + network, + identities, + addressBook, + }), + ]), + + // 'amount' and send button + h('section.flex-row.flex-center', [ + + h('input.large-input', { + name: 'amount', + placeholder: 'Amount', + type: 'number', + style: { + marginRight: '6px', + }, + dataset: { + persistentFormId: 'tx-amount', + }, + }), + + h('button.primary', { + onClick: this.onSubmit.bind(this), + style: { + textTransform: 'uppercase', + }, + }, 'Next'), + + ]), + + // + // Optional Fields + // + h('h3.flex-center.text-transform-uppercase', { + style: { + background: '#EBEBEB', + color: '#AEAEAE', + marginTop: '16px', + marginBottom: '16px', + }, + }, [ + 'Transaction Data (optional)', + ]), + + // 'data' field + h('section.flex-column.flex-center', [ + h('input.large-input', { + name: 'txData', + placeholder: '0x01234', + style: { + width: '100%', + resize: 'none', + }, + dataset: { + persistentFormId: 'tx-data', + }, + }), + ]), + ]) + ) +} + +SendTransactionScreen.prototype.navigateToAccounts = function (event) { + event.stopPropagation() + this.props.dispatch(actions.showAccountsPage()) +} + +SendTransactionScreen.prototype.back = function () { + var address = this.props.address + this.props.dispatch(actions.backToAccountDetail(address)) +} + +SendTransactionScreen.prototype.recipientDidChange = function (recipient, nickname) { + this.setState({ + recipient: recipient, + nickname: nickname, + }) +} + +SendTransactionScreen.prototype.onSubmit = function () { + const state = this.state || {} + const recipient = state.recipient || document.querySelector('input[name="address"]').value.replace(/^[.\s]+|[.\s]+$/g, '') + const nickname = state.nickname || ' ' + const input = document.querySelector('input[name="amount"]').value + const parts = input.split('') + + let message + + if (isNaN(input) || input === '') { + message = 'Invalid ether value.' + return this.props.dispatch(actions.displayWarning(message)) + } + + if (parts[1]) { + var decimal = parts[1] + if (decimal.length > 18) { + message = 'Ether amount is too precise.' + return this.props.dispatch(actions.displayWarning(message)) + } + } + + const value = util.normalizeEthStringToWei(input) + const txData = document.querySelector('input[name="txData"]').value + const balance = this.props.balance + let message + + if (value.gt(balance)) { + message = 'Insufficient funds.' + return this.props.dispatch(actions.displayWarning(message)) + } + + if (input < 0) { + message = 'Can not send negative amounts of ETH.' + return this.props.dispatch(actions.displayWarning(message)) + } + + if ((util.isInvalidChecksumAddress(recipient))) { + message = 'Recipient address checksum is invalid.' + return this.props.dispatch(actions.displayWarning(message)) + } + + if ((!util.isValidAddress(recipient) && !txData) || (!recipient && !txData)) { + message = 'Recipient address is invalid.' + return this.props.dispatch(actions.displayWarning(message)) + } + + if (!isHex(ethUtil.stripHexPrefix(txData)) && txData) { + message = 'Transaction data must be hex string.' + return this.props.dispatch(actions.displayWarning(message)) + } + + this.props.dispatch(actions.hideWarning()) + + this.props.dispatch(actions.addToAddressBook(recipient, nickname)) + + var txParams = { + from: this.props.address, + value: '0x' + value.toString(16), + } + + if (recipient) txParams.to = ethUtil.addHexPrefix(recipient) + if (txData) txParams.data = txData + + this.props.dispatch(actions.signTx(txParams)) +} diff --git a/old-ui/app/settings.js b/old-ui/app/settings.js new file mode 100644 index 000000000..8df37c555 --- /dev/null +++ b/old-ui/app/settings.js @@ -0,0 +1,59 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') +const connect = require('react-redux').connect +const actions = require('../../ui/app/actions') + +module.exports = connect(mapStateToProps)(AppSettingsPage) + +function mapStateToProps (state) { + return {} +} + +inherits(AppSettingsPage, Component) +function AppSettingsPage () { + Component.call(this) +} + +AppSettingsPage.prototype.render = function () { + return ( + + h('.account-detail-section.flex-column.flex-grow', [ + + // subtitle and nav + h('.flex-row.flex-center', [ + h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { + onClick: this.navigateToAccounts.bind(this), + }), + h('h2.page-subtitle', 'Settings'), + ]), + + h('label', { + htmlFor: 'settings-rpc-endpoint', + }, 'RPC Endpoint:'), + h('input', { + type: 'url', + id: 'settings-rpc-endpoint', + onKeyPress: this.onKeyPress.bind(this), + }), + + ]) + + ) +} + +AppSettingsPage.prototype.componentDidMount = function () { + document.querySelector('input').focus() +} + +AppSettingsPage.prototype.onKeyPress = function (event) { + // get submit event + if (event.key === 'Enter') { + // this.submitPassword(event) + } +} + +AppSettingsPage.prototype.navigateToAccounts = function (event) { + event.stopPropagation() + this.props.dispatch(actions.showAccountsPage()) +} diff --git a/old-ui/app/template.js b/old-ui/app/template.js new file mode 100644 index 000000000..d15b30fd2 --- /dev/null +++ b/old-ui/app/template.js @@ -0,0 +1,30 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') +const connect = require('react-redux').connect + +module.exports = connect(mapStateToProps)(COMPONENTNAME) + +function mapStateToProps (state) { + return {} +} + +inherits(COMPONENTNAME, Component) +function COMPONENTNAME () { + Component.call(this) +} + +COMPONENTNAME.prototype.render = function () { + const props = this.props + + return ( + h('div', { + style: { + background: 'blue', + }, + }, [ + `Hello, ${props.sender}`, + ]) + ) +} + diff --git a/old-ui/app/unlock.js b/old-ui/app/unlock.js new file mode 100644 index 000000000..a1f791552 --- /dev/null +++ b/old-ui/app/unlock.js @@ -0,0 +1,122 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') +const connect = require('react-redux').connect +const actions = require('../../ui/app/actions') +const getCaretCoordinates = require('textarea-caret') +const EventEmitter = require('events').EventEmitter + +const Mascot = require('./components/mascot') + +module.exports = connect(mapStateToProps)(UnlockScreen) + +inherits(UnlockScreen, Component) +function UnlockScreen () { + Component.call(this) + this.animationEventEmitter = new EventEmitter() +} + +function mapStateToProps (state) { + return { + warning: state.appState.warning, + } +} + +UnlockScreen.prototype.render = function () { + const state = this.props + const warning = state.warning + return ( + h('.flex-column', { + style: { + width: 'inherit', + }, + }, [ + h('.unlock-screen.flex-column.flex-center.flex-grow', [ + + h(Mascot, { + animationEventEmitter: this.animationEventEmitter, + }), + + h('h1', { + style: { + fontSize: '1.4em', + textTransform: 'uppercase', + color: '#7F8082', + }, + }, 'MetaMask'), + + h('input.large-input', { + type: 'password', + id: 'password-box', + placeholder: 'enter password', + style: { + + }, + onKeyPress: this.onKeyPress.bind(this), + onInput: this.inputChanged.bind(this), + }), + + h('.error', { + style: { + display: warning ? 'block' : 'none', + padding: '0 20px', + textAlign: 'center', + }, + }, warning), + + h('button.primary.cursor-pointer', { + onClick: this.onSubmit.bind(this), + style: { + margin: 10, + }, + }, 'Unlock'), + ]), + + h('.flex-row.flex-center.flex-grow', [ + h('p.pointer', { + onClick: () => this.props.dispatch(actions.forgotPassword()), + style: { + fontSize: '0.8em', + color: 'rgb(247, 134, 28)', + textDecoration: 'underline', + }, + }, 'Restore from seed phrase'), + ]), + ]) + ) +} + +UnlockScreen.prototype.componentDidMount = function () { + document.getElementById('password-box').focus() +} + +UnlockScreen.prototype.onSubmit = function (event) { + const input = document.getElementById('password-box') + const password = input.value + this.props.dispatch(actions.tryUnlockMetamask(password)) +} + +UnlockScreen.prototype.onKeyPress = function (event) { + if (event.key === 'Enter') { + this.submitPassword(event) + } +} + +UnlockScreen.prototype.submitPassword = function (event) { + var element = event.target + var password = element.value + // reset input + element.value = '' + this.props.dispatch(actions.tryUnlockMetamask(password)) +} + +UnlockScreen.prototype.inputChanged = function (event) { + // tell mascot to look at page action + var element = event.target + var boundingRect = element.getBoundingClientRect() + var coordinates = getCaretCoordinates(element, element.selectionEnd) + this.animationEventEmitter.emit('point', { + x: boundingRect.left + coordinates.left - element.scrollLeft, + y: boundingRect.top + coordinates.top - element.scrollTop, + }) +} diff --git a/old-ui/app/util.js b/old-ui/app/util.js new file mode 100644 index 000000000..3f8b4dcc3 --- /dev/null +++ b/old-ui/app/util.js @@ -0,0 +1,240 @@ +const ethUtil = require('ethereumjs-util') + +var valueTable = { + wei: '1000000000000000000', + kwei: '1000000000000000', + mwei: '1000000000000', + gwei: '1000000000', + szabo: '1000000', + finney: '1000', + ether: '1', + kether: '0.001', + mether: '0.000001', + gether: '0.000000001', + tether: '0.000000000001', +} +var bnTable = {} +for (var currency in valueTable) { + bnTable[currency] = new ethUtil.BN(valueTable[currency], 10) +} + +module.exports = { + valuesFor: valuesFor, + addressSummary: addressSummary, + miniAddressSummary: miniAddressSummary, + isAllOneCase: isAllOneCase, + isValidAddress: isValidAddress, + numericBalance: numericBalance, + parseBalance: parseBalance, + formatBalance: formatBalance, + generateBalanceObject: generateBalanceObject, + dataSize: dataSize, + readableDate: readableDate, + normalizeToWei: normalizeToWei, + normalizeEthStringToWei: normalizeEthStringToWei, + normalizeNumberToWei: normalizeNumberToWei, + valueTable: valueTable, + bnTable: bnTable, + isHex: isHex, + exportAsFile: exportAsFile, + isInvalidChecksumAddress, +} + +function valuesFor (obj) { + if (!obj) return [] + return Object.keys(obj) + .map(function (key) { return obj[key] }) +} + +function addressSummary (address, firstSegLength = 10, lastSegLength = 4, includeHex = true) { + if (!address) return '' + let checked = ethUtil.toChecksumAddress(address) + if (!includeHex) { + checked = ethUtil.stripHexPrefix(checked) + } + return checked ? checked.slice(0, firstSegLength) + '...' + checked.slice(checked.length - lastSegLength) : '...' +} + +function miniAddressSummary (address) { + if (!address) return '' + var checked = ethUtil.toChecksumAddress(address) + return checked ? checked.slice(0, 4) + '...' + checked.slice(-4) : '...' +} + +function isValidAddress (address) { + var prefixed = ethUtil.addHexPrefix(address) + if (address === '0x0000000000000000000000000000000000000000') return false + return (isAllOneCase(prefixed) && ethUtil.isValidAddress(prefixed)) || ethUtil.isValidChecksumAddress(prefixed) +} + +function isInvalidChecksumAddress (address) { + var prefixed = ethUtil.addHexPrefix(address) + if (address === '0x0000000000000000000000000000000000000000') return false + return !isAllOneCase(prefixed) && !ethUtil.isValidChecksumAddress(prefixed) && ethUtil.isValidAddress(prefixed) +} + +function isAllOneCase (address) { + if (!address) return true + var lower = address.toLowerCase() + var upper = address.toUpperCase() + return address === lower || address === upper +} + +// Takes wei Hex, returns wei BN, even if input is null +function numericBalance (balance) { + if (!balance) return new ethUtil.BN(0, 16) + var stripped = ethUtil.stripHexPrefix(balance) + return new ethUtil.BN(stripped, 16) +} + +// Takes hex, returns [beforeDecimal, afterDecimal] +function parseBalance (balance) { + var beforeDecimal, afterDecimal + const wei = numericBalance(balance) + var weiString = wei.toString() + const trailingZeros = /0+$/ + + beforeDecimal = weiString.length > 18 ? weiString.slice(0, weiString.length - 18) : '0' + afterDecimal = ('000000000000000000' + wei).slice(-18).replace(trailingZeros, '') + if (afterDecimal === '') { afterDecimal = '0' } + return [beforeDecimal, afterDecimal] +} + +// Takes wei hex, returns an object with three properties. +// Its "formatted" property is what we generally use to render values. +function formatBalance (balance, decimalsToKeep, needsParse = true) { + var parsed = needsParse ? parseBalance(balance) : balance.split('.') + var beforeDecimal = parsed[0] + var afterDecimal = parsed[1] + var formatted = 'None' + if (decimalsToKeep === undefined) { + if (beforeDecimal === '0') { + if (afterDecimal !== '0') { + var sigFigs = afterDecimal.match(/^0*(.{2})/) // default: grabs 2 most significant digits + if (sigFigs) { afterDecimal = sigFigs[0] } + formatted = '0.' + afterDecimal + ' ETH' + } + } else { + formatted = beforeDecimal + '.' + afterDecimal.slice(0, 3) + ' ETH' + } + } else { + afterDecimal += Array(decimalsToKeep).join('0') + formatted = beforeDecimal + '.' + afterDecimal.slice(0, decimalsToKeep) + ' ETH' + } + return formatted +} + + +function generateBalanceObject (formattedBalance, decimalsToKeep = 1) { + var balance = formattedBalance.split(' ')[0] + var label = formattedBalance.split(' ')[1] + var beforeDecimal = balance.split('.')[0] + var afterDecimal = balance.split('.')[1] + var shortBalance = shortenBalance(balance, decimalsToKeep) + + if (beforeDecimal === '0' && afterDecimal.substr(0, 5) === '00000') { + // eslint-disable-next-line eqeqeq + if (afterDecimal == 0) { + balance = '0' + } else { + balance = '<1.0e-5' + } + } else if (beforeDecimal !== '0') { + balance = `${beforeDecimal}.${afterDecimal.slice(0, decimalsToKeep)}` + } + + return { balance, label, shortBalance } +} + +function shortenBalance (balance, decimalsToKeep = 1) { + var truncatedValue + var convertedBalance = parseFloat(balance) + if (convertedBalance > 1000000) { + truncatedValue = (balance / 1000000).toFixed(decimalsToKeep) + return `${truncatedValue}m` + } else if (convertedBalance > 1000) { + truncatedValue = (balance / 1000).toFixed(decimalsToKeep) + return `${truncatedValue}k` + } else if (convertedBalance === 0) { + return '0' + } else if (convertedBalance < 0.001) { + return '<0.001' + } else if (convertedBalance < 1) { + var stringBalance = convertedBalance.toString() + if (stringBalance.split('.')[1].length > 3) { + return convertedBalance.toFixed(3) + } else { + return stringBalance + } + } else { + return convertedBalance.toFixed(decimalsToKeep) + } +} + +function dataSize (data) { + var size = data ? ethUtil.stripHexPrefix(data).length : 0 + return size + ' bytes' +} + +// Takes a BN and an ethereum currency name, +// returns a BN in wei +function normalizeToWei (amount, currency) { + try { + return amount.mul(bnTable.wei).div(bnTable[currency]) + } catch (e) {} + return amount +} + +function normalizeEthStringToWei (str) { + const parts = str.split('.') + let eth = new ethUtil.BN(parts[0], 10).mul(bnTable.wei) + if (parts[1]) { + var decimal = parts[1] + while (decimal.length < 18) { + decimal += '0' + } + const decimalBN = new ethUtil.BN(decimal, 10) + eth = eth.add(decimalBN) + } + return eth +} + +var multiple = new ethUtil.BN('10000', 10) +function normalizeNumberToWei (n, currency) { + var enlarged = n * 10000 + var amount = new ethUtil.BN(String(enlarged), 10) + return normalizeToWei(amount, currency).div(multiple) +} + +function readableDate (ms) { + var date = new Date(ms) + var month = date.getMonth() + var day = date.getDate() + var year = date.getFullYear() + var hours = date.getHours() + var minutes = '0' + date.getMinutes() + var seconds = '0' + date.getSeconds() + + var dateStr = `${month}/${day}/${year}` + var time = `${hours}:${minutes.substr(-2)}:${seconds.substr(-2)}` + return `${dateStr} ${time}` +} + +function isHex (str) { + return Boolean(str.match(/^(0x)?[0-9a-fA-F]+$/)) +} + +function exportAsFile (filename, data) { + // source: https://stackoverflow.com/a/33542499 by Ludovic Feltz + const blob = new Blob([data], {type: 'text/csv'}) + if (window.navigator.msSaveOrOpenBlob) { + window.navigator.msSaveBlob(blob, filename) + } else { + const elem = window.document.createElement('a') + elem.href = window.URL.createObjectURL(blob) + elem.download = filename + document.body.appendChild(elem) + elem.click() + document.body.removeChild(elem) + } +} diff --git a/old-ui/css.js b/old-ui/css.js new file mode 100644 index 000000000..21b311c28 --- /dev/null +++ b/old-ui/css.js @@ -0,0 +1,30 @@ +const fs = require('fs') +const path = require('path') + +module.exports = bundleCss + +var cssFiles = { + 'fonts.css': fs.readFileSync(path.join(__dirname, '/app/css/fonts.css'), 'utf8'), + 'reset.css': fs.readFileSync(path.join(__dirname, '/app/css/reset.css'), 'utf8'), + 'lib.css': fs.readFileSync(path.join(__dirname, '/app/css/lib.css'), 'utf8'), + 'index.css': fs.readFileSync(path.join(__dirname, '/app/css/index.css'), 'utf8'), + 'transitions.css': fs.readFileSync(path.join(__dirname, '/app/css/transitions.css'), 'utf8'), + 'first-time.css': fs.readFileSync(path.join(__dirname, '../mascara/src/app/first-time/index.css'), 'utf8'), + 'react-tooltip-component.css': fs.readFileSync(path.join(__dirname, '..', 'node_modules', 'react-tooltip-component', 'dist', 'react-tooltip-component.css'), 'utf8'), + 'react-css': fs.readFileSync(path.join(__dirname, '..', 'node_modules', 'react-select', 'dist', 'react-select.css'), 'utf8'), +} + +function bundleCss () { + var cssBundle = Object.keys(cssFiles).reduce(function (bundle, fileName) { + var fileContent = cssFiles[fileName] + var output = String() + + output += '/*========== ' + fileName + ' ==========*/\n\n' + output += fileContent + output += '\n\n' + + return bundle + output + }, String()) + + return cssBundle +} diff --git a/old-ui/design/00-metamask-SignIn.jpg b/old-ui/design/00-metamask-SignIn.jpg Binary files differnew file mode 100644 index 000000000..2becdb032 --- /dev/null +++ b/old-ui/design/00-metamask-SignIn.jpg diff --git a/old-ui/design/01-metamask-SelectAcc.jpg b/old-ui/design/01-metamask-SelectAcc.jpg Binary files differnew file mode 100644 index 000000000..239091a98 --- /dev/null +++ b/old-ui/design/01-metamask-SelectAcc.jpg diff --git a/old-ui/design/02-metamask-AccDetails.jpg b/old-ui/design/02-metamask-AccDetails.jpg Binary files differnew file mode 100644 index 000000000..d7d408ffc --- /dev/null +++ b/old-ui/design/02-metamask-AccDetails.jpg diff --git a/old-ui/design/02a-metamask-AccDetails-OverToken.jpg b/old-ui/design/02a-metamask-AccDetails-OverToken.jpg Binary files differnew file mode 100644 index 000000000..f26ff31e8 --- /dev/null +++ b/old-ui/design/02a-metamask-AccDetails-OverToken.jpg diff --git a/old-ui/design/02a-metamask-AccDetails-OverTransaction.jpg b/old-ui/design/02a-metamask-AccDetails-OverTransaction.jpg Binary files differnew file mode 100644 index 000000000..8a06be6b9 --- /dev/null +++ b/old-ui/design/02a-metamask-AccDetails-OverTransaction.jpg diff --git a/old-ui/design/02a-metamask-AccDetails.jpg b/old-ui/design/02a-metamask-AccDetails.jpg Binary files differnew file mode 100644 index 000000000..c37e0f539 --- /dev/null +++ b/old-ui/design/02a-metamask-AccDetails.jpg diff --git a/old-ui/design/02b-metamask-AccDetails-Send.jpg b/old-ui/design/02b-metamask-AccDetails-Send.jpg Binary files differnew file mode 100644 index 000000000..10f2d27fd --- /dev/null +++ b/old-ui/design/02b-metamask-AccDetails-Send.jpg diff --git a/old-ui/design/03-metamask-Qr.jpg b/old-ui/design/03-metamask-Qr.jpg Binary files differnew file mode 100644 index 000000000..9c09de42f --- /dev/null +++ b/old-ui/design/03-metamask-Qr.jpg diff --git a/old-ui/design/05-metamask-Menu.jpg b/old-ui/design/05-metamask-Menu.jpg Binary files differnew file mode 100644 index 000000000..0a43d7b2a --- /dev/null +++ b/old-ui/design/05-metamask-Menu.jpg diff --git a/old-ui/design/chromeStorePics/final_screen_dao_accounts.png b/old-ui/design/chromeStorePics/final_screen_dao_accounts.png Binary files differnew file mode 100644 index 000000000..805cc96b6 --- /dev/null +++ b/old-ui/design/chromeStorePics/final_screen_dao_accounts.png diff --git a/old-ui/design/chromeStorePics/final_screen_dao_locked.png b/old-ui/design/chromeStorePics/final_screen_dao_locked.png Binary files differnew file mode 100644 index 000000000..9d9e33930 --- /dev/null +++ b/old-ui/design/chromeStorePics/final_screen_dao_locked.png diff --git a/old-ui/design/chromeStorePics/final_screen_dao_notification.png b/old-ui/design/chromeStorePics/final_screen_dao_notification.png Binary files differnew file mode 100644 index 000000000..d56a5ce62 --- /dev/null +++ b/old-ui/design/chromeStorePics/final_screen_dao_notification.png diff --git a/old-ui/design/chromeStorePics/final_screen_wei_account.png b/old-ui/design/chromeStorePics/final_screen_wei_account.png Binary files differnew file mode 100644 index 000000000..d503ff301 --- /dev/null +++ b/old-ui/design/chromeStorePics/final_screen_wei_account.png diff --git a/old-ui/design/chromeStorePics/final_screen_wei_notification.png b/old-ui/design/chromeStorePics/final_screen_wei_notification.png Binary files differnew file mode 100644 index 000000000..3560c51ff --- /dev/null +++ b/old-ui/design/chromeStorePics/final_screen_wei_notification.png diff --git a/old-ui/design/chromeStorePics/icon-128.png b/old-ui/design/chromeStorePics/icon-128.png Binary files differnew file mode 100644 index 000000000..ae687147d --- /dev/null +++ b/old-ui/design/chromeStorePics/icon-128.png diff --git a/old-ui/design/chromeStorePics/icon-64.png b/old-ui/design/chromeStorePics/icon-64.png Binary files differnew file mode 100644 index 000000000..7062cf4f1 --- /dev/null +++ b/old-ui/design/chromeStorePics/icon-64.png diff --git a/old-ui/design/chromeStorePics/metamask_icon.ai b/old-ui/design/chromeStorePics/metamask_icon.ai new file mode 100644 index 000000000..27400c5a4 --- /dev/null +++ b/old-ui/design/chromeStorePics/metamask_icon.ai @@ -0,0 +1,2383 @@ +%PDF-1.5
%����
+1 0 obj
<</Metadata 2 0 R/OCProperties<</D<</ON[5 0 R]/Order 6 0 R/RBGroups[]>>/OCGs[5 0 R]>>/Pages 3 0 R/Type/Catalog>>
endobj
2 0 obj
<</Length 47428/Subtype/XML/Type/Metadata>>stream
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?> +<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c111 79.158366, 2015/09/25-01:12:00 "> + <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <rdf:Description rdf:about="" + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:xmp="http://ns.adobe.com/xap/1.0/" + xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/" + xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" + xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#" + xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#" + xmlns:illustrator="http://ns.adobe.com/illustrator/1.0/" + xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/" + xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#" + xmlns:xmpG="http://ns.adobe.com/xap/1.0/g/" + xmlns:pdf="http://ns.adobe.com/pdf/1.3/"> + <dc:format>application/pdf</dc:format> + <dc:title> + <rdf:Alt> + <rdf:li xml:lang="x-default">metamask_icon</rdf:li> + </rdf:Alt> + </dc:title> + <xmp:CreatorTool>Adobe Illustrator CC 2015 (Macintosh)</xmp:CreatorTool> + <xmp:CreateDate>2016-06-15T14:23:12-04:00</xmp:CreateDate> + <xmp:ModifyDate>2016-06-15T14:23:12-04:00</xmp:ModifyDate> + <xmp:MetadataDate>2016-06-15T14:23:12-04:00</xmp:MetadataDate> + <xmp:Thumbnails> + <rdf:Alt> + <rdf:li rdf:parseType="Resource"> + <xmpGImg:width>240</xmpGImg:width> + <xmpGImg:height>256</xmpGImg:height> + <xmpGImg:format>JPEG</xmpGImg:format> + <xmpGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA
AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK
DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f
Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAADwAwER
AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA
AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB
UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE
1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ
qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy
obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp
0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo
+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7
FXnP5r/mvB5Tg/RmnAT6/cJyUMKx28bVAkf+ZjT4U+k7UDYuo1HBsObl6bTce5+l5X+Wf5t6jonm
KZtfu5rzTNVcG+lkZpHilACLOAamgUBWC/sgUrxAzEwakxl6uRczUaYSj6eYfS9vcQXEEdxA6ywT
KskUimqsjCqsCOoIObUG3UkUvxQ7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY
q7FXYq7FXYq7FXln5rfnHb+X1l0bQnWfXCCs0+zR2tfEGoaTwXoO/hmJqNTw7Dm5mm0plvL6fvfO
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</xmpGImg:image> + </rdf:li> + </rdf:Alt> + </xmp:Thumbnails> + <xmpMM:RenditionClass>proof:pdf</xmpMM:RenditionClass> + <xmpMM:OriginalDocumentID>uuid:65E6390686CF11DBA6E2D887CEACB407</xmpMM:OriginalDocumentID> + <xmpMM:DocumentID>xmp.did:d4d07395-aa96-47c2-a9e5-d0351947bb0c</xmpMM:DocumentID> + <xmpMM:InstanceID>uuid:c63c1031-e157-9748-9c58-86481308e954</xmpMM:InstanceID> + <xmpMM:DerivedFrom rdf:parseType="Resource"> + <stRef:instanceID>uuid:1abccb90-0c26-4942-b156-fd2eb962e3e1</stRef:instanceID> + <stRef:documentID>xmp.did:58fdc1b8-1448-3a44-9e20-282d8ec1cf95</stRef:documentID> + <stRef:originalDocumentID>uuid:65E6390686CF11DBA6E2D887CEACB407</stRef:originalDocumentID> + <stRef:renditionClass>proof:pdf</stRef:renditionClass> + </xmpMM:DerivedFrom> + <xmpMM:History> + <rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <stEvt:action>saved</stEvt:action> + <stEvt:instanceID>xmp.iid:d4d07395-aa96-47c2-a9e5-d0351947bb0c</stEvt:instanceID> + <stEvt:when>2016-06-15T14:23:10-04:00</stEvt:when> + <stEvt:softwareAgent>Adobe Illustrator CC 2015 (Macintosh)</stEvt:softwareAgent> + <stEvt:changed>/</stEvt:changed> + </rdf:li> + </rdf:Seq> + </xmpMM:History> + <illustrator:StartupProfile>Web</illustrator:StartupProfile> + <illustrator:Type>Document</illustrator:Type> + <xmpTPg:NPages>1</xmpTPg:NPages> + <xmpTPg:HasVisibleTransparency>True</xmpTPg:HasVisibleTransparency> + <xmpTPg:HasVisibleOverprint>False</xmpTPg:HasVisibleOverprint> + <xmpTPg:MaxPageSize rdf:parseType="Resource"> + <stDim:w>128.000000</stDim:w> + <stDim:h>128.000000</stDim:h> + <stDim:unit>Pixels</stDim:unit> + </xmpTPg:MaxPageSize> + <xmpTPg:PlateNames> + <rdf:Seq> + <rdf:li>Cyan</rdf:li> + <rdf:li>Magenta</rdf:li> + <rdf:li>Yellow</rdf:li> + <rdf:li>Black</rdf:li> + </rdf:Seq> + </xmpTPg:PlateNames> + <xmpTPg:SwatchGroups> + <rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <xmpG:groupName>Default Swatch Group</xmpG:groupName> + <xmpG:groupType>0</xmpG:groupType> + <xmpG:Colorants> + <rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>White</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>255</xmpG:red> + <xmpG:green>255</xmpG:green> + <xmpG:blue>255</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>Black</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>0</xmpG:red> + <xmpG:green>0</xmpG:green> + <xmpG:blue>0</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>RGB Red</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>255</xmpG:red> + <xmpG:green>0</xmpG:green> + <xmpG:blue>0</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>RGB Yellow</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>255</xmpG:red> + <xmpG:green>255</xmpG:green> + <xmpG:blue>0</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>RGB Green</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>0</xmpG:red> + <xmpG:green>255</xmpG:green> + <xmpG:blue>0</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>RGB Cyan</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>0</xmpG:red> + <xmpG:green>255</xmpG:green> + <xmpG:blue>255</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>RGB Blue</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>0</xmpG:red> + <xmpG:green>0</xmpG:green> + <xmpG:blue>255</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>RGB Magenta</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>255</xmpG:red> + <xmpG:green>0</xmpG:green> + <xmpG:blue>255</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=193 G=39 B=45</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>193</xmpG:red> + <xmpG:green>39</xmpG:green> + <xmpG:blue>45</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=237 G=28 B=36</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>237</xmpG:red> + <xmpG:green>28</xmpG:green> + <xmpG:blue>36</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=241 G=90 B=36</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>241</xmpG:red> + <xmpG:green>90</xmpG:green> + <xmpG:blue>36</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=247 G=147 B=30</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>247</xmpG:red> + <xmpG:green>147</xmpG:green> + <xmpG:blue>30</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=251 G=176 B=59</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>251</xmpG:red> + <xmpG:green>176</xmpG:green> + <xmpG:blue>59</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=252 G=238 B=33</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>252</xmpG:red> + <xmpG:green>238</xmpG:green> + <xmpG:blue>33</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=217 G=224 B=33</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>217</xmpG:red> + <xmpG:green>224</xmpG:green> + <xmpG:blue>33</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=140 G=198 B=63</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>140</xmpG:red> + <xmpG:green>198</xmpG:green> + <xmpG:blue>63</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=57 G=181 B=74</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>57</xmpG:red> + <xmpG:green>181</xmpG:green> + <xmpG:blue>74</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=0 G=146 B=69</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>0</xmpG:red> + <xmpG:green>146</xmpG:green> + <xmpG:blue>69</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=0 G=104 B=55</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>0</xmpG:red> + <xmpG:green>104</xmpG:green> + <xmpG:blue>55</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=34 G=181 B=115</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>34</xmpG:red> + <xmpG:green>181</xmpG:green> + <xmpG:blue>115</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=0 G=169 B=157</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>0</xmpG:red> + <xmpG:green>169</xmpG:green> + <xmpG:blue>157</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=41 G=171 B=226</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>41</xmpG:red> + <xmpG:green>171</xmpG:green> + <xmpG:blue>226</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=0 G=113 B=188</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>0</xmpG:red> + <xmpG:green>113</xmpG:green> + <xmpG:blue>188</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=46 G=49 B=146</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>46</xmpG:red> + <xmpG:green>49</xmpG:green> + <xmpG:blue>146</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=27 G=20 B=100</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>27</xmpG:red> + <xmpG:green>20</xmpG:green> + <xmpG:blue>100</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=102 G=45 B=145</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>102</xmpG:red> + <xmpG:green>45</xmpG:green> + <xmpG:blue>145</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=147 G=39 B=143</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>147</xmpG:red> + <xmpG:green>39</xmpG:green> + <xmpG:blue>143</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=158 G=0 B=93</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>158</xmpG:red> + <xmpG:green>0</xmpG:green> + <xmpG:blue>93</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=212 G=20 B=90</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>212</xmpG:red> + <xmpG:green>20</xmpG:green> + <xmpG:blue>90</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=237 G=30 B=121</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>237</xmpG:red> + <xmpG:green>30</xmpG:green> + <xmpG:blue>121</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=199 G=178 B=153</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>199</xmpG:red> + <xmpG:green>178</xmpG:green> + <xmpG:blue>153</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=153 G=134 B=117</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>153</xmpG:red> + <xmpG:green>134</xmpG:green> + <xmpG:blue>117</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=115 G=99 B=87</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>115</xmpG:red> + <xmpG:green>99</xmpG:green> + <xmpG:blue>87</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=83 G=71 B=65</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>83</xmpG:red> + <xmpG:green>71</xmpG:green> + <xmpG:blue>65</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=198 G=156 B=109</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>198</xmpG:red> + <xmpG:green>156</xmpG:green> + <xmpG:blue>109</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=166 G=124 B=82</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>166</xmpG:red> + <xmpG:green>124</xmpG:green> + <xmpG:blue>82</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=140 G=98 B=57</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>140</xmpG:red> + <xmpG:green>98</xmpG:green> + <xmpG:blue>57</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=117 G=76 B=36</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>117</xmpG:red> + <xmpG:green>76</xmpG:green> + <xmpG:blue>36</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=96 G=56 B=19</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>96</xmpG:red> + <xmpG:green>56</xmpG:green> + <xmpG:blue>19</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=66 G=33 B=11</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>66</xmpG:red> + <xmpG:green>33</xmpG:green> + <xmpG:blue>11</xmpG:blue> + </rdf:li> + </rdf:Seq> + </xmpG:Colorants> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:groupName>Grays</xmpG:groupName> + <xmpG:groupType>1</xmpG:groupType> + <xmpG:Colorants> + <rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=0 G=0 B=0</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>0</xmpG:red> + <xmpG:green>0</xmpG:green> + <xmpG:blue>0</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=26 G=26 B=26</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>26</xmpG:red> + <xmpG:green>26</xmpG:green> + <xmpG:blue>26</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=51 G=51 B=51</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>51</xmpG:red> + <xmpG:green>51</xmpG:green> + <xmpG:blue>51</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=77 G=77 B=77</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>77</xmpG:red> + <xmpG:green>77</xmpG:green> + <xmpG:blue>77</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=102 G=102 B=102</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>102</xmpG:red> + <xmpG:green>102</xmpG:green> + <xmpG:blue>102</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=128 G=128 B=128</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>128</xmpG:red> + <xmpG:green>128</xmpG:green> + <xmpG:blue>128</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=153 G=153 B=153</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>153</xmpG:red> + <xmpG:green>153</xmpG:green> + <xmpG:blue>153</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=179 G=179 B=179</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>179</xmpG:red> + <xmpG:green>179</xmpG:green> + <xmpG:blue>179</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=204 G=204 B=204</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>204</xmpG:red> + <xmpG:green>204</xmpG:green> + <xmpG:blue>204</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=230 G=230 B=230</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>230</xmpG:red> + <xmpG:green>230</xmpG:green> + <xmpG:blue>230</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=242 G=242 B=242</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>242</xmpG:red> + <xmpG:green>242</xmpG:green> + <xmpG:blue>242</xmpG:blue> + </rdf:li> + </rdf:Seq> + </xmpG:Colorants> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:groupName>Web Color Group</xmpG:groupName> + <xmpG:groupType>1</xmpG:groupType> + <xmpG:Colorants> + <rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=63 G=169 B=245</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>63</xmpG:red> + <xmpG:green>169</xmpG:green> + <xmpG:blue>245</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=122 G=201 B=67</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>122</xmpG:red> + <xmpG:green>201</xmpG:green> + <xmpG:blue>67</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=255 G=147 B=30</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>255</xmpG:red> + <xmpG:green>147</xmpG:green> + <xmpG:blue>30</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=255 G=29 B=37</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>255</xmpG:red> + <xmpG:green>29</xmpG:green> + <xmpG:blue>37</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=255 G=123 B=172</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>255</xmpG:red> + <xmpG:green>123</xmpG:green> + <xmpG:blue>172</xmpG:blue> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <xmpG:swatchName>R=189 G=204 B=212</xmpG:swatchName> + <xmpG:mode>RGB</xmpG:mode> + <xmpG:type>PROCESS</xmpG:type> + <xmpG:red>189</xmpG:red> + <xmpG:green>204</xmpG:green> + <xmpG:blue>212</xmpG:blue> + </rdf:li> + </rdf:Seq> + </xmpG:Colorants> + </rdf:li> + </rdf:Seq> + </xmpTPg:SwatchGroups> + <pdf:Producer>Adobe PDF library 15.00</pdf:Producer> + </rdf:Description> + </rdf:RDF> +</x:xmpmeta> + + + + + + + + + + + + + + + + + + + + + +<?xpacket end="w"?>
endstream
endobj
3 0 obj
<</Count 1/Kids[7 0 R]/Type/Pages>>
endobj
7 0 obj
<</ArtBox[19.792 16.0 109.0 112.0]/BleedBox[0.0 0.0 128.0 128.0]/Contents 8 0 R/Group 9 0 R/LastModified(D:20160615142312-04'00')/MediaBox[0.0 0.0 128.0 128.0]/Parent 3 0 R/PieceInfo<</Illustrator 10 0 R>>/Resources<</ColorSpace<</CS0 11 0 R>>/ExtGState<</GS0 12 0 R>>/ProcSet[/PDF/ImageC]/Properties<</MC0 5 0 R>>/XObject<</Im0 13 0 R>>>>/Thumb 14 0 R/TrimBox[0.0 0.0 128.0 128.0]/Type/Page>>
endobj
8 0 obj
<</Filter/FlateDecode/Length 106>>stream
+H���wV��u6PprqV�*�2��3�4R04S���32�P�4ճ��T(J� +W�*�w6PH/�H�+ +8;W:dYmnJk$j=`^PKX*GV"-/6MPPhMW4o*<SJ[.r.2B:%l2U+:>jFegTA5n:ROqi. +8M?-(/t#IN>re.=TbIMqYWQK1D%b&pOLGa]H?hKs'8Gqa4A/k;[i&\e-=4:h!/H6BW;~>
endstream
endobj
16 0 obj
[/Indexed/DeviceRGB 255 17 0 R]
endobj
17 0 obj
<</Filter[/ASCII85Decode/FlateDecode]/Length 428>>stream
+8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 +b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` +E1r!/,*0[*9.aFIR2&b-C#s<Xl5FH@[<=!#6V)uDBXnIr.F>oRZ7Dl%MLY\.?d>Mn +6%Q2oYfNRF$$+ON<+]RUJmC0I<jlL.oXisZ;SYU[/7#<&37rclQKqeJe#,UF7Rgb1 +VNWFKf>nDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j<etJICj7e7nPMb=O6S7UOH< +PO7r\I.Hu&e0d&E<.')fERr/l+*W,)q^D*ai5<uuLX.7g/>$XKrcYp0n+Xl_nU*O( +l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~>
endstream
endobj
13 0 obj
<</BitsPerComponent 8/ColorSpace 11 0 R/DecodeParms<</BitsPerComponent 4/Colors 3/Columns 880>>/Filter/FlateDecode/Height 947/Intent/RelativeColorimetric/Length 90241/Name/X/SMask 18 0 R/Subtype/Image/Type/XObject/Width 880>>stream
+H����oi���@H�����y�&�����8��_�n�������y��A�'��? +I + +W��<�*�
��'���%���Y��%��V���ma�o!���ǩk�v�>��w�u{=�Q��<\ȃ*fƸm�q���Y%ŏ�R�p� + +i�H�F�'��>hd,��I#��_���ы��Tj�~Q�5�c�R�`�n:�s�
e8�����P���� +WW�zٶ�:��l�g���l�7Ƀ�Hi�J&������/�Ӻg�.�}���C�����'���d�D|V�֪'9TL*�4�I]��6�� +���>�#g���V���-�?}=����Tj��OK�<�>�Nh a�uOB�n�Y#qkB�)����fiQ�@
+� +z���tu��t&���k�s����g1�twuO/�J���>_��9E�zb�(Jr2�h�+�ɓ�)���⇻��A�!�����_:۪.�%��ٱ4�E�3w��~�� �sO��q9��F�$����~��E��<G���J���? +7"P�� 16?w�'����PƔ�P���m?U
A�J�������O�C�/%��-n�� :d�}��_H��R0I�����yc5S�j����V}���nǡ�!��1�I�,�C8���LaP)G�cA��1(�E�4F|���Q#0#0P�W�{� V<��^�F��Lz��@���%����k�����0�u�'�I1����q�<��$p5�SyV(%AǓ8�M��Y�ĶQ�E���Y'd7��2k��/Q;�L&���^1*
e����v<�7V2�Sy�+G� F��"wA +����P&�rA\�9g��J�C� +���c����1Bu��U�U!�h�B +�m����?I��X��q�Bf=�O�-�u���S]*pb�L�p��� +�+Qf1XGbu�.�AL�}�����{��;�j��:�1�X�M;`�m����)ݒr�2���?��?��b��<g�2��|��NDq���)}��s*�[��Sw�LGE�R>ӥ^"�T�.4�{��7���V�:7�cO�
���n���]��&I�Iʴ���]�׳����L&ټ��~�e�?61��8qW6�$�уS-���J+j��� &�H�R#Y(�u3C�"���va������VO ����qˤg���/��{N�d*�� �w4~����8`ਡ�O��D����T +����(� ƃ��(r�Vu��6z�0F�|�i�U�6�������_�Up_� |�7//�y
e2��6�ka��E9JT��h�<'|���� e�\x�y�(�7Q�Q1Z)�7�#�5eoӈ���0��g�+ۨ�wC�xc�X��S�g")�-n�k����E��J��N[��*������ FA�K��L��LR7�R.��L�BME#@�* +�~U���݊�tEEVOt�7�U콊�ؾ�x��Ԝ'�is����jf=��O���[Z��O� ���((��A��>��&��]�r�"��т|f0`A|0�/2}�+58{�:��!ELTǝ�uB�1H��z��GQ0�g����[��|Q_[VSo�r^G���y�?l�D$g=?�ȩՕL�N9�� +���K��*RYģp����u0�%K��'���*�-�l�p�D <P�#�Y�G���}Ũ4�I��ϸ.V��;�I�������Q&+=u ����PaqU����S_�q(R o*B&���Bc�@-٫��m��大+R/������rlpך`m{�ͯ-��Vr�te�O&�^��LOF"��e59��h9��Ą˵�J�ho���q�{5�0����ށ�:���5�8Ƀ*ô�x'/>I��D2Mnݾb��L)��O��Y���ׯ��R3OF"�R �j"�iO8��%�����{��Pqs�?H�e�e}-����XJ��N��m\�-��H/}G�<b"�µŭ�|�x�y}}YM�����>ϩ��Z&���L��/�u>7&�I
wQ)� /�+P�.b�P�"�$N��5��5�B]�=�{�2��`�[������Hnk�?������-��s��\��粓�y*d�qP������9�I����,1���k[������`��^��A�/�n��3��Օ��c��V�n��a�-_�s%Y�S�����M{b �FǠ�oZ����nk�E�%�yt�$mA��s%E���v]������JW������^x�A��
�Xk���0v_���KӉ�� i$��Fߪ�/�u(� j�L�I��������O%�k��/S���<z�YW�nZ� <Q�b�誒��&�[q���Dz1��'��Mwc����U�0s)/�Pz�����R����m����u��/X�����?��O�y��d��R�<��ɇ0��m'hˤ�S!m(/6�o�G���F��"H�Cs� c���f��䐧YBh�ߔ���syڡ��y߿�n���,@2����1crXS>r7B>Y��,7�70����ݙ��s)�]ub�Q9O�Έ�L��1�2$j����n*�2�*쾊O&iV��"s��r��+�2L��j��ȞC������xҜ����J�9:J��ʌ �H(���hx�A&�xk
�i&����Iu$6ԕ�j���:.��E� Q\-^*%V�@V;��R�M���]�d�L��W�<}*�w�&Kߊ{���-7@�-&;. +C�6���6 �@9TB�U�f�I�[#v�1��r�`��,���f/5n����T�Lֹ�ޤ��o�sI�w�T&�����\�ߍ�#�UB��XJ&�uo�����6TE���-E��HL����u[���F���Uf +���x�謖���X���z�{FEr6��q��iV�d>ս�l�� +��\�Uv�^dK�CR&��p�����6�kڄo@)������ɛzx���Z�ZfB��v�5n�F�C��
�`�r�{Lŷ�y���7�g�2H&��;x�@��k�A�SYQ��C,��2�9�Wp� +������c�!{)��r���*��R����j�!���&�#�8ˁScM���}��Zi�*H&��M��f��$�\�P� +Ŵ�\����Id e��DҐIЍ��F1�����|C�eH �ld�Ԭ6i.2K8�t��&�t�(�Q��+��Zf�B*R&��~?g����4�|W�~��!�$����1�[�N��Ikq���S��(T�[�'iͧ4*m����~�@���?���>���KT��)��Ε��J��3t +dE�À.�"!�|��g_��F>";,o)%O�Q�������~Z��2F�B +3����%f_,%.u��;��}�����o�Z��_`>��19�)�ۂ��֙Ĥ
b���-��
2z[&��;BE����z1i6����Cӯ!�G9��h�t��j9��'I#�8�ˁ�B��!�=��*��t-T:zT�����G�\2z;��F3�}Zg����L�h����H�Ӎָ�!�fi�V�L:�,N��0E��wH�V��sR I �!�-U�L�1�����#4���z�v�B�`�V��|�u���4�i�$�\"&^�X�j�bޟ��� m�R���� q6����H �JER�����/-N&�w�'�,�͌ƹ�ӿ�8�!�f�I�|��1T��B����S�?�D%�}�35fW�̊�CȊ\�!/�5n�:VC1�@��#�&R&�����2rÚ�!����"H �<��O"�$;�,Ɣ�G�)�!� �P�i���q��6k^��6垾���n��m��G��ţ��������t�,Q�\W +����Ho�[�]H&�lB���<iΌ�'�)�L��t�`��=C�B>��OS&c1�[p��Uyu�������������N�'v�9 +���L���凍\����L2铥�Akq���q�$��C���k�DyQ�c��O���z�q�*�8� +U_��D"QA�PA�@�I��w�涱��DZ��I�PP�i����G~�;�9���]����6ov��p�3U�$lJ�'�o0�bR��v��L���~�c�I��F��eA[Q��IPY1��o�7xGv����Λ�j�i�$�-I��g�2l�c��.Ť�=I !;e0�'Z�JZ��wzT6�b3;��� )g���S��V�G1�,�� ��xt��������$��(!b1������Ѯ��-������~���$�"�3V[�f�K�@MR�+��3ϟ�ePI��a~�F�p��2�
���Þ�qZ�JZ��� +0 ��'����0$:HJ��\��� ;``pPL�=N���M�.�H1Eb�~�ԓ�vsK`TO�=�h�wѓ +�m��crE�?m}��F!��e_JRPF +7���b1��T}<�x���4z�V��,&���읲ye����T��J=���q����#cz>)�R�v:��5�[Q����Г�O�"���5�o)� �c���^�m��X�y���Tع���T=�%o�-�oK�2���U~c���͠�B���>(h1*��h�|: +�ؐ�<p�D�����Ť��G��|��i-j�zR����E�Qˠ'� +c��'��z>�w�TҺ�辣QEx=��D19��-�d��!}?��d!�}3����Z�#)��nmDz����ly�_|1^��N���d`Q0��l�9'0�Nn<X +�(iC�4P+�$��� +c�T6��^b���-��4��je˷O|�z�S~�?_�q��C�j��R�r̖E˓�>�j��E�k��.C-�n#�E��<�I�O{�vE5�ӄ�&E�N��& �݆ +���w&B����g��w���)#��S���]\Q��V��Q��>�$I_jJ��X�,�\^�Y�S�d|'z��D%�{o1�!䅇qx';q������ڈ�><�a�X��/���/�
�:z�556hz��^�`tN��ʦ]a�r�DhKUvX�eg��f�¤~��u�bU4u�+�&g�b�8��5�I��nݣ�T���c�%N����N~(�d�X���'Bh%���=���f�j-NK�2z]��W�"L�y�'t �l�^fZ��&�a,�- E���K�v|deKhߙ��Ds8�^{2yc�"~tt��o�����`���V�x��h���v۠���d���N�����`�}���ʼnCh�Vr��fg�֭iљ�O ��т�|�,I��@�3&����7�r��~x�]5K~�� <�'�ɸN��j�G=��=`jߖ��}��Ƌ��Wǭn��Z��\Lҳ��o�`M�2iC�ɍ|�a�'BN$�ɸN~(���<'x[)��!t��DJ���`����ɨu�O�&��7���R�,��R��6�=<������{.�q�;!t���&O6v�se�8-@ʨ�m�k���$b������f�a%�܌*� +�s��Mz�C�*�d\'\z�1z�A��D�����d�&<��u�;e]� x�^�,�Yo`Γ�Z�A�>�� +���9��$Y"?L�tzK_��14*Y|�!ԯ)7�$�U���� +L�&\��Pby?�ޓ�u��r!m���� ��FZK�G���brΓͲ��c)�eE�+W�q�yt�T?�w�� �]����]�}["�֫�<O?�Z��I�(B��ڸ���R�9�S�!&[J�9,^ٟ,9�&�G��U +=� +� +7]=�!�I +�AQ�ש'=FE�4b2��&al�6>� +��������h�B��")��;���I��s*�Q����Y9c"�1鲒��z2�k�l�vy07>� +�d�֕MW.o����BgDtʿv(u�X�4�Kp}�G�ߓ��-�8,���]����o��^������ѓ�[J�^�����c����(�N�Y��]$eo�
�h9[�ƣ�:1�v��t��᥌e|��� �q�'��K�����p��4 �b +4��4@ߩ��߿N�N �d� ;�tSl}O��J*I�p����r�G
l?� +ע�(�'㵢đ�gi +����&�������!&;��=���@O���K1Ŏ=��5�:�2J.778&�$��k��4�RJGL*�sͽ�֨+���I�N,�I���ij&}`K���闍�sEvD��R�Ͽ���d�}����O�I�b�_9���3��D��a`�(r\���|��@O�@���Mo��ߎ$�g��i�)���R�~c�b]��_����+$��H!n~�F]1�GL*v��Z�F���i +����� &����NA����@O�t\ᏻNo��V�0�� +'?��Z�t���w +٫ + +���w~L��w�ɰd�_���X�����2�oĂ�ϼ�0aL&5��QP�RK0�0�*���?�%�� +G�C�;��0�SO�!䒢�(m���� @b�c���_v��(J�k�E�@m���K�8���h/M Hhb IY�eI�Q}v�����r�7�b���yH~�Լ�0�q�i_��V�����S��!=����#_�m�L�Ĥg�����i��Ұ����=
������X.�o��7��=�<����Z��d��R����'�4�!����s��d�����q�ak5k�����M�MJ(�PtKx������#�I������ +d���!��թXK��tkc�Z*y��ͅ����(
�w¯<�\�*D��b������,�$=O��V���p'1�K.:|/�lӥ��+<���LZ��dg�4b�5��H�<R����+1�88�{���� x�#����2sI����� +|��?$��d�����}�Q3���]���Aʰ''[�0'�&l�R�3 =�br�NG]>i&o练Ɏ[�U��lL=�t�_w���H�Y���{�D'���C�%A�)Cy�t�)�8�tDzP��ˠ|!B!�D��D���Eg��̓~���WF/��Vs��'�A��\�U/! +.a{��0��Ç� +.�ĕ�#_��u�MLzb)Z���O���V�fc+U�����A����)��" +4�D�'���)58=�2�6L"��>^&Ư~���nc�#�{U��ҭ��'��T����Z�;�
�����$U:r�i�� +_�͒K��쳷x#LJ�4K\��4�^�mΔ�X]�[���X�VB�f�@)5:�'7}OV2L��=�P�i��ϲ�gc��0�Y�h-8�i��ҧ��Vk6�\�o��'�Nq���|$�T��(�$)�y���6A�ߓ�gO"�Hb��1��fl��s�a��rE��tku*F��������?�L$|���)�>� R�����
�Ѹ�oB(L�7H>IwU���h����c������}�[3��;�/��)�go�2�q���CJ�=� R��HO��Y���$B�kѧJ�6�)�b
�F��l{�h-8�թ�rb�V�����yZ��gcF�;�H�Ң���t@ʰߓŤA#v齌�3B�IL��ODxRz��I��;e�5R�kw'w9��O����D� +�y�š��|��%0���Ke��X��\�v�I�ِ�)�H��{�fZ;qR��C�{ �/Dn�y]&�O��k�ꉥU�S��=�l�'凯G��w%)�H�3�c�t:B��xO�����3$�0.e#���P�ɶO +|���XZE�_���\(Z�ODh�<R�^ihIy�)҈; +��rk�'e�����G��!%��
����������:�W!�G��{�DN���h���J\9���\�w��ACl +��w��ϱ��R�>"����j������'�3���J�)_�P��K�w�G���&)�
�w��Z�t���ݠ�Vw��gc�)ßH��aO&nr�#��<r:%�����Bh���;�]�����d�"+�VK���ic�Z�_��
�o���=)C��6Ki&RL�Ye` +U�B.���t/M�O0�tx!D����n�}~�yLҿ�V]=�2�f�^�C�Q��_�u�y���p�%(�I��䈬��!�I-�y�B�s9���5�k��I���A�Qn��ԩ{Sѯ�p篧��G�m�2=d�7���R�&Ӻ4M5����4�<�P��'�|�-��>;=NG��c2nc�R��t��`�����AJ���x��w�&ӷ��4�p#��B��Σ)Óe6���y�0��)��%L^_��rhe�{-G^��O9&%�4��j2�Q/ +L��AHi�L�"C�ɇ�v��M��å��)3�0�Pf�ۿ�Ղ��X�a�0)�QqVgsI����V�^U��B�����~l�� Gސ�p��3� ��L��4�RI�9�&M�?���V�!$)n+�Ye6��\�V0����YO'�j�
������Sm�,�u�^�)�d�w>��R� CҠ/eO� 5`2�� j'#��=%�J��X�H�Pe9zT�w�?�p�f�}iT�n�Qn��tw�R�����)OX�"���pO�%t���T&������Ϗ�]3����)�$�7e�Pf[p�r||l5pnd�ғ+�ĽH9�z���K6]mŤz��Ϳ +�'�}���nM�ty!�/0y�(��[v7t�%�OZ��`bsI=��P'L�'ol���3�{%�R�J��}&����|�DQ�5M,��$)K��B�cuq���\��B銞�����SV�'�Ofw�5����7����'H�#RΘs9���'���R/)�Ȗ1�BrT��k��,pY� +�}�+�;B(Ř���
�ɯGE't�s+�mF\��wO�;���Kl�T�Ȓ_�S�O��c�f@�=-M�//��:GnW?q�P�gE9o +����W�!D��dUb�;�<��s���[#�Vۦ-�����Q�|�_��緍����T��hw��r+��P��KR*��B��@�E` �kR��.I�tia�i�^��Arȥ��kP_ڃ�b��DJ�l�2ˣ�fgI�rlX?gw�>X���<���}�"W� +*e��� �Oh�)�5���Ћ��PŅ����������]lx�h���7&���\�B{������ԭx���hv�R�zE��,�Y0�C��>y����F��� �UJA)����_~��D�<�KT�n33��[jǻ�_�\'���?��^���B������kB�<~�U�c�>���7�D����A��A�$��;)��Q&�%��AG�t)K���^��y4ν*��
o����{M��O8p��r\r@x"B�<��Xt���)�P����ǎ�)Q�'eR�>���qبrۑ�]JƾИ�k7l��J){�'��@o<���q��N�4M[-F��l"N����A��2y:q�!߸f�l
W2��Z�;fj#��SWf��d2S����ׄ����iՓ�Μ)~�.�y�V� �h�G�<y��3�ߎ|�R�����������Cϣw��÷�Ҭ.}�'!3ՑL�L�ri�66v6��y +�0�A���%�Aj-\v(�'��9{-�ҥ6��x{"Zw��(%̝�ٟ(j9�1�5Ʈ#M�&��*=6�ʹX% +����&(%�}-( �$�7���&#M��d1���:�Uˑ ��� ���4�_}�Sd2Y+8�� ��k�7.�٩OK����Sn˧�z�Z�.A�<��dPH {�P&�W�ra3/���B��]� +��E�<X[ ��.[�(�g���5\�dK��<l�f������x�R�3�Jyb�e�b��U�h����bP͍F��'*%���2)��:�ȗ.����y��j����H)�s���FȤ��3AQ<�2���1iQR0"|�*$��l�f�_�JP&��Q��Z�Ka��v-���/�~�^��3P)� �$HPH��L&���R��~h���b�*$�<���=g��}����s����|�R8�$��Pʪ����.�7TJٗFa#����}��d��i��ع�gC��r��6C�����2y�R��hBnҁc��tБ/]�2\���ۑR�H)+6����rB&&|�IJ�V�Q������j9�C� ����29�ereR�-��G�w)̣�Ҟ�&Msz�b�j�R�@6<�I�����0��)a�8r���n1kt��?P&c +�d�����4��<@{�d�b}r�J�4�E�7l�;|@�*�w&�$!���ϧ�Uke2��t��-:��] +�����,�!l]}� +�����O�g6�*�be�C� +$��_���X��;�T�����1��H����I�>~@�C"��a(��R� +�t�R���u�f�:����N�R�eؚ3C�Q��JXkl�����
�c�fS,�h�IC�c���=����u�0_Wf�k����>�k�nL���1�ז�^�����O��> �~����Q�'t���z�`��'#���W�
xV +��t`O���=��?���7������F�{�Nvf��o��wvv�*�Q�J��*0� +�D��?�ޙ�a���
����B� �J_$<��z��;��������i�{w�F#�e=�{��\&C[����r!����7��&��'kn¼~Ѻ{�]���2
@ �*n{�Q�^�Qw�+�e��ǔw�T���>~'�,�U)+�DB�Gbe!��z/�E�"���-|tʌWX�b��v�F�<�6N�H��P&?p��dr�A[��_Wm_��� +5?&P�F����������1�J�'�3p��|R]]�9�M����]9LL2�Q +��LrH�P��<ɤv4��Β�V�^Z���Yv?���`�����vF��RB�(���M(
� +�H4J��oէX)Ϣ �G)�<�Ʈ@�C�*p�&̟���\q7H&5��UQ�^Z�^u���-�R)E�7�?�A�|^�u6�0H%���LϐO���R�����Кr��{$�$�A@�$n|�^v�$�z�n₰WSo_Z�[sSrd�Rޛ�>|��|��R� +�% +X�3��J*%�0|�,ϙ"g��,�3�9!�+��\JdR��"N�tg�Q�^�Ҋ��R����lr�?R)�i���'a,P��*Jyc����q?���DVI��1�?��
�IM�<(��.-i��[�-�g�b�\�~���{�� ֟!ɥO�Z��:,Ø�9{��ٵJ�:3�6p��V�ݕI�I-��o����Ѳ��c���ݷ85���k����k,K�(;�9�g��'
�8�r��[���a/�#<�4+�, +:VInI����(o����d�^r����@ԛ����/��{w?p�_��&�4(e���D�Rc���ё��D>�]+X�kd�qj�2��2y{6��p�dRw +V�Nͪ�^�3�2X)�mP �?s�bֺ�Vf�{�D0�/#�o`�7��Β�Vm_Z������_~��B��pS���E��TTz��aL�tZv��2Z)�8��J���q%�S&�I?�IH�d:A�7�.��ɲ��G��=Pkɳ)�?�(�_��;YDl���g���O_��!�;��FJ*��*e��'� )���2��H&� �����zӏ�z,T�=Y]��=+eQ/��0g��"�c��b|�蛲��I�k���F��$!���Yrڪ�KK��4.��»5��J��j����;>i�:'�:nA){;,n��Xepx}P<�4�MX�y��d�@ +ƏA����)(#��n�a��o�$�<2�cI�GG&/Zw��$��Q ���ھ��ފ��}!iD���_~Ͼz��dÈ4�0 +��$�l��WS/`��_w�t��7������U6?�J)p�0g�%z��*u�#�"�#�eDy�� ����ڔ�ן8�Ȉgg��nW������4c�[��4�R~z�Ű��:�,��,�G� �L}��ʳ���A�H�L�Bo�H��xV����ۗ~�,9ʛ;�`:A)1�0��C�|E"�<g��� !�$�,�����)_E�,���%����L>��E�d�xv��ۭ� +����tb�X:�O�����Z�`
�R�Fyx�Qh$�TIcz���7�8'a0y&�'�2Y�d�̟�L/b�]U/`��_w[Q|$��w +�H\A��=xraOjVD��EI`�N��I&�������Ό�8�隧�ϗ7E69t}�y^�&��+�t���z��/%�v�p��\�ԧ��"�>�A���nB����.����W��C�(�y��S���&��r�t+�Y�H�J
W"U|C�~��KJ�Ǭw�RŔ!�3c[�1
F�d�I2qǐ���xC�o)B�i)��L�N��0�&���%6$5�KL���#x������G�;��n�䟴T%m8�<�9�%��S4���o�����6����� I�@Kq=o�w�;G�nۊ�h�х�|�!�`J�d}�<�v,�Y���l6�I<i�����]`�4M(�,�^�H:;`%5bdɑ�| 4�L^r1鞽���^U6\��g�*
���r��C��a��%��BB��]`��Ir���o��I��~V!I�\������>&�o��zI��k�i[і���p뺤�u1�3O�*�QL�#d��I�'�����LH���;�,��o+R�1����;ϝ� �D�D��X|����
�R�&����K�!�R�]�?y;��i'|�W���KCr0��X�,>��{;P�7`H�dt�~���ìs��VB�F��*�`��V�7����'������9�8���QN;���� +\C�D�}��#Ig�J��E>�B�m����'R�ӆ�"ixؐ���c�χ�n'
��=B��3��]L��It���f-"�`*E�'��G�I���)�\R&'vؒNK)¤V��3,L*>�����E�}��o|�| +�Dң�[+�l���v�u,ޒ�fZ˭+�G����_��2���T$fv��S3DJ�U��z�DJF+�7�����$����;
�S��2[+�K}��t�]��aB���z1e� m������л�~>����R"��eΙFc!��έ�|���F�
W"�%�F�I�� O�)�K��H���rڰ�8�:������3Rƿ$ %R$Z㼩��{W"=�q� �����t�)�p�m�yۊ�d��@�}z����Y:3��JJ�[����F��,��qB���&�$H�����a�os\7h�=$����%�L�&����8�ͤ�j�߹4���n1�ȡ����3��)���틤� % +n����^_�G�,��hZ�m|R��0e"���<9���X�iI�$O.���<�z>>�j�<�3��!�R� �i�^L��L�����rД/15�D6���Ė�mE����l6���u���A�]W6<����=H�"H��k!�<?zo�+�I4�mչt�)�v�u�/��ת@�1v,���u1�3�C���4��3շ^!<X����AR� % +H0i9�0��0����3L�z6<9��� � �2o�����r�PLhĆ�"0�98H���h�;�IL��6�VtД�05.3��תR�#RF��p6��/ +Q��$�E�mHf�DS��ɼ�߽4�Z +&H㑒�#RʆB�l���,� m+ +L�`��ڪ�l��Ѡ��6~T���K�'�'W"�y�0i%�# +�D'a���?t1���<���|�)�z��X��Z�g�z�9x;$�"%�v�)�i�)��юec��^��$R����Ӕ/��7h��Jd��]�kU���ҳg}�q�Ob&3�IYJ�D~Fە3�����0�k���1.��z�mE[�_��=.F���Z�A +V������$�*#�%RJsc���i�$���0�R�.����dL@&�@�@����R���+�Q,�8�+δ�q�h�_=�DX���q(%�8wr⧟����L���ڼj��,��z��IQ��6ǃj\�kNA[f�k�$^���rθ%��r��ď?;��s +2 �h"V� �<4�4^WGú��ZU�6�v���=J��IF.� +w�̈́c�=��M��~�_�ghf��]����S�ɷϩ���`6SV���OV���d�-6秋1�}���ᓈ/�U��#��
�?�?I}�G�����>��;9��G'��#�~,��C��ڹ����I�9�=3z���+�{�a����k��?qz8gd�%�$ +g8����& �D��y����̉��^/�Z���,iU�J +�$ +�< +��J��)H
®���A]T�*Cp�&��N��l�L��nf�U�YT�*�V��%����6a���50C00D�?���Փ+os����9��ؿ�At�jJ|�LG�q'��l/�-~zG�7 0����O�hA�W�\�m5��-�2��V����*Z�<��!��Q�=�d��F���-��V�"`R!Z�Z�Ϳ������ |�;?E�*8��0K�2�HGܲ,K�� +w�0�W�քa��+[�<.�劣SU�Zy���Id� ��h��"�fm�!��a�Ss�,Z����:���ŏ��>��ĵ��.d쑭���J �(h5�iI5˾���:b-#�0o#%�E?+�IF���x�����l��'�Qw`�4sm�H*��3Ͽ���9b#�|�9�.Ī:��Id� .2}'�lY��; {o +{�0y�=k=+�7�8\�ɲE*��'���k_�k>��1+��m;Q�O���� +=Sb#�VS2�H�'���?]�/��}�,�6�P�.� +w�0i�O6s��i"=[Դ�-��=�ұ����7�'#�_G�p[rH������sē%�^ l�J���R� +�$E�F�j�-�3>YM�#D?�V��x<P�|9����w�������( +�C#-�%��4�l���0��V�����E>������љ�x�H$�D�#�=���>��D� +�=�$A�Y�H�\��4:�襑S��O�|#�܊���⟞={����G.\?}�|ٿ�S�+Kڸ'����Kz%QOC)��JJ6sµ���,�LT&)��Ъ��?n�8��d��U��%���璤�䓉D���[E���J���b_y +�s����}�����tHO +�8��T����Ssm���֕$+F�".���P�(��. +Źڬ�6�:T�����Q��ߵ�O"��4TJ͕W��r'x�(9���$ I���O= �����XN�=�? +�+3�8��B0����gS[=%��;ˋ/�qU�b�'D}$�C�*��, +�@�S��8�e1����[� �g��Y�4���U��rgI��(9+ʝ�'%I��t�u�KkK���8�Ӥ<h�'Î��HJL%�'3��]j��� Q��c�D�$�����~H؝ ;A�㩕bA�� U"})i�`�.�|'V(*>�Dt��T0�|������v�Ɛ8�{��bR�I6�eG���X�(�Z9�-��A�:���E1��/'��|�Ŵ���ɲ��n�����w4e驒�����/��t��D�y�C=�n����zu ��������^<CO� /�� Q���L�#�8��K�&<�'A˰ß������ɋ���$;)����r���O����t:�D���姻e�3}l�ߛDOb�h{�@Rb��xi�"�/I)��(�*~���]xA�p��=q���S����C��fT��>��|��{1�~05����$�����I��a6��e����?*��/���W5�������;g���l�k����J<z�s{��]�3�a�nk�GO��[a�d��d���x�|��*��J����S��HS���o֭ +�w��jKЮM�|�< +� ���J�Z��$O|v؟�_ +P�� 3>�o��t���C���,
�U͂d7�;�V %g�I�${r�5Tpi`�ԓ��N�ߛDObZjw��W��,[\{S�D�|���~H(��/)�K�$0���"' +sS��0H���b�<)V:���o(��I�c�\���&��z��b2�|�1�$m����$��;āko�`\}�|0O%_߁Rȧ��E�r��|'�P�uq�n9�d�Ԝ;x��@߇�u��Z�H?���Jm�K]�T�{�I.��;��aC�k����(9 +ji�4�.;�N�ꌒ���i2:�dm\�����x���Ld>�v�`�n�+���̿��>�.ҟ���T�Q�y���$K!�>�^U�+qGp�)�gQ����9�ݔw6��'� +-v��Y`��+�I�ѩ"���[p��������i�4��agi�.����uR1N��<N�#ԧ:�A�a�
�0<I����bA�#����ԝ=O��&����F&u��˝��m.;?z���= �p�0ӗ��ƚ|KK��0H��U��f'xO������u�J슝 ����3�1�h;c��"\#�<�^A��ٺ;`�`��� +�ƾ`b�����h[��4Aix���Cx�!)ICK�7ۋ��TeRֽ�JU�M{�fm�M�'��DiE�ec�s���������飫+�����>gH�v���P��J�Q�I���m���Ho�T���'i�WB�?ZF�|2.u/S(�r���c�*'}����J� +^��s��=hg���6t7��;�=X~|�r�>�v�fT"�x�L�_�?����;�H��ɂ�6eEk��nU�[_�N�dQaUJZk���шv����w1��q�R +�5�mY�����l�Q��lDne�6��$@ڡ�O����?��wd��[:��( +���Vk�k���WX�
�2�.���$���<�<��H��Jf�'oD�\�m��X�"V�s�@�6���2�CR?L��<�M���'�d^��s��0����V���Vt����+z�&�����9&�C���+%�ԤW����d����o�*�x�'�y�'�n�I\\{��-*%�q�'i�*���C��5�r��$�Ef�R�,L[��S�H�i�X�q�E��mG�b�"푯# �W0h��m����߳�Y�
B���~RڦdR��8K����,u�N��{��_�d�H�A�Nmr(��ѩ�hP�5�J�7�d�ޞ�I��E��V�n>y
=����VCy�Y_)���*=���)��$����O�wJ�Roz��j�?D�?��@h�|8և7�7�_��!����xK�}rB�v6�!�f�'�up-0�m�A� ��J���~�̀��|%G|���|RWqTm�ή�tk��C%n�'��O�J��ɕ�X���B�"É�M�Rd�|�O�r��
��i/���@���#��5�<֊@/wy�� ��|ra�yxU�6��������E����)��|�/O�d��^m�sN�̸R�v����I�ٙ^����pN}�I-נ�����
n��vTSST�>�r��O�Zq�,��|2J}��W�B)�mV�J��`ٞ)i�a
Kc=�>��r
6q������vHB�gzf���;�&� +�dK�z9A|X�|/�㬶<X"��M�����:�����z��e&~�:���o|� +��.K�w�������f���Z�� +B�/�G��n���e��^;͓S����uf�����u�G����%A���}�C<�*��xK�V��ߜ(��'5fr�o�o��?������b���,���*^uZ�
v�š��\����>��k�'_27��ɼ�<�ņ�$��x�����t{��]�Y)�V�>�ʜ D �8Ҏ�<��'�gy���'G��&�zʃp�}�0�c�7ӳD�o]��B�G���r����� "$\��x��7������533> +��ol�Mze[nw���h�����y�ɞ�I��>�����j�[�I��J)�����J"`�>e��nX +EZ����U�%�RܨCRe]`���&�Q���0,O����o2����L��~r� ?�L�8�v<��zҍ�wCr��� ��9�{����7'<$H}�ҭ�G�]NÌ���}�m�~r������2K��� +�W�W�%�����6��0��q���9�����~���F�p�9Y~C�i@�2:UւO*+�'�^aqp���Ez;��)*l}��rI�6�v��OƇepD}2�Jޭ�n�(��6��l���*w��64��w��r��RY���Za:?+��V��t&u�u�3=�/;�KKĠ.���`���"ҁ��hڋ�т��Ll���Hh���;�8�l#~�+D{��I?�8��Q�+����M�է|Rc���Z�� +>�V�S>���'�����"+=�r�!cT�V�Pv D)/n_)� +��Y�ʙ +V��rB+>��<���} +�,g�GCO��֗�$���Ħ223؍�{U�Q����0!"z^"eT���*�'�TмM9%��Tkժ����$�e:;_�_r'��8j�)Iԫ���.�]k�#8�O +ϓpC`�:Tjϓ�u4���-Z�C��I�O�K�ÅV7~���������fyu�Jo�yR]e�����Js��Dx2O�-v��Gض��^�DDY�?��p�UΞ���*��b6IY��q�����oe Ӳ�|�x�9 ��7}t�p΅ƻ�DJ�Ҵ%�������-4B����D��e��<��7J�Zs�Oټ�ጭҵ�8��q�
�$�D�AiB<�8DϜ�9l��J�.���fO�'A<On�u�m���'�hDw�r�]zy�_�DD�).gFJ�*�x���N�2A�BO9%�^�Ϸd'�VV�b�g.���v�6qҁD�Jxt�'j�n~|Y�B��9�d/]D� +foq]��� <)�[�]i�y�Hnc��d~v��Q�Wi�˓�(g�~��C�<w��&T�B�6�B3N|�����F�[K^��ԉ"%�&�k�.���@O��̜���2�S+��X.hŇ�.�i�D��d{���T��!鶈w��Zp�I������n���?Y��=�������r�< ���Ojjm����CF�Dz=��n��(1E�9�H���)j�M���D������)���C�N3S´���l�v��<��^ +�@��;eNk���MQ�\��,�B��n/���n�ѵr�$y���KԊ������_��{�X�zdރ><TT^ӜJ�������Gi�!����K����S��NΘ�'U5-1�ĥF��@x2��^vg��x:Fx��(ye)� +U�R����$��A!7�sT6���lws,7�fnz�R˾�c�gǥ3z:�j�) �T<�HϓP�K���a�S�>� ���A��1��d��]-�k�|p"hQ�6ɣ��TaQ�YVeUj��No�2&�I��<�]�HIx2��d�Z��$"�]E�9�H ��fN�-O��i����ş�����b���J�|NW�~1�ӷbS.������J_��rB�P�.�D� +�cA +��� 4��"E���(�@cC㝣2���H������!:�ovj�'+j�'���*��'�n�b�`r�Z�b$"�2�4Rrq��p���U��wL�%@��`_������F��J�Y�AZ��G��̺���>-��I���y�*W��a��q;z�G�h9��@�^�� �;[���q��P���A��C�`���5O�jZ�U6EU3]i&<�/���i�����$�P��s�ra�5P�l��ay2w����r�B/��~�z���8 +�Jm.��Z�s/�Sg~�}g��wC��]p��ia������e��Z��K�|�u��vp�j��'��љ�ضs���O�S������EZk�'UV�'�
xr�������=�� +�qLʖ�O�z$"�J��v(CH�<x��~<Ճs�*!I'�4�B�N|�ME�E�aLE�4T������M����CߘV��tJ�2�0I�j� �w��?�����y�<ȴ��=��1I H�m�c�
v ���JK�r�WI�`��\B�V[�h?L�4E�ک���I�6m��[�\���F�\H��=��<�R��{l���rH���<���c��X=i�A��>IW� +�PJ�P����pL>��L�:���_H��IWi͊� +����5����U���� +{��2����-�n�t���
IHR2�{�r��,�҉�B�܀����1`�u�s��% �L^I�JwM.���/?O¦�x6y��p8����"SgQ����w�����%�a���T���B��6�P!���J�.�Ԙs�F�b�<�w��9٦��d�dJ-7������e7���I݃$$��9 I����*���1&� +I�;џOЧ�Vk��T�̬�+����r���wK��X4O�S�nNF��R�g�?���{��7GE�"{����j]x�"?s��Q3n:�JԐ
�ܥ�+5Vy��ē)�B��g�4���mHB�����Ti�U��+p�*���'��5y{�*�QV-=�AJG��5�gC���kqK��yZ�>J����'�\�����:b҅���E&��V����R]�z94�x
��I�(��3<�)1 ���<�������j��]�V^{-�M��B�$$q���\��j� ��P�C07-�e�m� ɟ�./- O=��z��ݦ6���
ZP<�G�`���u{��L�oIh���p,�5h�M7!�6�fD�@�P�`�sNJ�as�(����3�F�ʔ���dˈ'7���+�}��mHB�� �!%$�B����Ϋ�;��E���4��CVt���*�6<�`؉;@-,?ͫڿ��ü�E�����e�6�f�^"���N�R=�^;8���9��i��y\;�w�bWjO��`��3s��ۙ�+䑇;+o�Q�'U:0R��2[[M<����m�B���;��%�H���ݳ�� �lߑ*�� �5m܉F��Fm����[5��KmI�Ǻ�&w҅�HtO�IA�l�f�3��/��wS�<�؋g;�P��� �����z��?^�Rr�ߣ�z��u�]c���6j�MO�3?��Oj˵�HZcO2�͂'s��O�����Y_��UF�$!�TI R�R� �&aJ��
�Я�U7��5��y'��L��}���Y}�zHTR�N���{��~�%o���Ӌ��B�Q�(��7��BŕJ̭)I�Q�x�Xg�W�����K�4R����|�)�Ժ�-<�������O�d��'Sv���1�C-�IS�#!ل�KRF��`+=ތ��2�U �q�� +4�O�ҋ���c���H��J���{2��c��r���2���l'5)Ry<8��ϡ"�dAqx�-,�On!�L����P�P`�� ɦ��TO\RF�r�!��~� +YO!EJ�h�_?����X��|}���$I�^u��� Ra�Q3n�U�ܶ�,xR�Ӂ'�^O<�j����b
u�� +�$ ��IhR�k��F�H��ڰ� �
�$�eA7j�*��ؕyǪ���& �@�5�:&R��c���i<�f�W�]�wM�g�O�A�?�Et�l���y�]?&#%i0��t�#��ix��{ך�s�E�
73�Α�vSFVqy��z�Cf~5�d�.nC=��+���FBB"$�I)T9��q�S�*�X��B��`#��_ɪ-/ +�9"ɵHɿ�*T#6�m��vv'��
�xy�p���J�5 ���sXh��yҊ&]������kK2�e&c�u�]�$_\aB`�ull%lh�(��6�a3�B3����� <ɽy�'��Y1.~�[��yO���8!�BJN�-Ԩ���--R�>kڸ�9�G�(����j�2��fV-��9��iL7j��.��ޓو[�[E �'��-����D
�e���P�v|�&�o�o8���������>�3}�=�y/�<�2��!/��#ړg���me��_ +��./g��MA~5xR�/��Ynn��e@�=�c$�5!?iH�fU���φ8Ucl���3���]\�<�TfVj�%K�*��o��ـ��[�'G�^ +��B~r���i����~�?5����c�2��� ���$H�CDaAř�$""WW$uwj����fvv���ڭڣf�v������-�P r�p�r�k�췻!�N�Bw߫O��P �����<�}�-O����[�|�'����O����#�e#��g��`RJ�13�C_^�����S�l�F�I?�}I�8��n��f`N�$��|�@ �e�,�y�d�M���U�n$9K�1|N=��@~{ 太7�$��Ż�I_��2���FB���"��l3���~n@♨�z��2|R��ا:���D�x|r])�O�03�[��<+$x�a0��.��uN�3���zގ�Z��k��`��QS���}���m�>�@,��5:,��kQ0�P~"��@��#!���^)�����\3�g����%�N��0O���|�?����Z�}�1I� +D�PÁ2�$��B�G��F��ťs>�7g�O�`����伍r_����`�bc� RJX䨙�m^��CWۘ�Z��=��u��[�͂��\� mR�J�ݦֶ�̗��́{�CG��>�0�����������P� K��q�Q���>�UD��.Ґs�t��Ӣ�SV�����6 &�a�!0�Z�t�Є~wQ>��$��b��U��I��`�����5�`SJ`�qm��N��(`ف��X���{�VF�)���y��}U|R�W���T�"�<����������b?<��ɾRꑙ�-�O,��_2"�Ƽ��Z�Y�k�>��sa��8���� o +��r+9g[�9m��j����6F�O&����@�F�Z�����{->��9�_b�u�R� +'�T�Y��X�Sp��mx�5t�1�۪�O�����d%��N?��`�j�b�9n�yƎ���Dw�Oe$o>9lB��ރ��T1��S�G��%įN�L��&�6�'�$;�ۘ�X�M��Y��L+`����"|2;[2�}r�3�y��e� -/1���1JY+v����"X꫟vC0d�-����1���K�$0�(���\�.�U��i��i�ڗtĒ�eB�ߎ(���i�&��©�Y)��U��j�L�6�E�+E�p%�L
\!@}�co1q�쳢��V���L�ѥ�ϸ���������y��-e>��L�a���9;�\�� :f��Y�JYC=i�[I�qK=�&\CkZn%a�|��J�u>~W-�m��(���S��JT�Ӽغd�Ä���Dl���.��탄���<' �ί��������"�.����2r�A���� �Q�uj2&j�B�W���b��̌��}2�d�.p!v���GZb0��#~�6��z�`����^�[�<3�����-;i��P0�G�ne䝒�_D��*���(�ֻ�)2��Rh-܆Of��۳ådWዄ�7<r����7x9Kr����P�����T����Y'�~�a\��ުPY\zllfLt����'v"<�<�L얚�v��@���"Wʑ +�7���u��U�٨9V/�}y�r�
5H�Մ�.�;>:R�n|Br���KbƊ%3˔�[�_D��r*#��B�}�ĩ�R���_!������/ +]bf���i"��p~}��SL<�'��(%Dp���)��"���<��a��ec���2S���`0[F�J9c%wB-^r˥V�Y;����n�MZ�L��\:\{Z�wL�II=����-3��-����D7k�����r!�nB��KC�@^�8}�I +�|;�d�!�I쓻b0�[�K�家т���>�Uʑj�����ۀ͚�K��hw+V�N�-�=��ƨ_����S�g���M�
�23��L�e��0���/!�ѫx�$#��}���k�.��b+9�@B��RJ.�O-��c���v�����{e�����ߛ��I����3㓐����-���>�UJ`�J +�Z\�z�服`/~�κ�MT�Q�����)=p� ����Ho�J b�!�Orw?tT�ŇC���"b3��L��-��E!r�[�F������CWI_g��4��d`}�]����yyj�I�I +t�C�9O�皇WI����=�f~��"�X�u����>:63;;��n�3>�Њ�<�"��*%,�Z��-��.;гv��`�Vr����ʈ__:\���?��HO9���S�[sK������f^�p)�UDx�ɡ +ꑙ&�5Ԩ����]�U�.������D�*��K����&��NW�l3���|����M�7呜O����T�T�O�-Fx�?֢�hGbm�f;�M)a%�5̮$��y-�5{�.@&A)W8ü�ܝ�j=P��+�?��vu��܉���pH�ʷ��)Sd����t �Կ���E{�RV �\ܧ�w(xXE�X5 ~��O�B�H�����O��鑚�/����دۧ��;��Й��1��s��ZiW�*AY+,��i�)���jʃ" +���<� +v��e�����G��T� +�������^txZ�`vIr��@���1�P^������A���]t3sn������Z�9z��O*O>q�*���e��ɍO������B�,0L�f��Z��mq��'��SV��u��ǖ�֡�&R��j=� ��=�aٳәqG��}'O>w�`�&m�I6�d��`n���ā�����R���i����d!`K�����aS^�x��{�x/c瀵���_]=����ٲ����ŨpqÙ�_p��N���:XG��`��z��·�u�I�wEr?0O��ad�m�jV2���D +s_I��ǘ'�JO��⾑��[��q#�%�O�#V���\/��H�R�D�a�)d���f��hjoeN[�C��By9zR�M)�`�w�>/�%�I ����L�w��zÖ�⪟<�d�|�E�vPB�Kr���Y}���S����ز��Hy�L���Qy�$N�'UR.� �q�Q��3�����'!�a�)#��(�KmXX?%ӡ#xZ�6�6¦��̓�5�#�:���+|I ��}��r9��
^B�^�*Ua�{��.:�ȿ{�WW�\__�����SEǫ6a����ׅ'�����3v�}`� �t�4�'%\<cē*�<��:R�����f��_\.DO�)����n)��i��`t�\t��$��KfK��� +�����Gs����e���_5N[��l�*��Qdw홸�H��'5`�3R�}*��Ӷ���'�l�/�{<Y]]���eS0���̓xB�`0<I 7��Ӵov�'��+�g��ɋ.�+��$�y�e| ��Q�G�m���.1����"�5�"�%KJ�r�Y��#��MmR�����'e�*&���x���v��,��f#@� Y�>9��p_�x;�i�eeH�uJ�n�i]t��EJ������Яxő&4'E� ��{Bv�hZW��y��ڌ���WM����.oz����il2��r�w#>��;YpQu�Ϫ+�>�&ܿ�ۗM[�1���g�t,1湐���T�jג"e�l�a����`F-��xJ�I�$��-�d2�'���1O�uH�d�(0LNe���E�n��r��ow"j��S�<��$e:K �? �(1hN��p�x����I��2i�)̥�]��o��U+M�doa�����1�6�>)a?��R�%��]�E�8)��TI�=�XV�d�)�%EJ���VXp +)���A�dH �L��XZw�y��øE��KЛL��'��jj������E�/���&)��6��*���s�ę�|��,$CJ�`��v1R�k��݄������'%�$zR���K=��'1L2�)��+�����wO"J��SV�s��$��'���I��O�҆I6��5�Gd 2c�nx��'u�dV/8�<��4��_&��5R�Z�CDOr�J�8k�cY)t��Fl�E���A��� h�T9m�r��^9��MO��6MM���{��O +�'?��K6H����2$li��0�g�m�N:��Bk"%&� +�X���8rK���fãÒ��2-w�sh9�Ȓ��U<����Y�����S(}����`0�KvH Y�P|GqL�M&�I���X����7
o$e��a�YH]Z�k'diR���wUO�'u��Z��x��}�c0=f��VĂ��7��̃I�rP���Z)#��EQI��&�� ��x2��!;��w��e�6O&Y}[�A��1��v��k����|�A��y��d��[ �ᕘ"��C�%�H���LTR�]dHi~)��g�ܖ�F�8�W����H���j/r1ϰ�3��w�9gC�>�6�!KR��<�<�^B�>a��BI���k >�Ʀ%���W*aK���k����ջ�)�h7'��k��'�G
��x>�2��{f*�v +�oH�\6_?� +AEdR�����
+�-QO����^��g*J= �\���g�y�h�T�� +ո�ͩ.�;'s���R��r��O^��)���s��2�t"�C��w���U�uŲ�^�c�N譛�g^� +�%�Rq�Y(%m��~ ap�i�nk��_)%�I�I��_)�9N2?�'K�l[��*|2�%�i��/�y���tTw) +Ly +�K@)�IcU�R#O|��\����);�i��(�d=�pm�\?��5Sy[ +��۩D�֢vV)��r��m����jhg�%�d�K��J*��ھ��{� � +�%
o�pV ������Rn��Ǚ3T6(�j��a?!%��Q���O�\��m������� +��X�\�H)i���N�/��wp'����*>�'�0+�O�6d݂�5sP� + +(�R���IQ�!y�|r��3�I��I~3��Odo� +�Z�֛ +���l��Æ�H�F�O=�Ac��7RN��k�% +����g/o��:�l�!
�Wv�)�R&/���<��d ��ux}UE�9D�a�Jg��n�h?�t,�h�2��$�����?�* +hT�`HN�9�0/,��9ck��a��َ��qv�Ѕ����E�qH�#��u�ۀ�,X;�: R>R�嬢p��?�|,��cד0��2���T��
?���/��:
���IF�{rg�k�a�zX�,����E����^-)Ja"��Ŝ�H�F��}�)�:���^�W���{�)������zZ\��i��|w�mL +i���f��ɍI�p��q�!,���iT*X6�},�I�[G"�c�5��9���G��6@�BO�vV �E�#��)qe��ȿb;��$�[�����<?�L��*,]����8�s;���}�P��YL-�-RV��_Q�Tw�@J�V��λ���b�Y�L,y���_/u{� +U-!*a^x����I�cn��e�&7'y~���
Xr��DXF%���ME}�FZ�2}Z�)�9!R�e��i���4QADʇ��8��k�飕����P +�vː�����d���l{��g`��ed{{/pK;�W��+�X�$@�4*.�?_t��j������D��)�Lx�9����!�o�l��S5���(F��ZB�.�b��ΰ�q�ʍ
#!���)��'�%��� ������{�Q��YW��|#��?��YO�}��E��t�Sg'M�қeS��R����Ȧ�H +.mk�iw��|XZ��L�*{(`|��R-���]�}�bJFV�Hy�1���e�;�R��R�4�S� h��y��,q`;���8CF�"#�{� :x��s�r%(�,#�"��
Ci��4�-��k��uV���f}9,��F%�uE��Ġ���D +��p~�gK�仳ls������3�cG��ׂ+ݞ�� כ)X,`Y��Z��t�d�<!�PR�D��>/�p�'�g�"�]��8WvJ:�HJ;�5)��z�֧b3��C����"Ͽb[S��� +ӭ����?��������2��g�+X���iT\$$l��R_0�(�LʠR�u_N�t����)�H�ȓw8Q��w0u�L Ӿ�Eu=x�43�ȋ8�D�q���� #� +J�E�F�Y�����xG��ð��Zڼ�p�6���/�/�g�}�C(Y�0�vf��8��'I��L��p�<�B�*Z��QYK���×��{�A���"�HI�L��eO���w8?��^:��'�Ӿ|EuP����G;�'�Iq��;�6'���Qd�v��T�ɝ9~d��mֿ�,���,&.I#:��Y�vRRi�J�Q�@1)�1�ɹY�I��J�GQ�}S�C6��`ȋ8//�� +�� �� X>egQQ�Le�NV�H���� Po$�dz��H��a���#��f�<IQ}22w��FE)$��3�:ʍ�!��1cc����K�I&ʖAy�'q��^�}
|����Nj�+��뾜^�Y3�����g�O4�N�u�J��DQTO��z�;�G�z�_*^X`{s������d���א�TY��vXj��5%@�`9,��;[2��C����e|;o]L)o�709_V�M �3�{V�jѐ�����r�rc�%FvL���7�vh
U�vX.�ʒ�%Z�]m~�w�����Yg����2IK�5����H�DJo�<\g��Q��(J{>#�Yd�EB�-�� ߛCC*�ƈ��i/ �,S;��3Ku�iQ�Fq����o(u/� ���'%���h���ۛ��(�)F�+�e��ȿb;39���tl`��ܚ�o*�KE�RX����v�~KR +F|��O�o�6r����iw����Ȑh��sv{���ɓN-߳e9,�1
Kp�5�������$L�h�@��֤l�
?ehZ��)��_�$����Z�'���������ъ�����3T��`�0醴*,�<�q�
���a�`���e?R�[桵����)߮뱿�g_v��v��;W_�ׯ�t�G���˿�������ÀGB߃���5S�,n���������,1r����Y����=7�)��RXT㲑қ��ݞ���u���n��� %=S2��&|��
���%R���ݚ�O����.?�]�HZ�^(��W��t��8���c�_\��u�]|ď�|t���0�lh�Xn�a���23�D'u�٪���a���,#U�*���ir�mR���4�ݒ-xO����R�#����}����g�����<����?���|t��>6��툢�,���1rj���]d�Q�����n�pW?��R ��g=�r`0E�$+��H�Ğ��0og��
�N���ߵ��A�C��F����ؙc}4�sȏ�;�{l�[��D]�� +7�D�H�;�~��аL�f +�S�f ��6����D�~^#eA� +�}!ORԤ�{��6X��r�KH�~P.��A^ +�㨨%Dx���`��U�@��4�n��r����Eʙ����rh� +�s�r�
K�U+�m��)�7{b�iƬw"���X��,���w��rI 3 ak�')jB=��D�;�`�)���T��(?����e�t��@��T�+�H����he�/
斗5��~,(Y�ΡoO�rk��W8:�<�}g�7�GQ�_ކ�u��C�4��,A�t��I0�RH)��úlgŅ�\D�W�X�����AI��IQ�L��%�A���8�>�2���I�Xb�e�� +�������<�&)j�����#�H9�`za�>�(jrٰ,*Q�jL6����t�4��.�~��X�DʷY�ѓf�(�*R�J6�� +x�o�M��ɤT!��կ� ? K3���(��/1t�9=���2a�rU6,�a��8�kX6:��;8�bH)o��#e7�����Ii� +�W#R������\_>�_?� "t�94���_��s��]��0�R4R�"B�n��qD�%�H=NJ��%;�dʩ�|�@�yU����М��G�r~���#R���23�D_G��\�*ᠨD9"j �3�i�>��i�b8�
��qR�Ͳ&��kaҡ���8m3�����ug=����r�`�v�u�&�r_}X�<��o8
�pΠ�HY[�-�SE�]��[�5��� +���R�v! 6&��uW,3t�9��Fw*ʃ�{��ٰ�u� +�s.�}��93��e(�;�=a��Ç.4�s���@_5��
`��`V +Y�\e�0��I�:��T�'%�yb�H��͌���Hٽ���T���ۄ�<�BHD��{��(jJ�TPR�2�ϓe�F7TKp8�I9��?ɌO����3L�L9Г�9���z�i#�8ο�vwI�xΜː�V�6j�+5UWiz��jWEj�6Uwە�Y !!`��\�������CU�O�"�c�}�Z. !�m�`n�1$�ߙ��, i�g`~�W����3g,�j.�,Xh�#�&��H������E^��,��e����D8��٤�>���f�u�g����y5sR�宺�_���y(iM���F2�ln��L^U�K��a�+�;���*[�.�2cڙ�%�j>T�y�YI ��SK������cJg��)e�xJ���_7HJ+s�Z��G�~��5�8c�L�2a�~ɁeRZ��X�a P��Җ�Մ��_"��!��1���a�RD�g�T�.�c �5���!`����f����#Mt��'$>�0��r`9-E* �9 M;�6Н�H�'�)�ZL +�MȺ������6����v1z�DR>Փ�.1|(a�K�v��X.�(Xf����j���"C>1�L@d"�'�F�փ(��W+�� +�J|��=jR� ?���~�c�����U>�H��[09�D�ڄ�°��fX·8�2ӫ蒋1�vJw[I{�-�NK�np��6D`6KNs�Kv�9g��{,�����Ťu� +�N8W5�@�/3�2�W�P�-�;E��/��j�R�F�-��,RF����Ń/Zm�ҙ�����_�l�ox�`c���G�vȹ!�#M4�.���c�g���)�p31R��'c&�SA��_ ��Z���>���&�)�O�����ü<<�^�HJǓ�/3�+�a^�< +����Mn������-�M��H�x� .��b��[�k`��&]O�z5^B������뿓1̳��<H�!{;���Ҿ��R�����TP +���^��j����R�V�͉ao���6���pj#MN�b��(���ޟ
���,s�T;T\�K=(��'�HJ��!!8���J�������ng��Do�������i�� r�ǘ�_u����*��� >��r;U:;���P���g�^�\�K��ô'��V>ܨ~{��{-L�u�0l��m �����JD��r�!p��Ow +��{DJУ�j1 + 娟�����C��_�+�gO�'��Z%�;0$l� +΅�s��#%a-Ʋ�������J�d�e����J��Y>�UJ�YIɁ�Ii�V���a�ӽK0��;o�U���0�m)U��c6 +��D�|S�P�S"2�]�%�OK�z۔&%\�w�G�&�a�3-��e��+ɠοI�!�{B_}V��'�$4TK�����dza�HงI9���^�[�bD5�SðX���y�T&e6r���`b6�3` +qX +�*�F0`9��ÁJr��qI � +`�鰼!�o����@U����-@ʁ�L��F��V{�[��De%������:�B�gO<><9P>=�a���� +�+�ԗ�֒�o�x�����ػ��*��b��� R��*�Ű�J� +b��F��oU�pv�h���R��J_ß��<�Ǖ���m�N����yjȸ�+M�5*���+�rgC��<� +�+�e���]���iEO��yXf��A��0��K�o����0,}j�ݳnҐ2�9ُ �ace��(Ս�bt�#��h�)�E���Z�|�t�Q-_��zh������|����w��۰��z�s��r��I��j�������Z�|�]Gc��W�(;�G�q(>f��13ƄdΓp��a5I�J$*��/�&ia'��m�I �����a����XG��K�1���h^�b,]��~�ּ��Yx�����8���(����6T.������f��\��m:�X�-�=�FPbZ4>�ѓ��I(���{�n�d����aبIb0���$-���Ű���z�a 4��ԍN�c�̈ۦ�S˗��Kõ? }��Ю�������sQ1��4z�4�]�rO%�p���Z�ĸ�l�Pb��И)7�'���$Vkf=94tb=x�-�/#n����ȟ#���YaN����M��J��4�n#݊�q�\�K���j�� ���7C{����9��'���n�6�����\:K�w���e'�cυ�u1&)�#z��=i�/��ZN)����t?|0�Lin�w�� )��Z^u ��8`ؔ*�FG�8
(�]ֈ�q�u%ڌgi�Z��x�1\�jx��C{�|7�I��D�b�^ϹC��#��J�I���J�|���蘄F����A�\�/%�����L`����cR�IE�Z�8P>;��M�a��.;�n�I g��"&1,mb:4:�.�11����h�L�F�(9���j�u���W�.�Zط*pd}���;]���9_�t|�\<�\:`�9�������]��&��a46���q��=�Ԟ�V{�ɡ���":����HJ��Ib0�\��&��p.e���}��ıs�H4R7�4�m��k�����_���|���_|�9w��~\��Y�.У�բ�l�p�$�i�F���a�����S�����\�%�2m�g;w�ת��k����������8wkQ� +> +���8)W�`��㥨�b@#�QC�&ƴ���i�1b7�:l��\���T�|W)y#|����峿���^����k.��V��u���8�(4�G���nã\D4hh��{U4�ъ#��Q��4�'�ILF= �H��+ם���@Q�Rql���g�V�����!���?^���.DG�y��Bf�y"�U4�Jq&r���p����wC��k�����{���K��^㟦>�!�q��8ч�-nwk�Q?ߑ�F���FLK�����I<$,���/��rV|��Ơ(j�86�gA���'!ٮ�0�W%����ܞ����h��Kŕ��xr�|f�\�A�����O��������*�s]�o +#�*�T4�{U1��^\���F@E�j�ݨ?x�U�<��6|�Ѩ�'g�Џ8+��=J���u�l��Y��+�I��P����]*
��Y4B�a]�l F�bُC��
U�/��}��G����9��RK��}Y���ې���1��bt�rЈ�9��]M�P�D�����T�1�����Ӫ>r�z�iE-�@��R���t�:%Ȑ��S}�l��2GňhdЍU=�ǔ���e[B��,t����5{u��o�}w���.J=WŁ&a������DbD+���@c܍�oI��b�'�Y������I +Orx����_Gȓ��R�,�� %��.4�>"�Jc,mZ��� +E��w�~=|ts�|�|f�|~7��>���ګ��ˢ��[lF��F0У��q�0���w�8�7O���j�E�L<���^*)a2���F���u�Ⰺ_���u�a��(�Ƹ3�-*��r1?%b7L��b�2�&��;ʑ� \��P��r���տ�~��X�k)��/��z��0�$�F��c��!D�D���^6�w���9t$(R�yRK��`�I6Or�}�"OR��+T`������E�`z�Ъ�@�X�\7��XG#���#���u�Eqf(%o O�$|�Q1^��������K��s��Fi���[끐��W�ց���ح~xA4�)"O��03Ƀ�<X<�^�8,�>bU�=�R��86�gy>Lj�暧��_���dR���ܘ�n�ۀhte�On}�s��������O�Y�[��_{��uI�)���� +^���i�Fr��Lj���.��ub�0� +2�F�C1=�t�G����H��ȓ�'�SSg�
�33��G�L0>v��9�R�Z)����9H̳̚�z��h���P��hԔX�����S�[`/gS��k���4�N�:�S��1�����T,uTKݗEO����������D̍{���~�0�!�vƚgE������'�!33�|��3��
��}R��|��?]S��
f�@���>)2���H�Bn��.�Y%"V���"yЍ��X����.}3\�%\�5T�#x��+{���
���B�:��p�0��%��n��8���=�XO�@ą�Hh�^�ȓX�bR}qxVa��S�-9V���DZ���gä�����:�.U��tA�t�1b7#�a��ܤݬ+t�P�{r�.���5{u���-eRG�����'�y��ch�cg\��R��8E%C��'-�+&�Lr{�1�S�b�$E��8����oS�����\��>N)B�BU~��P��J�4�h[WuhҤ���p��~�i����RPB;��q�qb�qǹl�v�9���>vH������y��$& ����<G_t���|=��ڭ�fO�ֆ�-T��K2$�qI�r`�t��Kṇ���Y�ڜ8�t����u/�N�=����{��G.VG�����{>y�������?������z��~>m�e��)+qe����~j�$����RZ���FJѤ�SkL��=x���@�)v��*����b���hbbLC���I@�W��+6��"~�ر��N�6�;�\ +\�8ꁋ��3!OS�k���?��'�険��Q +��D�!���H _E�*��߮h$l�4.��4/Y��*ɥ�p�EK�X�Q���X�%Q�L�Ȏ�'/�~����7���"m���(. +�V�� +�^~���q|�z�h�=Ԋ�tT|�b�zR�'�7RJk�}>z&[`߾]�ѽZ�9�a�E�x���S�*)�&|/�?S�Qi�]�=µI�4�5����O$��E@c�f��g����`{���G��=���7f�Jf.VF�a�i��%��@�B�͔�O�(�1�f�]�7NŮ�ňnİ5��=�0)�}OJ��l�3�� ��MI�a��f��+1){rf��{yn�V����B���1/���<��X��ġ�>��ױ㿛=���ٿP1�X"G#]�B}
���1��<����V�L���dP\�Y�M�VM����̓k��)�h�ߪ6�ʓ���a�#p��n�2L +oi�ГL��&c��hbP\�b�f�»ӈ�����?��b|e�����oϴTDZF����a��P�0h���'��ꑹ$I�ؓ)���bİ�M���_s۶mR�xR"��0�Up0PY�Չ&C�©R���~��w���h\J�Jfa�&YV�,ͣ�14�%�'E��r�X�9qx[�英�����{gl��H�u:�{6���4�|m���N��>*F��>�h��h����Y��a*J�������IكIv�G������R�i�a�C�(7oieR����=~̭�F3��2i�cIn���TI��F��Y��ӉڭT�GvĎ�v��kцw��e��ÑΏC�&a�N�; +=��j�&Z�y� 7*ѓ��.V��ޣ�f��3.�W$�����dɏR~�,�"*���&=?�B�����D?���o��g�ދtԅ]gB��?�σY��E��[��ҟ���dJ�K�hD7b�Jj����F�2L.)�~�bL6e��=pl �Ё'C{T�&Y��n����(Z6�5?Mz.~����wΞ�=���1:��=�B�s��K�����
Ђ��!�(.�\Tbf(F�,zR���$��� I�)ѓ���h�'�1\�����$y�z��Tݎ�'���j��_���"�j"��p���t��!� ~;U(qb�����2�@/�Q��h%Q��=�T������IY�I�=3����F��"�a�>`$�Rf*ɛU�[�F��;sf]�z봽n��*x[�c=�d8��}�0�����'�=��]��Q�a�:S�'� +��!%�Ub�#�$F�OI���P�0����E)yٚ���0O +w��Հ���Ǖ��/}��e_t���8C��7�#�F��V���j��휜�@���O�$�`$ݪ6�Г����EC����^�ݩ5�-Src�<y�U��x���0�iw]�b���!��P�p�F]�O
ð��Ǔz�F[P o�Y�I8^f�4���I�$���R�%C^����h2�L�h��\i#sr��2kaG"�d����Fo�y�5�e��_�v|5�9��[����a��ē�{���KَIIj�I�_$�f�z%zÔΔn�b�Ye�!�J���H��(I6e���&3�~��j]�`.�w4�썃�ơΦ�.뤻���,�i7l��~.\�{����0��O�ZmA����L�-Rf���2��)��,�L�"t��D(EҒL�5R$�-w-[`$����~�ڜ����<do�lr��������Q�m��v�k���kj��2�lJo�4�g
�a�;5x��T~>�RZ7�dSI4`x]����}��Hi�#oV��)#�1I�I�1^mX�X[vRF>��C��8���vX��p�3��A�m���eO;��j�vx�%����0l}�Oj +�u�I�� ��>��h�ߪ6�'1��%��r�b�Q��uw����k��V(��"͑���L�p��ɦ�
09�n�t��:),G:��ݶq��ɾ�+^;�R���Cðuٺ����Q~~���<�p$��[z�)=v1l��bgXe��⾮���7�^4q�r.U�ai5��c0��cq+�����`�� +�uڂ=-���n���q����p��eO�l�{L��a�غ�$�+(��&����<)��cN�a�'�p���5H����f�p)�A"[2�b�dc�Tj+ �K̋�V�X���/�ߦ�3��o�ʼn��ؾβP4 +]�`/ݺn����nSѴvl�TUh�����N���N]h�R����-����ߝWB� MjqL���~�{ι�c��&��&�y��ս'`��=���1�J�������L��� +�J�r0���~~*��r:�!8MݒB�����I��T*��|R�IT}��,��oa +ec�1a{�m"�n�A#�Y�SݿPM��#��M��|�,\��x@�^[���9�@�'V)�%���@��9��&c���ݒB�P>���I�Z�|_��
�1j�[H�!F�^�P6��.��u֬��l��RKֵ��>12�m�{Nt�u���ϱ%�q����r#ݝ�=�T�'�����%�X�-�A�p��|�{�����>"nyIꪢP(��IQ&u:��K`����5�ׄ����y�)�g�o�X#�!�,��n4�O�3F�J�a���F1�*|�L`lq7v
��!G�o��lN/�[�Xƈ[�v�#�c}�-) +eYJ�'��P�2)�v�~������MM��s�c�5s�� +%쓂Ї��5c���*%�R��� �F���F3��I"�Lj��C悈@2��%����%��zZS�-Y�$�����+��㕜a�z�[E�ǔ�6v���'"ީ���-C���BY{J�'5*�P�2I�Y�Ϛ��[j�Rw7��. +�_33�̭f"�&�l�_�H&�M��wBh�J�o�{�^+��HO�Pؕ�>�N�\��Q�薶��c��u��}�?P��P6�'Eut�Q��*U�BY�P�(��"l�ă�|R�1�n41�')���w����ob���C��*� +��)8�[\�ب���+&|l��
�����������M�!�hO'qK�]jH�*�P(����I�:g�:�F������F�T�����j�~mpH�R%z掯��}h����/��̚쓒�;���d�u��|�R;k�g�z��+ei��kw����L�,�p/sd2�p�c�n6�k��l���x��=���J��-��L����c��c��3�M�P@���t2$yR(�{d��=���!5*�B^UUQY�����R�R1�m������ٽ���~��G^<��{�̟|mg��Y�,^�Af�f��Q5*y�S(_��F�E��t���n�%�(&� +����r
��ADP�oK�8I�(φ��Re�d��Э�̤y�R +�����(���:�F�4���BU]
���ƀF*����ޯ���?x�g��ק�������;p�}��� +�8�ǃ@B��=d��9��a�®���3�6��&���w֬�>Iٸd�5K�s�̭f����u�M����m�!X4�>����!�pp�rl��"�&C6l�|�!���:>?�[�tKNu�O��T�6��:�랈x�� +�R���-�iK�la�X�"A]��+Mx�5�"�!�Hw�x�g"❌�/���U)����QԪspż=�:n���IP�o<����~�٧~��C?=q�D�[�>���I�m(��� b�!S[�ω�� +�$�$.V�H+�j��sݴ�$!�^ ,4����c�O��$>���Ӻ)Hۍ�$mzb�+���ϙu�v�$c;�G��q��{�k_w9��{���*�ֹ�s���m6.��e۲�F6{1�N&C��xLjƬ���1R��+�Dp G�D� _��fS���0���%A,�O�ᓐɎ';N�8u���cǎ=z�ȑc�>��j~�������~���z�g���u�/�������5H��H�bih +�,��d"0���0&y�9�`�-�����Ǽ�!��&�Rp{G�Y���N�ԯ��3�|䓟z��)������|�{����?z���o]u�����:�O�ކ.���!샓q1��-����Fu�o|:q>�o��l���3��t �7\��Ds�$���%��+]UX%�*̾���z�s'�8�N�F�W��R=����np��\Z�J +�����Ps�mA��?�!��3�Ҙ~3C�!����۵$�$��ŸG�'���v�r������{��_k��������� (%&{�v9� �H����0�r�?aL1Ƭ��Q"��6�5Om�E�8��!�E��n�?�0��H&�wK��赑F�w�����?��{��F��P���?�G�"��'�3���thq4R��H@�%�<� ���%�mZ�p����<�aUP����QV��ַ}1���'�f������sL���q\Q���q0���sܻ���
���44R�\���ر�4��Y�����u8d�쳩��Р��\�aF��wS��l*�]#�$�ggq4<��?�7 +uw��cݽ�\wқ�x���Z|J�^�:�/���A�0I8� +#a����`)9��b& ޡ��˩�6\���E�^.9"CI, ���b�}1�Nˑ�xpͱ��<��Z7��xd�a�b�p��[�fJ�x�+�U6?�*������'�ۑk$#���H�0����X��O�0��1�|&<���3���un97<�0.gu��-� Ru�ܒ8�5 +[n4���&i�t,�A��y�>T���I[�i�wQ�^?�6@�W����[�ɤ�"U���8�_jhC�oE�$��.�ؓ�=�Ǿʇ��A�ͦBŨW�Ba��RP�Չ�zxp>Z�<��Ơ����"�ki�2Y�KQ��"�|Jٶ|�9\2|��Uτ��W��ᒱ�<��2i��߹`oh>��FR=�Q�īy��9
Y�W� +��pp*��`z<&�9�L��j�-}�d +�P���-������1/�r!Z�o��|�t1!��Ēhr��,gut2Z:��ޭNד���?�Վ�N�A�fV� +ф�1�E�c�x�+p�k��w�t�ݥ�i$��Uo����>Xe�[�����h�<B� +M
��Z�x2��%��d�?3<�]���vK��� ��r>��ak3�X�rf��%ê���G?$��%�r�!�����!/J�V���E����N���\6c+PQ�Hչ�?�H^�@�-y�L%`2�/�i "��Z���D�WJfS�����\�r� 9��6ܑ�3Í��`!����0(��qت2��nR�C�Rc�%?�ﻥ����������n�ʹ�f���ض��T�^g3�i~��#�l��"��RJ����n�S�[�z'��Tpa$�,�c��ۈ�b�.�W��u�x�R��i���5�!~��5/����M��-�� +����(,⠨8
�d�k�����{W�p^U�����k�}���e�i�H�6���H���,�G�:��g�"Ck�g�[�9��n9<�\Ӆ^B,M�$�$��Y}�Э�&l'������DmP��-����XgR�6ǰǪ�0IC#���_�k?rv��w؋;ZG�m��FR�s1��USG]�XΦ���P1��.gu����%�����JCs���h���! +��s�' �wa/�f���8 +��?�|���"tAB������eQF�#��m��<����hD�ٴ�Mm,�ʆ<0��K���kK�x�KJͲ)���\cY���K& +k��m�W_w�a����IBacU�#�l���A�����h(*Z!�ۇ>�4�^�D�8��o��MӋ������8���A #1��a�b�/�3�.�,��rj}>Q6�Y6����qx�
�f��ga�n��`˽2�%w�`���лc}q�<�#�I��[[HښT��q�hN�%��y��-'(v���������s0��)�EX��VP<��o��9�H"�3����`.'�yoS)-�lkT�5+Q��L�;�(�Oڲ�F�X6�j&�X�k,k`K���� IX�������3��Q����'��d���,_���H�����M:ܽ�=���y��|��������M�����÷'˪��hH� +"Щ$K��y�ǒ�P=ԖeS�լ��{��j{��R2��L|}q������R�O��~V� +��X�F6UMNJ�$I�ӭ-�Yθo�=^?����=$^zO�n�H��AO',������yr{�Ԑw�#2��l����E3R2dw���'Y�C��6����Jc��L��VN���L�D[ޠ�bQI.k�L�c$I��qS���n��0B���_����ѓ�K�K��(�Ey�@����v�sL�xf�$���uH�/��k�)�zw|� +�/`����n�3vY��Z�T�u+jgwy�a����6��WS����bF��fHJ� +S�%̻Յd͊3���*�eϖeS��c����lj'��-U�]Vc��Escq���pZx<�<�%]9y1CM�'��$e�z���0O���O�m�m��à��?�L�#����cw����π*!��Z2��.�*a�UұFV�f,y�W�\��n����Vbcin{Eظ��+[PW;�%�����{��ʥ*�2��t��M�49���1b��B��$��v��Ꭾ+5d��!"0�EX��h�(�k�f���C���rZ�D8�#�K��`F&t���%�6�E}�6d:�R�2;�UƴR�}[���U��닳�em'�/��{)�+SI6�aWgI�h�R
�f����qy��7���'�-���]_����$;a�ݴ� �;� +���H1�WI��+��=���7����+"��dG���o�������O���8(��$y�4�`0c��?Y�^�&j�dђFge�T6��jV܅���e��2�l �N�fbkɭ���`��P�%k�g���]�>/��qW��I��ض�h<e/�=^o�8���j:On��ۇ>�6�)��t ��MRR�^'�#�$u�`����`>�l���Gpf1)h2����|r3�*2�#��C�(����[��N^�-�`˽�-���p@���9�b�$�L)KZ^B��s�Wz着�Քؕ�S
���EX����M����<�{�𭳷���xc0���� ��+0"�ꌭSIں�����s��g��t��Њ �Ll,�5�����liA����$��o��Z&��<�Z�IY�x�����I��V@tI�=��A���|���|�"����8�T� !#1�D +&\�e���b�׀��&`ͿX�_Ƙ�o#�b\�C�ގJN'T��
8Rҹj��q����0R����n�E\��.�$���۳�Z���V.�x���%��ג��ߠ+ڶ젫��To.��[~�T���gI+��|k��Kp�BL^(wѮ:�A��%�TϏ{��z��M.L�´Ur4�d���f`B)��1pH�
�0��e�[0����͵�B*�^�DWfk�I��z�t�&]�o�d�^ʬ��Q�o���L0Y����A��h +X%_z7�HJC� ���������}H�{_|raf8��!��f0#~��-5og�j�˰��2X9���˹�R6*�%����%�d�+������z>��ԼTt�R�
�����Q���5��3 �9�Ҝ���AL[J��_���w�ݧ���r ��UvU��Uv鯺g$O�;��`0���gv�.���,=Z����Z��v`Y2�t$�"p���&[�DWf�ϟ��R +��.��-�m�����Sc9sNR�D
n�x[<@Fx��^��@�=��֒.�k��0R�N'�7��?����%�nҋh��zG0fC)m�p�H6�e���u�A��'�-L���Z>�R0[��H9��ğ-$7�z��*vl�s�W�1[�(��Z�w���Z�Pa����/���y�@��O�G��oH8#Oʷ�F# +n<�����b l�;茷�Yϧ��(ɫ��0�y���rELG�Mk��oh����{Rmy:��`dCH�%����'�� #1�;a��g����e���U2Q��e�Bf:���&�f��sS09/ +&���]�A;������v�7��\�y+�3DL\0��DLW�=8��0����R<ާ`��$�ር©���?���+s5)2��`�7��g��+Æn~XQo<1V��o���[*̎-;�o��&����F���n����������O~���M¤��Z`�N�W�+6u�N(��lǴ���� +L꼷�HXR|��2��L|m> �\����r^¾S��x�dVZ��h^ _��}�H�<)�*�$��89�C?�#�#
�'�gw�ϛ�x��.d$��\/⇔۲k�$��$ +#mq<��� �p`���-$[�7�vL0��`07�X�����gAg��a �U��'��HQ��A*�J�G�G�$�R�Ǽ��o@tǁ>y�%F�?�����$� +�r�ޝ��;�H���e�{쳷쫑;��2�pb$EQu�)������mX �%�Y�KE���C4?|��\�9�b��x���.&�� �j����-`�p��nC�&��ӗ����S~�>�K%����U�|���n +�!�Ü.��������Vi�m����t«���~P"S�g��]���C��(���]*y��g? +EQEQu��F��L +H��
pT���/!&���_aB�A+�ʄb�J���ZDh�jh��b�"Sl��SF[��q��vB�P� +�P�)-��7Bd I�&��;=��&�_����{{�|�!;L���s�w�9�W��=������!�ግ�Pڇ�#��=^v��^���f����V$Ax �6G��<=\�
k�˰n +]��J{�X�/���-�0G�OK�K;ֺW�̷�Baפ
�=R�2��X� + 0M5b�cдp�;NY����#�pMg���|�ӌ�4��W�4,�v_�}&����:�2��Z=lX�͚j0���T�<6�g���2n�}Md~=����}�.��5+�۳��)���H�8�tY��yh��J-�k~'3~,Ϩ�&XƂd�
�Xn�p.ù��Fі��P�>7��`&�&X护�M��5*�~��Z$��{��S:Ǝ���VB�LJ�`Y+T�H$\gR|%��1��닶����4�3h��X�z�4�J��w�@��(������_R�
`_���g,��]Ɯ�rl��Y.8.l�g��;j�Ⱦ�X8w�`�oO:ݔp�Z��D��E��-����#*�5D^A�;LI5�6�(�V�X�
2�"sA����VãT��l��1�qVx��`�L2%
��4����M��T���દp�����uwVUn2"��`C�p�������ٯ���+���s�A�GETdT�Q�X�RP#��m5)hՖg}Ԉ $�!)�f,Q��*>Z�E�Bַ�G0u��jEq@��{u�s�Ig0uf��s��_7����Z��Y�����<k����K1{�&�F�[�g�V���G:�e7�
�˷T���[�5�3�����1�ɊD�Ö�D�y��3w�+�q��!��J��A�(ov +s��i��-q�8���Z�,lQ��7���O�i FYk��}�8b'<n8�YR��8�8k��}���oiL��#�k�y�3�=L,�݆��4.���(�t�n���67�U�x�^_�U�5�w��-�6������2�}�[7ܵ��l�����������"�-]ó��o6�U�f�s��煝��0���/����>��_�z_W�9��.�O�r�?�KS�y���/�?�X?��'�[Ư +�q�'+l魌�~��_�$ۘ�\��z��F��ܠ�=F��_.�L���kQ���G����+YI1�ӠMå���;�o�]���s��y�k.Z�5�����F�Ė�� �.?���Ǐ}��Q$^�k�0p�2�E��~��L�4���Z^�b�7k�'7�-X�x]�#]Z��\)������߽�+k"�I���J�����j�~�ނU7���:�>��"������p�3{+P��֬���&��Y������}4�cI�,ҝ~eݣ�V_�y���{&!���D�qK;�]�F>��pq�O����׳U�Q+f�R�n� ���r���[���m�Ee�Zv�7a�p^k͖wp�R����{YP^�:����y-[W�!��=�Av����Zk^w7n����q��u�����Eٍ+��y�*+�E/lͼn��=�XN|��q�ڏ��ۏ}��k�O��*��lX���Z�u^{�Nj7h���k����
k!��9n���>J��TO�2A���: 8�A߆xm8���Wg��q�ys;[Y5�kmx]������~G��7��K�~ t�"�\Z�j������U���\^��<K;��;�!ni�Vu�C�0������s��TYP��W�*�n;2ov��ޯ����B�lB��:�?Lג�kU��TY�(����|W~j__����w�������+_� ]FR��ZkA�Ɉ��>y����[��s�Μ��~�l�m���}�r�~̜~�=oT��*��ZK��c��2�J�� +��에T{ak�u)�\`��f�+�Q�g�>�q,^y��ײj����v}5���}�_��CC���9�?��5py����¸<{{n��9�Z�Fp���6�99�%�D@�����7��˚�qD��uX7���M�A +��0��PGDr�z-�oD���]]��[,S�g�����h�ۃ,o�)��Z����OX�S�K���[j_M������d��,o�)�
=�d�o���ٽ]�w�:�I߭V�� +�0D�3��ܩI��F�)���
���r�v�7�u2Vysr����5�N�Z_kWG,7����.�����W1n*��I'��c�T�/����#���^ "DA7Y��y#H^G�����N(��JPysR�n�@�ͽZ����Wm�$B��d��8b��n�Py��!X��,o�*�%`��b
���͵v�aD�m9��*k�`����U�7�4\�U�䷌�*��G`�����R�� �7{~��o����ỲI���FAJ�YAj'c�*ay#Pvs�����$^e#'$�;#��%��#�7Btu ���/]��PY��(n6�
}�j2����%��5��J��oN��3o�*�(��S����Q��Z�@�{��`%�(n��~̼*���8��_$�7����5v�Q89m�}3��� +Ny��ʼ0� N�z���$��7k'�{�7�u��v�!D�� ��P���´�����v��Ysv.Jy3wh9�#�<�/���X���卐%:�����鍐m%����>���5��P%���(�-�+�y#d^o���ɡ�7B�����"C�d\¼2k'q�IYi����T������!�J}���q#d!��7'�a�/��:$nVަ��4���A�7'����F��ٯ�X��2�����>��c�:$Ok� +��a�"T�Z�K��X�3@�-�DL�~�sC���BؚJR�a#jdSaSB��=�������P�j�����~>�?���7�}��uݼH�:�ӕ�8P�s�%�!k�Q������}լ��'0�@5�s��7�y�1z�����ޚ��: ��ym184�h�����R3�������݃�̷]�0�@5�O���u�
���|���d��
Ts�Z�B����
t��S%�dN�=���y�cՌ�y��h���
:z˨��o���y:�I9���j�������J� +�
��<S�x��!�q +���ष=lC�*��'�-��g��^�IP���`��4�ŽRߊ� ���M;�� �O8C�<��o ��D~�3��=z�d�=�=�uRup�6p9��Dg��V��_@g*��ep��Z�$F�������QAj��1�ѥ�$DZ�a���4�}��_@g�KR���t#�7H�lm�%���% +pN���Uo�1c�p����������M���C�p���?�!�;��24 ��J9o[o� 8�)�ur>� 8ЩʏG7�$8\)A�n^F��<jO��|��2��}����"�+���tqlgG�[�&���.�ߺ-���c��2�Ӹ8hc��������OP"��ËA' �rg�!�-u��F�zԨ�/��NR1���x=,��x���s�7PC~��E�[�I�7P�q~O��ɇ-e�j8>=3����u��|lR���bz=,�p��%��s�[p��}�h{3t�~�7P$翛h{Ki1rM,oMb����q�E��koM�/��� +���#S��-���3��cyw;߁��\Fo�P�/][o�-?$ +5�|�����k����҆��@1�J��N�Plg���ƶ�f�ҟM�To�8����N�����V�>P�'��z����
��y��(��ɘo�s��|l]k�^.dR�g�s����� +�L"5�7�����B��,泪��q�9tի�K +����0����N���-8$�_��]����)�yt��s�\Y���O�l���ӉX4bBo�ޅ�
t�Pp��
�˛��
�\�s���Z��#N���˚5�[6iHom^�������=v��h�\�gS����r�#7Г\`�|t���P��ߗ�Q߄�VMc�=-4�$��aykh�؟����uPڅu4%���ݔ|�����`Yͷě��=����J=>�K�z�w�R1�j5���L҄�<��Y����no�8�O�l7��B_:���o��no�'���Ǜ�墚o� �kޛK�N`���fz���|����%3z�h;�hK.4�$��c��b.m@o.�Do�+)N���To�\:��ޛG�w�r��R\�-��
�WS��j!?ӛ�z�78��{q����lp��w0�ǯk�T��L*1ӛ�Υ�K�����[x~Ω ���Z�����{#���h�������|w�U+�gR� �uoEb�}�������7���Y��L�m���
��Vog���� +>�~�[V��\�r��g�;�p�mU +�tR��͡Ƴj���lor���7|�H�R̦z�������7��#�ۍ�@1�J�"���9�!w��c��,w{{j�6P�jޛGkNc���Q[��S�Ԫ��lo����Ou'�70�j���b.��7}{s�~L�4 +�2���/��j�y�����i�$�!�C�|.���M{{�
,����� }{si� �7����-��"��z����t+�XC��|>�mo.����5:�h.��E<�ձ7�օj�!�'�3��x�9�܃�
���Gr�x�u������8�{r}��Ft#�7�G���닩�t<���u�!%ߑ�����i���,�e�AT���.¥=�_ +�X��2�q�
etӴ"ݓ��� +��H��9�{�I���5��+�H�7�����*Po�|�s���� ��-�=�z�� �+N�욾��!�yۙ7���G���~��2o(1��Ņ�-���ۅ�U]Ϸ_��t� +qOƲ���J�~�/(Ⱦ�UzC��~R����_����9����<�Pv�ۧ��[,��D�y}vjz��,�]�z�_�cN�M*@o��*��s�Ԅ�������%����3v�%W�U�-�V>PvN�ɿ�X�Xμ��B�k���G������r������ +����M�y��9� +䝛��W�� +꿖�9-g�PA��wo���7T���g��["W�*��k3r�-������� +�ˇ6��ͩߟ��B=�$����1��(#��Ѵn�Ҝ�t��O�����*��i=.�71o���'�up�L{�y4]��'�|�β�h�z�Ğ��G�
�.�Y=��:�$�&Ka�����Ln��٭�0�Yp�L��9 ���p���B,�+���k�Up���W]�(��y�"�D�����?-q��e����t@�x<��({��aހ��t��^�er����ӳn�2zށ���{+[3�А� +(x��@��-��S��z����5���0�6��{xg�F�������?PP��9"Q��]�.�����L������p���e��۵��g +��ƣ�.�3����u��g�[,�<��ӧ�� �-V0��8]55���刭4��O�镅Hj+�
h x��]�,�ݥg�0�OX�l\6˔Az��K&Ɉ�8(��l�f\"s8(�Ƭ�s3 .��3p@c^�����w���?
Pp�|��.��<��M8�|D�E�����8�8+�'\"'��=���>}`��E2�4�t�ۧn{����M9}dB�}|���? +Px��q�K�~�
h.]�[�'_�Z`�8��n$2�yzZ`�\u\$�О� +�#�������Q˙AC�?3�� +�"{�QiL-��s�@7�����V&����7�;��W�Ǟq̓;�Np@w�gܚkM'.�1��孢��k\\$���=��K�lT\"�6qP�u���F�Wc�}KnL�{ +$A��Q���#��+�X � +>x4�� ��"2��h;N��A�* +%
�a)Pa�� HA�) ������;g�Y�����{w�?�;�ݻ��;�{��o4H�z%"�A����D�o)E$��8P"HH�� ��$�����9L�o�8�T9�8��I���"�/��!�S���9R{�K[#�� �#�xV�V�X�)����A�����ȏ�|�� ��NUl��@pPo�&v��PfKo|&�� �]�`���M~��.48q +8'%&���� ���{��Pn�����E$"���4�)��m�77�8&�L��wno��e�p��xo%?L,p�n\�㨷�����1��Ln���+5����q�t�A�7X]6���%x�Prɋ
�`�(��9g���w�re';�Zv��Q.Y��t^T�$�m7 +��O!_�k#��5��ݯ4��c����H���$J�I���z� �j�{.���i +�LoW_�0H�>4��`z8��YtЪ2:ʑn���/q�����Hw7�&yU��]T��]5)��l�y=�5HN�\��o��'`��9r��sGn&�=/���l+�洄nYMj�Jc!�Y�C{쒀,��J�(`b_��_�4߀�vMdd���`��U�,{7�aZ��~�ҏ��1�r~En�$7Ħ7ʯ��<൦��!��x�\o�ou~l�Q�Tl�abo�қ|L�a(�L(p��ݳ2�EFӑ-���z�]\��ш�`b�;�$�B^4�y��V}�[������"�l�{�e���+Oã1��*���-{#$@��@�S�zj�.�l� 6�a�䬮��TΔ�a�}�ܫ)�r��Q i�"��e��Ϳ�?Ckĭ�4z\���*ʡ���ۻgo`pSE�o>gz�>����iJ��bӄz���J����| +�sN���/ߗ��s�)K�.�|"��T�=K��z3H�=��7�t��}wj��jC,"[���_�)ZzD�%�E��_/b������L!8Ӂ����)R&�x�-�w��ޏ/���0�rރ��n�
ʜ�T���$��2�f�R���U�WY.{��j� +������G����md�a��Ҳ��rJVʂ>���l�̘�
n�/Jj����{�S�����ư��5��B��҇��d[�$�g�$�;|gp\���-��AW��-<�>���nT=�"���8�
�y�d�t��|C�}�aL��À����k�A��܄3Q�1.r�?���)x��ұ����[V +h�3 �d����t"�=�T�͖���'�[�wFe��K!�)R��6V +49��������{Yx}�-���m�?�����z��Λ���PQ��;���F�vw���(9�7��u��UK6S����7�M^u��J.*��c�G��ׄ�
.$�S���F�\ˌ_k<��l.=��u�������������u^��Q�p`�N-�R-�°���S�Y�9r ��-�&�a�J��`U5{mx�Zg�F��:�
|qk� +�=gG(�%z+� +�%�QSE�@�E�X�ݒ��?���lVC]�AEإ� +*hE�`�/������ymiiݖ��������7�ܙs?s�W����O��.���X}[2t6���Bm�E����`�6�NBn��n �l��@)��'?X>Y�e
^�#S�?�YB��\�ܑ�n��s�k�l_m��^F�PB-���/+?��f��a�P���!E2�
.�du���p}�R�-Ԩg +�
����Y�1T�.k'��Q��l�o܅φ��oK�ll}�aW%����r���ɳ��&�$���Rx��ؾb��1��1ԁ'lO\�)d9��ҭ)�������>�Mp��]���7�Z���G':u��(��q) +u��$dlM� +'�w��k���S�-|��
O;y�]� +1��ԍ��]7�T5ھ�G�Oݸ�$kT�F���`�O�V|P�čM��]�t���Mc�Y
}�����v,�n \���fcj�{.)�ٚU�ŠrLV$��B@�u*B���7F6y����2��|��rr��;+�\[ιr�pt��r�Cx!��r]��(�P� +�g=��c(�1��
f���B8P +�������G]d�����i9++�m�'A�<���j�n�7�9T�M0�Lٙf�S;��qP��2��� j��@��2�O�ي��P'8��}c��PQ��������猪��s���Qb�or������I`�� +2��bd3o�$�y��Uݸ�뜺�U��MA���W�3]�s�W�L#:$`d3�`�R�J>�UdQ��n��3%�ilr�O���8Ӫ�o+�9�����ETO�iSW��h�r���F���d�w3:�{�ϣ���l�W�����
��.�6��l�Y��{e�x!8t�_��xW�>�mΈ����Ȁ�5{�J=WF�sL��hPv�$}_��RMפ����} +˴{Bz��r�5x��.�U�I�&��$������{C��[��#�Eq��x(կ�a9E�P\�%���w�E�OwS8��q�'^�ӘD��٢�#AJ�S��T�Y�+�v�0��Z�G��M0٪���]�lQ����m>P�vy$+��^D�& �H��}�Bp���8o��/��w��o�$��_��u���.7��Zհ�� ����7��D����-z VwԼ�u�Y���a0�N����@Y�e��囍�'�cmt-�Ɨ�Yk�C�#0�1��*SuS�,٩p܅�[C�_���q�b��hj���F Y.���&�L0W7���O.(Uf�?�U�ʍ��l�E0�%ݹ�@��"��qy*�`�@��v�y�Iy�%Yqp +�~&en��c�*wn��jI�cw�5k���Η@,'k;�}�Y.����Z�.�\�\�)+;=�����V�~�M�+�\�`��I��)�^�*�-O0 !
AB��\��u߃7�%˵
�.��}w���[�<�Ċ�s�d�r��#G�o?"Z-�6��K1 +����$d/��:�0����\}]����7>��� +���vT�UC�:�ˉ�Ae����>�Ś��<���Ov����x�_�'M�8�jd�c�3t�S���˷��}�Å��17{ĨA�L--��3"�\&�������Aڒ��C�(D�9=ڭz��&�b�]�� 0 +H���yTSw�oɞ����c
[���5la�QIBH�ADED���2�mtFOE�.�c��}���0��8��8G�Ng�����9�w���߽��� + +�V��)g�B�0�i�W��8#�8wթ��8_�٥ʨQ����Q�j@�&�A)/��g�>'K�� +�x������- +�ꇆ��n���Q�t�}MA�0�al������S�x ��k�&�^���>�0|>_�'��,�G!"F$H:R��!z��F�Qd?r9�\A&�G���rQ��h������E��]�a�4z�Bg�����E#H �*B=��0H�I��p�p�0MxJ$�D1��D, V���ĭ����KĻ�Y�dE�"E��I2���E�B�G��t�4MzN�����r!YK� ���?%_&�#���(��0J:EAi��Q�(�()ӔWT6U@���P+���!�~��m���D�e�Դ�!��h�Ӧh/��']B/����ҏӿ�?a0n�hF!��X���8����܌k�c&5S�����6�l��Ia�2c�K�M�A�!�E�#��ƒ�d�V��(�k��e���l
����}�}�C�q�9 +N'��)�].�u�J�r� +��w�G� xR^���[�oƜch�g�`>b���$���*~� �:����E���b��~���,m,�-��ݖ,�Y��¬�*�6X�[ݱF�=�3�뭷Y��~dó ���t���i�z�f�6�~`{�v���.�Ng����#{�}�}��������j������c1X6���fm���;'_9 �r�:�8�q�:��˜�O:ϸ8������u��Jq���nv=���M����m����R 4 � +n�3ܣ�k�Gݯz=��[=��=�<�=G</z�^�^j��^�� ޡ�Z�Q�B�0FX'�+������t���<�u�-���{���_�_�ߘ�-G�,�}���/���Hh8�m�W�2p[����AiA��N�#8$X�?�A�KHI�{!7�<q��W�y(!46�-���a�a���a�W�� ��@�@�`l���YĎ��H,�$����(�(Y�h�7��ъ���b<b*b��<�����~�L&Y&9��%�u�M�s�s��NpJP%�M�IJlN<�DHJIڐtCj'�KwKg�C��%�N��d��|�ꙪO=��%�mL���u�v�x:H��oL��!Ȩ��C&13#s$�/Y����������=�Osbs�rn��sO�1��v�=ˏ��ϟ\�h٢���#��¼����oZ<]T�Ut}�`IÒsK��V-���Y,+>TB(�/�S�,]6*�-���W:#��7�*���e��^YDY�}U�j��AyT�`�#�D=���"�b{ų���+�ʯ:�!kJ4G�m��t�}uC�%���K7YV��fF���Y�.�=b��?S��ƕƩ�Ⱥ����y���
چ���k�5%4��m�7�lqlio�Z�lG+�Z�z���mzy��]�����?u�u�w|�"űN���wW&���e֥ﺱ*|����j��5k��yݭ���ǯg��^y�kEk�����l�D_p߶������7Dm����o꿻1m��l�{��Mś�
n�L�l�<9��O +�����z���p���g���_���X���Q���K���F���Aǿ�=ȼ�:ɹ�8ʷ�6˶�5̵�5͵�6ζ�7ϸ�9к�<Ѿ�?���D���I���N���U���\���d���l���v��ۀ�܊�ݖ�ޢ�)߯�6��D���S���c���s����
����2��F���[���p������(��@���X���r������4���P���m��������8���W���w����)���K���m�� +%!PS-Adobe-3.0
%%Creator: Adobe Illustrator(R) 17.0
%%AI8_CreatorVersion: 19.2.1
%%For: (Zachary Mitton) ()
%%Title: (metamask_icon)
%%CreationDate: 6/15/16 2:23 PM
%%Canvassize: 16383
%%BoundingBox: 98 -140 188 -44
%%HiResBoundingBox: 98.7919746568114 -140 188 -44
%%DocumentProcessColors: Cyan Magenta Yellow Black
%AI5_FileFormat 13.0
%AI12_BuildNumber: 147
%AI3_ColorUsage: Color
%AI7_ImageSettings: 0
%%RGBProcessColor: 0 0 0 ([Registration])
%AI3_Cropmarks: 79 -156 207 -28
%AI3_TemplateBox: 180.5 -120.5 180.5 -120.5
%AI3_TileBox: -163 -488 449 304
%AI3_DocumentPreview: None
%AI5_ArtSize: 14400 14400
%AI5_RulerUnits: 6
%AI9_ColorModel: 1
%AI5_ArtFlags: 0 0 0 1 0 0 1 0 0
%AI5_TargetResolution: 800
%AI5_NumLayers: 1
%AI17_Begin_Content_if_version_gt:17 1
%AI9_OpenToView: -39.6666666666679 23.666666666667 3 1419 866 18 0 0 -5 38 0 0 0 1 1 0 1 1 0 1
%AI17_Alternate_Content
%AI9_OpenToView: -39.6666666666679 23.666666666667 3 1419 866 18 0 0 -5 38 0 0 0 1 1 0 1 1 0 1
%AI17_End_Versioned_Content
%AI5_OpenViewLayers: 7
%%PageOrigin:-220 -420
%AI7_GridSettings: 72 8 72 8 1 0 0.800000011920929 0.800000011920929 0.800000011920929 0.899999976158142 0.899999976158142 0.899999976158142
%AI9_Flatten: 1
%AI12_CMSettings: 00.MS
%%EndComments
endstream
endobj
24 0 obj
<</Length 22700>>stream
+%%BoundingBox: 98 -140 188 -44
%%HiResBoundingBox: 98.7919746568114 -140 188 -44
%AI7_Thumbnail: 120 128 8
%%BeginData: 22554 Hex Bytes
%0000330000660000990000CC0033000033330033660033990033CC0033FF
%0066000066330066660066990066CC0066FF009900009933009966009999
%0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66
%00FF9900FFCC3300003300333300663300993300CC3300FF333300333333
%3333663333993333CC3333FF3366003366333366663366993366CC3366FF
%3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99
%33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033
%6600666600996600CC6600FF6633006633336633666633996633CC6633FF
%6666006666336666666666996666CC6666FF669900669933669966669999
%6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33
%66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF
%9933009933339933669933999933CC9933FF996600996633996666996699
%9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33
%99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF
%CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399
%CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933
%CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF
%CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC
%FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699
%FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33
%FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100
%000011111111220000002200000022222222440000004400000044444444
%550000005500000055555555770000007700000077777777880000008800
%000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB
%DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF
%00FF0000FFFFFF0000FF00FFFFFF00FFFFFF
%524C45FD24FFA776FD75FFA04A4AA1FD73FFA04A754A75A8FD71FF7C4475
%4A6F4A6FA8FD6FFFA04A754B754B754A75FD6EFF764A6F4A754A6F4A754A
%76FD6CFF764A754B754A754B754A754AA1FD69FFA8754A6F4A754A6F4A75
%4A6F4A6F4AA1FD44FFA7C9A075A8FD1EFFA8754A754B754B754B754B754B
%754B754ACAFD3FFFCFC9C299C1997476FD1EFFA76F4A754A6F4A754A6F4A
%754A6F4A754A4B4AFD3BFFA7C99FC198BB98C198754AA8FD1DFFA8754A75
%4A754B754A754B754A754B754A754B6F76FD37FFC9C99FC198C199C199C1
%99754A75FD1DFFA74B4A754A6F4A754A6F4A754A6F4A754A6F4A754A4A76
%FD31FFA8C9A0C1999998C1999F99C199C1746F4A4A76FD1CFFA1754A754B
%754B754B754B754B754B754B754B754B754B6F7CFD2CFFCAC9C89FC198C1
%99C199C199C199C1C1C175754B754ACAFD1BFF7D4A4A6F4A754A6F4A754A
%6F4A754A6F4A754A6F4A754A6F4A6FA8FD27FFCAC9A1C2989998C199C199
%C199C199C199C199C16E4B4A754A75A8FD1AFF7C6F4A754B754A754B754A
%754B754A754B754A754B754A754B754A75FD24FFC9C99FC199C199C199C1
%99C199C199C199C199C1C1994A754B754A6F76FD1AFF764A4A6F4A754A6F
%4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A76A8FD1DFFA7C9A0C1
%99BB989998C1999F99C1999F99C1999F99C199C199994A4B4A754A6F4AA8
%FD19FF756F4B754B754B754B754B754B754B754B754B754B754B754B754B
%754B754A76FD1AFFCAC299C198C199C199C199C199C199C199C199C199C1
%99C199C199994B754B754B754A7CFD19FF764A4A754A6F4A754A6F4A754A
%6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A99FD04C199C1C1C199C1
%C1C199C1C1C199C1C1C199C1C1C199C198C199C199C199C199C199C199C1
%99C199C199C199C199C199754A754A6F4A754A4A7DFD18FF7C6E4B754A75
%4B754A754B754A754B754A754B754A754B754A754B754A754B754A754BFD
%05C1BBC1C1C1BBC1C1C1BBC1C1C1BBC1C1C1BBC1C1C199C199C199C199C1
%99C199C199C199C199C199C199C199C199754B754A754B754A754BFD19FF
%754A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A
%754A6F4A4B74C199C199C199C199C199C199C199C199C199C199C199C199
%9F99C1999F99C1999F99C1999F99C1999F99C1999F99C1994B4A754A6F4A
%754A6F4A76FD18FFA14A754B754B754B754B754B754B754B754B754B754B
%754B754B754B754B754B754B754B7599C2FD16C199C199C199C199C199C1
%99C199C199C199C199C199C175754B754B754B754B754B75A1FD18FF4A4B
%4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A75
%4A6F4A754A6F99C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C199C1
%99C199C199C199C199C199C199C199C199C199C16E4B4A6F4A754A6F4A75
%4A6F4AFD18FFA16F4B754A754B754A754B754A754B754A754B754A754B75
%4A754B754A754B754A754B754A754B75FD16C199C199C199C199C199C199
%C199C199C199C1999F6F754A754B754A754B754A754A7CFD18FF764A754A
%6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A
%754A6F4A754A9999C199C199C199C199C199C199C199C199C199C199C199
%9F99C1999F99C1999F99C1999F99C199994A6F4A6F4A754A6F4A754A6F4A
%4A7DFD17FFCA4A754B754B754B754B754B754B754B754B754B754B754B75
%4B754B754B754B754B754B754B754B7575FD17C199C199C199C199C199C1
%99C199C1C1994B754B754B754B754B754B754B754BFD18FF764A4A754A6F
%4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A75
%4A6F4A754A4B74C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C199C1
%99C199C199C199C199C199C199754A6F4A754A6F4A754A6F4A754A6F4A7C
%FD18FF754B754A754B754A754B754A754B754A754B754A754B754A754B75
%4A754B754A754B754A754B754A754B7599FD13C1BBC199C199C199C199C1
%99C199C199754A754B754A754B754A754B754A754B75A8FD17FFA04A754A
%6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A
%754A6F4A754A6F4A754A7599C199C199C199C199C199C199C199C199C199
%C199C1999F99C1999F99C199C174754A6F4A754A6F4A754A6F4A754A6F4A
%6F75FD18FF4A754B754B754B754B754B754B754B754B754B754B754B754B
%754B754B754B754B754B754B754B754B754B754A9FFD14C199C199C199C1
%99C199C175754B754B754B754B754B754B754B754B754AA7FD17FF7D4A4A
%754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A
%6F4A754A6F4A754A6F4A754A4B4AC1C1C199C1BBC199C1BBC199C1BBC199
%C1BBC199C199C199C199C199C16F4B4A754A6F4A754A6F4A754A6F4A754A
%6F4A75A8FD17FF764A754A754B754A754B754A754B754A754B754A754B75
%4A754B754A754B754A754B754A754B754A754B754A754B7575FD13C199C1
%99C199C1BBC16F754B754A754B754A754B754A754B754A754B6F75FD17FF
%A84A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A
%754A6F4A754A6F4A754A6F4A754A6F4A754A4B74C199C199C199C199C199
%C199C199C199C199C199C199C199994A4B4A754A6F4A754A6F4A754A6F4A
%754A6F4A754AA1FD17FF76754B754B754B754B754B754B754B754B754B75
%4B754B754B754B754B754B754B754B754B754B754B754B754B754B754B75
%9FFD11C199C199C199994B754B754B754B754B754B754B754B754B754B75
%4B75A8FD16FFA86F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A75
%4A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A99C1C1
%99C1BBC199C1BBC199C1BBC199C1BBC199C199994A754A6F4A754A6F4A75
%4A6F4A754A6F4A754A6F4A6F75FD17FFA74A754A754B754A754B754A754B
%754A754B754A754B754A754B754A754B754A754B754A754B754A754B754A
%754B754A754B754AFD13C199754B754A754B754A754B754A754B754A754B
%754A754B754ACAFD16FFCA4A6F4A6F4A754A6F4A754A6F4A754A6F4A754A
%6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A
%754A4B4AC1BBC199C199C199C199C199C199C199C1996F4A754A6F4A754A
%6F4A754A6F4A754A6F4A754A6F4A754A75FD17FF7D6F4B754B754B754B75
%4B754B754B754B754B754B754B754B754B754B754B754B754B754B754B75
%4B754B754B754B754B754B754B7599FD10C19F4A754B754B754B754B754B
%754B754B754B754B754B754B6F7CFD17FF764A754A6F4A754A6F4A754A6F
%4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A75
%4A6F4A754A6F4A754A7599C1BBC199C1BBC199C1BBC199C1BBC199C1C199
%4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754AA8FD17FF75754A
%754B754A754B754A754B754A754B754A754B754A754B754A754B754A754B
%754A754B754A754B754A754B754A754B754A7599C199FD12C1994A754B75
%4A754B754A754B754A754B754A754B754A75FD17FFA8754A6F4A754A6F4A
%754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A
%6F4A754A6F4A754A6F4A754A7599C1999999C199C199C199C199C199C199
%C199C199C199994A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A7CFD
%17FF75754B754B754B754B754B754B754B754B754B754B754B754B754B75
%4B754B754B754B754B754B754B754B754B754B754B7599C199C199FD13C1
%99994B754B754B754B754B754B754B754B754B754B754A7CFD15FFA8754A
%6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A
%754A6F4A754A6F4A754A6F4A754A6F4A7599C199C199C199C1BBC199C1BB
%C199C1BBC199C1BBC199C199C199994A6F4A754A6F4A754A6F4A754A6F4A
%754A6F4A754A76A8FD13FFA84A754B754A754B754A754B754A754B754A75
%4B754A754B754A754B754A754B754A754B754A754B754A754B754A754B75
%99C199C199C199C199FD0FC1BBC199C199994B754A754B754A754B754A75
%4B754A754B754A754AFD14FFA14A4A754A6F4A754A6F4A754A6F4A754A6F
%4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A75
%75C199C1999F99C199C199C199C199C199C199C199C199C199C199C199C1
%99754A6F4A754A6F4A754A6F4A754A6F4A754A4B4AA8FD14FF7C4A754B75
%4B754B754B754B754B754B754B754B754B754B754B754B754B754B754B75
%4B754B754B754B754B754B7599C199C199C199C199C199FD11C199C199C1
%C1754A754B754B754B754B754B754B754B7576FD12FFA8A151754A6F4A75
%4A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F
%4A754A6F4A754A6F4A754A4B74C199C199C199C199C199C199C1BBC199C1
%BBC199C1BBC199C1BBC199C199C199C199754A754A6F4A754A6F4A754A6F
%4A754A757DFD11FFA14A4A4A754B754A754B754A754B754A754B754A754B
%754A754B754A754B754A754B754A754B754A754B754A754B754A7575C199
%C199C199C199C199C199C1BBFD0FC199C199C199C199754A754B754A754B
%754A754B754A754A4A75CFFD10FFA8754A4A754A6F4A754A6F4A754A6F4A
%754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A
%4B6EC1999F99C1999F99C1999F99C199C199C199C199C199C199C199C199
%C199C199C1999F99C199754A754A6F4A754A6F4A754A6F4A754A4A4ACAFD
%11FFA8754A754B754B754B754B754B754B754B754B754B754B754B754B75
%4B754B754B754B754B754B754B754B7575C199C199C199C199C199C199C1
%99C199FD11C199C199C199C199754B754B754B754B754B754B754B754ACA
%FD13FFA87C4A4B4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A
%6F4A754A6F4A754A6F4A754A6F4A756EC199C199C199C199C199C199C199
%C199C199C1BBC199C1BBC199C1BBC199C1BBC199C199C199C199C199754A
%6F4A754A6F4A754A6F4A754AA7FD17FF75754A754B754A754B754A754B75
%4A754B754A754B754A754B754A754B754A754B754A754B756FC199C199C1
%99C199C199C199C199C199C199FD11C199C199C199C199C199754B754A75
%4B754A754B754A76FD13FFA8CA7DA176754A6F4A754A6F4A754A6F4A754A
%6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A4B6EC199C1999F99
%C1999F99C1999F99C1999F99C199C199C199C199C199C199C199C199C199
%9F99C1999F99C199C198754A6F4A754A6F4A754A4B4AFD12FFA87C4A4A4A
%754B754B754B754B754B754B754B754B754B754B754B754B754B754B754B
%754B754B754B7575C199C199C199C199C199C199C199C199C199C199FD11
%C199C199C199C199C199C199754B754B754B754B754A75FD14FFA8754A4A
%754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A
%6F4A754A4B4A9F99C199C199C199C199C199C199C199C199C199C199C199
%C1BBC199C1BBC199C1BBC199C1BBC199C199C199C199C199C1994B4A754A
%6F4A754A6F4AFD16FFA8A14B754B754A754B754A754B754A754B754A754B
%754A754B754A754B754A754B754A7575C199C199C199C199C199C199C199
%C199C199C199C199C199FD11C199C199C199C199C199C199754A754B754A
%754B6FA7FD18FF516F4A6F4A754A6F4A754A6F4A754A6F4A754A6F4A754A
%6F4A754A6F4A754A4B4AC1999F99C1999F99C1999F99C1999F99C1999F99
%C1999F99C199C199C199C199C199C199C199C199C1999F99C1999F99C199
%9F99C1754B4A754A6F4A6F4AA8FD17FFA1754B754B754B754B754B754B75
%4B754B754B754B754B754B754B754B754B754BC1C1C199C199C199C199C1
%99C199C199C199C199C199C199C199FD11C199C199C199C199C199C199C1
%75754B754B754AA7FD15FFA8A14B4A4A754A6F4A754A6F4A754A6F4A754A
%6F4A754A6F4A754A6F4A754A6F4A756E9999C199C199C199C199C199C199
%C199C199C199C199C199C199C199C199C1BBC199C1BBC199C1BBC199C199
%C199C199C199C199C199C199C174754A6F4AA1FD17FF4B6F4B754A754B75
%4A754B754A754B754A754B754A754B754A754B754A754B754AC1C1C199C1
%99C199C199C199C199C199C199C199C199C199C199C199FD11C199C199C1
%99C199C199C199C199C175754A76FD18FFCA4B4B4A6F4A754A6F4A754A6F
%4A754A6F4A754A6F4A754A6F4A754A6F4A6F4A9999C1999F99C1999F99C1
%999F99C1999F99C1999F99C1999F99C1999F99C199C199C199C199C199C1
%99C199C199C1999F99C1999F99C1999F99C199C16E4BA8FD1AFF756F4B75
%4B754B754B754B754B754B754B754B754B754B754B754B756F9F99C199C1
%99C199C199C199C199C199C199C199C199C199C199C199C199C199FD0FC1
%99C199C199C199C199C199C199C199C1A1FD1CFF4B4B4A754A6F4A754A6F
%4A754A6F4A754A6F4A754A6F4A754A4B4A9F99C199C199C199C199C199C1
%99C199C199C199C199C199C199C199C199C199C199C199C1BBC199C1BBC1
%99C1BBC199C199C199C199C199C199C199C199C198CAFD1CFFCF4A754A75
%4B754A754B754A754B754A754B754A754B754A754B9999C199C199C199C1
%99C199C199C199C199C199C199C199C199C199C199C199C199FD0FC199C1
%99C199C199C199C199C199C199C1CAFD1DFFA84A6F4A754A6F4A754A6F4A
%754A754A754A754A754A6F4A99999F99C1999F99C1999F99C1999F99C199
%9F99C1999F99C1999F99C1999F99C1999F99C199C199C199C199C199C199
%C199C199C1999F99C1999F99C1999F99C199FD1FFFC299C1C1C19FFD0FC1
%99C1C1C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%99C199C199C199FD11C199C199C199C199C199C199C199C2FD1EFFCABBC1
%99C1C1C199C1C1C199C1C1C199C1C1C199C1C1C199C199C199C199C199C1
%99C199C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%99C1BBC199C1BBC199C1BBC199C199C199C199C199C199C199C1A0FD1EFF
%FD18C199C199C199C199C199C199C199C199C199C199C199C199C199C199
%C199C199C199C199C199FD0FC199C199C199C199C199C199C198C9FD1DFF
%C9C199C199C199C199C199C199C199C199C199C199C199C199C199C1999F
%99C1999F99C1999F99C1999F99C1999F99C1999F99C1999F99C1999F99C1
%999F99C199C199C199C199C199C199C199C199C1999F99C1999F99C19999
%A1FD1DFFC9BBFD19C199C199C199C199C199C199C199C199C199C199C199
%C199C199C199C199C199C199C199FD0FC199C199C199C199C199C199C198
%C9FD1DFFC1C199C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C1BBC1
%99C199C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%99C199C199C199C1BBC199C1BBC199C1BBC199C1BBC199C199C199C199C1
%99C199BBA7FD1CFFC9FD1BC199C199C199C199C199C199C199C199C199C1
%99C199C199C199C199C199C199C199C199C199FD0FC199C199C199C199C1
%99C199CFFD1CFFC298C199C199C199C199C199C199C199C199C199C199C1
%99C199C199C199C1999F99C1999F99C1999F99C1999F99C1999F99C1999F
%99C1999F99C1999F99C1999F99C199C199C199C199C199C199C1999F99C1
%999F99C1999F98C1A8FD1CFFFD1EC199C199C199C199C199C199C199C199
%C199C199C199C199C199C199C199C199C199C199FD0FC199C199C199C199
%C199C199FD1CFFC9C199C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199
%C1BBC199C1BBC199C199C199C199C199C199C199C199C199C199C199C199
%C199C1999999C1999999C1999999C1BBC199C1BBC199C1BBC199C1999999
%C19999989999999899A8FD1BFFC2FD1EC1BBC199C199C199C199C199C199
%C1999999C1999999C1999999C199BB99C1999999C1999999FD0DC1999999
%C1999999C1999998C9FD1AFFC998C199C199C199C199C199C199C199C199
%C199C199C199C199C199C199C199C199C199999899999998999999989999
%99989999999899999998BB999998999999989999C199C199C199C199C199
%C199C199C199999899279998999999A0FD1AFFC2FD23C199C199C199C199
%C199C199C199C199C199C199C1999F515299C199C199C199C199FD0DC199
%9999C1992E4BC199C199C2A8FD18FFCAC199C1BBC199C1BBC199C1BBC199
%C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C199C199C19999989999
%99989999999899999998C175510528057598999999989999C199C1BBC199
%C1BBC199C1BBC199C19999989927286FBB99C198C9FD18FFC9BBFD25C199
%C199C199C1999999C1999999C1BB994B2E0628272E279999C1999999C199
%FD0DC1BBC199BB992E282E99C199C1A0FD18FF9FC199C199C199C199C199
%C199C199C199C199C199C199C199C199C199C199C199C199C199C1999F99
%C1999998999999989999BB98752706052827280528279998FD0499C199C1
%99C199C199C199C199C199C1989998990528054B98C198A0A9FD16FFCAFD
%29C199C199C199C199C1999F7552282E272E272E272E272875C199C199C1
%99FD0FC199C1752E062E51C1BBC199FD17FFC998C1BBC199C1BBC199C1BB
%C199C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199
%C199C199C199C199992706052805280528272805280528989999C199C199
%C199C1BBC199C1BBC199C1BBC199999951057699C199C1999FA8FD16FFFD
%2AC199C199C199C199C199A07576272E2728052E2728272E277599C199C1
%99C199FD0DC199C1759FFD04C199C199CAFD15FFA7C199C199C199C199C1
%99C199C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%99C199C199C1999F99C199C1BBC1C1C1999F7575272827280528057598C1
%999F99C199C199C199C199C199C199C199C198BBC1C199C1999F98BBA7FD
%15FFC2FD2EC199C199C199FD0BC17576512E27C19FC199C199FD0FC199FD
%05C199C199CFFD14FFCA98C1BBC199C1BBC199C1BBC199C1BBC199C1BBC1
%99C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C1999F99C1
%999F99C1BBC199C1BBC199FD05C1999F99C199C199C199C199C1BBC199C1
%BBC199C1BBC1999999C199C1BBC198C1CAFD14FFC2FD31C199C199FD11C1
%99C199C199C199FD0DC199C199FD05C199FD14FFA8C199C199C199C199C1
%99C199C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%99C199C199C199C199C1999F99C199C199C199C199C199C199C199C199C1
%99C199C1999F99C199C199C199C199C199C199C199C1999999C199C199C1
%CAFD13FFCFFD32C199C199FD15C199C199C199FD0FC1BBC1C1C199FD14FF
%A0C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C1
%BBC199C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C199C199C1BBC1
%99C1BBC199C1BBC199C1BBC199C1BBC199C199C199C1BBC199C1BBC199C1
%BBC199C1999999C199C1CAFD13FFC1BBFD33C199C199FD15C199C199C199
%FD0DC199C1C1C1C2FD13FFC998C199C199C199C199C199C199C199C199C1
%99C199C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%99C199C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%99C1999F99C199C199C199C199C199C199C199C198C2FD13FFFD52C199C1
%99FD0DC199C1A1FD12FFA7C1BBC199C1BBC199C1BBC199C1BBC199C1BBC1
%99C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C1
%BBC199C1BBC199C199C199C1BBC199C1BBC199C1BBC199C1BBC199C1BBC1
%99C199C199C199C199C1BBC199C1BBC199C1BBC198C9FD12FFC2BBFD35C1
%99C199C199C199FD17C199C199FD0DC1C9FD12FF99C199C199C199C199C1
%99C199C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%99C199C199C199C199C199C199999899999998C1999999C199C199C199C1
%99C199C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%98C2FD11FFC9FD31C199C199BB99C199BB99C199C199C199C199FD15C199
%C199FD0BC1BAC9FD10FFC2BBC199C1BBC199C1BBC199C1BBC199C1BBC199
%C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C1BBC199C199C1FD0499
%98999999989999C199C199C199C199C199C199C199C1BBC199C1BBC199C1
%BBC199C1BBC199C1999F99C1BBC199C1BBC199C1BBC198C9FD0EFFCFBBFD
%2BC199C1999999C1999999C1999999C199C199C199C199C199C199C199C1
%99FD11C199C199FD0BC1BAC9FD0DFFA0C199C199C199C199C199C199C199
%C199C199C199C199C199C199C199C199C199C199C199C199C19999989999
%99989999999899999998FD0499C1999F99C1999F99C1999F99C1999F99C1
%99C199C199C199C199C199C199C199C1999F99C199C199C199C199C199C1
%98C9FD0CFFC299C19FC199C19FC199C19FC199C199C199C199C199C199C1
%99C199C199C199C199C199C199C1999999C199C199C199C199C199C199C1
%99C199C199C199C199C199C199C199C199C199C199C199C19FFD0FC199FD
%0CC1CFFD0BFFA79999C199C199C199C199C199C199C199C199C199C199C1
%99C199C199C199C199C199C199C199C19999989999999899999998999999
%989999C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%BBC199C1BBC199C1BBC199C199C199C1BBC199C1BBC199C199CFFD0BFF99
%C199C199C199C199C199C199C199C199C199C199C199C199C199C199C199
%C199C199C199C199C1999999C1999999C1999999C1999999C199C199C199
%C199C199C199C199C199C199C199C199C199C199C199C19FC1BBFD09C199
%FD0CC1CFFD0AFFC2989F99C1999F99C1999F99C1999F99C1999F99C1999F
%99C1999F99C1999F99C1999F99C199C1FD0499989999999899999998FD04
%99C1999F99C1999F99C1999F99C1999F99C1999F99C1999F99C1999F99C1
%999F99C199C199C199C199C199C199C199C199C199C199C199CFFD09FFCA
%C199C199C199C199C199C199C199C199C199C199C199C199C199C199C199
%C199C199C199C199C199C199C199C199C199C199C199C199C199C199C199
%C199C199C199C199C199C199C199C199C199C199C199C199C199C199C199
%FD07C199FD0CC1FD0AFF99C199C199C199C199C199C199C199C199C199C1
%99C199C199C199C199C199C199C199C199C199C199999899999998999999
%989999C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%99C199C199C199C199C199C199C199C1C1C199C1BBC199C1BBC199FD04C1
%FD09FFC999C199C199C199C199C199C199C199C199C199C199C199C199C1
%99C199C199C199C199C199C199C1999999C1999999C1999999C199C199C1
%99C199C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%99C199C199C199C199C1C1C199FD07C19975754B27A8FD07FFA8C1999F99
%C1999F99C1999F99C1999F99C1999F99C1999F99C1999F99C1999F99C199
%9F99C1999F99C199999899999998FD0499C1999F99C1999F99C1999F99C1
%999F99C1999F99C1999F99C1999F99C1999F99C1999F99C1999F99C1999F
%99C199C199C199C14A27F827F805F8F8F852A8FD06FF9FC199C199C199C1
%99C199C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%99C199C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%99C199C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%99C1BBC175270027F82727272027F82752FD05FFCA98C199C199C199C199
%C199C199C199C199C199C199C199C199C199C199C199C199C199C199C199
%C1999998999999989999C199C199C199C199C199C199C199C199C199C199
%C199C199C199C199C199C199C199C198BB98C198C199C199C199C2A0A0A0
%C9A127F827F827F827F827F827F8F87DFD05FFC299C199C199C199C199C1
%99C199C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%99C199C1999999C199C199C199C199C199C199C199C199C199C199C199C1
%99C199C199C199C199C299C199C2A0C3A0C9A1CAA7CAA7CAA8CAA8CAA8A8
%2727F8272727F8272727F8274BFD06FFA0BB999F99C1999F99C1999F99C1
%999F99C1999F99C1999F99C1999F99C1999F99C1999F99C1999F99C19999
%98FD0499C1999F99C1999F99C1999F98C1999998C198BB98C1999F99C199
%A09FA1A1A7A1A8A1A8A1A8A8A8A7A8A7A8A1A8A7A8A1A8A7A8A127F827F8
%27F827F827F827F8A8FD06FFCF99C199C199C199C199C199C199C199C199
%C199C199C199C199C199C199C199C199C199C199C199C199C199C199C199
%C199C199C199C199C199C199C29FC199C2A0C9A0C9A0C9A7CAA7CAA7CAA8
%CAA8CAA8CAA8CAA8CAA7CAA8CAA7CAA8CAA7CAA8CAA8CA27272027272720
%272727F852FD08FFC299C199C199C199C199C199C199C199C199C199C199
%C199C199C199C199C199C199C199C199C199C199C1989998BB99C199C199
%C2A0A0A0C3A0A7A1A8A7A8A1FD07A8A7A8A7A8A1A8A7A8A1A8A7A8A1A8A7
%A8A1A8A7A8A1A8A7A8A1A8A7A8A127F827F827F827F827F827A8FD08FFA1
%C199C199C199C199C199C199C199C199C199C199C199C199C199C199C199
%C199C199C199C199C199C198C2A1C9A0C9A1CAA7CAA7CAA8CAA8CAA8CAA7
%CAA8CAA7CAA8CAA7CAA8CAA7CAA8CAA7CAA8CAA7CAA8CAA7CAA8CAA7CAA8
%CAA7CAA8CAA7CAA8A8FD0427F8272727F82752FD09FFCF98C1999F99C199
%9F99C1999F99C1999F99C1999F99C1999F99C1999F99C1999F99C1999998
%BB98C1A0C9CAFFAFFFA8A8A1A8A7A8A1A8A7A8A1A8A7A8A1A8A7A8A1A8A7
%A8A1A8A7A8A1A8A7A8A1A8A7A8A1A8A7A8A1A8A7A8A1A8A7A8A1A8A7A8A1
%CAA127F827F827F827F827F8A8FD0AFFC299C199C199C199C199C199C199
%C199C199C199C199C199C199C199C199C199C199C199C2C9CFFD0AFFA8A8
%A7A8A7CAA7CAA8CAA7CAA8CAA7CAA8CAA7CAA8CAA7CAA8CAA7CAA8CAA7CA
%A8CAA7CAA8CAA7CAA8CAA7CAA8CAA7CAA8A8FD0427F827F827F87DFD0BFF
%A8C199C199C199C199C199C199C199C199C199C199C199C199C199C199C1
%989999C9A7CFFD10FFA8A87DA7A1A8A7A8A7CAA7A8A1A8A7A8A1A8A7A8A1
%A8A7A8A1A8A7A8A1A8A7A8A1A8A7A8A1A8A7A8A1A8A7A8A1CAA127F82727
%5252767CA1A8FD0CFF9FC199C199C199C199C199C199C199C199C199C199
%C199C199C199C199C2C9CFFD16FFA8A8A1A8A7A8A7CAA8CAA7CAA8CAA7CA
%A8CAA7CAA8CAA7CAA8CAA7CAA8CAA7CAA8CAA7CAA8CAA7CAA8CAA7A8527D
%7DA8A7CAA7A8A8FD0DFFC998C1999F99C1999F99C1999F99C1999F99C199
%9F98BB989999C9A7FD1CFFCFA7A87DA17DA8A1A8A1A8A7A8A1A8A7A8A1A8
%A7A8A1A8A7A8A1A8A7A8A1A8A7A8A1A8A7A8A1A8A1A77DA8A1A77DA7A1A1
%A7FD0EFFCAC199C199C199C199C199C199C199C199C199C199C2A0C9CAFD
%23FFA8CAA1A8A1A8A7A8A7CAA8CAA7CAA8CAA7CAA8CAA7CAA8CAA7CAA8CA
%A7CAA8CAA7CAA7A8A1A8A1A8A1A8A1A8A8FD10FFA0C199C199C199C199C1
%99C199C199BB98C199C9CAFD29FFA8A77DA7A1A77DA8A1A8A1A8A7A8A7CA
%A7A8A1A8A7A8A1A8A7A8A1CAA7A87DA8A1A77DA8A1A77DA7A1FD11FFCA98
%C199C199C199C199C199C198C2A0C9CAFD2FFFA8A8A1A7A1A8A1A8A1A8A7
%A8A7CAA8CAA7CAA8CAA7CAA8CAA7A8A1A8A1A8A1A8A1A8A1A8A1FD12FFCA
%C198C1999F99C1999998C2A0CAA8FD33FFA8FFA8A87DA77DA77DA77DA77D
%A8A1A8A1A8A7A8A1A8A1A77DA7A1A77DA7A1A77DA7A1FD14FFA0C199C199
%C199C1A0FD3DFFA8A8A1A8A1A8A1A8A1A8A1A8A7A8A7A8A1A8A1A8A1A8A1
%A8A1A8A1A8A1FD15FFCA98BB99C2A0CFFD41FFCFA7A8A1A17DA8A1A77DA8
%A1A77DA8A1A77DA8A1A77DA77DA17DCAFD16FFC9A7FD49FFA8A8A1A8A1A7
%A1A8A1A8A1A8A7A8A1FD04A8FFA8FD66FFA8CAA8A8A8FFA8FFA8FFFFFFA8
%FD12FFFF
%%EndData
endstream
endobj
25 0 obj
<</Length 65536>>stream
+%AI12_CompressedDatax���$��&���?d&�
C�;\;�f���J-���n[[Y����UZ�(�������xd&�,�f� #+3���q98�������O��x�O�q<?������wo��� �~���7_�{ˏ~��/&G4��M~V���ۯ����LG{4����?��o�q����wo^����_����^ޡ��ݻ篞��g�/PW��n���C}�� �4�`e���߱���=������&������7���������Ô�?L�/ޣ��v�u��&3%C�����o^|�����O߾yq����7/��W��?��>�����y~���^�|������0�����;�����qv�~c��7�/���o^���a|���t�/_�/t���qz��W���w�0R<�3�ٯO�a�C)?�����l��/J�o�|���ۿ�i�[Lݘ�ج��{��K̬̂��1���?�?J[�������x?��~��������W�~��Ng�����u��G���|��˻�����F�ѤS�7_ܽD����/��H1�������������o�ɦ�� ���>���Kz3�� 3��y��}v��gӭ���w�2I�M�~����?��Wy�O�t���Һ���2�!Lj���}.�6���(�^��{��_G��<�����Ѽ�b�� ���|ao��Sl�߿�DŽ��kѽ����_���bٚ���O����1�';=��I~R4!o�����;�H]c����ձ����W?�y�=�5�w���7_j�������|�����ӷ������R��}��T���o����?�~���_�^� +�!}H������o�_w�g�߾�������Ͽz����z���_�~˧ߩ�O���n���_|=w�.�̙�����/�|����ܿ8��~��_x�����N���u�T�OX[�˷��Zߥfi�>$_��>k���sP���3��|q�-y��=���?�F������?!]��϶j~���x���x��7/�~�t���S��/�>�������\�?߿�c����ww�I|��+r�������;鳶�|�0�e���>��l������o�q��\�������3�L��/���p�b��a,�H�=;���0�?�)vU\)�� ���߀�%�%�Ӧ\�� �\���܌��x[�f`��*nU��-���LDI�o^�iS��i.繜�5J��z�7�ѵ�]������[�*�F�A��iU��U��*'-������V�m�ӯVuY[�a^^�Zd]���f��U͛��V+��e��b��e���7�����g�]k;l�a]�/W�k�dY�Ԭ�U)۵�Z�)��*և:Y�e�Xt��Me��@CY#�չ�k)7�ܲԓŗY���U�e�L�Iɭ̍����z��ʵ�ؔF�2� ��s�sλ���ɝP��-V�x�>��'�O����[L�
.�C +S� +�p7�v��v)e�s��U<�s������SH1�4�S:��t�}b��>�s�S�ʧ|�o�-��&7� �L�N�y��n�i̕��W�*^�����r������d��N�O�N����t��e�mw��p� +D�5C���pq���n�X�.� �K��ucq���7�g\DW���)��;��2�Un�C��|�Ey��
��x;Rٙ�-�خ��v8Pz����? g��x�'�H��˗�v0ܮH��� �*`Cl���d�!��2r.y9��&*w�"�6`�ټ���.b������/�+>P�<s��r
�4��` +�f��j=��i�v�?����?yZ���q�E�^�\�Z��J���YYa ���(����rrga�oе)L��N��,b�tU;Z��Nd6�˻3�C^/�.҆YN�a�v�I�B�ԩ��gMs���Н5�ڣS�C����1Z�Sߜ��|O3�[�"�䍈��أ%l$�"-
����FF��/�����ӗr6��Y8�*�ߩ)�)���š��s�]q]�;��I��x��L����n�fI�\���Jg�e�Xr������%>�,"eX�a��lX~PdS�}bٛ��2<���d����uX�E3Ϩr��;.E9����J�\d��('}(bs=�U-�l��4W�����=�9�"}ZӬ���YA�������L�6�%�Ts끼VJ����{O�X �2�=�y�e[�3UC�wD翇�d���?���S�ԇ�os<���;�������XԵ���?ʏ��O�BF��7�mLE�߰��s��8҆�+ �H$�"� �(�"�t��Ay��\��( �!�DʢJ�BFǭH��|��! �,DiȪ4$��u��N"e��(�r��E�"�R,R���Qш���Q� �,e$JI OeSB%'�Јj�Fĥk�K�(2Qh�ؔ|����J5��t[듖|97�nI�����?F������յX�4�̲P,~�)u�u�x��I��x�" ?4���
Q��s���
E6< KC�v��D�1<�L\$��9.Ң���j��U˭T�k]��/R����)[�[hJܔ4lTy�Q�� +p*�����2�:�Z��������a}S7zϢ��-n�M^_
/�Y�;l�I����r54 +�rzb�>l4��맕a�ýE|r.V��O��oGEq3��--U�� +ͪ�L�T��TJэEUZ*mX�M]�JY��\9���U��Di�%�%���2�r5�������=Ҵ����ъ
��%�s��(�It8�i�4fCT +a�);��12<L7�@2�0���{���y�D�H���?\~�s��t�-*X��*;�K>�y?�Ӌ+[� �@��c���&�*��PV��5m��\�8���6
V+-��7b�U[�#w)�Z��f{%0��<@j������Xp1�fr�b�=�]����9I�t=�G9 [>�E�����Xy�+3�������K�o�J��O+ï�~Q��Q0:1�L�<�98�Il�j>-�Ѿ��8��Jl+���u!���3)]Hh%��\h�B#ڸ����L��o�{[Z�&qk��"fÊ�mIWC�v8���x�}���i؎u����'^��{����߇q�m��C����IJ���Ϟ=�����c@�0�9B��k۱���i�c�c��wt�6sM�&;�XݸC����I1��T�� ++��t���ǵ�l�⟿Z��+R>���q�V��#���6�C�xji�7~��zQfd����@,�����zv4����.����/�_�b���S;;�c4`&�#
46%�0y��SI�R�����
�m{=��j�P���]�����|���|��s�|<:@>�l��m�������/z���r.��_��S �� +_rUX���Ba3|�!<4�S<�0��< Sy+�De&���W�@�AAr��-^����u�U��jKTˈX�ō�uX������ᒗ���e?��#u����F�nf��VŜ���z�Q2�7�sP����f��'z���3m�����dq<9+��r>�3_<U�k]' +@��rO���"���i ��
嚀y�0s�fE� ���:�g��x�,>;���ug{�Y�ʪHNEa십��]�����ԕd1����U���
w]<��[�
)�8��c�(�����b�b<;��]=)�,��I�ȥId�,v�+�PO���D �QuV�o���ʬ��*rk�$V_ba���_���U�����[�X.}�7I�ʲC#�rOL��,����lE����kY�,��
E����n%ʦ"ƞD��1V]� ֯$XJ���:�vl`{6V��Y�=�+2�ҡ�Y<�W�bc����~Z�-Cq��Ŋ}�س�o�g��u8��r�s��m;n��X�u�}!�Ց?�j6U615r#����I��n +�����w�z·�2�����_�}q��|t0��>\��v���,��н�e| +����(Cq7o]ͷ`['s�ث��j�[�d�˧�1rQ��Nت�����8
�E��Tԑ<��}�>�S������|e��f�k �Hʾ����_ +�M��^A*V��� +o�DT��7
�F�\'�uY��6@��,��[���eh>�O*�r.V��+÷h�#��exZ����:�i0�$��3QN� +ߑ6�V<ϒ���^X��EH��92k�V'j�X\+Kd��P�8S����GY��р3ɡe�N�qV1��e'��������%:����U�9J���1џ��P�:��v��lu�{��L[�5*�F��6Ԯ/�+B��ƪ-;��eф�a�ǓJ��ږ�߶<��'�Oo�_��K��M ]"�\�EkF0�ED��ϤE Ȕ���θϔog����|VUu�^�v)H�!�
{'�x��T:��U���jCIT��Ғ��آ(Z�J(Z�4�K�Y�薮l��Z�Ja���\"6�Bi(��D�9���P�{�i�{��:�:�6�KO�y�íO��0i�5*�a��l�X�!X�%R�K努Q>E���(c4���,�Z�ۙ;��^�o�;r%�( � �/>��1��]�3HJ��W�.=��Cq� �Q;
�J��liJ��B��%���۵�C^ײҫjL[ExD�Z䤵 ��n�I˴�~Ի�z��Mj�,v8�'��2<��9>�Oo�_�êD�� �Oس�&������F� +� +0j�h���MMo�p-�~v*����fP�j��0<м�4�A͗����ƪ]���\ /0�)�zdp���[�_b��ݫ���j�ZL]��km�r��kX��6�ָ՚�.X��Ƭuɨ�1i=d�.���LYO�^I��S��)exZ����2<���N�O�' +�������O�' +��x������m7��?�a>Y����kp�i�>��d��8��$�\�09�f��B�'�zgFx�q���O/e⎭�cT1�;ɸC0�tm�ojj{��(qp�͂C�@���z
���Ni��m���)�x�?��Nv������U��!�q�nܺ/�/���r�vE�i]���ŧ�Mi|��T3��ٷ�O'��ؤ��\��L+�u6�u&٦|t�,�J��tѲ���K�]���j�=?��Q��`%�֜k���,pHy�Ta��k�5u1'�@I�QA��l���P�8��MJ&�7nJi�Q��<�Y��O�d����F0��D��G3yv�hC��x/���e��w9�ˣ/�h�-�UP�h��n��u�&r�S�w��O���f�c[��x��^$����؝lx��qq}���c�����sn<���c&�z��}����������Q�P�M5V�����'5��K��9�fK����rC$ۊ���������-h4�5��^�73� +^.E/�y�j�R��Kߗ��i{�v��?����|�'ȍʾG���K�6���
�ʅ���F|�,x5�奔�v���1���a�b,��T������rT��hv��/�̞��ʽh�j�2~���s�&pr|O���s�O��!y����"�p�Q�-�����*X\�ZY���[z���4��]%��zC�@醒����(M�Di�s�g��'����-tuh"Bm�@�L^u}DmA�n$��$y���`���0&�g���nճC7x'�᥎�(6�Kf��t'�8�=n��W�l��AS��uO���x8S�V��*���;�T��d���>���ٖ�I�İ�X�#�!� +����Ma�\Q��ݙ������>�Y+|�Z��[1�z[gz[����1�Ԙ۴���mJ�Ur�5���Y|�Vn�o�d����w��`�x��NR�K���������i��s���l�\7��P||���T��GY�ug�nK��E��$%V`��t +�6�>+j::�T��\P�h��e�l��銻P�n�C��%�o����S��5�� +�YS�h� +������fW�X1V�������� �*��:�I�2���S�O�BI�4�4�!�eV�k��?�x����ܓ�'cO��L�j�4-���o�K�����Y���uU��h�%
�J���L�fd��-y����t�u�����<��+q��e��Ymˇ_��CU���V��N`7��� +�6��<žr[D����\,-�9n�^$D���8�a�w���2\�0�[�����ԡz*-���-�Z�L�T����F�h7@�K�`�nQ@밆����#�^�M�n���RD_�y��rwQ�v���p���ѹ��ჲ�p�b?�M��c��C��a7�M��t����;H���sM���8�)��4y%q��i��$�!�wb��-� +K���g�Ѣ_�� \߹���D!��˔�]
��b�j�Q"#ΐ��Sm�2�a����+|�;rud�ȼ]��A>���Q�?u��l�R0�Ԝn����`uEss����9
+Q37�f���Q�;NL��t��hp)
n)�n��6W�Z����nE*���:]�y�u};� ��ӕd�q�Y�J��Z����,�=���*�S��Z�� +�`E�;p8O� +�n��2�
;aN(���FXg��`��ᡭ�Xb�mZ�b��w�k7����ax�-��(Å�S[���/|���um*][�W�m�!n;2�.��_�=�1�1i���8��c���T]#�w���-����ՇI�~��ݔ�÷Q��~����^/�CQ�J�Rz�$��-Hi���[Ȥ"k���?hR���{�W5�q�n ���U��V�i+��~� +� +�wh�p�C=�C�����~��ӷ���ݿ��OVr��b��X������ݽ}
����?���9D���a��St��~�;X�4�3��a{��G�Ol� +DžI3�^�+�0pl)=�4/��$��M���'0Y�:D�H�k�uˉ�f$��H��˟��^�f���<�$����j�'��ɲ�'pe��8l���,X�Z�d�.�T>�S�� +��}��[��Ϲ0quf�ۿ���df�7_��������/��ʃ���s���7_��ٛ?��o��jõL������{����آ���!TfE�b��ѝ�(��x�L(2�f㴸˸$��n +���,L"�C"��z��J��Є��� \��7T����[���ʤ�d�+���
�6�vB�oe�W]�!DW1�oHwm%H2k������dRq'C��Վ�XZ��[��i;F�x#�B]y��oe�����N�l�3_�c�D9��D/��*m%��� +dބS�y]�-��
�u��H�J�bc�x�[ ��w?*����rYrB�ʟ:3̑��n�sS.������e���U��dSi�k3G�>fT�9i\�h?��q��s��iC;��+x��#���@E��:��P�����l��XJ�Kun|���ƛ��y��$�����8C��(A�]�Z0O�ׄmx{\��F0TO�E�ȓHfw����aaJ@C�r�`%@|�R%�R�U�#>L�o�;yp�"MfP"0�=��Xp������n� |��9����APr�-�� +�2�3A�(L�O�ř\��'�"�D�ӂ���3��� +|=g��� +g�Z���h+������6,Q�����Y��ޚ�Y�ռ����9�>s���ǹ
%ґ�?l� ��m��m]�㽃)�L������p轑Ch�M� +�� �S�I�8\���Յ<%4��4.�i+�഻�2�>=�ρ��o?�R�ݵ�4����1��������?U58?!Yި�&�2<OYuf�\1?d1����J�Y�^U���wR�1�4Q��@R��'q��A� �S"�ݏV(�d@�DU�w��e�%E�A�[�ԕ +Y
�BƸ4�*��h��UN��v�v4��N ��[�i�^:�N"hw��@SQ�AK'!�S�;�- '?d����ۅld� +��eLQ�-2ux5n� w��S(�1����&y Kٵ�'��؎�������Ԁ�$Fa��q�R�'O�>q�ň�LeL�f�9m#�p\����K�dv�e���~�e��� �K¶����#}0�U�O���e���$��|��xA��* +L�T�U��$</k> ֎�&���&�4yr�(��$bx�(�5�M�0����Ɉ�p�r���w�ݗ#�-F6<_�� +�4֣VԻ������s9)߲zNWQF���m�;�-:�ϱ�?�3�R�O�N��Y�Ϲ4w�J�?�Y���1�F�7lֵ�,� ��F��8��J\�o���Y�}�68j @)���7�TەT�E��ਟ��� +��ic�� c&���N�-pd<ttd�pW�# +����*�NX
�F^��ӎ���^�p����r���f�WY�˕��< +� +`��^��7��1���q9���M���(ID�RΖ72���� z�\-o�7�9� F�4����B��!X�9f6�:3m,o�(a�)H�S
o�S-p���C�}78r!�f.�. ��k"'W
o�g.m�m ������B�#Y%���O�ň�X�H�����pd��1
L +/��
-��"�UMg�h=�l1{�u�������`3�M��d�h���<�1i*�"h_wm�w��`{{*��}'��㜥4+q����-������PO�UMcdm)G�t8��41M�b /�7�1ru�/���T�TØ�\Bb +c�}[�2>���d�?���ѭLc�̍�w���0S�kY�~x;(&68�`d]@��i� U}�q��@3ŭ���Oʨ4|n�ނ,���xʀ���1M����O#�i�ڸ�&H-�nqdq]�$���������v�����0��qTɣR;�{��#OR?W�jJ���'$q� +4��"�Fj�0Z̝��e�H�Ӑ�K����aDc�Jj{�
��e�Y��[�E��l]�����l�B��� +����yi��/�3�Do��:Mp��q�yNj�z��7��*�<7���%'D�fW�ҹr�""���u���:�N�#=����չ��`o6�H���{yvw�#�l��}�����}�2���9��t�4���8½�e�b�)t����sg(]��vFy9Q� +w�x�7c�"��"����Ş/�N7��vCyl�.���D�=y�#ȼ��oJ��W+��3@�x�sv��ޝ�b��t��։t�ym�f�{��<<A��t��K��>���nХb�%u�V7K����$��3�)ގ��I^���c_S��ro�T��#��x�C�A���a�#�4[So+8ո�����{|*&D +�l +�1 fE�h�5���X1�F��HX��P��I�X
�X|���5�^ɓ���Ir=���t]�F3�}��7���Q�0Y���u�oe��%D�>��9t��Ɇ�/�G��e#�*�B�Bu� ��������V�����ѫ���!�-�W�'��0�r���Ǻ~,�����!�^�i������Tv�tI�t�u:+�!��H�{���D�>GY�ƕ�n\��/� ��iǩ�'+z&;�v��������ʈ!�5p�O�����|� ߩw{��$�$��{�b�����[�BP�����O���;�y,�Ͼ�Y��[FK�fa�5�;-����g��L�P�>��]yl����?���w"CuQ�*v�����>���ͫ��БGq��E{'{:� +�豛��ɗWi+v��w���f7��V����'�˒�Q��v�]�j.����gT쒑hL~��^��eY݄6���:oCت(����^@Ú�d�7���^_��y�� +��D�LsL�^�:���~�"��r����|���ws5�mn%n!#\���� +�얍�y���0�9ġ�xJ�xI&0!����S�l�
<ཽ�Az#��(k$2J�S���` �L%��NO;�/�< &��*���0��y�f0� +��XO�V:GK��oe�'��o/^��wD�F������F�W�f��n� +�8ݱ ɉ�)Z\ɹx�f#~������2�`gW�uSq!�nH����"��7��4w`>��`��ő<`�z�*P��o��1�գgu�ΐ!?��穋�H��#�o1)g����5�k7�8�'*���%��Pb��NH�����j�2��pW�������FpJ��O�^6��G��A�0SX�b��;�V��F�� +/ƺ�7��E�N����)�(ꦑ6�~,VE �V��SӢR�fn�~������:}t�0�%�GQ����D��j[1"F���Q��Q�b3Q����]���?��h�+&�@z��LYB��� +,%���M�w��'I�������a�$�Q=���u���Y���sT�B� -ݓU���g&��TQ��L�QL��g�y�iP���6�Ǝ�}]7iR^!FKBᦢ5��J��d��2Ɲ�:�����q��u�#U +� +Gbg�y�����@h
<):o�^�i��&�망�n(�������� +��"de�A53cK^����3C��"�xf�B+�D������uŅ*�M�fH�V�@��cX�=dԥ����
b��kug(]��ꓚVI�`4f !m��� :Ez�8ӿR�@��L�M7��P[�y=��A +� ����D
�T�CVc}j�x�ɠ�j�)�B�Н+e <�*�%2.Aܖnb;_���G韬����蓺V�ɕ��V��v,����]ߠ��wj�ڵm?��c���Dtp�4���Gb@ +(����<j"�y/R;θ��:Q4�rS���%f6�tw"zSv�[��NC*���F��J"�"�9����XvZ4�O�ZYե洣ԏ����8^�/\�NM�e����������4��cݲ� +X
d�p> �.hۈ~��$��t�$k��UeG�ʀ<���K^�ԷxQ$d �B�(�^��먭Ş���Bע}�*M6��94�O� +X���Λ� +u�,�_w��<�Y���l +r�顰�^SÂS����i1�hȤ�3��[�I��E�8}R�3f&� V�N���H��eA�a�*iq9�8�Nq���6�8��.�p�̺�h�3�h����I����i�0�Tfġ�E�"���Z�g��y�/�롵� !�
�:�x�>��-/���ߢ��Z� {�[�;��=��qUZ�*����Qu��/��[�e�t��l��mѾQ�Z7��n�v���`܆���E�U�����v�� +�����d7�GW�c4zv�M$�A=�Ne6�o�|�5%���8��@%&73�7`pT=ҙO�6�+6�p�ү7�h�����h
6M\ɳl�'�k�����_o1��S�]������L�t&:=t�J$+[�TN�5�G�t9�C����PM�-���d<.3%�ԃ�q���փqL;-"m����նo��Xlo#z�9�xK��c���Z�$���i��@5�ύخ�촨fL*J�����9JHm.g��/��SCނ�1Z;ʌE�U�s.G�T��`��rt*e��&9��i��c�]�����c蘄]:�7J�Y�-'�Z��hjC�=��*�[�6$f�|D�(s�WB.�ͪܕaZӣ̑6ţ��U��n�&2 �j��Ȣ�;z�r�;�����;��/\C����B�N���(�Pt�BS������n`ߖ/5�q;��Z4��t�����D=e7"� 2���
�A����tS�
履�Ւ-��<��`+�p��6��H4�]�a�^�]��ț����b�ӊ. +8�<��� +�y�-�3��0m]}R���O��3����;u������N�#�4�f��S�����>�X)�pÉꮅm3�8����mP��
d\�K6��oѼЋa�Nt�43�Ҍ�G�S!xzF�ж�^pݴ��t3���zT9�����BET��"�C�� ":�]���È�@�:���~$����@":��$������:��J����z���^�������.8D��ׁCt +6���~�)���/v:R�)h��M�'��o � +���|\o��a\=y�)t�3!��-m߈7p����@�y7��E�:�BҔ���������={�R?���G�|�?�V�a$T1Oب*�Ed\5!�s�oD� �4��@����.�3b��$n��J{Us�8^}]U���~9�)������-�ר>M�!�:4�iR�#��e6���ݏ�i�Xe�i��ig��#����[%.hb7Ϡ=[/���ab�rQkG�0���^3��Y�'�{���:� Ė:
�vir�wb���+��V��Ucն��$���4�M?��ʼӽP�짠<���-1$��[&���m�I1_�Vb�F�VcF2����i��@Tk����ʸLŰA���[��#��4�S�~^Ʀ�5u<4�O���>N���JE�(پ���v +�s.M��CoEL��I���ə�nܶ��x��`;�(�V�����LG+qv�^B��dI�kQ�d�X佗�a��k4��Y�|��X��;�;�i���Ӎ4h|^3�\ĺ�&qe�ߩiQ��fn�~������:���\��l(ne�GQ�j���~��Zߊ�U��!<�j�����i� _0�Ϥ.آ_�����+T�B�sG�߭�5�r��Mq�ym�v��x��-&�o7���_��k�^�m�Oj߿率�n,�-�G�B"�K�V#��9+�(�k�-6��s +�"�'�st�'��2��r16�T�2�!"��}ؽ�����Hؿ�7��E�U��k���醺��c&�C�]�JS��f��z�������)bM�7�6P
;T�ĠزM�V�r�r�"��d�� �+L�L$~I�Xb4�O���w�:մ� zA0�ö�d����kE3�ڭVZ��0�>�n�<����V���Q�
�ܾ{�M7�P[�Q `5uf4��ф���֘+3�ъ6F_B��D�b��K�-�ɢUdV�]|gR�B�9��AmA�k��8Δʁ�h\�Kעy�j�ݶ���<Pm��s�Z�������Nm�eҶs��S��
Ũ��[!���?�7?Ad${�r$ж,�4�����1�?P܃'�D$-�zT�$�x׃�%�)�A*&h�*���c���@�4Fh�h�_�2��ja����41zY��� b^�Q\�jo1c�q� +� +6�@a�ae4έ����,MG�q=,�(z���C��ݺ&��u��3�FB�w���$�l +E��{,���6�A�2�� �xA�� @ɹkA�v�*��«��;-�
��dC�B�Dn��}'�dхt_"��1�c��h���FZ��@*̓�dZި�\�y�ř�L��b +��--�-��8
�"d/]�T��̴��t�>�P���I���(�������v����u�4O�8oub��)��{4W�`C�hr)�8E ��h��`�h����K����}L���Z*h����E4i�[4����g�������c�j#��;�DKe������uk��#��i�[��Ni�9s��R� �,�i@����`-��~k���9��N.mm�] +,0����+����\�10W��sZp�yt{��˵�� j���D����$}�4E}
������o��~}����w�����w���ᗿy�n��o��v�w����_�^߿����~����ֿ���gx�۷o^_��:�7_�m]iF�����ϻ�/�����ٛ��w
��n���}q�����R�����0Y�߾y�|�Yڛ�gW�q�n^Q�пOw_.���������/�G�EQ��� ɺQ�������<�f� +�ɵ��,����;}�WCg���_���;�����1��>1FF�>g�g|p4�������s�������mY������n���^�۬�Ù��߉|@c5e�D!����'�1ծ�뀑��V+Fky�>�٩�*� ~���y��#og�clJ)+��J&�H4��� +f�`E +�ZT:�УR�S��9��@�3�%O���,�#/h���F�1Cv�U@u�yP�k%d +y���
}�@�Z�7�p1�W$��D��I!G�a���TI���@SVPK�������L����XsI��ш����ҏgPl>UB����n��>GRW��9�E&��?Y#�Њ +�����l����J�F�����IV��E� [��V�� +81����d:(
i��Dd�;YA�'�1�-\��ÐP� ��2mE���y�"��V$Q�ғLd�QW��n��9"�(s�8�0�0Y<'��)HQ5Y�ۑ���LK +Bn +T��ى��V�l�����K���+��<�b�T�㤙����SQ�-B3Ŕ5I�p^l�F*b����^�^��+]�n%B�2�o�-k�5|nh���Q��!s陣�KP2�>nK�v���b@LjHE�#� +�&���4�240=#����%s��M�9�I���
$Q,�*WN�X��YI*�J�
GFO%]�POH�(ߢ�T�s�eѲ��W��T<0����ƬF����&v�� +FB&?�i��Ra}�4�J[1Ez.�� +W�
�a�ҏ�e +� +�/A���xC!�A]U��8�V��w�C��!oO�s�ᓗ�C�j%����\B[.|&Hp�xQ�3�t+�d���`�X�)dV�ǩ� +4+GN��I�eΥ3I� bD��I �`��x�����V4�HE�=�s��Jeg�
�%h��>g�8���H\;��nZn��e�3�ٙ�YL���4��tR9%������\��U��ص�ءI��T|���>T�~���>T*Y�IxYq�;�gn�0+��)�[���"|�=8:W��4n�D�L����_B�QI�>�l�C�$;w����$��t�д���;���#/%�~�ԥb��oG_0�;��hAr^�9��\�o' +QW�T �&?�H��8 �5`��R�oF�9����H����l��Ie�v#�Y���B�\j'�A�D�U�Ò��CTG|z��!�VX���V."=�X�>w
��8��F�i$�RJ�[JW|_���p���oe-����v�8�G��O��|��� ���! +IB��Hd(��z��S0w'�<ziGa��\Ɗ,��A�g&�B3�1eE�)�7��\@5�0jVfX\5^���)t=���nKOBՖ�@ +IEm��l��a˴�Rvg�*��t��-#d��D|n���1w�81g��e�/$R�`i���q�E8�+e^���2e����[5����ע��>�)�~����-����~�(i"^��Yш���*�W#C�J����'���~�L��#��?ϸ���KO�Հh�Ju�3�8�IL/��EQYɭ@E'����R]����3����D�" +�!�#.��ZU���z���Zi)V�y�~TD܄�tY�x��w��� &�:��GX~i+;$2��d�9&�Ee'�i�!�� VA�Y)�VQAE�ṑ�H�TjŭQ�����aW��]������2Ĭ
� �H���� +j/��P����݉2����L��8���z�t?�P��siFOI��q�����K&W��'��5!�4��ĥ�j(YQ(� +XվU�P���d���l�V�@D��w<���%ߜ�bF=�E���Q30��YUJ��Y���9A}7� +��jO�*i�j�I[����9p��>;�2U%�D�c��&�ƴ�0'N�ˎc�yB*¥$ ���@��k��[ _K���@���(w˚�fIP},PǼ�(�gn$:��PIc���㘊O���0�gT@t;)�-",$U �1=ȗ��N/m�3���x�6i���^��d�Mf.,�&b�H�dI�ЊQH��<�h���De�(�h;i!X��z<���T��$��J%���n�R֒|�% ��4�J��� _�$'1�'��;q��� +��$uRƙ�v+���q�&En��P�>�ğ5\j�"Gs�`���c��~�\���|�P��$=�Dz8��N�4jsM$���P��<��s�p��E�� +���2�8z��i���5��Q3CL*-���B1e[��c_�aZF��q"��&+_w<��H2�2U� +z$9��FF +ר�^`q���$��sA�"'P�'d�#z3&�i��pr�ē�w��nTh�H�0I$��jNy�[8�º�8^+Qޓ��m@R}�(`|��ֈOE�
|��id]�RBR����+:Q)2P�L@�(o$T�p�0��� +}�� +�%EEWg�8�չ���Ʃ��A��]�x�n�Y�!g��ŐIYW)�¨{�D*$�q� �F'�w�c2xL=h�+��)��W��XQ/��G�f[4%�X�CJ�損��Pa��^04�yB +�3�ٙĊL�$-8�h�R�dw�rzjs�K���l +`N�_�7y�:x5���u���� +YO��l��OEa)��J2���j�B�� +�PHEw21h��H�#u;��(DM��v,�ٓ���-���� ;I���������dgzW�{8C�@_���a�l=0`��� �eC�������<+���ܟkR<0pg3"�L2�b��gC�h4�9�r0GG�u�'��x���,� +Oͪ�q.��H�(Er�m +��%���NX=��f��_'s36O4�h���<n4 +��um�ɞ��K㾾C�+R�قi��EE �KY��)�D�_�XB@j!O7�j��2�Z�?���x}pq���ז��C���ZxA\M�)��4T�/����\ �������k�W�ڂ�uc�Ϲ��+�M�2NQ����.t���W��Vr�c�b�u��Jz�4=�եH2����S������6���2���F�ti��>��
����0ng�=ܞ��q�)� �l����{��F���n^ +4 +�2A��r�+Pj��#������\�͍i���&YS~IY�6�e m�C�ۨ�j�k�� +�'�-L#�����!��<��؍�I�MM��Ϊ��n0�ǟ�`�� cu +n-��K#��!!�?�F�T��
4IS���i�AK���X���Z^�!�Tzt�AwJ�6��:7��~������:*�G�Cb�!1;���8[]>m��S*���|)겍@
�.(��W� <�:��; :�զ�3 +�h8����q������ML(=\���2�)���@�������x�Y�ȫ3{!n ؿ���? +����mD�=��ߞ+#�Q�Z)�N,�czA-�\7t�6�l�N��B{7qes���P�)|��ï�M�C�c�K-8��>��4
3���4Lh�=���^��Q���H��W,7��)ӣ�3���?P8 +!FR��d�%
Hi�&��v
��* r��*Y�6zELS �"XG}��v �`Ϳ�MA�7�R�-�̫{�f4����-�?B�E�f����/�3~bpG��h�v��c�P�S��|���]rߘ�d�
���2��J9�|J6 +�m!�Dr�<�
��K����9 +U!�|j���l��_��p�$�7G:j'�R�d��q��!U~�~־�
Em�;np� �A��*&<��8�'�cQi���T��r�[Lm���G@��^��J�)�.bf�_y�X�z|��+�Ǟa���V�'%Sf'\�<����]1�)f�v�=�%�LV��e%�w�b��$�T*������돐C�ʉ�� +5\���+T�-�=��V�
&������{6���ϲ��s�?X�(露�>�4��}��<�����Z����M7�Jh����]�5y�曲7�1�R�d�dYl=�y��E�p������w_�L!�;!����N?P G�k6��H�~���)H$�(��Ң���a~=�Ћ�����o���rUO_7�t��~o������}���\v��S�)u��I��M +1�"z��{`�3:�i�+�|���R���S�C$2Z��֨��yFZ��y����
��Ru�NYU@\������da{@b4a��$4��}2*��/I���^�2iN{�8�W
SO��e�Wi��2S�����W��PL&%fZ���p-*�ޝY��Ng�]�JQ4���@����D�+�^]�����'�@*�r����2N�7j��t��Hyq�S��Q�m�V˨�ͥ�{*��ݨIιEVR�J�'��+�֎
��ah�RqC +����#��M����r/���5.�i���w~�hta��C�ƌ�K�SAS�ϔ~�DK��V�{���%@H��"�`7��5K��K-Ǎa3����]�� +�N�����oU3髜 (<s���5$�{�ν�}�����I+Ը_\��k�����@C�G߸����� +nS��Vf���NMԴ��G<qҘ�<�35����\�Ҏ�]��5ۖ�t�0ɰB�;/�1�'�YV�4�%A�N�$Er��rR:�u��`���+��R���_��.5l��uG�&��Bv�.̯�i�Ush_�j�ә�!f?��P�zE2<v���j��ɪ,�uj�-H�R�S +`t\���_�(vk�j�3�W�f̍~���1��ŝ�8~���q�����m��@?]'8910xiJX^Z��8�%�q��:���J9;Źk)�w�Bop��{��iR$.�$D��E��l��c��ydЍ�F���/@A�)��W�g:"�y7ztK��(��*�uo��ef�6�b��V +Ku����cbb��]����Q������h04B-z +TKh<���,�ŕ0�ݶd�1�uz�$����K����1�;�:�MQW��w7w����4������s��_�������������?��?���/��?��C��4�~�QC�i^�rA��忬^2�[5A��+����cK�|�f�58}�9j�%����B��0�^�UY�FHG���Q�`�BY�Qpbfӹ"���v���c���/,!��t��ɰnE\L����"I�1��=��͊Rߋ��G���фP"f���:ϵ���m�C�C�V ��]
1��yl�e�EY9��\�f+����*n����/�fr,i^�/�@��%V��*|:�4��f�~�ǵ��F*>�U�|\W�FU:����w��X��#�=� +���ψ��5vW��=��J��Eא��d�;3]助�Q���2z�tN+�_���`}�{�"}���4�*�T*Q��Г���B~�_d�)봳�4Fړ{�f�)
����$y�����ضi��9ؿ`W@�hMZ�,��[P� ���B��0��@��Z,��a$�|�3�<�C�q�rT
J;��v��Kև�`N����ZuJ�8��S��l)�~�6?�� +�8�O^AV�� +
M{�� +1A-w݄�)I��Xe�Ye�`����(�a�E[ +�^Ŵ�r�!ly�@j��94pɠ>�Y4��s��t�(?�~�N�!�$s� +�ku�{a�R9��'t�v�5��e +�K'��S>!1�=@t����������P�Wfl;Mu�8��Z�]��oT��X�ó.�?@i d�30��P^�6��@(A�G�`Se +?���:2�˴elX,&6�I��G�t�&��s�۠�q���Jr6:Z$Q6�D0�N{+��X���PO�M���#��; + +@0��*�'�7v�
��?��b��ᒏZ�� +^�q�J�� ��P�{�l�nD��X��'���a�-��
�oz�.�� +�y䲕�[$,@ ��豨5��d*�� A�9�.i!3�~�:E�����gu����ק��+�T��B,�U�����A��2;è�q�߽(��g�j��E>�RZ�L�����k&��}9E��o�B1�����ws�44�&䩡4"t}n�U��(a�s��!��Sf6Ce���U3<�� ���3�ޖ,�8��a��E��v~@3�ڑ�*��BDzL%g����Ɵ�S mA���9�2@E���h���1�t���zE-h�� �6�=����� |^�q�D*��b�T�`[��B�D����������ˋ�M9 +��]l�뫜�%[��U�>C���8L���8�d� +�G8x^�+g +
X{�3Y�=�aY���L�R��I����N+v\��)3 +M�H�^�����d��_w +����8b��ʋ�ң9��rK֚�F�����HU��[�O]�A�d���x�ހ��?7�L�|'� +��Jytw�F�W��r��-ԼgT9��ǁ��77����M�VDF�O%����a�=�W�V8��s�{9D�Upf���B)�R|N�9E��.�6�݊'5&�����%���5*G�*عJ����p�m�}j��H�� +�::�S.1Y6�C-.ncE�0�ڌ{�����`�}6\�hpY��e� +���o����}u��n��`\���������YZHi�Qסo���stq��R�j�{6�a�Ο�ȡ1K�
�m����F���v�ʫ���R����B�P%D�-Ά9 x��g +���� &�����\ +�OX@(X�8���b�Zgw�@C!'���AQ{�������`w�+�9qV�r�6%}L���� +u I�)#�E��q&GUӒ��JC��x�z��C�>s4fYH�x�{D��dǒ��Ա��p��\lw��Mgn��0�.�P�Q�V�<S�7��2��=r���j륯��p�T�խ��Qd�����:35k3;������w�P�g�Rl�x�_�l�BG�R���:T���<s�O=4� +\��i����7RN��)m���
=�.�6ڡ��X#��rՄ�2�h����j�*z�.�WƷbαsE�#.��N��HVe_2�E��:���몲��D��)Rʦd�U��C��-�Lҋ���!�Z�����k�q��爵�S/����B�g���/nY����v�#A�*B�IgZ�V���� + �����W�P��<�Cp��s�j +.�Z8z���b�g��m����Nn1-���)�8H���w�h4�=]
��� �S�����@ 6(��� +�f�8Gq*��ܵ1���q������,�*��l���|X�V�� +���7\��%`7Ľ?#�O �MMV>ży�H�|+�D3Sry,���������$G���y��Ѐ��@���@ce�J�%�
�=5t�n�+���C'�P�|o�Ua$4{,g0t �_�}8��PH�G
P����b�Λ�S�����$@Ǣ�*�_A�%$I�)��r�m��D�1�ʶFe�^�;�^F +�AQ��e|��(U�Xj�no*I���!CuԐ�E�V�Ad�\d�����[�����V%$M-���<w������iy/uO����,��(��9 +ŗ�w*8e��⡩5�D:O1�+��������z+�U�4x.�G�OmXHa#����g�s�/�m�����1@ei)������Q���ZǠbQ�4:�>V�;�C��<�36��لd�����i�$s�̳8ȅ�(ߧ�5�����y�-�� �d�n���ѽW��"^�m����1�$�d,_���z�DD�9Ƕ>�����4�#����Xh��D��;����u�ܦ$����K��s����9M�G�����jTo������Rn�_�D�s�����?��������?�O���?�ӿ���������O��O���������������?��O����O����������O��������������ͭ0����'���Ϸ`<១6�`�V1g����� ����ܪ�n1�������7���Z���r�7��ŭa�~�|f�{����������1S=���V!o��sT�����^�!�<�!��#�
��+�I#*�6(g��}�|�щ|BȺb+[��)�>�$;�fq�Z�vBIU��s��B0�W0H�QL���s��l�T�� R�g/�?/�z�KԾ��{��#'A� �=����fy_�ݧo�����(?[�.&ʧ�}!���
틐�����09� +a__$���Z_
)��Y=Lٞ�G}���okzJW�Gz��)�o#z�>�����H����Bd��|垦��2oC�?��W-O˷�<�#���I�ʀ�~6���Ĵ��x��m��]<�4��O.��)s�6�Wl�[���K�G'x���o�ξH���}'�W��ݻ���p��+Av�os�.�~�tq�s����6���=|��
��s��~��w�B��~��Xry��w���6g�j�˓�r�mŎ�"�0ۂ}�
xf;��'BO�u>��=hKPE��:�t����{�o/u�1�#�D��.��;��q��2]N �j�e�nd�����Y�G�!,a�q[�m���
L��1}Q�RP����.C̲�|�>-�tya�h��J�G��8�4�02~�~��'�w�o��y| D�Q�� ++t�/ks�G55��x/�F�Q�����6J7�����l�q�((Π4��~8����/�m����o��ct: .?
�/d`�!_>�+����/B��nz�1��uN��i[�s!˰�!A��f��y����[
���_~��V�۶ܱ[�Y9���nQ�2���L^���ї!��#���W�~��G��/ݮ�5(}O��%��0�"(߲����oyX3�Đ��|�C7!���Dn��4\��m��&���ᔿ N���Ja��
�!�X?Y�EŒ�f�]"j��7Fp���;,�=��/��u[{�7.�OG��<��[�|�0�.�S����y��۶�jpaE�nZ��O�nS +�mҝZ<����'��Y� yF~��FID��p�Fż�vp���<}�)?�m�-�)��e�� ��4�f�Z�jOm�I�m�]Sl��Scⴎ��n�e��$����F�V��厍+��m�
4uΧ6~�g +(�=N�Z�K*#��69�ON/sc�u�/sc�d��i��S�^V��遼�>����H�,�aQ{H�l�p������E��J|��0#�Ƕ1R.���^���8|)�Yn��I��ak�4Og�����A�*&�-��y�Y �v����'��v>T�7�{�Aέ.,̂��r�=��*��f
��*Q�x�����d�w'`V�@�� G����ƿ�棞���K��m�{�V.�d9��+`b|:��g��2�=�����%�Ǜ�/��B�m��VC.L{�w��>�zYQ0w��Ų�lg^\�k�o�������>��"�ۇ���Vx�:?�Q�o� +c�؋1�����.q���Z�{���Ɓ6C&�i���m�\��#�f>o�2�/r/ +���1�m���u��0�~[�2���X���t�ч�-����Tb��W��~���ǖ;meq���3d�-y���ɟ?��R.T�Ib%ݦ�gY�+
D�u}��ڻ�����=����5����S$V���k&zʴ=]�=h�t�oGX,�2�_��O��ω����g�*���QY����<y��o�Y{�K@�����g�� �Ԝ"���=���d�_�l +:�Q��F��-,=-�Ǜ�=��0SY�_F�oo���6 +�g��7�l�Qڷ]�\�]bi��_4�Q�Mai ������ ,���}z���&��G����U�����?{�zǓ�3�ȧ��cs�R3|��֯x-�|:�^ji�m�J��B��w��Ҟ��A�b��r�#r�z�j�x�o֭��9��s�<^�Q�sdĴ�=\��U��V���.�M}��S��puL�!�����\}NV=�e����E=��H]o/W�
uI��\m�ׁ��O3רn;i�k*�6s��r �n3רl��hכ�+w"x�:��rU�� ++�8FN*]��+
J>����J���T=oWW�G�����jCU�w.i�����Wb N��eۻ�f��4>�we��8��&]������8MH�,�W?e�9?e5i����Q�쀄˛�+� Tt��U��~1�������{�`_��y�1h>��q��� žË�m^="�㵔7�Wb������/UCl4���,U��39�\��UiT�9\}���w%Ai:��y�ȵ�tܭy{���k4��Fr���կ�*`r0n�W�,�� +��v|�� p���5��!)�ެ_�(�c��թm����8iƑO�W!)�Z��cێ�"�Ηe+�ۈ����ʲI�nå�i��6V$JyW��Q\���aT��Bv|������W�L�2�'(��k#_{�ۆӒ��N��EM�a����U�!�<`������zZ��Èt�z��}:��ӻ{��2N�?�R�C�&u^;���:��#Ӎz ��~{�֙s������>�3f����X@��t:T�Io���۾��B�:��)"��M<�Lu��г�� y���^[y�,��u��g)�V�=\A���X ��KJ=�ض#�>�ڛ
i3�=oR^á�dl�z�2��}4�=�m:������m)�s�Q�t;���.��(^�^��x��~ۈ��9ú9)��ܛk�ԏ�n�P0I�Z�G�n���'6���E�d��6�Nқ��Rn��f��lV|�->Ufa$.kOe\@ -G��/϶�-۾�/��q��a։�/`<:��N��Bd�,�#'xr��v�+R$�Sw��M��f��[�l��{�l�X��� ;�Ŷ��yM����eU3������2l�����-�>�L2 @��1I)���ļT�n'L�#����-@n'LP`敍y8a��c���N�B&�p��GS�j+�L��o�|`��N���8��� �O���4�� �%�ˉ�d�:�����e9r����%I �W�٥W��{��s1��.
wTbP�4��^�x�ذ���e9 +G�7�8o�KB��t��^� +��=U ����Y�D[�����".s^Z�)��&��� �4r����S�0(�50�x�����&�6T0)o�6��J�lL�('F����0�% ﺝ0m�cu\��
���}Z��RU��n�(�Pb�!� ez��ү
����o��ڑN���+Ey�(��4+���2yxb~E���2�I����3�.�ٺ��f��S���s�.�3��SuV��g�gOOLɟ�!c�q������eC���\R�)�p�a�Ĕ����VM���o� +$Ϯ���g��H�(�� ?�ζ�D��:oL�F�@�Η����ñIb+�d�6�4M����
/M�E�+�P2
�R�AV�49�_\2�P���6Χ��ex��T7Cg�����Dɥ��siѦ +���z�>�&j�k�ҷϥY}�^���A +lWK��l3K)᩼yX�AA
a[Wv��ݎ�]��fTɱ���S� +�����6�S���/R¿cT���� �?�0h��p�j�4 �<L��Ǵ���r�L�����&��>M͂/��/�>3���ı, +9�< +v3���������}hw!\y;�y:R���p�i�w�G��-����FQ$>Ai���O;�f���|����8�������@i�y +�6���Qd���DZ�$]����w�']��Z�� + �ݟ��&��x�v~� q�(����/jE���SS���y��Qr�lx��}7.�?."R��7�Z�}��E�s�D}�i��I�҆�����@�`���?������w��7�ට�������93�t{��G�M���mO?q�J��=<�l����J<ۘ*�9$�:f����0��u�Y�N��2���O�+��H�u\^~�Ʀ��� +=����$� ��m�'<� +�} �כ�=��0�}}��?��)f����ҫ��zs���b���SWOOǿ��/�?�/l(�oc�˿9���$����B^}Y��+^_�:��k[��V�ԕ#x����ȶ��G�?{9~��Z����_�I0��u�d����K���r�\
Q�M����%vљ[������2�S�1� +1xe��V?à�4E�6�S9
pM�g���i·VPz����ո}�*Q����~��{5~��]��>����nj㯚E�7Z���y_(�gY�j۪��f+�}T$J,c���ۏo��ޛ
�<fan[�j����H�����#[מ�(m�=�~绷8J�F�2�P\7��(~!s�tЃi��o�QA�j��a.����/�c��M�c��x��uMzx�AJ�=�������q���օ(�-+<(�j��K�����r�Ȑn�;H�Z�.E�RБz�ہ����L�2�i +TR�͎%^����=����M]��oӷ�j���o U��.�7����e��樟ooTŀYl_���p��ܺ�6o&n��@nﶞB�r[���O�6аs�C�Z�i�������c��Wm6~��U���D���F��6[��=BhZ��=�՚^��vT��X�H�-������g٦�ZG�.-��u����3���
�,�Y����=��T�Dh�t�7��|V%��7�3����s��dK��Y�[�|�7+W�n��qq +�-�j�~0��>f{��ː���Y�e��=O�2��U�5��[�ɲu��͒l˹n'���X�d���U�1���a��2C/�T�e��bʝ�0@N�|l+1�4(�=�dj�z����u���i��%,����`�}�v{����߬�E���E�eU'�����]�:����#ܼBb��4WE��(�� k#���"#M��i�u)�v����BC/�.�F/�����O��e��P(�)#�pc�qAW���X��.��@�)%C!&�.,4@�X���@�֗���-��B�Zs`��x�i���/-�c%��g����e����m�L�l�Y���2��-�i��\�K�l�r/��*��y�^�f�(zx]�l�v�bwU�,��Р8�C+�x��cj∐�����J۪ +�u���h&5��ET�!��KT�,�~_O�\.��m5��1�ށ�Ah����c��m�tiH����/�z;;QKc�ۆN���^}@Q�/x�7
�vX˵)̄����GT��&Md��/��6��-���O'�}l0���n+��j�����mT5(�l����>�=�����m�ԗr��A z���8 Qu�5�8I�uP]�h����I��5_&H���k28�t���F��w[ �ro����H�*���1�;���L��o~Gci�n�#S����FdRK{352)_��2��Ůu�ys.�b�۱h��@�2*�%�џh�E �R ��y������T�ߨ��>����i:��@�n�!����͆d�7�!Tr�+ng!� ��/C!��1~��&�o��k�j>]��I��g���z�����8��
�Yѐ�,�H0�b��ϗ��O���?����Yv?Âm��|���4��R�z�=}��ˋ���G���OK����Z�%6=�{d,��_��~��(K �Ӟ�/��ӕ�Cǻʷ�$H�/����?x�4���r��4��i�nx켎��N[r�_�%�,O��|���,��Lt�o
��wNQN 4��,s���/�x�����ѯ�q((���S�6)���)#���o��ޗ�
��Zo����wn�b@���6�WgDy��X��p�=/�7�����e[S��`�ӭ���8��c�!�LjJ +��7MA��'K�( �ۉ�3���_1���
h�_2���) �:�Y����%,i��C�:O��q7D�/G]_N��b�=�@
$k5s��כ����"D"��ߌ�\E��K�� �/&���4�6��v�'��[��xf���c��䑊c��h�����s�i�2��JL��I:5�e9�9��K)��`�9�ˁ�S���vOj3����y�Ӱ1��Cx\�D��B����(� <��ޗ�����`z��b^���<���ʄ +LH� +����V4C�}H~�s��� +T��b���Od��[3�FՊ�+=D�Rי+�u3�Ϝ[)w�����@�3�x�8�JhL��-����hZ���G���(�uA)���� ����x��%�f� ��}ZQK�����ѹa�7
���Cjb.��u���v����4v���[����XVb��:�R��
X�|�� �8E�u�˅W�S͜��7��Mm�:����B(:�7��Rf�Y�Y�W�����G:�gx�sc�¢Y��@��v���M�}�*0^Fo +��#���܄zMъY���V!:{ +y��\N�z�{qQ�7�*=j7�*]�p?}�Ă�>���K�\j��*��h�@��>��7,��-��k� +.E�[�Afx^��n�����FVQ<��C"ּuH�3����뮟��/�V/'�Aպ��k o��P+�E(����x�x@�Y�jcI��qE�j +sٛۗ�^�$clvN#\̍�x�e�e�^KGf�s�V�P��1�Ğ�N����vj���"&X:�8=&��4T��!대��WBD_V +��� N(��3�\C��@���Sy.�J���6�\Z��\{��
�I=D�+��Vc�#7�`�
6g���\�Ո*+�~#���}E&tD�I�K�R�E(���������k��M�帿�ܔ�q�Ɋ9c<��Z���C��������E���4{���\��������K�=�q�C����_2'�=����w�w����f��撾����y�)^��9�\*z�h5��{v�:�U�'`c{EHG�Ӈm�lN\�b۩��@k��8�=��t�석�S�Ԩn����B�om��B%�e�uZ��S
e�-�����1��<�@�a�K`H�%dD��$՝�ev�`]|3�,``��;���w+�(�*s�{����- �e�������p����V�
��*{�D�`���KL634`��έ�}@���0,�ei�c�Y��mmY�.��":����3�w97�<��ˆL�8�r}2��2��x��9jN5-H���Ngv��o��������V��{�# `�%�@Ǽ^V{ 9I�+�A|u˚BG�NX�/�Q��iM}Lz
�sЀ"9�{b��M�`��� +B&��{ዠ��o"�9z�ɒ��}�!�H1��oq1�O�c�F]�
D_��K��}6\$RgC�C�-a*>I���h�86|Ɵc�y��ϲR��6��i�cTPqtaij�I�����#���z���k�VR���s�a=?��C��ʤ%����8�L\{47T��6��^q�j��}�h������ +BZB��6�3��6tB(�qj�_J���ϑG�/�B��'e����~5~�+�ե��������L�%N���g��l���fHtng���[�̙�6h>��8ה)3��a�'ё0��#z��!'�Lu����ѷ��)��';���f[��4�� �uTʪL +&�E���"�1@��Y�s'8˹�B䮴�jk_]�%W_6J����
I��RZ�,u�B&9�V��5Wp9K�[[�[��Z�F�V +3�
z�O�PB�<�k�2]��݁���Ɍ��\ � 3f�"�����y>�pc'O�j��%�`�E6��!h�2&Q�&�u��fv"��b�;����ח]�*����\�H����h���Ei6�� +%�MGZ��`�v�� +��bF�y~��{p:��И7t�C��#���+���,�<h�2�W!
��5�*,�0K�=�1�qQF�$ ��K����>o^��Lj��Ql�"�
�� Z�+�P��G�;6{ +�^C�1�9�+�lIoy +4F����D�b����e ���=;~[�p�p��5�Wa�Bqr�d����
�(�0�]e/~�1vm�^�젅@�'����U�� G�8f� +bP~��l�hґ �Z#;[�͊�pm/,:%��f'4h�5H�͋G,NC:��l�؇�(5ۙ���F�h�� +�Bj� ���hP��3�N +�d�M#/P�\�p7�D�H�q�F+4�|
��g��Jyk�����52��=��c� +�{�n��=�qXF�$���_����q[V�(�Ʀ��@��e}�CUz �=Pi�tSAfɴ���]Mz��T4��=ۻ�v�MM|)i`�����X�XIc9��!r��;I�ٱ����\���Rf�W�� +�"�+�M�M +H�m�'�)�5�mZ�͇9LېM���ǖ"8t8Ϥ ]V+��NW� F�.�-���e�s���"���� +��=�R�V%
5#uAj|@%Rk.��#:��ǣG��5�r����1RR���6����T�>t��6��qL�5�����?P�`[��S�wҔ�����~PͰ��-]%x��LQ.��-�]�UBҘ��q*SE�I�&��� +q +"p ��Sh��[�9�@l45�/�d�1i7���B��j�x(���X�i^��Q7�J�@=PGw+ԃ���S?{�E�'B����������㡕͉s��c�{G-h�E2;9�ʹL�@į���F����;U�;[ �!'F.@Ls%�Rζ�m&3y�o�x�&��T5-V/�p#��l���y�� +m�� +B�n/�\�qgXS��p�ҁ���܄�[������4{��|?�M0"�q��^��F�� 抌�8��������{�����^� +l�d#���p�'�>�ܶ�C-��S� ��"=ܨ5��y�haJ/ҕ�Ebd�>�A5{�t��C.��r�u�dp뛨�����:�Q����.��� +���3�@��� pa����3�a�.@$���{�.�0N
�{W6�Q�:4{�B�8Gy��d��&.�� +-g{B���HkK�i&-Ez�\%@�O9��G�Ӥ�}�5��> +�{�I��PoXC_��`��Ά����\k�+5-���P��Zg�K + ��\���P�V9(���r��t +��%�X*����Gp�(,�%�Ue?�����H[�����z㛓٫�R߇�f�4zQ�B��K�[�'�b9E��``H���T��1��oA��ĵU+���^�#E�k]1��+V���;+ͤ�����r @4��m�;���a")��+2�M�K����0��p�
% +�������#D��5%)�� Qd���T���dg�D֔��A����W(��-�fF���S~U/A��B!�P+�!b{=��t����2I�C�"�3���Myo�cC!���)_�HMÔY�:�v�bQ�e�ኆ��5e`�'��z���*X��R��]��ѫz�9rs�F��٣�%����F��B���,�5��r�i
-|�0�����J֑�}h���������j�R�A��+Q� +��fsii����1v)\��
�'ÿ�^KSD'g�,��p�D%�CP� A���:"DR�o`g{Q�u��Jzj*�9]05���ԃ�
i����.�2���"�|\ +�x�=�1F�_���C�v��<OL�@�E�o����(�|��0��P��_�Նu �T�/D����#�/""j�z����]��%���cZ�� $e�I/�}�h`�����+�o��hēS� +���1�m� +2�Oz�@b����}K� ��G>�c���Rhd-g�T��'��j�m$�+9�/�SH_�W9���T +2�� �/`�0���@x�TJx��g�T�H/Ϡ�L���C4�}V���0 $$���kX0\�,��ZX�W��k���%I!@���L���wE��HP\η>��L����K�٫uv��5��x|����B�0���5�Nޏ[��4`BDIL�9^��0��t +?dd�4���d�|����n:�DtN߱q�-�G��ZN)H�Tk�)� �W�0�4����J�U*�f�Z���Mֱ8�s�Vu5O�5����-���Dzᣌ���(v�P��9�)����T�6�T�x.'��/-/ +z��Wi+�&����#�# m��Q�2�� �� ����S�8=���b����8�m�3@r�^�ŝ�����]�=��䒣��$�:�Q��@^�0��14�~��]ԃD�i�l]�%�'U`0�I��,#�;�uG<Y����b���1rGV������ЦK�`g����ðmI�|���8��@y�i��^釸F�+�[�Y��j��I��4u��CM
���V�9�%SVIF{�5da U@��=�W��=�4��Rr��]�jg�X�`x�Q�)8��
�o�y���[=$Ezy#�|��X�GO��*��b��:y�&.X,V:���ځ&���54H~����T������2<b��)�wП���0v4.�Μ�CJբ����%hj�Gk<8��,�K+T��F���P��۽&���'��YfL�\������|�P�m��ӠJ�R�sUd�5CЋ� �D=�}�Wn���S+��m +���sG2��F�/�N}�{R[�k=0rƕ,'䏽��f�ʆr�+��5�ʬ����yZ�V�=�dP5���M���V��+ �tȧ��:�hY��&���}W��O`�jh�3ﭜϘfD�A��Q/����5�%�G�u�� +�4`ӝ�q^�r"�pO�)w ع�&�3`�f�u�C�Z�t�7�k���>=�r%���w| +>����
� �ԡ�3˭�l7I�|�m +���JT� )� )F�^d��EI�RU��=b�9_��EJ#�C1#���E�z��ө����q�B�(H��s9ԢMΔ(%7�n�z�F�+�qbr��6b�M�λ0�� �!�܊������@�ɍ�T:�/M +r�a5qQ�9�����!J�)�7ԫH���w���Se{�\���g*gI�ᠺ�K��`������f��(��MH�����~��KT��*�
e~�� ���ı���F�Ӕ@ �!��B�g�^�����&� +�ux�5x� EZ� �x�Y�#��4�����!A�,�#��
�|�"�u����5n��#7JA�U}����r)��^�[xb�U=1�3e�� +��O�J���C�D��A
����B�G�8��Z����;0�J(��N5䝖�9b��-�'n;�Jj���#
�^Fw"�ʾ^%S�s���X)H�W=lTS[D�9Pt2 D2�C�a"јiK&Fg`])qLKV���a�!%��u� ��l�){$�9���.`�1��b�� sߥPx!(��=��ٗ#*`��זej��1�����&0Շ�"PA:ɘO�j�g�T��ϱ%�B��S����Eے���װc#�PΌ����S�dlb���|����?eV�&������N��ƣ�C̽S��#(���F7�Y��y�Q�3�b��e�=��{����(���0JmQ9�+���_\��,U�k��Z���pt�w���2�l�#N��N�XPcՄ�7��2���.N�� +���>�@�1U�X��f�a9a(�@>�p ���w^o���D�&b�p�2�ɋ.��q�c&��ˢ����kZ)�IN���V��#�M��u��U7�(XÅ�#����N��тH~�D�{R�r�2֠�g�hj�կd��(q��<!P��] +8�!7�{
4|�>P�1�@�N1:�m6���U�[2=닿�����c�)s!ș�(r�w�� +4�ye����Mr�j5�@������q�h�cP��/�P�j(��!C.SI��*\��d �4o��e.�Pس��W,�݆�ɘ���%���V�=���e�p���n��W���g"��2+�p9j��\����e�D!�i�5�Ӟ�V��P#z J�T��-��5�vE4L�ft{V����,cn�w��E��*��6��l9#��SS�h9��$�V�X��C�\��b)� �۪��`�Y[��/Yu �9���YA�\��n��b�'�j�I �h/�i�/6D�@iJC@%Z��=��Vĉæ���K?�{��CWC�`�
� +�x��ط��h^w�C��e�
[=�
� +ɏW)�Y��MD�R�yD$Ujs��n�$y�.f߱Y��/f�&`x��q-�d����ӫ�������|s��M��`\ �u
�+�P�{�'<T])&����m���g?�ҭ8r� +�L���"�ќ
�mا�Em�=�NF�I +w�(!�Mj�챙��}�ǜ�c-���~�S�X��@ܯ�r�N�9f�;�ЃP�F/����[v�Hlzmj܉`v��<´B��'�Tdz s�{�b/�K�~'�q����w��sT!�]�O���L���~2����#��eȓ ��v"��K��b�^��LO�F(w��FH-T�ԋ<$�F�ĽĴ������\�Pn�)�e�}�SjX����2�|����(�)�F�'�����`�2�B�{ /�&O��*k\6c��ͻ-�R�p�a��+6���K�*l�IQ�\�"���2�B����SV�^�b��i��(��aϳ%� +M\V�)!d���!��B'h��|���ԍ���(B +,�M�Qִ�*R4��!M,���K ����x
!���rH<$@� H��� �L�i��"S4z�c9�)�;��{ړ���]\�0?�]�)�%{��}ZI�a������9w@����j��잤�"��v�*��
X�l�[�B}�!֦^���uG��T7�7h�ޙ�%ǜ�2�n ���QW7��)�7�Ȏ,�����5��mpa\������~EOx�z���OM1g�fFL�]��b$���d��`��ث�N�[�|�[����3LA�5���P��k�cdh����� ��S�D�ʂ��6L]P��Gp����rZu�"9@��^M
� ���A�!�������Wu�u���1�E���PI���7"� H�������<����I����L�4/kU!Dyк�� +�e�_��i�Z���0�{ +�;k�A��j��e��_��)��� �'�E�\3��P��3�q7�B��zJ�o4K[k)hk������3$':o���I�Q��(��!������r\�!:!����L�[���1��^����x\1@ ��� +�M!��"�(c�T�|�˱�����H����{#��K�=����?�C���z~I�%Y��yf����+K�<l��y�C< ���Z��쁎M+oL�j�FSWU~�!+]��.T��r�Z������a������Շ�J���7�9�+�A-Rry�f4�?!R)���S�:�����c'���"fllx�mB����b�!��ب����É�e4("rR��t�.D1r�G}�$?�_���u�Yg��K�H�:sS��I�p�f�B���V���҄�5�[�e!d�^L1`6�^J�̛,n-��>��.�=�X�=e10&Rg���>b��-�-��`|�;��`>�4�0V�IA(K���H�ݣ+1�iڥ��WW�<!�ٚ�g��Nc��ȋh\ţG�~z¢ +��;�lb���Z���[x^<���r�&;�%?Q�iQ�+
&���4�cCd�Q�s�D���e%����F����xB�"z��g,��2.<���<��,��͌*�l%"�xJM�����@0A�����x�UmU���-F��_u�'����zh��=�ٜ��V�+_�IʵKyUu��;Y�����*�����K�� +�Ȃᓜ��Х]6GHA��'���.��3"�Z�����~��7S\�fKABY��\�D��Z.�W��pc��uxv/�?���J&(�~B�d�xBa�Bv,Qo����K��ДS�y�rj a��ޫR��߱����pY)��kI�̤���Y6����}TF���xb�!�*2�ة-�%/#�%0�"�\ +���No��lI��S����^Ǚ�S�bU)��K��6m��s��������$�Lz���3u4�-�;�e`Y%�� ڴA5�M��b��Ykࢇ���������J�
Q�$ܝgHC� - +Fc���s�)eU�������*U��oU��F�+z9��I?t�z�0dl�&���ti�;H#ּ�9J� �X�����#xRQ�sLA�/�����XݭX]�WFm��2r��EG���p�?^�f,�4�sK@���O��'u��2\�дpT/]���[}���7�,����'���?�����?�����_����������|������������n�����~��W���w�����������o~������O~�y����w��G%�_�5�����c���hH��1v�� +υ��2���)�?(��(�7!���
<���'r��ɴr�+,�P�a.�e�.��;�.>�y +��+I�b˩���;B����}Jh;O�/����i~�e�RBd��r������R8cHA��=�X�$����4�Y\L�>�����(�"�D�������7y+.mT��>,Hނ<$#�j<I��t�VDR��B2!H�s��}Za����)0� +i5�K�W��f���Fq�>��u{��"eɷp`�a��%Ɯ����AO�����D�7=X�&�������n��$�O.qb{����D���
�iR�oR�l6��Cկ��@YU��.`Qd6��`�{�e�""�R�>�A�����i�W�����sX���Am2^D��!9jr���Z�@&�QH���x|`�7�%�_���J��x<X4��GI�q���"=[���tID$�p�h��Ì�-�x���C7�eI +hF��u�x(c��Ż,������ы���qy�h +.��G�Q���SC�� +ѫ��!�d��P�����PfD����2Ӎ��WUЈ�w[�H8K�{h���zH��#0���'V%���s_��D���n����Q���|����?��$D ��*#�U��.��.yr�(��m�Ⱥ�ּ��qmv����U�~W��Mfd)~�u�[�%���g��gK +��T��ct9�����\\�"�$������H���"�=�l�RW�|���9iŃS���]���
l�������B�*.=R�|>�U=h\���<������pᤗL��xt!\��>G�F$� H/��$b5���1�h�3��O�v�~?`��C�o�9K7-,K"�����j5w�]�)�r�# +d��] ���n*T_�:J���e)C�I��[��uŅ�e��Z5����KZ�"���@R]�ZV��w��{N +�v�9�����ٛ+�?M��)��d��D�_u�O��瑒���90{�q���8v_��m���#Dd��Ӥf�"��qdT�P���v\��u�d������4�����|*b��/K����=��O�7��69X7+�����!m)��M0���%�)�$Ԭ����~��xuٮP��O���z�� ���~�c�"�8h�;��� ���Y%l&�����f;G��6lI{~�hb���
��iy��Cu��K�ۖ"`���{u
�c��:6�|���*PK!����tʧ�
!����2��O�&t�U����wa��7C����ߣ�n
&Q����U���a�����*3w$W߯X���l����mA +�i�;��=&���Ga�����ށRµ%�܊�%��ރf��Gjǯ�5�} ��Xa�@v��uS �+ᐰ��1PWy��-�_�C}7t�`�TdҘ�n�6#-��#*2�^Z�=ql�ȿ����i��3�������砺L�!�OfA +���͍�M-8Ő��Kƍ�)��I�;J��Α���}��\��.=]տ��E�~+4�P���KU�Wmpq�KA�J���D����'C�u8�6�
�^J�'Vq}b�H0RVX�GJ���y��� +{L-,�;�B������/;@�=W3�^R�MK���y1M�����צ*�
��ۏgG�o�T�/9�l�F�N�R�����E���]�R����W��W +y�u�^�覙�� .�p�0ir�0�d���UzQ���`�(l������Y; ��1x�#p63Y����4�����]0ʤ��n��Id̃+2�3ҟ���)����*�e~j������6�꯳k��)?�s��3�I��k2�ih{�5~�'�Z����;F���#��Ě:����/���ɭ����2Ї�k�A +~)�>�Ct<8��
j��ΰ���(�H*ֶv����͎�v�P��$���G���.d~UW�K��c� +�|?��� +oHDi��Q`)Y_awx���upKT�ff�����>"��>B5�8�Ԝ.�ݗ�F�c��Q>`EjR; ��B� +)����ͬ`MA5�}8=�� ��
[/4�`��C�*�)��_�K)ч +�E��1�_
�:�P�v�:k;W�/�$M�;���~ZF��"�E
�K嶄��5��;�va���CTn�5W��X�A���]
�m�$���h���v����� �95B�@�\"�p�m��{�l��dEA�{��0-%C6��G�w��ĞՕ؏��:\-�Q�!�P����~`�x��6�<�QRa��D��6A�η���gZ��$x��0Ym]��>p� :��X2X�+y5*U��ռb��9Ic���R
��B�&�'�Qtb�Tj{PQi��0� C�H]I�+��Ps�=�� ˫!VY���b����y˓{�\����7�Ce )!9��P���?����ڟ�����&�����ܾ��v4&i���.&'aY5�*,�o���2��c��B��C�,�ޛ_����ғ<Òk���\����хԀّV +5��W����⒢��}�E�;S�r�,1�e�fY^�P��-��cO +�=��S9S�T��=�"��~�K=������ĢH稙��OH0ו���nվ����Sw�w�*)�A��ݡ7߉T A�ۉj��@)x���\mY�7�z�Pm����#��G8W��!֓Q���b���^]��>�L]�r�~�ʕ�P� �M�܄eSU=���C�k����C�{�oT�\J��%U�(��d!��aIn;W/9�(����W�{�K��<�Cn��I��ծl�1"��S�ڥ��1ΰ/+g銒 AvڼdyU�VR�"�e��wݓy5ґh�@H�AtH*a
rՓ74CױR �:
#�^A�aF�Q Ry�zX�û��b� +��<��R�8�$�z EL��B�F�Rq��ԞrB�|���B牔���X�l�W��,����f1A+V�Ӧu?�[<>��h;�x������!�# �#�\W(C0Kþ#��sY�S�p@�hc��"�/P��۪8�.;���)�&W\��C��E�(l�%�9���� +�*�sEK�V���3�Q�).I/i�� +�� +�̻t}��7���� +����8A`�b0�G`K�/R1�)�w����\��S�y>�K� +�bwd��~k����[����� �P�q�Vy�A���t��1�$D����H�����R}P +X�ͣ�JF���������e���<w�Y< �k�g��T_���G���b{|L�����_�"ֺTFJ�yk��LU���̔痱�#� +�ʉ.1���&�t �'L��ɴ�-�Et�y/$�Y@�`k?�R=���T~�( ,����TmѪ��ʯ��F��{Ԭ�k&��5�T~���+��*$u�pqX+|G�-�C���Y��"G3w�����/�_�d�!����/P��Ʉr���9���m'�2G�� +���B����)�1�aj��^($ ��!@�*�%(O�G�W��FL���[���R���M-;�=�J�T��D2zh,|y� +/P��+Hx!v`�^cAЀ%P�[#Ģ��g
36:�S9Fpa�������7�Xo��' +��l�O͌(�e +R�i�/���}�R��� ��fA噀.�sD��X0��(�&u��ґw��Mh�b�,��F̻��y��F�s���4A�:ɥ�1�GJC�6{��2�ʜ!�Ez +���^�t|v%u����gK*k�8��#s
t�t]� +R�l�䰊��
�_�CV8�Cᤴ�:�h%q�u?��__0CQZ$M�wV�?����љւE��{ї����n@�ޥy�b݈�.rD�Pc3�m�wܢf�T>A��)��dk0�/�G{2�9W��ܷ&��n= +��Z��h�T"ہL���Os�z���q�e_Y�/ *��ɰ-�GPQ�wݾ;9��HĪ7�����X9��Dj�����Ք훹�2̓���¨I\���sl<.Y�,���w"{��ΗS�� +��ؿ\��/�r�]���X�R�Oj��d�:�4���*�pxu��}TQ�Ϣ@א�\�-G��^�b��C��XBô8�L���) �;�(�,�\5вw!�`�������o�^��i���,u(��e�B���+�Z�Ԃ�'��"��Ԙ�d������� n� �g$̂��ȄD�P;�1���7-�RJ +xm�sG"�IC%�������v7-E����d��ဧd$���ʟ�O�|e�H��%(���g��9"�;�A}�$���f���;dogDo�"{��ߐ$� +T
�Lq�?D��G६(�#���%}�î����_�UF=���jo�����?�K#�kELl�L�@>T��@�#� +1�{�Ű{�I��|ҫ�1͆U��ңJ0j�Σ� +)A���&Uv4�;�+�I�2��\a��9����N|��q�������
�I@�de]�y]VnWI��
��'�� �^�쾉����gt��fDZ����)Vċ!L�����wz�ln +[������gѐ����T ���Q�Af�@���I(�E��_����+,9=q��3�K�87�z�U_C1א�%9�i��ʁ�X�����+��/�2뼔�'�c����O�]�����xŘ����M�����,�*�)t�q�V� +�ȝ�YRl�4w�4�%������y�SG%�����uz��+߁҆W'1q>n��\Q���aر�����'E�8◙�����,�G2=x���5���C�"�����`�_��qeD~IK����"��fm)��'������5�}�n�'�5kl#e^�t��ˏ�J0�e�bŧG<�����.F�8��(]�!3���u��<�������y��F
U��g�.�FN +�@�V�빃�.�<y��Gg�D�@�N-h�;pv��"�G�Aucf�6����/���IQ�VqC��$7Zc������YEw$�,c4�]��>+�H({��T�;��f�$[P����i/�����]�&�$U��eU���-#�c���������J'v�@T���2��XPviQ4z��&=�B}�� ʋ�QM-�I���l?�$����A�.�C�{T>�85^� +!��]Ԁ�!K�n1%���>?�^��.�O��������4ChcƙtOaYÁ�ɦ����6e��t����,S.������%B�d剅�a�p�~$�,ݻd�f�"a�GIP���"�w���-< +�V��������k/�MKB��N@"�s:T}�ܕ�L�S��-�faG~�IG�l�8�д��$yi~�~�r +��ݓV�N6c�{�om~��ا�z�X��f����?��d��T&�/R���.��b_������%~5EZ�`FSU��b���p;'q(u��ɲ,�~���TTo��2��MA��-$��D�rX{��,���\Ҝ8-9�}%l��Cf�ڙ�������%}��z�8:OboG$2 +���ET^�W?�������юs]�g����'P~�0q�o��a��Gꦀ�l��RA���3`�IV�|��F�p����,�N�<��J��!Hs�hN�DjͰ�R�������Wj��:cJE�yH��t�$��Ԋ�"?ïMe�~����3��L�b����PM{� +�E��]<5��R���幈Z�S��Q�ՖwJ��Xs����Иe|�[��cI(�X��t���J5�'C��A���fPP�[l,�3�������a,�C� +�]+n�ah�����2�A8t$[�en�2���BK%.kg�(�PI�Ӂ�n�����*���_��x�Eұ����W� �)���?uɶ��CZ�d��J��u|^(8�fQ��wG�O����%bR� 2Q��e'�4��)�Chv�,�ě�/�C�( �C��
mb�p�� �@�"��~J%�EM�Hc��t��K��Tx��hx�N�`d���C� +�Hpٽ� Q�W��`Kع~¥ƾj�!=�f�Z�DK�O��L�Y�88n�����t��qZ��9�m�-k�n��j^%L_��vH)�R��v�$~_ʗ ׀ޖ��T���@������KL_ho�/��<�%�XE�>����f�埭����[�M)b�]LnC�@���7��"�A��dž�bqX�jv|[�����'6����i�1"�q�v��Q��K��+2˦�� +BV� +4� +�+�f]�uײ�c �,�"tP�YM��]�Yʬ�n@y_:p�h��{]�1�J��`cC!�ֽ���+J��5��ʒ��{���6��2�@�+��`F�;��x@ۙ+6"�!U���@��e�Բ��dw� +.;m^��K�:��V�Je�v����|8�{������iA�=�_��̣jx�D�,j�)��[�K�eI��G67L-L�3����n�ޑ�B���r`���&����SRW>`��bnb'�ThZ�q:c���J])(�-��P���tIq�n_�Ot:�D��X��)p�ML�F�83�i����V�����j�(�oj�}�"��qB�L����"�6(+�)V�.aD�W(��h�^�T��I�B����J�ډO�~���b��cn��g�#ܔrhT��~�]��j���|��A��(�����{��ڭ��
#��Nb� +��=�G�}�:�bEWa���"��n#2�+������5x!Kx��f�s?�r�9#:��ň��*�B�ʴ~0�Y�����wl�az�x �d��<f���[�k9YV�!����F� �8�n��q��:��@B���o�g�wT/o�v��sAK���ʣ��*mH�& �T�>���/�F�R�|�0bH�{:W�����ߵ�ry���9��S"s�%��/���:()��u�K��*d����t�g���-�W&��=�W�`�}̭�r� �ܦҥ�|�
� �8J��( ̏�$R +$u,u���^�]yB�}j�B(���b�!�Tn[}
���x����B�z5�zX�.ϸ*� +C�N�őudY~"�A[]�i�Gد�s���:Dwأ&[e�Ͷ@���|=��>���h�<;8^��W���0] +���wG����J?���u�Bq�ʛ~pR� +�2��ʖ?O��+��h\�I���iΩ�|D��4�q���
ĝ�z�� ��E���n.��� F����ˢq�8����X7y_���Q<�s�<����r��K�� +�9x��n]��snO�~�lܘ����+]d��:��ţ 77O4����tg[���Sb:�I�B
*���h쯓��|er>x��^x��b�+U��9�+=�#�-�uij^� +NPO�5Ϗ�w'xyi���bYqiT�U�N�SW���
�[6^�> k|n�c�����w�^�A=;�~�f��<���8�Wk��'�1�{`j���q����ĸ���rN %�K��g�h�1C +��ୌ���6�W˵ +Hٯ�UO���*��P\����A�1&��12�\3�H=��X�8i���+x��)�ΉF���E[��#���*���M&���'8s��Ł3��h����( _���7�`�+�3���L7��6�s���>s\�?�)�z�Xqa��~W]��^�}�b��m6_m�{%q�8��C��Wϛw(���;�_�w��!�T4����k�F�ع�z7��ts�yi� ��U�|����|��^_���1�c�8���|e�������������������7�9��y�L%��zs#�'qS�4�"���2v���(�_ +��ԝ�<�'ڮ�◰�;F8��"��x�H�D#��hl���2c��Ѳo�h�Dc�o�b�fS�������k����z���ij�'��#�P_�~�-� j)�Y{�Uc���_�?.9�5�]��9pz/�aM4fј��>�l'���Y�ZN�Wl n9�Tp�Ƿ
&k�jm���B�����9mnb�cl7��;U��F����9��|���Ph�uA#)ϙ�J����?gs=ƹ�v��D��}��'%����WnV��$�[h9.�7K�73iO�+4��W��+��rN�GN������Hŧ%�z\ֽ�����\�g� �>��}D�J!�oa�Bܾ�e�Eh^� ���y�)�϶��ʟ�K�����cȠdg}�|�%ϔ�Z����(4���휠?D�d<Y��=3/me�5��1Op]��P��};oq��� ���0@�[��|��nأ}�]���<�kp8�G3��9s��𠰗��eVB-'0X9f�hJ'J[+��W�p~q���LjB#:�o d�9m��[�G�s'����H:����殤#��ļ6���!w�'x��bC�qEn�� +� X���W�K(������m4�%'�x6�tQ>���PN^��s���;>�2N���$˒���[���"ª� +p�=�k���}�+����ɸ|\�@z�y��ظ���g��A���)9�a��;�)ۻ���:�2�=�zy�DL�]2���,��v��O�(R��;����A��:Cɷ6��X4^��H_���2��|</�.<�`d��x��p����e�%����,�a��cw�Xi��<�c��E�U�柟/=�L*��3֜=��S�z<�ˆ372��� +"�w�*���i�i��V�k.0������x�^i�y�ȭ<�J�!=)|J6u�ySWɇ"c^7>-?+<�IW � ֿ� �ude��w��]��q[/й�����fc;1o}�v6�%�>�6��9��dN(�<���V��{'n�7��{?�g��s�ԅ�G�E˷�<���$���f�G�g��3���}�Ŵg��@��9끷����w����q�s2���0��%�{�w ެZ�b0��� +E��!jYES�̩2��}��|���F<k��ԩ>v����L��4���=���b��
�:��Hr���n���<��]½��+u������/��Z����S���0YF������Z����DQ�$i��8�MM�jq_�Q��}�QO�3S�������O ߍ����Q��B������30��\R�� �n�(2��3�W9�\�!��ٕ-͑'�'F��z]���}���9^տ��SA�6'��"#������|�2EĉM�� �Oj'g��E*S�/A����K�$� s-�u]�g�A3O\�I��ch�Hz���W�c�@�X,,�u?_�1\jL� ��+���I��뙪{}q%ڕt�u�2�� d}�ؕ�29���ۙ���E=\{բ���m��mf���X=���AC�_�j�G�����^W�~r�'��/F=MO��Ly�b��1�Ȭ�+�s�kM*�C�aO�姜��p9�}��(g��5����W�R͚+�Y6�5�n��q"�Q�Q �x61������Ո|JN�=�*� +}y��·��8A�
�+
P܋�E����Πo=�_ש-�@ +��ٶ��g����˙� ���IS�,9U�����;(O��k�YN�<�kN�L�a>)�2�w,lA9ܘ;���1NPj\��s�'�������fAc�s̼��H��u��h�M:��9o��L)A=.�_�g}�����s�I��m3�K�$�lL���SB�������i<�2=�|��&��~>�|6�T��I_˾9U3��D3��x��w��B��A��8��T!c�8�H����rYgx���'ȒCw�hl9�f��kJn�+?����8T�!�dt��G�'xm�LJ߄�u�n���5+�$I��.!� JN�|s�إ;��'י<"���,d���*�<��V�c����~�P�sS�5���m�����,o�_��[�y,�0�knN�_g�>�?n��w��ו��dW�����䥮��@�IY=SW��*���~��V3�U�*��V� ^�~�2����E.'�*]�#V+N0���F6gV�&�g �Ȱ��d����]\�t���N%#2Κ���J~�I����� +��/�b�H�렽ƻhH�o����
��'�ȓ����H�}�}Mۜą�F`���r��R�dJ4�b�CWT�8���n|��������Yp�vE/���p,� ���GC��u͚[��Y���я�9U�צ�y�]O�Q��Pߣ���,_29I�9=i�N��k���Npb�e�r"���^'����Z/�vئ�� Q���, +\��g����'H(��t�'�y��o +����/�z�_ +A{�L��X�Q'xr����^� +���~��W�f*O�z@f�ߧ�� +O� ��I���H�������_7��p��Z�p�Z���h)���G_�JW7��NЫfd�~:8;�X�;��L4d2�+� +L��K�^���_�V�P�L�;�XU$Fը)������bս�4M�=8�D|��X�K*vfP���<x�6 +�?`2�N2a',\+��PNK#�2Վ>�(��
J&�0cUQdkZD�������b��*�f����PPG���G |�j���QT��i5U�L��#`H�h�BBx*�2�x_��}���ʄ���#U��23��o� �/�w"/f&�%�sՍ�YCxS5�8�F(Xg*�KU6�����(l�õTTW��.� ��n6|�@M��2�vB���TL��Q4zv +�T�W��9a&��b�h(� +3��&S��/��㭎��Û�7��5$Df��Vi FJeB��蘚è�5�jd�-��Jn����Q��FFRM���E]Z +e�x U9�
��J +h�'�����P��UɍL��j,rtu5H�kh F��
5�h5�D�苾T�%-S�3S��5k��`5�ve*m�I�l����R���9I�w�v3hоf�q�/���]��T��`W���y��MՁ�p�L�P_k*b�G�a]8�A��Z6i�z�&����Q���o&�̔ �%U�FPGI�Q�o ʽ�p/!�/S���5�L��T(���' e�*2��T��2�S����~�Ѓ�$Tc\B�i +EhJ�! +�,�[�+�z.�*k[�Ru�ؾ-̭��>��T:a�+��Y���p�H�d� +F}K-��? +�jjbҗo�~�����0R�\��H� +)��@ß;Дǀfqqj�e :�T[̠Q8}@]P[���M��k���MRoi� n��X�P*Ə���N���D�k
� +��܁���N-y��{+�5y��bۯn4�E�ɮ� +<�";U�.����'U���E�6�U�v���ڤ9鏵܄��,Z5xZLф��XP���X��RG��j��*�U,U�o&$�����j���N����D|CaC������D���n���\���P�P�al"f5��RO���}��Q�2SUV��H'�:�����kՇb�u������ ��}�\������cm��]5� +%�!���j�����%��m��i ͌��Lj���P���<�PL,Kg ���u�P�M���j�T�-ƍ�`˄z
&}�c�����4����z�9�꼘܉�!VB0R��F&��S��s7���Ƶ��?74I�x���X�J<l�/�j��26��X��R�"�¥��S"eBm(�'�.e��K��n-��*�����p��jŋG���'䙊�S]�,�����~`M�(�@?Y���������'6T� +n�̌L����-U-r#���%4��@1���RM +�:e_+�/���~��T��*�g,�%U����'��Z4+� +���M'��4�X Ӽ��X![�*�-T��D�1�����l��� N\UR88L��M�����p��p.������So��[�v��%���/u�T&�� u R����)�A�?Bd���X�p����Z��^��F��������͚�o�0!3Ds)N!�����@+���͛�G��m��
��k�W��Z�:�{�W:��y��y�������Q����p�{"�@o����n�������?��/�)D�@_o����9��-613u�^�T�D^�TΨ +�C�c�±�K�@+�[���G���JG��g�+&q��_0aYcؐ�QxLb +'2q_P�Y#)Ǡ��_��7n(�a�M�vZ����%�eA9!Y�$V��,���m��$�c��]A{jY*��nb%��9���r�%��e�zi���hLѿ7YҒ5�7I,m��S��
$�R+��˷��Z3�Zr�~���]�Z�e��FbùkQy�����73���,$���8ڇ�g�sGЁ��(��r�Gˊ�ԲRjo@�mXe!�T�!9��ϡ`ܴll�uH�W�t�Ϲ�
�b��A�#mc +A榳���ir�����Ђ�\t�d>�Q��)�̇�E�<����̇e���=Cn!����/��Nf="�1S��sfl� #>&w\C#١�Cў�9���ĺ|J����po�y��IJ��a��>4k,�=��$W8���� +G_]��U��u�&�u/$���)�$3���S���IL`�p�9����\\�d>�~�;��L����#2��#A� o��O��IΆ"�NŇN�3�,ds.�C��3^1C(��� �\B�4.�n��2�Km�Å��gRG2�ICA6����lJ�t�S���7T��tL�D6(g4�8ԆGs��r�Fπ�9�a��<�����'����S^a�����||�t:(m$�2�
��"��y#�<uXgO]:�a2�8Ēq�Z���ȵk�7>Xǚ�Ֆ3h.u�ckm��H�l�$Vr�~r��6�1�p +Akޡ��B)�f�nZ��:�c� +���|p�.0m�7�����s�;d�Io���w6��c6�5.��=kR����%|���\l
Z�S� �_�{yGf�b�2q�S�$�ҫlj�L�s��<��)��D��}S��~IC)Ϙ����ت)l|�T6�h]8�
J�F� +�E��<��_�l��w̤Ӑ}G����p
��p���M��N�]���N�������9���ӆ�>éȢqZ\r���o�pЩ�;��� �L�m��&� +�,��۾����Y#[n�������V���5�_r}l��ꯋ�)؏����+2���WL��yt@�2�y�X:�c�{�&m�l*��B:�}]9��.�@E���R��_�����D�d�;��ZR��zj�Ƀ��1�_�0�kXk��`R�!'S"��1 +���X_��d�c�0yc�����{V`��>�D4���{_)j{�& +N,b�맂|b�ܨ:p5�!��'��٭ ������Gxv`~�
|L������Ⱦ0Ⱦ�Ƙ�2<]48,�p�CC��g<o��������a�{�]D�d���C��XS�����l�]�7�l�-35������&r���M9������Ä�e��Ϡ��a;g�C:��:�q�{��)h�g����H!{G�9"�W���I�e�~���ڂ� �dž��}J#K�!l�ցSX�c��=$�t@�H��'g6(k��q®�� +�k#�ԟDؔ�ʇ l�3�E�1������g#�^<�Zd��}���=����Ekn]pt)��5�A�=裢sFT�����'V��ǫ��������)7�!�Q!y���#�����5�1�鉮] ~!���k� +qK[���O�#N��A�Q�Hv�"�#y��n�#�c��,Z� ���a��t�C:���;�������a\`�h� +�ߨǃ�[�=)�j��M�b�>��Cx y��H�@�-�:�X�e,�멣���il���l�y����L�k���!�7�G�� .�p����_���%����!Y��� �̧V�`3[璥�eĶ'����+��_� ������Μ�x�[K�EP�E
`��' +4�F��]�����*=)E�j>�K��_0I��0>F6��B:���슱��| �7�U|��)�����w�O�`�s"��������<�O�}Ӈ3���`���UlE��!�?p:&a����tP1�o�H�ˀw�',��2I�'f�rG���mC9h�n1�����c�@�M��Kp(��}u|T�����Ψ��\�lƞy�@/�႓F�cc�'���#8��Lr�4E���O�ľ�[�Q��@�,9-��Α +��TH�H��
�Kt���tR�t̟�w��cK��6=&����0_`'��Ɇ�˩���Tb�4��Ld�$�举���2y�c:u�*8o4�l^�9)�z���;+���o���o�ҋ&�>���s�����K�£K�����i��i$����Z�-/�a$o��x5�3���|��v�&��w�u��TX�8��� +|z`l������|���X/$�H߂�L�8<��%bĄ��mj�5�5�W�t���%�ws ���d���81[2�(=�O�~��=�HI��YG��N��"w�@;�$�q�N����G!�?�9Ħ8$�\p�h>���+|b��y> {4��x%�N����~���p��� +����JAl��)?�O�~9���'�=�Jy���k�@���)�|o9��>��p!�U���B�e����~�s > +f����y�
�\|���蚩\��%L���\`�(�٠�D@� |t�dr� +��w�����D�E}*��2��"���ͧ +�PY�� +]y����r�<dD�x�
�ރ�`y��C2���1e:�S�O7����{z2��B2�vT8Z�=b6�:V�]?+$��A(��z� z�A�|Q/�0'$p���|��%ʔ��1� ��d-��u�V1�8�bvH� +�^&�f2��̏��*�ހK�;���>�@Α2�r��<��9�r:T��a*���(8}��G�|�0�2G�5=�x��G�|+|u���ڷ*Ύ�w�w�_��n�
>{�/j�*�=| +:�j�^G�^1fZ�3��}��U: 0��q<�)�T�!.��D��pn�#B��� +y㍯��������Ķ�D@�H2�t,�yz������`��:|^\R�t��S����1U~�l��� ���Oe +���醻+��5��4v��� UxZ�J�?�(>����4�2O,�c���VT\1��_����-֤l�*Ϡn:y
p��#Kت��٦�ud�E�rG�b������q$vo'a��x����7+`-��g�Pa����a�5�/�8p@�H����*jϛ�M�W���#<h�z��B�K�Ydߑ�缣�(�� �Ny
+�.;��2��Av��9���:���o�1!���i�QB|�%䊁�|�E��/i����b�J��5�-8!��E�y +J ��ל#�]�����Yد~e����&�v2p�EA��mh�;��\d�x6�u����kanmݫ��n8�]�N|,�8�fs�l�k��In���=� +`v�3p�.�2�YL�웏� � +\R��+G<��f�q�>%�+p +|=��[fL�9�Fk���oc���gĊ
w�&j���n +��u�����~4���*���G|K6�>��3Vx�V���W@.�O�P:�q*Uxސ��ekAa��x��
ұ��!7p��E叧c�&A^ +]p�@5e����g����K���&D���n��<Qۤ�/1/�W�}�l�хST���b3w�㲎.�K.c� +8,�x��<��1�0��X/��Oy��JɪKf�����<6��"�L���+���_�%'q�;g�l�����g��8�'dψ�[ߑ�gd8n�:�+q~6��R�QEg�D�U��D�Ec�� UrD�2Q��4�u�f�!��{>ƴ�fC�'��>���/��[��Qi�3�Z���{���Yp� +o�W���L��ZF}I�:=��� +N.��,��X�m@��Oײ�'� +��3��Wq���<��}��/}�E +y�[c��_�b>nP�=V��pW^�n{�J��뗒��߈��tz���Y����*�߮�F";Go{�aBc.j�Tyu����k�:�o��>_��>��e>?Ϣ��|~�E��.���.��p3��I{�OOsy�����[i��/���Ͻ��wy~�����R���\�Yw6y�EO_�Ǐ����N��V*�?,��v��]�����;����G�:���w��=�����b~��b�= ��
�ot��u\Hc����������r���s/��_n��>D�xNj�pÏ�x��<[��W_�d�m]�ih���X��"��sa�>LU��U�|�Q����`��dp��r�'�#mn���͍��S���Y~�g7���(��L�sG��c����<��s��k%������>Y��R��1���FhcO?r�=w;Xy�����'��#[������}�Rq�M�{��^x�Ý}�͝x��~��Aq�͊c�)d�sO��;w������w3�_])q~���ɮ:ח���ޝ�d?����Ieov��?����?�{��۽�\���l��ӽ��=��A몃�W��w5Ty<i/��p����&Y������m�P8��k�N4>_F��`Noo�
l�<��t��O��ŏ�v�.8<=_j�b�ӋS�/~�`:�#�W~��r�w�M��֎��7��JH�Y���3�;������^O��um����X���k�`��}=��ˊ=������v�g)�@����=fA��Ϻ=��W"�����R�u#�d����2ۏ��ϗ +�+�zP�e��F|��qeۮ'���4V�Hn�^)s{���7�{ߓ���\9��C����MD�o��u����O�!�����dg ⅛���V+�/�.�X"?�+�|ґ���t��5�o;��Ǐ��3���Zƿ�ȡ���_�lk���,�^��'�ԝ'A��_]�W�aN_�(g��:�u-���m̶���-�{7Zw����qkU�����;I�9��I��u�=�uίW�?�)�~z��|~����$���������';���}_ls�߮��������w� ���1���W��]�����=��gv#���¶���oxjN������jL����;������D��X��{y�?V�K�-U�_Zl]z}���G�f���S�.�N�(_��e�w��~�Y�UW�r?�>�~n]CGBU���&��t���@��WK6�?̨(~�X��W��S��Nl z߲��Y�9׳�r�d��>�����X ��M2y�u��=�'�/�^w�}���w�X����l>��ӿ�L���Y�߳���gG�W���Ž,��O�7���w��Mq��-.�Zn>ۻ֢���r���ثO����V���l9��Mu��7u���n\K�%���&�p���z���яYnO�W;>;Q���p]Pw�ȮҪ�{�e��K��ގ/�?�����]!�W:"�.މ,��Vp�^X�M���wËn܈*>z3���fBY���*�G͕��(`?tf;�:Q�x�_~6'z����kC��Ն:��e������dI5������J27_�o�S�ϓ����Ϸ�o���e)��(�{{��z�2���?m��+�������������K;�rf4��mw|y��{%����J�W�]^��\RYp/��`Gt���E���Vx �<� ������SQ%Gкk��P��VBy����Ի9����-n�2�E7����]���rG�o��r�.���ݸ�d��J���k%��.?y��U��w���n9w���+���l����)9w����6�?�Rʜ���Os���&�?��N�e��Ġ��F�'{���^A��|�ݻk%�/_)��.���_Uy?���q[��z��A�ۋ5Iݹ������Ǘ��.�ρ��%ߣy:w+��쵸�S�b�܈-���\��lg��q�;Uy�#���ԋ�q?���(��}/ +�F�4$���Y��*�nV�wV�_K�̹�]G�|o�c��uW��+�Oy�2k���Vl��\���W}}ᝌzw�lć�q�/�n���w���7?�۫kSAG���{y;}��mq~y��~t;��}+0�~a+�|�ݍ,�s/�d������Q%W�5=��py}����u��^7�w��e�[o���qv�O��t�T��ͨ���T�z%�,�nY��Æ2����=���7��^�*��t�ϻr��'Y����=���9���C��2��&���Z��*��=S���T��Y���?©���_;�\^�+wxw���Y��U�G���H�����}p>��ލ[�~�m�>1}Kx�h����[�
�n��%��x����+���^b�V��
����vӛ^n��^~�^��}/��c���/��V��
��H��HQ��s��ǽܦ��{�����]뉰�ב���`]̽�Ʋ��u���"�����ws��]��g�샻 ��G���Z��:J�"�V�T~�r\I��j��OW)��.vx}���Ց������YM��u�O�*��J#_��a^w!�y�����J�����=UU��Rd�2�{��W?E/~������J�>�m*���1�
�zWX��͛��n^�����k����X�z3�ī���������d����NȎ��]/bݞ�I��Ww�R|���%G.%�ᅵ���Pz�r\鶫�N/��}w��k֝쪓WcK/\�.jG:�������!y��� +�u��+�����q���o�A./��o[y�;��ģ��#�"��S��n岿��{h��R���o<ݻ|Kt��u��ګ�����$�+�%F_}'16[)14^!�7�V��x�D��B�L�oMԉQk��{���k������,*�v.�|Ϗ�e��ʫ�g�7_L.-��S����OW[��M���;ŮOT!\TSx3���rjն��;n���R8Ϧ�<l?�/�v'���o���? +��,�������;?�,�JG���JNѓ��/�./�"#�}���~!Y��l�ʕ�d��N����7�dΨ)�ɒI�I�a��%#���L�ѓL8G�7f�d�#����$2K_�ʌ;�֟��zsG/#�_A��^G��O�v/���_N��x9����7#�N^�)���XQq3�*�nN]�݂��˩���&�V_M�,��^����Rŋ�C�wo���*;�C>�Gk�F��w��z-���}���ݣ��[Fn�=8~c�U=�?�o8�?2�c�_�W>����M2Ko�d��/%z�g�w'&"*$�>#п&H�J���If�ѓ,5��|gW��<���5����]g�s��������o_e3]���ש��g9n��V�u�V�\N-k��\��RR)ҋe�Sʿ�[�������ː>.=})��Njq���7�J,/��Z�����ʷ��������|�X�埽�/��V%�8�[.���W�$s��I-�'Yc淋!e�x�ֱk�"�gOד������Jt���轴���$Z�렖������i㶡��i��K�
Y��D������wW�J��V��.+��YZq!���jZY����mSʶ_H.;x>��̅�ң�K��!�� ++��*ֿ��dޤyHG��g��J����'�'����Z�m�J�a��F���%������L�H�D�(Y��1���{c��r����x<�U�~>��ⅸ���Ie�Wː�)>{%�(�N^����)��A6�_�-9p5���ZJ��Ӷ2���9�?��b��;���ĕX���ku��S��n��
��a ~��� ��a��"��~�����m��_?�v}��n0�oZ���,�z2n͞�[>���/ޤ*���sx|�������Ϊ�����{�E�m�ޓ�D%"�(Q9CU�b2�DI�3JT$�&0ۆV��YQ��n[��y��}κsL���s�y���y����S����#�5�������9��b��1l��� ���⦳��ȸ�/=q1������W����]�į��J���X�/B��
��1 ��}�9��~E��߯�و�h�� +�4wC��b��^u�G���79!o>��ZP_s��)���F���4A^u%ν���
���_4��n����9����[�s��ڎ�a�6��B�V;��b����ď?��߃����g��M��.�B���(2{�=����\u��3� +�jq|oh�S�����A�w��������=k�iL�~��.���g�6�ѰB����8�`�d�c�Dd�5�Ҝ�5l���l4���\��W��r�(���^��yK��o�6+�� +�p�&����cOa_ٍ����w`�z�zvó�i��p͙�����!£��i�|�h����el���+��?��S����GNEc
�q����d 2�̌!S�y�t�\d�7���>�=3g4eA8rڭ�6 ؊^ ёOT���Q����%��p�{q����Œ�_]+�y{�xǷ� +�������~n��;��s;��r�-,����?���� O��2ײFF����Qx!����n�}�D4F�����Lt쐩�4v��d�s?�<���R[���/�zc���ƿ9��z���/�ڮ](h�u)����m�o�^���z�r~��k���?={-� ��t������<s����\���#t�g���#������x͵&�qx�,M��x3{d1~%��ꎬl���F�,�����;3����";�Z�,繁�a���ӹu�kI�ryS�K�
87kj�^܀��f�=^����n��i|p9�����F|�
~?�Kc6��,tıu��|^�'GϠI>���sP�d#�����B�Y�E�cW��vJ4}I<�l�1�r�YN���i;Q�Ƙ��q����J�����_��'��o�To������m��m�~�p����4|}3���Pv�����dwܿ��
rR�_�͢��ј��Er�Q�g��1�����O�����ԛ�,�g"s�9�7�@fFvx�-E�ˑ��rdj����x�`4�F�&ύC3|ʑ}�a���_9l]�������C����{Z�q�7���r0���Wrz_���~�(���`.�%ʷ�>VL���?���sEd� ��[ c
\!�ye�眩�D������(�0a������ +�����z��r8��8wλ��EĈ���=
�ާ<}�G�����U|������]��1�>���c���Dwdn+F�]֢9T)�M����Z�0f��C�}����ժ3x|��\�K��-�zh�8z��\y%�W5�-�ۣ�"�pe�s疟ƻ������/B��)W�|��W�M+�Ƨ��-Wm�ÿ���o��_���>�[�������ʏ��!�?�V�:q/Zq�y�w +�*:)�4L5����!0ӌGN¹�4�Z�&� +F6�h�G�����^�ќ�h�=���vG��h�b-��Ԗ$��t�U]����qWp�y(��B�ɍ�j�V��ʤ?��.���L���믳}�^���+�� +b�M�� !���'��������9���&�w_U1>�KnJٝ_�p(.���chpÖ⡚f�Ώ�&[/��R�6�{�y���Do +��\��.D<�U����hYl��ҺkF�.3=~$b��:����e��O�d��!��iz�߅5�"���/���'!���u��k!ث��x߸z��m�K����0��qޞ���B ��}~�˽mQ��&?����`G����1Z�����h��[����E�;���XF���0��6��M���<w#r�;����+C�n������B�߯B��/�����|KX��Fp����:�A}�����֡�{5��ga
�۞�Y���`�uK�=B$�����e)~�W����F��S@P����%���A%�c�z�81u���3��W�o5���0�����D����)�?I����7�z��bdi0��X����yαF٢)�xdԩ��� �?��| �"ĉ�"$|/D�>ƾ��@�(�����&� d~#Ċn \�i�K���N\|�J���^:���ݷ���t�K!�o����֒m��?x1��-7�S��gSg3��ʏ]S(o]� +yt��?�M��э�r`�/�e�=eC���R��U-������t�_�1�i��
'�:z�4����@��56��_���&�����$�:+��*9m�ף������>�����v�Nj��O�d��n�$�D�梄՚�u�Ey%�~M�l�� +>��'%ܓ���C�%r��)��Ԟ_�e�5���L-�����7rŹ�qܙ�a��g������?����ٝ��ʕ��;��P����'�u��&M_I��?�8f̞+CK� +5�3���N�� ���$��B�� +1���?�?,�þ�{C��'O�x�|���x䭗�ɵ���w��?m� +{����C�hH�}v~7Ƿ����炓���j����4��z�_|�R�����7��b"
J��
�!J�At�@?�ۊi����s����Tե�����d ��ی�����'�I�$Fk��t���R���qm�B4�A����Ԝ�ތs>-�v}$��������u���"�o�*B>���{����̃w����#�sS�W?�+<)R>��}PP:�|�}���R�JY��%�����)n�6W�Va}в����=��爐�{�d�mc��� ���i\���]����WKT���G�R�/$Ԯoܨ֛����&�&7���6SM�v����l�4a�+�훈�'����0��[����jX��� p~�^|_�?�G��-o�`��*E��`�Q��1��a����+���v~�0ir�b���c�8��
���s�0�^q������Qd���;?�':&G� K�-Y��;��ڃ�zf���U��)��}�^~�i��on��sv��?�З>F0�ަ���=��U�n/���X�z���ջ��cFx��^p��k�Ov����'���m�۟�����-���~\":"����20��h�r'4�zZ`i�d^�(4~�n䆜1��e�O,����̕�ъ��l���H��G��#�dٕ�T��i��'"�G���a�s�V��Fo�+�і��hɢ��H���ע����]x�J���J�n̓T��*���8���<��cf.�<�yN*4
��q�V���!�>t�������;���J��q���o�y�7�Ln�
(�a��R`U�����Q�{Q���Қ33�̞�tJ� ��9���c�d���Wx�z#��+���+�)�!�2U�:S�f)m�4_�zq�t�E{���m�Q;ߺ�G^r��_�d_��IlA����Sy�ޚ������竂n^�S^��^��;�UPY�����z>E��xl:c�2�Tc�2 +�1�F&#q=��P�y"�wi��S���[�����~��<�y�
�+8�s�LW�k�Rb �zj&]�m���&_����N��c� +X�x6�� +����6��ucy�y�b�����ZQ5�l��C�ٍ��������������c����?��}�´�_Nמ�#����r�+F���*��[�����YV�m)m\H���=�^��J��� +�B��B +�g�ޯ�����;m`��(y*V���?��>y����*�9�3'Kn6r[�ĒDz4ʿ��*O��H�h��Yh�̅(��+�4�Sr�#�sMB��Ve�;//�}���G�Ա�$����ݯW��z���f�+쫕���C��r���;z��I����:ͩ�,&�~����2f�?j����sh�d����7����a�-`�ץ~{�m��������^������(��<��� �g���':#��m>eퟐ�������퉖Μ�\��( +����1��˨��+���L^���d!þPy�vl��ӥ��o������[��#S'��+��.�}��k�2�����gK�ҽ���uƲ�/mŗ ���ȋ�O �=�O�'���L=:�#y���a��;!
��I�a��̼|����?>'w�trY��3u�=/���b�禎lm��X�BГ.�y�J�6�^4v�C�}�����40d۟��9GU�J'o2�2635GgB����q +P�iHRG���� +W��D�N��i�=�\�6̢��=<��r����"�Ua!I����=SB��g@o��p�x�q��_����Z~�k���WYN�]�c���;'Y���Tj��4�J_��7'�g�졷�uٰ����M{'S������e�l���Ň~u
��Ӫ���y�����4�(�e� +���(����;��e����&�������Ӂ�/��ZLd�������5��K��T[�b�b���;z�@KO�ZnZ�T����ko�g����<w���"ev����1��\F�.�ے�j���݂��7�d�{W��`��� ��$�=?�Jw}�J���s�[���b-�E�t�/.�� +Cf}�!��}���s�[���ݲ�o�o�yX >#��������=f��|���i��� +���S�k�%a�Z��4M1�F���Ͽ�h�G蔊Ѳ]�8ü ���@3t���DMUJ���担|��3�$뽻����4 T�*�o\���Ln�X��o"�zA<�i�
��]>����}퓝���/�w�`����l:=�����9���X.���'u�?]}h:�]kJ嵎�dw���(�zm�(}���*M݃�W�Udj��u?q��,��X����yU +۪���Pš�Jz���p��s��^+:c� �q` +hR������=��Oq�q����dI�>+iV�YB���/���r�������cӨ���`�T����W*]�A��a>"%��S5����t�#G����f���:����}��]L��2j�gj�3W���Oa�;dzi[L�#zC������������y�$;�^L�{�b�|��Ͼ
�.|E{/��Ճ>�^.��W*�DϟQ�Հ�-z���S�ݾR��1�Üy��w��B����Oi�m>�2��?�G~,�DoЖ�٠�V��HӖ��k:������\�HxlTr�!���' �T�X�'��*Rʌ 3*:C�K���Ru@+��,V|�`}H����ӫ��}��=AאI�2�3}]�'�E�]=U}����Ӄ�̎��Ѓ���4�w`���`�z��g�15g�<a���G'I������ƒ����Ugl�ɭF��^�_��/vEΎ^�_�}���R�iv�F�M10A�G�G+p��UP~�$���s�'O���zgEP��>8AS"����$Z���H.-/����/d����u-ù����펽�����oi��+���$U�����j��eT��e���^d���e6n�D5.b��d>{!��eν +a/���O�fpLt��v[Ic�tDt����<�DH:���#�-���q�EG�1��wī��ꌰ-L`�����[a�?��処S��:TR�>�߃��A�6�1
�>���,���2������/��k���;��>�:����4d�O���O�I�;AԲ����J��� +I�;I�O�����%�d �:L���]��]@7��:8�*�l����<I�G��_VIS[�=B�����d�0e.Z6orssC�~���6��r�'�A^"��#F�
Yz�1h��m�Z�?�S�$��P��|~1��ԍ�}���Tb�S�{ +��i�r��l�-�e�嵎M,~����C%����������;��GO� ���-�k��ZЕ;l�ۮ�3��^�K���SR}�VV=8[���!�督�t�Dqx���_��#W��iR�[%k����w@s'LC�� �U~�oJ0"A^�q�����J�Jd*(b�a��Y@�?��ۧA)���s���J��t��/5�]����͜�ЋgS��IO^N�8���_�Ot+�ΠOϣ�N�aJ&���Hw�ZI�6�9�FLm�ѕ�x��2$�$
�Z]��IŔ�����9�H4���Z�����ꂑlN�%[~Ԗj~��4q^1�I�E�-7���t�ج���m{��� �~n'뺹z+q�R��}�T�J��?\M�6P�rc!�c�l��3�7�ט�_�I~r��t�K��F� +��Kw��$����M��]@L��k"E�:�ii\(�~�@���N�tY�^�ܖya��� +�6�̭�lf�9�I6�łh�l��`�ŋvLds[,��dF�:!S�N(�#z;�ے�)[�����5ρ>|Ш���Ԇ>i���*��૾�C'�R�j� �L��q���0_�߹J����v�q�v}p�u?[�m<0
��A���{� +k�=D�kXS��<�]/��C�e�J���t�{gf��@w↬��B��;j������XW��7��U�g�<[9�~o)?hGJx���iP���ڀ��� +���B*�h��'�� ���#.�b4��o2hSrE}�4���M�Kc�GJ��kJ��5��A�9�4��U�3��/���}���މ�=J��q���]Z(�}��GG���|����cp�����������l�����>�M +�t4h��{��Hw�um3���/h�����u��2C&�˒)�q�,�LV���ٔ�j4��q}��وI�b̬�5����%4����n�*��������J��w��^:��W�5���jp��z��b��./��@c�M).̾����O�Ï�ܾR�@3�N��P�^[������s@{� 4������GOi��e0g@Ì�LR�>W�ny��[���������@l���`���A���H���A�]�&U[�;�.������� +<�ܑ���ңD�˛C^^��^9�*Q��B_>�d
_̑�D�톃�����/�K֔�tu�峖 o\����k����G�LP�&k��°�ClX�6hO���� j��F��b��@+ +�%��Ϧך�kRF@�V~v[z�F���<ХM%���B�� s�G�xǏ�L�!аg�pNY��<6��$P��[���,����xM����m4 +��tX����R�C�i��5�L����A��n��H������?�M���'�{^��'^ѧ��<�G���|��ֱ��d-?�w��'������ ���S�� +�9���{�<;��]�<؆S�.y��{�ϙ�Kخ��P�w��z�����u�3�����Rj��9!�|����?��m����������=jM�N�<^��Lצb�Z�jy�8\�"�i��R����t9C��!�t�VcfӾ)LJ��ă�*���+�k��g<sQ���᳁>���bhq�w]A�����l}Y�-G��s�ms�{9����cLb�!�꾸���� ���UVv�IOO��!�]�1H�1��8�Y�zǁ�I�Pu��&� Y�\b��^�h�cȵ_Z��8��o�|.�5���`l�եl��U����Ԙ�\������r�0(�Z*��&@Yyh6h�m��*vߓл��d֕�Bc5 �t�d���Y�dw��a����X��ԙh1���F��1���<�+�U����/�:�Vp�`�`-
��؝_{�)�7lv�86�ے��5_��=w�_z*���)��1]�WQ�^m��L-C�у��o���Y�����L���b��k7�������(��D���/�'�<G^�6A�W;N�������1�mӁ�d8�aJwL±n�Ӌ/7&&��x��/����-`����Ҟ�$�'a?�q�TX�ar&��7��)u�Tb��:C[Ć�9�pC˗�BpO(��R�;h�1]O�@Ǘ\#\%,�#ⴀQ��zƁ0��W6-��p-}C~lӕ%|^�8Б璋
�zg�6�w��2t���^��w"��[Z��W&s�)h2��kpl�2�F�N:���t�
�N]z.2^+(�q�*��Z��d5 +~<H���ɸ`5�c�� z[��
z�t�Z-�?������2���rಂ�(a���+���n�Ҕv�[�|B)v��ŭ�� L<.��7Yy��W���n��bv�YtJ�h���E��:��lB�����m��g�'�3�Lb7�En����A����֙m��ې5�~|f�%Ѯ�{�*��5/0�`]��Õ�6��x�Zol�3���J`�F�X3LU��+@'�D����\�dž�x�R��ț���
?�tT��uZ0�a�I���|�g�Y��8h�=F�yǝn�������v�u��!ܫ��f�������3ۿw�z^��JN%��e�6D�n��Hu�v��'A��s�}����T�F}�uq
�u�Z
t��
&<~}�# �lw6J��KJ��ʪ��T%;�q�+����Y�l��U��^��+���-�D�+�]�+0��;;�j�yف�b���DS����v�Q�b��q\"h�����*s:'(Ӷ���*�� +�`!������OXx�F|�Ŷ�A�w}䭃N�彶�P��8NYqt0�������C8��})Ӈ���-�3����sCѪ3�@�������Zܽ�ʝ��;��S=W�-n�)����5���zD�.ߐ +Ź� {�4�7�M�,����M���q�ҰT-�{�_"/�$��3�0.��L�\4�H���L��`[R.^�|`��m��UO���fC�+�"��5�0��Հ�2��(�{���Ơq���6p
�zm{�(?9t���1��VgC�j)��F
ΦS��������@st��wD�a�xݞp�;-A;��x���ze>SzdSs�T�lي�3����'#�N�NQ�\-��ѕ�==��|i.����X`��}:��� +���� +����H-
n�̨��c���K
��h甠��1���T�o����|�4�����ĵ����r�#/�71�4��.���?���l��<�x$�z�vgq�&�,� g(�u��d�p��R���%���C���G�\i��UBX�m��k +'��}@�l�v������̍�1��6N]�mX���6Ԍ�|Z^�=����Ed� +�E�3I�.���0�C��4���Yc��E�J�`gEd�TewM�מ�WLS�xFt���nWf�8�P̬0��2�� +���Y��q�G���=��������??�� +4����l�ieF�M}ӂ:}B��
uS��������y*�?u������x!��ME���������4mX����0�[_c1�YT���V�G�h�
����s���q���G�oЖ2�j�a;�$�uţ�=��H��b�L�����tx&���
�D��(�y�e�s.�!?w/�Βr +5�Ov�$X#��( +P� +Z�\J�1�_�f\�]g�Ia
P�����Ճ}#��U�; �[�7�Y�i��IXN8f��;���{��R�`gA����b��gV���Y�K���?�Y���,���c5!��Rj���)�0wA�_���r �� �g���B������;�����������z�~>�ɠ�M�}�k4�_��<�T�g�<��t���LX�Lcv���w}+Y`��<�NX`Z���o�1m���� �D��z ���x$�#���r$�"ՠv��� +GŦ�G +0��F�k�>��k�����z3U^�50*��[���}ȩ@��� 7uLf���!�FB�;����9���6η]T9
�1yz���AY����e��u[��s_.��\L�vr���"��=Ө����Ŷ�t$쬜V`gi��\T$�sy;�@����7�&�,%𓁝U8��R�����;+e�A���T�r^`��m�}o�o@N,0ej�����V ��u���F���ՀK9�����"`j�dX�x����<=�'�^?������Bv൯���2�R�Q������H��~$���-G���#�w���B��
զ����7x]X� +�A���r�kȝ鸶�n=��d-��Z����bh�þGE����%U��7|�((�Ą
��T������x���r��8\��%��Yag�_�o�+�{��> ,��|}:2g�$*M��.�;֗�9@�J��*���) +�X��^�f�m�;K^������l`W�s�a��qX7Q�wZ����9��'ܘ�vk�]�r�qU���tp�"w��b9<?4Z�[���ZO9���`}��s�`~-��
cɵ���[@X���k����_0P�xD�5eK{�٘L)�. +W��I�_��Ϩ6��`Q�$T�
۠��+3��V��e,0O�'s��R�>�':�p�bu�H��\R�!�BJ��!����a��=�KAS�tL 1�5�م5O\���4X/��a�� +��Ø0 ٺp_���r>�r}1������N��b7�=\���\n�xвfȚ�����XϪ��Y� �/�����Y|�����K F��VV$��~�-�3ͧ��Z|�eݓ���I�5_�k����"���µ�{.ɥF�\\ +��,2C[�s|6��Xi��Y�����x"�;��s��8�S-� c]Q��f�u{&�=�Z8�U��s����ֳ�Ɩr�gH�B֬��g�k6\)�{�� �
�Sx��ո�ﹻJ��.M��ڗ�t�=vp�]Qy|�7��7��Or���c'�\�T� +d�n��z��3�"EN�K|��o� +{ݸ�ܑ����H��z�Q�Qg&U�QgpNM�}���b������hu�,�R$���1�c8/���"X����)�T#,O���{m�o���������"`� +�&��5�{���9\R���Æ&i�S���}=�ޗ�����Dl��2��5>:�����k��R�q�t�4�-��H�Zu`�/ �o��xj!��+�ze�߅�ͤ�1�X�Ĥ�}3��C.%O/6"yJv�8eQ�5�'��;�zv�xb.\�C=/�ǩ��0Up\!>����L'� 8o�?���=[�ϖ��9�[B>!��y(�5�7�=cw>�
���n/g�-�� +ɝ��]S��t-�r�������pl�g�y��ߪ|�TEA�%�W�pl>�y}%�p���3a��"n��Dz���T�x}r�&�C^�%�1��Ϛϖ��H�^ZL5_��^T66K��l\��|����{H +vO���W��Ho2V�X�8媶c��$�������M�3��ue���*������d��L���σk|i��J)y4�&P��u�< �r�f��b�����L^�9����Y� +���'A�<-�aϖ����n�������i�fP;���<�p��W�=G��O�l��)���{�>�˨7�3� �~Ŝ6��V@��[X��PnBXM�>�p^a��0ǹ-LJ��O��#�+`��:;�c�T|� +�����"�A\-d꿜�9!���b��>O�~(��a����ʌȽR��M���?��1i8߆�����m�,:�+��t��P'��6��6�E�W��]��B�/���ڂ�R�uL q��a��s�6uM&vZ�ӆ�|r]u|�Vo +�97���~��alE%j'\���J�g_p�_�s����5��3Q���������q`���L(3$���cs�Oǧ�����t|:>��Oǧ�����t|:>��Oǧ�����t|:>��Oǧ�����t|:>��Oǧ�����t|:>������S����B�CX/���ދ��ג�u�IS��:'%�E�%G'ć$�[;·X?�������/$=")h^�}��eֶ�����'��ΰ��uޜ��s%!�ֶ�/j�l-J�����ߔ���F��2�0��-,�����~�jqH2~J��7]"�s�ӷm������pk�]k�m�E3�Y;�� +�D���[�#��t���d
�V���y���r�<�p�}��ݒy��[/��0�:���a�ü9�������~�����k�������×�#:6�q�Sr6�_g�����s�"R��"\�9_k6�@nmG�y��ɟ�â%s�sp�VZ��_/^ +Z��j�}�4��A)��2Q��L�V���S����ח�ʩ��(Ϭ5���2|��=��Ӷ�*��Y*�AA�Ze +z�D+��쇋Mա�S�����k)����K�'�9��;�.>Mz��Ia��8h�6���B�6�@����L�0
���4(��uZ�g�2tP��Et&cru٤}��Te7���a>��P��C4��-��K�Vm��f�2��i������OG�k�k�@CB��m#��z���fɫ�Q�6��q9zlB�.�9���������z3�7[�����Ht�/.�[�C_$�3�=��-ԗ*�X`{ ���؞����w2h3>\|�.�]�(6V�wL�֗��֤�$�)�G�Ǎ��E�jqY]�\\����P�p��>�I<ߔ)�>QC���L֤�C¯Q��Q�/;��Q�k
��T<���Ĕ +�~+�?�e�sF@?W��~�:b*\-��R#�����K�3� +t��$
��s=��|=Й �z��{�A��IlL�H��b=�"QC��~4(AS��@O��e�2��X����Iׁ�VUF����7�em&�g����x|t k���I�4U$�C/#��K�C�)�a,_}b.�NBo7�����uM�{��DY��V����=3Db�4e�������p0���gB�
��s�c��d��>v�ej��~f�U)�>z�H���R#bo�/+S*M�eF�<�s�ZDg�<�������M;�*����\S�l��Y����lH�Yq�DEn�x��Q�!t����ym�w��O��N�C� ����[�j�=a����%�]�n�o|v��|}�(�ߠ~����*<�`����}�'�]�QqZ�;:`W>"��'A� %c�-z���O�d<~>�ItX��L����D�� +�{����%��S�L@�tz@CC�\m:��n��RĪˡ'*_� +^� zDW�^�+�}!�EL�.h.ȓ�F�o�RvM��8*ʺl������'��m�����2G=��-�gPU�s����l��:'*J����� +4���**�ߤظ�|�2u�1hk���Z���-��u#��U��b�|]��^;tE��h#@<�j�>�i��,Ķ}�Ч��ђ#�m���=dԙ�F��%�s�W�Mzx��.��.�G��)�g��N�6+xm�#�Vv-����s��A�����S@�YY�{�2�� +����2��=S|b�!�ѓz��]WbHbzz�9�&_��
���G|*���A�$��[Mt��ב�
た}�p=@O]ʪԀ��F㸰&G�j��dM.4Ct�@c��~�RD�C������N�az +� �� +�ob�>��n˦�A/5�s*"M��/�-+nӡ���öDG.,Y�þ����9yh:���o6�~x 誱�D� +bآ�Hw#��9g��;p�{�{��~��~���b˜s��}��c>����umh���- � -]'��8��0k0�k��&��F�f(��.<�������}� ;�>4�(��h�s�������)�S�^��*]=�Kc��)E��t�[�@n��
�� +��`���N�{)�����/O�y�^�Yc���3��zN(N�z��?�0$��?���|���|����G�`5�l�g`Q���Cp���E�����4�Ȁ< +*�;���2�F`\��b��������ǵ��W� +�����h�3g.O +W�L�A/ p!�m����=�x�q9��� �' +��s-�Y�y���=��C�~��ِ�uB���1 k
@> +{����<�f�QWZ��(֊�����Ҟs� +����Iī��1�FB�aX����9�b���HТ����<h��& en3����p<�P���%�N�����������> +���_%>�� +Z1������Tо���חc��?O�0p,�ŶA +��!�F��Y/{�-����`/��~S����$�b�|�.�#�n��[ը���_d��l�ˍ��(���<s�c�����*�nZ����� ��>f7t�阒TJ�^�� +�]�Is��!���p%#+��&ԩ�jԄ 媠2����K�\�X40�.���{������b���e���j��e@\����:�+�S���~�I��h�"���?����(�����{���9���^� ʟf�#�ӁFh�V�[-&C^�=aЁ��]x�����g���c�c�g}&�9����H���s��W������N���b��C� �O"w�}2`=��r�m��H���/�F���M��\�S��Cg@��-�/߀��^aMx��(O`|�S.�sqOzH>�W�~��D��Q�ˀv�z}V�KAx�u�5�� +�T�����C�E��<�9�7��Z�=���f���N�D��~e�;�G�A���A��
��Z#�r�g +�W����AW����[�Ș?�~u�õ��'�M�
X��럻�N���DUng�2~��(����D<ZO��+�땾��4�:�j��9�iJ0Dq�tB�n*�fY�
뷜��� r +�)���3@�뱁���|��@V�Y�Ҵk�Y8���|��u�&��������u�<�� +���Q�>��@�&����E�F|!Z�q���<�
Q��� +̛��
iZM�=�|�k�o�N/�Y
9��-�Ƅ�Z� +��_>G/71��W��"�Dcކ�h���X���-���I��/:�O�Ά�_�I��s0�_���4����G�c��b�蹘��"�>hlq��+s1����y��B�k˱^����D�aJ��(��Px��d�vj �����=?���9�9"KyJ|V~HKq��`n�9�g +�A��<��(w�Qn�����P�aE��~�)�m[�1ᝤ�O� ?�������.�?�`ln�/���G�
➠� +�����ix���q[<�p�9v.�uc1��`�P�B�� +zX"��(�@��������'k���C�.�匥X��RȌ!���1@s<���):��ť��D�?��t{���١�,�)�GA����G�R�T��p��=(ι���DJ��(�Z���Q��cB =/�c��v�3 +���=�8�_<����+�:*�{���^��]�۰�"�F��;e�(���j_|�݀��� �+�c� 4OX�Kɸ|�1Aǖ���?�~}cB_tZ|��w�P�g�3~x�`� �!� �zLX��1a5�69&O���a�k¨�ӱ����,�g�wc9��9m�Ş��1)���+��T�*��En� �Й�߆9/hi_��a��ޛg=&�}6a3��C��:�_��=4���ђ�ޓ��>A���x��u�2�<�5t��!�!>y�cr�����&��iD���z(�N:�Z�kAzX| +��Ό�|"��F��1J��".
�.N)�d���Qmýw���x��r8�l��\��Mo��!9�!f�zLX���8?Z�=&n��~�y�)�[��D���5%1s$� +p�K����#%s��p�ŐX��\xd,�\���F����o���(�xB��( �����F� ��z�F���J��/xU�\W�,�*� �+��������:m�t��%���~�+� +56�T�N)S���3^��nD���yk)�P�� ++\�\�YJ=[�s����a��]_ +�csX� +>X�a���)J��
�T�Q��g�+U��u�OR�Ta�|��'� +�?|����'/�S�����!-r�� q��5�����rQj�&Z���^�XK��4���#�n�P�O^��<�:���Q��@�e��AK�&�%�|.p2��Ή�@��NmQ�x�FxP{�.�+�P}Gu^|�a��x�ZX���.9������b}eX;��e���E!h3�宒�d,�5!����
�(a}�%���� +��|�yf.����o�=:����/�x]�#q>���ĕl�:��X���q(F�2�w���4��wO@\%��_P'`?^��5t�-P�%�YK +��@\@> +���~X�}��9�G�d�g�{@?b�jh��h��5�O��x� +Ç�| +7�Y�Z�Ě��S(�cx�$�a�����r�}���b1zEh,��@a����)l:��F�M�{m�������[��c�{��Q?�2��@M`||hO�����[�����1y�q,y�f$���� �2� ��HG�m�� +� ��z��K�//lh�&����K��.�Q����,�#�l�k(p�җ�� � ��#�=S�c����R���y��[����i��/ +���iLX�&�h����[�`D�z��T�Ӹ֡蓉j��ӂo���Y�k�Վ��Fe�����?$5�5):�p�2�j��j�>}�� +R��.`V�X�*l +�4�v͞OF�n"�:@����_��.���O��fL�<H�����O:d����u�v_����U����Ṣ1�ѭ�Ƽ�e|9i����8�Kཫ螁�$��˄A�ֳ)�j�ku�iV��`Z9i�Z��)c�c���R�|��WR�ջ�?# +~� �ePIջ�KsN�����LV��֧�$��u8��繴fe<FS���1��/�?^���ڮ��IjV�H�݁8��Z�{�x������+�uc �t-{������Jk�G_m: �j2^m��H2�~�#�o��Ʉʝ'�Tj� +����h3��y�=���@��z� +�[w�Y�5�g�Ƣ���7'�Ϛ�0Z�-t�ߕܭ1f�4 Dw����J�rM��Z�� +}���i�����L�v��g5��j3�2����ڣ%�lU��J�׀��'T�>h�w�Ll��!��̥Lr�>A����� ����fe������V�3�j�!oփ�����Z��P��״|��z����mFdÊ�B
�8DV�]��d
�����Һ���\��K�<���|�3w�a\���������|�)]��\��o�����^����i��HW��a�N�������+j�/z��'"�Y�X�����i�I�{�fҌ�$�J]�Tw�Iiڏr�.W*��j&�UE|����J%Jj��?]\��-a��!x��9����W��a�8�?�/(��A}dn�07��6��i������浙���ST��X�K�ѩ��h����!yo����U���ш�;`��m��{]|�Q�Ht�Y,ɭ9d�W|N��҄Io����&ӻTѡ1DŽ�^q 1F_��f�j�z�0�bS_z���ެ25Tj� +�>6
忤&eX� �>(�W{��������]z�]��G=��G�q��}�@7K��(a_��v�F�x����K���[���N����� r��O>�l��#�77!_| +K[�ĥ��&��]0y���n���֬�d�h�������ຂ���Q"�閰��,����Imj��'�̬���%�����>/���6��Jŷ�E��VJr���5k�2��٫�ڬ��U�����[FGož���[ +ߴ��wg��J�G}��y�[�v���t�~��)�>ü�d�~>F�q�z��X��*�dʔuYJ�J}$��}E�e�������5�E&��!3>�����ه�bqn�){��e�Zuȫj��V飊#�ҧe�;-}�ˈ�ޡ'��F�4� +���R7�j�w?걷�H*��O>ꢨ�>)���0��ے-�8Ǽ�:�T|8�Tv��^���.j��WD�� � ����tA�!���J���e��>\<�$h�,y5�9���S�a˼�=LeҢ�P
��� ��4q.G����xa�kx���&��Hޔ_4�wQ_��?ZͿ�]���MG��3C>��Y�� +bz����%jI3[H�{Uǥo�l�K�\��n�_b'~QsBr�I$�j7�X�J�&�4�96�_ab�+�q5������������O�Ń%��O��_�|���د}��@��x�4�xkV���4�Wy`\x�嘣�d���.⾦�#Ět����Jڛ��ڎ��~Z2��ٗ������i*��FK��2'����W=G���K,~�hm�R$.m��n>)*n=')����T9�T\�o���������7�e_v�ӯ;���Q<V����V�A9��(�k'���^l�Fޝ��rFTQ�Q[����,D�W"�j��5�����v�����K�4!K~5T|9F�h/l�|� +5�z#��DW|8K��27z
Ȱ���W먨ڭ���:��y�����Ҽ2KiN�a��c�*3�U�̣61�䃔|�Ų/[�E
��yu��OZ�����w��x����VsqE�����E�T�c�Uq���ē���v>�;��2F4P�+n����Xӯ�L���g��j���z�-�n%X6��Y�'�]����mL��h͒�0�=��_O������i"�����m�J�6�6�]���
S>ne +����
1kˏ4�-�?��,�PǫhaU���軩�N���|!��H=mc����DN7�s���:^�N��N�jLO?��0Ѹ���{��]k4�������|?髊s��&C�������D[V������2��h��������$�ބ��<�����1�U�u��9*���̲9%Z���pWNԱ�[1���`qs��Η2�a�����RY�5�]��'K�+_�<�9/y�q����~2��Z^D�Z��o����ϼ�y���'�ƽU�7qg����wQ�Ϊ +��Ĺ�%����o�Ϛ���4��G��6�d
��}j�&��Q�aɛ��BT�_~1���zT��:WG���E +�[-��k�� �}�`��M�nV��)'Zo%���\�m�W!�Zr�;Gf�$KL�u���uO�l�L���a;�\�u܍wo +L�����u��Y���J���h�^��G�;�>+v��-q��-��:ޞ%�� lo�VW]����Z��7X�˫�anD_Fq�/�+��v/�u� +�M*�� (�O�;{\�^s|^#w�(�OAe��E^��E2��(_II�>I�ѹQ��zo9=�ל������O6�I
� +��ʶl��aޙ�6�� +��λ׆^�q��e�]��jLj�r��{5�E
�a�
��G���P�v��pnj��q����H~��l��$ر*"6��'&��=�j�G�}eT���䨳�)�Ǜ�"�=o�ͺ�EJzC$%ͭ~�G��n�]G����fM�Qg�2SO7g%�p7�`C=Ϣ��}Ȟ�l��n7ѷ��#�ef}�"��9���#�j�#�c]�#���_6x���g~ۢ��d��M�TǤ���M���Q�����bC�c��d�]�"�~���urƺ=�X�����qB�~���̌�rg�~pV�*O�{�'�勓^'֍jZf��Ӥ��8$.n�5���=�r/ѱ:*%��;�j�[�mcl���2@X���ֵۉ�*]%�
�g2���"m+cn���u����C9�y���<ܬ�0ڼ+'�BsR��_�KMx≶�����tG�������p��ܘ�mYq�ccc��b�����������T�7;^-g�_����ܡ;S'8{�V1����~J�ke�w�LZ�[$�{�7��"�J"N6eD�w܈`�<��[�էè�a;���ߍ��J���%��{���7��;o]������sd�;��Ý����C}����}��)���!,嬒J�����A�Q�r�G������Z-��;gu���J�SLQӥ�'
v�9
vQ�M^ɢ�e���PM�D�����S�w��y�R~��y�=|1�}�6�y�^b�}�ƭ����{�5[U��[
e�q����)�[�Q�iP_ڝ�J�"�_z�n��� +/������� +="C�/#�p�13V���k�U~��n,�E �o�b�ɲn�.����o�������� +�K�ߞ5Z��i���n��h�������:r����X5W�X8\��O(s�i�lt(��W��M����طODh���4�n�;w���)s�9�,�[�� � +�d�����J���K �ik��s7+V([-�}>3��v�UqBA�V�[���gK��w�Yo=b +�:��-v/(�{��1"��-:��+ֻ2 ѭ2$!�W�m<�n�q�.DŽ���>��4�������j�S�t)���b0�C��>7���@��k8ޘ�m�1Y�鞂N�;%��/�r��E�!�S;�n� +��Xi�p�"BIa1���b1�C�E�$��"1�P��A,��D��fD�5 �W��|�j��<�&N��w��+gc��"D���/lt5u{����}�s�*0.��WTZ�G��7�(/F]-��=.v�|��!�J�[�Ǒ��8G�.t/|��Z�&����kn��uY�~i�I���\����p��9��o�-j����۰S�X�T�X�f9�nzFN������l��W"&���(b1�@�%�>�r?�^��z,����'y��x��˄���"b�/���J�W����?*��72��7*����BoYz�gԕ��{�nQ/ +\"s\"�r�����b��E�QoK��}*�ٯ�����䯟\/�DǼjF5��bht�s�.N��qb���(���s��J_��8t��#�����r�j�7�L F
���N$F�MD?� fNYM��r���U��@uc�sB9갸�9���zlV�GTa�s�շ�QY�ܢP� �+r��5�y�Y���S��wΑ�ŞQm�Q�_[������>X�7;G�Ν�/{=w�]Bi�t
����Dg�O@�4E�T�|?�\�����_�{������h.��{�P�k��~�[�?�e;z���Af-�#��d�.���Z��b^�BX�$�a�o�c�+��Bg<n�K�D5;Ew�9D�?���\��c
����{Nc��91�����F��w�;��=S��X�P�X�q���Z5I��;@}*��*I +Nx�'���#�i���I�[̓"�� +\�t�~����7ҵ"4&��7:��[v��r�ț��I�2�W�J��U���tUs[�uk�3�&������99|��q����|
C�8�? +Ͻ�y8��F��PV�@�$��XL�Q�O,�eAl5M�Ө�4�ϝ��ݏ��\#���d'Z�F�lH�.^��W�/�j[}�-;^�~�Q�0{}�u�ֵM�u�5�ˉD�B�z)tԼY3���pt����\������{$�3c��>'��;�Q�r���k���������Gh����9��-�C�V�GG���qx�!5�&�-�}�Kt��"���7n�M�j��_�u�F�){R�*K(��r�
�bƄixn�wy����u�wpMc~��H�9_�$�j���Ăeb��Eb�8q؞��<�Ϝ��[�I/|e��<��^�ž-pM(+pK)-vNz^��[��R��X�[EP��ѕ�n�h�r:��m�__�P6���,�/c:��{cѻ���a3���I��8MC9i���i#���/&&�/"��YM�T8@�Tv!v}=B��[��8!���Ԅ(���h��� +S��'�'��ZGL��� +ߏ�@(�G���J,�x��f�%�?�[n��3o�x��J(`�{/<�P�k}��\�����5���Ǖ�2�J������J���R�D�]�ʹ������ǿ� \�/�JĔ��Ih���)7��Č�ˉi�V�Ƭ!���H̜��X�a?
gb#�<l�0UnW@��/�����S�K����.ǽ�w�-+t�-�P^����9����{�\� +P>}��I���{F��q�+ש���导 9b,��~~?�1?����Qq�Bb6�9�6s6���%�,Q'�-2$f-���sԉ����b�N(�˱e��[n�����AQ���z\����,��#��h�w +~AX��{Ǩ�7�Qo����5F�~���[�i'������<9g�����84�b42��!7��5v91k�:b�̽Ē5b��S����� �sR�̥$1s�1CQ��=� +m_b�{�;�����p��s[�?rG��]��<�#���5��Su�CT[�S<̹�ZǴ�*���z�䷥N�K����r{����_��еx���M��EL�G ͫih�M���^�OLDc8 �F-"f�_��m#�0k+�OU����&ļ��Ă}��}bO����
fO�v��6C���@�_�X���&<��M`�{���е=|�${�j\i�����1���1���!6��s������ܮY�f�����|�|�j��"�8r���(���'��=q�=�����(������������$�h��t�5�XÕX��B�W�!������y�z�����T�p+���®7N犓��#=�I�z�\��3=?�E�!��7֪1>���2{܇}|yY��d֬u�v-��`DT���Z6N ��E����(��G9��4�9]N]�b�EĴqPnD�䕄�t��iJkL ���Ă
'��{������ +G�%Ej�p����[�&�/�q(LDׂ�����/��%-t*Ĭ�j(W( +3Q���
�L4��\�;k71g�^b�� +1w�1oM,�x�X��J�����mt+�!�y����/��~��W�m�������zy���,��L/*t�~��M�/�~��9�m� +�VsP=^���X�aM,�fF,Y�#��C�C�r��5耚���;{;Ă�4�`��X�z�X�H��c��G��o���7[��SV������
z9����Hu�ч:D�l̊M}����'�TӵӞ�(�ڈԲ2ې� +���b��}�A���xm#��L��y2����8���ᯀA _N1a��h>*SG��DL�����@�X����������s�����[xR�1�lw��f�읶=�k����;.=�ǯ|�j.�b-�j�;k��;-�R�e��(�lc|$�9��5w-t�=�QZb���!j��9��S���A���4�������C|2V5��;e-�p��F����!����r���};r���1�<ގ^w���u�y#�x�����<~�o��-��Fo���ӣb¾�ܚ}��n��"��f�ln�f-��S� t�8�n'�r�.V�D +�H����K7�h���x�m�|�m>P�i4q��.�`�O{�� ��o���������턶�:�Q�>F2�Q��Ad�1W|*l��9w����0w�����I��Z���T�1�z�!1g������ؔG8a�Iˉ�[��f�$��Am� ������A���I�_9K�O�a��j9R��#u�sz����`��3��N�q���ad�C���R�7�+�8L����?rּ6�B7�ϭ��9J���-Ե��G�,?�d�b5�����Wc$�}'��ٛ��t��I�����mL��uLnc��2@�]hP�1vQ��u�Eyq��\b��y�ԉ��B,X�C�ӳ!���5|�w��ݷ���Z%��'�/�=<_(8�:V�偢�+N�i*���p#^:X�4��zm�9�(E��G���i��9QW��H���v5z��-���������^��^��-�e�D�A�Lx�v�N��U�I6�͌-j>!~_z�(k`���7u2�C���Q]���A*��A����sY�,ۋy��~LE5c�:�����7i%���}����s�(_�
Qݥ�|s��
��ܠe{m�vMb�
����Fz��9�i�L�n�M>ԛ+�>�TpB����������S1x���vl4���яԳv���g$��y1f������� �'�N�ﻤ̣�v1�K_7^��\����gd7U�l���zg��6�-����~��b�<�k37˶ ��Ҁa*��٪/��j��^��8���{��6w��z?Ӂ�X�c�[<�ھ���o��W�����S��FwIi�3�; &m�tTu��;�����_����?4
�߭�]��Ab�7�Y���>� �z��)n&����/m)[��8����)�1)-=%�i�[ydf�~2�d���B��Q�a�m�� �w�0� +�W��T#V�X�-o���[���ш_��� +���( u�a���i��
����� �RgRb��6I3i���h�s�S��i��<mT�x��Xb*'����nqs�1���� ���G� ���W{m,��]��U��/`\��Q�4%O���V����0.)v��W[���s�}�t����3gh����k�%�zI̘�DL�� +�$�*�j��wp�h���ns���뚹�PV6 4
%���<�B�du�g��s@Bh�h*�7�{�y�O�ih����Z��߀"DR3yӳvM�R�z\[�I����3��6]ӻ�GE�>���>� �(�+��?�"�7����O�\�SE��|���K�g]l�yf���B�-a6�2W�{w�aJ�fû?Ԍ�U6�+]o�1�U����9�qF����}��.�+��e�3���r�)���M��1�� 3C� +Sٺ�ضd9�g�VB�;��hx�
��$}��;�b�ݥ%�_#>��w�i�F>�էE�?\C���am�g��)sh�x�o�g����a����&�75�ɇ�y�����������lQ�a~� ������&�V�I������m������· lg��ag���Sח���s�Uܧ�Ц���_J�l��i��.����ٍ�\nH�Sݩ���:B���dAf�*�}�xhf�n1s�r��B�tqгM´�Tj�� �j/��r +��1���[��\9&cf�����
W���_������:�q������/<7�./5ܜc��\��zᕁ���n\G���eB^�T>�f�Xrr6��k�z{^�����������>�����s3�g���[��p_���R4��g�>�/�:��/w��sE�gb�Tw(�ڝ�an��^I�rz��-_o[_n�n6�HO��^��=��Zl����p�/wb^�g>E��"&ՌᓪF�N��,���]��x���_��/��Ž�g���
�ݟ}��
���Ӟ��=��_������(�; ��y��X`~�������P���?��)����u��٣{�<<+?��W�Y<~�f��t�y�f�~Q�
I�օ�Z{��Xr�I�:c����5[��ܺv#�ظ�r!:�N�d�X!G%ڪ ŎČ +I����,�Dh%�'�y�矩
����)|r�����F���{�k($U��3j��Own|����ܐG��}oߋ�4)��L���:�����ۙ���\�:��� �'��]{�e�iG����*����5����7i6�ݩqٸOs@`�9Kmx���K4�l�4���h�������W>9�3����0�g8rm���p�O���o��V/kDc�%i��W8Jɫ�,��J��x����&�K/��<\���wW��O����p�ز��.�u7�rmO7qO7�}?^u~�P�7�;~o�x���p��Vx�{?��ׁ��?,&n�����m<�0�{͞�O�܇��ckF�����e
�B��4�f�0M�gU.�܊p�7w���<.<ˆ�-!�t�x~���� )�&Yue���&���������<��w����?{�~�aNC��b������_�c�,�|��j���e����%ڞn���G�2l���p���L���\���}�˵=?n�:���t�͎{=�4��-�,q��Y7{�f��]�vi\�{hv�c����nޒ��C����������'�;B{�3��Z�֟���sZ�{�@s�����b�����\t��P>4[<���p���KgI�͓��%��J�\}j���R��?yr���
�c/f����p
��ډ|y�,]ۧ��s?{�7� Н��{��w��+�-���y�w�/uE��{dXy�1�n� +�af�OĬ?t_䲾��#eq`���8^�o���x��?�w��_���-���x1�f�2�'Q~���+X~ew��r���R������l]��[�?y~������+�8zZc���p�\�bɅ��y�� 3��oM=�o�t�����.fvNK������_�WLb+F�1�|D�-�>ڑb��Y��gh���%��/6`���?�Շ�g�Q��O�~��7}�Jd�__���&b~Mx�[����2;����G��z���m��į;��0�ܡ��h��c����T�I����*m�W����Iɖ;6�k6/ޠٵi�K��C�kt���>�Ֆѹ#��4[mp�%����h�'78I�7C������qjp�p��E +07'�s{f�-�6A� �|f�x�th&��l���d�8��
s�Rũ���{��(����/����]�g�������|�<R���x�Ϟ��g�Œ�Ybv����B�ٿ�����U�����OV��Gs�
�\��[���l�~�Z_vq��>QW|y�>�i����f��՚=[�k���K�c�Y���I�p�4:���a�L%�d~S���D�v/�so��X0J�N�����
7��57������n��ۤ���Bj��Txn6X|Z���vl<⤘�4�4uRY=��r����bV�DҒLi�G���Q�v��S��|��P3�N�y<s�Ш�J�Ɯ4������[K����\����G{�"�줬��X/��ݩ;��^n����o��]/�H%��B�:B�7;���!�ɤa͝�~�4���x�^��� ��J�
��"T���s���?����r�;�7W���Vr���W�'�W0���rr���̏C�ڑ:����\j���=�l�?Y��w�+�:h�f������FI%�3�M)��Ng�r�����k������GZ����>�V4�����[+���OҸ���Q��f�B���*]���l=n�]_!6��o��I�{�f8�N��r���p�0��>��ҍo}�G�ӌ�>+7~�q���>��,]}��� +��&���Z8��~���g��]�yb�f�m}D��������r�'�K���'wD.�g��>�ېnd��\�1f�c*F�!�q4��U��x��`��ta�����E���Ο��M7�����p�Ef���ʘb!�s����,�/D�+���qRJ���~t��꣄��BB��_;Z������,��nq@�Hs1�� �\�.\�7ۡ�!�uN#VQ�s�?]��x����!1�`$4\�3�=WՋ_�3_�P#@3��*?=_,�t�����Jhπ
³:�?��+w�/{uݯ6a�@�L&6{���:y���.���,pw�Y-�� �t`&l\d���� +F���e�u0���ӟ�M��l
������|Z>�E�ia�vЊ��br��0q�p�����ä��ˡKM%���U
ߴ������Q(�0�B�)�o-j�x��f��Ģ3�gQW�FZB۟;\b�@.�j�.2���<;1����2Gz�)����V���4�I&��'p��{�%�␉q�2)1o��Z:��x_�B�[.==zu,���4��gB��"ҌJ�t��!�>�=_o_�X��6�]��K�����;B�b�������Xf�R��`��x��S�0��o�Ġ�a�!bf�D>�t��O1�ut�<��
5'����Q<�d
0� +�"V�����&���x+�n�>��f�r3}@��_9ZN���H�H�V~f�x��6�۷A7Q��j��u�Tmi�U_Zf'�}�'���x�V�ϙF҆lxo֨���Ո��/ʟ��jx� +�~̗�Z��,>vNb+G�Wŧ5�C��_�o�}�~͆y�5���h��t�hWV�����ri�C*!������A����/��?�g���������*'���<�@�6�G?[c8�l8�R�+/-&���������}���!y���=|��9w�'Kk������Հ;��z0��i�{]��E┱<@L�e1=�lN>0���īd�M(O���Yʱ�� +F��l-e�L� +)�NBD��> � +�)����1�K/��lM,��.g�p��֗�'��A�W`�����1�zW�N�"�L~�p������h��եc1�-��BR�b�tLU���'=)�9�.�{�Q�x)�����7W�.e��=s�s���b�.����\��mRF�N�N`��۟m����������3���xm�����$j��B;.4��[�4炒��p\�D+WO��<;5���lX�V����ͼ��-��:G�ș�BB�h��CK�8��jF-�}��3��P4�}">����y�<hI]�vB��|Sl�}ǗI����~���)\�7�����0wg��o^�{_��7�] +?�w�^�o���+��UN�N� Lf��9�9U���C˛4���GH�I6�_�i�3(�~�������e�k!(� +�`��O6��m�Y5�r�����]�o���S7Y-�����bh�-mP�k��� +����-�s^�6S�>��Aq�g7�����{_��Sѩ�bH���e˱��e���R�%|��rݽuЊG
��4h���%�)�7bF�$1�k2��U�.��^m����k�z����t��y+X�Jr����=Z����y�9�S)�(��P<��Z��]r�7n��Ǟ���J�#w�'���T�k�fȮ���]Y)v}�Cn�����:��Xn#��`�n��E�:���w<�"��.��� +� +���:b��W8���s\���~������c��#/�8P�3���]9JT�-��4��;���p�g^{��;��'h2z*�,��8�B|�(褋%��7��]z)(��'��cv��1��T�`�A�q3��4z��z����ۂ7���+ҟ,91G9��&�����Bs���~e��T�5Z�����H�s��/Z��0bڰ��{�Q�}����F���.��W^b��E|B�=4�Ÿ|���Y�ʲCn�ރ����g�� 'g��=��A��`챘1 +�||�O.�'�
9����:&�v]�ӝ�·Q��� +g��
�_�֛��r��z+�������5#t~�M���脢'B���,���VC�B�w���wB���Z9^�?l�u���Zse����E|��3�XP:��[>� +G.��#�F���P��_�䝜�䜚A���S�+@����q
a[:)�\>ؿ��x�����Zzu1�_�h���� �`^����Pw��9����z[�k�������]-��:��CB��s�/�J��I��n�1t<q��z��]�<�w��2v����E���`������B��B�]VS]�/�]\��?�n�q/������{���������T��h���N>�9�Ӊ�S���w`w�=�w�{��M�w7�Z�塾foxs��<!(� +q��Y1��JA��!�6Xwj\�H���Ah�B���Y�u?ګ�x���8������1`gʷ��'X�-���-�b�9��
Q��;0NHS�`��D��9#HS���l��`@$���c�W�X!�qt�q�f�$T����r +�:���I����K��.;1�+u�'rd�e �,g�,��CLZ��jy��tf�|��5^w��%Ь�y4��F�ژ��)��0�e� +�jط�l5�x��H�\��{n~m�<�n�y��<�Fw�����;��������k1
M5�m���;]�d���>4u�_�n�w�̓�5Ӄ��j�\��z�rZ�$�?����Tk��k��*f'��a=\0�X쉅��즩��Z�
k��ŅB��]����cy�2��{��5�w�#v�NR�����!&zz5��,��#>S���l!�6J`�09(e8|4X�ħ�j���4M���Rl�w���t��:0~H�>��y��r}���7�)��(�g���e���h�ޠW +-n)��Q`�|3���rR� +'����/�����L�,#��}�-_� Uc�k�]h���+�����,�q�1�f"�;d��a��b��I���Co�_��:^-� �mb�!�h|�����>ŧ*����3�`K����#�� Y�c�ƣ�؉��|k�r����k V"��b�� +�y��<pVR�1;K/H�,f��O��re�}��n�/�&�� O��
ɷ�Q�����H?��b>Y.�
"j�;��V���-�*I
����`T�]_�F��}�T��&>���B��b$��#�m����#�=�Y�uo�1�q�!,��7�a�O:�����덧�(��+/��-�;�����r-;Kl�b#��2��βp�ZT�̥�����&6��!bg�O;+���2�+;+�
;+a��b����TYގ���충��9 X`��b�>&��@�gu�̞�j��f�R!g ��_qe}��������l�]K%"ێ�d!����Vқ&�G?\%�������&�9�`�/��j5�"��~��]��g5y`�0������˩�N�#"��~��E�i.��?�'J���W6�����U�A�-�$2\7Q-��/�,n��'%��ZFN�%��[q}/\���������d�쬤��Y�6Fbg�Y���\������������^�!�~�Zuj�OA�l��<�[S=�vt鱷|��x,�KCZ����a��Z�r���ŖO7˝v�n��[<��p>�j�Ng�/���Jh��ܣZzy1��j�������1���14͖�kS���6#�X-k�K��Y���l���wWN���d����e�'Yq!y�߰��_s��J%]s�ʳK�ܚ��s[���Ӌ��wWJ/,�R����bX��r:�ţ�V���&nLQ�3~�C����rÑ�լ���� +�0��-p���Ď����F{�` ��2��8A��u"�sx.���ri�,�_�]�}�ᚊE��bX��N4���#vR�M��J'�=��[{�L�O�6D;��5��L +8?bݵed�`ˤS,�+�~��)��y��Ԟ'�~�e��Op�<��dN���������=�2l�/%Կ��o�l-�Y���}���`g��g`�C*�)euO���@=����V�Y��>�{�{b��|;K>��������oe1ߐ�<�rM���lA>,��Z�eﻸk�\�=�X�sԆk���'�-�\�F�X} +�]���쎩`nȅ31cB}���D�+��Q��rL��aĀa��T�[��b�G�ڋI��#S�.���=��g&�߈�"�q`Ả%��w| +��4�R����TՐ\>���� ��X�f5�}�� /*�rٵ��<��>����t���/.FOC��j���(v?�!�DZ굲�WĨɮ�D�/pސ�E䏠~¿��Ć;��n�m�"�^[�|\��h�w}P�����bR�8�Ҕ��Y���c�x��U�1l# k��61����Y���=
�@� 8�C�ڋK��똍m��P�B=���;�
W���=�����bkT�d�|��m��G<�;w���F��Þ�Z~m)��L�)�}���Ih�����>2<�z��`��^3|���>��K�ص/陃�nRp�p���\����nTR��錡�˩�a������6�C��z��4:�Q#�C~��%���%X=9L�̈����R�3|+�_"&Qō����׀9��9�Z�(18� +�-\O��eb�E��#F�!�6�!�e�+E����z��j��zۘ%�k�ƞ1�Ä]_[����!���o�ƻ�ܒ���\C��%�{���7�Ǖ�2
�k����K��{9$�F<k�$֍Ź��7�s_+J�מb�M��A���W���o�Z?ߪ��#�9��,磜����/�Pr�OK<zs��b'�����b��f��(&��Y?�\JI.MyJ��I��vg�b��o���;z}�8��uJ�9��Taq�|^Q;ΰ�#n�7�)F�u/V��/����-��Oh%�X*�����3q��>0 +X�Qv�_�����A`m�
�v|�l�G�d�2��j�/A>B�j0��f����;�/'O�g�.�s��C���9|Nj�|ۣM�yJ9�%�UB������~�=ҁ��zb}%�:���q���|��������]�~�E���z���J��Ib���֘�o�2��я�����M9r�4�#��?��I.���'[�
�-PK�[��L81��ř��2�?e��*���6N���ƫ+Ď϶J���>���a�)��q�X,+�s�Z>^��O�5���'c�I���|͙�\ǧ���r�?X�YT1<�|L1"�F)�C|8�!��)���k�&V��6�G��>�C�.�M��k���_��R�S����Jb�9�����)��c5��y�F�K{�k5�:N�<� �]\w�I�o���J�)6d�`L�k��uL�Y92�VE<o��� +xZ�qfK-읅�XWx�/V���C���<����e�t�,��j'ǜ(��|���0Lg� �bf1�U�>�ܢG�Z:�XM��YA�W�LX�5.�\3�#�O��#�X�賳5�$�k����'ȋ`��Z%4���9����Z����>�'~(����O�T<��JYN>���� +n"�8/��E9���W���i�*.,!&8{�ґΙd��������kĤ'�s��p���XO�� +��'\{�ۭ�K�yH'�;
�r�����1���ݻ9���8���#Q���i]_]�_oooooooooooooooooooooooooooooooooooooooo�??�����/��^�g?��u������X{�9>�\b�v��DžDE��&;oė��9�]�����K��Y�b���M��]\ٿ�3ط8/f?�|����˴�~���M�ՙ}��36$8$�}Q��h��M��~ɺ
�V,]�b����W�Z�z�u����KW-_��_��/������������%��/��/9d/�G�{�op���Y�;��ǘ�Ş������d����~p����~ٮ�����$wg��^q^�Lo���?^�:�W-_�v���y��ڕ���oO`?��I�Z:����������̡W�[��y���k�ً���\��4��]���l���AsO�������g��>wY�g�V��h��Cf��,k�9�2��A��ڀ+/5�|���f��}�=�ƃ3�0Ƙ{�������].ޚ}{�4�@�22�������"rm������)V�Z�σ�>���,���ô�I���>��ݼ
�w�4�����Z��l��Q߿ߗ~�[ +1ヒ�!ebH��"cv�4��cԕdz�s�0�L�-��Gc���8z�qLC~�t��`�?c�`<�'�i����˪��1��29"Ö$(�g%4�F��DI�x�I�4 ~#H����A�����X����!I"Dgؑ4B`��#żьS��!Gi! � +#��c�!���$
�n!�V��8
o�ǒ�$���t�KBBU��5���D�ㇱ��b��W�WKO.0dwO�(��b&��[AZ��{���l�߃�P\��#�I�(�}��70C�l�$�9�qU��c��Z'!8{��!���Rt����8>����dM�h�&�>> �L8>O��!����f�K��G�2�CF2̞�Af^Z?3w/U�%F�p�s<�_� +�ݞ�/���荡��t��i0>-���c�v@����9��V�dk9�r�W=Z�(��́h�6�Y���s� i^_3H�u@�H�`)�-��$k54���5B�/�Y����Վ�qs={��5�+I5NjF�dCN�3��N�g$9��R'؏�hÇ$Z��-�����@�"��������jCf�D���lG�L��HI��Ә�I��e:l�'�n�1&���dgH*s�dI2�u�d��w� +�}B,�H+��˲c3G`�Ҙql +�|�<%(Æ$���N�ȕ�T�$�g� +�[C��Fq������b`�$�$f E�12o(=�H���Ԑxt��i'Fe���1�9"��И^r�8s��T�����������6c�Q�4IE1y#tv/�=��q�g���̄���"�mi�$��ѐ�>]�/%�&�Q����F�xA�VRz�d)"��K4߳ݍ��=��֛!�R+G[��0v/�,9���C�x�wф�1FZ�dL`"[��f^�Q�U�>ȵ���0~#D��~�`�-���2{Y���H��6:C��d)0�����A��O(F�L�Ր��HK�����h����O���k�&Ռ5Ė;��vjX�
FQ�)��$�:�Xc�UJ��Q1Hf`T��[Bc��@�<I�Nj\�#FIJ/�a,ݧ�� r��eu�(6FQ�dv]!A�|/�EE�����49�@%)����t��g� ���il��d�31*���Tv�İ��;���Gct�Ə1Z��7�=4�_4���eCB�5�x��m?��E�X��i�4:Jc�G�� +N��ZS�fC��4�78��� +���Y�S �c��E�1Y#��)5�q碞� +F�0��0QN�K��ϴ%lI
�NŨ��Q;^����
YW�UH��Fv/a��a>� y +18� +�n���]���Ը��j ��-��5�5z�=��$�?�Jo2��!ف�a��f�_�a��gwO��[0S���,���oC^6��&Ya�k#R4���^s�H�/�`��P1rC�Ձ�W�Y?�]{5�n�`l&8ǖ<ɠ��K2��G�a)��HPb�G�7BjTM��H�Z�9c���-9��'��4���4�<���ӆ�|Xb
���Ҩ4�ojڱ����c�Z�;��S!)����Q�/,�oRKNχ/2$�8B +K����-��[�!��a4UM-�.-'�ɐA� +�9�N��$� +˅��l;���|�Wl�(\K>��Ƌ�����c,�~���f ��%f�o���Zht�����_���JQgA���#�//�,6��2U�k�W�Gb���V>H�QH�����y@��SH�#����_L�H��'fB^� +��AՂ�YRt�|*d��7h�<~���j +�����M�������z�����f�\�������P@֜�<7�dX��;X;�(�L��l���⭰�HJ��M���X��n��Qd�V���C[&���|b�֣t�>q���G��+�����$!����dk��c`�`���Q@G�:ct�K�j���$�xm���ps���Ps���C}�g���g!&�\�F)�����Rl�H�'e����f�E[�b,).Ʌ$[C�2�ZV��d��-ћ"��x�xK/��J���`�z����'��$��t)$}8$� �V��{�<��� ��g�i}��eVO�:mqӟ��u��n�&���S��c-�%�7����R�+��JG. � +=�R`
�1�#�7�άC���ǧ@FИ�r���jT�-�O5�d� S o�5E���Y�d
9�NYn )��q�����*��ǒ�e1��
`��g���gK5W��$�\0�������~�'�|����"YP�v�.���dd���@מ��y|'�5��-�p����Ŕ8��R�Q�� ��x�2ڧ��4�q �B>?��j�
H�5�p��c���$�ւ�z�Y\p���}��&[�~Vִ~�����^ +2�²m�%�S������Ȑq��D�ql-
�4�p(c8��joV�x�|4��J���������YC:�:��9%��|���R�����-i�1��%|'��,)�Q�/�2} +{��rzJe��'cv�t��ߐ +f��05���[A��i��ɇB��T�9B��P���S���:U�k��<=C5�j�!��$��Q;��咞Y|��-�>J,�~&�?5�PJ� ���{_�����Ax��O�K5wWB�P+�X�
�>X"���O�I���қ& ?B҆Cv\h�b��|+I����1Y�h7�G�-��� �=�.w<�)��w�\�I��ŕ��)�KI����K@���:S~�>��+����Kţ��u��k�ˀ]pכ�ufWXS��`u?Iȇ&G����d���hm2�G��)��Afud�ѷC��d��?�5$� A$��Sn-GW��_F���0d�a��q�c*G}��ͥ�L9��(% s8l��C
��W�f�v�ߙ^7A-=g��@�r���Q��H�$.o$���O�Z?Yǝ���/��_��ca^j�9����F�kE�X��OP~����)��G�ȩ�O����I�E_R�2z}�襰|���!Bo��b*���cLrC,e~�j�������}��C��e�@�1�ɓ�$Q�L�5B>�bj������#��_GA��6e +{����.Bۓ�|Ǔ-R�G�Hn%�Qh�d�L�k�/��B$��6�裆����[�����HR,,�V8e�z]D��8��&�����S.�\7���7ȵ�C�#c�F*�ͦz=�t���E����\|~�Psk�\ze��xl��4�'�{m��f��.�6j��q����&��@2���Y
�����`O�P��{��n�~
� +�/��gQ��[p�0Hq�6e��~GB��7���ݯ\~f����7H)(k���r�Ö����Վ�[��㐥��{S*�C����2�g^�H��'z�^�m$���������:��ߒ���^�G���F�9-S咡9�v^@us&�& �1�c@�_S~f!jz���b�D���ub�{�� +�����Q<��C)�H���g�)8a�O^�L����+#�^�'DW: ��w�D��;��9��3�4Ւ,�C��3��Օ,fC:M��X +߉�����F�ې4?��s�y�Kl� +�T���2�GDd�!�'�BL�(c8[�"��n#$D�Tq���?���0h��T
��s� ��f�<��ߑ���{3�AB�7�Z���Ppz��r)=RV��?8�p,'E&�}�I�����,䏥�k��G뀍2�]wLE����w�|{f�Q�B����Do���A�K�=7 @�g�|�w."�mI>��C��Og%�'B�/F������a}`���.��m����9��|H�0`!p@�֮��<Ѝ�'���( �'@M���5�}Q���,�[lV�o,%� +9p3|�I#�HP�M��w�5ҡ��F�7����䡤�ߴ��iE����p��p���J���QnQ}����f��9������J��ݵ�3!��{ +� ���$7Z=��Q�[���J��WWH_�A�~{(�d��K�f+=�����o=����p�������\��BB�_l $��q����G�D��L �P��.l�� +!!rMH�_��o��ւo����S��=a��{���l�X�I=�����G��L=:^-<7O��v���������JީYrF�da��=��Q��k�K8�>�[0��E�ԍE]��juԿ@x"�CM
Jn�* d�>!/+4|�F���E�AƝ���Ԫ!�{w{j\v�ո���xJ����S�|�
r��/GK�?cM�Dյ�8��[K���{W����?\���F���J'���Y�lȶ�8s���H�ߺ���b��"�w$D�p!!�.���W2�5[O<Ξ�\Ӑ�4ـ�P�����צ��`���X3���q梠o6|���O��� ��Θ�����;��)jQ�LH�n,O����_���-E����6��}���`�t��Z�q�$�ѻ�� �3-;� +��K�]��'��>�z�=`{������ݔ?�v=?�ƹ�`��s���k�߇4z���J��B�G+p`;�'��RQ����x�j$�����{Q�whO�䂵 T�Y*&w���=jM�K�|�r������R�_턽��|�m�~j�Y�W#3쌈#@����7�Vйb%�~ +�!c�g�p��ER�eWr�f`O�/aذG��v/qV>��yjL�H��ʴQ�X}j�Rsc���$� +�}|�j����T��Ǒ��G�[n��.�/}?�S�x��T���&����±��B`i��ov�)t>�&5|�V9ra�R88�����O���U`O{�����Y�J�B�Ӂ/G=�o�b�r|D�-^l�ld�Xx~pЄ��oc���i�$���՜["��1�P84�ߛ�*մ�sŶϷ���(w �_����`�N���߱vO]���9LZc�1[$y��S���?�AD���ӳpF +�/�D�3�Mg>P� ggu���YƊ+K���A�o�>��D+�Sa{C�Qଂ���L�ʁo�Pa�,�J�#D�
�32,��!�r�Ԍ��h��z���Ʃj٩�8�+ሜ����
�S}߷��Bd��1��;�>؈� $�ɷ�&��*>=��������8���4��*���W����u��Sn����R���V���u3s���cq&#b�O��;� �Q;������A�������؝�7B*��Ȅ�,��8pC��t���qvk������]��/�����|
�Y��J�氚a0.$��� +�� ���}TԔ��ӎ����c�
r] p��&c�{~bp*�}�c!<i8�m�윂=Z�>|���� 1��@w�Nb�e�tΠ�\��j�rF���Qy��o��<,2�Ne����D>�{��nE/���<�7*�,"tI.��g�X�E}����� +����[�Yc����cb��B��E�?`&���g�|/�壇��<CJ*M~�$�5�Fk�-'\ +�K����z��)ϭ83{ńgo�t|l�8/�~�b�������y���y��G���]��O6�q��y�:+��"���������ɄfIm��^[sh(���Fh�?�ΉP�̿��'P���u +}?,�N +-�:��c��(��}BMg���,�[��DY�g�Ef�r�)���S"�tMk?X)�r��c��7�1��gs A�����q@;�\�Tsg�����J�g�*n.�:��y�[a�8'��9��R���~��X9ru�M����@b�eW�H
���yXJ�x��sr�Q��0���r:��^��;����%�{v]� +��$@�
7V� +�wE�� bO���vM����3��˭B��5�oU� +Ŏ�A�QK/-��-�(0ӧ�y�m�7 +Gf����H+�w@�������q�X��\G�G�a�>^%$u��'HE�f ���P�^ +y'�s�Wgz�<]�u�v�o�����o�O��O��߂����u���_x��t���J�W��#}�K8�����<���L���A��֯�z��p�ͯ"|.>�7�=�Z�6t<�'v���|�&�W���b���v����o�S^��f�R~s)jE����ꉾ��}�����;�C�&`<�O��(���S<�t�I��J�n}{P��4X��M�r�[��m���&}�ۥ��j��߈"�����<�����՛��t�[A��g���+E��R5\}�{��ʵ��b�{��/ko�T��}O
�(���P��&i���z�@�XKK݁���-PA�R��+u���{�of�<�����w��z�k�4iʚ�{n����3�c�}�PG6GF�ٌ��q�W���i����s��mr�y
��f
M^i��3�ԑ��KkSC�Y`Yk����CDސ>q���3b���h����%K�g���S������у^�m�Ƃ.�~�,?l��v����|��,���XX���=�LPE���{�+;ω+k]�^�:�=-=!)���y��d>:7*�h;�l\����.�P��:���̨�.-������9E$A��5}��I���^t�ߔ.��ou�$���$�����
D9��Z��x���.�]E��v�2��E;P�"��yd�Qv��(�>�ٯ%���!L����v���C�����m�1����Í��p�e���I���9�ї��--��';�u3A<�&��,�i7뭒�z�"i����(&�|������˚/H_��tH�w��T�Y�*r2TvJ|�^��|��v� +��P�1<�~Z�Ck�tN�!��j���v����z)�7��nm +�]�N_\�f&z�xT��NX��苐x:,��u��������ģ!�~�mI��:J}�&�
&+�O�����϶x�����o��W_h���9Y�g/骼,�.�V���?�B"wTK�:�]�t��^A=����S�Z(2���֣E�tr��j#��>�:F�� ��}&��c�N!��jN?�2�o~5� +>S��0��[�=���CR��5U�oOU��!��N�5Β�=��#b�A�b�bP��� �
�{�4�͊l�8G����G�G[�=����[>;��=�7��x�'}" +�P��٨.C�i���(>��*~T����kх=ɻjG��/%ɍ:d����[�u�����>�ؓB����0ap� ��^Q���4�3�[wT���ٴ��ۢ���YQ���E�q��6�(�ۄ�U��:��q��և9�N���¤�]���o���gO��P�hE(��C�K_ ��%��:t���T��̕�lϊ�M����p��V>�x�-�����f��2�@G���-�h�q��iO���^�Zs�kbY#꒗��f�U��G������8��O,.ou2�(W���o��De�g$%�Β�:w���E���$��E���E���W=6ě^��fh�5v����ŵ���35�ҷW|?�a+��?��O�d谨�9@�W!����^���/��[C��.����*�0�*~��|�%>|t�G[%��"m�&�?��5N����A.�~3�z۸����&z�bc���A���^ZXc-)h1�ޯ�4-�3'u��'�س>�z�a#z�rR����I���q�%V��{8�'a��^uڈkj\E��^Ҷ���}%1G?��u^O=�{?�z�U�h�>P�Q �lp"^�Q坧��z/���1V�/�u�J�o�J:ל��Иw�5=�Xgn��HQ9:�'l��8����h�G|&RE�ym��A��1�� ߆b����"^�ǝd������]E2���`�g�V=���6a�ws�}FC��|)��e���) y���%��&K˞�qv]��εfg�v<L5m.Dq��ݎ��ZMD���ޔ;�5I_ל����$�;D��Pݭ>ǻr��%����U�#��k:�6J��]���C�k����� +�ػ����q���h��}���]�$õ������Wqdˈ3�c��~����#���$�~�3{�pV�����!,�|#?�n���7R�Yd��<�H��d���h���G��|٢�4V�[B��� �?� +��>������dM�9a÷#d_���'q��JW��_u�W��rF�p��P�1���ߏ�u\K̬�IH��M +i�����z�=#զ�~��KM��sg��+D��3Ī�a�䣝�q�C���?�����E���v�8?�K>\GE�lC�+��o���{����w`�ך���.*�� _����+~�igZS�#����s~�Ɣm���m���7aOG1Ic���R�=O��T��>4��V�8����7���5����y'4�fJ:�.M]g͇Ke�-���/�G���_���6�G߬�퍽TRRs9�|sB����j`���>I>1�<k9.y�b/yW�(~�bK�m'��&���A�Qƙ��{ɮ=?�t��t���4��[钞� ���1~��$�X�ߏr�3<㗌7�o��ǽ��N���8���qdǀ+Y�{���>�g[�6���Ht�AJ�V�6kyd�u'ɪ�I�Ѯ���ڲ�]Ze����n��1a�1ת�dw�b��"+[�K�.DDU48E��;ET�k��**\�T��\��
�L�o�J0~!i��{"Ú�8%x������w� ȇ�"ѣ:�#����-��%�{����A2�F�vP��$Í��OՑ�Ȁ��;H:\e6X+#;z��`�>`��
ǥm�$�uf��e>
��!͗3϶�\��}', ���p�� �p߭x玘��z���un��F����N���cQ�sdQ�s�:טB8�2k�㲫��ҫ}�jC��ކs+�U�F��h��FD���{}��w���*�|�ZJBͻ�bD�[O sG��+CZ��6��Q���]�����W_,%
��!5�����L��]�y�� �y�0��dPD����kM�8�y+�l��¢x��������¸mq�)�^� ����9������۶� ٷ-4ů981��Kv��-�n1��8��r��,�L|V�WP�!K��=ڝ+��Bw�H��.�o����N��'qu�+����Ю�オ��}�#��"���B��S��/�7����=�SXU`rbI@|v�_�[S,����Ț�iG��#����c��X�����v�w2#�B�C����;o]��-��Z�/��Ug}#��qBǫZ�����1��^1w\cJZ��2[���$��{�[����3���O�f�O���bCj/'$W��^+�u���?՜{�9#�h{�L:�.ܲ��L2�!��*i���b����!��k˶���m9�'�sS(H�|k5�,���}�ՙ��}�;�s;�r�̤�9f�>z��P�r��^�wsL�iS�E�kƐ��m'��"�s�2�=m'�m�I��"|���Xo^bd�obR�O�M�-�ɯ�Y�^��h�3�!�6fH�Q���+s��s��V�O}��Ǿ|�0�`�F�m�x�]��+qY������wS��c3b�/�^��I�К�)�
��[���nQS��d�%�t˕4Ϻ����)7�}����qjN�>�y�t�:ڲ�8ަ�0��=-3�)(ӫ!:�xWN�[�E��ǝ�o���:ڦ�A�]Wn�C{bbB�Ob@Sp +��=����|s�72���cxot�Qd�l�����e���� �/�a�j���|d0��n���*Cb�ڮ���܈!�G�����O�0��Z{<l�����R��*w�)|�w�7�����{OYv�_�u/��C%�(��'>-���-s�ʅ>���9b��1�#<J���k +N���S���|g��w��#���|�Ya�Klx[@��{U��{m����d��_�3���G����? �ݚ`�ރ`�M�u�ؼ� +a^�Y���> 1��'.�
����(������Ǣ����Wп=ku����y��)���r�8����l������,U��Y`>Ps�>_;n.�4w��}�����Ga�~��>�s�o��f�i�s�l��`���`��F�t�v�f������kf�`��1����s�{Ɗ~��ެ�T���/���{��2�跕.QOK�cҪ}��+/Ն���F���H�͎��,��bBt��x���2����Р�kkTBC�����p8���C>-W/���z�7�
��L3��;�0�t�A������a��k�дR�o�/���^�Z�0L�$0L��T��*�+��U�M�L�A�(���'i$�.�icty_��_g�����`�u�W�� ����p+�b]hR���ج�~���|e�/�^+��{\�!{S�}��'�c��w��7Ş����љU>q�5I���L�}�.�_�΄�Ɉ���;�١��F��Yn�^-�j�b�~�j�m~J^�?o���ڶV,Z��)`��"{W��R�w9 ��ϊ�I���o��?)��M����׀�[E`,���*��%>���
�ſ
��/��X|).��?��[�ػE>�/�z����y��;� +����/��[��'E> OJ<��zƿ|���O��"�؈�@�wMdBxe`|X���k5��v�ݬ�I���e��fvjܞ�asA~�Ɲ`��T�dzg�ڜ<�� +�����چ��8�?��{?���6�'B�:�ӕ��y����}��N�,y�fF���n��(4��;&�,(�xǵXT۷dơ�Օ0��
��b�m��e���r��j��778E��u�"S�-� +e0�k���`���߾W��?����P{�|�g�ǰ=3��x���ޟ��R������7k�V�v�1���m%���a?�d�q/�tmv���e�O�d�6���{�7�1l.�Ji{��V��P����W<�ϸ'��q)%q���d��̜��έ��/������?�P���9�c�}����c��v�d��Qw�ĩr�1�?36�-�.������?�����o�S���dT�y�=/�N|P��Q�/s���E�OMX,���Z_�U���J�pݪ��v;~zC���iL��|o|w"�O��
f*, +0Uq9���L�̞�֪y��G�(i�e6Q�o=`�"�� +}e#�נ��*���en����17a���g�������r���V����|%���x���d�P�Tǭ +�}��|����_�.��,��:P�}e��+{��#���-���#�]���Ω +�o��_~��)h�T��銪�pQ��S~�%��L��@e�z�2~�1i+�=�X��~:�`+�.��Δ��?��cI���H|{��Ť�"�Īb���w�)���Ş���y%�-��}��R�8�z\��L���X�I��n�_~�� �g���q����ipU����p��l�gms��Vh��x`�2���T�i��K���U$�` ��wLV�lx��",��[�]�}\�%��Y\B��������/0+/w�m|����#�Qf��s,\~ٶ�0�N��ۅ��8�3(�����sp��L3�g�9V�9�7�y��$`��`�vx�֊���8���q�LUm0w���&~<���8Y���b�-[�^���My[��/���oJ�[��ߔ��>Tx$�Ը%7�$�4��6Tx�����#Y����3t�S�m���Ϙ�����&�w��Yc�yW�9��U��7���o��o������3T�m����_&K7ف5�`��]�=�}���՚e�N�G��ᦼ@��>�X��;��S}�[lW�G2�sݍ�Y]u]ͮ��+=`-���X�N�߶͟m���x�,?(+� + �+8�f(,��-S�N����e`���m[��9;�}j@�䀹[�����`��;X� k�d�O[,����u�Z%��,;�X���.::�]hL9̽�`��{�=�1���=���=���=���-��g������̾9S������|C�E� +�@u�ئ��g��'È=��{������±�� ���`ެ�`�R,�v�<���x�Z^`��3X�},�v��1`���=��S՟0k�����Ǚ��Pߢ��g/��=�Ooz�]T��j����s�ɉŰNh�re�!E_]T�ì�3gӿ��\�0z)�X6q1��ˀ��R��A���ڦ +�ϐ�۷̞��L\}#<���f@��� +���DN��1����������x8Z�\��p{�PXT�nb�Ju��AC0���p3 } +�[n +6�`��g +[#{&�~���fԴ>0��QƆ;�����ߊ�kʉ��cך����Rbڛˉ'��R��b�c2��.D�8G&����
1��S�k�ư����i@��ٜ"��r�/g(-�9�|8U��:�S6�9K�25��z�x rh���"�g�j�O�=fV�O�ۜ��A��}��xUM�s��A��50k52&��ӼO�I�KI��У�ӭ�2Tϡ�嚏Q�Z����=���5���-v��3���# ����Y��|����m��3�#�D����y`��`�:C�A�X�;�U6Q`���
���l
*�����M�(nr��#�j��I;�'�p/�өh�^��ɚ��
���~���2���YZ��*�FFװ�u1"�6��2��bPڕsg�ڨ.��ƚ +l��z�"�$�ێ]W��0e�@�%�Zf�f-���}!M�w��(l���X�=vוxUN9ء���u����V������:P_J|
�Z/�b�Ql�j^D�j��<�������#��?8��iP��0=�nN=�lNJ���m�o;N��8%���8Da�����z�i���\+X����3�v+u���?X�wl<`�m�����`�j�~'
vb!r��>��B�ͬ�/թc���A����æ�f��s�E��oN��?\;J/����}�
o0ۍ+��!�5���e�$���F}���|o��*N��;�hq�3a폣To��o]DjM����x���%K���RUm0����Se�r0o�N�b� تkva~`��OU�]:]��V���1�gD��za�ָ���������?ڜ8�3Gu�3\����;#1��X������3�з�
�b��ڄ�1*fU�'���<���g��X��=w϶f�뾓�����b�8�'��yY�v�K��|�>�N��nS�-T�Vn�<��e�ZiwP����*���z���W���cm�k�1{5��m���������Y~�gLb��̫>,F4����@��y���}�lbt�m�9��9%��U��>�����CF�czL^c�n`��
�>Jt#�ժND��"r�2_|"j:��`���!�`����K��Z"p�Q5� �~+̛������m*�<�XSW��;h��4M~X� +��>��ł�������s>1ֆ-�42�����c^3c)a\Lz���*��`�x��
<�����킚߭��/�GƉ��3��c'/�p1?�q��Y�x4J *�`�/�c�/wwLDJŒ�W��!��^s*m�]��}��|�F��� +��W�r+r�>�l���*���- +0���V����9����/��Z��A�_���W��._�� �1�?j�Ïhr����^�&&KFO�[}%��ԃ1v!m���!������ɕ�yO���K.��?4�&m�r�u��CaB��G�l�?}�8(k%�X��4�����p6�,�h<Av���N>��{K��!����l�$�}������?��XΚ�,\��ڃ�����Ǭ�`X_Akt#e��м������Y�+��=-0� +3��8�2��;c%_q� +y��c����{���ѱf.����Ģ���MG��=� ���l�T����!#���c�� K�1�%K��h�}:d�˭Df���fE������Ʈ�v�z�Ap��^<jM4:p{+�FC�r���� +���*�?���q,����S������~�@����kq<�R������5^B�f^�������Iޏ�&�I���W��[��B=]`q����3��.�E��L�~�&�wيkj��~���b ����0��J�[�2ym%~���^��b����ڂ�W+�ٳ���c�JB��J쾗�>�ٓ�S�EM�؋�W���x7kt''uh��׃Y�bO���R������R
s��"JN#�AU��٠��9�[����g��{6v���,���%&!�x1��s��s�� +�^��\2g� *�s�l������|�D�d=-}��� ��x����\^(5�'|�� ���n��ݎ'<�&Ly��6�E�����4{]���%�w�<oDW���ie��e��ӊ2OIQ�9��Qm��s���u�4��7g���sZ(�߇����q��u���\��Y<M��9d0�����>���7ir���y$�09����0��Z�/c��� �I�)h��
tv�5m@��ؽB,;�'w��S�l�+ +V�6g=T,NyN��������C��ҏ�Ͱ�|,��.?���b�,8q���������O��&L����w#~|��B�*v�u<�3S�ٲ��1b�����jv�ެ�f���=`txw�C��{�n�}��uf��[f��0�1���2�͌�Q)c�y���1�%ch�t��I�1K{�� +��`��E@s�.`�� +�]���d.7��[��I|��=�T^��yA���bA�g-�{�,���Ba�Gu��l��"82Ix�uIQ�Y�`�`��\HQE����7�b>)sq�����e������Z&��$Un�^������Ss��kR�7�I��H������_����S�]��0��$vn�&�/��:FN���r�;��]+V��w#8�p[�qh/b�IU��~� ����k��i����o� +��!},���+y�=�rϘG�&C�<����C��a-�m���]�I��g>��7-A�G5A�M�� +]A�ӕ�)y������"?*��WοM@
�#�C�4aN��7�T13����W�:���=�Fg��ᙕ�¬���=Ā�ޮ�������� ��٤_�"��폧._Y��<��^��h�K>�z-͢��Gtm�C�<_O\~��:�A<�����7?�b��xh�*�-r�8��6�xg7�t�隊����vB�P����xVrB�8e���)j�t� +� �M��־C@k�~`l�e9�\��&9���✺4Md}\ �mE�/�SwKr�{ +}�m�3L��I�X��tH��7�.i�0��-��au���R����Ǡ��tY�:$��Oڨ��M�O��9B��������&��h�|�6����I������K�~7\�g +OLD�b���x"���C[��>X��������+�0��a\ ����xR�^2�]q�ψ� ����:ho�\��ڪ��k���8�)�W�|�|� +~>l:~A6C�| �~���au��a��OJ<��ͨ���a���鰈�WM���1e.�3;���oṟ�%O���V����W�/%���1n��庂�`��r�n�"�8���o{a���1&��1��c�s���� ��w�e�ذ��S{ω|sy+蓎��Y�([���IE��q<b%�y-<�1Q�k�$�ǝB��M{��}��kH��N�E��MZ�'�6�%O�m��E���<K\�E{�(��K Y�."���b�b<��f"���'���}Q�Ǖm2q�U�{_��y�Lp6q��6����wj��z��o%��Y��߾rX6aX>Y��6��ʯL�җ�"�nB{�$�n�k�䯡�N*�4 ��Y!��8�?M�=��}���xP�Q������j� +>�Swp�ՎHG�84�.�QO7b)M����}�A=v���YM\�����A��4!�u +���{�ɷ����>�Ľ�o��q��\����tԹ��8��^����p�칈��x����w����DO������G�ۍh� +�7bH�{��N�M"�2a<����Y��짏+\��U�#2�5�=���\<�_��m�����h��0�m�0��~��:��jYt�7�|X*�2z��~?��>t����T�I��D��U
��&�fb!wVb��Ve���Y�{y7�� �u9�`۪�`Ì�`��M`���СC@߈����c +p���z<��<� t�VF�A�_�m�ZD�?������`��~\���Tf�!<�]1�1{��Dp�r�zGr�F�l��YFy&�EL,�F�P��IBv��[\,�6��E� Ó���>��#���W� RJ��M�]V�[���C_��V��e�2��+���g�ģO���x�1��)���c�l�6-\ ����jF�o + +��b_lƣ�n$�������� +8DA?��E�tw�e���y���"v,p� �m�������z3g%��C�G���8�=}X��o܉�1a^��82?8��w�ؑ�߭e�=���G��{��J�L%j�����e�I�M��`�D�P����_�h
ڛ���o�-��_5�i����ӄ>��9��yÚ(߁��)����X`�ç�КWl%�rZ+��3w�YsM̜5������C���]�G���R^h
kK{�I�����ӊH��e�X9*�N13��'��q]��ѳć�ƙv/���%���K����I��� �1p�U<0w)��r��hP's;�>W*��j�ijZ5D7ĝ6� wP��&�x����h;B��� +r[��K9�HϘ�X�ݵ�[�������ba���h�*p���9�(c����Cjxl�va���G����K��T448`���@�@:�H�K ��0����,�����$�;�E�T�.��$�69ݺXV���oe�2��KX��<�DF<و�����Q[p�W��J�G\��A��^��6p���K�*���g���sփ�a.�{u�0�eI:���O���O�Ndy;A�V��ӱîck}��G�*��1h�4��QA��!�6����L0+9�� {�N�L�<���"���%�5��]���rF����K�W"�;��]Z����Cx�O�5�ףK�t�B�q��x�A �
k��!��w۰;C�حO��ز��{���&t�S�C���l?�r,�~�?�x��)ùfa��]�PAk¬���dv�w��.
� `dH�l�4�R�RĦ�|����E�����Xp�m����"������k�"���䭥"�mEl��d�^Y�{�ei�X!H*�&�j���^"��2��n<�r}��@��(���t�+��D�~��C=�6���]�e����~h��y�K'�A��\�=n6��ۉ�Fh/.~��=o��.�RB��IDF�&�ӫ��b�W�\a`�r�C�2�Eu4�f�)@|�����c�vK� +��j=\��BLy�����P��>(=L�j .aq�0
1���C�k��m�%4�B�XtH��8��S�^��ga}AB_A��fQ��3��Y���§�Ĺ��� �I�)��8��H醰:���S���������ǃ�I_�j��:'�t�C�xH�i3!���71\���F��V��n����(@5bF���!|c5y1}1b=��[{i��N��G���Q]Af�>4gÌB�3�='Q>�Pނ]�?D��Z�twM`-�j2�D^[�l14���9| � ��.<�8Fx�c�mu���U�%�>��Lh�Y:(Ѿ)Gq��^���'l�t
)`L����X��C�銛�VD,��g_[ƲT�㥼�t`� +:��:��tg�r�)r�GW|�������ዳ�w˭��}�Gǚ��F����%]�̻�"�^9�*߮'Ѿ|�� �=�(�5�0�|� k��0��*�Q�qZ<��n�k�tb��)�IFH�XrR�gqVѐk ��% -�� ��U�Ӥ�C,;��DĊB�%��O:E���:�Eq[r�Zjq���x3��!���zQ0�'�~�~�K�,C{"���6��*&bk9��7��8��j�� E����\���ع�i��g�L$���sR�o�9q�𰣒�1��B + N2��� �X��G��`��q�4�P�>S��*�ˈڅtP���� +��`���Ⱥ���nˌr��8���!�j>��X-X���jʻ���8৽' �l0��?uc�JaJ�n�1~Wd'oBB�HXˑ6�cQ!����Sy�v����ʎ��yfbvT��l�d.@1�(
p�SJH��)�hϨ9H�s�Ê۹�G�d<��<��V.c�s�Ӊ�.c�1�SD!V�{�*xu9���7��ҨGdT�S���̻�{�f'��_oZ<s���3'ӛ5R�
�z����7�Q,���[�%'�>=T�#�+af}�Q�1������Щh� +wI��j#����~#�g�n��f�V�{}X�j��`.
sH�-�����!&7�O#~)b��g��ay���6��� +�@�m�c�vHn6Ғ��zo=�.�K^�_�1�w��O�L�0:���+ظ���\gcG�*�� +��)!��!���D6��%���Î:�a���2g���`~�b���cc�c� +b��}�z3���������JGZ]#��q��T�|� +�a���@|��j�'��9cl��jt��x��zR�t+�K�;sω���dz��E9�,�U�rK��=i�S[�`��usB�־�����H���M���O$ ��OĎz�7���l��`�Q_8*�s)X�h�]+w�=vm
�崐�W�����7���'�TYa�@e�[$��̹@�'V�
�Eף����BTF�b1����$aZ�^���bМx�I�%w�E�c�}�87�
a�el�d�xv��0��F�'uu�@O���;�a3����4����wl������G,o�}�ue~<f~N�e�CH%�֤#mBvMUB|02�d�V���_�{�,6�J(ލg��G:��yb��%H@\����=��z>�ӫK��8Ehq\��9HY* +�[�tɜA"oА���m,�)��r�6`y�c���JS�O6��-���]��t�И��4�&"�}�e5O��!�R���|=��F*�C���ҕd�I2�����HQ�:���\�X�����g@|c�+{�s=XKƖ���>���$Y�\��Z��J�!�'¹�Q䓴P�9WU���(ӤS+��m�bs2��W��X������41�dΰ!�7h��-�:)�A��ظ��K�W���#��ĥ��C�2f2;�<�K��i8��S�;!vXi�#�ު�8�l����'nm��4*�Q/w�h�B�YmZ8�Q_��k�ȸ��iϸ��#O���®w�����k����|!��3�%���럵����������!q.d⤓� +V!߀����9�d�;_ꙶX�� +� +�Y���wע>D�%�N�#]>d��zmij��8��z�� +)k9�\�@qi^!����B��φ+#�%��1H�P� +�+��P�d#⨣�P�h[y�������T���t�$�A�4��������l��b˶��ni�;O�<�G��B�_I���5U�j2���j���I������G�7F������M�T��"�9�=靶 +V���f/D�gd{ig������X;�s�O���m!�y�1�j�6��"��E蜨��)kױH_^��p����A��a�����J��oA�ၹ+��a9���먘��Eiuڈ�Keu�"�#�ڪc˝Ǣ�������g��H +�--�_y��5q��[k�uC���wm��̮+��'�^�@k�|�s��uLü�uIV�9�� +圬^1��E��by�؊��X6��Sc�.�W����Ύ�A�96��E�ڍY�,طig#�,���{M{��G�X��{jg���'�al|Hp�J������B���SB�eR +m�(��eV�1vM�l�T���"�gBLo�{�r��F:[0N�����iH���5r��r�j:�h7�X�Ay�����Z=���,��L'�&Ҷ?Yܬ�PR�^�3�4���w؝
�Y��Gc�{�.�����j|H�yNB�Q⓮jgE/ s��� 刴����Ez&�c�N��
酡8$�;?�O���H;�����e�:NꖾP�b��'��3���{���4��Pt ��t,%^���/q������w"kߑ/w���x8���~~�-sbV#�&OB[=q��r�JӴJ�:[7e��w��;���߹�͚�;/}�������44�n)�E^ً��ϏAk£�R�Q�G�Y�B���� �����etT�n���.sQ�C�~�Յ1�L��h'���������t�g��c�O�64�/�]Kd�B�Dh}Q +8�|_l�Q|�X;��v/�u/�>7��q�|4��f��=b抽 �I�t��=�w����i��|�sA�(o�\���bٓ]���D��ֲ�m�I���u:���V�XܔC�2�&�7�R�4PN�� +P͊�Ч�_mCz�H;�����L�v��� +��T�0�h"[Z���j$D�R8��"�]��:��jר��N���3�X���>�j���N�:�$��� +p'�7,��YT���y�-����=\N��e��(�j���ƃ��jS�VS�,%����֣���g�,�?��v�a-���-%�ہy�\8���� +�@�F�Ͼ +k�-�E�\Arrۀ>x�����Pm�|�F������
�t���� ��'��� +hsn�1��e�6簇���1R|�4h�R\I� +-���&a��E�r�Y�{�E��qN~�,8[M��6M�N����4�pǘ�o��l|{+]�!�U����� |2�rl�T�Ĉ� c�b{@_�|�#zb�\�ej�U�{~H��BS}Kc$�kTg5O��a�=�%U������_����<?:J���T,(<�eT>�R⩹"�U����f��pҰ*C�S�/,��p +�$n�
x��� +�X���M�y߲oa4�ub�T>��l.��Rbc��̫�КU���x�
E�|� +���&Q�9����9M9��@rYԢ8{gmhm�~����rI'g����9��+�{AGk�b�ѩT���B��`t�P�F/��vu֬��!j����3����СV���a�
��փ-�<���L89vO��&�q���ڵP�d@���#DGp���m�����ľ��sc��fQ��l����@5{PC��ӧ�qE~��$�TO���м%��b�ģӱ�>@�
,.��Bž������f���1�Ƥ��3�灥D�d}�/ңkBĿ+�-�g�����u����&�+�� +�+��Ea�T���&���2﹤��8��Ix'���P��{ϸ��M� +�$������GA�P��6��|b�Gf�&I�5ko�/Л�|p;��{�a��G��u>�3�|�����M�39���.�;p�[yb���~Զ�1M�V�-��;��K����@O� �lI�{'a����ŢW�.rg�o�H���?��9��W��F�8�W�Sx�L]h:S=a�W̧���tnQ���N���>7�꼢fBp(�8�z��A���8�s�X�����{F��'�E�A�-d3/��8������=�uR=1�Bu�ɽ��ҵR����&V<5B�E�6��F��{` +��^����G O�v�6��)�f����&c�+t�A����_#�{�.��ƥ�㳩&8�f>�d"�Ӹ�I��3�g�s^�#���a�K���OTc��M:���;��|a��a�Wu*�Oe���F�;}���80��Gh�F��M�����_���������z|=�_���������z|=�_���������z|=�_���������z|=�_���������z|=��?���wl[g��Z�ۤ��z�bK���]�:�:��sW{�Z�`���u�����r<�m�o^��\o�ko[�y��,����7m����,���NכE^:oEzs�m�����������������m�K ��K�-�~��yK��}?o�9�,Z���^�pK��9����xz1}�{��7q����Yg���C�Lg��z�#�������c������ֻ����yr�-�����4���.����z�i�%�u��&n����$_��ͣ�8o��Ƒ<�Go�<=#=Q9Oo^o�3��y���D��\?9�%�����^H�n��������;������q���l���[z5_�\�|=n���u��ll��z���H�t6Ξ��O�~.X�`a��(��O^� +̆u持�Ș˶kX��F��.���ο����ڦ�����&�����x�X�a�r�4�9in0��u�͘ML���*�k����6�vӒ����9F�7���64�d�L�2 �����Kf���ʫ���%�l3%yf����9c��k����l���1�4vAҢ�I 2&Up�� @/% v�fnڴ�3a(g���M�h4U��M@
=[�{�h����_��������p��8�%�?%� _EG�~��W�G�(�����h����W���[�#b�҃|�g�0���n(郭Oo4K+Tr�FDK M`��k�Y
Ѽ�Go����yFn���{�E�������ރ��\�w��FP��ZȬ4,������������GIq�+��&���Lr�`m<�AA�=�R_����}�����;��3��*���a=�q����i�y��}p_3�-��nA)H@������D��M�9ߠI�t#>H(��(,����&�M��� ������������ĀL�M�3%�4�"2Fj�$c�k!�h���(l�=%?��s��-gAX�:D��;D��m��)� �YM���Q���ù��C�lܵ�f�F�����I��])C9���2�U�f�]Z���6�鰕H�p [���U��b��zK���.AEϨ!��i�� �_�.6�����s��RGH�c�!�z iP�I�IJ��7��;��p��[�����߱"7s�I�k�Ĵ���Ic����ë�%(�JX% +.�@ ��n}/�ծ@�&�C����
�P�� �@��w{Fcqd�D�DP����i�O�0eH��3z︧/m�AC/7�hh������]�� +��V��1g�|S��e.�i�'2��z���\p�42cC�G�G�C�����!s�F�T�b@$��-�-��X��� ���ʷi���� �\�����y��~J-|7�\-:� +��A��fZ�M��� bwhă-�TL�2�Z_�_<D�Fa.�yKp�b|��Rᝑ�hL�V��\aw�{���M�ԧ_B +��������7ƃ�
�q?@�n��4 �9����Ĺ��^�V�� �ٟ��E�� ���L~�` +d� v��b�_����� @=��7M�r��^��� ��c�O�NL��v6��y�Ki�+����u ���z��1�o��&%M ~��r�V(m{�ɵ .�A��8{Q(�
�
���3t)���"�<�`���qԞAzC~�����ݣ�Y +�Q>9chs#���vCJ@p�w�.%��"�N���m�G���Al
��CYchs9�����)�J���ИL4�|ż�&1o@,#R���oq�� +�7�]4�I�%�zM(�ß
�1gf�t�6���A���&�=��S�ч���s3A��䎆`v8�\P�7x(��@� ��M� y�@FϹG�@��\� LJ +�������� +0��;����$։�[�� +�!��w&�(�3��Me$WQXi��\�sc-��;k���$q�q�h� +:���SF�KWpU�d��ޢ�sH>�l�'s��֣�/i@��U�Xħ�\�{&
�o��F
���{�@�M����Br�q HT�!��������S��|b0 nǜ��ɵ F�
�j+�l �#�T]dAp�qze�����,��Pl +� 3���� ����%s�H��}�$�6#9���%c&�hP�L�<|��خ�_o�b"_��\��� � v>�1eV;{�9F|,��$��E���:D +�ڱ)�fq��#)����p+�1�T�Z���=��& +' +NQk!�#w���%�U6��R>��"�?w4�!�����l��e��֟(Y,����rE=!��.�v_�t�PܴV(�[
"�2FWB��!/��D �D\��K�^=���C�?=�O�8�˺���XƠ��02����Į0�����)9�㞾�"rN�?�ԍ�Mb������H��u��{�[����퍜dU W�=3(����/�&Bz�$���!u��l4y��~�G�q[`_�&�+�C�;#i�$Ԩ��z��h)�hQ �@��v�֣�,��S�∢o����}2P�h,�|���O �3��4Q��8p�%��<'~��s`���њ>jH���z��d}�S�e@"-���Z +�$_�j�JOS�}�G�)�J�$͡b@hxd*����)y�uנ"�+��M��k�l�l"�(Arf�7u�M�=�CQ_��D�9�?1B�4�v��9|K��x!N� gf�%/VqY
�sa�". +~c��s���+!L�G���<L�Hb�'�9��z�b~�j��i����G^}{)%������RGi��@��I��t@�ti�,��"Yi��,�)�?��U�:�|q��&���$�X�;}$�dl���C����9����o^O��;n�1��x�l!��T6��!��aO�.g�������T�y=����H�stA�+� +�Z >��E�LFrx��ք�1{����P���B�����I�F���H�a��x_�.���C�[�S-*E՛� ��S삷��Zb��r:ag�0�-�wF!?�ڔD쐒s�0�3��;��R�Q� +p�B)q�R�A�������]=��r,�%��/�T��y:͛����k
�5�|�5 �g �OςOT��[ʥ^��%�æÇ(H��m��C )#ʿ>��w��+��ȹ��9\܉��[� �4Ԯ�$�=�|@q��$���
Bnl +�+I�)�Lrׂ�����5b�ӵAƀ�H��&q�� �+��.�&%1���7o�'ٔ���Ƽ�sş�:0���S��T4É�y��� ��[!��<1�XO +-�@��I ��<��@p)��B.��,>B���m$W #D�آ�?�|}1�2���E���|��9oB�
8s�'_�| +vb�w��3����$_��[Zw���L�e<�+`��%nB���]T������'���69W�r����2*v�@��6����ݴ��V�+������9@� +�ȁfX�;h¿J��zG�$�5XG�� ˕[�hcm�G�$M��w'��O�
��]��%��HI��Q1Gԍ@�Gl +e ٥b1�z�����ER�� +�>�Wu"���k��?�{��l��M,�4ֳ�yjB�[�����`A�.K�<D)QO�(�SBx9j��� -FD�8P�$��˯_!&\�C��=c� �h_-/x�̢��G�4�.M �6��]�H�n���|֮�M�����'>��V�.i���f�vۤy5�>���������Q@�<ĺ��� ��k�.=�.et�J��:��@yw_����+�_b�JרA�~�ؚ|���к�G�� +~ +B-$֣�Lݽ�ɷ����*��3�?�.J�7�~������viQ�A�/i$�=�.0R�?�]���]�G�*�ݨ�Id�ۗ���M�!%�;RA2�P��7��djw�q��G +/}��-�Zͦ_�O���Q��^��<�=Ct����+Q?�1� +���9��=<ȩ!2/�+����� kE.�خibj�o1eHޯ�<�ȇ��)��/Bu�F�Y�ܐY��&Ⱘ�Z8@�,W�Ĩ�a
�LIs�����z!���j���!H +� 3��7�����Vt��y��̩����f�[j�a���%���\��]��C�o�輸��״>�ݫ/ƛ�k��Ц_�ܴq�Dg ���?@a���!�-2�/~��N��e\\�e_[� H�)|�}~A�j�h��^��uTJ<�qf>_�l +~G|*v�#v!��۟b��Y+-��I�.քI�g�j�s�-� �5��C��Gh��5J�<:�+�\��{m�(��ui1��$!�p,[յBr4��7�%�#*�1���I���#���!N +���d��W�3b\X�q.��`1�o��%j +�\��;5G�O�♝�C�_bѣ�B�ͅt?�� ��e�������so-�2�χ�Ck�`ϑ*"�;et��2��\����4%�i�u��1Ci�= ��㴆��]����w�0��Q[Q�7�sk~���I�����c3�Q{�Q��t:aj +/�@�."z�.��sK hA� +ˑ<��%���%
�����4?)m[�5A�O�����C����z��16g{H��>�� "�5��A��W�J,k�Ȧݞ�� +�},�RGY����t)��qJ����m���C[�[w|�2�S��&����qʤ�3 �˖?_Q��e%�yk�{|�Y5��c��7cjt�k�]��'��_�PD��#���?\ +�<�Kx�s� +�h3��}OWC��0�C���"%�O:8��Z���}�W�P��&a� +HQ +B}&��tE�����i��X���PG�� �fA�\wh�Ӈ}�ػ��sT_���:��yj*�_a0ಘj}�3̇@
�&y����_���:*rJ��~9��{�� �օ�OP�X�{b͏���qc�:{��{[K�a���bD��uY�h��#O�x�ܑ`�*=!�fp�P>��f�0��t֢8l�� +�O�
+QW��L�
��)�~2�,��ɧf��#g��0���UkQ�"�M����a�j=��G˄�k�i]��
��C�Mqn��iX+������7�����"�=f 1��~Y�/`�5
��a�n/b�_o�5-v%
U�8н��)b��]�96M�/KEg|3G�VD�>] +H�}#t��+}�&�M��?��~����w +�;F�ݣ��{QPG�Y:�쩷q�ڒ���j������>�!�>�t<�vs��h)���H^�iA|,p1��Rq=�����B� +�R�ԫ�{�A��Tz��xq��[ +Q\��� +��>Q��I4/��� ɉ��33���S�7b_R���|��%���d���O��L��P&�����oa/|�Յ��Kb��N��)� ��46��������W���&�uGԌ#K'P�D♢��Ol��t��5jDܰ�/����z�~u!�b�y��Pa��������O�XGb`l�ه�SL
!��Nce�&YE�J.��;��CYq� +�I����#�4.*;���כE-+�ݧ����EQ�$f-��:*ɏ��-F����#ŝ�ɧ��Kk��>�b�(�[��VN�"�U9�Ц��4�/�(�^���.�}��V.��B�+k�W4��:8�-{�F�h3��;�7��9�<��Q/ۧ�u@n{xګrh��w��QQ#��`O2|p�i�#.ͣ�#�~x"�xz�<�|.0�O���3}�"�x4z`�\]�P~��&��;c�����������o������g����φ������G_YH��ן�K7Zwp�$���F>������*��Kн��A̒�өB�y|i�Z��� +��:qky�ܺ��\̻�� +/{��P�{��RQ�x�3bʕ�ؗ�(~��F4�$؞�z���~cȕ�[ϕ<_�u< �D�\y�Jb�em?�ski]�O9?�SQٹ��+n_K +WұF��;O�����-i_iy�a���Ƕlů��;� �+�_�C�� +���kZ��g!�z��Oo�|��%���d?�^��0�_T�OM��כQ��ON!��h6�j<��<��D����MOv��]��Lq�7���_��[�����V��n��/���1\��@���;��3�6L�o +���c/|�K�%�J������mTM�ʂ���⧛�Ҷu����qU�^��?[%�k7���T!?� &\��\�*�p�2 e��Ψa���B֎�R!*�b��;�i�~oƟ~��;�R�V��S{��s;�`�BQ�a����Y��U��Ns��s�#c(?��D~�Wc��'3��f��N�=�ʂ?�!�'�%噦mVWkv�g����d�OV���ZM�`s\�y�K�������k��Nئ�j�Bu�^�*�6(��V��������Ě����Jy�5>�c����~e$?�a���'#űO&���*��[�^�+����7��3/��G�5��4����[��{�9j��~5����X~�g����^v�߬�W~��g�Rm�������.�ߡ<ޠ���qUo6������h\!�Hq��R8�Zɗ���_��`�_�|��V-3�^��Z��;ު�un�ז��*�H���~�P�of��v��1_�ڀ�??b]|쉩��f H��E�!�<�f����@,��-{�֢��ղ��������y��W��閛�u;�������I���e���WE�/�ܻO���B�kR��9�v|~8W��4Y|�"A�՜b��z��ʧ
��>J�_� +7_;J5;�k-����X����G.[����>W�.�|��W��^V�l�p��L�v��[�"��2��P3�:��2U�{,�>�`ky�� +�&[��-Ttmd�u�K�۬īO�W[\d���E~�{�J���]��ʑ��VŞ{��;m�[����m�;�����ݹoݸ�?;(n��Vq�7Kٵ_����ܣWn�統��qb�#��k��[�q��������0��],�S�δY�'[x������k�P��Du�������I8���G_�����c�Y�T��p鹵���㟌�#��ӝ�s����T��_m�����G];��\�����.ŕw��ؤ��VT�|!��{'N�쭶m\s���-�����cK����ͼ��N���n��˗���Vq��f6��P����˰�I}9����W��?�m~��� +����;u{��_ݣ,x��K97�����G3�]���_��ZT�e�,����ߖ�%7��:��'Uw��X�����N��͇~ҕ&g��6Q��4�Xe�ۍ��X����7L�D��7^�ߴTv�Sy�o6�۟���������/��?^� �[��_��p�EHjS�U�]�˳���3E�n�:������][���SyV���7I�ζ�I�r?ݸ��kmeU����X����fu�Q��|��p��={ꣂ��J��z[u�$K���v���N����@��[��vO�'n��'n��V�Z�{��V�j3��z孇���w��,�*^-�H8�o�״��ؿ�7��m����^|��z�(U��1U|�+�k��^�&��^�Y<�Wk���b%�������'�cK��sc�ݫ����d���{���;��D�~w�z}�"����O�xN��bgy�n���#7��z[��KթF���ܹ��J~��_�o��JW��.<s�w�ȏ�n$?���#���N����<Q�5�Z������x�˳�E�_�ʷ}w-W��8Nꨏk�����������!V��fn{{5����B���|����O�=ZK�Ug[~���}|!k�����ߌP��v�
�+'(J_�d�0���7�oC쒅\�`Z�i w��v�λ�6�o����N�������z����'���������'�o��md`ɰ���t�;��S����.Ϗ{�����q�Ȳ�&q�?ڮ������}��`��ӛ���;��m�ʣ"������:��\n����� 9�A��'�,?�JW~��j�������d�Ð����>�vk/�Q��}u:����\����}{ײ��>�g��(��(+z�qa +��MV�v)/t9�+�e�<�����9�˿q�g��v]��w^(�|ۘ!t��I/�c�����|٘��t��n��8�7S٥� +��3g�������ܫ�!�m//d��k��N�e�I�ㅦU����J�݆�mst��+��-��Ol�-oJ)��^Zd��T���t��g�����o���>�������فl�w�3,�}�鱿���b"�~F����B�ٙ|꽅��\�kCsOv(�C��[V>�)K����?)r�/Q���Q���Ų�6LY[$\xc-���Yf�\yʝ���s�?ʕOj÷��Th��r���6I|�e��6swkQQ䓤�'IE%��yQO�ʔ51��绬��W�����4��d���T6���3�e��͊���N|��X��՜�����L�͛��{W��k�g�7��{�K-��v�?�n&~j��������2ƥ�@�G������.�GJ�]��ٚ�����R��wyÿ9���65�ڽ����b�}���������&{���\�����a�;��RE�)w���T�J�_�a�r#�����m����*�l+��תz��М����YY�>�$ �����=)�}�o���?l�Nmx�ZK~�k�I��?�Lm`femhVrm\�[Ky����⇦�W����nq��\q��-�c�Ypgߊ���O�\���/Y��o�P۵[��-Yx�ſ|�|�$M�\��~x&���z�0��m���x`q���K/��&gUۃ���T��w�aM)%�ͱe�ګ�m{y9[��^���˹�_Ϸu$ǧ#37�qD��� +�.�ˎjH�U}��bR�-��?�n��{�p�(�y�Uy�t����aM�U˽$�ΚL�n�����ZyŻ�Ru�L:��Vy�u�t���k��(��D&�'�?V�Y?��n>s����EQ�R��_6pފB[k�gkI��#�Vo�_x3��]M��ks�ק�}۲� +����> /r�*Q���w=
u�:^ޖTќ���$D}�1 ��
���8]{䯾Z�w�&(��� u^mD�c�,�SG����z�-�z�"=|�->h���cn�k��]'d����ץ�4���D�&�%�/߄���0o�v�N�S�{Q9{�Ed<�"�U\�V[�H�M��c���n#��F������.���R�$=N>���H����9|K��P�hW���J���2?��[�y��?�^�wzYK`���㹊?^����v0{��.�w���9�������̼Ć�܂��Y��"���rܛK�<�Ks۫ժ7wRl^_R+ߴ�*_�&)۟���ئ8�o���?lm�j�<ڪ�\۫�_����Jֶ7�r�O���7��kL��:�m��ڬ��ɬ��=�ⱟ}�ɼ�����OoF�\�64��m�q
�>��L�G���7����x�2����������a�v�����ҽ��e��7ݒ��n��n��}7g������n��w{�5F�7F��%Ȩ�[ڒ�6��T�F�ݿo�j�}�7�9v�( +|�U�UST�(,Ϸ5�L��!Qhn
�v��OB�o[R<Z*��3�|� +��>w78ӻ9����y��u6�o�ؽ:�����,�i|YHSF���\�ٮ�@�u+�uv���<���ݞ�����4�P���x�����7?�'�6����
O~\�%-o�aʁq�k�W���}��GCrL}BnyM���=��{a���L���L��C���|�_��g[���֮ ������N� Q_{�y�Nh�����oC����ޏȱ}Ib�{���� y��o��W����'�c۞�O�q����� ���} +���mn�{����#��Z�r�y�]h�S�n��Ji�*�$�ސ�xh�����_v^�^e�2x�v7�uV�4�����0����,Y��Y�d53oя��%��yKL���@����������voP��T����ZL��Y���n�e�ߎP��J̉&����*Ox�&��U}�����.*H��+,����AX��r�"��,Z���������!����~�wڱN���-�F>/6�VYk(23��1{�2]f3���<���3�~���F�Y�Fd6K��UaZ�W�̔�㘱��1���.3D�ft/=f\�)���9��q����W2�Mݘ5��#7]�����[���O���m�ݟݬ��F��q�&0�V�_������ua99�Qy1
�Ea
���w�r��1
S�ߏ��x����E���/���P���ܦ6���=)d���.̠��dӁ?�l +<4���b�Q� ]ä�z~�����-68۽� ��U��d����ѓ=���F2:� +Q���y�zh�q27�Մ�O�κ[�ېX���'��'��s螎����$?ۓ�����U�̴1ӈ#�s�C�J�^�f +��=.lz�s�nH����C��Ee~�V�_�dF��s���������\S�/cڛ��K�0�Gb�E�wSe��U{��R�Ə���~m9S|%.���Ȝ�7���� +-|t+���&����м3�C�JoG��2���O�"�]������h�Am��̩�����
��9k�Әj|�]����P���H���`
]2NÉOKb�f��>3��df��$fh�Y�h�M̌�!���7�W��˿�Dp���Ą�����Sm�凫��mj�c�._YJ�|
0�>�[o���ۼ2��ӻ=3���n�
�/��`�dFk
����J��g��<�!^ �4��>3z�B�˙1ÿgF�\��[̌Йnj�3�6`3�����$��]�L^��YjY���@�4��n�֣I.��Ҁ�N\��*$��ٝ���"+:����ͣЊ�
!{�6��7��!�ZSd���������`�Fi�1C{�"?
&���O��X�K&0#{Mc�����7�1p3z�:�i�mf�%��2�_5���Fx}#(�Z|��K���o��=��Ww'���aP����yw�䝸�u���k����|��H���ݫg�]����?�&|D���|��/�#��|?���(��7d��_Č�]Č�3V=3~�)3f�3f�)3j�zf�w��qS9f�a�C`�Ϊ��s�W�2�$gQ�r'6���5�fٹ5j�3s�{�E��bf=��u�^P�F��ߺ�.sJќ�p9��C���~�/����=>�g��hd03Rs43��4f�й���?1������w0ّ�3v�Ȍ��`FO�3�'�0#G�g��f��\�fE���/�7�붵i=�VW�Tx)!������5�� +I�ϻq/P��aP�����M~y�5=*&5�{�r�b����S�6�z�y�{=��!����Ì�ό8�5l���ݡ���[ƌ��5|3b�O���M�b�M���s]��q̢m'������t��55�K�?u��?�z�jD��[���d��d=�
*���|X��1��y���� �Kĥ�}�������k��V����0�1�0-�!�y5�̹Z�s�Ad���>���g�k[��YB�s5�Ic�V��%n�wk}�f:_�LW3�m.j�H��ȕ���ٷ5^{n��F��Ȉ��{ϰ��u�{R��"vQ{/(vA���Xk�U� ґ�A���Rl� ņ]c��Xc�&{�[v�.�9g=�?H���u�����͙k�����˘���?�i���^wȹ���p�i�n\/���F���_4����t�Ӣ��w[=>3,�g�=n�7�{D*{�A� �Q䜆{�'��!۶�ߌ�3�,&H��j:��̰�K���9�iv,3nI3�s53ֽ��4�q��aFx�2T�̌�����q=c��xcX!���p��5���?:������;\*�|�xj�
7����4]!u�ÛytR�ÅJ�#��C�L��c�)͵�#��eJb��#��N� ���Ϗ$9��f��@r~���VNL�Q�7�G�I�@{���|ǩ���(f��8f��"fL`#3ʷ��u�إ�ՒÆ���$��}u�<�n熺�5��+�t���-ɹ}q������_�ɮ���ܖ7Oswܼ����Eic�oߥO�d��YO���ӗ���d���\�'c8�>�MF0��L�c5���ؠ3���Y:f����@f�_f�P7f�(OfЌf�2�j�Y�GM�l|d���0d�-�,�[�Ͽ�E=�^[uu}C�'�[���v����F�>�S���{�m�����A^�w��ڿ�U���M>� +'�y�ָ�������\H�a=�q�ƌr�!����N|�Rf�`�?��I��kÇ,b�
]�8re��V0�f��f��jf��L_q�xV���3�Z.8m���ˮfy�4(����8UQ~��a���M_^.�z�h�K%[�7~
S|l�
:N�+��I_=/ �����a�뚫�ٌ�_ϫ'�Y��^ҒfY��C�~d����#�x��(f�g3�%�;QŌ��q �r��T�@̛�:�� +f��5CÌsKa��0ӄ&�y�G&�꾱���a���R��
��������ˣ����gkķ���m길����ڦ�'��C�����~c�͛9_�ʮk�^�����������9=��2�����9������́� ��|�ؙ�����Ne���c����8������7�\��a�ɥ�
����!6��?o��~�oZ��<�{�/���4L\~���C��/�D�����?ܐ�e�9���5O�v�R���k�7��kx�y�混���}^����$߽��������mZ��a�Ȍ���7�=ُ���L�Q�̔���S�>3���s��e����y�tz�y�97-�j=�����k��f]�Ͳӆ���-=hpr�}:�}�a��}���C�� �b����w�5"g�y�%�s���m +A��,c���x"�'~be��.�3���/�_�Ҙ����A$������d�/Kf�q������cf��7q��g�����<�ۆ9�n���-�~�on������~�����f��o�.�z��m��×�6�"����_
!��ޥK?]-��� {W�����ƫ�c�+�/�K�|�� +���l��I��+Hs��P�쏡�W:��1�O��`�S�UC��������{X�L��=������*f����%���LU�3S�Әi�c���<3~�3a�'3e���媍楞�5?�����y����������ka�W�5?^�T��K��o�~�����M���r���s�
�R�AP�2����&J���K_�]�꣭�//l���U�p�m��s�����J���e�w6�����V�V��w�F;��7��U�=�<#���j3l�\f�� f�W<�1��|fa\����k��~j����A�4�[����b�o�r����U�?�f�~���J�_
+�
*�_
:��
�_^��4�x�|2�/���+������W}����yʢ��էA�7o�c_h���HS����_i
T0bD��Xn�v�C^<�J����ϴV�1�:��uؒq1ȅ7UM��5�K�E�y뾲]�nDlo�����o�������˞��4������Ê������,jl�U���nm��݅�����`p�:ep��i�T<1��^�ٷ��i�[+�����S���Xc���_O}����u>v.�����M��'�t���O>�6���Pzh�:w� ���^Sf)�a6c��Z�ۦ ɳH��g3f��8�/�}��o��t��)5�+�jH +��!����
\�M���!@��ξ5�}k�S�4H����M/�*ˎ:(:�sV��G����b��,�C�����*�N8��ߟ�w��-|�NRo�b&Wwn +�z~�p�^���5���ռЇ�T�g�
���-n��5�NO>C�\��}w�Fq� �\��?�˒��>&Ù��;�Q���Ì���L�f\������zѡ��~۰��'���b��s���;,����h��|������O6�o���_�^1(�6R$�0U�J3W���o9����+�|\.=~���<:�G�aòL���c ��76�֖
�5̓�}��^|/�.]}���FF�K���xp{�q�w��!��:���S��9���U{�F�_B��=�H̘2�e�K�� +��Y~�����A��!���!��k���]��_J�_ޕ������o��3w�L&0)�,��+o��kE���td=i��������������U]r��સh��f����8凿y�}%r�b��݇���_�b��2�>΄r���/nwZ-�����8C�^����B6q�UPV���f�E)̨!�4F���t�?�Ҍ�kB�����x����6r���P�s�)�
K|�fг�}�����T���u�o�7�ޟ��Y�p�u��/��ſkū�����n<-�N��r9m�����Q-2���j��<�_^ʖk�U��l��n�<����S8�Z�n�;�-l,���]�9Nj��(x�A���!7�����O�O|���=Wq{�]�5}1G���h���ָ�fojC����X�;�1ɝ���,J:�k���>�R_����[���� +�B����3���]��B�1�͵_�>N���b����@�2j(�`�0f�2��\�鲳�⃕��o$��Of�������^��=ѱBx�9X��o<����b��YB�Kw��'�x�e���n�ߗs�������_y)<|�����y��t�v�L��k�h�^3��}�<3O��X}���ޟ� +�ޖ`/N����ܫ����*������i���#���%A��-re�;ef
ư�^LXB�eTN����ʡ�:����ً��[����R������<�������v\��q��� +�G����AG~�P��0���̆�����ؘ3�����"�̗���dp�ފ�-��PU���|77������i��g��q$6�����8���m�7��a��%����q������y���2p���A�GUw8(�Qt�wVt�@]{~"��1�O��_�n,�wr��x��0��0*_�TJF�5f���BI�0��+3�M��Ro�ę���lv��9��W�����W2�W��e��z����Kw�����V�y�:���E��w����y����k�W����-�3�s��!K�+L�,�6�L�ޤ u� +ƭ�J_�'���D��J�7+R]2�An��f���Z��۰�g'�e��� + ��` +�z0�s\����,��^!ʎ+����0XV�o��A�o�-ù�s�ړ�uGNjk���t=�
�sG'm��@��0 +y��&��G�Կ�U3��x����9a�瓹���"��Ү0 +hy4E|�]�|���/�����>�R�����&p��L�U�yc'3K&�f��1!�p���B�����a�E}������Ob��|�aw�+��G/�ޗK��Nn�>'��7 +�e����b6����?�U[o��s�q yBn� +D�B���h���:݉a��7�Bˋ�l�W���w��v?Uu����g&�
NV���?���\�m�S}e��J�-��av���c��K̖.U0^J��4Q�o���a��3~�:��Շq���x-^ޣE#'{z2n��1>��Z�3}�IhJ�mHIǘв��
ҕ�G�����?����c_k��?��[�e�F�]?������2��W'V[��~w�]~�*}%�^�����̭=0�+�>�_�>��:�l�<��{����5ߘ���vn`���O�\��At�?tAW�C�?�����]CE[�+w�2�?��jz>[���?��} +��ja�k���T��e���0@*h&��2�[�5�P���;��7!�O�%r�~T�������Ru�O˄S��������q���.cS�� +i�\���և.¹����w*c�=�]���j�y�"�#�G���S +OZ�� +�Ɓ�m}�N��5g�j��U�flH���_i���̿��R�������{�uü ����� +� ?yɟ~)����+�렎+�P��^���`�����S6���G�R1�w$��[!��G�'�з"t������� +-��2k�����#$�2P����#kOL��n.ڟ.|�'�Z�����>�N�>
���"���Tվ7��B-�=���o����?����y!�?�UއM̷���y���z��L���8�ꃱ�k3T��-P�u�:���+0��=~3�~4�2f:�p�,f��匏 �ܛ�6��I�o��x{*o_%�O4a����A�6X�`��|�1�"���4��q[/͕:�,�;�����%[ ����? �����U{�����`b��t�gZ��� +n��ޟ���7ߝ�k(��¯���~�Y8�*H>�"B}��^��ؚS��\�:^/PW���7S��ƾl��2,ӔK�h�Z�g>�3}�8f�e��R�7�4"���?A�v�S���讁C^���3A +��z�E
C��n�8���80B(�4H(mu`۞,���������}4U�i$�x�bF���+hJ��OgR������f�
g� �F�U�Ǩw}��;�}�p�;%��'wn�1'�2T����X�m��VYA�A&�9�� +L=uH�8{�?�+V�v�NL�ޟ���#���>|r�-_d����;R,;��n4�� �}8����|�V���;y;B>�H�?+Q��`�� v��E��
NDo"�ׄK_�����.h�Nm�˖t
W���U��f�b���{Z�b�5
�6rZ�n�V��w�;��d�.[��,�2�Y�Лإ� T�Zn�F��2i�5��k��N1�%e�Dd��Y����3S���U��0P��;8:�B#E뢳,��;G��7��6_�m_�w4��h��~�U���}�R�� � ��4#OT꽯�T\Ɵ~-h�<NМ{�B<�R����U\��I,j����z�C{�O�e��N�{��
���F;������R~�5gvݱ�|a�u���l��nn���4g�s�?Oh}���'�=j}�1e~�歷N!.����.���N�|��u�X,g����r��m|�����3��M���P��v�T�4Lȩ�������[o/�n�8)mB�:9��$�x鮑b�!�%��8�O̵�K�(og݇������^`��5���J�"�}���I�NN��?��'�ZqF��`��%�XI�m�0_��~pWz����n����t����8���)�^�������a�u�%�y }Ɗ����I��o܄
Nwq����l��� +��,�㉯�Xg'�7��4���0 1��p����'�Xa�K�ġ�����1�2J��9U��e�yA,n���x��Hs�ad�
�t�(3*��C�>�·K�/@�`���xa6�.��3:|�jk6$Ƅ���mc��Jv��yb�V{�&�8H$�Q�4��{!��MC���>��x�!������gA!+�)g���19J�Rf��d3��:e�\T?�X���a���,�N��c�I�`�F�i5����^j)�r�$��IU�Ɛ�})������B���Ré��y�ჩ��v�v�=6��Ki��>� +>xKOِ�gc��M���叟��W�%�O5<8�BH(�e+M��wRj�`����65�?n�ȟ�?~�4�QEd��uI&>�vu�V�\�䐚���dC����R����T35ṁ�2��j��������o�>Gw���T�k>�Bمe-#����ɧ��g�*1x�k���q�d�M���f�J�Y��CN�k��b��N�ļ:�-���Gƙ��I�*�}� �Pˌk*�K/�+���T�<z`i6�J��$�Ò�(����tm���rA�J�I4�Nl�l�\sp2��=����ڔ5}��
}
�����;r30C�nv��a�`j�<����Y�9�@䛯���6G�%tS�L��� ++6"�ZRz��a^*�0#ne�9�*kwVUتBH~B�ؿ��h,Ϩ�ֻ��ۉ�͔6
���t�����thu�I��ޖ�jm!��?�0(ns�V�@yRX�l<9]���}O��q�S�tv�R&�3G<�]�'���
��f��@���R)��\�{hʰ���s{�sB��t>��{�\�2��g�'�O"#Ė[q+�-�4 �\T�9�k�a棐H��θ���̟:��p�3�Hg�g�� k��k���*�Ψ����A������'��>�؏�����~�,f�R�ٶ�(��ܫP��_4\ˋ���ے�a�Gj�� ��
�]������'��X��[�@AF�=t���4�����qZF-���Mщy�RR��fF���J-W�Z/.�7~8v-D���&n�:_l���/��v ͵�]�Ƿ�:���aڲ���[t +X�|��ڽwU��o��U��lX�)�9��>Z��{2t�=�|��W~4�w=q�,���cĘ +K1�В#�OE�\i���T���"���Xq�QØa-
l"q��^T��1�u�X�>���O��?s��_x�ڟ����;�\-DMV��T�1,Cp���|c��ˁ��NN7_�+�}�\�|�뼫麭���~"���4%�#tEuC5�'f��חɭ7܉m�М��6BŮQ$�M�<��*[hb�m��{��Iݯ�n�uR𠅊��4�?�f�X����F� k���;.�چ[�m�C��/g-\���P m-w����]��ԵJ����fШ�֟w�hi�vT���s\m�-q�g��-C���R�l�zg�v�w�j�-ɟGP^ߑ� +��+^��Gw!w�=�� +�J�zt���ऋk���o�v"��RT�Yp�����6G}��`|�x��� +�6N���������WI(����fm�?Yܚ�����^��עC�_,��?`3�˕L�NӶ���,�u��S=l���O��}��������=D��v��Tg(�i(��X]�����v��wԇ�����\�G;��jPm��BhSPmxʥ��3l�O�,m����˩�9��Yb[К�k��jȩ�|ZS�>�I�.��"�zA_^�|o�����|4^g�#��~4ë�����Ě}��ƳΚ�;��J�Ͻ�xZ/%1�r����;?����o=u'���_�P���@!��H�
��P�{$�^oG�kNL�\���pUd�)X�2���u�s�B�I����MDm��ZAs=��^�l]$�W=�TsM<���Z{��5��P��rrm���Z�,��%�hWof�.�Ľ?��ĸr+Ƀ��/E�:�Y�a&Rx�Xˢ���J�k���#q����V��bV�B� Loʽ�r~eqCg��i<�+�B�.8�n�vm����< ,�u����}W����<�3%�Y�1=,n�?�|k��B��k|��#S���~4���cѳ�M5>��E�Ў�&�Y�hg58�{�a}Pʀv��Q*�g��:]���0�!m|���Y���Ey�jgE�������;�/�7NK���\mIu�r��R
��u�б�or +kD���@=�"�%��I��[�k��ɲ�D�����{�GC���S6�os���-������.���|��uv�[�$�'~`�v�͆�S5�M��m��#�]w<��k�`qK�vyO�I�wܐ�b
PSd��+�¾��U�9 +�-T����AH[ۇO4�ZN$f���v֎;��λ�XK�S;�V���?�Yέ��^������쿵�Jz������3E|ѧ��#��1w����C��+�6���l���8�����rxv/��E^��a ^����u��|�h0��fr�M����.�Wɫ�3������]�=�=�+���v,����I�������f��q=��)��J�� +#@;��8����!�G�~ץ��M/��eSj�F9"�\�H4�$�� �.�媮1�@��];��Y˭%R����w�d6�u8B�Bn��<�9�S��M� ��o�!�P��J�wo.e�s�.G�$ߺ�L_�i�.��*$�qHp���홠��%��O���LɃ��|ۅjgQ�����O�v������U��,?�Em��T���n�M�v/���A?�Y%=�Y���J�S;+��c��Ԓ�9/�㋶;��
�
�$��eT���8� +�����CV�p|�t��3P�����d����Kz8ǻ�hɵ��YQ}���^����m�o�d������B�r!�&�_Γj5Z'ħ��C�M�}4��'5yd~/<'P�1j}���Sc�uD��ox_�a@w�� �O��!R���Wmn?O���a��bL���C���N��/�+Iܖ�O��Kj9��j�a���?��#=.�B�O���?���,�T;��4M�Ygmje_5j���m�+��6���\�>&8���[�z<w�`�co�����8]ʲ�^�&o,�l$�1��b�E�[B�%|�ŹЀ�ka؟Ck��8/��Y`�cߣ����jw��7}4'8���g�_�kI��Ҷ닐�I���ї����vֽ%��o�4�O�����H*�� +z��3���jga} �T_iM�Xm͡���������Q�x`���cg]��)Ю�$Xc��8�Mt�m���S�z�9>v��1-�x.b�z\5'f����-�8�X�ׇŘB:�R�Y���+���=wh �i�6�Ξj8ǭ�Z��խ�rU��_�]?�pMŊG16�B-F��ƈ�4��?����Sd�TaFbx��.����.w�`h��'K�L�v��dܫX��>_J��E,�t�&Ju��{~H�A.�8�+hAc$�kTgk��n��4�����q6�[�5��xzttٛS}��fĝ��f���ǧkH� +
�o�h +����P��<���3�ߐPMh�\��&��@��h�zC�y����y���q_���E�ΏXj:�Mh���X4Nn�� +��:_z�~���_�۲D�'t��O�2�:�e;Fʫ*���>�DH̷�})������s�����H`w>w�v����D�|H�{GK������T;Z!X�ZO쳲��9_hg��hgɛ?�#6]��A�[I��69�\��}h� ��u���yW����;FQ���=c��g�H[/Σ����Z�O_H�h�UuO��n����=������jOL��t>���]wj�.{�!*�L�=8k�wy�Etm��+���\��Dj,Zk�;>En��D�re�$�*����Rh�9�|�ɫm����Ͳ�e���v|���j���
D.��z(HI�u�ض�c�a�uc��`]��`T�4�RW�4�]���6hn��G�DŽ�3�t;��W�_&X��E��è�%M��ɸ�A5�Vۈ�4�G��8:^�zm�D4坣����-m!\Wԣ�/�l�j��Re�ʮ������3�r=�ۤFC�Oul���;�����z���<�����n#m86kڣ�����b��eRp�)��ܿ�5E
C��tސ�ŗZ������Ϧu���rݩ�����;�Q��Q��,������J�T���I�>2�GJjg�������9���Xז�r�yߎ�ZB��z�x���T�����R�y���5���x�
WA�|r�۠;E�XCj��;K5������������ܵ�OM��&���ȇ�CO]]u�LR��Ϣ��o ]_.#���3|���Ձ�%9r��t��^7)������8Z37]X��n�֯4HNM5�Ww9BwK$�g�c�
&���Q�����1�K����K�z����Q-O�Y�5�Nз��%�IT}f���9����s �,֢��83hm�zjj?�.�|0k���bL��K6��2�k*���(�^/4�ZFBg
k��%���;��<�&���$m���С��p��iӅ�ܒΣ=�t�?� +��c��&�q�4��ڵ�yϗ��iRJ���k!���i2�`_�x�E���C�f�C��tk!���՝>1Cl�|����횽㩦94oI�Gs�����>@S�u4���ggsM����]�o���qeV4&�?8 ~��&���S�7Օ�:�{BĿ�M�p�OO����:�y�&��TS����*Z��e<�
�y����2��D����e6� �D��C��^���{&�~�
@��ۿ\$n�8s�K\��$�x�{=� +b�%g��6DΊ��>��%�^B� �h�����֫n���th� �^�X���h�=X�N���L� +��D��2�*8'��V�����V�ȫ�]�s��=z�NӬ?0k����Q�RbK5�H�F��嶺��i<7�3� +b��i+�M��`O�_`�ɂ�%y�������h�'�[a�Rn�x4��~���
��u0�lz���/4Ƞ�Wwd*��[
���N�F���w_N�xZ�/�v^C�=Ԫ�n�A�o{���~g!|�f=�%���X���T�㱛v�5tbp��j}�W�ѽ'Xk����� +��B����rǝ�l����Mf�{:�$v�v���7nF�b={��6�ɑ�G`��͝��=c��,3V���t��s@N��H�̦A2�?e췪�;V�z�0z�l�əb��%Ҧ�.�O/��+��F� +��v:r͟������|bE��0Ǥ�.G~�� \۵\ӕ������E��,��)�gYh��K�ᰇd����JC�W[i���V�Z�$��wzh2l��\ָ���)MR�����V�Q�_.�$>�u8]�#5�7��p��/��S1Aj�A���.�;�$�o���J �Զ�1M����m��� y�Z����s��@O� �li˻��w� +���5�[�v��FIu�����=GЂ��`O�=���{%>E�nMg�'����T�[��:�X�ͩ�O����p&�yŚ �C1ǥ��z��O���:WЊ�:;�c�r�J����yl��@��Əgb� +�ϕk�{��zb���0�y�N�Yُ�+%9��4;��N�$�6��V��v�8h�Q�2ܧ�]g�: �u���:�?l8>��^w`��B7��/��Esrm�tE�#h\�>:�j��s���M��j����d���D1���=7�{i�|��؊N2�N����%�_J�_H{�������A�G�n,tzH�H�#�+m������t������x�?���������x�?���������x�?���������x�?���������x�?�������ر �CSCmDo��n>s���U��R#Slm�OwKI]������ +�δ�e��~�,Eg0v�SW�4]&��ÒM5��$.�TX�]Y{l:2�=&��[R���Y�m�I��~HR�J���hEfo9j��>��V�B>?m�h$BR��"Df���M��8M�1HD� +�f�&Dǰ�bJ���.4�DJ���4|L�9�B�1�oI�y�=U͆��0#������-�y���U�&�:F�9Hc$�����@Ͻr�X:lW��AG(�g��~�^T��)�=J*h*�U؊����u���:{!��w�.��V)�К�2��;�)����&�(�:]L�9Ow���@>��5�c���hc�A`VE)U�F~J-ڒ] R%9�k� +�K��_i�o��A紸��_Px��o��,�R0�l
�2�j�H����e֬�hu� }��y��;��!F��{�F�N7tI�BT��ve��.��Z�V�7��67R�[7;�Yr��;k27�k���;�b�˨��������a?R\��a��iJ��0
�[�k7]���;�+���H�v��LtP*II+��4���g��'���R2�t���A+�4�U�mA�BW��<c"�'�Q"dl���R`�NJ}�����SKl5Q��T�y����5�r\���b�9�\���>�`*F&�����$��^���55Ǧ�26�����|K�9:�@"B���jH;�J�a�ڢ���x���yrӍE�`� +z(Br��ZGƂ��:N%������Ѡ(P%��<K�e�]f�+n)�U��Vf��]$�x%�F;��̤�ä�+�i���K|�'��|ӥ���$V�%c�jʑ�J^i(3�~b�z�>���b"3Ȝ7Rrz�U|?�Zň�^��+�A���(�� !ڈ��9�[YJo�/E��P�RL� R��X[l"������iJGblVo��2+V�d��?�h�Y��J��q�.e��6>�J�e�.T}v�@)]���p��6�.1�2�%O�ǒ�b�q�d������*;tR�^z� +����U쟠�pj�n���ZJq�9N��n�"k������%>��Lt���hG*+16�7:�a3���~�Z����*)�9]=�35���7�u���kS+�iR�l���^���1ϭ�]���{�����k��c@������D;��:Fj[����_�ۉ~�Ʌ�rQ�pt��N���t�#��q��S7��A�+���1�2��.59�n�&mu�o]�WA��w��d,a���!>� 2�o�.7!`W�� +��_ŀ�Ċ��y&�_ϰ2y=�I|x���2���ā��^��f6t� o��g?���Bd��Sh�->dy��i�._�-tGю�����q~�e֚���
��څ&��D?��^��3֠c&�ؒI6��PI���#��ٖ�#hRJ��7�2*�̳@7��r�:��`[r,�O2���p�0y�I+E���䰌���O_�{�&���2�'/h���C�Є�k��j��ߤ]s`|�.c�(XbT���"� +����7JX#����04'��:R5�M�ݶ
f��c�pB>C)9���� ���TLF�_�����:�`�kv��YW�w�.�����a.��IN*�9�v�����ܖ���M�0W�r�s,ѥG}*� 6p�Id�VP"0|���t��z�|��FPWcH\XY` ���j*�e���O�"��1F���E1@`m�<h��'��TaM +?)�$���"79�etpӮ��L�j��h�(=4���$����EۆS{��;�~�>7c�@�B��P��u��#��Ɛ�S�I�U7�Ҙ���jӫ�S��
�(S�͠#>s(��}
�TV���d�(mI�#:wi#���� L�c��
%9������ +:!�[���I�m�YHm ��lz��%�w�%6����B8�}�բ�~5�c��.{��Km@���bW�µ���\�~�/H|Հ��i���I�C���tn� +W��D;��J9̓��N�,��9K�5� +�t��&�~����T���tt��kW�s:�A���C(OƓ�2��k�_d>js��_�#��0���K� <���!>���5smi�%G�A����7lt �I��Y\2?(1��BrB�:O)> +�R��R�GI㕶�GR�1y?:Ca3�"��D��ώ||ڵLrH���������Uv��@%���
ǧ��M�U��j�6R_I�������f? +� ���;2*���̑RfK�/����eݣA��? +�Y.oEIU���w��9 + ��5��#~�>������� +$�J1�� 1I�%� 2˜'��Z�OiUu_�F�:�k]ɒZ�1�Z�B|7!u{��J�&u�Jc����C� ��a���BL&������$�/�f�_��u}(���~�Bh�)�d�F$��x����e�-�*R����L�6!$�Z�!i�J���a�z���dz#�Œ:]���
�U��Ը�d���U�5���":��� +6�v�Y$�y�����������`RR?l0�q +sYJ�?���,���[��<����A)�%���kJ�]Ubuz�����w�w"^C���G�_�u��5����^4AN�Voe��:P�4�q@I�>�#y5T
(�5����Pl��ۤ>��-�}�$q��ӏ���!Yf���(�3�͠ +E�9�p�jFRゾ � y���՟o��E
�c�q +��*�B��7aÇS���>�E|�l�Q������:�%�kO�����E�A &�z/m2�@ZA��4��ԇ���-��+�@��*U�'�����A[�}$�X�jsj��{���uCh���Ӊo�r1U=�X�뙔�P�4JS�{���9|�sw~��˨�cӵy���@3�c+�k�n�����"�Ua�5��g)o�`�BLnoDžm_���/�4U�k�
�[{r���&�[n̗�?p����ۿt���VH�Jq�pԥ��Z%��OJ�i~L�u'&K�g������
d�e�.�؞z���U� u?�ǯ��|C����O��ѹI��<XO����ʤn��v�{�0�?�s�QӁ�����@sk9��/�2�� ����]N���s�n,�X�)k�j" +z�6AvD�[UN��@i��.]�̫��:�C�@Or��Ҿ��(�$��%�����Z��p~���dw�v������Xc�˂ƍ<���koWպ����ݍ���Vl��k�Y� +����"ȍK/�� +��&l�Ф!�_���8�5��wg9(� +�Kק@~���>&�s�6^�W��1ǟ`Ҵ��u��'�I�X��㝳����F�Vn�]R~��(���M�<�@$ԫ�r㑼���7�<�c��sܓ����*ԩ���d\�F^����r +��}��!`�(��:P���B��4�����>_�[V�E�д��&v�~,u����4�u��7A������ +����7���� +���ܹ�q�Ʊ+� +��M���M��(�� +�0��>~J���:`����9U���̟��M���V�h��5NY�� +h���yq����G�S��E��y_7�|!��ryg��%_��(�ly&N
"c�(�BS�Qk,��D�i���ط;85�����X���ERrNqh�)��؇�ل� +����C><|(�à�H����e�[�<%��0.�:LӃ\�s�<Ԏ�/$c�w��߬�1ɐ�dpN��� �q���!�5PCgS2!0W��2?������m�@
B|�f�Ni�1�'�Ĥ��!5qt��(�I���!�Җ�߿�=&���+�,BFa����˹r��g.#b�v�}�A��%������Z&s�U��q�� ؆�N�vW�JG���M��u�ːǛN 2N���_�_�^o�� +{���O��ˡF�\�������r-㔡L�vo�Q��W�s�2�#�$�kPǮ��i�����-)t���ݾ�7r�
��1ǾK�};�En��?N��F0��(x�ZN
�Z��?� �@
�wh2?��/���5sQ��&F2A�������&���q~��4�N���
w���c�<������!���}�����w&L5��ǡ17L�}�&f��3��R��#`^.�؆�ʏ���}��=��2~/�s���� +g�M���g�ȩo�� B���\��jRdl,A�MA=�8L��8���T��
j�6�_j�WFM�|�E�vk�c�r��A��5}��⓹ +TȨ��]tP�zP+�߅�njףUDD�6P��t7�U\�p7��P3%u���L��rS�@�܊�����(�A�L��Ncn�M��x&v�O5蕀<p~��� \�>�|Xx����r��&9OP�&�ڎE��K�3���O���Q����� ǀ�?���j��Ę����-�~��S����.�E�4��e;IM{ +rXb����@���ɳ���ab*W+?9��^MY�M��0ch�����gԁ �)>��ۥ���D.���������
�V0�@��z�;s��}����N-�g��P�H��'U�R�J�Ae�9��<������{ q�W5�!5�85l72+́ی������ +��8 +�E<=��q�*J=����.����^S�_$ıe����\?��@a��Z/�j�R*����y�� $��\r +ypȭH��4��{�8;��6��qo��#y)��9eI��=r +LŇ)�\=��0F������l6�3�.JD`n�q��VI����(��nI����ɟ�'�J:��b�a�;��Q>i+ �%q�^��A�
�A�����7-c����9�5�S�i���L|�:�X���&u���b(ڑ����ݼ*�%ujBߏ�����.C_��0=�\M�بMl�� +`v�3�]�e��^j\���r���SA}jC���^�k�2�W�
P��0O��.�M�N�����x���P>8#\vQsA�
r�Rg�|���U��K�z#`f���*=P>���r= +�\�C�!��py�芝�3���oN����\��}�Z����8F���*(J��d�K�К���A��IU{��m���K)���1�D��攚r�p�Av�J05��۠�����dī�DX�F.o�Q��O�<2�0��p
(�K=o��z��z��\���L��/J�3�?\��׀r�kK1g� +.ܤ|���W�w6�� +�x�m�\\O�7�uA��!f.�=��G���>�1u��h���>~�h����A�8l&u��P����1���ҕE��[ +ꍢ�~S�����5c�_E�.N�� +��� +iq�땄�"ԮἋ��[!�;�Se� ��"|�ru � ���9h:�������J.�s�#z����c�����u�(�G�꩷8=rK�ӊ�3&Nُ%[�qP(a��Ӂy���mp@y�z�����7�S��z�����})L@�ơ{:b*������:J^�
Tc9>�}+�5�/�x)�P���X|=g5����K@
K╳� )P�0+�0�`%������p�q����S�O`/L`�fP������}]ʠ��j$�.F�<���P�~�$/�r�P��#��p� �32�l/�r+W�:�1TΠ�/����itP�fPS���#T8徐�
���(짹X�c��t�o��0-(L�R��\�O���4��W���B�PjRT@�F�/Dt�QZ��֭C�6�����������p�R?uT̏�@�[�~c ��9����G�((L�l0&c�wR��q*��:vj�@�%�s�حF�l���zX頷��ˡ�i��Y����Tb�>qJ�!(�s�Fx�8�<C��%U��ױܳ*N�I�@���Г>�/��8��rK�q�����^I��0�u�L�B��.n圹���n&n~ҡn� n~�f�0"_3%�>�r���'}"��~2m@���%�<k:,}]wV����CB�tk3�v�^�[*;i;�\�*�g�����r���
LB���Fi�Q.>�TN�'��őE��2���2���$c�wC~F��r3�e�qջA����3��}:�O��o�u�@���sIͪ��&6�%"J��4��d=�O2�]| +���v&˥r��Y+���G���R*��z*� +��a�Դ�Jk�g4�Di
��H�����x�DL�N��k2�]
zG�=z��f>�D��?����֝D�w-�y������La�I������VZt_�w�Y5�̽&��^��Z qv��&K6���6
���U��NF���4����4����zt�����@ z
谢�������"�^�����9�0����o�'���@��>x7߬j���iV�!*�P�p�^/�q�k1u�\M���5��|�!����"�� +�.�|��_dIu��n]�A�W,��i�>�r���p�YdU����)|�CH��&% +3��Y +��퀠���Z�\u�F�|��*z�2}'����K]$5�������1��_"yYB������jYJ
_]�)��ӡ��c߳��x���kU��6���֑�6-���u��\bI��g���1��5m�(jǹ�R(xB��#}��G��7a��&�E�<o? ~VwX��f)��N��Zdl�.aJ�s����o�i������Ո��ф�0a��)�~��y�"?h�Hsj���,~TiF'�k jw�]��R���l +5"�*�ֳO�9���ѧK��2$�
�w>��>��'�2�y/����y�sD��y@|�1�����$��0�Z$��N>�� +��O?SL����¿�/��D��$��W�^��h���)iV����lH����kc��@,�� +�Gd�G�(�[�$�k1��Yl�ĵi��T4��0�'�j�_h%{Q~F|��T��+��iK3ZI�zJ�Ԭ'N�6bҺ��'�A͊�~9%/V�D��~_��<�x�8�]O��A�J��d|QF���'�����j\��&����˒�Z_Q�u���i�����ѕ���,,�?��@~��v�d��O���[�Q�o�Y&?Җ#��t��QB��z@��}LR\o#{�pN��"�ݫ13�);y�U����Ⳓ�2"���0�u��f�@�Ss���K���; �9cQz��CƲ�j����C���e�7��vMl!�C���d7��sk�IsN +�~7 R��e�¶����c��^����h�`�ێ�y�Q��������3���Gɂ��o�� +_}���鲮3Ҷ�������ʲ+��TV����%���)���y�tP̣v�$�ɜy�����DZ��(��'{\q�[����^M��2�nv��Q�����m����zD�GC�NAf���]$��'��b�u�a�:~��w��+>��+;Α/$tN
��|�+&|�����"*�� ]�rA���a��>X2��'lf��kXK���E��Æ~�{����K�j>x�49_�q)��W���o�]C��!��_�|�{I]�E�?^#��]���M_��3M<���#zU��v��ue�-����c��"k��"��]��Jl%/kNH�6���&VI���F�8�$��bL�"��:_U�M��1Q�͂���(���W2X�+�������S������w��s���k͐�nN +�(�� +.�q��N9�������f��咞_i{�7U�q ��3��AK���!a��}DҀ�4��YA���I�1�����A�~�%��o�2k)���6_�i>).n�YZTi--��7�ʿ*~�|A�����m�I^�9�U�%���$��c�Ii~�YIA�Y��LMR�v +�.�G�l����&�kB���{Ⱥ�d}U��뢾���F������o悒?̈�_,�_�R>^
6xJ?UZv=��|j�*>��^u��[�<"��*��z2�V���Q�'~�`i����,��,��4��T����4�ʜ~�&a�~�ϻ�U��8��$���i�Q�v"�!�h�O��˼j��TT\�V;ɚ*��w���{��f�·Q��^E��=%-��+�u���,�\�d��6�`on��;1g���.��F]�� +;�y�5#�t /��q��r���wC��H~�&vL[@&|P�n�1��z�� v �^,0N��B1k`і'7�-�>��<�`��pQU���軹�CV]��b���HC=SDQ� +b��%�u��N�ݍ�И�|��Q�i}�'�5�n3)��h"�������fuy^��?37���w[��g��F�m��"b�y�x��
�j:�$�T`��H~�N��dF�S�������ag�¥�nue�m�!�����7��|F7X�sX2㻶0�k��t��E��Y�y�ӎ�D�� ����!U�/�Ѳ�*/ˎQGڟF��V�Z\$���t��vV���'��LO~7>�&�w�'��oG�:'ؓ��O��եWL���To6N�a����Q��o���ɖ���r��� +�(���1�5���b-�FH�TI>���>�������~�scB����0�'���G����A��d��8?�-�|�� (�ؕ����b����7[Ӵ:�4�M����K��S!o|Ԗ�j=iZQ�"-�p=�1���OR���/\˗�_O<$����G><�9��"Z�Q�+�P�a:Xr�16ֽ�7έ�76��9ң�7Q�R|��k;o��N���p��zxp�KxZ��<��>�v�C^o�r�0��^�>��.�G��y����Q%������
'���H�/I�7e�7S̭f��F/� k�|��v�93�\sj���q'���K;�������%� +k~%*�~���56�e�xI][�S?��k�x��8�`wn��s�.�<E�������$�ɘ��` ~X#�+?g����h۽���OC��=��Д�l�(���������I+w�߫�ɫ� +,m��_TeTPaTRcPYmP��.��*)��Sj�V��W�y�!)´�u�x��ۢ멜����)�'�C@��&���ŏ;�n|4��jJntR�o���㢴��O����t~p���J>�R=.���^��� ��J9��i'x�x���ל�5��&�� +0�+w������x�9=�`�0io���G���w� �n ��v�_e'/��*h� +|�hX�?��Y��Z>�����]b�sXr�sX|�K�G�O��S�?�����`�EĒ���]���sf%Ůf
E����!ⷍg�DJ��$�I(y�vHZ�xQR�c�/ҚZw� +�D�jy�yk�\��z����� �~���-�i�X���r�1>�D�8��"������C$_�vg��4����:EFԺƞiI����`:꜏vdE�6�Ƹ�{GF�:�oW�ÕUi��ӫ�+��b����aY%��R��c홡�->��&Yu�UQ~�III���}����� +�
y�Ul��a^�^�偑NU��q�n>�ޱTg���V�od���ɯ�3:��#<��-̮.�W\\`���c������oYC��P���,�퓍��|3}��2ϴ�I���g�mD�e�]k�`��zUir��>$��)�~͕���������Y�/���=�Q����g/�?9��?��� +����]��V�z�24�l}|����c�rYO��E�s���1@���W���%z��A����E/~9d�Tz�)=�tsF��Yz_��y.��~���՚��v��;�q7̢�ܤ�=n�<x��Pm{��A�s}�
Ӻ����Q���F�OY�M���M7�o�hR������?�y#2��52��%̲���W��a'kj��J��Y�~+��gi�A���+{��{��V��|�r'�|q0la%�Mˍ����%��6f�U��Z���W�&��_�M+s��i�L�vW������v[q]������\CJ�cUH�Med��װ�oC�꣰�~)�/��.��ʎ����]��T{�-=����*��a/�nľ�<ز;'�d[F����Ȉz�H�:�ѧf/�����-���0*b���0����9O��U�w~?%����Z�wDR���=��"�G�O�ɦ�ˎ[!t��S�cC��t���Lc�����h�j����N�W��B����u������[Gy�;��C�8��C|����|��A�_l��}VI�u�`�%���*¾έ�;B��GG��o�p��NXj�CDQ����
����P�&�x��2_��J��情rA���_�jFv�����Q�ov^a�@����C[v�E*;��M*�hÖ=h��ڠ�C���0�+O�h��m�V�E~iwt(
+I~u-��������<ϰ�7y`�O�U�N7�G�z{<M�*���eEb\X����#2��KX&�
����?n�1/(��)��o����Z�k� +f~4\7����g%���/F��)�E�g�h&����9�RƟ�=�����'F��+ +�2ŝ�)�l�<4�ƿ5MP��&+�A��+�y��!�i�Тy[�ʕ�h����z����.�*V$�����=(z���Y�;y�[������o���Km�����+w /���V��R��#�.��.�wW#��_?��LNt�r���u��Q�t9���?>C�ď>������:�[S��S&:ܟ���NY/����o�{��ԋ�[��?��(�G�f-F�3��5�@�84�Ac�5 ���#e�h�4e�~� �k��v��x����ZM������ڴ�e����[�8�*n���t���p'�j�oT�[�Ф|7��BW9���i�aO��o�����b,Q�(S�\��>8��%,��#����/�u&�K�u�/}?���H6��=���ݪ��f�����;5��e�h��H��������z�i�5��(.]��&��h4�F�����.E�>)���p���x�c�o��_)r�����m�$F�Ho����բ�"Wy��<�w�<�S����jhd�������|���y.�/��9�N!O^;�d�y��I���1�m���>���O��zO�OΗZ�#^7��z)0��1\��5�cz�����T��ᵍ¯J�[��8|�+���
~������o���F
��?ND#&�f�YS֠u[��U3�8n��G��5�o����Z�����54�K(�1��E�An~��=O�����6:�d�s�G��oK����������U��p�c�7����7�6�1@��g�5��^�H� +�� xMӱ�Mş�����j���0nu���a��n,�{3�Y\��R�j��y�]e4�a:z<d�~-/B��d�]�����
�x�cYl�������`�_���*p��
|�|�Іb���2���bo��,
:XƸ�=!��Z�g�vY�)x��_����#������E���:��h�s�$�.V��Tf{�$�?�Wؽ7n����D<-r�z��1<7�9��K��<�Ѐw�r���R�p��kai�w���o�:�ĕ����^�*�w��[�(�_��f)L�lp�*�O�S��"g���?�a�G⟏����9�}����a�:�BSF,As�����#�$�zV���io���7��9į�+�DKZ(��3
�a�ˀWb��?�Ԅ�m˔��3�;��c�^_c4�u�ck�#-���_H�/��?{�����]�_߃�*����u����X|����I���C>H�ϵ�����ɛЪ���cwGh�f� +�Y�C-�U&���^���tCbhM�K����:���EN1M�.�M�cj���_�u +�����9,��#L��nT���qg���۷���߽������#��hn���;��S���˅h��%�Y;lO;��3ky��ε���aws��s߸D��w�)�wI(-v�{Q��S��P�.�/ �˥�/�wyx���`�� +}��jԻ<�Ȳ���B����w����N���9��c��C|?콻\��U_�^�����&����g���9?2���'�}T����4w�4o�4{�^4w�&����^,@��#���h�B]4o9����]�-��%^:���pK���'Nr���"���g�������b��ۇ�:�9��5�
��v�WX�y'�����u���y����C>p�����$4Ca�=v�=e=�;k/Z�V��o?�m���q4w��]D�Y�4k�P�Ds��p?[�G�j'h~`����C����)O�y�Z��-���kLq�K��o���J"*�"�kl#j�bkJb +)M]�}�J4s�Z|�v��Sw#�i���i{���[a��-��E�O��z�h����;����e�+��*F�Ç�nx}��Y��Q�����.���!�\{�}R[�CB[������KxiԲ{����_���Z�Ϧ*�FS1C��j>s���-@�N�״Q�ь�k��6���U�}�c�4Bs6���*g��}�h��7Z�D��d�h�Law��3TKٍTo��K�n���^��!�1���k{��!� �q���am��]���mv�y���竣C4߲�fO��o��_�
�=D��JHi�B��9����O�{����!�1+�?�{7n=��[�ܙ{тEZ��8Z�� +-�rFK5��Uk4_���i�V�C������Ԟ�+y��QW�����y!A�]��z�_��=9/�)8��g������ˮpyH��WW��Kg�^�o��������p��)c߿)
_���l�38ۜ�ߧ+���[�f�[���[�}#�&�B3�c��X)�5G��,�'В=�h�QZ���Z�U��Q;n�]v�F��q�Ii�K���I���}C�t�W�v��k+�s~Vb��:�S�mt�m|Y�]l\�k�ɏ�k�V��=�����_�d���5���xgs�tş�Ҥ��^)���6���`;�i�����>��]����#��ZHi�Z��9_��x��ր� ;o��U+�M��6���l�qݳ�;8:�j���1��6�\e�Yc�[g���J\w�cBG�=��-,o���k���?���x-}�_��RG�u�:����W��������
�L|��Y�7{7�;g/�����-���)�h�Q�B��&��Gr6�����<v����I?��+`7iw�<��f[ӶG�o���s���y��E��O߸� J��`�Lb~Q�� +ܞ�_�����,54s�&RZa���;��h
q����o*n�;_5�O%�u_%���.��)*G���Y�'o���T:q�g�4�����?a7a|���k��1x��R��͊t|J��6�0(ZA���XT�}^�����F�俩3��0?�n�<�l.��ʞT�䷜�~'�"�DM�8]��{���6u�B��7����h�j3�x� �L��廣5:к=G��-$Z�F�X��֨�� +�3l��'�v��ݗ��EZU��^kb�˚_�;X��~wU�훕��[���I�u�^|��[��R֘W�R� +�\�0p�i��c>T;�}n��*L��݇���g���ǘ�V7ת�؊R� +�p������U�
�T +�%� ��� ��k�<"�t+ᗳ���ZN_��\�ܬg�^%e�Kw2W�g�3�ϝ�dR�>*�f7�l�0���4����T�ȚʼMn�]]�0W]��x6H�6{�
��3��?Xk���E�N�v��n6�]�r�d5��-92�0�a
��m#*�D=��χOٯ�����{F��� +��� +=�m_��]��SGfŃ�Z�w�v��d���,2�p����ԛ9�|"�6?�k��j�|�;s1u��}��[ߴ�m��Q����n���H��)����lCfvQ���-~\�V~Л���n�V��>��(���[W1��n��gwj��Fz���A�P��50x���b�M�Y�����?S6<�8��⌢Ɂӊz��hǪh߶mH�g�ȃ�F����M�}�����_�v�s |oIϔ��<ϤeR{o%���x�*|�0�v߲��HU��fSNa���Js�O(y�A����[$�
�J�?\"y�rPZY�}��w�l�{�AB����"�B�T�ϋ�,��b�H��[����3c�/eO�:�1^�!������|�J���)}���)�T3�k�D;TѾ������f��(���LnR�uk,�!x&�O����x�N��5�],��uMT�&U8s��ͥ��� k���_�*x�D��`�0��<����F�4�� +� +1�jgu��x�uﲛ
��X��PU�!mc)2�^V�_���/F{�i })�V�Ejk� �=���hD�������}HW� x$�,���N4sI\b�vc%<$u ��827�̳*����n|�ڇ�$�R&Tʋ7�§ N�����&�k>Og�Rܳ.61J�<3q��"�%f�0O虵�8�n�q�
��_UM�J7�RT�n|�a���l�3���Ԥ�o����w��Sg�æ�|�A���&�����DL���^ +�b,:4LMeڶtڳA�sGu
ϲ�,=�%�i0��~�����?��֊��fJt�Q@e�����RN�s���}�\�J4��ѳ�k���o�k�f��ģ�|��o�_�Q�z(����(������}��^�� ��y���m���������G1Lg��q.�3z�j���1t�Q�gt�Qg�.�M6�f��ϖI�*�-lG�.7&�)��T��o=R�x���5Y�ީ�ƈ133`n1}��p�E����EI:db��0�j/�Ң3 dw����n
�j�2�>�vK^ +i#�.�q>c@MW���f���a�1�KF�蒒�z͘���DN������_̿��>��8C�|���YEx~����+}Vw̴����}�=��+5�����1k��}�D[p�QZ�VOX�?�CZ4��)8f3����p���م�j�4�^�?�����؈���3���� ++D�/��\�:�ӌ:j=��8=\t���� ��`,�� ��:M��y���TAr�N*�K�R�}������:
��w�EϜ�V=6{Yz�J�׆g����(y�6���J�j�2�j�wo%� +�7���Êכ؆N�;��1��],89EC�-��n
��S���,�'<�lY�-;-�0
��<����S�Bq����L�����Ld�S�̕"����B�eLJs�A��d�K�\&��f*��^aB�.������*��>�2�zHAj��Q��yM�2��:"�nW��N���κ߽Ե��Dx�V�N� ��U{K��0��[�O�(w��'\���� +�Z�R�!̹?�4�<0��K�s�HK�Q<�(��ȟ��`[��rŗ_�:xn��1�O{f-'N8�!ι���q<���`�L�Z>�#��Wqe����}ԭ}���ѭ��۾�eD=��s���k���j�pY���^��)�{�!o����OZ�O��Cy�_.LP'R���L���2���R���~R�N�[�U�"�j����7����mK֣]6����#]#�_�6���L�gD!-��3F���V�Sa� �xFf-¬?��P ����8���7*Lb�~2�Yfvg��Q�K�MF�;b�]�3}1�9fb�n� +�9uRQv�����#�?j_��02�z�C�s�l�;u� ���n���Y�A��ߴ���V}K�'�n3I��)�����c�Y=��a�.'�L��2r��mh�O�Ю��������0^r�� +i�;-qD�^�]�9t0��/�!�8=L����?�}y�,��Hq����+Q���qM��ۃ�D�G-2��Z�&J��̋�/�L�ɳ���ᛐ�\A��D��
d�u�G�B���Aj�^"�Lj��6&R�h��/�y|�9EuD�of=�8�9�tD�?�q3�f�#`��$�8�����Ҟ�+��Z�/���q�O�9�I����������Fe��:��P6���ŦIr�X��F�G#idi�4�-c�q�1�w�� !�Jr����J!���ޔ۾�~�����㾵֩3#Yg�ʌ8֜���}�Z{�U�^{�-�:֞�O�: cG�6�rE�ӟ�ty�w+��Jų� ����۶ț�56���t�'�[x���5<�K>����Nó�x~-��n��������M_�3���w����w�U���ج�=���0Xâ�I��Qk�HqZv���T�9t�m��_u����S�fͼ�e}�B_��k�ؐ +�;���}�������19���+1�F`��ɡ���dh��SL���\����^Z���KrŮo�+O��=���l��T�^��Y�E�N�X�X��c�*��'�9i�����i�m����=�6ۄ���2����������������������g7���}�^���1NA��1�� +<�Ű�����#_.��dž��_6��ǰ�T��w�FÓ�������W�k^�c�s����u����� l�y��P��?�����1�?Ǝ��`��t���spm��Пn<�s�ޓn�;hNY��HY8����}�/�ؔ�{_ +�<7�|�d��/u�I�����[;�Ü��>���z0&Pt��k�;��al��I1���c�R,m��=��C�_�qF�����R{?�y��[�~�����3��|���^����;�����M|���O��������w>�"�
�~�<��B���Y�����|���Ϟ(�Q�����ӂ�R:�y_̿��
[�a�g�.:� +s�6�a|�����(c��#wn;�r=���S�*a><�uM��Ţ�+��0.L�e�7��1�/��V�s���f�''c�b,:�YL�]y��Ӄ��_\r����G�
�xhrp�c��ׁ}�����K>;ػ�H���wn,�Ƽ��7���:'��vN�����������#�~�%���A�sv�B��b���bn&�1Z����|��k"o}������˟��F��ѸvB1�xijh�~�z +<�.��g07H +�a�:�#�gBKw�s[,1u�Ц��@9�v����x���c�{<�x��SC��m=;��&W�>�aѲI�l�a�dʱ� �X�ڣc ��r������?#rזs0.#�yP1wd�KWc�:�a�Z��g/�Xw���bF-�>�b���C���P.X̧���<�]�7�H��紆ۓ��oOiy1�2�ʆ�?TB˞�\�x[xc01!Ծ�D�!�ջ�,�rF]s���u0��m��1��l�?x1��Q�E�-wN��E`��Y��|̉���:V���du�%AG��ж�`�����V��/�8Ea�����o��<{%��7a���3��<�Ï��R̻��U�9;1w_��OZ~��������Mr<�ц�?P�G~�EK��L�9=��1�k��8�;�.{�������������'�E���u���ה�W+e�oZPV߶|����y`�V�R�4��$�߮k�O����b��@kf�/�hb��gR�����^�y �m +<�������F��:�]��K/�����_6����o{������;��l�����3�j���0�,���p��V�0w^}�E�Sz@h���kN�ܜ�D�x��I�*a|aL�Z_�,ز��H7����u�\Z��B�G�����^Aq�A��tM�xU�9=��� +�˅9�B�� �.��gjd���b|C-���b������1�F`��3B�~[������k���`F_�,���GwD_�](�� +�a�M�Zb�T��\���`ǦS�z'a����G(�&�1��u� �;�N�\Bx�=�N����w�7���e;��X��G��|3���>QNW�������| #0�V���3��9�r��wql�+S)��s����ȡ�Ğ��.���9�G��Ḍ�?�3Gy|�Jh��*���r����7���tzd2�i�������`� ߾/��}G/��y�BlۼYs`>�ʂK6��c�ɷE;'���N��&ͫ
��S]&_%��R��J���2�.�:.�l����_�2�t�Y'c�R�e[Ύݽs�����kF�0��g��T�_�e� +��c1o����}��A�~��x���������9�z�t�����@����?V7�����ܹ
e��R[�����=8�NQ'������o���|���˛bD�W��Z~�?�;�b�??����{߭�<���8���I,����о�o¸_���K�֓�)����04��yal���0@��_��{�Sc�\8���ͧ7����<盞�<���k1�`���n
��|����PI��6�xe(��В5��a��C`\���w*O}v}d�2Ɗ�<j�g�����B��y.�<~�{��5.$}��x�O���ȁ?�m<������ ��͍�1ڷ}r�ރ�b,C�����8���Ťsl��5��ޗ"��<+r�O�6����ÿ��>��|��s�]��Ƶ;.��|�x�*���j�2�d��7={ȺiO�s��3��BG�1?|�op��I1tp��KI�w����)�>\��%
���X�����m���+N�
�'T�0����7���B�� ��c��~3��%�][W*$:&a����ɔ�w�ٔ��9�"v�Ú��?S"k� +��i]��\Xzo9��e�=s�w(��T��q�!|�3�����7�pY�C4��u���q&���ke��OTC��"+�]H�����a�og�͋9�p]���6��|��O�`����/�BO��F�}Y��$�뇹f��}S��Oo�8��&B����+�{���q����y��ƸMwm�f��g�{\s�=�&<�ae��Gu�G>F��vv`�/U����Fƺox� +�{��[Ӣ��2?r��u�g�k����nozm +�o>zŷ{��ڦ7��}�����?��>F��3�]�����m`b����� 1���9���Hb�w��Ekn�Q�c̭�����4m|��p�gE���]�����On����Ο ���b!�|�x�=���9��z�,��������[�k��j���ȝ�zT ����p���Mķq��K���&�@mZ���e-�� +�[���-��M���D|fa�����21r��ɸ����7��00﴿
����8?��[�`� +��=NC��y
e�o��ˀ�<?�����˗�J���'��[&ҷ�r������?TF����rga��T��>3w�r=wV��M�;�eot���Xf�l;��ƽ�ƕ��{���7��9���[�=���(���Ϡ| �0/
Ų�|��|�y����+Q�������g������w%�Oka�C��~�~��ƒG��ؖo_�yIc�~�0�����e� ���o�c�)`�]~���Q�-���rg)w�'7F����ѣ_܆>�hP.��u��W�X�h�$r�IF�,\_�_�Sb�_������$���� ?�ҵ�G~ 4ny�:�]�Z}����u��u�<�����?(o̦�<�,ʎ(����&�x�k���<|>��(�oI���0�}x���оOo��5�s�\��v +ܿ������H�Ц��В�'�B��
�mQv���1�Wl�<N���� �ֻNh��|:ڷ�+>s� O?�ڵ�C�.�8ȸW��燻7����ߘ>���2�}~@��.�r�q��KHF�\�<��� v���z�����������2�\�]o3���q�c�Q~�5{.F�Ӽi�ضoO����9pp}S�)��l-�P�Sw�#`�7�(' +��]���w���q|�����u���}��<����"�`�x̋�y~B;ߚNcsˬ"YtU�_ߌ�3|�_o���ءO�Ǐ�6��y�j`�����z��K#=���=}�`��Sp_*������K�;��ς
�|y3�� +=��4<������5/�X�AZs��4ʝ��Bp=���N�/�κW˝y�bh�O��� +2�q��I���9[P>�=!���|��ƃ�Q���G��v�#��xW������tV��0�ߖ�S��>�������n<
u=�浘��|`���ַ��+�<?��1)�����F쥏�����?���$��6�[�}]d�/n�<��ԓj��e���LJ��O�5�؝���yPcK�Ni\�urx�������r�ܵ�\�`�V�z��`c�0�uc�G����Q��U�4��}��B�/�v�Řs#���� �3�?zE�+�_�W��s�i��QK�m�^������P�r��Q�nz������k"э�.ǜ�(�C��0���Q�럸sV�9��/h�6ʁ����7(3�
ꡑ� ��FC}��ؠ^��'�'��� +�z�c=v�Wh���ق��z��W�w�Q��cƘ��#�Yh�j��iX���އ� +��ބ����#�>���7ܽ�<�\yr��{Rt��o�_O�?-l|���賿�
��p&���5�;�&����O����}�_M9�1�-�|��n{u�"��{�B́z�{|��?T�w�L��]�o����
��Lz��k�ϣ.��p�)w?vA�{=�'�=��Ǣ����#}0�:��h�D�_A9U@��۴}X���A�7�$#`އ��<5�9�-<��a�O���:ۍ�g�羸s +���?�D�J{���qh��������$����p�S��g���Yˉ����0� +�{c��;�_p�<�i�e��Ǽ��s�|���Fxi���$�����SN,�Ѩ#a�7�:����D7�����6�1-���7�'"Ա��h汄�����('���>}���~y�"�<��A�ksí|�<��iy5�/� �|y;^�@}��Vc����\6 +����s�唋g��30w�!{mU��a���?�x������.�y�P�>�zE��畱�?�a�ܫ�\_K��M�'�ֈ>@[^��z-�7�{�O�w��G74���x����,فc昖�xυ����;���5y�%�G���3ҝ"��\�o����s��� +u� Z�0șG��3��V[�����i���ﰡ}��~�]�郭w�P�c�1Ȳ
�x�{~&c��_s7���{/�9�x�x���}���������E
�V���1C}'G�{f +�C�{��<r�Ў{N��=�M�U�\ڠ���=<��kqL��u�!�|SѮ��z6�]����C���^D�|`3���F�_�v~}�m>��h����tG= �[�0fÝ+N���9��f���.A_�H�Sb(�w�-������D�����W���+l�G�?q.��ȿQ����[�&�#����� �&���|��S�+v��9�)�0�+��C9�c��`�[\��k�9���x�wY��k&���?��Ə0�)�8�s��bq��Xt�n=�3�OP/�16���u���H�����a�P�?��<�N�|�Y�W +:�g�>�x�.��m���t����0�+�}��['�����pn�?<��k�x�KW��+�M���/��t�-�Ƶ{/!���� +� 8���9��-�]x�k�ޚZ�k2�s���<��8�(�֢�I�'���?���?/���?�<����E�N��!��A�M�<= ��|�܃�ͧS�i^g�����~�q?������~�q?������~�q?������~�q?������~�q?�����gʔٝm��xy��)���f����d��˧4O����J�f���xw�g�Bj��fyfx������L��<�3�3�r�4C�u��:x��r�gz}"��L�*��Ϟ���d' +��mW@�Q��۳�.���w�Dj^���Nvf���**4pU��P����O���9��v�y 4E�.L�%�2��� +�4��Qǰ�+�Z�;�1�{��� Л�w�^ޕ�Lt:�-���cY(���ΞL|HZK�Rs
>N���1UV���)�J�[�l!�2�v�"u�dg�����Y�L��[����ӎ�����>���C��C��{����vJ��ǚ��q�ū�-q�і�Cs,���8dGD(jD�;;"l�s�◙��dfqG"�|c��d�����I�.���tE��(�[�Jr�x�,Ht/J %KO%*t���.�v��Gã����QI8U�ө��Db��m���:��?���"_.`V�[���d*�|���L��m�u���-���1"%��u�;ޖ�u����NENww-N�ҋ���1[�/ws~V�ȹ۸�i#���i.OC�u�8�vڤ��X'���9�R[L/U���#���r��p,@��"8F1Z�[�&�"��%�se��$S)Gm��&� +;U2V�I�O��whiq�7.+�>)�E�J�;(Ջ㝝��/�J��Ȗ_pԑ�w��5T$���8����J�[��̂xW��$�c��ɻd�.�v+]97:��G}�vġ*�[�%�������sq\�B�q���&^�o8�D���Z���Tq>�|�8?3[��^���2��w�E�� w���)U�c��;��ܧ����A�:�f��?ڳ������"�|�Y{z�=R��}�q���w�d�����Jg"��pCk<պ ��A�V�xwr2i�Gz�Lw:�Ј���v��gdg�"��[w��{�赵%3ɥ g���B��ۓ�T!>ש1�L�Ɏ���Q)��w�xq�iu�f���s�%��$���ی�c��73��+�WǙ�q�8S��-v��:��|r�����L��gZǍ��8bb���8�����:ΰ��L�j���q� +��E>UƵ��Wj|`���J��� +�\�ڟ#%�t���
�4.�_;_���q��#�&����o%���U����mv7 +b�E��Z�]��Zk{����
K�/8^`[2���?���=���9O[2,���Av��E�� }gG�--��%g�;�Yܑ�8�JI�Eꔒ$�A�S����ǐ��=�8�v�����s�υ�,�%4w���v������&Y�;�3� �Q*{��7K�����9����<�����{���sv��-���s�-�ξ���g�)�ݦ�d{{oO�:� �w��Wn��v�L����º/�Ш#חH��˜b�J.Z���+Z1x�cs��:�� /�y<�E�5_��ąL��_�s�����72o��D�s&����dg[rQz��d:����N��Lw�;�$s�r�r��:w�.�.��).9�tI�ঠ�[��W�Lj�W$;z3�dY�O��1[���$ۿ�1�����+5��^z����������d��t%ZA���#�;�t"�^�J^K������P,^ +E��9"nx�"sa-���z9��ߡ9�e�T2SO����b>�P�"ԍpUl"t�D��]�ѱ��J�R��nd�q٪�nu�Z
�cۆqժr^�oq�-���;��z�}����,s���Pڇ��ms����!��AX���E>W������{�݉���u�q�Z��ke#�sDZ�P,�3:����/�W�F+0S���eɶ����G�w���D!>Y�㣎�ej�!����=ʨV����\=��L�[,}���[ +���Q��Oi/(�e��9"��G Xȥ���w��������.���֙xNO�Y]�;؝i_&�id�n���
�Tg��ʌ��c7��ގ��L|i�ً�����q���xObNw���Dg�s"�Ԩ#�������gh�"h�i��j-l�ҡ*0L�u��O���`�~� +&5^�/��D��q��Lڹ�N�*n4%7�Ҁȹє�{��hJ#������қ��d��80%p�� +v�X��`2n����m��q��±��F�(.���#l�F���X����X
�ë�x!��ӆ-^�h{�S��o���iO��TA(�hI�[���h�tW�5��Q�qO�/�|�Tz���R�Ss��JoJ}�8:��阤ӥ�����]5�HX��!��Fd_k� +��t'�wn6�u{��v��[�u_v�QGn��N_�p�~�p�Bm(�u$M?\�l<��v�� .��8�V"7���J����3���dGo[�������45F�֬$�ښB6�G(Z�,�?��"��t?W{(u�a<��!d���-��f/�Jw& +�E���e��`�+���=����iO��4bʓO�ʥ�=�^֥�SP�j�jK��W8��O�5������r��sζd,�sD�5�#"���d�'툰c�H�+�E/;�����D�3JI��Kg�T2SOf��"��7��]�:G��ņH���!�5�K1Z��q%������T�&�,b�h�YH�t�ȵ������4~S���8��5Ґ6��[�s��tu�R���z����L�Ӯ�+�L�x|�eG�r��8G�Ӭ��\(�3��`��
:j���H,F�1%ո%�u87W�!E*���S�b��%�QƩ�ks��T�q���;f|z��;��} +�
�8&s {3�{�}ȱ^��JP�w��c��6�J[�\<Ԟ螓�.�U�b�g��x�'oI%��jf��>�������9������T����í$���n���Jt�U��� +�Cxػ�;����<�E��!�*pM�b�d(�i)h�� ,��]9�� �ƫL���k��$C����1�mJ +�)��X�yvg��� +A"B��;� + +YT��������vQ������%�*�Z���_��F&R�x*�_h^$�{���r�+�2����H ++����"��p�(H��9)yY���gy� +,�E�dAd
endstream
endobj
29 0 obj
<</Length 65536>>stream
+T��U���喻S�nn��; +'q�JVD����p��)�� ���멀j��*^�xl�I� +���k%h��UYI��)W�<V��/bT��^� +���ͭ� +�A�Q=*�<#JT��q*�A<:���Ud�ó^^Vw�"I +����aM�ZUxA���F2!Y8�Z7��`E�<x��׀>0:YU"��C�0%Yd��h-�v1/Z h���&{U��� +�r��}�L�D�@<g�1�@#M�Al�wPR�^��� � +iêH]�����(�N�"���� +;��<D��fH,M�C`jڌ +[���06���A��ܦ4�7�<7�y(,nJs'��S+;ӝ�����D�CUy�$+C��L"�NS�@ã���0z$EE^h@��U�'^ +dթ�RI-�-XIs��m�}Z�\~0gw�z5�\�N��������6ͬ���[s�j�Ӑ�L�~����L&�ٜ^ +Vb�6�5�@�Y���p��&Ƴ�8 ð({q�)t��y��~��$�((��F�7���q�k� +�F�"�ʳ���w��N��'A���Q^�P��k�jʍת������Z����,��/�w�<0kID!��Õ�FGS��el��ᐻS +#�1e���*r��, + +�G���� +��l&��!��3*�Wh5WkԔW��l�w����Y�oK&`��ӨS+T�`�v ��T-*G�D� +�B��ʲ��x@m��$+�P��u,�q�i�f],�$)�u,�Q��y/���jU䪆9 ǔ��������� +}�e��)�M�jk��S*Un�i���'�1o�#�>lH�4�9�c_Qe9��
�zJ�e��_�Y�x��_�ne$�mx9c���6Ҭ��y���ױ8<XF�?���QŮj��������$�6�y����"_�H0��Q�Ύ�t��N�%3��xw��^,ˮڡ���W��TZx�4�5 +��<���܀��ߒ�Lfe�
E ��˵o��o�"Z5�a՞�f�A��Q���:V�r�$<�A�20/�t��ͪ�0��&Z������V�B��T�m˻����i����$��d���6���F����rzm�嶗�d�� +��>4�&8XMp��)�_E"8���I]T���6E��(F@p���E!��Ʊ��
N�&-�(d�K�<��ʪ������x��U9�������S5��HNeC"�#����`���".��fPqя����m��i��]\�۠�Da�IN�C҂#��y4^��-Ia�����?1[7�65�T����6� +Qn�SIA�DG�nH��9�i_c/)r�ЀօmQt�qe��l� +��s,#^�� +Ί�飡yM�t�M0�C�J��7�j�P?-zt�Ƣk|q�?����V-n�g�dc�־]�o�0�eǻ��U�9���r�e��N#{k����S��x +������J��W����.U��ÄC�0�`[(8�ce�n��x�f�k�x�X���鮶��c:Z[YΘ��Y��� Dt��0QG�Ƅ + +��I"�f{�Cw0l���m�+��0mx�U�_�j.'��\�p"�0��65�m�k��]~2 +��s9���˲�X���r���$�lapV�*���X��0h?�s�~����cg�N%B~�#G^�"k~� +���!�9�TDZM�~�cؽ���ey�[�B]�N��F>���tTc���YԘ�Y�������� �v0@( �J�^���C�bZ +�)���xRAD�gN�e���z'��`#Y��TA�Y@S@�,kkm�EEx0H ����?�b=�Q����z`B��{�Е��5�si�;�h�Y +��8Lqu��XG�y�H@ +����F(��c͋�cp·�hB +��j��j�<cx���W�9/��V�
@
Ъ�a����We�x��6���Bd�.� �b��H���б +���� Ԅ�~h�Y���q���$�*ґ
�*�����^���
lP�%����$Ŏ��e���r;�h�3[���Q���(� �.6Zj�a����^�`�p�(J� +��VR��2c�w� � ��g�f�&����g6�F?����^�`�/�RD?��N?;L�^���� +�������,�q�V�
U�ȴXj�n��` �0BӬܤ��;�1�j�2B�1�6��
`r�\j!
9qt�A�#*�h#k��5�,�_6��u|>��y�������L�e�E�r� +V,��-��gbc�,|����:���J٤��=j����������`��0��p�WT��� +��(�X�� &�z��{�B�+\�������3N�e, + +�E"C'2��:�Y�~o�Ȅ�$�A�em�N_㭶���̢��v����Q�u��(���9����q0l��JX�4bHQ���|A�s�_��е_uXߪ2������X���q�~��g�
���ǡ~��f+z�y�jz� Omw�1 +��m�!n�Pɼ������+w���C�@�v�����h[+P����a{���n�d�o�Ry�,�6K�;���~Ɂ�����`:�M*��
�u�C��m�t(�1�Qo`J��I�
t�M�I��7j(��j�d�fM��v
fy�۰AT߲�j����l���t�����s�C���by[:�@��:�M���Z��
�l��-������d��o��wR��O6���Ⓑ���·���1��m�l��!(��5D��7��X��P6��a��ED��7���ֱdZ��
X���M���l�p![H6��Z�:�F��`kUȦ�l%�C�c6��,`�ɦ�fv(M6�6��C�l���,�eéj9�u�;��(���E�·�,u6��Cؒ�)�YdʶT?�r��f3�!lX��,�e�ʦ�fQv(W6�6�a�z
���)[���M���uH[[6}�N�!moY*����oq��ip��N��7�,��N��7�,
�N��7�,��N��7���3��j�d�[d��j'd��d�Jj'd�[e��j�c��e��\A�ӱ��4K9����4K���
5K+�S��M�|�LɁ������r�����Ӿ%ݑ8Kd��"I�^�j��J�9`�<�R^�H���� <�Ad��A����(�!��WeY;���9���y��4/d���_��Nr�)q����Fc�QmxV� +(=�c�-u�9����Bx���d%'��=����L6T�Ɯ�3'��
���K���X�4m�'?��H�V5��3�%��(��\V< =ͺlM<1Z�ɬQXA��l���F��eT�������3VAm�k����^[s�!�U����~K�\{�|~��~F�>�Ca�U{������<��dU{��-]��Jef˚.�F�q쪆;��1]�'�S�� �Ek��M�W���$���{h����ӯ©�G��OW����k�:f0'h�*��9U/�0_�O{�i��P^U�h#��YU�*�X��D<����/��W��U�:��]�.M#<V�!ď6�h��Y�O�;����[��yYa{��W�2K7��� ��[��^�?]�#��i��,U�b�H��l�v�b�0�ɪC����x]M��hc���vD
U P��TK�~���.)n4n��)5��$`���/u"��I#�R/H�N��m��bS��O(��J�6��tz�U9�g]i�0Wc�ZF#"Շwv��j�!_]�5t)���s��-f��e����Ln�X1�J�`�H�I)��`l��6�V���m,�ʬ_r3J�4jUÍ�`�����4�q�1UY���,�p�Ơ5.m��vƨ3F�1��9�3(������ʒ]�Ҳ�! +�38EA�r�`��0�ױ�Z�hO��kk�4vUÎ�Y���I��e�Z��(�a�9���g&C�e�v���j��� +��`�_a�q��Aw�^r�ũ���e�`[������'��n<kv$z�U8��r��4B8U
;N�0�e٩:G��Q�I��+�~���8O������eY������ +sf�˛�w�J����P����Y� w>�CvU$��O�N�Xx�:0�2Nu��7A.�eDQB����_0by�é^�*dЖ��N���q�H�lAjLn�Ά
��.K�`~"@�*�6��/I��6��粄��QEm�E�dm7��u�hi��R�ێ�ܦ� �<|*�k[;������N��r��^�U;��������`(�;�Q'�-'�hɸ��1�o
D-���5��m#�;l���U]no����Q�E��3��x:���a�CjL'k;�5�Ŵӿ�c��Bݨ����n��ۺc +�"���� +���M, +�'[]F7^�@�xȽ��X�sj��Z=L{p�GPp�MY�� +_�;o�>_>#�en1� +�0Gi�^�=$��).�<%�"y\(�I���*KNA���u �d=���>f%�xQk� ��A;WD�`���c +�t�<�T��H�#�t��S7 �Vs�bYQ�O`S1x�Q1;K��t�ù�k9�U�Q�-��q�u2/�����w���� +dl�O9�gp�T%Rы�/ܤ�AKe��doL��H�@3��7Ve@ +#�'�*���j�@�)��a�)�(�>i�����TA3NE��s�g�t�*:�a^��f�'(ZN� +HҘ*24�ꑼN����c�x�t�1��8�1<GF~E��TC�r�U�~��NdKQg\���M��x�1%�m=��j���@�/�0�����%����p����j;C��x!��N�,��0�6�5�(��H;>8aL +2-�@�
��2�N��Q���/��8�Z�H�
B;�bqK +*�I[ASEܚ�W�Q
x�@����VD�{P0'\�4`�ڀC?>��>� +F�`i$�$4�x�}��{M*i}����f� +�[�ƽ�$���d�n#�ĵh��� +��qk�m��6 +�
�nw�p��@U�d"�Y2.�� 2�,�b\�b�!�R���[��s�XW�i+~�`G_�iy:)�g�B�]�v1m���V!�-��:S{Ԩ�HZU�-LO�s�@*b�U4��Ur���ә��;[c�g����~K�jF�t�5�Bcߦxs��f
�m!:�B8��j�q +ڿ0����[5Z�U���I�F9��6�xՏO��CCHAe���%UB��S0'��YPǪx�T��+ .��a%��E��a��i`��~��jf�7�·X%ڵw���0Ju�ԊwJ^����p8�%F +}�f�J55vCby��;onO����k���s=��0YN�D�:�'A��k]��t�1��v8+�in�ʬ'Tٿ���X�g�#�� jZ�uS��T�w�7�u�/�z% +*��e�2:� ��d���7�]��~���Xt� +(0'��|C��uq��TE�b�4��N��YE�ǻ[���S��lM�����)�"�@<su\w.�M���O�5 ��@\_"�1}�ǫ�toV_
s��iͰ�jo;�b�tT�<���B��y*�5WuìJ%���dL��j<)5c�4bui��%���A�*���chi�t��L�餕M�螶�d�+�PC�nt�h� +�U,��� lU*��6L��N�<-<��"R>}��Dk/��~��yL��؋�?~�6���&�tvY��ޓ�L���^`^*�K�c����c�&�0őN��Y�zj������ ���df({jmo�,A��ĬdOW*ާ�NA�n�
��5�Sk�#fTjsf��װޱ��(ī����J��6`D��N�'�bţr�+Z\��W�h8���+��N�H&y$%S�R�=����Dw�pI��JMIp̾`�,:���-��g�a�o������]I闱(ŭ�g#�D/3��2/q"�uxNd�J,:;�A#]PV5%G��ZL�D�=;���9��SQ�N\�u����% +�FLLu����JJ�(~��qL�����*՛�,L��3��ĸ��Ȋ,'rxJ��2'�<+`MV��g�l�u�H�9��,�|=%1�ϓ��lk,�'2���"f�P;��)�Y�xPv��䘮H �e�ו&!�X�֖�PS�����A�����5�Ɏ'zJ�A��&p*�.EL��dI6܍y;�x��]���l�@�à��|�"1*z�#q�z�C�T<栣�Q��H>���L3\�Z��~�d�P�yOY��Q�00yeEa�)��ωfp��lM_xLj
����w^y�XI� Β���,q��"O�����Gxm��������N^I���|&g�Hd�3�MM�3{�x���n ���g���̵����U]]]���Q��Y +��#�>,�C�B�X$t��bz.%<��\���Z��B&��[� +�{����)�-�ޮ7��io���U�)\�a��oK�p��`�E��D�3K������c�����ܮMo��x�����s���_?��b+�a7�5���a+�t��K�s-��OGu��xD��w��p�b�o3���@�&G��vt�mw�+��j�\d��N������)5��$ϨAgӠ�H�_������-t/!�M�D���#j@����H*H�|l
E������>��'ڡ8(����aH��2�;@��1?����Y��z@���������'�����f�����vx=j�Z)���_l�j38�g`j�/�k�ؿ�Dkc��,N��;��d<�����6���@rS ��
��Y
��>��Y�-F�������1Y_�'J��0����~S\��ڞ��#��o/M`PmG��'8Y��m}4�0!ht7/��8t�~�����7�z�>lG�V����h�$�J���l(?d��s��Bn;���~��MC�A��������1���H)n��H6�~�����@�K#��G����)�A�&}��L�nϔ?��*���)e����+�գ�� +�$�>�q��O{QZ-�G��
$� �9ހ$�Z? ��� :�1���*�\P"�p�'�S�VI�o�bE-rQ* +0�B/�<�V�$E����c!L���(���F�� �`��ѵ�l� +LL���+A�i?�10!E3�U���N +���
�Ez�{/A��a�^X�?ꉢp�G�!��Ax�A��" H�@rAP���y��D������$����� ^�d!xI���q|$���*.UY�����W�P)�^���A�c�?>T���x}~��� +Q�� +�"�Pa]�hJ�'�G��'�`!���n���F p2�x�dG`��s���kL�֥�BD�����|$�^�� +�� ���!Ų>^�䌁KPd�dRay
� +nǷ���/X�i�eNz}X�3'�Ë�5Ff8� +!}.6 +.k_�V��B���X�h%NX1ȋ���5ʢ +k +�bO�/�%&���,�, +'�']>0hO�.X^��A��\{)I�첸��ע~��Jh�}�D=.Hc ��CN;��kЕ�0�`��w/:��H�c���Ф��t�����{�H�"rJHy0TVؚ
PG��* +ݠ��cGO�X�HL��G��HKZ���Cl|�[lܞ,/�&A��`�]c4�w���h�e� ڏ����b� +��p��8 t�X.�^��b� +g�͂, v +�QS�dr/F����_ p���%��������Y�!���G��oS��z{�ۮ����2 V����>�""(�����e�)rC��i�D���^���K��((F��e9���f.\J��q��.#6ș���������� �h�;0�Q�v��ȸ�g�B��&@ha{�e� +�h�9� +�X��D����SeH�d`�Kd�75Z,R�r
��}����_�h(y4�����*ϋQ2o�M2���b4�����ȵ��z�v��s;.� ��A�6��D�~X���@���X|n�;a�_b��{��-yyt�yc�<�"Q�FL�q�4t}�h��,Xv��w��j����ୋ +h~��~��a.���R�[���� NH�v�@��j��������b�ۉ�D^��a���F�;|��S����?���x�B!�O)�v�� +Mg�5Pgt�G7p�5o7�
�x7[�3���o{G��]1���o�N�!�v"�Q ��uKf�M'<!����^�-��$զ<T۞@�h�Sˣ
�����|V��_m;ڍ��nQ6�mf8����O�����ď�c���f�)p +���8v`�c��;'�� +���0D�@s�!����dL5�w!�
�����a���'�s!��r���W���=�7��r愶׀tg�!x%(����M�ޣxf�2vb��N6�٠�7��i��)���~���,��45T�� +�tj/��N]������o�Eso]�a@�U^:�;q�[䷆���4qjr���N�ыX6�6�1����T���� Jo�?%;�Q�=
P�M{����
��b�7�E=�F��H�D��S�&�Oj���6�̑+y�QO�`s�>��*5@ÒM�,|��5��Ih�^�p�Kbw1.1?�!�/��b���0�U����k#���Җ��X��=�|��}|�[��p��6�Ŏ�ҟLT�f����-�����YQ�y�P�mٛ�v�tV�51}M3��hXۮQ +Fi$fbAS�%��(%�!�9��;��ux� ����/X3` +g���Ց]w� �:����1�u�?�LM�����yd_��6�E�����P.*��}D��A�C:���?������b����6QPr��?�Ba� +���L|v��aj�8W��w�.�V��_C.:(h�<��>n��&��L%��)jZytZ��L���L�� +����m�J)a3iR�m�ъ�OD,�5p&����\���[pE�.�!X���w���g�>�=Wn���Bo��r�^,N��z��?F����r�@�v��~a5^ߞ7WU}*��m��������i=zS��t�{�Q\���/�C���*�A�q��{�Z����x�Ҍ�f��s��������CGm8�)M�.U��ex3A�V��iB�6r�X[��z���r{��#ۖͲ�(�2fx���6����S�)@������@D3�F�$c�Z�v8:5��r� +o{(ˏ�h7��x�#JI���`U��� eȬx��g����� ��q9��ֽ�oNI��W�J"�%�@��d���c|0�Q���C�z�.c�É�A}o �6�d�
�)���ĭ�|\�?.,Nq�ʩ8�����1����OyVa�V�
+%)I]�jw<f^�sqsVJ���w����7嗔v�)xd@ e�4�}䋨�l��&�2���Wi�������V�gJ� +[1Rr���`��&�j��Z�1��qK�v�<g�H����r1S� +��?=B���t��!X+&�u�X̛�T��p�g�F��q�P���u�m�Й}�z<T�l���@�s�f�毿���li��n��t֢���3տ�� +$|0n��f�y�,������d|������?�z�����| +E�5��&����Ze7�!�u��&�
|��QߑD��9�O�(�ڼ1�,�>�Q#}=g��{����I�vM�����u�>�H�4�m���G�Օ��}Yч� ��Դ��_�X���_��gS��_�3��f�MB��� ��|g�&=�Z���3e3I;���e���Kzlɛҥ���I���1a�;ݔJ�*m| -���_�q���lB7]�g*�s%=�e�q�����M�㘛<������Ը��Ύw�#�
?a��R~�ώm�!4;�wxR���e0�$w�뽛�%;��D}xgNf<���|u��<�1����+�������Wg��ҹ�*��7��y��X�'�l$[��ti�J͢��#S)���Ȕ����x���g^,�����(�*�
g|��M���|��ӣ��yg������S;|��|aS v�j�O8�R�0���t$]���taX�ܘ���\�M}������vP ��Z��"@.���n�Hf�q.An]�x��O\n}z�z����JL<��\��y�/��F�tu:�0��ӥ�>��mJ��+��zn�l�7��v������v��x^��b�o�!k]���k��l� +ՍAWr�r�����s�t53]�=�3]�P����G]���=����{t +P^�]�a��h���~���
�6F�x+���^77y�2��ҭ���k����T^�+�z�&Yћ���:}z�;Rw�3}�J/�����I����{�U�^�1K/��o;_�Դ��g�%���VX�˯���:������J��o5��yM,�����]�_�q�@�g���Ұy�oj�@�[i���5̾���6�
��7��N��7{����3D>�cC���lH���|����y�P{}���Q��c�Yo���Ы���Ѥ�4|R���aUOM
;sbb�W��F�351:�����>�~���|}�2�J�1�&-Ƽ7�2Vm����E�mw(g|��j�^��bWJS��cw0n�9�I>DoL&��}��8X^M�}oe�� �)ro���ĸa�M��J)j35w����L����4��Ѧ����i3,ͺa�g�̇f�y�1�}���/��,a�1�st�d�<�W��5??���1�'#��y�n����m1��.�k�y��ZonK�!�jI��>K��Zj��;K{f�X��i�2�;˲\x����;��XTgu��OV:H�����ޚɆ������a�����aqS�.�m�'Kz�%9�<)G�Ɣ�1�]w���;[�=ڞ����c�+�f�&@�}-~�)�尻�/;������}s{�k��랽�u��E��>���������6ysP���#����b�w��v�i���w&�g%�v��u��䴾�N*[�wF\�gf��9�����y�y��oƹ���.��9w�L1�� ����W�UZ������xmW\sw}�:L� �#�Rq�����n +�����|c"�{���6lS��#*�㚡�>�Z��|�E��f ��ZTl�YP�T�C=��9 +L^��*,^[����>ۇ7��x�֘d��4ƽ��I��oW��ϳO9|�c�;���n��F�η�w~�ܾ�یޟK�L�GO���&���igh�=yGȏ<�Mzt��x���� +v̌��G3A�0�,�-=1�5g�۵��
�n�TہH>� �RI_�9��J�Ϡ���ԨT&ͭM�!3�?FFX3d�uB��^2�.ꌦ�ЬMߘ���b��r�p:mم��rx�.Z��юV�?O}�"���^m����G�u�IEc��-zߛ��-c)�)��1g���E����}�^��?W`�c���|�r��w����]uS�������v��=՜'�`��x�j�Ň��&������,�v&���=N|ZzӤ%2�L�diCl��dΐ�l�S�}o��T9�j���Ը�k��O�a�����Ū~kO��G���c�L2`�e_u��̾�d-��]6�����c�_��r��-���\�vPro�A%��m�D��ʧk�y�i����Ť�l�b����Yx|� +��ܶh;P�����(6�ӷ�5���])��m�����������S��S�S�aI�����g�F�Z��,��4gT�3��;���>Ag^��~���2+�p5�%����~e�5�j���C�}��?��Ƈ�@v�������A��VO���y?�z+/��
�����y��F�j�4u�WG3м�4k!k�9ُ���A��|)����m3<o��Q�U��*��9�ٶ%�S;1?��&}{;�e�����S�a
?M�A��ad:��~�� +<�z��shZ�{n:C��e�V~!�;�K�;���ث-:н�L�����&��{s�oLo��P���Q~[7L�ף
ݪ�yܝ1��w��c�`%������a��9���=c��ڻ��ڽ�x��;j�p�V뷆�Zk����}��4h�ȗ��T�
i��s�0 ��e��6� ��}N��p}��
����a<ǽ/�-L�
���H���� +Ok�ek��o�3߫-<{x��V�e�>?�ڠ��xu,?7�Bt4/��V:��w���"�y,:r��?-c�x��\v�lqe�-���|]
<Dt�d��u1�m���XdCUæ�x�ج���+���=�V�u��q�[k�ngr;�i��b'w�:�q�1�i\�,�����9Z�F[t9-#}�<�>yy���q6u"��
���-���#W�g_*�|�Ė} �_Bb�ž���4u�}x�}ʷ��na������$NA�AMO%����P�cLD>�s����6��:N�K��d�㦗ih�M�1͔�=�M��ݾ=�Bj.�֜�v���vt���n�����1�����v�&>�V���o�j������ +�X �:���{����iG-�ޓ��5W]��6���&+]1�sZ-�YϽ3ҏ�m�s���.T~�T��À�f�J�D�|�إ?�'a���n{<�����1��e��ب�ON��x�7j�f�� �v[&����c�YS�y��ӟoI߳˙X�˻D���:b��M������Ҿ1��D�/ٙ� �����k��r���ۅ��y�-ڹ����t�Zs�� +��1=~k3hK�)4NN��)�L +��aN��W<rgi�� +�'�"~B>vz#�� lj��p�&;`�S�W��0��w!&�e1P���_��rz�F��0�Τ��1z,W��É
L���h�`��%1�ߘ�4pP�w��}�a`: �ţ:ŝ� �$p�K�%�>%,��өG��+� ��C�-P��iTgV�$~ +�׳�x[�!X�����.����%�G��*]�7��>��\�B(�;���{���]��z��pB[�����$i'����d�?I���ٶB�R�<���^U���7"�5E�mp�]�Y�좃'��Z{*���,%����?qN4�&�R��s��5ᬾ����X�Y��v�g%�po��<��}�TLb3�L�sW��<�H���k���- +��:Q�|�D=j��y�>�@sW�̗�7 ���Y[��O�:䐝�h�~�.��#�Y����T��*#�Zs�� +/���I��m�s<�,0霉l���K
M���1���/�J�Zv�~����G]���B���,�\?� �d��Ͼ�{���<J�.2�@�T��!sG?�R��֝�7�����:Lr��gr]n o{sc� s���Y��h�+I/����MbנK���Lo�c���U����!4/����&X{�D5�)���
���0�X�[W��dr<��
�����'�<ڛE�~n-M���Nb=�ځbBf9�K���y@���X��J1Hp��4L�������a��yC6�x�dS�I=o���D�3OH7I�?�f�����<l@��P{4�6�w�����pQm�u���'�%�[T���˃~�zwN�A�١0�pǧ9�7��ct�vׇ.\��3��O��gW)n��\��{M.A� �oYx���Ǒ�#���!���vig?��،�G���WrY��/��A�k��,�0i9�3�������-8{�x�[����GΔՕ�[Cw���n �
�֜����S65��� �A�X����>g�Oӹ�i&F�fc������m8k-�ȹ|E2�)=�t��pp���.��n���p���g�J&��f������_�G3>
=<*;�3{�e~W� +� +n��f���N�g˫����.�M�X�Өda:��:1�JCʗr]X�z"&�����i�iZ��g�E��O�wb���J�]����:[:��|;�Ƞ�YF�u��q�Y�h�ȣh��䂉�+�md�hs������\���4R~�����b�!r��<�S��L��X�<�#�>H,z#�+a@�5D��.������h)�'���C1gz�
<�6� ��bc�+_/cG9<^����g[H����θ�d�"��8���Rj��2,r�-��t�ݎGY�w_wh ��3��P��s�,AZ�!E���P�=3C(���F����I/���$��v{����Z��V�|\�£�y c����c_KlE"�|7 ��!�o&<����C/�ޚ���X���i���0f��E`o7�����qh����N/��*�>m +�H�X
m_�`���w�4BZ�^��V��o>ҭǷV��K�Sӗ�yX�x���M�J�i�X��cٞ9�=���<8��5 +c.�L��әX��j����k��g�}�wÅj�N���0�Q�3��8iQ$&0�`�� +1��k�=��Qq9�{/�D�"!�����~��5�I��r��!�&vzJ9�uz��y�Q��c�ߘt��<���?u��}��:�!��9+Oi���P�'ڱb�~]����Q;P����wW��y�o +��Vt�6G9��;�h���ދ���� tnw�1@��K�Tp����B��4�,�D�й�ݳ��k�J(�5n��� +%D@���h}�ߢNt��q��.���W�}4o8�a�{��H���uH�i�\��N����p~z!�A���2o���#^�#F����M��n�X��j��z� +�Z!�*�4@���O����D��� ��<�}Zv��(����8|~*�m�����ہ�9yܱOǖ����G��h��I}�b��bc%���ri�|+��m�{t�O_ӡ�b�?L]�(��s_��e��[T����b�y6֕{Pz�e�)_�I�b����(˽m֙�v٧�D�?�}Z����<�:�h�<��L�~s�=u4vw�Ӕ;"^���GΞ8?��|κ�KC�K��?�z����컟=����$�c�ވ<̔�Uv���l�?n�[V�L�S�O�o'�^=y�|[=e��\�<?G`��^�X\ⵁ<ފ�T+��O�z3�GN��Y�o��ln�@�n�7�3X��� +fu<�ǟ������K-���势�eZ҆�n橪��?����I�k���K�úDԩ�4��a� s#.Z�h��y��X�M�YG2���c[ds�ъ����O�E,�{I���ed�Y4q�c��YYs +�y� B������[qR�;�G�1�AZ��%5��?�3/1>�Nv|7����<�_C�>�����I��� +��>k̟�g��X +����gV��-�~$V�ug��J��Y�ʽ~]OyI��q��q�)O%��Ee���K(zl��������Qc��ka�'� eͬ葦]U+ ,��3�d�p�#WҴ�t�b[nU�x���:����bxpV��F�\���&H"�v�F��b�Q�jn37�b4PZ�$%a�w��{�����|�a3rOi�irnȞђ�8�q�o����ӵ#z�'㠎tg��Τ��t����/�]/�u�)�:Е=��Aq.
��t�?/�&�[�d�fJR� �O(�zD_���$/y��pB���>'�Y,���
2N����+�rJ�_�q9%Ü��U�����b�`3��5�UK7�k�7�h���z�Z�ÜPNK��>+^��wEY]Y�s�h1� +]�\ᓳ���$�Sn���ym�T@<���LP,A��
#)>dHA��1]���@(-ђ{ۛ�ղVP8 +Ɋ"$ˢЂ�q��C�04�B�f��0I�%T��7N^���A���� +~�������)��}]��r�O
)m'�ռ ���[����g!oE�]����%X47�oR�YSVy7��:��a�퉳��t�����s/G�|M?�뽓�/љ`��:%*��`��iZ�)���+;)�|zcR_��
�r_��'cD�\N�&R���З@��%�nn��h��xO�D�����0�J�dzD;z��X����%ڍ�$���%�iU�Z�_�h0kR���\/�.bl??�h�����~v��I�i�sc��J��V��[��6��Y�[��sG��t��_Ɩ/y1��2K�:��3��N�Bg-�UB��$+f��� \�-�K<��(0k��&9 �ޏ6�^���~~��{�q�E;���7�5��%vpg��fu!�ρ��6�_]?��yL���w?����Z�Y��6l_e�+�`Qg?��_��t�Z���!�K-����}������p?��T/'�U���PYb ���cm(Ѕ��}b~��t$$$�8])H�:�a���[�)�ҩa����'�jQ�:�����%���s�(���=�$�"��\�5�s���г�Q�\iH��$�8�Guy�S���PK)�G�_�A1Qɧ�lz�|暌��Q�H�aq�w��m���ݜ�=Z�3�1\*�F�(�\gb�� ��|wk�����,��b�-�7���&�4r����42�t��,毬$=np��n�s��u�V7�s%�]T7����cOn�y
_�]VЉ*��]C�\A�e�/����t�ՂW��)W��RC�\A'��~PC�\A'��A
�r�B��U5t�t�Z�j��q��?���X�� +��g��:� +:l���� �*�j����-�/_ $Jvр�d�7���m�V/����N�M��_����H�KZ����:�_Z���m:��v֊�t�UK1��s�R����:S���6>�S���<>Q��r�h'��z�d*U"WJ(I�̡�\U4�I�dD� �ܞ� +��W����c�� ׇ����d�ǫ:.���n4� 3!�
bN�9�iĘ-v�۶zIj�n����OZf�A����U3*��u&L�"/wl�ԗZ�6���^���U)�����)�W���ڷ�ƪCu��%��}��.Cgj��y`# +�����I��ر�ɚ]�U`<KI\�jvi��;���_Q��W�1�V�i�E0ʦ�e�%:5�!�*є�?�x�YÜ0�)9Z��[��%ff���~�Bt{����L��3u��N1a���S-�>ȳD�ń�_*��q ���z�J.m��E����:-��t�R�^NԅLs�P#Kt�AuI��Cqu�58{'�O�ٛ�5;{r�s�х��(0ϧS5���}k�� u�r4i��*qS2�(��QU��w��J5r7*e��<<��p�����"�ߚ�k 9ogD��?ׅw$\%�RR)���:�Q{Im�
{��uş�=�Y�.�#_f'� �6��*���+!�WFd( �)���J�Ŭ����ӊ�rv�zQ�J�;ܢ�/[���"���0K
,a����ǧR�c��?�������#2ЁU!��2��Dd.��Aeh���\E�Z}�愈�d����<G[q*у�������U��X.��e��q-Ʋ���a���5����d2�y =X~'�CYUrz���}3���_P�|t����jA�����f/3Tq]��|=ź:^�B��z��xHo��lK�T���Y��7���X�.���;�p�o��)��]��w�ᤲ�k�߮��A���pJ��W���?\���$N�-��~=� �������玲q�]�zJ���� v�4�Z~�N��m�J��W�#�k9�Е0'RζԒ�ZkʉT[�����f@ +'H����T�}��h�#�텵�p?�P�u�ɠ��.�Pq�|@�2ߙw��LƳ��~��l�R��"���<�~���G���O�!t�x����]����e�`�#z_�/J2�����n���#C?�R��h�b��� ,s��\������� �Ң�m��*>S>�Iա>U����&���,w��*R{�w
E�+R{�����J�߯T��~�NE*��7*RQ���+RQ/�Q����v��%����D��ԫ��l.n�������PT +'-�~���+f��F)���z)���B�)��W��?(��A����%�pQ�A)�t|L��Q2���~�R��T6WUˉ�B{,�Vq��&z����"�Ȩ3�����a.�vs�W��Ѹ��t:/�r)�w��^�,��{�=G���Q �p^���8�<n����4�h��ӆ�!�
��l3V��={H�l���k��ϙm<����T�=H�������9�#�B�2q�bIU�!/��Qz��;<�j|���� +?����M�Z����yR*vzd��fR���T�Uzr@?��\APq-Vȱ�E���n��i�t3��LoU*v#�"�����K� +;�`���r�n/JUgK� +�u�)�\M�r@G���=<��ܿ�d�k\y��r@�vxVa�r�Ɵ8>il�j�F-}�eM=�l5��:˴�!z��b��B�P�b�Rn��cŎE�GT3���G=CU5����KJ�}1�ԒS��<X��7o���vD�L
�%��䮊½�5�H�TC�3!���S�DN1�O;?�\"';>�{��.�:>��4]��Yj?�?N�zɍ�/"�Mw�z�r��;�tߋ�\[M'�����j:������N*&(^/?������n�|5�T,^:��'�t�pkV���U�Iu�rB�7�龩�����ڧ9��_���������SM'UK�1��j:�X���߫���]���j:)㆟;�;�tR�t2��������A�R�n5��qzc��j:���Ȇ�a5��+�;��UM'g[�n5�v����NԕxO����E����k�~��N������: +2U�rH�P�* +4�.'ܘ�J�b��U�.+�$�H!+a�p����DZL�ݑŝ�#����͕#s�۲�.���5w�s�4��߹�N�v���Z%����Uri+�Ӕ ���|���gs��l��2���t͝jD����q6��Ew?�掭}S��N��Ѧ��\y�I�I�^gQ���M�lr����i�O�]tA�j��2:�<+F�5�i�h�Q�0�O��\_P��H"Cԑ
� 9Y�
[ +�J%\s6t��?�9 +:Ӗѭ�،e߯T>�|+�(�p87���t��T/�̮�o�@��E%�d��z-;�LSa������결����SQg�r�1�1�V�0��.YR6�H�z߫R��rKU�]fP+z�r9ԣ��W*SN'_oI\vU>��
��&�E�y�?^uQ����x���ۋRV����)l??������N8�.W�QC!�U;�6��2li(d����
w��J�;%�+�{o�u7�)U>�`����Wn�S�'�vS�O�N7��|*�p'�K�R���{Ew�]Ý�S�Q���k_��f������:S7sn�:��t�+�W>�?B���r��ι��|Cn^�����z� +��S�G�VT�t�v��.��v�"&��(e��L������7�eLZ��,Ѯ��i1-eL�A��N�]��E��)d�T��趟VeȪeUj)b�DWb���~��UELrD��DM{�a������T~�a(qX�S���7j\Sn�SŐ�r�tW]��I)o�u~�h��}����T��0��U�=�ܔ��f�+o}��04T=�J����j\���2#
�h����|��������NF�ƍ)}�h4��
�r5\ݗ}z�)KL�f��b��'A��]�TPwc�Z�?T%��-�z������)�ɢ2<�.W�G�L��&W��*Ƣ�n��c%r��GY��B�=����vz��:��x@��i;c>�#�U9ڬw/)�7&D`�s�2�����O�R�&�6�|��sV\�� +2� +�����(�Zˣ}��RL�>��(V���tvQ.,er������m���0���{�w�s{}�ܴ��03 +TS���z��4 +z}���I&n����KC�����M�j�OG_��*�R��\��g�ζ�_�i��g��P2��~�nÒ�]����qzJ���oڼ״������9����o�kKF���%�qu�f��o��l��Mq�]<�<M���L�����M�N.�~|s��gn%��3�l� }���{�6���L��M��iŃt�����{�'qv�[)�yÓ8�m8]_����c�f��o���Z�m?��iLޏ/
����o���RIb��z��X������:��~c�����3S���+:�~S˜I�،��M��o�U���~s�����/���4�����ߌ���*w�l9�����-]�,eN}�&���]�&�r6Ӿ~S�w�{�ͺ��ԁN�lJ����X��M].��~��[�=c3�y�d]9��~��+YW�YG���7到t +�/�S��f��H{{�������Z��VO�C��>���q��c;.������l;\*/�T^S��d��A��O��r�;鱲���#������6HM-�AيSm����4���H��-��b+�W�mb9��M��:�D:q�����+�/��}ȡm�bI�K�[-�F��d�a�*yK�"�b_�Dk��堲�a��-�}�ŭ�U�_<�hp�xv{����ikڠ���p`Sh��(���fc��}f~i���4�q��Gk�-�6=q���M�{�4V�n�w䀷�+�I�K��~�ʽ-l�TRܚO�[�L\��(`�+�g�crFV7������_2�/��뗲F�����Ŗ"����e�k�fC%�K�`~(.]8�D屳�kK�7�.`;Jw�`�-��n9s����`}��G�-��Ə�,K��l������߫���eR��qb��)���R��w���0�ˋ�R�P�1�G�,�Q.�+����h���e�DihUM�XƷ}��ln{G!���J�B߱�b����i�Վ"�K�Vm���QB��ZJ������f���_�_������]g����-e?-+X���G늌�RR �));�K�\������ݒu�8_w���0�~��|���`O���q�o�IJ��b��c������P�b����ӻnsY��]^6T�ۻ�̼���K�=v8�X�������Y���,M\����z:���ST�/\J�RYűm+�w����wm��ڲ���H�����J���|������|��e��jJ��nl۩o�pA�9���Y����g?`gl� +�<j9��{�[��Q��s�SK6m?v���:�ݕ�HLg��8�������� c��X�/�_��v����+�wGΘ��\���Ol�7۶�V��۴��@`�\ytY���~�ų��~�U�^+�:��c�MsZ�8oO1:s��7��v>�r��ڪ��Zh��U�͕%Eu���m���ɴ����-0}|d����l!���],)>�+*>���_.�}���$��>��ْ�3{+�����9�V(����'�:�5�q����N)�"��h�M�D�I�ZBœؔB%I�>�Au>�}m�y%M��Z���!K��G�����1]M���ݡ-��n:>fV�))Yy��^��R�l��y�ɧ�ѹ�����٣���M��RC�լ�τ\�~���v6��5�ƶ�\J��̥�ɚ�|�XȔ�,����n]ߠ�5�^_��n�g��oeqBV��hՂ%�� +��-�V��6���]�
�,-������T`֏)$Qs�~'��ִq���WVe��\v=�������h� ��7���BZ�]"ķ���V�`Z*�������uY����>�ɰ�gy��ڋ��>lH��e��"�쨴� +�/-�m���ˌ�w���n�)b��*���;K蚦�����F�o�k��j�\V ��R��B��������,_��C'��^ܶ��qM2���D�h�&�wg�8f{�%���mqU��u[6��=�������651��ڲ���ҍ��L3_��g�]_����,5/�rg�ytg�.Ki�Xwķ��s�Iߵ��ۼoy�z���l{,����評�W�����EdJ�i�[F��)���e�����# ��Q�m���]�o�Ş��>H���V�[VQ|�1��SM���c�+��.�[Giء +;�bW���%2S�/-�Vy2��<p���8a�$W�0W�[�:�c\=�V����� �|��I��}����}I'��~�{���?i\��C�t����-�{�z������V:[VZ��)�Sf�2yj}qE�c�K��,�L\�ڳ�6��5� f!�Z�F?�J����b��B6�����u���lY�M��饄����|��-�r��ڸ�:iv,I8��6,ZSRZ�YS���S���܉�m-gN�i�,]���M�������-'Nԝx������'N4�z�y�7���YYq����'<,�j��զf����<b�����2k�抓k��!q��#'K�n�L?\F]�k�.=�x���cE2}���.-���..��r�m�I=�l�/+N�ln�,���3��Ek�)�ɕ{6��Y^|��cšM��+�w�*/n-9oX,��uLx��-�ċO�V��[����eŁ�ԛ_A�E�XS�]ZP^N�����m�Ƿ��`�w٦�ǩ|y�4��8Ҽ�:%���3W 3�4�=����f�kMxZɓ�Z��أ�6?�V�x��3��~�EX�2��,~�CֿMo12e-!�B~���8����R��L�^�q{ybۍ��e{�ݭK3&��ְ���5��F.��m�\/lnh����R.��j��妇��~�1�ͧ��poMB�6��>�/��=o&>m�0� O��d�����5����l�Ukv�]��'�*���{
5�Pj<M��r��]��E}x�=�¢
,���6.t�v��X�GJJ�քȻ�����衲
k�e�Z=B�z���W�M����e\/�P?����g����Z�A`c�C_n��!��Fr,��Z�,��r��U��c���r����r��K롒R��<��;Rj�;�P4�tgX��+&������%]�{��6x�V�R��=���%UJ!�N\�?ɩ��:dE��Y7��A�����O +��g�]4U�$����Y�����=K�>R���㽤�l��}��܃�f����tζijk.'�|��$0��~V'Nݛ�)+�7�)0l�םm2Nq>�es���oM��n����붷��+�c �y���g~��;�P��ݮ�l�
����h�� �u.�}�C7�:f��0X��qKY|�38��u�3�\�xW��ij!,����z&�-q�t�11����S������⩤K�R���>%����5�H�͖�T67�|��0IW}�i�q���?�1V��(��I�ؔ�8T^2�18�?�1V�T0�Ky5�K� �
��;��.���`�d c,�M(5��o����l��Ky�K�����J��j��W��i�����FY_X7��AU�ԧ�=_�:�в��� �������9���;˦ه�
ť�'rhEkQ�c�M=$��p�Ta��D�r/�؇���q������☴zٜFıe��G#�����������F��жr������Օ��LQ&���}]��{lE���Ɔ��#J͖�U,�[V�'O�k�����[#0|���-��-�r�Cnۉ&��pvYYc��R���-�4��-R��q��z_M�%1�*T�0g�0Ü�U7�g�}�^<��q����0��t�\�Zwt\��윙����'-���%�L���4%�L��Fr��B&M I�hMCRH�d)!��4&�L�B}�iK +�4%�KڒB +'K !ǒ���ISB�E1mI!������L +��Օc0��|��o��&�n;���E����l��f�}��Syİ��N/
��A�f�eJBKtGJ��Xw��\��4+.c��,��&�6�������`�zf��� nd��
+�,_d��ذ�F�uN�P����!�3#ؽ?6@�,�?�8_��r�#��c/�!��ڪ�L��U��.�Wt�� =`B�i�v��b�E^�ڰ��E2�V6V6�z*�2�fֶ�V6n>q�LS͑�O�,*���J��u�ZOi�O�ʕ��J�m��E��w=����E%�M�����M-�g���9�t��i�:�UCmM}�³���A#��z��.�4��&?*�>��RO�����џ� +��T>u�|K�����g.�9z�gˮ]�������7��#�kx��9��mQ�~p仧ɇ*��q�Փ��O�g���q��;�� �9wb��$�<r�������E�'�w�؉��fO��E�=%E�%��W��^��du隒U�OM�v횢�kK^�j�5��+<�V����YS�Y�b5���o����E��=���]�N� +��%2رUi=��\钒�5�5���8 += +.&;kE��fa�$ד�(�ʊ�S � + +B +=�2i�������<M6^# + +j�LjyU]�C�t-"vɣQ�����5�A�Tي�e�uQ�����bo��*���� +19rC._K"� +�F�3��)7���� +�>�?. +J��K��fX&m�^9I��͡��� +|�a| +a� +Z�NJ +uv��.��0�]S1���?�|��TE���{� +훓�V� +��>��5� +cJ�\L��~�ea���"��4�2���� +����,��z�G�$p�V��i�]Ҁ��OA����� +-2��$��f+F-�6G��c +�d̀�� ~`�Б�V��H��2rt1Y�X/�+&0W����*:wE��K +Ri��qD��f�$�q\<�0-�y��:4�շb4�&���GvN�����A��Ẍ�09�tQ�r$5�� +�� +�qHJ`栞;3$R���u���
wH#]��DFRU@}٣Qy+���'�Z���<`rH��q__�+[&�dӬ�L
���B�
�$�]Ԍ�s[��㖢� +���2�0Nc���Qì�����H�5/�\��y���癤���|O�<�*���
yտ������������w�F����\ѷ`ݲ�뿲�÷��W�,ď�f��J��]�|�94&�*~�Nh��>�;�=�'+�e����o��$����O�qYz��g춆��[=�
��4`2"�j�?>!>�5�ʕ'�H�k�z0�$G$w&x�����b9���R��j���YzL�{}�|k�!4&_>�Ue}�$'K�`��AOc�$iA�Y(<&�Ɗ?�C����@R��x�2SvK0�iL��]��!/Y�vey�����ri�G�E��EL��j`���J�KG=o_�x@n8�d�1E%8{�r壚��'�wgqQ���W��x��I�A��KU��A�0���U�o����]��E�'ouKГ���Gΰ&�����#�S�f�X�+�� +'#O��`��V/��`�탞gC09��rZ�v嘘T��d�I��'�L!8�:���x�I'A�������L?��
�|F"C��Ip����v�_<�(�� +��4=�ؚ����Z��Q +��.��r��������
����eT�g@3��OI��'�@��4+�t��JA���rf�/6���Z�}����{=w��wP�˛�Г`J4˕�Y|�L��3Y�n�ci� +ϳ&��}V�� \�n�� +%8����Iߕ�4�� �Qn��A+�+ ��`7t1Y��*.ުA�͖��8�y���� ��1�`��3�DL��j���h8�&�ӣ�zvk�8��I���!C��h��'A0A^/����!1�Y����
Rb�W���9����I+Y�E�����=q�X8�}2��q��S��j}��s�WBF�)9�uK���IRO�ol��xn��e�{L!8|M�)>��m� ��$���3^�'�&� �jn����)&��$]�&8$�f{��XL�����Z4X�$�Xƾ�]�� ���8�h����+����dߌ#��twW��(c���� ���s>��so@|�&����&*�V5�-����J���FoDqP��8�z�cH�
rG�"��#yp|� �"���$�B(�G�\����>��V���=)�B-�����8�݀������� 8i9�J���W"�ϡ¹�I��hz�Y��fT�N�������Iɶ�0���YQ��L7Һ�.s�a�(�L&�M�+ܟk�ܿ,���p��EUs�\�!�?��_=��v;3`21�JA�0� +��=v�` +�����na�(�4�-|�U5c +��u�_>�#�3w�L6x�� +��^M���(��ΆV��-�X'w�> �v�Ĝ?�-��P��Q�BOf�5e���!\b���Tf6]O2!��n'�u�B�~�0��dGP���^�(��=�wg:i��꿡�_;��qрI�犬 ?K4�B�r=a����;����Ѱ�"P�<�6a�����&$�3x�_�]/�S�L��)��1o,�*L�=Wd�OSUtg7*9�>��]����&k¸��ܿ,!1�!|�2-v�&p"y�͈&��S�'�y��D���&����փ�n n6X��j�a�E�����(G�����$W�DL~�U�P������!���I�ev����9.�������aPCF���PBOfy��aU��9ߕ�BG攙Oe,rR�d1�2�3M�1@FE7�� �P$������/��z�<�%~�z2��&�뗏{����<f�CL:�NTDqi!�ı{p��saN��^�\'[2�1@Ӈm�Q�u&&G5������v�.LΖD60�&���L���'ú��#��;*]�s���(G��|!�@�}s3*�g�����\9���0����Z�#qd�8�:��a�
�A�I��DQ:����kГ6�I09���r^|f+ʕω\0�JAB=q��d�Ӈ� hy9��j����^o���U�uEzpU�ۋJ;�$���)�����В{��9Z�U +��t0�q�'�Vî^'A�&�Ĝ +�G<���w���]>`U͇�U�$�0������.� &�:qzR�Г����$�M������כٲl?�|���Ұ�ʅU��DL��I�#{X�$�o�1e�nz��`��l�^Ü&t������z���_G$R�6GcГ(&٩&�_���#`2�S/CTD���
:
Q=�"�
�&��+ݟ:�y�2
����=���=~���7Tʯ���ո:��J'{�M�� +�m�G}�z�*,�@�*I#`�gO˟��!J�i'�� =A��q:x�Q������B���p�t��i$��$Q�|�$;�DL~����i���X���W� +�q��� ��"����B_�����Qf9��9��(�r�h�>{�ۥ `2#���mJ�'9�L��]U\1'A0��s>��=�#���$���)9<`rD��&�q�&3��Qaﱈ�n������n���\$��_:�}�e�ݺ�5oƜ�'��k�7���ې}�q�e�aY=�D�vH�9 = ��Gބ�OyQ�2�y��~]g����R=��I_w����M��"z$�2�N��תV��Q��L�N-Lk�Ț0�락|c���I0�ʯtH�;���I�o(p{�s�wʘ;Z�^Ü���&�\fGP��3�����;;��e��5ۮ�HI2�j>��s�����H�z4V�bҙЍ���[
�����Π�����N��g�띕$Wm�1!��0G��w���w `2s
�zMZ5N���L�뮅�B0N�`���>�ˬ%$e�N��=�˕�P寞����I�op2��`��/����8N��yyZ�'m� . +��v�~�ׅ��&�D��zs��8
z�nŭ���[A� ��(��!��Q�7$e6��'���vK��R�LL�F�<%}��V�D�d&S32q�Z/0N:�EZ �U� +g7:�<���#���;�H� +�D$��Q�� +�1{�%Vv2 +=�<�E�tY!���":���/�������*�1 �LJ09�ɿh�>u���l!�ġm���-�T6���U������a ��-$�j����^o$�d����BJ3`�{�� 4���L�\�Ǫh��8ʘ;d$�עL:���G��}�����*�����<`rX���Izf���ʳ�TL*�K��q�IG����j���8 ��'�����9Y�W�;����&b���_>鋱r��qg5VƼ3L#'���L��
/�G�Et<y�� +�� +rt=Y���n�'AL�� ��(3�������v19�y���(W��de̅(�āq�iH�0�x�?�qS$O�y�Na(F�zCRf&�_�� +%/WN���O�p� +F�? A�.F���'}�>�Ĝ�#���{l������'}�0-W�4`�Q3�Pg7��N_A<]�d +Y����Is2��B̽�9Ͼ���wQ�p��^i�xm�i����ݼ!� p�d��[��` �i9�J�G�[��;H����p36'=�˕�h�7Ή�t6���՞8�N:z��J/�� �7y��WXF*f�VS ���W5'�pX��u�}�
#`�zR/; 1�0p=
.���>A�yv)���y�����Up��/�NO�ɟ�˟9�!��&�0���!���#'{ȊRq�8 ����(?�_�7 �e&����P��QM����?�ͲoP�4����"쓎�^v��#r�b�Y)��Ḿ������$��L�P�o���N[r�>�@��%�_F�E�A���� �@��!"��6�5M���v>�"���'y�����7��=U4`���f5v_�71�'��vx
�턥�a7�H��]��\��a"�]V9�o]�!�w�R*A�&_�?�� `�st�Ǣ�`���� �@"H�a�����m?�`V��M�<`���?)}��������ZOg�;Nc +���e'�B%ك�n3���}e��JMm�3���?�:��0 ��h�e�T-�"�N�, ��A7j�� �i���n~���
|�DN�w[��*f�D�$����j��8zv; yF�n��}�!����ۤѨ��e����ȋɿ�/���B;Ep���]%DC�Uc +�co�8A�T����D�$�H$ͽ���ʁ|�i4*�Ƌ�*I�ك�K�R�M�T4D�N�&��ij�^-��F�I3�A��^�W%���X=�M��{$�Ʌ���M�<�(�J��K��5x�+�6`&�L���*2����=�������A'������*&�_u���Jf$*����'����C�1��?Z���� '�:(P�1�$p[t���
= ���$��(�_]�n��db��z����?�%�O��E���=TR�!�p�=���8h��rG������AǒwT��Q&ӊI.cnu�/�H��Gcc.5k>�S��t8��Mq�ZΔ$�����q���� �C.&_���ɓ҈6����I���wz�E h�����:�x�8�|
*+;G�E'�Z,�mA��d����!jdT�Uh����D�E[x@��J�8EuII.((N��_��Y�F�/�0=Y�;O��h����ɁZ��.J7�)Y&�z�(m�[cC(���\��^��V�!)HV%f�V�{q�I���ɖ�����(> ���I�=��$��PLr�2�����mou��ju|�s�.)mc�B��F��2��t;z���k�;��4� ����Du�Ac&'�-O�Dy�Ǐ,��~1���v�.)�%���{��6�������y缧��M_[ ���ے�X����\%JdbDZ-ﲭ}I +m�������#8�Sx���7W�U~&�I +� +;���EK��f�[�Қ��Wr��QʿyȎn��G�6/�s�����f��X�� + +�g�'��+��]��a>۠|��V_��v�+eJ�o�}2�vV�� +��$_~�4m�]h25
�^�"W�$Qc��s��R>#��[�����'��Fe��s9�����d���-n��%���} +[�??ye��. +Qf��"v�[��D)�7*�= +ƀ +z��cB&3s �rQUFQ��xF����ɾؽÕ�L�P�܁�+�h��n���'3��ZLjy�n.��7 +�ɀ���m�A�d�.�W�b��`&Xՠ��ɾX�r8����F����� +�x��s_.�|����%o�!ƞ�U���e�aR)E��Ll�n�K��^QTT�Fml��]�n)�9 +-D�-!EiѪA�3�i�wUy���[�X�6��ind2�"nSeS�-�֖>Z +��d�I"!�[�xi�� �� +N��p�<>��R?$���vM���%,U�`�5����*�� ?QʘL���4�d���Š�&S�A��e�^4����w}��3���SJtc� �C-Ehy����+�z
"{Q�*���7j������wȇ�B +y���p���O +[%�r>�W�����ֺ��G�5Pz+� +�zk�2�0���BWJ�0l��52����� �CEE3��'�.��4�yj,��Rnm��Hׯ�i��@/��u����k�g�*�L�+t�[E�E��jZ�싥��R6��F�9ϒ��֊hI�J���:�x=�U�r���B�+�<v���;�l�"��6j�6���� +Le�&��ODP�Rh��D�̢z��M��I�|V��M2��m�C r6@&MG�y�MB�E#�`U�L�!�� + _���C�cJa^�r�P +��M���������TF�ΐK�2 �8��X_by~��݃ty2iz�{�8�얮�I�/q�J����!{�5�f%(����(A)*�J龕m������h� @��e���GBf�d��/c8�c�����Jy�A�����BRJ.*ͬ�L%���v�%�����h[��&7I +e�>ɖ���->�RjU�����F+�7�*�3��AȤI!p�Y�w���.z�^�%��X�J٨|�>[�,|O���X�J!&�視7�:�E�J�}�e�M��)i2 �4%�%Ny�TK��pP��G�W�؎����9���8�D �\ V�\�#��VVp��R����]> +�{QAas#�6�~��=�X�����*���n��WN[��aG�s>�n�W�z?*���:�;��&� +���½��2ǀ���iG��n�����m�SY����g�����F�o��wK9�� V�H.���2YH��@<t�[�
a��P/N?��'����*e�\J����9�����o
x��~��JT`N ���{/"Ei�� +:�ϕrPU�����ڦ���X ʠ7�HQ�u����|�[�2���� +���Zj �z�!��` +�%���o?�PX-��L��A,y��Ƌ�/��Ɣ���R�PGhC�'�o�F�fm]Q�C�_iU��1p(% +�"<W[���¸јR��5fRJ^����.���|�\QwZ'BKVҽ
|��K�~ +Q��xa7^�e��Gӱ���
y���_8���?Y�'�����e�ˬ�2��� +@&p�쨲�t���$/D9�- w0�A����9Wʷ���aEYy�����5�z�Z�Jf��`/%�k�er(D�Lb"I�ދq�M~qs�^���<��#�ѓ7�o���E-�d�'Z=�b9���ݢ���[Ƞ%��I���H~*g�-y㬷��u�h�8Ӑ#��yd�U�R�&)�3�����J7"��� ����n�����T�L�TXɓy2 ҂�^�4^�mȱQGYo=#��ן�
G�7��$V�<hv:6T�'B�-#-u�͓ ?!�<������`���H�G����+-h�8�c�ʛ�����ߊn�d=qh@&9�s��[C>��)+o�27�C4���6ǀ +��CGNl��C'=�t�29��c{)���J=���V�;4��s���7�4 �2I^��Ӹ2 2f��)^���X�<�l��PH��㎆K@�su*M��^['8�{�K�/a_��"Z.�|�݀�8���Q +0�q�Y�O�>�r?��ͭ�FOqN)e�[7]�Ɓ�[�C�3�6���Q �L���w��L��z/ +031�-]i�����+\)�ŔR�c6K:�ˬ*k���B�� E|wE�̦z�C�W��"0 Vj�<uy�S�^���^���m�/��@r�O�R�H��h������r��+�{�i.�o� +�G%�&Mq�nި-R=V�k�9I����HI��v�Q�dq��Ae����:1މ-�)�C����a�-���loWk��.4�&9�#~u��d�=k�Ra�CSB��_��N^��\�Y +z/�0/�>U�7�6g/K9�m���t�=�j��{�J�����p���� +B)� �L~�>��z� +Q�@'m�x�M�z�����p���~;1�7j!����+e��?�ǻX]J(%�2�LB&A��%o���i ~�? _ +;���
x+x�hA�}�� +`2Ȑ�:�{Q��Kޗ���md�^mv���I�$B�f)+��X�V �B��=�]U���O�c���8{�E�������2��u����g_���Q�a@D���b���������]2��Đ�=�>�u�ǁ1���6W_�A�I���e)���&�?�L���^.c�`0�'���m�^�D��w�X(Z:f�h]J(%ȘD�� �`h!���O�����-�I� �JAD){������O"���RzD)y!�f�.���27�B��/y���.\o�>�熞��.�"���O�'�_�n*�T��YJ�"�4��~��gC��&P8\k�������IFo�C�XPͻ�>�B�� +��ɣ�hi ���S^�2 +�^�T
�Z|2�� .��<��#��ҩ���K ��י1��TP��T����.\m�� +@v!��ua�CF�E=�ˣ��{�������@d'��x+��RB)���`{&���c ����p!>9Ʃ ����ʍ���p7����Q�P�R"K ���d����[��)U�� +�����yA��(E?S�ã��ZP�0�H�K�|�E�;.��T9�N4PN2��'n����<v���>�;�S����_p�x���sJ�����Gl�y�����о$|O���/�Y_���8Ĩ��ۻ�!U��K +�O"r&�O�x�VW#�%�!���8����Τ�T�dՙ;�g�x�L .ϳ�a�4܄g; +��&HQ�(D�c�2 +� +N���B�X�N�Ӎv��A��f^◯4����X�n�$"�u:'��ȋ�9 ��`n��e�!Fՠt��IZ�>�ȍ�6�H�]2���v�[����ǯ7aA'�N�t�EF�۔ ҕ�ᐳ?Z|2�D��X�����"�% +�] |2c"� +���C�9�>y�aAQQ�'�擣��I�%&��`:z�\k�p(2
�U��`��W�h1�wvQ���I����ث�]� Yc�� ++f>����++�=�R��)b!�:&
��=��$/�(; �jQ0~*g/��3�Ƌ?B���F'�I���W��Â��I<��p������b�����9Ή��'���'KN����vDP)�(� +/D)���/�A���x�Phs�|�ȂE�jkkc)J,y#����tq�D; +�(H +�.�(���7v��]���'�Kag������%Om�J�,E �D���D���HN�] +/D �LZ5(,���_�D|�a��M%�{��֮-^�)J���ҍnǺA� +�=�K<,y#�
*��_�tKHN�|���$H���7�2Ӌ��J<��ƹs��9H�]�=�BM����C�x,�ul���am��L�N�x�RH����q��D�ؑ�Z��O[&#�j��L��U�'�X�q��NqWi���)o��[�� �'Xr�/�ǻ���O�� +Q.^UA|�_�F�1m���|^gw�� �� .5�����1���U�Y�o��p1 +��Do}���v:z�K��;%�l<��3{�?�a܂;�q0q�d�1v�������'o+���n��j^�\�H|rŲ'���)������{'�� �Jߊ:�$s.y�R�D��L~�
�o{f:I ������薆CRv���Ń�����䒵��sٽU�غ�g��)J2T�/bre�y���ؖu�U5|���E�]�k���K��'q*1m|Э��$0�{)���=���C�*�����Ҡ;'������s�婭6�)�2�B�I>4X�k�҉�l�<��1tH���S�\SM _�K=?yF�YJ�z�ʓ=
�4>�-���ˏ�֎��F9�VEݵ2z*'��>���vN���rD^�O33U)�\%-.�w�ՠp1 ++�+%y�4�*��Ƿ���.�|����{�l�&ڶq-�˳��9��4~gVI��@���.����3pɛ�(������>�W�o_[��Gnϼ� +�{��|ɛɹy�[(-xO9�MN�3�d���+�<Wyz��h�(@��V���/������>U��j���d�R>Q}� �L�#ח6�>��OrU�̖���O��'$f���R��tQ\1�ٳ����C^g����ʋJ%�|�[(O78_�z'�qV�����Һ.�%o���' ���J/���<Lp��2U�@����zִ1�7�8Ϊ��;���!���j|-!9�d�\G�����C���ˡ������aeK�����ءF�7�!o=w�ms��h��d��Q
�o����C��qKe��S+�Oa�>y�ʺ�/be!+;9������ +��dMN��r��O�M�Rr��i��D{�L�mnN�����i��-��^_�ɞ9�i�rǦ5���KI1��d�� +�s�]��F�W[�뺅����O��wg|�;��GW��Jv՛�w��^���'ɗ��+�O�^�[��v]\zw
_��'�(� +��;�� ���=��7]�T�[;������sD;6�!�yj�[tr����46Oj�0�%����v����6�<9߽�,�!�8v;���α}��>4�{G:�l���+�x�n�\�n���$�v�N�I�(���^m�ƻ��w% +Gd~��8!���-[���dR.��amߴ�����G7O֧?H.79�Y�hu�k=�M���H�O�#�7|�@�F�=�vN�>��R�A��0{�U��.G�~��ۜm����+�O��8�}���� ݸ_��^G���/h�v�����C�ګϒ��t�w���x'L�'�ݱd��?}�V8OH��q�'�M�ך]g]ee��O��u���UuZ~2��"|����NN�m�����{( +���yk� t�w�,� +����s�nt��$z,`��20Y]��,��s��$��u����{�n(��z9UR2��9D��s�`F��n�� +�3�$=��dR\o���w��֭D,�}v�����3�5�M�����?}�i�o�*������>��L)�4��e�m�Wm���e��O�<������?�1 +wet�3���4f�}�W�ֻ�7�[�J���2T���km҄��'/�9�H��7�����γ�#U��y&�Z�'�*�}_|jeO����sFغ�h'ͦ��6���+ͮ��/q�7-]W�b�f� �����'MEѓ8�R�$'Cne)o�J����ۧvK���ms��V��Op�u-��w��~����[���/EI;��v�{gR)��H�����=Lsg,/>�㧝�|%�ҺG���/��(�w�4/�������&��m�j��϶P�_�����Kܛ�{�<? �4s����.2�>D�I +v���n����y�$ +K����+�����}�r��!��y�1�~jv�T<�\�R3N�r�ʇ7���(e�\a���b�\���]<�+���y���=~�E59��N��'#�$Ǣ�HiΎؕ�-[�K�~y�uLF��͢~r�E?bzr!_Гq�x����g���+���68��2���udshc�R������_<Ծ��F@���<~{W���)M�a?X�2� +�՜}�`zr߽g����o[��y'�R��S%r��HAy������g3=y�_O +� SOZ-��&�er��"3q +:q +ԓk"�I/��>Y��_��& +)��w�:+v�[m�Xj�v +�>ݲ-W���tk[�����y��
�'��x[��F���� ����t��UM7���տ��-���UH�=�3�z���\��;����/�榠���d�z���7_����j�Y+��Kv��j[��G�����-Tj�ʓ����G=��>LQO�x4v0�r�f]~�
�
�^\O����>-� �HR2i����4/�iK�H��
CuAk����s�}`~�=���Ϋn�麋F���i�.B���k^�J#D)�'-l� ��M�j,�8�>ޛ����URX�Ralϕ��d���`�GB_~J]�z��E���'�b�8N\|�m�Ǝ�oyp2^/� +��!mYH�yϸ:�(�g_i���䤾����~�`�O����.����+̳�y=���97��۳�Vʟ/qU��-Ov�r�xHy��R�9��>A,�a���d�l���a's���DfJ��T���'���.�|���/V� 8 @�b��)o��Ե��-R����귛T*w/�� +�/�9;�^P����[|�m7]�pQ���x��n��_K�er�Z��f�@I�_�Xц��f]9>�p�Qs���3�Q�v�=8Ɉ���t�:-��I��bΓ\��]���J�?S +o,?; +��(`j�>�G�SHU�^�6�m��
M&)�W���b
a�x�2;�:�ՆIN\O��X�-\�zҩ�'O�j�`��� +CR�VT�?ג�PUt�R&,�r�6�M��2�]i��� +�A����4��$¯���&�jޖM��]~�b���v���/��|�0 +{3q�'�x��dAj?�D4 +ER�!�]y����%|!�ԓ-YLOj�
zҁ����`= +��(�����|�%lɌd�2��1��>�Ȧ��Za�����=��Xⶓ�r� +���-�O�`� +����E +�f��� )ÅI��,y,S�/���]����F� �x��vyR��,�N�I�/�<U��c& +a%�oH���G��]?�����d�06�_��c�=��.*�w�|��d_�r�D> �6 +Im�2�C���8�-Fʹ��[��h���Vp.�/ГvZ<8�ei2���d7 +�?�L +�(�с��>~:w��4�ۭ4����V������Hv +��/v
>�N +'���X2�=�t�cHʘ�U)/���t�5Г�,��G�3��Q' +208����Zv�c���q;P{�ܖhH�NH�|�Q�.P{�$�5ۡ'�X|��,���w +N�����ka��ޜ
wt�ӑG{*"�JH� �ڨ���=��7]!�~�Q�|� +w��|�����@��D)�ྔ��EXa/n��_���w�w+ +]�Œ�, +�c"P@m��H:���!'��|��d�o���<a~+o2�j�Х2��*�Yr�*�9jFZ-��H���00�K�Ν� +g'��U:�Rn�۔���x;0�����.&��0��D6��5gS��=��}�Q�O|����'{�<�I����P�5�_��o��[�� +�6XH +7����>�psߐ�����Z_��[���w�7�po��t�F���.�+�������$��%���3a)Z�س?��Ii��&a�Ϧ�z&�����JGN +R� +oɦ�b=��2��eGȹo!;�=ֿf�|D��܂s��ڱ8�$%G�|��[��'���ћc
Uk0]DCXf(M�jK�ڑ��&j�� +q�$�AE)ic�l.��KR�[��93��v:�(�09�=N�(a��a�5�=A�1:��!)}|�7�]z�`�E)u��M��Г +#�[��=����J����I�痔�E�s��˧+m�<ٍ�7 +B� +N��/�k�<8���V;�H��;-b��o��x;c�M�9\R�,�{��Cs*)�rȈ�g +�RZ�:�@���ʗ�2i3'R��ܢ��l��'� +���� J��&>�(��ٝ��<���7 +���d�jx0yM,��^C� +�Z51z���l���x�MYjO����2I�0�
n<�����stQB�jp#�
��L�G�ǗI�i00 ��nu�e�G�������D��`���i�_���I�b�6���]�Y���z��C��%�3_��r�l�r�ʗG侇IJ'�lFJ|�(~��I)^'�n��P�7|9 +o2�ѣ3̱����%��R�
�~4���+���,>Bқ-}�J~���wKi7'�}i���%��I�uz��3��<�4�̙$#�������'�q�C��LU�Y9�kR`D �=H��%Sp2��
+[@��*�m�,!��!)�k�2�)ɮ�ty`=�V�^9��z�==��$ +��:�����XYy����<���(a�TΚ�YUT�C�>]a����a�m�������oL +����x�;З���<^g��� +3�-%'+�b���I��Ocz�7/z +��eC��e�ܙO�CBR�X�7��'�(47+A��A�R���R��4��)D��� +�� �
�����9{�����JOk��Qt�p��[{�o�t�S�9�Q�Kѥ�%W�m��n������c|a�1�}������~I�?.�R�(h|ӈ1���q�M��T⨢q��zr*zR�m�Q����dg>�It� +I ��ѵnrKII����t$�A2�}�f��.���1�~ϐ����}��?�����V?��jk�J�y�b���U-���7Js�:��#Ì�*�'''&]I�b$&
�J}.;k�rSPE �е굱.��^�6��H�w��wk~��i�H)i&)%}C�T�����<@Y��z��y���8�?�o>W��K���*1g�RF뵜��GOF��|�%R�)S5���n +uy�����Z]Z�M��//_!!8 �ĈӢc��J'��u��֞�E�F�/L.\L~����r)�?�[���+��T��ݤ���b�}��B�/��:F�3�;��n�
�'C�II�̙V�I���!S9��Ҩ�Hy��&�Q�w��m�D!�ne�hiӾ{��1f�C����ڇo��O�����Q�6w�ŕ{-��凶3h��� +F�}7�����1�2`��r�'Gד<8i��ԍ�w���(� +&t��禇ڥgP�ˆ�^>��b�e������R��/��]R�{��^)�f�ϗ����k�ݣ8x#%��@O�ɘ{N��x��}�$#J1���� +=�I[��g���i�)R� +N��p���6fǴL��
g��O�d41�
܌��uȏ�b���ƚ'�:����̗ݛ+���Њd߽��@�Q2}�T"Ӎ��Λ�?���"��t#D#H4�' ��I�xWN�����WK+ +Zr +�fk=�]��Q|�fd� +N +2S����9�<�?�����l���K�~{�D=���}e,��`�o + +:C���H_s�T%[�dz��wogb���_���W>�O���=�>ܷ���/~��.����� +>��β��9K>]>]tͷn��٨�tv�5��5m���ww���]L[ncb����?:����^�`��û�?�{���}������q +t���a�s۶m��z��J*��x�o���^�O�����$/?9�"�����mv�fƙ�,�� +]r�˽�߰ +ٴ.�_�5dB\B\#톶m=���B+ +�ʏ�$ҏ�-,��%����17���r��!�o� +�ƣ�F6e�TK�#2I����'��Β;yF;Q� SYk��4��Ŷ�����^�#��������xeI9j�%Ӗ];����|�]�PO��c2S�LC�(�8c�ӧ�v�w��_�O?=y�,M�榦���̿�����-�c��mOn��ܓ;�������/�M��T܊� .��n#�ݜ�����ͫ3�ty���`<��D{Q�2#=�+x����˄�����7H�XX�(��=���_��:z`��s�VO�ik��fR��3�8��N��������LR�}V�ο�ҋo���_�莕��6/m哥��<�ػ��{}�%���;�8��o���kݢ{e�ƹ�>ۖ�%�;�Wq�M]��Q�A2� +#��@'EbFFt� ��p���A�Vn��j�Azx�Ɬb�������0Q�y�@O����O�"m}��駟~�}����/�*�s�5�_rǍ�����W��7���X����M��>��A��|��˟����^d� �����~E:�{�k/=c�5ײ�Գ{ks&���8������,/o��wk�,�{g�N6w�� }���g+]���_EU3Q�k��mg��4�<���Q�\0��VD\O]f�LҌ��<��~�L��șӧ�N�.����t�o~��u�W�^�xQֳ��|��7^|�)���$����Tί9GFg맯���ޭ#�x �xW�O�����AO�"�����A�Q��H�[��P}n�)�\r�/�8С!c��;����IU�������6�G����ӧ�[���C&�y��N + +�W?Y��ҟ���^��̻;�cH���.��P���z�0'�J7���g�?�������:����k~c����{g��.�r�#n?�y[6F���>]i��}��C�θ�_��5� �=��sGv=oW��{���{Ã�l����R��ݢ��8ό�� +%@B�c�܀�GI�@������dl5wcl�q�{�l��|3�w�S��I73��=�!������}�m#:e�N��}�129!��1��w�Y�\t��W]��=��>��k/L�z�f��x�{K�G���l�!�\G��L7s�ǥ��k��b�ny~��D˨��OoD�r�7�D�-��V�+�_�~�gR���D
0�-��$n��X�s��H��= �,zY����,7��.6)'^3'ŬƊy�n��n,�����XX[5�I���Y��.�+�G�:��՛���u���s���G?�᧿��O?r��L���s�y�\�����W!_̇\V�U���z��9顱�&%DBV��aU���OQ�𧼇Uxѕ�%� +�cT���F���Jb��S�i
}�E3�s�����F+��?(\4�T���2�i�!�n�x�K��XXm���$�E|r����Mƭxt<0������μ��v�������ʼnO��g����̷x���*�Z0�}����1��#5v�+�1g2�hNf�eх;�<5��s��%����;��z�Q���'qkJ�.�i՞� +#U�րt�uy���9�{�gQΛ�r�L�����o���]�Q���틼����i��d������4�_�`^{tB¸λ庫�ͯS{��R�����ud?Y4�]�.2ﱞZǚ�cx�������N��&����S1�K�2�g�����&W0��������>9,�)F�v��^�?=��ܿ�rVΛY�7�p�}ˀ�������nqw���yḎ�o����%t���y�o���k~u��O=���O������:�&s�0��.��x��Н��t��ֱ�M������J�9oP'i`pPaƚ[�;XQ�����x�L������x y���ʋ$kz�Y�FjN��K.��L�a�\>>ǒ�?�Ǧ�n�A���⹛��0D+,����i�9n?��&X^�Ͷ�l1�q����~��f�u$��Z�{���0EcOw]�%?uN���� �6]!��//�<�o�ndJ��j>�^��QH��Ks�S�k�]�`���.�a3%�fn:?CQwC��-����6,�7#p�U��:Q��^��Ŝ��ܬH} ʊ8+g�����S��Ob��J��!]�]��I�ޤ�< �AB�J��zk�8v���L7���pF˛w�v/Ʈ��^ȇ��C��̴Df��b{�U�g��`�ʒ�{��|�l[���*'G|=�C�����{��@���XZ�`�7�m^N���27r[J� �_{�>��0s~@-D��Z�eq���2f������s��ֳ)�9q����Z9o��Es�IDu
Q�����T�϶`�Ğ��=�P�<!2��^̜I�{�p����'ѕ��2x��Ԥ�b���X7%n�䑟?�3�q��� +�V��')��'��s�j� +a��z��y�� �S�Xa_��{�����ɉ܍��� �ww=3��'�K��@2�E�u�EiAb)�*k
Hok��^���-.���n.�u,�������l/��'��ֱ-�����RqVs�]9XQ�x+MЇs���ȸ�ޡ�LJ粃��P�����^.Uw2jH�� +Q�eUGO�[+����4��'Y*���2JgN��A�림���w2\�(^���]���}�����Ըm�����>9,����,��@u�X�M
�O�fGf�Ood�%8 �-+-��-�%���%��K.?��3�Y�X�]��^�M
�rҍN˝��&���Nn�&B�;�/�L�G��&|�?J�}�"E�_�M�=��s�O��_7hF��̠�=๙U҃>^D}ˠgg�e��CԱZi},�n��a�}����g�_�校�����ۼ�^n�W��AX
/w�Ojմ����kDCV�o���Q��� �5@s��Ζ8+<t@z�!�e��K�zxZ���/8�U�X-\�����5�f�Ծ]s�2�ds��G��G#����SC�!��r@��+!wOL�79�m�r��~N��\k#�.jwt����#���^9o&� +��h��������������g�=�2� �Z�{��l�e�M�3��nKr�G��F+ݸ��ً�� +F�{?��"���� NH8�\\�����m +1 }ypܐ��=�۷�Q��C�W���.1D]�垙�fќe�Y�Z�J�X���*��(���$FM������#�&WD�_ªkm~��NMb>�6Ѹ]!j_w����U��,�g�Ç�թYc���^i^��oY���ܳ�fD|�P���U��^�������D/�]�1��7��\���f3a��j}"R:��?{�K������$wOJ<�\s&>s#yad���}ț�� 2-~����䧕�*W͟��(g�;�Nz#^R���T�d��=[|Sq�!�X�/����Vf�U���n�җ�U(��������~��Y�K�x�'#���[����&�H~̺7�#�sR|��5��$�H +/�`FzcV
�ryA6s�?,�˜��E����+xf��3K���&t�}\�t �����Cx#t[�[��A�r#_�{R�h$?J;i�7n����!�B��H ++�>���y��X�g,\�?j2�&�wt��I �R��Mq���WQ�B�k������`[j�v/F|z�;x{+ +� +�̙'�{?q�Dqx
s2yF;�����q +�b���s�݊J�n�^0��yG��-�J�u��'8�2$�y0��9ϫо]���iy�/qI�N��6A|�!ݒ����y +#�y`J�aq�� �ćFN���g�^<��&Bw +�kW�$PDž� +�s��M�g�]4G��Y�����A��%�yKjw���o�qqsk���K6�x��D>L��Dm}vs��LJ�5���[�Cn�iy6Y��I��ȝ���x�8 +o�,g�}Z>"ҟ�v#+�J��o|���uk# +# +�ObԤ����Cd�āܖZu⮉|���)I�0��b��;4t��s�YWÍ +GYb�e����wi^V�S�Exn[SZ���{j�ߓ�9��_�VEJ��T^�%%�˿&�xa�7�0 +�� +��o)�Xf�����Kϙ�����{ۄ��J�Τ�4x�ѣp/wz�zj�;���M� +��}O��i:��t���(��+�u#E���I�{'��Ή "P��}"��u艇�@s
&� +#���� +(}�/L.^�_7 +p���H=���e"���.e�{)��v�n,�9��ŀM^�����W��v��R�.���f_�ծod�88�]�y�nj�,?�ԗY��V�7��pFQ���rrZrQ��bU k5��S�� +���M_�{oUNNa�&�?�_T��Q� +nA�L +b& +�ڏ@p��ý�(z>�[�ɞ�GJ����k�Q�Z������#8>�u_��J������� �����>���ܨ�@f����.m16]����a�w�� +?a��Q�P2�=`��ܸ��+ +N�a�S��ǩ_OG��b�<���r�¡t�ᢞ�~��q�Ϯ�t�f[t��(�0�3�%��`S�Vx�Q߯ M��<�����l�a<+J�I0�M��7�{υ������n���^�5DZ� (��ϢEn���Hn\p�1�< + ��H�����|P< +LjU�^�n��.I��:5\ub���⺂ �'���c����������S�x!*�I��ՊJ��K�EŅ���##/���O�G���d�}��(�{����
����RF��ڐ+}{��aq�6�.�����K>m� +�n��_�(�0=�Gj�yOf����e���Q}Z�Ʈ�5�[�U'6�d,�1�[8���߽�~��S��Z�Gbߏ��{����r�f��@pz�/�7�y��� �U6�@U�S�M=�, ��f�W ��1�{^)?��j�1��#O�nܜ��M\��R�a���]��K����l�V
�~�����!���_�\6=�s8]���H��;_/���j����C��������9��L�=���0c�P��I��c�����6b�V��w�.�N�m��:�����r٤�Y����+��ubӯ���yȀ9��\VG�/���k���������M���*����}3I�mY�U�Ev�d͝v]qC����x탯�ʹ�j��M|(��Ο�&SԶ5\ub���Bo��߯�NC�{a�֣�F6y�V�AX�W_�&�I���w�p +a��=����`���.�o:����{k-�;S[�LփE?N��� ؘ�q�Ms*��g��1r���H��V����vD0P��� +�I�د%���Oŝ�j�n1���EW�Ʈۍhex.T�ql�/�#S�د��WM���1~�*[��>��ycr�S"�����h���m��2����w�7��B��c�-�v��w����pՉM�� +����ɗ�9{�{��j�n1���������,w-,�u,'�!�$�3>v�S}��-š���i�<$�u���W6 +�~"��DC}�M�����=��>:ȓ���m-��}go�M2���L��~~����W����h�V��YC�����J����!v���������q�[+�݈����4�{7�<$����?r�f�^:��5c�=o,�!.{k�Ģ34+Wg�w�q)�n5��$����?����WW�� ��ת�P�>�n9�[��Y��XtqoX�V�0�~cn�[�!2���b��Fje�L��*r��poy �0l����_���{�#��C��*Hf��o+#7Qؕ����4�C�H�]�^�U\�Lf7�C+���2I����P�~{�N7 ���k�|�ߗ~�|�&��6ݠS��CF���P�n?W�
t�0c�U�1��g��s� H�_��^H=d�b)��5�� +���`.����N����Z:!�Up�s�6��0�Y���Mt��&�5U�٧��+��ɰ�BmZ��.j��{6^���hC�!B^��o3w[4d����c��� �P���r�.���0�q�:���;��C�:�vcv�qh�.{u&�������M^��}h�đ.q�<1g�(K�x�Hc�����pd�G���T��3>���F�e���}2���E�п�0G�=Ƽ2��{XMg�Ţ{¥l�`cv�+����D�п�Xt�(-��^��J�}�����^��B���O�� N���0kA,���-6����D�� )����8�����P�6Ʀ�ޠ��!]_U]n�n�[�����=0m��Z�W8�l�������]��ƽ�/0�:��Z�+�?A��Zuث�?
<4C���P:T#<�c�{��e���:���_��������U(ׇc��X��H8�����8��w?�# +G�ۯ�����A{H|��%�u���D
<��D�Ͼ�?��C�+5��6}T��kx�ūeY���]�T���>HK����~��rWk�bA��p�ѳOv�{��m�X7�M���ҘIUc�ٿ}�d�"���ݵhf'��{�?٪rQI�tC4v��2b��[�-
�!���m���ycN�G�L�b��(�r�/�7�$���k 'R�^іa�ONS����~�w�Y7*>_&Jߘ&l��w�����;�hf��T��J{�&1���On"H���q��2n������7��~�:��v�?E=ĘBu��(�T�[�C�I�/^^�x�j'�¢�)�!�!�^�Tn�D��5�����x�:���J����uܯU���WvZbH�L=j��Ħ��Sp��잣���耸���4��H]�yHWMJ&�Ʊ�4�b&���3o����S[w��Ǧk:({C=$n��r��$�ݏ��k�o�<G��d2��������$ :�pՉM+oS����O���~"N;l��#�C�=]�
�IƬVq�dӰ��sT�C���������Ő�د��������4L� +]��Xt�H�'r�ܰu��'fl��+�?(�Ħ��y/���юh�ܜ�<ͨ&�����x�6�oH���cӯ�TRo|���ߡ>�v�����g��gXZ�����d��=|������|m�M������%������� +��G��<���2^ +{rR���$#6��(�C')�
���&���4��Z��b�7�*�M1�v3��@Ul�9A�d�A:f¼U��/+-9�;D'��8���Z��r�RI���eކ�Bt��E���yc
�*6��c���� +��*-U*Z�!�Z0o@Qؓ�t�%�♃9 +@Ul�?^%w2�\�
�P��Tj
`��_ؽUa�� +ɍ��N�@2 +SI�ԉ��d�J�7�.�QǼ�z亁�0w2^�fO.�ơ3�q'
r�Q��@]���Q!��7aހ�8��A�l���#q����yu�I��G? +#j�Tq'=d�w�N�����T����ro@a�f�ie̛I������du��t��Ms�I��ǧp'��8���*rc���6�P�nW&�f��"$��8��2\����0��U��-�r���ʁ���C���TƢ�U�&����P�Gb"-���!#�Bp��E�vVž�n亁���qUj�Lҩr*c�/�P%Zb��,�
�s'��&�,'��8���*��$�C2 +�$?Fy ��:�Ppr�Q�߀~�M����ߣ�����s)c�$�K���(��wz"�����Np쵼�t7���p��? tŦ�Ñ�X(&V�t +r�G�q�MY�xnk�Vm\l1�Y���=�����Jթ��J��?��}߳Ak ��d�+��+o�n3L��]�o[س�h��*i����rg�.��� �
D33V�OI*��;C&B�$�J��{��vE^��Ξc��h�a���o~�B����v����� Ozyt�9�< ��ٽ�Ɓ�?�_OM�l�2W܅Y�b�2�F���"�wۨ�c��í+a�@�b�}��?�k�s��6�gj�Qo :�,z���ӛ�.��a�`D%��m�7�8��r�� +��J!��4|�d\�ǿDn +h{�S#-�:��W�>�� +m��@p@IZy�j֍��tw�p���$�P��y#\p(�E7&��y�����џ*j�8P ��?)0��~LbBp@���+ ��2�!�@Z6DaoR`��3!8� +:����y�Ǒ +�
2I�!$��ش������#&ewp��O�-�cӣō<�w�N��T5pi�C���
�+��C��չS��E�&��(��Ǣ���#��յs�e
�Aބ܀�t���QC����GQg���P����nOL6�o��]b=�v x��H�pl���<lp�ݺtfzS���G�P����8r耞ݺvn����!�}�d +� +fj� 8 t�q�қI�~�tš����O�g�-��Н2鍹��p'���tc�D�\9�%@_l��@��f��p'��شh�<z3Hϕ��Ţ���w{�m�aހ�X�uC��������הForƗ�� +���֛I�a� +lzl\���!��@T`ӣ�GXo��n�t���Đ_�D6��5�z3H�4�*������Gv|��|�����$���F�D̲��DУ4I��75� +���A�Fm �"���w)�1w2r��/�#%8�G�2�.l�<���<���2,z���A:���D�#1�^pr�Q�7uT��G`g��P[��n>��������0��Bb�Vo&�����qe�IzBo :ql�p@� +�C��1x Za���І�3y�����g��mXJi�[�N��ٚ�]e�A�; �fm�h+�1w2�
D56�m��.���Re�X���6���
wD7�][x���� �辋� +C~�N +ML��o + + +����Wp^cL���`� +}Mb�F�F���|�7�v�n%P����<���ܨ�]�98�sp��0߆�Ș܍��1y2ǧ�$�ಾE�S\�_�7�ް����zw7$��#龻7@;�c�7���=�����w�@ +�%?��}sYȖ`�J�O#�6%LI��7��\@wդ��]K�O��u|p��B9�B ��
c�׀�� p�\<���h<�<ޘo]����𬨣�N�{K�Xi�c4�p�m�t�d�mz��6�|�}Gǜ!&p���h�g�lB�1������4�\H����m�>��U
��F���p��_��{��%̏���y���ȏ����l���ⴓC.(Y��P�Q,|9�w���`b�����@m��16�t=��9�J����|��ppΐ_ +�c���t,���+� +_l}�8rr�'�_�j-�A�U��oi�f~��t�n=��R�����]��,� +GUV!prׂ��u��/�cp0?r�讵�`2��z�+y,*����|W�m%` ��H���N��~a�!dl4L)\9�,��[�ȃ��x78��g�1!���O�t��9��z�K�?�f���� +����oH��5 �X��b=-�%�=������}�h�6-�e��P�s�X��>{ 0��1r�lB�7�Vڟ����B�C:d�X +?��gO��B���P涋�mL=C�) +����~К��VQ�GK�f
�yt���E��T�mTd�E8��Y�?��^��������M��Փ$���8�qJ��\�02&�VQG_��<�26O��G��ݴ�������o�X &��9&Lz�<���9p�(dl^K������/�r3�"]�0^�2����܋�|�%������?~�Л���N�-��"ŖΟ�c�#��Ǣ� +G&ǀ��x47��L:0{�[i�x�gy��rl�K�s4?yx9�r4.��|�� +ل3�9�x�S��p"��'T�n�덷���j�8f)��ްl�(����D +o�H���}+�����OnS�u��R?��] +�u_p��]�kW ��0,k&��3%���n}�)�R��
�R��<�P��`�^����W];��Ƣ��)�Bk�ܥ���K�(�o�SMv�&?�Վ�4:dC� �)�_n��.��+�8y����]gB�����pz���C�m��C���������] +��Q�*���(�-������Z_�۲rh2���r��> +�W���E�>!pr�@͍��˿<��s��u���,�o=zI;�a���������f��E57�7�t�1f����6ŃGѫl� +�5Ĵ0����9)���0���ɯ���C���7vl�v]gOYVvbt����Ox�T$A��Yw\w��w)��L)���Fmlx�G'O��?��>r��1�H^��ҋ/�P6�d��d2�T\���6�#ܥ����*�#F�ƏI]ç����/���?�����/��0i�ml���3R +��Mڐ��r#��rM7A�Աc��}��m߸᧫�V�2����(�&C��@�S +_Zv����Xnt�8<]���>x��G~~݆���9���_u��!�ԍd~Z�@�.]Z��az�1�M�8���/�xs�3����ݵ
�1qK]17|��s��|��@ +����G#�����_���o/���-m5YQ��g�M������ңK��f���}]��\�{Ւ��>X"�
L�ƈ��0��y��0��psDB�9z|(1/�� �b����JS_������JCqZ3��V��6 /�+�Ն�������g�F��/-�)6*t���5��fMsRs�"Kc(N�4S_�>�U$P�&)�+m�E<���LQ>����G�����c��eQ��k��\~'�]�6Tg�m��m6��Լ��^Wc5g*c��b�E ��Ćx��:)�>n�%ӶZפmЬ7g袲�Y����zG���sW�`�.�#�-��ɘ���7+��F��kmj}|���֛�#W�?��k����¦�FCAQ]�rCF˺���ڼ�x}A��`��lN6��}[�M�b�[fLQe��5E����&;Ő�ܬ.]ї��9ی���M�ٵm%re|v�`-���Ԣj-�2���R�樾� +C�2��l27k�ʲ�B]_�zuEk�F�V\L�6ڠQ����w����>�j0�#�ݽ˴5EZ��r%}n���\bj������{R��u�D�9���3rx ����G^�r0&Ϥꯏ��fΡ�@ݗѮ�h����r�fENMݘS��T4��� +�mI���T:��V�Q��� +}Vow��ö^5ݍ��{c��s�"�fj���Z��L}w�Qc��0�2c;����ӝ�>�R�l��[�)qW�6������z]���P��"��~���`���s�+��[EbZBDQn��SM�C���(�ΑX�ߝ��:؝[���d�2��c���sb�m��֖� ߥ,��m��j0Q�o��Ӓ�X3@�ggT��*�+�����
�kk����ʛu9����jg�����8^n�g�2R'� ���)�UUҟ�ѕnHo���o��.�p����4�$G�M�Π�F�h2�s\^m���1��e���^����#<���tN��Z�`�Ti���mYP�G>�t~�TP:��-J��ԓ����+�\e�6Z���U��*���SS��uԷv����)���6Z,EI����}v^��ұ�/М�ߝ�C4���0�w�#�d��*��]�Ѣn�+ڢWe�O1��6U�e�F��V��k�]U�ݥ+Փ�f�!r�&ܙs͚�5��GP�F[�SRB�Y�.�Ĥk�Y�-I�m�e)�U����&��92ͨn.�6��W-3�[Z�cu���Z��m�k��IF[\e��'�y��P'�+��RB������兆���h���&+ٸ�^��Z�ҥ�5e)��v}JS��T��ȭ�����v��9Q��Nhl�N�X�Ʃ�]ָ��3R�a6%�S��J�][i[�M9�ef���BJw���ŕJ� +�����"��'9�h�,��d����R�L�QZJ�ӔjcIAǪ|�٘֘��ڣ�c��Ii�)-��2�IUV:�<���Q��A�}Ue�!}��&�k
���#5`������\S<�G�ԍ�i�v�U��)_�e�e��L��d��0S舰F��TsVS��s͊��e�i��φ5mQ��V��nP�Nc5�l +p*��E���wm���l�عU�{� +x�T���s4>� +��L�L<m�*���9�|yd.T�����,�����u<Ʋ +x�_T���s4��Ur����>���*��\����q�3����<Wn��wv�K�-����=� +p(�����m�C�鱙T�k��e_�m�o*�b��C"������Om�Z�U �r�7;ʖ +��cި +p'�H��c<W��R6zlf�X.����x�V�����9U r��}<�s��`�ǦS� +�\���r����n��v�����l +k__��괭�>Q��������5����J���,��(�I
endstream
endobj
15 0 obj
[/ICCBased 19 0 R]
endobj
6 0 obj
[5 0 R]
endobj
32 0 obj
<</CreationDate(D:20160615142312-04'00')/Creator(Adobe Illustrator CC 2015 \(Macintosh\))/ModDate(D:20160615142312-04'00')/Producer(Adobe PDF library 15.00)/Title(metamask_icon)>>
endobj
xref
0 33
0000000000 65535 f
+0000000016 00000 n
+0000000144 00000 n
+0000047649 00000 n
+0000000000 00000 f
+0000163121 00000 n
+0000593503 00000 n
+0000047700 00000 n
+0000048109 00000 n
+0000048283 00000 n
+0000163420 00000 n
+0000139682 00000 n
+0000163307 00000 n
+0000049181 00000 n
+0000048344 00000 n
+0000593468 00000 n
+0000048620 00000 n
+0000048668 00000 n
+0000139717 00000 n
+0000160473 00000 n
+0000163191 00000 n
+0000163222 00000 n
+0000163494 00000 n
+0000163800 00000 n
+0000165099 00000 n
+0000187851 00000 n
+0000253439 00000 n
+0000319027 00000 n
+0000384615 00000 n
+0000450203 00000 n
+0000515791 00000 n
+0000581379 00000 n
+0000593526 00000 n
+trailer
<</Size 33/Root 1 0 R/Info 32 0 R/ID[<858D18969ABF4CF88593CFB9A20C1759><B33F39DA517C42B9A50D10EC91C85574>]>>
startxref
593722
%%EOF
\ No newline at end of file diff --git a/old-ui/design/chromeStorePics/promo1400560.png b/old-ui/design/chromeStorePics/promo1400560.png Binary files differnew file mode 100644 index 000000000..d3637ecc8 --- /dev/null +++ b/old-ui/design/chromeStorePics/promo1400560.png diff --git a/old-ui/design/chromeStorePics/promo440280.png b/old-ui/design/chromeStorePics/promo440280.png Binary files differnew file mode 100644 index 000000000..c1f92b1c0 --- /dev/null +++ b/old-ui/design/chromeStorePics/promo440280.png diff --git a/old-ui/design/chromeStorePics/promo920680.png b/old-ui/design/chromeStorePics/promo920680.png Binary files differnew file mode 100644 index 000000000..726bd810a --- /dev/null +++ b/old-ui/design/chromeStorePics/promo920680.png diff --git a/old-ui/design/chromeStorePics/screen_dao_accounts.png b/old-ui/design/chromeStorePics/screen_dao_accounts.png Binary files differnew file mode 100644 index 000000000..1a2e8052c --- /dev/null +++ b/old-ui/design/chromeStorePics/screen_dao_accounts.png diff --git a/old-ui/design/chromeStorePics/screen_dao_locked.png b/old-ui/design/chromeStorePics/screen_dao_locked.png Binary files differnew file mode 100644 index 000000000..6592c17e4 --- /dev/null +++ b/old-ui/design/chromeStorePics/screen_dao_locked.png diff --git a/old-ui/design/chromeStorePics/screen_dao_notification.png b/old-ui/design/chromeStorePics/screen_dao_notification.png Binary files differnew file mode 100644 index 000000000..baeb2ec39 --- /dev/null +++ b/old-ui/design/chromeStorePics/screen_dao_notification.png diff --git a/old-ui/design/chromeStorePics/screen_wei_account.png b/old-ui/design/chromeStorePics/screen_wei_account.png Binary files differnew file mode 100644 index 000000000..23301e4bf --- /dev/null +++ b/old-ui/design/chromeStorePics/screen_wei_account.png diff --git a/old-ui/design/chromeStorePics/screen_wei_notification.png b/old-ui/design/chromeStorePics/screen_wei_notification.png Binary files differnew file mode 100644 index 000000000..7a763e5df --- /dev/null +++ b/old-ui/design/chromeStorePics/screen_wei_notification.png diff --git a/old-ui/design/metamask-logo-eyes.png b/old-ui/design/metamask-logo-eyes.png Binary files differnew file mode 100644 index 000000000..c29331b28 --- /dev/null +++ b/old-ui/design/metamask-logo-eyes.png diff --git a/old-ui/design/wireframes/1st_time_use.png b/old-ui/design/wireframes/1st_time_use.png Binary files differnew file mode 100644 index 000000000..c18ced5e2 --- /dev/null +++ b/old-ui/design/wireframes/1st_time_use.png diff --git a/old-ui/design/wireframes/metamask_wfs_jan_13.pdf b/old-ui/design/wireframes/metamask_wfs_jan_13.pdf Binary files differnew file mode 100644 index 000000000..c77c9274a --- /dev/null +++ b/old-ui/design/wireframes/metamask_wfs_jan_13.pdf diff --git a/old-ui/design/wireframes/metamask_wfs_jan_13.png b/old-ui/design/wireframes/metamask_wfs_jan_13.png Binary files differnew file mode 100644 index 000000000..d71d7bdb4 --- /dev/null +++ b/old-ui/design/wireframes/metamask_wfs_jan_13.png diff --git a/old-ui/design/wireframes/metamask_wfs_jan_18.pdf b/old-ui/design/wireframes/metamask_wfs_jan_18.pdf Binary files differnew file mode 100644 index 000000000..592ba8532 --- /dev/null +++ b/old-ui/design/wireframes/metamask_wfs_jan_18.pdf diff --git a/old-ui/example.js b/old-ui/example.js new file mode 100644 index 000000000..4627c0e9c --- /dev/null +++ b/old-ui/example.js @@ -0,0 +1,123 @@ +const injectCss = require('inject-css') +const MetaMaskUi = require('./index.js') +const MetaMaskUiCss = require('./css.js') +const EventEmitter = require('events').EventEmitter + +// account management + +var identities = { + '0x1113462427bcc9133bb46e88bcbe39cd7ef0e111': { + name: 'Walrus', + img: 'QmW6hcwYzXrNkuHrpvo58YeZvbZxUddv69ATSHY3BHpPdd', + address: '0x1113462427bcc9133bb46e88bcbe39cd7ef0e111', + balance: 220, + txCount: 4, + }, + '0x222462427bcc9133bb46e88bcbe39cd7ef0e7222': { + name: 'Tardus', + img: 'QmQYaRdrf2EhRhJWaHnts8Meu1mZiXrNib5W1P6cYmXWRL', + address: '0x222462427bcc9133bb46e88bcbe39cd7ef0e7222', + balance: 10.005, + txCount: 16, + }, + '0x333462427bcc9133bb46e88bcbe39cd7ef0e7333': { + name: 'Gambler', + img: 'QmW6hcwYzXrNkuHrpvo58YeZvbZxUddv69ATSHY3BHpPdd', + address: '0x333462427bcc9133bb46e88bcbe39cd7ef0e7333', + balance: 0.000001, + txCount: 1, + }, +} + +var unapprovedTxs = {} +addUnconfTx({ + from: '0x222462427bcc9133bb46e88bcbe39cd7ef0e7222', + to: '0x1113462427bcc9133bb46e88bcbe39cd7ef0e111', + value: '0x123', +}) +addUnconfTx({ + from: '0x1113462427bcc9133bb46e88bcbe39cd7ef0e111', + to: '0x333462427bcc9133bb46e88bcbe39cd7ef0e7333', + value: '0x0000', + data: '0x000462427bcc9133bb46e88bcbe39cd7ef0e7000', +}) + +function addUnconfTx (txParams) { + var time = (new Date()).getTime() + var id = createRandomId() + unapprovedTxs[id] = { + id: id, + txParams: txParams, + time: time, + } +} + +var isUnlocked = false +var selectedAccount = null + +function getState () { + return { + isUnlocked: isUnlocked, + identities: isUnlocked ? identities : {}, + unapprovedTxs: isUnlocked ? unapprovedTxs : {}, + selectedAccount: selectedAccount, + } +} + +var accountManager = new EventEmitter() + +accountManager.getState = function (cb) { + cb(null, getState()) +} + +accountManager.setLocked = function () { + isUnlocked = false + this._didUpdate() +} + +accountManager.submitPassword = function (password, cb) { + if (password === 'test') { + isUnlocked = true + cb(null, getState()) + this._didUpdate() + } else { + cb(new Error('Bad password -- try "test"')) + } +} + +accountManager.setSelectedAccount = function (address, cb) { + selectedAccount = address + cb(null, getState()) + this._didUpdate() +} + +accountManager.signTransaction = function (txParams, cb) { + alert('signing tx....') +} + +accountManager._didUpdate = function () { + this.emit('update', getState()) +} + +// start app + +var container = document.getElementById('app-content') + +var css = MetaMaskUiCss() +injectCss(css) + +MetaMaskUi({ + container: container, + accountManager: accountManager, +}) + +// util + +function createRandomId () { + // 13 time digits + var datePart = new Date().getTime() * Math.pow(10, 3) + // 3 random digits + var extraPart = Math.floor(Math.random() * Math.pow(10, 3)) + // 16 digits + return datePart + extraPart +} diff --git a/old-ui/lib/contract-namer.js b/old-ui/lib/contract-namer.js new file mode 100644 index 000000000..f05e770cc --- /dev/null +++ b/old-ui/lib/contract-namer.js @@ -0,0 +1,33 @@ +/* CONTRACT NAMER + * + * Takes an address, + * Returns a nicname if we have one stored, + * otherwise returns null. + */ + +const contractMap = require('eth-contract-metadata') +const ethUtil = require('ethereumjs-util') + +module.exports = function (addr, identities = {}) { + const checksummed = ethUtil.toChecksumAddress(addr) + if (contractMap[checksummed] && contractMap[checksummed].name) { + return contractMap[checksummed].name + } + + const address = addr.toLowerCase() + const ids = hashFromIdentities(identities) + return addrFromHash(address, ids) +} + +function hashFromIdentities (identities) { + const result = {} + for (const key in identities) { + result[key] = identities[key].name + } + return result +} + +function addrFromHash (addr, hash) { + const address = addr.toLowerCase() + return hash[address] || null +} diff --git a/old-ui/lib/etherscan-prefix-for-network.js b/old-ui/lib/etherscan-prefix-for-network.js new file mode 100644 index 000000000..2c1904f1c --- /dev/null +++ b/old-ui/lib/etherscan-prefix-for-network.js @@ -0,0 +1,21 @@ +module.exports = function (network) { + const net = parseInt(network) + let prefix + switch (net) { + case 1: // main net + prefix = '' + break + case 3: // ropsten test net + prefix = 'ropsten.' + break + case 4: // rinkeby test net + prefix = 'rinkeby.' + break + case 42: // kovan test net + prefix = 'kovan.' + break + default: + prefix = '' + } + return prefix +} diff --git a/old-ui/lib/icon-factory.js b/old-ui/lib/icon-factory.js new file mode 100644 index 000000000..27a74de66 --- /dev/null +++ b/old-ui/lib/icon-factory.js @@ -0,0 +1,65 @@ +var iconFactory +const isValidAddress = require('ethereumjs-util').isValidAddress +const toChecksumAddress = require('ethereumjs-util').toChecksumAddress +const contractMap = require('eth-contract-metadata') + +module.exports = function (jazzicon) { + if (!iconFactory) { + iconFactory = new IconFactory(jazzicon) + } + return iconFactory +} + +function IconFactory (jazzicon) { + this.jazzicon = jazzicon + this.cache = {} +} + +IconFactory.prototype.iconForAddress = function (address, diameter) { + const addr = toChecksumAddress(address) + if (iconExistsFor(addr)) { + return imageElFor(addr) + } + + return this.generateIdenticonSvg(address, diameter) +} + +// returns svg dom element +IconFactory.prototype.generateIdenticonSvg = function (address, diameter) { + var cacheId = `${address}:${diameter}` + // check cache, lazily generate and populate cache + var identicon = this.cache[cacheId] || (this.cache[cacheId] = this.generateNewIdenticon(address, diameter)) + // create a clean copy so you can modify it + var cleanCopy = identicon.cloneNode(true) + return cleanCopy +} + +// creates a new identicon +IconFactory.prototype.generateNewIdenticon = function (address, diameter) { + var numericRepresentation = jsNumberForAddress(address) + var identicon = this.jazzicon(diameter, numericRepresentation) + return identicon +} + +// util + +function iconExistsFor (address) { + return contractMap[address] && isValidAddress(address) && contractMap[address].logo +} + +function imageElFor (address) { + const contract = contractMap[address] + const fileName = contract.logo + const path = `images/contract/${fileName}` + const img = document.createElement('img') + img.src = path + img.style.width = '75%' + return img +} + +function jsNumberForAddress (address) { + var addr = address.slice(2, 10) + var seed = parseInt(addr, 16) + return seed +} + diff --git a/old-ui/lib/lost-accounts-notice.js b/old-ui/lib/lost-accounts-notice.js new file mode 100644 index 000000000..948b13db6 --- /dev/null +++ b/old-ui/lib/lost-accounts-notice.js @@ -0,0 +1,23 @@ +const summary = require('../app/util').addressSummary + +module.exports = function (lostAccounts) { + return { + date: new Date().toDateString(), + title: 'Account Problem Caught', + body: `MetaMask has fixed a bug where some accounts were previously mis-generated. This was a rare issue, but you were affected! + +We have successfully imported the accounts that were mis-generated, but they will no longer be recovered with your normal seed phrase. + +We have marked the affected accounts as "Loose", and recommend you transfer ether and tokens away from those accounts, or export & back them up elsewhere. + +Your affected accounts are: +${lostAccounts.map(acct => ` - ${summary(acct)}`).join('\n')} + +These accounts have been marked as "Loose" so they will be easy to recognize in the account list. + +For more information, please read [our blog post.][1] + +[1]: https://medium.com/metamask/metamask-3-migration-guide-914b79533cdd#.7d8ktj4h3 + `, + } +} diff --git a/old-ui/lib/persistent-form.js b/old-ui/lib/persistent-form.js new file mode 100644 index 000000000..d4dc20b03 --- /dev/null +++ b/old-ui/lib/persistent-form.js @@ -0,0 +1,61 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const defaultKey = 'persistent-form-default' +const eventName = 'keyup' + +module.exports = PersistentForm + +function PersistentForm () { + Component.call(this) +} + +inherits(PersistentForm, Component) + +PersistentForm.prototype.componentDidMount = function () { + const fields = document.querySelectorAll('[data-persistent-formid]') + const store = this.getPersistentStore() + + for (var i = 0; i < fields.length; i++) { + const field = fields[i] + const key = field.getAttribute('data-persistent-formid') + const cached = store[key] + if (cached !== undefined) { + field.value = cached + } + + field.addEventListener(eventName, this.persistentFieldDidUpdate.bind(this)) + } +} + +PersistentForm.prototype.getPersistentStore = function () { + let store = window.localStorage[this.persistentFormParentId || defaultKey] + if (store && store !== 'null') { + store = JSON.parse(store) + } else { + store = {} + } + return store +} + +PersistentForm.prototype.setPersistentStore = function (newStore) { + window.localStorage[this.persistentFormParentId || defaultKey] = JSON.stringify(newStore) +} + +PersistentForm.prototype.persistentFieldDidUpdate = function (event) { + const field = event.target + const store = this.getPersistentStore() + const key = field.getAttribute('data-persistent-formid') + const val = field.value + store[key] = val + this.setPersistentStore(store) +} + +PersistentForm.prototype.componentWillUnmount = function () { + const fields = document.querySelectorAll('[data-persistent-formid]') + for (var i = 0; i < fields.length; i++) { + const field = fields[i] + field.removeEventListener(eventName, this.persistentFieldDidUpdate.bind(this)) + } + this.setPersistentStore({}) +} + diff --git a/old-ui/lib/tx-helper.js b/old-ui/lib/tx-helper.js new file mode 100644 index 000000000..de3f00d2d --- /dev/null +++ b/old-ui/lib/tx-helper.js @@ -0,0 +1,27 @@ +const valuesFor = require('../app/util').valuesFor + +module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, typedMessages, network) { + log.debug('tx-helper called with params:') + log.debug({ unapprovedTxs, unapprovedMsgs, personalMsgs, typedMessages, network }) + + const txValues = network ? valuesFor(unapprovedTxs).filter(txMeta => txMeta.metamaskNetworkId === network) : valuesFor(unapprovedTxs) + log.debug(`tx helper found ${txValues.length} unapproved txs`) + + const msgValues = valuesFor(unapprovedMsgs) + log.debug(`tx helper found ${msgValues.length} unsigned messages`) + let allValues = txValues.concat(msgValues) + + const personalValues = valuesFor(personalMsgs) + log.debug(`tx helper found ${personalValues.length} unsigned personal messages`) + allValues = allValues.concat(personalValues) + + const typedValues = valuesFor(typedMessages) + log.debug(`tx helper found ${typedValues.length} unsigned typed messages`) + allValues = allValues.concat(typedValues) + + allValues = allValues.sort((a, b) => { + return a.time > b.time + }) + + return allValues +} diff --git a/package.json b/package.json index 871ed204e..5c56d2e1b 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "test": "npm run lint && npm run test:coverage && npm run test:integration", "test:unit": "METAMASK_ENV=test mocha --exit --compilers js:babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"", "test:single": "METAMASK_ENV=test mocha --require test/helper.js", - "test:integration": "npm run test:flat && npm run test:mascara", + "test:integration": "gulp build:scss && npm run test:flat && npm run test:mascara", "test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload", "test:coveralls-upload": "if [ $COVERALLS_REPO_TOKEN ]; then nyc report --reporter=text-lcov | coveralls; fi", "test:flat": "npm run test:flat:build && karma start test/flat.conf.js", @@ -46,16 +46,22 @@ ] } ], + "reactify", "envify", "brfs" ] }, "dependencies": { + "abi-decoder": "^1.0.9", "async": "^2.5.0", "await-semaphore": "^0.1.1", "babel-runtime": "^6.23.0", + "bignumber.js": "^4.1.0", + "bip39": "^2.2.0", "bluebird": "^3.5.0", "bn.js": "^4.11.7", + "boron": "^0.2.3", + "browser-passworder": "^2.0.3", "browserify-derequire": "^0.9.4", "classnames": "^2.2.5", "client-sw-ready-event": "^3.3.0", @@ -71,20 +77,22 @@ "eslint-plugin-react": "^7.4.0", "eth-bin-to-ops": "^1.0.1", "eth-block-tracker": "^2.2.0", - "eth-contract-metadata": "^1.1.4", + "eth-contract-metadata": "^1.1.5", "eth-hd-keyring": "^1.2.1", "eth-json-rpc-filters": "^1.2.4", "eth-json-rpc-infura": "^1.0.2", - "eth-keyring-controller": "^2.1.2", + "eth-keyring-controller": "^2.1.3", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", "eth-sig-util": "^1.4.0", "eth-simple-keyring": "^1.2.0", "eth-token-tracker": "^1.1.4", + "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-wallet": "^0.6.0", "etherscan-link": "^1.0.2", + "ethjs": "^0.2.8", "ethjs-contract": "^0.1.9", "ethjs-ens": "^2.0.0", "ethjs-query": "^0.3.1", @@ -93,8 +101,11 @@ "extensionizer": "^1.0.0", "fast-json-patch": "^2.0.4", "fast-levenshtein": "^2.0.6", + "fuse.js": "^3.2.0", "gulp": "github:gulpjs/gulp#4.0", + "gulp-autoprefixer": "^4.0.0", "gulp-eslint": "^4.0.0", + "gulp-sass": "^3.1.0", "hat": "0.0.3", "human-standard-token-abi": "^1.0.2", "idb-global": "^2.1.0", @@ -128,16 +139,20 @@ "pump": "^1.0.2", "pumpify": "^1.3.4", "qrcode-npm": "0.0.3", + "ramda": "^0.24.1", "react": "^15.6.2", "react-addons-css-transition-group": "^15.6.0", "react-dom": "^15.6.2", "react-hyperscript": "^3.0.0", "react-markdown": "^3.0.0", "react-redux": "^5.0.5", - "react-select": "^1.0.0-rc.2", + "react-select": "^1.0.0", "react-simple-file-input": "^2.0.0", + "react-toggle-button": "^2.2.0", "react-tooltip-component": "^0.3.0", + "react-transition-group": "^2.2.1", "react-trigger-change": "^1.0.2", + "reactify": "^1.1.1", "readable-stream": "^2.3.3", "recompose": "^0.25.0", "redux": "^3.0.5", @@ -147,6 +162,7 @@ "sandwich-expando": "^1.1.3", "semaphore": "^1.0.5", "semver": "^5.4.1", + "shallow-copy": "0.0.1", "sw-stream": "^2.0.0", "textarea-caret": "^3.0.1", "through2": "^2.0.3", @@ -176,8 +192,10 @@ "del": "^3.0.0", "envify": "^4.0.0", "enzyme": "^3.2.0", + "enzyme-adapter-react-15": "^1.0.5", "eslint-plugin-chai": "0.0.1", "eslint-plugin-mocha": "^4.9.0", + "eslint-plugin-react": "^7.4.0", "eth-json-rpc-middleware": "^1.2.7", "fs-promise": "^2.0.3", "gulp": "github:gulpjs/gulp#4.0", @@ -186,6 +204,8 @@ "gulp-livereload": "^3.8.1", "gulp-replace": "^0.6.1", "gulp-sourcemaps": "^2.6.0", + "gulp-stylefmt": "^1.1.0", + "gulp-stylelint": "^4.0.0", "gulp-util": "^3.0.7", "gulp-watch": "^4.3.5", "gulp-zip": "^4.0.0", @@ -212,7 +232,9 @@ "react-addons-test-utils": "^15.5.1", "react-test-renderer": "^15.6.2", "react-testutils-additions": "^15.2.0", + "redux-test-utils": "^0.1.3", "sinon": "^4.0.0", + "stylelint-config-standard": "^17.0.0", "tape": "^4.5.1", "testem": "^1.10.3", "uglifyify": "^4.0.2", diff --git a/test/base.conf.js b/test/base.conf.js index 122392822..82b9d8eec 100644 --- a/test/base.conf.js +++ b/test/base.conf.js @@ -54,6 +54,8 @@ module.exports = function(config) { // Concurrency level // how many browser should be started simultaneous - concurrency: Infinity + concurrency: 1, + + nocache: true, } } diff --git a/test/helper.js b/test/helper.js index 1c5934a89..a3abbebf2 100644 --- a/test/helper.js +++ b/test/helper.js @@ -1,3 +1,7 @@ +import Enzyme from 'enzyme' +import Adapter from 'enzyme-adapter-react-15' + +Enzyme.configure({ adapter: new Adapter() }) // disallow promises from swallowing errors enableFailureOnUnhandledPromiseRejection() diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js index 61b38897e..e59897713 100644 --- a/test/integration/lib/first-time.js +++ b/test/integration/lib/first-time.js @@ -40,7 +40,8 @@ async function runFirstTimeUsageTest(assert, done) { // Scroll through terms const title = app.find('h1').text() - assert.equal(title, 'MetaMask', 'title screen') + // TODO Find where Metamask is getting added twice in the title + assert.equal(title, 'MetaMaskMetaMask', 'title screen') // enter password const pwBox = app.find('#password-box')[0] @@ -66,17 +67,17 @@ async function runFirstTimeUsageTest(assert, done) { await timeout(1000) - const detail = app.find('.account-detail-section')[0] + const detail = app.find('.wallet-view')[0] assert.ok(detail, 'Account detail section loaded.') - const sandwich = app.find('.sandwich-expando')[0] - sandwich.click() + await timeout(1000) - await timeout() + const menu = app.find('.account-menu__icon')[0] + menu.click() + + await timeout(1000) - const menu = app.find('.menu-droppo')[0] - const children = menu.children - const lock = children[children.length - 2] + const lock = app.find('.account-menu__logout-button')[0] assert.ok(lock, 'Lock menu item found') lock.click() @@ -90,36 +91,30 @@ async function runFirstTimeUsageTest(assert, done) { await timeout(1000) - const detail2 = app.find('.account-detail-section')[0] + const detail2 = app.find('.wallet-view')[0] assert.ok(detail2, 'Account detail section loaded again.') await timeout() // open account settings dropdown - const qrButton = app.find('.fa.fa-ellipsis-h')[0] + const qrButton = app.find('.wallet-view__details-button')[0] qrButton.click() await timeout(1000) - // qr code item - const qrButton2 = app.find('.dropdown-menu-item')[1] - qrButton2.click() - - await timeout(1000) - - const qrHeader = app.find('.qr-header')[0] - const qrContainer = app.find('#qr-container')[0] + const qrHeader = app.find('.editable-label__value')[0] + const qrContainer = app.find('.qr-wrapper')[0] assert.equal(qrHeader.textContent, 'Account 1', 'Should show account label.') assert.ok(qrContainer, 'QR Container found') await timeout() - const networkMenu = app.find('.network-indicator')[0] + const networkMenu = app.find('.network-component')[0] networkMenu.click() await timeout() - const networkMenu2 = app.find('.network-indicator')[0] + const networkMenu2 = app.find('.menu-droppo')[0] const children2 = networkMenu2.children children2.length[3] assert.ok(children2, 'All network options present') diff --git a/test/integration/lib/mascara-first-time.js b/test/integration/lib/mascara-first-time.js index 5c18cd254..515c7f383 100644 --- a/test/integration/lib/mascara-first-time.js +++ b/test/integration/lib/mascara-first-time.js @@ -71,14 +71,12 @@ async function runFirstTimeUsageTest (assert, done) { app.find('.buy-ether__do-it-later').click() await timeout(1000) - const sandwich = app.find('.sandwich-expando')[0] - sandwich.click() + const menu = app.find('.account-menu__icon')[0] + menu.click() await timeout() - const menu = app.find('.menu-droppo')[0] - const children = menu.children - const lock = children[children.length - 2] + const lock = app.find('.account-menu__logout-button')[0] assert.ok(lock, 'Lock menu item found') lock.click() @@ -92,31 +90,25 @@ async function runFirstTimeUsageTest (assert, done) { await timeout(1000) - const detail2 = app.find('.account-detail-section')[0] + const detail2 = app.find('.wallet-view')[0] assert.ok(detail2, 'Account detail section loaded again.') await timeout() // open account settings dropdown - const qrButton = app.find('.fa.fa-ellipsis-h')[0] + const qrButton = app.find('.wallet-view__details-button')[0] qrButton.click() await timeout(1000) - // qr code item - const qrButton2 = app.find('.dropdown-menu-item')[1] - qrButton2.click() - - await timeout(1000) - - const qrHeader = app.find('.qr-header')[0] - const qrContainer = app.find('#qr-container')[0] + const qrHeader = app.find('.editable-label__value')[0] + const qrContainer = app.find('.qr-wrapper')[0] assert.equal(qrHeader.textContent, 'Account 1', 'Should show account label.') assert.ok(qrContainer, 'QR Container found') await timeout() - const networkMenu = app.find('.network-indicator')[0] + const networkMenu = app.find('.network-component')[0] networkMenu.click() await timeout() diff --git a/test/lib/shallow-with-store.js b/test/lib/shallow-with-store.js new file mode 100644 index 000000000..2a66adb17 --- /dev/null +++ b/test/lib/shallow-with-store.js @@ -0,0 +1,16 @@ +const { shallow, mount } = require('enzyme') + +exports.shallowWithStore = function shallowWithStore (component, store) { + const context = { + store, + } + + return shallow(component, { context }) +} + +exports.mountWithStore = function mountWithStore (component, store) { + const context = { + store, + } + return mount(component, { context }) +} diff --git a/test/unit/actions/tx_test.js b/test/unit/actions/tx_test.js index ea6dfda6a..b6a691860 100644 --- a/test/unit/actions/tx_test.js +++ b/test/unit/actions/tx_test.js @@ -51,9 +51,8 @@ describe('tx confirmation screen', function () { actions.cancelTx({value: firstTxId})((action) => { result = reducers(initialState, action) - done() }) - + done() }) it('should transition to the account detail view', function () { diff --git a/test/unit/components/balance-component-test.js b/test/unit/components/balance-component-test.js new file mode 100644 index 000000000..9b1e82acf --- /dev/null +++ b/test/unit/components/balance-component-test.js @@ -0,0 +1,45 @@ +const assert = require('assert') +const h = require('react-hyperscript') +const { createMockStore } = require('redux-test-utils') +const { shallowWithStore } = require('../../lib/shallow-with-store') +const BalanceComponent = require('../../../ui/app/components/balance-component') +const mockState = { + metamask: { + accounts: { abc: {} }, + network: 1, + selectedAddress: 'abc', + } +} + +describe('BalanceComponent', function () { + let balanceComponent + let store + let component + beforeEach(function () { + store = createMockStore(mockState) + component = shallowWithStore(h(BalanceComponent), store) + balanceComponent = component.dive() + }) + + it('shows token balance and convert to fiat value based on conversion rate', function () { + const formattedBalance = '1.23 ETH' + + const tokenBalance = balanceComponent.instance().getTokenBalance(formattedBalance, false) + const fiatDisplayNumber = balanceComponent.instance().getFiatDisplayNumber(formattedBalance, 2) + + assert.equal('1.23 ETH', tokenBalance) + assert.equal(2.46, fiatDisplayNumber) + }) + + it('shows only the token balance when conversion rate is not available', function () { + const formattedBalance = '1.23 ETH' + + const tokenBalance = balanceComponent.instance().getTokenBalance(formattedBalance, false) + const fiatDisplayNumber = balanceComponent.instance().getFiatDisplayNumber(formattedBalance, 0) + + assert.equal('1.23 ETH', tokenBalance) + assert.equal('N/A', fiatDisplayNumber) + }) + +}) + diff --git a/test/unit/components/pending-tx-test.js b/test/unit/components/pending-tx-test.js index 20feba2a3..c6c588e1c 100644 --- a/test/unit/components/pending-tx-test.js +++ b/test/unit/components/pending-tx-test.js @@ -1,18 +1,22 @@ const assert = require('assert') -const additions = require('react-testutils-additions') const h = require('react-hyperscript') const PendingTx = require('../../../ui/app/components/pending-tx') -const ReactTestUtils = require('react-addons-test-utils') const ethUtil = require('ethereumjs-util') -describe('PendingTx', function () { - const identities = { - '0xfdea65c8e26263f6d9a1b5de9555d2931a33b826': { - name: 'Main Account 1', - balance: '0x00000000000000056bc75e2d63100000', - }, +const { createMockStore } = require('redux-test-utils') +const { shallowWithStore } = require('../../lib/shallow-with-store') + +const identities = { abc: {}, def: {} } +const mockState = { + metamask: { + accounts: { abc: {} }, + identities, + conversionRate: 10, + selectedAddress: 'abc', } +} +describe('PendingTx', function () { const gasPrice = '0x4A817C800' // 20 Gwei const txData = { 'id': 5021615666270214, @@ -29,55 +33,35 @@ describe('PendingTx', function () { 'gasLimitSpecified': false, 'estimatedGas': '0x5208', } + const newGasPrice = '0x77359400' + const computedBalances = {} + computedBalances[Object.keys(identities)[0]] = { + ethBalance: '0x00000000000000056bc75e2d63100000', + } + const props = { + txData, + computedBalances, + sendTransaction: (txMeta, event) => { + // Assert changes: + const result = ethUtil.addHexPrefix(txMeta.txParams.gasPrice) + assert.notEqual(result, gasPrice, 'gas price should change') + assert.equal(result, newGasPrice, 'gas price assigned.') + }, + } - it('should use updated values when edited.', function (done) { - const renderer = ReactTestUtils.createRenderer() - const newGasPrice = '0x77359400' - - const computedBalances = {} - computedBalances[Object.keys(identities)[0]] = { - ethBalance: '0x00000000000000056bc75e2d63100000', - } - const props = { - identities, - accounts: identities, - txData, - computedBalances, - sendTransaction: (txMeta, event) => { - // Assert changes: - const result = ethUtil.addHexPrefix(txMeta.txParams.gasPrice) - assert.notEqual(result, gasPrice, 'gas price should change') - assert.equal(result, newGasPrice, 'gas price assigned.') - done() - }, - } - - const pendingTxComponent = h(PendingTx, props) - const component = additions.renderIntoDocument(pendingTxComponent) - renderer.render(pendingTxComponent) - const result = renderer.getRenderOutput() - assert.equal(result.type, 'div', 'should create a div') - - try { - const input = additions.find(component, '.cell.row input[type="number"]')[1] - ReactTestUtils.Simulate.change(input, { - target: { - value: 2, - checkValidity () { return true }, - }, - }) + let pendingTxComponent + let store + let component + beforeEach(function () { + store = createMockStore(mockState) + component = shallowWithStore(h(PendingTx, props), store) + pendingTxComponent = component + }) - const form = additions.find(component, 'form')[0] - form.checkValidity = () => true - form.getFormEl = () => { return { checkValidity () { return true } } } - ReactTestUtils.Simulate.submit(form, { preventDefault () {}, target: { checkValidity () { - return true - } } }) - } catch (e) { - console.log('WHAAAA') - console.error(e) - } + it('should render correctly', function (done) { + assert.equal(pendingTxComponent.props().identities, identities) + done() }) }) diff --git a/test/unit/pending-tx-test.js b/test/unit/pending-tx-test.js index bd47299cf..64547a505 100644 --- a/test/unit/pending-tx-test.js +++ b/test/unit/pending-tx-test.js @@ -12,6 +12,7 @@ const currentNetworkId = 42 const otherNetworkId = 36 const privKey = new Buffer('8718b9618a37d1fc78c436511fc6df3c8258d3250635bba617f33003270ec03e', 'hex') + describe('PendingTransactionTracker', function () { let pendingTxTracker, txMeta, txMetaNoHash, txMetaNoRawTx, providerResultStub, provider, txMeta3, txList, knownErrors diff --git a/test/unit/responsive/components/dropdown-test.js b/test/unit/responsive/components/dropdown-test.js index 3ad2c390e..982d8c6ec 100644 --- a/test/unit/responsive/components/dropdown-test.js +++ b/test/unit/responsive/components/dropdown-test.js @@ -1,40 +1,45 @@ -var assert = require('assert'); +const assert = require('assert'); -const additions = require('react-testutils-additions'); const h = require('react-hyperscript'); -const ReactTestUtils = require('react-addons-test-utils'); const sinon = require('sinon'); const path = require('path'); -const Dropdown = require(path.join(__dirname, '..', '..', '..', '..', 'ui', 'app', 'components', 'dropdown.js')).Dropdown; -const DropdownMenuItem = require(path.join(__dirname, '..', '..', '..', '..', 'ui', 'app', 'components', 'dropdown.js')).DropdownMenuItem; +const Dropdown = require(path.join(__dirname, '..', '..', '..', '..', 'ui', 'app', 'components', 'dropdowns', 'index.js')).Dropdown; + +const { createMockStore } = require('redux-test-utils') +const { mountWithStore } = require('../../../lib/shallow-with-store') + +const mockState = { + metamask: { + } +} describe('Dropdown components', function () { let onClickOutside; let closeMenu; let onClick; - let dropdownComponentProps; - const renderer = ReactTestUtils.createRenderer() + let dropdownComponentProps = { + isOpen: true, + zIndex: 11, + onClickOutside, + style: { + position: 'absolute', + right: 0, + top: '36px', + }, + innerStyle: {}, + } + + let dropdownComponent + let store + let component beforeEach(function () { onClickOutside = sinon.spy(); closeMenu = sinon.spy(); onClick = sinon.spy(); - dropdownComponentProps = { - isOpen: true, - zIndex: 11, - onClickOutside, - style: { - position: 'absolute', - right: 0, - top: '36px', - }, - innerStyle: {}, - } - }); - - it('can render two items', function () { - const dropdownComponent = h( + store = createMockStore(mockState) + component = mountWithStore(h( Dropdown, dropdownComponentProps, [ @@ -42,74 +47,35 @@ describe('Dropdown components', function () { .drop-menu-item:hover { background:rgb(235, 235, 235); } .drop-menu-item i { margin: 11px; } `), - h(DropdownMenuItem, { + h('li', { closeMenu, onClick, }, 'Item 1'), - h(DropdownMenuItem, { + h('li', { closeMenu, onClick, }, 'Item 2'), ] - ) + ), store) + dropdownComponent = component + }) - const component = additions.renderIntoDocument(dropdownComponent); - renderer.render(dropdownComponent); - const items = additions.find(component, 'li'); + it('can render two items', function () { + const items = dropdownComponent.find('li'); assert.equal(items.length, 2); }); it('closes when item clicked', function() { - const dropdownComponent = h( - Dropdown, - dropdownComponentProps, - [ - h('style', ` - .drop-menu-item:hover { background:rgb(235, 235, 235); } - .drop-menu-item i { margin: 11px; } - `), - h(DropdownMenuItem, { - closeMenu, - onClick, - }, 'Item 1'), - h(DropdownMenuItem, { - closeMenu, - onClick, - }, 'Item 2'), - ] - ) - const component = additions.renderIntoDocument(dropdownComponent); - renderer.render(dropdownComponent); - const items = additions.find(component, 'li'); - const node = items[0]; - ReactTestUtils.Simulate.click(node); - assert.equal(closeMenu.calledOnce, true); + const items = dropdownComponent.find('li'); + const node = items.at(0); + node.simulate('click'); + assert.equal(node.props().closeMenu, closeMenu); }); it('invokes click handler when item clicked', function() { - const dropdownComponent = h( - Dropdown, - dropdownComponentProps, - [ - h('style', ` - .drop-menu-item:hover { background:rgb(235, 235, 235); } - .drop-menu-item i { margin: 11px; } - `), - h(DropdownMenuItem, { - closeMenu, - onClick, - }, 'Item 1'), - h(DropdownMenuItem, { - closeMenu, - onClick, - }, 'Item 2'), - ] - ) - const component = additions.renderIntoDocument(dropdownComponent); - renderer.render(dropdownComponent); - const items = additions.find(component, 'li'); - const node = items[0]; - ReactTestUtils.Simulate.click(node); + const items = dropdownComponent.find('li'); + const node = items.at(0); + node.simulate('click'); assert.equal(onClick.calledOnce, true); }); }); diff --git a/ui/app/account-and-transaction-details.js b/ui/app/account-and-transaction-details.js new file mode 100644 index 000000000..60293de77 --- /dev/null +++ b/ui/app/account-and-transaction-details.js @@ -0,0 +1,38 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +// Main Views +const TxView = require('./components/tx-view') +const WalletView = require('./components/wallet-view') + +module.exports = AccountAndTransactionDetails + +inherits(AccountAndTransactionDetails, Component) +function AccountAndTransactionDetails () { + Component.call(this) +} + +AccountAndTransactionDetails.prototype.render = function () { + return h('div', { + style: { + display: 'flex', + flex: '1 0 auto', + }, + }, [ + // wallet + h(WalletView, { + style: { + }, + responsiveDisplayClassname: '.lap-visible', + }, [ + ]), + + // transaction + h(TxView, { + style: { + }, + }, [ + ]), + ]) +} + diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index d4f707e0b..0da435298 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -5,15 +5,10 @@ const h = require('react-hyperscript') const connect = require('react-redux').connect const actions = require('./actions') const valuesFor = require('./util').valuesFor -const Identicon = require('./components/identicon') -const EthBalance = require('./components/eth-balance') const TransactionList = require('./components/transaction-list') const ExportAccountView = require('./components/account-export') -const ethUtil = require('ethereumjs-util') -const EditableLabel = require('./components/editable-label') const TabBar = require('./components/tab-bar') const TokenList = require('./components/token-list') -const AccountDropdowns = require('./components/account-dropdowns').AccountDropdowns module.exports = connect(mapStateToProps)(AccountDetailScreen) @@ -41,180 +36,11 @@ function AccountDetailScreen () { Component.call(this) } -AccountDetailScreen.prototype.render = function () { - var props = this.props - var selected = props.address || Object.keys(props.accounts)[0] - var checksumAddress = selected && ethUtil.toChecksumAddress(selected) - var identity = props.identities[selected] - var account = props.accounts[selected] - const { network, conversionRate, currentCurrency } = props - - return ( - - h('.account-detail-section.full-flex-height', [ - - // identicon, label, balance, etc - h('.account-data-subsection', { - style: { - margin: '0 20px', - flex: '1 0 auto', - }, - }, [ - - // header - identicon + nav - h('div', { - style: { - paddingTop: '20px', - display: 'flex', - justifyContent: 'flex-start', - alignItems: 'flex-start', - }, - }, [ - - // large identicon and addresses - h('.identicon-wrapper.select-none', [ - h(Identicon, { - diameter: 62, - address: selected, - }), - ]), - h('flex-column', { - style: { - lineHeight: '10px', - marginLeft: '15px', - width: '100%', - }, - }, [ - h(EditableLabel, { - textValue: identity ? identity.name : '', - state: { - isEditingLabel: false, - }, - saveText: (text) => { - props.dispatch(actions.saveAccountLabel(selected, text)) - }, - }, [ - - // What is shown when not editing + edit text: - h('label.editing-label', [h('.edit-text', 'edit')]), - h( - 'div', - { - style: { - display: 'flex', - justifyContent: 'flex-start', - alignItems: 'center', - }, - }, - [ - h( - 'div.font-medium.color-forest', - { - name: 'edit', - style: { - }, - }, - [ - h('h2', { - style: { - maxWidth: '180px', - overflow: 'hidden', - textOverflow: 'ellipsis', - padding: '5px 0px', - lineHeight: '25px', - }, - }, [ - identity && identity.name, - ]), - ] - ), - h( - AccountDropdowns, - { - style: { - marginRight: '8px', - marginLeft: 'auto', - cursor: 'pointer', - }, - selected, - network, - identities: props.identities, - enableAccountOptions: true, - }, - ), - ] - ), - ]), - h('.flex-row', { - style: { - width: '15em', - justifyContent: 'space-between', - alignItems: 'baseline', - }, - }, [ - - // address - - h('div', { - style: { - overflow: 'hidden', - textOverflow: 'ellipsis', - paddingTop: '3px', - width: '5em', - fontSize: '13px', - fontFamily: 'Montserrat Light', - textRendering: 'geometricPrecision', - marginBottom: '15px', - color: '#AEAEAE', - }, - }, checksumAddress), - ]), - - // account ballence - - ]), - ]), - h('.flex-row', { - style: { - justifyContent: 'space-between', - alignItems: 'flex-start', - }, - }, [ - - h(EthBalance, { - value: account && account.balance, - conversionRate, - currentCurrency, - style: { - lineHeight: '7px', - marginTop: '10px', - }, - }), - - h('.flex-grow'), - - h('button', { - onClick: () => props.dispatch(actions.buyEthView(selected)), - style: { marginRight: '10px' }, - }, 'BUY'), - - h('button', { - onClick: () => props.dispatch(actions.showSendPage()), - style: { - marginBottom: '20px', - marginRight: '8px', - }, - }, 'SEND'), - - ]), - ]), - - // subview (tx history, pk export confirm, buy eth warning) - this.subview(), - - ]) - ) -} +// Note: This component is no longer used. Leaving the file for reference: +// - structuring routing for add token +// - state required for TxList +// Delete file when those features are complete +AccountDetailScreen.prototype.render = function () {} AccountDetailScreen.prototype.subview = function () { var subview diff --git a/ui/app/accounts/import/index.js b/ui/app/accounts/import/index.js index 46260c3e7..b7d9a9537 100644 --- a/ui/app/accounts/import/index.js +++ b/ui/app/accounts/import/index.js @@ -34,8 +34,10 @@ AccountImportSubview.prototype.render = function () { const { type } = state return ( - h('div', { + h('div.flex-center', { style: { + flexDirection: 'column', + marginTop: '32px', }, }, [ h('.section-title.flex-row.flex-center', [ @@ -48,7 +50,8 @@ AccountImportSubview.prototype.render = function () { ]), h('div', { style: { - padding: '10px', + padding: '10px 0', + width: '260px', color: 'rgb(174, 174, 174)', }, }, [ diff --git a/ui/app/accounts/import/json.js b/ui/app/accounts/import/json.js index 158a3c923..486ed8886 100644 --- a/ui/app/accounts/import/json.js +++ b/ui/app/accounts/import/json.js @@ -5,7 +5,7 @@ const connect = require('react-redux').connect const actions = require('../../actions') const FileInput = require('react-simple-file-input').default -const HELP_LINK = 'https://github.com/MetaMask/faq/blob/master/README.md#q-i-cant-use-the-import-feature-for-uploading-a-json-file-the-window-keeps-closing-when-i-try-to-select-a-file' +const HELP_LINK = 'https://support.metamask.io/kb/article/7-importing-accounts' module.exports = connect(mapStateToProps)(JsonImportSubview) diff --git a/ui/app/accounts/import/private-key.js b/ui/app/accounts/import/private-key.js index 68ccee58e..e214bcbbe 100644 --- a/ui/app/accounts/import/private-key.js +++ b/ui/app/accounts/import/private-key.js @@ -17,6 +17,10 @@ function PrivateKeyImportView () { Component.call(this) } +PrivateKeyImportView.prototype.componentWillUnmount = function () { + this.props.dispatch(actions.displayWarning(null)) +} + PrivateKeyImportView.prototype.render = function () { const { error } = this.props diff --git a/ui/app/actions.js b/ui/app/actions.js index 52ea899aa..bd3aab45a 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -1,10 +1,27 @@ +const abi = require('human-standard-token-abi') const getBuyEthUrl = require('../../app/scripts/lib/buy-eth-url') +const ethUtil = require('ethereumjs-util') var actions = { _setBackgroundConnection: _setBackgroundConnection, GO_HOME: 'GO_HOME', goHome: goHome, + // modal state + MODAL_OPEN: 'UI_MODAL_OPEN', + MODAL_CLOSE: 'UI_MODAL_CLOSE', + showModal: showModal, + hideModal: hideModal, + // sidebar state + SIDEBAR_OPEN: 'UI_SIDEBAR_OPEN', + SIDEBAR_CLOSE: 'UI_SIDEBAR_CLOSE', + showSidebar: showSidebar, + hideSidebar: hideSidebar, + // network dropdown open + NETWORK_DROPDOWN_OPEN: 'UI_NETWORK_DROPDOWN_OPEN', + NETWORK_DROPDOWN_CLOSE: 'UI_NETWORK_DROPDOWN_CLOSE', + showNetworkDropdown: showNetworkDropdown, + hideNetworkDropdown: hideNetworkDropdown, // menu state getNetworkStatus: 'getNetworkStatus', // transition state @@ -68,6 +85,8 @@ var actions = { hideWarning: hideWarning, // accounts screen SET_SELECTED_ACCOUNT: 'SET_SELECTED_ACCOUNT', + SET_SELECTED_TOKEN: 'SET_SELECTED_TOKEN', + setSelectedToken, SHOW_ACCOUNT_DETAIL: 'SHOW_ACCOUNT_DETAIL', SHOW_ACCOUNTS_PAGE: 'SHOW_ACCOUNTS_PAGE', SHOW_CONF_TX_PAGE: 'SHOW_CONF_TX_PAGE', @@ -78,6 +97,8 @@ var actions = { // account detail screen SHOW_SEND_PAGE: 'SHOW_SEND_PAGE', showSendPage: showSendPage, + SHOW_SEND_TOKEN_PAGE: 'SHOW_SEND_TOKEN_PAGE', + showSendTokenPage, ADD_TO_ADDRESS_BOOK: 'ADD_TO_ADDRESS_BOOK', addToAddressBook: addToAddressBook, REQUEST_ACCOUNT_EXPORT: 'REQUEST_ACCOUNT_EXPORT', @@ -86,6 +107,7 @@ var actions = { exportAccount: exportAccount, SHOW_PRIVATE_KEY: 'SHOW_PRIVATE_KEY', showPrivateKey: showPrivateKey, + exportAccountComplete, SAVE_ACCOUNT_LABEL: 'SAVE_ACCOUNT_LABEL', saveAccountLabel: saveAccountLabel, // tx conf screen @@ -93,22 +115,57 @@ var actions = { TRANSACTION_ERROR: 'TRANSACTION_ERROR', NEXT_TX: 'NEXT_TX', PREVIOUS_TX: 'PREV_TX', + EDIT_TX: 'EDIT_TX', signMsg: signMsg, cancelMsg: cancelMsg, signPersonalMsg, cancelPersonalMsg, signTypedMsg, cancelTypedMsg, + sendTx: sendTx, signTx: signTx, + signTokenTx: signTokenTx, + updateTransaction, updateAndApproveTx, cancelTx: cancelTx, completedTx: completedTx, txError: txError, nextTx: nextTx, + editTx, previousTx: previousTx, cancelAllTx: cancelAllTx, viewPendingTx: viewPendingTx, VIEW_PENDING_TX: 'VIEW_PENDING_TX', + updateTransactionParams, + UPDATE_TRANSACTION_PARAMS: 'UPDATE_TRANSACTION_PARAMS', + // send screen + estimateGas, + getGasPrice, + UPDATE_GAS_LIMIT: 'UPDATE_GAS_LIMIT', + UPDATE_GAS_PRICE: 'UPDATE_GAS_PRICE', + UPDATE_GAS_TOTAL: 'UPDATE_GAS_TOTAL', + UPDATE_SEND_FROM: 'UPDATE_SEND_FROM', + UPDATE_SEND_TOKEN_BALANCE: 'UPDATE_SEND_TOKEN_BALANCE', + UPDATE_SEND_TO: 'UPDATE_SEND_TO', + UPDATE_SEND_AMOUNT: 'UPDATE_SEND_AMOUNT', + UPDATE_SEND_MEMO: 'UPDATE_SEND_MEMO', + UPDATE_SEND_ERRORS: 'UPDATE_SEND_ERRORS', + UPDATE_MAX_MODE: 'UPDATE_MAX_MODE', + UPDATE_SEND: 'UPDATE_SEND', + CLEAR_SEND: 'CLEAR_SEND', + updateGasLimit, + updateGasPrice, + updateGasTotal, + updateSendTokenBalance, + updateSendFrom, + updateSendTo, + updateSendAmount, + updateSendMemo, + updateSendErrors, + setMaxModeTo, + updateSend, + clearSend, + setSelectedAddress, // app messages confirmSeedWords: confirmSeedWords, showAccountDetail: showAccountDetail, @@ -125,8 +182,13 @@ var actions = { SHOW_ADD_TOKEN_PAGE: 'SHOW_ADD_TOKEN_PAGE', showAddTokenPage, addToken, + addTokens, + removeToken, + updateTokens, + UPDATE_TOKENS: 'UPDATE_TOKENS', setRpcTarget: setRpcTarget, setProviderType: setProviderType, + updateProviderType, // loading overlay SHOW_LOADING: 'SHOW_LOADING_INDICATION', HIDE_LOADING: 'HIDE_LOADING_INDICATION', @@ -144,6 +206,8 @@ var actions = { coinBaseSubview: coinBaseSubview, SHAPESHIFT_SUBVIEW: 'SHAPESHIFT_SUBVIEW', shapeShiftSubview: shapeShiftSubview, + UPDATE_TOKEN_EXCHANGE_RATE: 'UPDATE_TOKEN_EXCHANGE_RATE', + updateTokenExchangeRate, PAIR_UPDATE: 'PAIR_UPDATE', pairUpdate: pairUpdate, coinShiftRquest: coinShiftRquest, @@ -168,6 +232,25 @@ var actions = { callBackgroundThenUpdate, forceUpdateMetamaskState, + + TOGGLE_ACCOUNT_MENU: 'TOGGLE_ACCOUNT_MENU', + toggleAccountMenu, + + useEtherscanProvider, + + SET_USE_BLOCKIE: 'SET_USE_BLOCKIE', + setUseBlockie, + + // Feature Flags + setFeatureFlag, + updateFeatureFlags, + UPDATE_FEATURE_FLAGS: 'UPDATE_FEATURE_FLAGS', + + // Network + setNetworkEndpoints, + updateNetworkEndpointType, + UPDATE_NETWORK_ENDPOINT_TYPE: 'UPDATE_NETWORK_ENDPOINT_TYPE', + retryTransaction, } @@ -357,7 +440,24 @@ function navigateToNewAccountScreen () { function addNewAccount () { log.debug(`background.addNewAccount`) - return callBackgroundThenUpdate(background.addNewAccount) + return (dispatch, getState) => { + const oldIdentities = getState().metamask.identities + dispatch(actions.showLoadingIndication()) + return new Promise((resolve, reject) => { + background.addNewAccount((err, { identities: newIdentities}) => { + if (err) { + dispatch(actions.displayWarning(err.message)) + return reject(err) + } + const newAccountAddress = Object.keys(newIdentities).find(address => !oldIdentities[address]) + + dispatch(actions.hideLoadingIndication()) + + forceUpdateMetamaskState(dispatch) + return resolve(newAccountAddress) + }) + }) + } } function showInfoPage () { @@ -368,16 +468,16 @@ function showInfoPage () { function setCurrentCurrency (currencyCode) { return (dispatch) => { - dispatch(this.showLoadingIndication()) + dispatch(actions.showLoadingIndication()) log.debug(`background.setCurrentCurrency`) background.setCurrentCurrency(currencyCode, (err, data) => { - dispatch(this.hideLoadingIndication()) + dispatch(actions.hideLoadingIndication()) if (err) { log.error(err.stack) return dispatch(actions.displayWarning(err.message)) } dispatch({ - type: this.SET_CURRENT_FIAT, + type: actions.SET_CURRENT_FIAT, value: { currentCurrency: data.currentCurrency, conversionRate: data.conversionRate, @@ -450,10 +550,170 @@ function signTx (txData) { dispatch(actions.showLoadingIndication()) global.ethQuery.sendTransaction(txData, (err, data) => { dispatch(actions.hideLoadingIndication()) - if (err) dispatch(actions.displayWarning(err.message)) - dispatch(this.goHome()) + if (err) return dispatch(actions.displayWarning(err.message)) + dispatch(actions.hideWarning()) + }) + dispatch(actions.showConfTxPage({})) + } +} + +function estimateGas (params = {}) { + return (dispatch) => { + return new Promise((resolve, reject) => { + global.ethQuery.estimateGas(params, (err, data) => { + if (err) { + dispatch(actions.displayWarning(err.message)) + return reject(err) + } + dispatch(actions.hideWarning()) + dispatch(actions.updateGasLimit(data)) + return resolve(data) + }) + }) + } +} + +function updateGasLimit (gasLimit) { + return { + type: actions.UPDATE_GAS_LIMIT, + value: gasLimit, + } +} + +function getGasPrice () { + return (dispatch) => { + return new Promise((resolve, reject) => { + global.ethQuery.gasPrice((err, data) => { + if (err) { + dispatch(actions.displayWarning(err.message)) + return reject(err) + } + dispatch(actions.hideWarning()) + dispatch(actions.updateGasPrice(data)) + return resolve(data) + }) + }) + } +} + +function updateGasPrice (gasPrice) { + return { + type: actions.UPDATE_GAS_PRICE, + value: gasPrice, + } +} + +function updateGasTotal (gasTotal) { + return { + type: actions.UPDATE_GAS_TOTAL, + value: gasTotal, + } +} + +function updateSendTokenBalance (tokenBalance) { + return { + type: actions.UPDATE_SEND_TOKEN_BALANCE, + value: tokenBalance, + } +} + +function updateSendFrom (from) { + return { + type: actions.UPDATE_SEND_FROM, + value: from, + } +} + +function updateSendTo (to) { + return { + type: actions.UPDATE_SEND_TO, + value: to, + } +} + +function updateSendAmount (amount) { + return { + type: actions.UPDATE_SEND_AMOUNT, + value: amount, + } +} + +function updateSendMemo (memo) { + return { + type: actions.UPDATE_SEND_MEMO, + value: memo, + } +} + +function updateSendErrors (error) { + return { + type: actions.UPDATE_SEND_ERRORS, + value: error, + } +} + +function setMaxModeTo (bool) { + return { + type: actions.UPDATE_MAX_MODE, + value: bool, + } +} + +function updateSend (newSend) { + return { + type: actions.UPDATE_SEND, + value: newSend, + } +} + +function clearSend () { + return { + type: actions.CLEAR_SEND, + } +} + + +function sendTx (txData) { + log.info(`actions - sendTx: ${JSON.stringify(txData.txParams)}`) + return (dispatch) => { + log.debug(`actions calling background.approveTransaction`) + background.approveTransaction(txData.id, (err) => { + if (err) { + dispatch(actions.txError(err)) + return log.error(err.message) + } + dispatch(actions.completedTx(txData.id)) + }) + } +} + +function signTokenTx (tokenAddress, toAddress, amount, txData) { + return dispatch => { + dispatch(actions.showLoadingIndication()) + const token = global.eth.contract(abi).at(tokenAddress) + token.transfer(toAddress, ethUtil.addHexPrefix(amount), txData) + .catch(err => { + dispatch(actions.hideLoadingIndication()) + dispatch(actions.displayWarning(err.message)) + }) + dispatch(actions.showConfTxPage({})) + } +} + +function updateTransaction (txData) { + log.info('actions: updateTx: ' + JSON.stringify(txData)) + return (dispatch) => { + log.debug(`actions calling background.updateTx`) + background.updateTransaction(txData, (err) => { + dispatch(actions.hideLoadingIndication()) + dispatch(actions.updateTransactionParams(txData.id, txData.txParams)) + if (err) { + dispatch(actions.txError(err)) + dispatch(actions.goHome()) + return log.error(err.message) + } + dispatch(actions.showConfTxPage({ id: txData.id })) }) - dispatch(actions.showConfTxPage()) } } @@ -463,6 +723,8 @@ function updateAndApproveTx (txData) { log.debug(`actions calling background.updateAndApproveTx`) background.updateAndApproveTransaction(txData, (err) => { dispatch(actions.hideLoadingIndication()) + dispatch(actions.updateTransactionParams(txData.id, txData.txParams)) + dispatch(actions.clearSend()) if (err) { dispatch(actions.txError(err)) dispatch(actions.goHome()) @@ -480,6 +742,14 @@ function completedTx (id) { } } +function updateTransactionParams (id, txParams) { + return { + type: actions.UPDATE_TRANSACTION_PARAMS, + id, + value: txParams, + } +} + function txError (err) { return { type: actions.TRANSACTION_ERROR, @@ -509,6 +779,7 @@ function cancelTx (txData) { return (dispatch) => { log.debug(`background.cancelTransaction`) background.cancelTransaction(txData.id, () => { + dispatch(actions.clearSend()) dispatch(actions.completedTx(txData.id)) }) } @@ -614,9 +885,50 @@ function updateMetamaskState (newState) { } } +const backgroundSetLocked = () => { + return new Promise((resolve, reject) => { + background.setLocked(error => { + if (error) { + return reject(error) + } + + resolve() + }) + }) +} + +const updateMetamaskStateFromBackground = () => { + log.debug(`background.getState`) + + return new Promise((resolve, reject) => { + background.getState((error, newState) => { + if (error) { + return reject(error) + } + + resolve(newState) + }) + }) +} + function lockMetamask () { log.debug(`background.setLocked`) - return callBackgroundThenUpdate(background.setLocked) + + return dispatch => { + dispatch(actions.showLoadingIndication()) + + return backgroundSetLocked() + .then(() => updateMetamaskStateFromBackground()) + .catch(error => { + dispatch(actions.displayWarning(error.message)) + return Promise.reject(error) + }) + .then(newState => { + dispatch(actions.updateMetamaskState(newState)) + dispatch({ type: actions.LOCK_METAMASK }) + }) + .catch(() => dispatch({ type: actions.LOCK_METAMASK })) + } } function setCurrentAccountTab (newTabName) { @@ -624,6 +936,26 @@ function setCurrentAccountTab (newTabName) { return callBackgroundThenUpdateNoSpinner(background.setCurrentAccountTab, newTabName) } +function setSelectedToken (tokenAddress) { + return { + type: actions.SET_SELECTED_TOKEN, + value: tokenAddress || null, + } +} + +function setSelectedAddress (address) { + return (dispatch) => { + dispatch(actions.showLoadingIndication()) + log.debug(`background.setSelectedAddress`) + background.setSelectedAddress(address, (err) => { + dispatch(actions.hideLoadingIndication()) + if (err) { + return dispatch(actions.displayWarning(err.message)) + } + }) + } +} + function showAccountDetail (address) { return (dispatch) => { dispatch(actions.showLoadingIndication()) @@ -637,6 +969,7 @@ function showAccountDetail (address) { type: actions.SHOW_ACCOUNT_DETAIL, value: address, }) + dispatch(actions.setSelectedToken()) }) } } @@ -654,10 +987,11 @@ function showAccountsPage () { } } -function showConfTxPage (transForward = true) { +function showConfTxPage ({transForward = true, id}) { return { type: actions.SHOW_CONF_TX_PAGE, - transForward: transForward, + transForward, + id, } } @@ -680,6 +1014,13 @@ function previousTx () { } } +function editTx (txId) { + return { + type: actions.EDIT_TX, + value: txId, + } +} + function showConfigPage (transitionForward = true) { return { type: actions.SHOW_CONFIG_PAGE, @@ -697,18 +1038,62 @@ function showAddTokenPage (transitionForward = true) { function addToken (address, symbol, decimals) { return (dispatch) => { dispatch(actions.showLoadingIndication()) - background.addToken(address, symbol, decimals, (err) => { - dispatch(actions.hideLoadingIndication()) - if (err) { - return dispatch(actions.displayWarning(err.message)) - } - setTimeout(() => { - dispatch(actions.goHome()) - }, 250) + return new Promise((resolve, reject) => { + background.addToken(address, symbol, decimals, (err, tokens) => { + dispatch(actions.hideLoadingIndication()) + if (err) { + dispatch(actions.displayWarning(err.message)) + reject(err) + } + dispatch(actions.updateTokens(tokens)) + resolve(tokens) + }) + }) + } +} + +function removeToken (address) { + return (dispatch) => { + dispatch(actions.showLoadingIndication()) + return new Promise((resolve, reject) => { + background.removeToken(address, (err, tokens) => { + dispatch(actions.hideLoadingIndication()) + if (err) { + dispatch(actions.displayWarning(err.message)) + reject(err) + } + dispatch(actions.updateTokens(tokens)) + resolve(tokens) + }) }) } } +function addTokens (tokens) { + return dispatch => { + if (Array.isArray(tokens)) { + return Promise.all(tokens.map(({ address, symbol, decimals }) => ( + dispatch(addToken(address, symbol, decimals)) + ))) + } else { + return Promise.all( + Object + .entries(tokens) + .map(([_, { address, symbol, decimals }]) => ( + dispatch(addToken(address, symbol, decimals)) + )) + ) + } + } +} + +function updateTokens (newTokens) { + return { + type: actions.UPDATE_TOKENS, + newTokens, + } +} + function goBackToInitView () { return { type: actions.BACK_TO_INIT_MENU, @@ -785,11 +1170,17 @@ function setProviderType (type) { log.error(err) return dispatch(self.displayWarning('Had a problem changing networks!')) } + dispatch(actions.updateProviderType(type)) + dispatch(actions.setSelectedToken()) }) - return { - type: actions.SET_PROVIDER_TYPE, - value: type, - } + + } +} + +function updateProviderType (type) { + return { + type: actions.SET_PROVIDER_TYPE, + value: type, } } @@ -806,7 +1197,7 @@ function setRpcTarget (newRpc) { } // Calls the addressBookController to add a new address. -function addToAddressBook (recipient, nickname) { +function addToAddressBook (recipient, nickname = '') { log.debug(`background.addToAddressBook`) return (dispatch) => { background.setAddressBook(recipient, nickname, (err, result) => { @@ -818,6 +1209,54 @@ function addToAddressBook (recipient, nickname) { } } +function useEtherscanProvider () { + log.debug(`background.useEtherscanProvider`) + background.useEtherscanProvider() + return { + type: actions.USE_ETHERSCAN_PROVIDER, + } +} + +function showNetworkDropdown () { + return { + type: actions.NETWORK_DROPDOWN_OPEN, + } +} + +function hideNetworkDropdown () { + return { + type: actions.NETWORK_DROPDOWN_CLOSE, + } +} + + +function showModal (payload) { + return { + type: actions.MODAL_OPEN, + payload, + } +} + +function hideModal (payload) { + return { + type: actions.MODAL_CLOSE, + payload, + } +} + +function showSidebar () { + return { + type: actions.SIDEBAR_OPEN, + } +} + +function hideSidebar () { + return { + type: actions.SIDEBAR_CLOSE, + } +} + + function showLoadingIndication (message) { return { type: actions.SHOW_LOADING, @@ -869,27 +1308,40 @@ function exportAccount (password, address) { dispatch(self.showLoadingIndication()) log.debug(`background.submitPassword`) - background.submitPassword(password, function (err) { - if (err) { - log.error('Error in submiting password.') - dispatch(self.hideLoadingIndication()) - return dispatch(self.displayWarning('Incorrect Password.')) - } - log.debug(`background.exportAccount`) - background.exportAccount(address, function (err, result) { - dispatch(self.hideLoadingIndication()) - + return new Promise((resolve, reject) => { + background.submitPassword(password, function (err) { if (err) { - log.error(err) - return dispatch(self.displayWarning('Had a problem exporting the account.')) + log.error('Error in submiting password.') + dispatch(self.hideLoadingIndication()) + dispatch(self.displayWarning('Incorrect Password.')) + return reject(err) } + log.debug(`background.exportAccount`) + return background.exportAccount(address, function (err, result) { + dispatch(self.hideLoadingIndication()) + + if (err) { + log.error(err) + dispatch(self.displayWarning('Had a problem exporting the account.')) + return reject(err) + } - dispatch(self.showPrivateKey(result)) + // dispatch(self.exportAccountComplete()) + dispatch(self.showPrivateKey(result)) + + return resolve(result) + }) }) }) } } +function exportAccountComplete () { + return { + type: actions.EXPORT_ACCOUNT, + } +} + function showPrivateKey (key) { return { type: actions.SHOW_PRIVATE_KEY, @@ -901,14 +1353,22 @@ function saveAccountLabel (account, label) { return (dispatch) => { dispatch(actions.showLoadingIndication()) log.debug(`background.saveAccountLabel`) - background.saveAccountLabel(account, label, (err) => { - dispatch(actions.hideLoadingIndication()) - if (err) { - return dispatch(actions.displayWarning(err.message)) - } - dispatch({ - type: actions.SAVE_ACCOUNT_LABEL, - value: { account, label }, + + return new Promise((resolve, reject) => { + background.saveAccountLabel(account, label, (err) => { + dispatch(actions.hideLoadingIndication()) + + if (err) { + dispatch(actions.displayWarning(err.message)) + reject(err) + } + + dispatch({ + type: actions.SAVE_ACCOUNT_LABEL, + value: { account, label }, + }) + + resolve(account) }) }) } @@ -920,6 +1380,12 @@ function showSendPage () { } } +function showSendTokenPage () { + return { + type: actions.SHOW_SEND_TOKEN_PAGE, + } +} + function buyEth (opts) { return (dispatch) => { const url = getBuyEthUrl(opts) @@ -1037,6 +1503,10 @@ function reshowQrCode (data, coin) { dispatch(actions.hideLoadingIndication()) return dispatch(actions.showQrView(data, message)) + // return dispatch(actions.showModal({ + // name: 'SHAPESHIFT_DEPOSIT_TX', + // Qr: { data, message }, + // })) }) } } @@ -1070,6 +1540,53 @@ function shapeShiftRequest (query, options, cb) { } } +function updateTokenExchangeRate (token = '') { + const pair = `${token.toLowerCase()}_eth` + + return dispatch => { + if (!token) { + return + } + + shapeShiftRequest('marketinfo', { pair }, marketinfo => { + if (!marketinfo.error) { + dispatch({ + type: actions.UPDATE_TOKEN_EXCHANGE_RATE, + payload: { + pair, + marketinfo, + }, + }) + } + }) + } +} + +function setFeatureFlag (feature, activated, notificationType) { + return (dispatch) => { + dispatch(actions.showLoadingIndication()) + return new Promise((resolve, reject) => { + background.setFeatureFlag(feature, activated, (err, updatedFeatureFlags) => { + dispatch(actions.hideLoadingIndication()) + if (err) { + dispatch(actions.displayWarning(err.message)) + return reject(err) + } + dispatch(actions.updateFeatureFlags(updatedFeatureFlags)) + notificationType && dispatch(actions.showModal({ name: notificationType })) + resolve(updatedFeatureFlags) + }) + }) + } +} + +function updateFeatureFlags (updatedFeatureFlags) { + return { + type: actions.UPDATE_FEATURE_FLAGS, + value: updatedFeatureFlags, + } +} + // Call Background Then Update // // A function generator for a common pattern wherein: @@ -1111,3 +1628,50 @@ function forceUpdateMetamaskState (dispatch) { dispatch(actions.updateMetamaskState(newState)) }) } + +function toggleAccountMenu () { + return { + type: actions.TOGGLE_ACCOUNT_MENU, + } +} + +function setUseBlockie (val) { + return (dispatch) => { + dispatch(actions.showLoadingIndication()) + log.debug(`background.setUseBlockie`) + background.setUseBlockie(val, (err) => { + dispatch(actions.hideLoadingIndication()) + if (err) { + return dispatch(actions.displayWarning(err.message)) + } + }) + dispatch({ + type: actions.SET_USE_BLOCKIE, + value: val, + }) + } +} + +function setNetworkEndpoints (networkEndpointType) { + return dispatch => { + log.debug('background.setNetworkEndpoints') + return new Promise((resolve, reject) => { + background.setNetworkEndpoints(networkEndpointType, err => { + if (err) { + dispatch(actions.displayWarning(err.message)) + return reject(err) + } + + dispatch(actions.updateNetworkEndpointType(networkEndpointType)) + resolve(networkEndpointType) + }) + }) + } +} + +function updateNetworkEndpointType (networkEndpointType) { + return { + type: actions.UPDATE_NETWORK_ENDPOINT_TYPE, + value: networkEndpointType, + } +} diff --git a/ui/app/add-token.js b/ui/app/add-token.js index 9354a4cad..10aaae103 100644 --- a/ui/app/add-token.js +++ b/ui/app/add-token.js @@ -1,238 +1,357 @@ const inherits = require('util').inherits const Component = require('react').Component +const classnames = require('classnames') const h = require('react-hyperscript') const connect = require('react-redux').connect +const Fuse = require('fuse.js') +const contractMap = require('eth-contract-metadata') +const TokenBalance = require('./components/token-balance') +const Identicon = require('./components/identicon') +const contractList = Object.entries(contractMap) + .map(([ _, tokenData]) => tokenData) + .filter(tokenData => Boolean(tokenData.erc20)) +const fuse = new Fuse(contractList, { + shouldSort: true, + threshold: 0.45, + location: 0, + distance: 100, + maxPatternLength: 32, + minMatchCharLength: 1, + keys: ['address', 'name', 'symbol'], +}) const actions = require('./actions') -const Tooltip = require('./components/tooltip.js') - - const ethUtil = require('ethereumjs-util') -const abi = require('human-standard-token-abi') -const Eth = require('ethjs-query') -const EthContract = require('ethjs-contract') +const { tokenInfoGetter } = require('./token-util') +const R = require('ramda') const emptyAddr = '0x0000000000000000000000000000000000000000' -module.exports = connect(mapStateToProps)(AddTokenScreen) +module.exports = connect(mapStateToProps, mapDispatchToProps)(AddTokenScreen) function mapStateToProps (state) { + const { identities, tokens } = state.metamask return { - identities: state.metamask.identities, + identities, + tokens, + } +} + +function mapDispatchToProps (dispatch) { + return { + goHome: () => dispatch(actions.goHome()), + addTokens: tokens => dispatch(actions.addTokens(tokens)), } } inherits(AddTokenScreen, Component) function AddTokenScreen () { this.state = { - warning: null, - address: null, - symbol: 'TOKEN', - decimals: 18, + isShowingConfirmation: false, + customAddress: '', + customSymbol: '', + customDecimals: 0, + searchQuery: '', + isCollapsed: true, + selectedTokens: {}, + errors: {}, } + this.tokenAddressDidChange = this.tokenAddressDidChange.bind(this) + this.onNext = this.onNext.bind(this) Component.call(this) } -AddTokenScreen.prototype.render = function () { - const state = this.state - const props = this.props - const { warning, symbol, decimals } = state - - return ( - h('.flex-column.flex-grow', [ - - // subtitle and nav - h('.section-title.flex-row.flex-center', [ - h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { - onClick: (event) => { - props.dispatch(actions.goHome()) - }, - }), - h('h2.page-subtitle', 'Add Token'), - ]), - - h('.error', { - style: { - display: warning ? 'block' : 'none', - padding: '0 20px', - textAlign: 'center', - }, - }, warning), - - // conf view - h('.flex-column.flex-justify-center.flex-grow.select-none', [ - h('.flex-space-around', { - style: { - padding: '20px', - }, - }, [ - - h('div', [ - h(Tooltip, { - position: 'top', - title: 'The contract of the actual token contract. Click for more info.', - }, [ - h('a', { - style: { fontWeight: 'bold', paddingRight: '10px'}, - href: 'https://support.metamask.io/kb/article/24-what-is-a-token-contract-address', - target: '_blank', - }, [ - h('span', 'Token Contract Address '), - h('i.fa.fa-question-circle'), - ]), - ]), - ]), - - h('section.flex-row.flex-center', [ - h('input#token-address', { - name: 'address', - placeholder: 'Token Contract Address', - onChange: this.tokenAddressDidChange.bind(this), - style: { - width: 'inherit', - flex: '1 0 auto', - height: '30px', - margin: '8px', - }, - }), - ]), - - h('div', [ - h('span', { - style: { fontWeight: 'bold', paddingRight: '10px'}, - }, 'Token Symbol'), - ]), - - h('div', { style: {display: 'flex'} }, [ - h('input#token_symbol', { - placeholder: `Like "ETH"`, - value: symbol, - style: { - width: 'inherit', - flex: '1 0 auto', - height: '30px', - margin: '8px', - }, - onChange: (event) => { - var element = event.target - var symbol = element.value - this.setState({ symbol }) - }, - }), - ]), - - h('div', [ - h('span', { - style: { fontWeight: 'bold', paddingRight: '10px'}, - }, 'Decimals of Precision'), - ]), - - h('div', { style: {display: 'flex'} }, [ - h('input#token_decimals', { - value: decimals, - type: 'number', - min: 0, - max: 36, - style: { - width: 'inherit', - flex: '1 0 auto', - height: '30px', - margin: '8px', - }, - onChange: (event) => { - var element = event.target - var decimals = element.value.trim() - this.setState({ decimals }) - }, - }), - ]), - - h('button', { - style: { - alignSelf: 'center', - }, - onClick: (event) => { - const valid = this.validateInputs() - if (!valid) return +AddTokenScreen.prototype.componentWillMount = function () { + this.tokenInfoGetter = tokenInfoGetter() +} - const { address, symbol, decimals } = this.state - this.props.dispatch(actions.addToken(address.trim(), symbol.trim(), decimals)) - }, - }, 'Add'), - ]), - ]), - ]) - ) +AddTokenScreen.prototype.toggleToken = function (address, token) { + const { selectedTokens, errors } = this.state + const { [address]: selectedToken } = selectedTokens + this.setState({ + selectedTokens: { + ...selectedTokens, + [address]: selectedToken ? null : token, + }, + errors: { + ...errors, + tokenSelector: null, + }, + }) } -AddTokenScreen.prototype.componentWillMount = function () { - if (typeof global.ethereumProvider === 'undefined') return +AddTokenScreen.prototype.onNext = function () { + const { isValid, errors } = this.validate() - this.eth = new Eth(global.ethereumProvider) - this.contract = new EthContract(this.eth) - this.TokenContract = this.contract(abi) + return !isValid + ? this.setState({ errors }) + : this.setState({ isShowingConfirmation: true }) } -AddTokenScreen.prototype.tokenAddressDidChange = function (event) { - const el = event.target - const address = el.value.trim() - if (ethUtil.isValidAddress(address) && address !== emptyAddr) { - this.setState({ address }) - this.attemptToAutoFillTokenParams(address) +AddTokenScreen.prototype.tokenAddressDidChange = function (e) { + const customAddress = e.target.value.trim() + this.setState({ customAddress }) + if (ethUtil.isValidAddress(customAddress) && customAddress !== emptyAddr) { + this.attemptToAutoFillTokenParams(customAddress) + } else { + this.setState({ + customSymbol: '', + customDecimals: 0, + }) } } -AddTokenScreen.prototype.validateInputs = function () { - let msg = '' - const state = this.state - const identitiesList = Object.keys(this.props.identities) - const { address, symbol, decimals } = state - const standardAddress = ethUtil.addHexPrefix(address).toLowerCase() - - const validAddress = ethUtil.isValidAddress(address) - if (!validAddress) { - msg += 'Address is invalid. ' +AddTokenScreen.prototype.checkExistingAddresses = function (address) { + if (!address) return false + const tokensList = this.props.tokens + const matchesAddress = existingToken => { + return existingToken.address.toLowerCase() === address.toLowerCase() } - const validDecimals = decimals >= 0 && decimals < 36 - if (!validDecimals) { - msg += 'Decimals must be at least 0, and not over 36. ' - } + return R.any(matchesAddress)(tokensList) +} - const symbolLen = symbol.trim().length - const validSymbol = symbolLen > 0 && symbolLen < 10 - if (!validSymbol) { - msg += 'Symbol must be between 0 and 10 characters.' +AddTokenScreen.prototype.validate = function () { + const errors = {} + const identitiesList = Object.keys(this.props.identities) + const { customAddress, customSymbol, customDecimals, selectedTokens } = this.state + const standardAddress = ethUtil.addHexPrefix(customAddress).toLowerCase() + + if (customAddress) { + const validAddress = ethUtil.isValidAddress(customAddress) + if (!validAddress) { + errors.customAddress = 'Address is invalid. ' + } + + const validDecimals = customDecimals >= 0 && customDecimals < 36 + if (!validDecimals) { + errors.customDecimals = 'Decimals must be at least 0, and not over 36.' + } + + const symbolLen = customSymbol.trim().length + const validSymbol = symbolLen > 0 && symbolLen < 10 + if (!validSymbol) { + errors.customSymbol = 'Symbol must be between 0 and 10 characters.' + } + + const ownAddress = identitiesList.includes(standardAddress) + if (ownAddress) { + errors.customAddress = 'Personal address detected. Input the token contract address.' + } + + const tokenAlreadyAdded = this.checkExistingAddresses(customAddress) + if (tokenAlreadyAdded) { + errors.customAddress = 'Token has already been added.' + } + } else if ( + Object.entries(selectedTokens) + .reduce((isEmpty, [ symbol, isSelected ]) => ( + isEmpty && !isSelected + ), true) + ) { + errors.tokenSelector = 'Must select at least 1 token.' } - const ownAddress = identitiesList.includes(standardAddress) - if (ownAddress) { - msg = 'Personal address detected. Input the token contract address.' + return { + isValid: !Object.keys(errors).length, + errors, } +} - const isValid = validAddress && validDecimals && !ownAddress - - if (!isValid) { +AddTokenScreen.prototype.attemptToAutoFillTokenParams = async function (address) { + const { symbol, decimals } = await this.tokenInfoGetter(address) + if (symbol && decimals) { this.setState({ - warning: msg, + customSymbol: symbol, + customDecimals: decimals.toString(), }) - } else { - this.setState({ warning: null }) } +} + +AddTokenScreen.prototype.renderCustomForm = function () { + const { customAddress, customSymbol, customDecimals, errors } = this.state - return isValid + return !this.state.isCollapsed && ( + h('div.add-token__add-custom-form', [ + h('div', { + className: classnames('add-token__add-custom-field', { + 'add-token__add-custom-field--error': errors.customAddress, + }), + }, [ + h('div.add-token__add-custom-label', 'Token Address'), + h('input.add-token__add-custom-input', { + type: 'text', + onChange: this.tokenAddressDidChange, + value: customAddress, + }), + h('div.add-token__add-custom-error-message', errors.customAddress), + ]), + h('div', { + className: classnames('add-token__add-custom-field', { + 'add-token__add-custom-field--error': errors.customSymbol, + }), + }, [ + h('div.add-token__add-custom-label', 'Token Symbol'), + h('input.add-token__add-custom-input', { + type: 'text', + value: customSymbol, + disabled: true, + }), + h('div.add-token__add-custom-error-message', errors.customSymbol), + ]), + h('div', { + className: classnames('add-token__add-custom-field', { + 'add-token__add-custom-field--error': errors.customDecimals, + }), + }, [ + h('div.add-token__add-custom-label', 'Decimals of Precision'), + h('input.add-token__add-custom-input', { + type: 'number', + value: customDecimals, + disabled: true, + }), + h('div.add-token__add-custom-error-message', errors.customDecimals), + ]), + ]) + ) } -AddTokenScreen.prototype.attemptToAutoFillTokenParams = async function (address) { - const contract = this.TokenContract.at(address) +AddTokenScreen.prototype.renderTokenList = function () { + const { searchQuery = '', selectedTokens } = this.state + const results = searchQuery + ? fuse.search(searchQuery) || [] + : contractList + + return Array(6).fill(undefined) + .map((_, i) => { + const { logo, symbol, name, address } = results[i] || {} + const tokenAlreadyAdded = this.checkExistingAddresses(address) + return Boolean(logo || symbol || name) && ( + h('div.add-token__token-wrapper', { + className: classnames({ + 'add-token__token-wrapper--selected': selectedTokens[address], + 'add-token__token-wrapper--disabled': tokenAlreadyAdded, + }), + onClick: () => !tokenAlreadyAdded && this.toggleToken(address, results[i]), + }, [ + h('div.add-token__token-icon', { + style: { + backgroundImage: `url(images/contract/${logo})`, + }, + }), + h('div.add-token__token-data', [ + h('div.add-token__token-symbol', symbol), + h('div.add-token__token-name', name), + ]), + // tokenAlreadyAdded && ( + // h('div.add-token__token-message', 'Already added') + // ), + ]) + ) + }) +} - const results = await Promise.all([ - contract.symbol(), - contract.decimals(), - ]) +AddTokenScreen.prototype.renderConfirmation = function () { + const { + customAddress: address, + customSymbol: symbol, + customDecimals: decimals, + selectedTokens, + } = this.state - const [ symbol, decimals ] = results - if (symbol && decimals) { - console.log('SETTING SYMBOL AND DECIMALS', { symbol, decimals }) - this.setState({ symbol: symbol[0], decimals: decimals[0].toString() }) + const { addTokens, goHome } = this.props + + const customToken = { + address, + symbol, + decimals, } + + const tokens = address && symbol && decimals + ? { ...selectedTokens, [address]: customToken } + : selectedTokens + + return ( + h('div.add-token', [ + h('div.add-token__wrapper', [ + h('div.add-token__title-container.add-token__confirmation-title', [ + h('div.add-token__title', 'Add Token'), + h('div.add-token__description', 'Would you like to add these tokens?'), + ]), + h('div.add-token__content-container.add-token__confirmation-content', [ + h('div.add-token__description.add-token__confirmation-description', 'Your balances'), + h('div.add-token__confirmation-token-list', + Object.entries(tokens) + .map(([ address, token ]) => ( + h('span.add-token__confirmation-token-list-item', [ + h(Identicon, { + className: 'add-token__confirmation-token-icon', + diameter: 75, + address, + }), + h(TokenBalance, { token }), + ]) + )) + ), + ]), + ]), + h('div.add-token__buttons', [ + h('button.btn-secondary', { + onClick: () => addTokens(tokens).then(goHome), + }, 'Add Tokens'), + h('button.btn-tertiary', { + onClick: () => this.setState({ isShowingConfirmation: false }), + }, 'Back'), + ]), + ]) + ) +} + +AddTokenScreen.prototype.render = function () { + const { isCollapsed, errors, isShowingConfirmation } = this.state + const { goHome } = this.props + + return isShowingConfirmation + ? this.renderConfirmation() + : ( + h('div.add-token', [ + h('div.add-token__wrapper', [ + h('div.add-token__title-container', [ + h('div.add-token__title', 'Add Token'), + h('div.add-token__description', 'Keep track of the tokens you’ve bought with your MetaMask account. If you bought tokens using a different account, those tokens will not appear here.'), + h('div.add-token__description', 'Search for tokens or select from our list of popular tokens.'), + ]), + h('div.add-token__content-container', [ + h('div.add-token__input-container', [ + h('input.add-token__input', { + type: 'text', + placeholder: 'Search', + onChange: e => this.setState({ searchQuery: e.target.value }), + }), + h('div.add-token__search-input-error-message', errors.tokenSelector), + ]), + h( + 'div.add-token__token-icons-container', + this.renderTokenList(), + ), + ]), + h('div.add-token__footers', [ + h('div.add-token__add-custom', { + onClick: () => this.setState({ isCollapsed: !isCollapsed }), + }, [ + 'Add custom token', + h(`i.fa.fa-angle-${isCollapsed ? 'down' : 'up'}`), + ]), + this.renderCustomForm(), + ]), + ]), + h('div.add-token__buttons', [ + h('button.btn-secondary', { + onClick: this.onNext, + }, 'Next'), + h('button.btn-tertiary', { + onClick: goHome, + }, 'Cancel'), + ]), + ]) + ) } diff --git a/ui/app/app.js b/ui/app/app.js index bc198b482..c6fce0e47 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -9,33 +9,37 @@ const MascaraBuyEtherScreen = require('../../mascara/src/app/first-time/buy-ethe // init const InitializeMenuScreen = require('./first-time/init-menu') const NewKeyChainScreen = require('./new-keychain') -// unlock -const UnlockScreen = require('./unlock') // accounts -const AccountDetailScreen = require('./account-detail') -const SendTransactionScreen = require('./send') +const MainContainer = require('./main-container') +const SendTransactionScreen2 = require('./components/send/send-v2-container') const ConfirmTxScreen = require('./conf-tx') // notice const NoticeScreen = require('./components/notice') const generateLostAccountsNotice = require('../lib/lost-accounts-notice') + +// slideout menu +const WalletView = require('./components/wallet-view') + // other views -const ConfigScreen = require('./config') +const Settings = require('./settings') const AddTokenScreen = require('./add-token') const Import = require('./accounts/import') -const InfoScreen = require('./info') const Loading = require('./components/loading') -const SandwichExpando = require('sandwich-expando') -const Dropdown = require('./components/dropdown').Dropdown -const DropdownMenuItem = require('./components/dropdown').DropdownMenuItem const NetworkIndicator = require('./components/network') +const Identicon = require('./components/identicon') const BuyView = require('./components/buy-button-subview') -const QrView = require('./components/qr-code') const HDCreateVaultComplete = require('./keychains/hd/create-vault-complete') const HDRestoreVaultScreen = require('./keychains/hd/restore-vault') const RevealSeedConfirmation = require('./keychains/hd/recover-seed/confirmation') -const AccountDropdowns = require('./components/account-dropdowns').AccountDropdowns +const ReactCSSTransitionGroup = require('react-addons-css-transition-group') +const NetworkDropdown = require('./components/dropdowns/network-dropdown') +const AccountMenu = require('./components/account-menu') +const QrView = require('./components/qr-code') -module.exports = connect(mapStateToProps)(App) +// Global Modals +const Modal = require('./components/modals/index').Modal + +module.exports = connect(mapStateToProps, mapDispatchToProps)(App) inherits(App, Component) function App () { Component.call(this) } @@ -54,11 +58,14 @@ function mapStateToProps (state) { return { // state from plugin + networkDropdownOpen: state.appState.networkDropdownOpen, + sidebarOpen: state.appState.sidebarOpen, isLoading: state.appState.isLoading, loadingMessage: state.appState.loadingMessage, noActiveNotices: state.metamask.noActiveNotices, isInitialized: state.metamask.isInitialized, isUnlocked: state.metamask.isUnlocked, + selectedAddress: state.metamask.selectedAddress, currentView: state.appState.currentView, activeAddress: state.appState.activeAddress, transForward: state.appState.transForward, @@ -74,6 +81,7 @@ function mapStateToProps (state) { lastUnreadNotice: state.metamask.lastUnreadNotice, lostAccounts: state.metamask.lostAccounts, frequentRpcList: state.metamask.frequentRpcList || [], + currentCurrency: state.metamask.currentCurrency, // state needed to get account dropdown temporarily rendering from app bar identities, @@ -82,52 +90,140 @@ function mapStateToProps (state) { } } +function mapDispatchToProps (dispatch, ownProps) { + return { + dispatch, + hideSidebar: () => dispatch(actions.hideSidebar()), + showNetworkDropdown: () => dispatch(actions.showNetworkDropdown()), + hideNetworkDropdown: () => dispatch(actions.hideNetworkDropdown()), + setCurrentCurrencyToUSD: () => dispatch(actions.setCurrentCurrency('usd')), + toggleAccountMenu: () => dispatch(actions.toggleAccountMenu()), + } +} + +App.prototype.componentWillMount = function () { + if (!this.props.currentCurrency) { + this.props.setCurrentCurrencyToUSD() + } +} + App.prototype.render = function () { var props = this.props - const { isLoading, loadingMessage, transForward, network } = props + const { isLoading, loadingMessage, network } = props const isLoadingNetwork = network === 'loading' && props.currentView.name !== 'config' const loadMessage = loadingMessage || isLoadingNetwork ? `Connecting to ${this.getNetworkName()}` : null log.debug('Main ui render function') return ( - h('.flex-column.full-height', { style: { - // Windows was showing a vertical scroll bar: - overflow: 'hidden', + overflowX: 'hidden', position: 'relative', alignItems: 'center', }, }, [ + // global modal + h(Modal, {}, []), + // app bar this.renderAppBar(), - this.renderNetworkDropdown(), - this.renderDropdown(), - this.renderLoadingIndicator({ isLoading, isLoadingNetwork, loadMessage }), + // sidebar + this.renderSidebar(), - // panel content - h('.app-primary' + (transForward ? '.from-right' : '.from-left'), { - style: { - width: '100%', - }, - }, [ - this.renderPrimary(), - ]), + // network dropdown + h(NetworkDropdown, { + provider: this.props.provider, + frequentRpcList: this.props.frequentRpcList, + }, []), + + h(AccountMenu), + + (isLoading || isLoadingNetwork) && h(Loading, { + loadingMessage: loadMessage, + }), + + // this.renderLoadingIndicator({ isLoading, isLoadingNetwork, loadMessage }), + + // content + this.renderPrimary(), ]) ) } +App.prototype.renderGlobalModal = function () { + return h(Modal, { + ref: 'modalRef', + }, [ + // h(BuyOptions, {}, []), + ]) +} + +App.prototype.renderSidebar = function () { + + return h('div', { + }, [ + h('style', ` + .sidebar-enter { + transition: transform 300ms ease-in-out; + transform: translateX(-100%); + } + .sidebar-enter.sidebar-enter-active { + transition: transform 300ms ease-in-out; + transform: translateX(0%); + } + .sidebar-leave { + transition: transform 200ms ease-out; + transform: translateX(0%); + } + .sidebar-leave.sidebar-leave-active { + transition: transform 200ms ease-out; + transform: translateX(-100%); + } + `), + + h(ReactCSSTransitionGroup, { + transitionName: 'sidebar', + transitionEnterTimeout: 300, + transitionLeaveTimeout: 200, + }, [ + // A second instance of Walletview is used for non-mobile viewports + this.props.sidebarOpen ? h(WalletView, { + responsiveDisplayClassname: '.sidebar', + style: {}, + }) : undefined, + + ]), + + // overlay + // TODO: add onClick for overlay to close sidebar + this.props.sidebarOpen ? h('div.sidebar-overlay', { + style: {}, + onClick: () => { + this.props.hideSidebar() + }, + }, []) : undefined, + ]) +} + App.prototype.renderAppBar = function () { + const { + isUnlocked, + network, + provider, + networkDropdownOpen, + showNetworkDropdown, + hideNetworkDropdown, + currentView, + } = this.props + if (window.METAMASK_UI_TYPE === 'notification') { return null } const props = this.props - const state = this.state || {} - const isNetworkMenuOpen = state.isNetworkMenuOpen || false const {isMascara, isOnboarding} = props // Do not render header if user is in mascara onboarding @@ -143,266 +239,70 @@ App.prototype.renderAppBar = function () { return ( h('.full-width', { - height: '38px', + style: {}, }, [ h('.app-header.flex-row.flex-space-between', { - style: { - alignItems: 'center', - visibility: props.isUnlocked ? 'visible' : 'none', - background: props.isUnlocked ? 'white' : 'none', - height: '38px', - position: 'relative', - zIndex: 12, - }, + style: {}, }, [ - - h('div.left-menu-section', { - style: { - display: 'flex', - flexDirection: 'row', - alignItems: 'center', - }, - }, [ - - // mini logo - h('img', { - height: 24, - width: 24, - src: '/images/icon-128.png', - }), - - h(NetworkIndicator, { - network: this.props.network, - provider: this.props.provider, - onClick: (event) => { - event.preventDefault() - event.stopPropagation() - this.setState({ isNetworkMenuOpen: !isNetworkMenuOpen }) - }, - }), - ]), - - props.isUnlocked && h('div', { - style: { - display: 'flex', - flexDirection: 'row', - alignItems: 'center', - }, - }, [ - - props.isUnlocked && h(AccountDropdowns, { - style: {}, - enableAccountsSelector: true, - identities: this.props.identities, - selected: this.props.currentView.context, - network: this.props.network, - keyrings: this.props.keyrings, - }, []), - - // hamburger - props.isUnlocked && h(SandwichExpando, { - className: 'sandwich-expando', - width: 16, - barHeight: 2, - padding: 0, - isOpen: state.isMainMenuOpen, - color: 'rgb(247,146,30)', + h('div.app-header-contents', {}, [ + h('div.left-menu-wrapper', { onClick: () => { - this.setState({ - isMainMenuOpen: !state.isMainMenuOpen, - }) + props.dispatch(actions.backToAccountDetail(props.activeAddress)) }, - }), + }, [ + // mini logo + h('img.metafox-icon', { + height: 29, + width: 29, + src: '/images/icon-128.png', + }), + + // metamask name + h('h1', { + style: { + position: 'relative', + paddingLeft: '9px', + color: '#5B5D67', + }, + }, 'MetaMask'), + + ]), + + h('div.header__right-actions', [ + h('div.network-component-wrapper', { + style: {}, + }, [ + // Network Indicator + h(NetworkIndicator, { + network, + provider, + disabled: currentView.name === 'confTx', + onClick: (event) => { + event.preventDefault() + event.stopPropagation() + return networkDropdownOpen === false + ? showNetworkDropdown() + : hideNetworkDropdown() + }, + }), + + ]), + + isUnlocked && h('div.account-menu__icon', { onClick: this.props.toggleAccountMenu }, [ + h(Identicon, { + address: this.props.selectedAddress, + diameter: 32, + }), + ]), + ]), ]), ]), + ]) ) } -App.prototype.renderNetworkDropdown = function () { - const props = this.props - const { provider: { type: providerType, rpcTarget: activeNetwork } } = props - const rpcList = props.frequentRpcList - const state = this.state || {} - const isOpen = state.isNetworkMenuOpen - - return h(Dropdown, { - useCssTransition: true, - isOpen, - onClickOutside: (event) => { - const { classList } = event.target - const isNotToggleElement = [ - classList.contains('menu-icon'), - classList.contains('network-name'), - classList.contains('network-indicator'), - ].filter(bool => bool).length === 0 - // classes from three constituent nodes of the toggle element - - if (isNotToggleElement) { - this.setState({ isNetworkMenuOpen: false }) - } - }, - zIndex: 11, - style: { - position: 'absolute', - left: '2px', - top: '36px', - }, - innerStyle: { - padding: '2px 16px 2px 0px', - }, - }, [ - - h( - DropdownMenuItem, - { - key: 'main', - closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), - onClick: () => props.dispatch(actions.setProviderType('mainnet')), - style: { - fontSize: '18px', - }, - }, - [ - h('.menu-icon.diamond'), - 'Main Ethereum Network', - providerType === 'mainnet' ? h('.check', '✓') : null, - ] - ), - - h( - DropdownMenuItem, - { - key: 'ropsten', - closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), - onClick: () => props.dispatch(actions.setProviderType('ropsten')), - style: { - fontSize: '18px', - }, - }, - [ - h('.menu-icon.red-dot'), - 'Ropsten Test Network', - providerType === 'ropsten' ? h('.check', '✓') : null, - ] - ), - - h( - DropdownMenuItem, - { - key: 'kovan', - closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), - onClick: () => props.dispatch(actions.setProviderType('kovan')), - style: { - fontSize: '18px', - }, - }, - [ - h('.menu-icon.hollow-diamond'), - 'Kovan Test Network', - providerType === 'kovan' ? h('.check', '✓') : null, - ] - ), - - h( - DropdownMenuItem, - { - key: 'rinkeby', - closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), - onClick: () => props.dispatch(actions.setProviderType('rinkeby')), - style: { - fontSize: '18px', - }, - }, - [ - h('.menu-icon.golden-square'), - 'Rinkeby Test Network', - providerType === 'rinkeby' ? h('.check', '✓') : null, - ] - ), - - h( - DropdownMenuItem, - { - key: 'default', - closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), - onClick: () => props.dispatch(actions.setProviderType('localhost')), - style: { - fontSize: '18px', - }, - }, - [ - h('i.fa.fa-question-circle.fa-lg.menu-icon'), - 'Localhost 8545', - activeNetwork === 'http://localhost:8545' ? h('.check', '✓') : null, - ] - ), - - this.renderCustomOption(props.provider), - this.renderCommonRpc(rpcList, props.provider), - - h( - DropdownMenuItem, - { - closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), - onClick: () => this.props.dispatch(actions.showConfigPage()), - style: { - fontSize: '18px', - }, - }, - [ - h('i.fa.fa-question-circle.fa-lg.menu-icon'), - 'Custom RPC', - activeNetwork === 'custom' ? h('.check', '✓') : null, - ] - ), - - ]) -} - -App.prototype.renderDropdown = function () { - const state = this.state || {} - const isOpen = state.isMainMenuOpen - - return h(Dropdown, { - useCssTransition: true, - isOpen: isOpen, - zIndex: 11, - onClickOutside: (event) => { - const classList = event.target.classList - const parentClassList = event.target.parentElement.classList - - const isToggleElement = classList.contains('sandwich-expando') || - parentClassList.contains('sandwich-expando') - - if (isOpen && !isToggleElement) { - this.setState({ isMainMenuOpen: false }) - } - }, - style: { - position: 'absolute', - right: '2px', - top: '38px', - }, - innerStyle: {}, - }, [ - h(DropdownMenuItem, { - closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }), - onClick: () => { this.props.dispatch(actions.showConfigPage()) }, - }, 'Settings'), - - h(DropdownMenuItem, { - closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }), - onClick: () => { this.props.dispatch(actions.lockMetamask()) }, - }, 'Lock'), - - h(DropdownMenuItem, { - closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }), - onClick: () => { this.props.dispatch(actions.showInfoPage()) }, - }, 'Info/Help'), - ]) -} App.prototype.renderLoadingIndicator = function ({ isLoading, isLoadingNetwork, loadMessage }) { const { isMascara } = this.props @@ -478,20 +378,10 @@ App.prototype.renderPrimary = function () { // show unlock screen if (!props.isUnlocked) { - switch (props.currentView.name) { - - case 'restoreVault': - log.debug('rendering restore vault screen') - return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'}) - - case 'config': - log.debug('rendering config screen from unlock screen.') - return h(ConfigScreen, {key: 'config'}) - - default: - log.debug('rendering locked screen') - return h(UnlockScreen, {key: 'locked'}) - } + return h(MainContainer, { + currentViewName: props.currentView.name, + isUnlocked: props.isUnlocked, + }) } // show seed words screen @@ -504,12 +394,28 @@ App.prototype.renderPrimary = function () { switch (props.currentView.name) { case 'accountDetail': - log.debug('rendering account detail screen') - return h(AccountDetailScreen, {key: 'account-detail'}) + log.debug('rendering main container') + return h(MainContainer, {key: 'account-detail'}) case 'sendTransaction': log.debug('rendering send tx screen') - return h(SendTransactionScreen, {key: 'send-transaction'}) + + // Going to leave this here until we are ready to delete SendTransactionScreen v1 + // const SendComponentToRender = checkFeatureToggle('send-v2') + // ? SendTransactionScreen2 + // : SendTransactionScreen + + return h(SendTransactionScreen2, {key: 'send-transaction'}) + + case 'sendToken': + log.debug('rendering send token screen') + + // Going to leave this here until we are ready to delete SendTransactionScreen v1 + // const SendTokenComponentToRender = checkFeatureToggle('send-v2') + // ? SendTransactionScreen2 + // : SendTokenScreen + + return h(SendTransactionScreen2, {key: 'sendToken'}) case 'newKeychain': log.debug('rendering new keychain screen') @@ -525,7 +431,7 @@ App.prototype.renderPrimary = function () { case 'config': log.debug('rendering config screen') - return h(ConfigScreen, {key: 'config'}) + return h(Settings, {key: 'config'}) case 'import-menu': log.debug('rendering import screen') @@ -537,7 +443,7 @@ App.prototype.renderPrimary = function () { case 'info': log.debug('rendering info screen') - return h(InfoScreen, {key: 'info'}) + return h(Settings, {key: 'info', tab: 'info'}) case 'buyEth': log.debug('rendering buy ether screen') @@ -577,7 +483,7 @@ App.prototype.renderPrimary = function () { default: log.debug('rendering default, account detail screen') - return h(AccountDetailScreen, {key: 'account-detail'}) + return h(MainContainer, {key: 'account-detail'}) } } @@ -593,40 +499,6 @@ App.prototype.toggleMetamaskActive = function () { } } -App.prototype.renderCustomOption = function (provider) { - const { rpcTarget, type } = provider - const props = this.props - - if (type !== 'rpc') return null - - // Concatenate long URLs - let label = rpcTarget - if (rpcTarget.length > 31) { - label = label.substr(0, 34) + '...' - } - - switch (rpcTarget) { - - case 'http://localhost:8545': - return null - - default: - return h( - DropdownMenuItem, - { - key: rpcTarget, - onClick: () => props.dispatch(actions.setRpcTarget(rpcTarget)), - closeMenu: () => this.setState({ isNetworkMenuOpen: false }), - }, - [ - h('i.fa.fa-question-circle.fa-lg.menu-icon'), - label, - h('.check', '✓'), - ] - ) - } -} - App.prototype.getNetworkName = function () { const { provider } = this.props const providerName = provider.type @@ -647,28 +519,3 @@ App.prototype.getNetworkName = function () { return name } - -App.prototype.renderCommonRpc = function (rpcList, provider) { - const props = this.props - const rpcTarget = provider.rpcTarget - - return rpcList.map((rpc) => { - if ((rpc === 'http://localhost:8545') || (rpc === rpcTarget)) { - return null - } else { - return h( - DropdownMenuItem, - { - key: `common${rpc}`, - closeMenu: () => this.setState({ isNetworkMenuOpen: false }), - onClick: () => props.dispatch(actions.setRpcTarget(rpc)), - }, - [ - h('i.fa.fa-question-circle.fa-lg.menu-icon'), - rpc, - rpcTarget === rpc ? h('.check', '✓') : null, - ] - ) - } - }) -} diff --git a/ui/app/components/account-menu/index.js b/ui/app/components/account-menu/index.js new file mode 100644 index 000000000..286a3b587 --- /dev/null +++ b/ui/app/components/account-menu/index.js @@ -0,0 +1,166 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const connect = require('react-redux').connect +const h = require('react-hyperscript') +const actions = require('../../actions') +const { Menu, Item, Divider, CloseArea } = require('../dropdowns/components/menu') +const Identicon = require('../identicon') +const { formatBalance } = require('../../util') + +module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountMenu) + +inherits(AccountMenu, Component) +function AccountMenu () { Component.call(this) } + +function mapStateToProps (state) { + return { + selectedAddress: state.metamask.selectedAddress, + isAccountMenuOpen: state.metamask.isAccountMenuOpen, + keyrings: state.metamask.keyrings, + identities: state.metamask.identities, + accounts: state.metamask.accounts, + + } +} + +function mapDispatchToProps (dispatch) { + return { + toggleAccountMenu: () => dispatch(actions.toggleAccountMenu()), + showAccountDetail: address => { + dispatch(actions.showAccountDetail(address)) + dispatch(actions.hideSidebar()) + dispatch(actions.toggleAccountMenu()) + }, + lockMetamask: () => { + dispatch(actions.lockMetamask()) + dispatch(actions.displayWarning(null)) + dispatch(actions.hideSidebar()) + dispatch(actions.toggleAccountMenu()) + }, + showConfigPage: () => { + dispatch(actions.showConfigPage()) + dispatch(actions.hideSidebar()) + dispatch(actions.toggleAccountMenu()) + }, + showNewAccountModal: () => { + dispatch(actions.showModal({ name: 'NEW_ACCOUNT' })) + dispatch(actions.hideSidebar()) + dispatch(actions.toggleAccountMenu()) + }, + showImportPage: () => { + dispatch(actions.showImportPage()) + dispatch(actions.hideSidebar()) + dispatch(actions.toggleAccountMenu()) + }, + showInfoPage: () => { + dispatch(actions.showInfoPage()) + dispatch(actions.hideSidebar()) + dispatch(actions.toggleAccountMenu()) + }, + } +} + +AccountMenu.prototype.render = function () { + const { + isAccountMenuOpen, + toggleAccountMenu, + showNewAccountModal, + showImportPage, + lockMetamask, + showConfigPage, + showInfoPage, + } = this.props + + return h(Menu, { className: 'account-menu', isShowing: isAccountMenuOpen }, [ + h(CloseArea, { onClick: toggleAccountMenu }), + h(Item, { + className: 'account-menu__header', + }, [ + 'My Accounts', + h('button.account-menu__logout-button', { + onClick: lockMetamask, + }, 'Log out'), + ]), + h(Divider), + h('div.account-menu__accounts', this.renderAccounts()), + h(Divider), + h(Item, { + onClick: showNewAccountModal, + icon: h('img', { src: 'images/plus-btn-white.svg' }), + text: 'Create Account', + }), + h(Item, { + onClick: showImportPage, + icon: h('img', { src: 'images/import-account.svg' }), + text: 'Import Account', + }), + h(Divider), + h(Item, { + onClick: showInfoPage, + icon: h('img', { src: 'images/mm-info-icon.svg' }), + text: 'Info & Help', + }), + h(Item, { + onClick: showConfigPage, + icon: h('img', { src: 'images/settings.svg' }), + text: 'Settings', + }), + ]) +} + +AccountMenu.prototype.renderAccounts = function () { + const { + identities, + accounts, + selectedAddress, + keyrings, + showAccountDetail, + } = this.props + + return Object.keys(identities).map((key, index) => { + const identity = identities[key] + const isSelected = identity.address === selectedAddress + + const balanceValue = accounts[key] ? accounts[key].balance : '' + const formattedBalance = balanceValue ? formatBalance(balanceValue, 6) : '...' + const simpleAddress = identity.address.substring(2).toLowerCase() + + const keyring = keyrings.find((kr) => { + return kr.accounts.includes(simpleAddress) || + kr.accounts.includes(identity.address) + }) + + return h( + 'div.account-menu__account.menu__item--clickable', + { onClick: () => showAccountDetail(identity.address) }, + [ + h('div.account-menu__check-mark', [ + isSelected ? h('div.account-menu__check-mark-icon') : null, + ]), + + h( + Identicon, + { + address: identity.address, + diameter: 24, + }, + ), + + h('div.account-menu__account-info', [ + h('div.account-menu__name', identity.name || ''), + h('div.account-menu__balance', formattedBalance), + ]), + + this.indicateIfLoose(keyring), + ], + ) + }) +} + +AccountMenu.prototype.indicateIfLoose = function (keyring) { + try { // Sometimes keyrings aren't loaded yet: + const type = keyring.type + const isLoose = type !== 'HD Key Tree' + return isLoose ? h('.keyring-label', 'IMPORTED') : null + } catch (e) { return } +} diff --git a/ui/app/components/balance-component.js b/ui/app/components/balance-component.js new file mode 100644 index 000000000..50007ce14 --- /dev/null +++ b/ui/app/components/balance-component.js @@ -0,0 +1,121 @@ +const Component = require('react').Component +const connect = require('react-redux').connect +const h = require('react-hyperscript') +const inherits = require('util').inherits +const TokenBalance = require('./token-balance') +const Identicon = require('./identicon') + +const { formatBalance, generateBalanceObject } = require('../util') + +module.exports = connect(mapStateToProps)(BalanceComponent) + +function mapStateToProps (state) { + const accounts = state.metamask.accounts + const network = state.metamask.network + const selectedAddress = state.metamask.selectedAddress || Object.keys(accounts)[0] + const account = accounts[selectedAddress] + + return { + account, + network, + conversionRate: state.metamask.conversionRate, + currentCurrency: state.metamask.currentCurrency, + } +} + +inherits(BalanceComponent, Component) +function BalanceComponent () { + Component.call(this) +} + +BalanceComponent.prototype.render = function () { + const props = this.props + const { token, network } = props + + return h('div.balance-container', {}, [ + + // TODO: balance icon needs to be passed in + // h('img.balance-icon', { + // src: '../images/eth_logo.svg', + // style: {}, + // }), + h(Identicon, { + diameter: 45, + address: token && token.address, + network, + }), + + token ? this.renderTokenBalance() : this.renderBalance(), + ]) +} + +BalanceComponent.prototype.renderTokenBalance = function () { + const { token } = this.props + + return h('div.flex-column.balance-display', [ + h('div.token-amount', [ h(TokenBalance, { token }) ]), + ]) +} + +BalanceComponent.prototype.renderBalance = function () { + const props = this.props + const { shorten, account } = props + const balanceValue = account && account.balance + const needsParse = 'needsParse' in props ? props.needsParse : true + const formattedBalance = balanceValue ? formatBalance(balanceValue, 6, needsParse) : '...' + const showFiat = 'showFiat' in props ? props.showFiat : true + + if (formattedBalance === 'None' || formattedBalance === '...') { + return h('div.flex-column.balance-display', {}, [ + h('div.token-amount', { + style: {}, + }, formattedBalance), + ]) + } + + return h('div.flex-column.balance-display', {}, [ + h('div.token-amount', { + style: {}, + }, this.getTokenBalance(formattedBalance, shorten)), + + showFiat ? this.renderFiatValue(formattedBalance) : null, + ]) +} + +BalanceComponent.prototype.renderFiatValue = function (formattedBalance) { + + const { conversionRate, currentCurrency } = this.props + + const fiatDisplayNumber = this.getFiatDisplayNumber(formattedBalance, conversionRate) + + const fiatPrefix = currentCurrency === 'USD' ? '$' : '' + + return this.renderFiatAmount(fiatDisplayNumber, currentCurrency, fiatPrefix) +} + +BalanceComponent.prototype.renderFiatAmount = function (fiatDisplayNumber, fiatSuffix, fiatPrefix) { + const shouldNotRenderFiat = fiatDisplayNumber === 'N/A' || Number(fiatDisplayNumber) === 0 + if (shouldNotRenderFiat) return null + + return h('div.fiat-amount', { + style: {}, + }, `${fiatPrefix}${fiatDisplayNumber} ${fiatSuffix}`) +} + +BalanceComponent.prototype.getTokenBalance = function (formattedBalance, shorten) { + const balanceObj = generateBalanceObject(formattedBalance, shorten ? 1 : 3) + + const balanceValue = shorten ? balanceObj.shortBalance : balanceObj.balance + const label = balanceObj.label + + return `${balanceValue} ${label}` +} + +BalanceComponent.prototype.getFiatDisplayNumber = function (formattedBalance, conversionRate) { + if (formattedBalance === 'None') return formattedBalance + if (conversionRate === 0) return 'N/A' + + const splitBalance = formattedBalance.split(' ') + + return (Number(splitBalance[0]) * conversionRate).toFixed(2) +} diff --git a/ui/app/components/buy-button-subview.js b/ui/app/components/buy-button-subview.js index 15281171c..d5958787b 100644 --- a/ui/app/components/buy-button-subview.js +++ b/ui/app/components/buy-button-subview.js @@ -76,7 +76,7 @@ BuyButtonSubview.prototype.headerSubview = function () { paddingTop: '4px', paddingBottom: '4px', }, - }, 'Buy Eth'), + }, 'Deposit Eth'), ]), // loading indication @@ -87,7 +87,7 @@ BuyButtonSubview.prototype.headerSubview = function () { left: '49vw', }, }, [ - h(Loading, { isLoading }), + isLoading && h(Loading), ]), // account panel @@ -245,7 +245,7 @@ BuyButtonSubview.prototype.navigateTo = function (url) { BuyButtonSubview.prototype.backButtonContext = function () { if (this.props.context === 'confTx') { - this.props.dispatch(actions.showConfTxPage(false)) + this.props.dispatch(actions.showConfTxPage({transForward: false})) } else { this.props.dispatch(actions.goHome()) } diff --git a/ui/app/components/currency-input.js b/ui/app/components/currency-input.js new file mode 100644 index 000000000..66880091f --- /dev/null +++ b/ui/app/components/currency-input.js @@ -0,0 +1,95 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits + +module.exports = CurrencyInput + +inherits(CurrencyInput, Component) +function CurrencyInput (props) { + Component.call(this) + + this.state = { + value: sanitizeValue(props.value), + } +} + +function removeNonDigits (str) { + return str.match(/\d|$/g).join('') +} + +// Removes characters that are not digits, then removes leading zeros +function sanitizeInteger (val) { + return String(parseInt(removeNonDigits(val) || '0', 10)) +} + +function sanitizeDecimal (val) { + return removeNonDigits(val) +} + +// Take a single string param and returns a non-negative integer or float as a string. +// Breaks the input into three parts: the integer, the decimal point, and the decimal/fractional part. +// Removes leading zeros from the integer, and non-digits from the integer and decimal +// The integer is returned as '0' in cases where it would be empty. A decimal point is +// included in the returned string if one is included in the param +// Examples: +// sanitizeValue('0') -> '0' +// sanitizeValue('a') -> '0' +// sanitizeValue('010.') -> '10.' +// sanitizeValue('0.005') -> '0.005' +// sanitizeValue('22.200') -> '22.200' +// sanitizeValue('.200') -> '0.200' +// sanitizeValue('a.b.1.c,89.123') -> '0.189123' +function sanitizeValue (value) { + let [ , integer, point, decimal] = (/([^.]*)([.]?)([^.]*)/).exec(value) + + integer = sanitizeInteger(integer) || '0' + decimal = sanitizeDecimal(decimal) + + return `${integer}${point}${decimal}` +} + +CurrencyInput.prototype.handleChange = function (newValue) { + const { onInputChange } = this.props + + this.setState({ value: sanitizeValue(newValue) }) + + onInputChange(sanitizeValue(newValue)) +} + +// If state.value === props.value plus a decimal point, or at least one +// zero or a decimal point and at least one zero, then this returns state.value +// after it is sanitized with getValueParts +CurrencyInput.prototype.getValueToRender = function () { + const { value } = this.props + const { value: stateValue } = this.state + + const trailingStateString = (new RegExp(`^${value}(.+)`)).exec(stateValue) + const trailingDecimalAndZeroes = trailingStateString && (/^[.0]0*/).test(trailingStateString[1]) + + return sanitizeValue(trailingDecimalAndZeroes + ? stateValue + : value) +} + +CurrencyInput.prototype.render = function () { + const { + className, + placeholder, + readOnly, + inputRef, + } = this.props + + const inputSizeMultiplier = readOnly ? 1 : 1.2 + + const valueToRender = this.getValueToRender() + + return h('input', { + className, + value: valueToRender, + placeholder, + size: valueToRender.length * inputSizeMultiplier, + readOnly, + onChange: e => this.handleChange(e.target.value), + ref: inputRef, + }) +} diff --git a/ui/app/components/customize-gas-modal/gas-modal-card.js b/ui/app/components/customize-gas-modal/gas-modal-card.js new file mode 100644 index 000000000..23754d819 --- /dev/null +++ b/ui/app/components/customize-gas-modal/gas-modal-card.js @@ -0,0 +1,54 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const InputNumber = require('../input-number.js') +// const GasSlider = require('./gas-slider.js') + +module.exports = GasModalCard + +inherits(GasModalCard, Component) +function GasModalCard () { + Component.call(this) +} + +GasModalCard.prototype.render = function () { + const { + // memo, + onChange, + unitLabel, + value, + min, + // max, + step, + title, + copy, + } = this.props + + return h('div.send-v2__gas-modal-card', [ + + h('div.send-v2__gas-modal-card__title', {}, title), + + h('div.send-v2__gas-modal-card__copy', {}, copy), + + h(InputNumber, { + unitLabel, + step, + // max, + min, + placeholder: '0', + value, + onChange, + }), + + // h(GasSlider, { + // value, + // step, + // max, + // min, + // onChange, + // }), + + ]) + +} + diff --git a/ui/app/components/customize-gas-modal/gas-slider.js b/ui/app/components/customize-gas-modal/gas-slider.js new file mode 100644 index 000000000..69fd6f985 --- /dev/null +++ b/ui/app/components/customize-gas-modal/gas-slider.js @@ -0,0 +1,50 @@ +// const Component = require('react').Component +// const h = require('react-hyperscript') +// const inherits = require('util').inherits + +// module.exports = GasSlider + +// inherits(GasSlider, Component) +// function GasSlider () { +// Component.call(this) +// } + +// GasSlider.prototype.render = function () { +// const { +// memo, +// identities, +// onChange, +// unitLabel, +// value, +// id, +// step, +// max, +// min, +// } = this.props + +// return h('div.gas-slider', [ + +// h('input.gas-slider__input', { +// type: 'range', +// step, +// max, +// min, +// value, +// id: 'gasSlider', +// onChange: event => onChange(event.target.value), +// }, []), + +// h('div.gas-slider__bar', [ + +// h('div.gas-slider__low'), + +// h('div.gas-slider__mid'), + +// h('div.gas-slider__high'), + +// ]), + +// ]) + +// } + diff --git a/ui/app/components/customize-gas-modal/index.js b/ui/app/components/customize-gas-modal/index.js new file mode 100644 index 000000000..826d2cd4b --- /dev/null +++ b/ui/app/components/customize-gas-modal/index.js @@ -0,0 +1,298 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const connect = require('react-redux').connect +const actions = require('../../actions') +const GasModalCard = require('./gas-modal-card') + +const ethUtil = require('ethereumjs-util') + +const { + MIN_GAS_PRICE_DEC, + MIN_GAS_LIMIT_DEC, + MIN_GAS_PRICE_GWEI, +} = require('../send/send-constants') + +const { + isBalanceSufficient, +} = require('../send/send-utils') + +const { + conversionUtil, + multiplyCurrencies, + conversionGreaterThan, + subtractCurrencies, +} = require('../../conversion-util') + +const { + getGasPrice, + getGasLimit, + conversionRateSelector, + getSendAmount, + getSelectedToken, + getSendFrom, + getCurrentAccountWithSendEtherInfo, + getSelectedTokenToFiatRate, + getSendMaxModeState, +} = require('../../selectors') + +function mapStateToProps (state) { + const selectedToken = getSelectedToken(state) + const currentAccount = getSendFrom(state) || getCurrentAccountWithSendEtherInfo(state) + const conversionRate = conversionRateSelector(state) + + return { + gasPrice: getGasPrice(state), + gasLimit: getGasLimit(state), + conversionRate, + amount: getSendAmount(state), + maxModeOn: getSendMaxModeState(state), + balance: currentAccount.balance, + primaryCurrency: selectedToken && selectedToken.symbol, + selectedToken, + amountConversionRate: selectedToken ? getSelectedTokenToFiatRate(state) : conversionRate, + } +} + +function mapDispatchToProps (dispatch) { + return { + hideModal: () => dispatch(actions.hideModal()), + updateGasPrice: newGasPrice => dispatch(actions.updateGasPrice(newGasPrice)), + updateGasLimit: newGasLimit => dispatch(actions.updateGasLimit(newGasLimit)), + updateGasTotal: newGasTotal => dispatch(actions.updateGasTotal(newGasTotal)), + updateSendAmount: newAmount => dispatch(actions.updateSendAmount(newAmount)), + } +} + +function getOriginalState (props) { + const gasPrice = props.gasPrice || MIN_GAS_PRICE_DEC + const gasLimit = props.gasLimit || MIN_GAS_LIMIT_DEC + + const gasTotal = multiplyCurrencies(gasLimit, gasPrice, { + toNumericBase: 'hex', + multiplicandBase: 16, + multiplierBase: 16, + }) + + return { + gasPrice, + gasLimit, + gasTotal, + error: null, + priceSigZeros: '', + priceSigDec: '', + } +} + +inherits(CustomizeGasModal, Component) +function CustomizeGasModal (props) { + Component.call(this) + + this.state = getOriginalState(props) +} + +module.exports = connect(mapStateToProps, mapDispatchToProps)(CustomizeGasModal) + +CustomizeGasModal.prototype.save = function (gasPrice, gasLimit, gasTotal) { + const { + updateGasPrice, + updateGasLimit, + hideModal, + updateGasTotal, + maxModeOn, + selectedToken, + balance, + updateSendAmount, + } = this.props + + if (maxModeOn && !selectedToken) { + const maxAmount = subtractCurrencies( + ethUtil.addHexPrefix(balance), + ethUtil.addHexPrefix(gasTotal), + { toNumericBase: 'hex' } + ) + updateSendAmount(maxAmount) + } + + updateGasPrice(gasPrice) + updateGasLimit(gasLimit) + updateGasTotal(gasTotal) + hideModal() +} + +CustomizeGasModal.prototype.revert = function () { + this.setState(getOriginalState(this.props)) +} + +CustomizeGasModal.prototype.validate = function ({ gasTotal, gasLimit }) { + const { + amount, + balance, + selectedToken, + amountConversionRate, + conversionRate, + maxModeOn, + } = this.props + + let error = null + + const balanceIsSufficient = isBalanceSufficient({ + amount: selectedToken || maxModeOn ? '0' : amount, + gasTotal, + balance, + selectedToken, + amountConversionRate, + conversionRate, + }) + + if (!balanceIsSufficient) { + error = 'Insufficient balance for current gas total' + } + + const gasLimitTooLow = gasLimit && conversionGreaterThan( + { + value: MIN_GAS_LIMIT_DEC, + fromNumericBase: 'dec', + conversionRate, + }, + { + value: gasLimit, + fromNumericBase: 'hex', + }, + ) + + if (gasLimitTooLow) { + error = 'Gas limit must be at least 21000' + } + + this.setState({ error }) + return error +} + +CustomizeGasModal.prototype.convertAndSetGasLimit = function (newGasLimit) { + const { gasPrice } = this.state + + const gasLimit = conversionUtil(newGasLimit, { + fromNumericBase: 'dec', + toNumericBase: 'hex', + }) + + const gasTotal = multiplyCurrencies(gasLimit, gasPrice, { + toNumericBase: 'hex', + multiplicandBase: 16, + multiplierBase: 16, + }) + + this.validate({ gasTotal, gasLimit }) + + this.setState({ gasTotal, gasLimit }) +} + +CustomizeGasModal.prototype.convertAndSetGasPrice = function (newGasPrice) { + const { gasLimit } = this.state + const sigZeros = String(newGasPrice).match(/^\d+[.]\d*?(0+)$/) + const sigDec = String(newGasPrice).match(/^\d+([.])0*$/) + + this.setState({ + priceSigZeros: sigZeros && sigZeros[1] || '', + priceSigDec: sigDec && sigDec[1] || '', + }) + + const gasPrice = conversionUtil(newGasPrice, { + fromNumericBase: 'dec', + toNumericBase: 'hex', + fromDenomination: 'GWEI', + toDenomination: 'WEI', + }) + + const gasTotal = multiplyCurrencies(gasLimit, gasPrice, { + toNumericBase: 'hex', + multiplicandBase: 16, + multiplierBase: 16, + }) + + this.validate({ gasTotal }) + + this.setState({ gasTotal, gasPrice }) +} + +CustomizeGasModal.prototype.render = function () { + const { hideModal } = this.props + const { gasPrice, gasLimit, gasTotal, error, priceSigZeros, priceSigDec } = this.state + + let convertedGasPrice = conversionUtil(gasPrice, { + fromNumericBase: 'hex', + toNumericBase: 'dec', + fromDenomination: 'WEI', + toDenomination: 'GWEI', + }) + + convertedGasPrice += convertedGasPrice.match(/[.]/) ? priceSigZeros : `${priceSigDec}${priceSigZeros}` + + const convertedGasLimit = conversionUtil(gasLimit, { + fromNumericBase: 'hex', + toNumericBase: 'dec', + }) + + return h('div.send-v2__customize-gas', {}, [ + h('div.send-v2__customize-gas__content', { + }, [ + h('div.send-v2__customize-gas__header', {}, [ + + h('div.send-v2__customize-gas__title', 'Customize Gas'), + + h('div.send-v2__customize-gas__close', { + onClick: hideModal, + }), + + ]), + + h('div.send-v2__customize-gas__body', {}, [ + + h(GasModalCard, { + value: convertedGasPrice, + min: MIN_GAS_PRICE_GWEI, + // max: 1000, + step: multiplyCurrencies(MIN_GAS_PRICE_GWEI, 10), + onChange: value => this.convertAndSetGasPrice(value), + title: 'Gas Price (GWEI)', + copy: 'We calculate the suggested gas prices based on network success rates.', + }), + + h(GasModalCard, { + value: convertedGasLimit, + min: 1, + // max: 100000, + step: 1, + onChange: value => this.convertAndSetGasLimit(value), + title: 'Gas Limit', + copy: 'We calculate the suggested gas limit based on network success rates.', + }), + + ]), + + h('div.send-v2__customize-gas__footer', {}, [ + + error && h('div.send-v2__customize-gas__error-message', [ + error, + ]), + + h('div.send-v2__customize-gas__revert', { + onClick: () => this.revert(), + }, ['Revert']), + + h('div.send-v2__customize-gas__buttons', [ + h('div.send-v2__customize-gas__cancel', { + onClick: this.props.hideModal, + }, ['CANCEL']), + + h(`div.send-v2__customize-gas__save${error ? '__error' : ''}`, { + onClick: () => !error && this.save(gasPrice, gasLimit, gasTotal), + }, ['SAVE']), + ]), + + ]), + + ]), + ]) +} diff --git a/ui/app/components/dropdowns/account-dropdown-mini.js b/ui/app/components/dropdowns/account-dropdown-mini.js new file mode 100644 index 000000000..a3d41af90 --- /dev/null +++ b/ui/app/components/dropdowns/account-dropdown-mini.js @@ -0,0 +1,75 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const AccountListItem = require('../send/account-list-item') + +module.exports = AccountDropdownMini + +inherits(AccountDropdownMini, Component) +function AccountDropdownMini () { + Component.call(this) +} + +AccountDropdownMini.prototype.getListItemIcon = function (currentAccount, selectedAccount) { + const listItemIcon = h(`i.fa.fa-check.fa-lg`, { style: { color: '#02c9b1' } }) + + return currentAccount.address === selectedAccount.address + ? listItemIcon + : null +} + +AccountDropdownMini.prototype.renderDropdown = function () { + const { + accounts, + selectedAccount, + closeDropdown, + onSelect, + } = this.props + + return h('div', {}, [ + + h('div.account-dropdown-mini__close-area', { + onClick: closeDropdown, + }), + + h('div.account-dropdown-mini__list', {}, [ + + ...accounts.map(account => h(AccountListItem, { + account, + displayBalance: false, + displayAddress: false, + handleClick: () => { + onSelect(account) + closeDropdown() + }, + icon: this.getListItemIcon(account, selectedAccount), + })), + + ]), + + ]) +} + +AccountDropdownMini.prototype.render = function () { + const { + selectedAccount, + openDropdown, + dropdownOpen, + } = this.props + + return h('div.account-dropdown-mini', {}, [ + + h(AccountListItem, { + account: selectedAccount, + handleClick: openDropdown, + displayBalance: false, + displayAddress: false, + icon: h(`i.fa.fa-caret-down.fa-lg`, { style: { color: '#dedede' } }), + }), + + dropdownOpen && this.renderDropdown(), + + ]) + +} + diff --git a/ui/app/components/dropdowns/account-options-dropdown.js b/ui/app/components/dropdowns/account-options-dropdown.js new file mode 100644 index 000000000..f74c0a2d4 --- /dev/null +++ b/ui/app/components/dropdowns/account-options-dropdown.js @@ -0,0 +1,29 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const AccountDropdowns = require('./components/account-dropdowns') + +inherits(AccountOptionsDropdown, Component) +function AccountOptionsDropdown () { + Component.call(this) +} + +module.exports = AccountOptionsDropdown + +// TODO: specify default props and proptypes +// TODO: hook up to state, connect to redux to clean up API +// TODO: selectedAddress is not defined... should we use selected? +AccountOptionsDropdown.prototype.render = function () { + const { selected, network, identities, style, dropdownWrapperStyle, menuItemStyles } = this.props + + return h(AccountDropdowns, { + enableAccountOptions: true, + enableAccountsSelector: false, + selected, + network, + identities, + style: style || {}, + dropdownWrapperStyle: dropdownWrapperStyle || {}, + menuItemStyles: menuItemStyles || {}, + }, []) +} diff --git a/ui/app/components/dropdowns/account-selection-dropdown.js b/ui/app/components/dropdowns/account-selection-dropdown.js new file mode 100644 index 000000000..2f6452b15 --- /dev/null +++ b/ui/app/components/dropdowns/account-selection-dropdown.js @@ -0,0 +1,29 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const AccountDropdowns = require('./components/account-dropdowns') + +inherits(AccountSelectionDropdown, Component) +function AccountSelectionDropdown () { + Component.call(this) +} + +module.exports = AccountSelectionDropdown + +// TODO: specify default props and proptypes +// TODO: hook up to state, connect to redux to clean up API +// TODO: selectedAddress is not defined... should we use selected? +AccountSelectionDropdown.prototype.render = function () { + const { selected, network, identities, style, dropdownWrapperStyle, menuItemStyles } = this.props + + return h(AccountDropdowns, { + enableAccountOptions: false, + enableAccountsSelector: true, + selected, + network, + identities, + style: style || {}, + dropdownWrapperStyle: dropdownWrapperStyle || {}, + menuItemStyles: menuItemStyles || {}, + }, []) +} diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js new file mode 100644 index 000000000..58326b13c --- /dev/null +++ b/ui/app/components/dropdowns/components/account-dropdowns.js @@ -0,0 +1,484 @@ +const Component = require('react').Component +const PropTypes = require('react').PropTypes +const h = require('react-hyperscript') +const actions = require('../../../actions') +const genAccountLink = require('../../../../lib/account-link.js') +const connect = require('react-redux').connect +const Dropdown = require('./dropdown').Dropdown +const DropdownMenuItem = require('./dropdown').DropdownMenuItem +const Identicon = require('../../identicon') +const ethUtil = require('ethereumjs-util') +const copyToClipboard = require('copy-to-clipboard') +const { formatBalance } = require('../../../util') + +class AccountDropdowns extends Component { + constructor (props) { + super(props) + this.state = { + accountSelectorActive: false, + optionsMenuActive: false, + } + // Used for orangeaccount selector icon + // this.accountSelectorToggleClassName = 'accounts-selector' + this.accountSelectorToggleClassName = 'fa-angle-down' + this.optionsMenuToggleClassName = 'fa-ellipsis-h' + } + + renderAccounts () { + const { identities, accounts, selected, menuItemStyles, actions, keyrings } = this.props + + return Object.keys(identities).map((key, index) => { + const identity = identities[key] + const isSelected = identity.address === selected + + const balanceValue = accounts[key].balance + const formattedBalance = balanceValue ? formatBalance(balanceValue, 6) : '...' + const simpleAddress = identity.address.substring(2).toLowerCase() + + const keyring = keyrings.find((kr) => { + return kr.accounts.includes(simpleAddress) || + kr.accounts.includes(identity.address) + }) + + return h( + DropdownMenuItem, + { + closeMenu: () => {}, + onClick: () => { + this.props.actions.showAccountDetail(identity.address) + }, + style: Object.assign( + { + marginTop: index === 0 ? '5px' : '', + fontSize: '24px', + width: '260px', + }, + menuItemStyles, + ), + }, + [ + h('div.flex-row.flex-center', {}, [ + + h('span', { + style: { + flex: '1 1 0', + minWidth: '20px', + minHeight: '30px', + }, + }, [ + h('span', { + style: { + flex: '1 1 auto', + fontSize: '14px', + }, + }, isSelected ? h('i.fa.fa-check') : null), + ]), + + h( + Identicon, + { + address: identity.address, + diameter: 24, + style: { + flex: '1 1 auto', + marginLeft: '10px', + }, + }, + ), + + h('span.flex-column', { + style: { + flex: '10 10 auto', + width: '175px', + alignItems: 'flex-start', + justifyContent: 'center', + marginLeft: '10px', + position: 'relative', + }, + }, [ + this.indicateIfLoose(keyring), + h('span.account-dropdown-name', { + style: { + fontSize: '18px', + maxWidth: '145px', + whiteSpace: 'nowrap', + overflow: 'hidden', + textOverflow: 'ellipsis', + }, + }, identity.name || ''), + + h('span.account-dropdown-balance', { + style: { + fontSize: '14px', + fontFamily: 'Avenir', + fontWeight: 500, + }, + }, formattedBalance), + ]), + + h('span', { + style: { + flex: '3 3 auto', + }, + }, [ + h('span.account-dropdown-edit-button', { + style: { + fontSize: '16px', + }, + onClick: () => { + actions.showEditAccountModal(identity) + }, + }, [ + 'Edit', + ]), + ]), + + ]), +// ======= +// }, +// ), +// this.indicateIfLoose(keyring), +// h('span', { +// style: { +// marginLeft: '20px', +// fontSize: '24px', +// maxWidth: '145px', +// whiteSpace: 'nowrap', +// overflow: 'hidden', +// textOverflow: 'ellipsis', +// }, +// }, identity.name || ''), +// h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, isSelected ? h('.check', '✓') : null), +// >>>>>>> master:ui/app/components/account-dropdowns.js + ] + ) + }) + } + + indicateIfLoose (keyring) { + try { // Sometimes keyrings aren't loaded yet: + const type = keyring.type + const isLoose = type !== 'HD Key Tree' + return isLoose ? h('.keyring-label', 'LOOSE') : null + } catch (e) { return } + } + + renderAccountSelector () { + const { actions, useCssTransition, innerStyle, sidebarOpen } = this.props + const { accountSelectorActive, menuItemStyles } = this.state + + return h( + Dropdown, + { + useCssTransition, + style: { + marginLeft: '-185px', + marginTop: '50px', + minWidth: '180px', + overflowY: 'auto', + maxHeight: '300px', + width: '300px', + }, + innerStyle, + isOpen: accountSelectorActive, + onClickOutside: (event) => { + const { classList } = event.target + const isNotToggleElement = !classList.contains(this.accountSelectorToggleClassName) + if (accountSelectorActive && isNotToggleElement) { + this.setState({ accountSelectorActive: false }) + } + }, + }, + [ + ...this.renderAccounts(), + h( + DropdownMenuItem, + { + closeMenu: () => {}, + style: Object.assign( + {}, + menuItemStyles, + ), + onClick: () => actions.showNewAccountModal(), + }, + [ + h( + 'i.fa.fa-plus.fa-lg', + { + style: { + marginLeft: '8px', + }, + } + ), + h('span', { + style: { + marginLeft: '14px', + fontFamily: 'DIN OT', + fontSize: '16px', + lineHeight: '23px', + }, + }, 'Create Account'), + ], + ), + h( + DropdownMenuItem, + { + closeMenu: () => { + if (sidebarOpen) { + actions.hideSidebar() + } + }, + onClick: () => actions.showImportPage(), + style: Object.assign( + {}, + menuItemStyles, + ), + }, + [ + h( + 'i.fa.fa-download.fa-lg', + { + style: { + marginLeft: '8px', + }, + } + ), + h('span', { + style: { + marginLeft: '20px', + marginBottom: '5px', + fontFamily: 'DIN OT', + fontSize: '16px', + lineHeight: '23px', + }, + }, 'Import Account'), + ] + ), + ] + ) + } + + renderAccountOptions () { + const { actions, dropdownWrapperStyle, useCssTransition } = this.props + const { optionsMenuActive, menuItemStyles } = this.state + const dropdownMenuItemStyle = { + fontFamily: 'DIN OT', + fontSize: 16, + lineHeight: '24px', + padding: '8px', + } + + return h( + Dropdown, + { + useCssTransition, + style: Object.assign( + { + marginLeft: '-10px', + position: 'absolute', + width: '29vh', // affects both mobile and laptop views + }, + dropdownWrapperStyle, + ), + isOpen: optionsMenuActive, + onClickOutside: () => { + const { classList } = event.target + const isNotToggleElement = !classList.contains(this.optionsMenuToggleClassName) + if (optionsMenuActive && isNotToggleElement) { + this.setState({ optionsMenuActive: false }) + } + }, + }, + [ + h( + DropdownMenuItem, + { + closeMenu: () => {}, + onClick: () => { + this.props.actions.showAccountDetailModal() + }, + style: Object.assign( + dropdownMenuItemStyle, + menuItemStyles, + ), + }, + 'Account Details', + ), + h( + DropdownMenuItem, + { + closeMenu: () => {}, + onClick: () => { + const { selected, network } = this.props + const url = genAccountLink(selected, network) + global.platform.openWindow({ url }) + }, + style: Object.assign( + dropdownMenuItemStyle, + menuItemStyles, + ), + }, + 'View account on Etherscan', + ), + h( + DropdownMenuItem, + { + closeMenu: () => {}, + onClick: () => { + const { selected } = this.props + const checkSumAddress = selected && ethUtil.toChecksumAddress(selected) + copyToClipboard(checkSumAddress) + }, + style: Object.assign( + dropdownMenuItemStyle, + menuItemStyles, + ), + }, + 'Copy Address to clipboard', + ), + h( + DropdownMenuItem, + { + closeMenu: () => {}, + onClick: () => this.props.actions.showExportPrivateKeyModal(), + style: Object.assign( + dropdownMenuItemStyle, + menuItemStyles, + ), + }, + 'Export Private Key', + ), + h( + DropdownMenuItem, + { + closeMenu: () => {}, + onClick: () => { + actions.hideSidebar() + actions.showAddTokenPage() + }, + style: Object.assign( + dropdownMenuItemStyle, + menuItemStyles, + ), + }, + 'Add Token', + ), + + ] + ) + } + + render () { + const { style, enableAccountsSelector, enableAccountOptions } = this.props + const { optionsMenuActive, accountSelectorActive } = this.state + + return h( + 'span', + { + style: style, + }, + [ + enableAccountsSelector && h( + 'i.fa.fa-angle-down', + { + style: { + cursor: 'pointer', + }, + onClick: (event) => { + event.stopPropagation() + this.setState({ + accountSelectorActive: !accountSelectorActive, + optionsMenuActive: false, + }) + }, + }, + this.renderAccountSelector(), + ), + enableAccountOptions && h( + 'i.fa.fa-ellipsis-h', + { + style: { + fontSize: '135%', + cursor: 'pointer', + }, + onClick: (event) => { + event.stopPropagation() + this.setState({ + accountSelectorActive: false, + optionsMenuActive: !optionsMenuActive, + }) + }, + }, + this.renderAccountOptions() + ), + ] + ) + } +} + +AccountDropdowns.defaultProps = { + enableAccountsSelector: false, + enableAccountOptions: false, +} + +AccountDropdowns.propTypes = { + identities: PropTypes.objectOf(PropTypes.object), + selected: PropTypes.string, + keyrings: PropTypes.array, + accounts: PropTypes.object, + menuItemStyles: PropTypes.object, + actions: PropTypes.object, + // actions.showAccountDetail: , + useCssTransition: PropTypes.bool, + innerStyle: PropTypes.object, + sidebarOpen: PropTypes.bool, + dropdownWrapperStyle: PropTypes.string, + // actions.showAccountDetailModal: , + network: PropTypes.number, + // actions.showExportPrivateKeyModal: , + style: PropTypes.object, + enableAccountsSelector: PropTypes.bool, + enableAccountOption: PropTypes.bool, + enableAccountOptions: PropTypes.bool, +} + +const mapDispatchToProps = (dispatch) => { + return { + actions: { + hideSidebar: () => dispatch(actions.hideSidebar()), + showConfigPage: () => dispatch(actions.showConfigPage()), + showAccountDetail: (address) => dispatch(actions.showAccountDetail(address)), + showAccountDetailModal: () => { + dispatch(actions.showModal({ name: 'ACCOUNT_DETAILS' })) + }, + showEditAccountModal: (identity) => { + dispatch(actions.showModal({ + name: 'EDIT_ACCOUNT_NAME', + identity, + })) + }, + showNewAccountModal: () => { + dispatch(actions.showModal({ name: 'NEW_ACCOUNT' })) + }, + showExportPrivateKeyModal: () => { + dispatch(actions.showModal({ name: 'EXPORT_PRIVATE_KEY' })) + }, + showAddTokenPage: () => { + dispatch(actions.showAddTokenPage()) + }, + addNewAccount: () => dispatch(actions.addNewAccount()), + showImportPage: () => dispatch(actions.showImportPage()), + showQrView: (selected, identity) => dispatch(actions.showQrView(selected, identity)), + }, + } +} + +function mapStateToProps (state) { + return { + keyrings: state.metamask.keyrings, + sidebarOpen: state.appState.sidebarOpen, + } +} + +module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountDropdowns) + diff --git a/ui/app/components/dropdowns/components/dropdown.js b/ui/app/components/dropdowns/components/dropdown.js new file mode 100644 index 000000000..15d064be8 --- /dev/null +++ b/ui/app/components/dropdowns/components/dropdown.js @@ -0,0 +1,113 @@ +const Component = require('react').Component +const PropTypes = require('react').PropTypes +const h = require('react-hyperscript') +const MenuDroppo = require('../../menu-droppo') +const extend = require('xtend') + +const noop = () => {} + +class Dropdown extends Component { + render () { + const { + containerClassName, + isOpen, + onClickOutside, + style, + innerStyle, + children, + useCssTransition, + } = this.props + + const innerStyleDefaults = extend({ + borderRadius: '4px', + padding: '8px 16px', + background: 'rgba(0, 0, 0, 0.8)', + boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px', + }, innerStyle) + + return h( + MenuDroppo, + { + containerClassName, + useCssTransition, + isOpen, + zIndex: 55, + onClickOutside, + style, + innerStyle: innerStyleDefaults, + }, + [ + h( + 'style', + ` + li.dropdown-menu-item:hover { + color:rgb(225, 225, 225); + background-color: rgba(255, 255, 255, 0.05); + border-radius: 4px; + } + li.dropdown-menu-item { color: rgb(185, 185, 185); } + ` + ), + ...children, + ] + ) + } +} + +Dropdown.defaultProps = { + isOpen: false, + onClick: noop, + useCssTransition: false, +} + +Dropdown.propTypes = { + isOpen: PropTypes.bool.isRequired, + onClick: PropTypes.func.isRequired, + children: PropTypes.node, + style: PropTypes.object.isRequired, + onClickOutside: PropTypes.func, + innerStyle: PropTypes.object, + useCssTransition: PropTypes.bool, + containerClassName: PropTypes.string, +} + +class DropdownMenuItem extends Component { + render () { + const { onClick, closeMenu, children, style } = this.props + + return h( + 'li.dropdown-menu-item', + { + onClick: () => { + onClick() + closeMenu() + }, + style: Object.assign({ + listStyle: 'none', + padding: '8px 0px', + fontSize: '18px', + fontStyle: 'normal', + fontFamily: 'Montserrat Regular', + cursor: 'pointer', + display: 'flex', + justifyContent: 'flex-start', + alignItems: 'center', + color: 'white', + }, style), + }, + children + ) + } +} + +DropdownMenuItem.propTypes = { + closeMenu: PropTypes.func.isRequired, + onClick: PropTypes.func.isRequired, + children: PropTypes.node, + style: PropTypes.object, +} + +module.exports = { + Dropdown, + DropdownMenuItem, +} diff --git a/ui/app/components/dropdowns/components/menu.js b/ui/app/components/dropdowns/components/menu.js new file mode 100644 index 000000000..f6d8a139e --- /dev/null +++ b/ui/app/components/dropdowns/components/menu.js @@ -0,0 +1,51 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') + +inherits(Menu, Component) +function Menu () { Component.call(this) } + +Menu.prototype.render = function () { + const { className = '', children, isShowing } = this.props + return isShowing + ? h('div', { className: `menu ${className}` }, children) + : h('noscript') +} + +inherits(Item, Component) +function Item () { Component.call(this) } + +Item.prototype.render = function () { + const { + icon, + children, + text, + className = '', + onClick, + } = this.props + const itemClassName = `menu__item ${className} ${onClick ? 'menu__item--clickable' : ''}` + const iconComponent = icon ? h('div.menu__item__icon', [icon]) : null + const textComponent = text ? h('div.menu__item__text', text) : null + + return children + ? h('div', { className: itemClassName, onClick }, children) + : h('div.menu__item', { className: itemClassName, onClick }, [ iconComponent, textComponent ] + .filter(d => Boolean(d)) + ) +} + +inherits(Divider, Component) +function Divider () { Component.call(this) } + +Divider.prototype.render = function () { + return h('div.menu__divider') +} + +inherits(CloseArea, Component) +function CloseArea () { Component.call(this) } + +CloseArea.prototype.render = function () { + return h('div.menu__close-area', { onClick: this.props.onClick }) +} + +module.exports = { Menu, Item, Divider, CloseArea } diff --git a/ui/app/components/dropdowns/components/network-dropdown-icon.js b/ui/app/components/dropdowns/components/network-dropdown-icon.js new file mode 100644 index 000000000..7e94e0af5 --- /dev/null +++ b/ui/app/components/dropdowns/components/network-dropdown-icon.js @@ -0,0 +1,28 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const h = require('react-hyperscript') + + +inherits(NetworkDropdownIcon, Component) +module.exports = NetworkDropdownIcon + +function NetworkDropdownIcon () { + Component.call(this) +} + +NetworkDropdownIcon.prototype.render = function () { + const { + backgroundColor, + isSelected, + innerBorder = 'none', + } = this.props + + return h(`.menu-icon-circle${isSelected ? '--active' : ''}`, {}, + h('div', { + style: { + background: backgroundColor, + border: innerBorder, + }, + }) + ) +} diff --git a/ui/app/components/dropdowns/index.js b/ui/app/components/dropdowns/index.js new file mode 100644 index 000000000..fa66f5000 --- /dev/null +++ b/ui/app/components/dropdowns/index.js @@ -0,0 +1,17 @@ +// Reusable Dropdown Components +// TODO: Refactor into separate components +const Dropdown = require('./components/dropdown').Dropdown +const AccountDropdowns = require('./components/account-dropdowns') + +// App-Specific Instances +const AccountSelectionDropdown = require('./account-selection-dropdown') +const AccountOptionsDropdown = require('./account-options-dropdown') +const NetworkDropdown = require('./network-dropdown').default + +module.exports = { + AccountSelectionDropdown, + AccountOptionsDropdown, + NetworkDropdown, + Dropdown, + AccountDropdowns, +} diff --git a/ui/app/components/dropdowns/network-dropdown.js b/ui/app/components/dropdowns/network-dropdown.js new file mode 100644 index 000000000..dfaa6b22c --- /dev/null +++ b/ui/app/components/dropdowns/network-dropdown.js @@ -0,0 +1,322 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const connect = require('react-redux').connect +const actions = require('../../actions') +const Dropdown = require('./components/dropdown').Dropdown +const DropdownMenuItem = require('./components/dropdown').DropdownMenuItem +const NetworkDropdownIcon = require('./components/network-dropdown-icon') +const R = require('ramda') + +// classes from nodes of the toggle element. +const notToggleElementClassnames = [ + 'menu-icon', + 'network-name', + 'network-indicator', + 'network-caret', + 'network-component', +] + +function mapStateToProps (state) { + return { + provider: state.metamask.provider, + frequentRpcList: state.metamask.frequentRpcList || [], + networkDropdownOpen: state.appState.networkDropdownOpen, + } +} + +function mapDispatchToProps (dispatch) { + return { + hideModal: () => { + dispatch(actions.hideModal()) + }, + setProviderType: (type) => { + dispatch(actions.setProviderType(type)) + }, + setDefaultRpcTarget: type => { + dispatch(actions.setDefaultRpcTarget(type)) + }, + setRpcTarget: (target) => { + dispatch(actions.setRpcTarget(target)) + }, + showConfigPage: () => { + dispatch(actions.showConfigPage()) + }, + showNetworkDropdown: () => dispatch(actions.showNetworkDropdown()), + hideNetworkDropdown: () => dispatch(actions.hideNetworkDropdown()), + } +} + + +inherits(NetworkDropdown, Component) +function NetworkDropdown () { + Component.call(this) +} + +module.exports = connect(mapStateToProps, mapDispatchToProps)(NetworkDropdown) + +// TODO: specify default props and proptypes +NetworkDropdown.prototype.render = function () { + const props = this.props + const { provider: { type: providerType, rpcTarget: activeNetwork } } = props + const rpcList = props.frequentRpcList + const isOpen = this.props.networkDropdownOpen + const dropdownMenuItemStyle = { + fontFamily: 'DIN OT', + fontSize: '16px', + lineHeight: '20px', + padding: '12px 0', + } + + return h(Dropdown, { + isOpen, + onClickOutside: (event) => { + const { classList } = event.target + const isInClassList = className => classList.contains(className) + const notToggleElementIndex = R.findIndex(isInClassList)(notToggleElementClassnames) + + if (notToggleElementIndex === -1) { + this.props.hideNetworkDropdown() + } + }, + containerClassName: 'network-droppo', + zIndex: 55, + style: { + position: 'absolute', + top: '58px', + minWidth: '309px', + zIndex: '55px', + }, + innerStyle: { + padding: '18px 8px', + }, + }, [ + + h('div.network-dropdown-header', {}, [ + h('div.network-dropdown-title', {}, 'Networks'), + + h('div.network-dropdown-divider'), + + h('div.network-dropdown-content', + {}, + 'The default network for Ether transactions is Main Net.' + ), + ]), + + h( + DropdownMenuItem, + { + key: 'main', + closeMenu: () => this.props.hideNetworkDropdown(), + onClick: () => props.setProviderType('mainnet'), + style: { ...dropdownMenuItemStyle, borderColor: '#038789' }, + }, + [ + providerType === 'mainnet' ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), + h(NetworkDropdownIcon, { + backgroundColor: '#038789', // $blue-lagoon + isSelected: providerType === 'mainnet', + }), + h('span.network-name-item', { + style: { + color: providerType === 'mainnet' ? '#ffffff' : '#9b9b9b', + }, + }, 'Main Ethereum Network'), + ] + ), + + h( + DropdownMenuItem, + { + key: 'ropsten', + closeMenu: () => this.props.hideNetworkDropdown(), + onClick: () => props.setProviderType('ropsten'), + style: dropdownMenuItemStyle, + }, + [ + providerType === 'ropsten' ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), + h(NetworkDropdownIcon, { + backgroundColor: '#e91550', // $crimson + isSelected: providerType === 'ropsten', + }), + h('span.network-name-item', { + style: { + color: providerType === 'ropsten' ? '#ffffff' : '#9b9b9b', + }, + }, 'Ropsten Test Network'), + ] + ), + + h( + DropdownMenuItem, + { + key: 'kovan', + closeMenu: () => this.props.hideNetworkDropdown(), + onClick: () => props.setProviderType('kovan'), + style: dropdownMenuItemStyle, + }, + [ + providerType === 'kovan' ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), + h(NetworkDropdownIcon, { + backgroundColor: '#690496', // $purple + isSelected: providerType === 'kovan', + }), + h('span.network-name-item', { + style: { + color: providerType === 'kovan' ? '#ffffff' : '#9b9b9b', + }, + }, 'Kovan Test Network'), + ] + ), + + h( + DropdownMenuItem, + { + key: 'rinkeby', + closeMenu: () => this.props.hideNetworkDropdown(), + onClick: () => props.setProviderType('rinkeby'), + style: dropdownMenuItemStyle, + }, + [ + providerType === 'rinkeby' ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), + h(NetworkDropdownIcon, { + backgroundColor: '#ebb33f', // $tulip-tree + isSelected: providerType === 'rinkeby', + }), + h('span.network-name-item', { + style: { + color: providerType === 'rinkeby' ? '#ffffff' : '#9b9b9b', + }, + }, 'Rinkeby Test Network'), + ] + ), + + h( + DropdownMenuItem, + { + key: 'default', + closeMenu: () => this.props.hideNetworkDropdown(), + onClick: () => props.setRpcTarget('http://localhost:8545'), + style: dropdownMenuItemStyle, + }, + [ + activeNetwork === 'http://localhost:8545' ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), + h(NetworkDropdownIcon, { + isSelected: activeNetwork === 'http://localhost:8545', + innerBorder: '1px solid #9b9b9b', + }), + h('span.network-name-item', { + style: { + color: activeNetwork === 'http://localhost:8545' ? '#ffffff' : '#9b9b9b', + }, + }, 'Localhost 8545'), + ] + ), + + this.renderCustomOption(props.provider), + this.renderCommonRpc(rpcList, props.provider), + + h( + DropdownMenuItem, + { + closeMenu: () => this.props.hideNetworkDropdown(), + onClick: () => this.props.showConfigPage(), + style: dropdownMenuItemStyle, + }, + [ + activeNetwork === 'custom' ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), + h(NetworkDropdownIcon, { + isSelected: activeNetwork === 'custom', + innerBorder: '1px solid #9b9b9b', + }), + h('span.network-name-item', { + style: { + color: activeNetwork === 'custom' ? '#ffffff' : '#9b9b9b', + }, + }, 'Custom RPC'), + ] + ), + + ]) +} + + +NetworkDropdown.prototype.getNetworkName = function () { + const { provider } = this.props + const providerName = provider.type + + let name + + if (providerName === 'mainnet') { + name = 'Main Ethereum Network' + } else if (providerName === 'ropsten') { + name = 'Ropsten Test Network' + } else if (providerName === 'kovan') { + name = 'Kovan Test Network' + } else if (providerName === 'rinkeby') { + name = 'Rinkeby Test Network' + } else { + name = 'Unknown Private Network' + } + + return name +} + +NetworkDropdown.prototype.renderCommonRpc = function (rpcList, provider) { + const props = this.props + const rpcTarget = provider.rpcTarget + + return rpcList.map((rpc) => { + if ((rpc === 'http://localhost:8545') || (rpc === rpcTarget)) { + return null + } else { + return h( + DropdownMenuItem, + { + key: `common${rpc}`, + closeMenu: () => this.props.hideNetworkDropdown(), + onClick: () => props.setRpcTarget(rpc), + }, + [ + h('i.fa.fa-question-circle.fa-lg.menu-icon'), + rpc, + rpcTarget === rpc ? h('.check', '✓') : null, + ] + ) + } + }) +} + +NetworkDropdown.prototype.renderCustomOption = function (provider) { + const { rpcTarget, type } = provider + const props = this.props + + if (type !== 'rpc') return null + + // Concatenate long URLs + let label = rpcTarget + if (rpcTarget.length > 31) { + label = label.substr(0, 34) + '...' + } + + switch (rpcTarget) { + + case 'http://localhost:8545': + return null + + default: + return h( + DropdownMenuItem, + { + key: rpcTarget, + onClick: () => props.setRpcTarget(rpcTarget), + closeMenu: () => this.props.hideNetworkDropdown(), + }, + [ + h('i.fa.fa-question-circle.fa-lg.menu-icon'), + label, + h('.check', '✓'), + ] + ) + } +} diff --git a/ui/app/components/dropdowns/simple-dropdown.js b/ui/app/components/dropdowns/simple-dropdown.js new file mode 100644 index 000000000..7bb48e57b --- /dev/null +++ b/ui/app/components/dropdowns/simple-dropdown.js @@ -0,0 +1,92 @@ +const { Component } = require('react') +const PropTypes = require('react').PropTypes +const h = require('react-hyperscript') +const classnames = require('classnames') +const R = require('ramda') + +class SimpleDropdown extends Component { + constructor (props) { + super(props) + this.state = { + isOpen: false, + } + } + + getDisplayValue () { + const { selectedOption, options } = this.props + const matchesOption = option => option.value === selectedOption + const matchingOption = R.find(matchesOption)(options) + return matchingOption + ? matchingOption.displayValue || matchingOption.value + : selectedOption + } + + handleClose () { + this.setState({ isOpen: false }) + } + + toggleOpen () { + const { isOpen } = this.state + this.setState({ isOpen: !isOpen }) + } + + renderOptions () { + const { options, onSelect, selectedOption } = this.props + + return h('div', [ + h('div.simple-dropdown__close-area', { + onClick: event => { + event.stopPropagation() + this.handleClose() + }, + }), + h('div.simple-dropdown__options', [ + ...options.map(option => { + return h( + 'div.simple-dropdown__option', + { + className: classnames({ + 'simple-dropdown__option--selected': option.value === selectedOption, + }), + key: option.value, + onClick: () => { + if (option.value !== selectedOption) { + onSelect(option.value) + } + + this.handleClose() + }, + }, + option.displayValue || option.value, + ) + }), + ]), + ]) + } + + render () { + const { placeholder } = this.props + const { isOpen } = this.state + + return h( + 'div.simple-dropdown', + { + onClick: () => this.toggleOpen(), + }, + [ + h('div.simple-dropdown__selected', this.getDisplayValue() || placeholder || 'Select'), + h('i.fa.fa-caret-down.fa-lg.simple-dropdown__caret'), + isOpen && this.renderOptions(), + ] + ) + } +} + +SimpleDropdown.propTypes = { + options: PropTypes.array.isRequired, + placeholder: PropTypes.string, + onSelect: PropTypes.func, + selectedOption: PropTypes.string, +} + +module.exports = SimpleDropdown diff --git a/ui/app/components/dropdowns/token-menu-dropdown.js b/ui/app/components/dropdowns/token-menu-dropdown.js new file mode 100644 index 000000000..dc7a985e3 --- /dev/null +++ b/ui/app/components/dropdowns/token-menu-dropdown.js @@ -0,0 +1,51 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const connect = require('react-redux').connect +const actions = require('../../actions') + +module.exports = connect(null, mapDispatchToProps)(TokenMenuDropdown) + +function mapDispatchToProps (dispatch) { + return { + showHideTokenConfirmationModal: (token) => { + dispatch(actions.showModal({ name: 'HIDE_TOKEN_CONFIRMATION', token })) + }, + } +} + + +inherits(TokenMenuDropdown, Component) +function TokenMenuDropdown () { + Component.call(this) + + this.onClose = this.onClose.bind(this) +} + +TokenMenuDropdown.prototype.onClose = function (e) { + e.stopPropagation() + this.props.onClose() +} + +TokenMenuDropdown.prototype.render = function () { + const { showHideTokenConfirmationModal } = this.props + + return h('div.token-menu-dropdown', {}, [ + h('div.token-menu-dropdown__close-area', { + onClick: this.onClose, + }), + h('div.token-menu-dropdown__container', {}, [ + h('div.token-menu-dropdown__options', {}, [ + + h('div.token-menu-dropdown__option', { + onClick: (e) => { + e.stopPropagation() + showHideTokenConfirmationModal(this.props.token) + this.props.onClose() + }, + }, 'Hide Token'), + + ]), + ]), + ]) +} diff --git a/ui/app/components/editable-label.js b/ui/app/components/editable-label.js index 8a5c8954f..eb41ec50c 100644 --- a/ui/app/components/editable-label.js +++ b/ui/app/components/editable-label.js @@ -1,57 +1,88 @@ -const Component = require('react').Component +const { Component } = require('react') +const PropTypes = require('prop-types') const h = require('react-hyperscript') -const inherits = require('util').inherits -const findDOMNode = require('react-dom').findDOMNode +const classnames = require('classnames') -module.exports = EditableLabel +class EditableLabel extends Component { + constructor (props) { + super(props) -inherits(EditableLabel, Component) -function EditableLabel () { - Component.call(this) -} + this.state = { + isEditing: false, + value: props.defaultValue || '', + } + } + + handleSubmit () { + const { value } = this.state + + if (value === '') { + return + } + + Promise.resolve(this.props.onSubmit(value)) + .then(() => this.setState({ isEditing: false })) + } + + saveIfEnter (event) { + if (event.key === 'Enter') { + this.handleSubmit() + } + } -EditableLabel.prototype.render = function () { - const props = this.props - const state = this.state + renderEditing () { + const { value } = this.state - if (state && state.isEditingLabel) { - return h('div.editable-label', [ - h('input.sizing-input', { - defaultValue: props.textValue, - maxLength: '20', + return ([ + h('input.large-input.editable-label__input', { + type: 'text', + required: true, + value: this.state.value, onKeyPress: (event) => { - this.saveIfEnter(event) + if (event.key === 'Enter') { + this.handleSubmit() + } }, + onChange: event => this.setState({ value: event.target.value }), + className: classnames({ 'editable-label__input--error': value === '' }), }), - h('button.editable-button', { - onClick: () => this.saveText(), - }, 'Save'), + h('div.editable-label__icon-wrapper', [ + h('i.fa.fa-check.editable-label__icon', { + onClick: () => this.handleSubmit(), + }), + ]), ]) - } else { - return h('div.name-label', { - onClick: (event) => { - const nameAttribute = event.target.getAttribute('name') - // checks for class to handle smaller CTA above the account name - const classAttribute = event.target.getAttribute('class') - if (nameAttribute === 'edit' || classAttribute === 'edit-text') { - this.setState({ isEditingLabel: true }) - } - }, - }, this.props.children) } -} -EditableLabel.prototype.saveIfEnter = function (event) { - if (event.key === 'Enter') { - this.saveText() + renderReadonly () { + return ([ + h('div.editable-label__value', this.state.value), + h('div.editable-label__icon-wrapper', [ + h('i.fa.fa-pencil.editable-label__icon', { + onClick: () => this.setState({ isEditing: true }), + }), + ]), + ]) + } + + render () { + const { isEditing } = this.state + const { className } = this.props + + return ( + h('div.editable-label', { className: classnames(className) }, + isEditing + ? this.renderEditing() + : this.renderReadonly() + ) + ) } } -EditableLabel.prototype.saveText = function () { - // eslint-disable-next-line react/no-find-dom-node - var container = findDOMNode(this) - var text = container.querySelector('.editable-label input').value - var truncatedText = text.substring(0, 20) - this.props.saveText(truncatedText) - this.setState({ isEditingLabel: false, textLabel: truncatedText }) +EditableLabel.propTypes = { + onSubmit: PropTypes.func.isRequired, + defaultValue: PropTypes.string, + className: PropTypes.string, } + +module.exports = EditableLabel diff --git a/ui/app/components/ens-input.js b/ui/app/components/ens-input.js index c85a23514..6553053f7 100644 --- a/ui/app/components/ens-input.js +++ b/ui/app/components/ens-input.js @@ -44,7 +44,7 @@ EnsInput.prototype.render = function () { return h('div', { style: { width: '100%' }, }, [ - h('input.large-input', opts), + h('input.large-input.send-screen-input', opts), // The address book functionality. h('datalist#addresses', [ @@ -125,7 +125,7 @@ EnsInput.prototype.componentDidUpdate = function (prevProps, prevState) { EnsInput.prototype.ensIcon = function (recipient) { const { hoverText } = this.state || {} - return h('span', { + return h('span.#ensIcon', { title: hoverText, style: { position: 'absolute', diff --git a/ui/app/components/eth-balance.js b/ui/app/components/eth-balance.js index 4f538fd31..1be8c9731 100644 --- a/ui/app/components/eth-balance.js +++ b/ui/app/components/eth-balance.js @@ -1,8 +1,10 @@ -const Component = require('react').Component +const { Component } = require('react') const h = require('react-hyperscript') -const inherits = require('util').inherits -const formatBalance = require('../util').formatBalance -const generateBalanceObject = require('../util').generateBalanceObject +const { inherits } = require('util') +const { + formatBalance, + generateBalanceObject, +} = require('../util') const Tooltip = require('./tooltip.js') const FiatValue = require('./fiat-value.js') @@ -14,11 +16,10 @@ function EthBalanceComponent () { } EthBalanceComponent.prototype.render = function () { - var props = this.props - let { value } = props - const { style, width } = props - var needsParse = this.props.needsParse !== undefined ? this.props.needsParse : true - value = value ? formatBalance(value, 6, needsParse) : '...' + const props = this.props + const { value, style, width, needsParse = true } = props + + const formattedValue = value ? formatBalance(value, 6, needsParse) : '...' return ( @@ -30,60 +31,66 @@ EthBalanceComponent.prototype.render = function () { display: 'inline', width, }, - }, this.renderBalance(value)), + }, this.renderBalance(formattedValue)), ]) ) } EthBalanceComponent.prototype.renderBalance = function (value) { - var props = this.props - const { conversionRate, shorten, incoming, currentCurrency } = props if (value === 'None') return value if (value === '...') return value - var balanceObj = generateBalanceObject(value, shorten ? 1 : 3) - var balance - var splitBalance = value.split(' ') - var ethNumber = splitBalance[0] - var ethSuffix = splitBalance[1] - const showFiat = 'showFiat' in props ? props.showFiat : true - if (shorten) { - balance = balanceObj.shortBalance - } else { - balance = balanceObj.balance - } + const { + conversionRate, + shorten, + incoming, + currentCurrency, + hideTooltip, + styleOveride, + showFiat = true, + } = this.props + const { fontSize, color, fontFamily, lineHeight } = styleOveride - var label = balanceObj.label + const { shortBalance, balance, label } = generateBalanceObject(value, shorten ? 1 : 3) + const balanceToRender = shorten ? shortBalance : balance + + const [ethNumber, ethSuffix] = value.split(' ') + const containerProps = hideTooltip ? {} : { + position: 'bottom', + title: `${ethNumber} ${ethSuffix}`, + } return ( - h(Tooltip, { - position: 'bottom', - title: `${ethNumber} ${ethSuffix}`, - }, h('div.flex-column', [ - h('.flex-row', { - style: { - alignItems: 'flex-end', - lineHeight: '13px', - fontFamily: 'Montserrat Light', - textRendering: 'geometricPrecision', - }, - }, [ - h('div', { - style: { - width: '100%', - textAlign: 'right', - }, - }, incoming ? `+${balance}` : balance), - h('div', { + h(hideTooltip ? 'div' : Tooltip, + containerProps, + h('div.flex-column', [ + h('.flex-row', { style: { - color: ' #AEAEAE', - fontSize: '12px', - marginLeft: '5px', + alignItems: 'flex-end', + lineHeight: lineHeight || '13px', + fontFamily: fontFamily || 'Montserrat Light', + textRendering: 'geometricPrecision', }, - }, label), - ]), + }, [ + h('div', { + style: { + width: '100%', + textAlign: 'right', + fontSize: fontSize || 'inherit', + color: color || 'inherit', + }, + }, incoming ? `+${balanceToRender}` : balanceToRender), + h('div', { + style: { + color: color || '#AEAEAE', + fontSize: fontSize || '12px', + marginLeft: '5px', + }, + }, label), + ]), - showFiat ? h(FiatValue, { value: props.value, conversionRate, currentCurrency }) : null, - ])) + showFiat ? h(FiatValue, { value: this.props.value, conversionRate, currentCurrency }) : null, + ]) + ) ) } diff --git a/ui/app/components/fiat-value.js b/ui/app/components/fiat-value.js index d69f41d11..56465fc9d 100644 --- a/ui/app/components/fiat-value.js +++ b/ui/app/components/fiat-value.js @@ -12,7 +12,7 @@ function FiatValue () { FiatValue.prototype.render = function () { const props = this.props - const { conversionRate, currentCurrency } = props + const { conversionRate, currentCurrency, style } = props const renderedCurrency = currentCurrency || '' const value = formatBalance(props.value, 6) @@ -29,16 +29,18 @@ FiatValue.prototype.render = function () { fiatTooltipNumber = 'Unknown' } - return fiatDisplay(fiatDisplayNumber, renderedCurrency.toUpperCase()) + return fiatDisplay(fiatDisplayNumber, renderedCurrency.toUpperCase(), style) } -function fiatDisplay (fiatDisplayNumber, fiatSuffix) { +function fiatDisplay (fiatDisplayNumber, fiatSuffix, styleOveride = {}) { + const { fontSize, color, fontFamily, lineHeight } = styleOveride + if (fiatDisplayNumber !== 'N/A') { return h('.flex-row', { style: { alignItems: 'flex-end', - lineHeight: '13px', - fontFamily: 'Montserrat Light', + lineHeight: lineHeight || '13px', + fontFamily: fontFamily || 'Montserrat Light', textRendering: 'geometricPrecision', }, }, [ @@ -46,15 +48,15 @@ function fiatDisplay (fiatDisplayNumber, fiatSuffix) { style: { width: '100%', textAlign: 'right', - fontSize: '12px', - color: '#333333', + fontSize: fontSize || '12px', + color: color || '#333333', }, }, fiatDisplayNumber), h('div', { style: { - color: '#AEAEAE', + color: color || '#AEAEAE', marginLeft: '5px', - fontSize: '12px', + fontSize: fontSize || '12px', }, }, fiatSuffix), ]) diff --git a/ui/app/components/identicon.js b/ui/app/components/identicon.js index bb476ca7b..b803b7ceb 100644 --- a/ui/app/components/identicon.js +++ b/ui/app/components/identicon.js @@ -1,13 +1,15 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits +const connect = require('react-redux').connect const isNode = require('detect-node') const findDOMNode = require('react-dom').findDOMNode const jazzicon = require('jazzicon') const iconFactoryGen = require('../../lib/icon-factory') const iconFactory = iconFactoryGen(jazzicon) +const { toDataUrl } = require('../../lib/blockies') -module.exports = IdenticonComponent +module.exports = connect(mapStateToProps)(IdenticonComponent) inherits(IdenticonComponent, Component) function IdenticonComponent () { @@ -16,59 +18,100 @@ function IdenticonComponent () { this.defaultDiameter = 46 } +function mapStateToProps (state) { + return { + useBlockie: state.metamask.useBlockie, + } +} + IdenticonComponent.prototype.render = function () { var props = this.props + const { className = '', address } = props var diameter = props.diameter || this.defaultDiameter - return ( - h('div', { - key: 'identicon-' + this.props.address, - style: { - display: 'flex', - alignItems: 'center', - justifyContent: 'center', - height: diameter, - width: diameter, - borderRadius: diameter / 2, - overflow: 'hidden', - }, - }) - ) + + return address + ? ( + h('div', { + className: `${className} identicon`, + key: 'identicon-' + address, + style: { + display: 'flex', + alignItems: 'center', + justifyContent: 'center', + height: diameter, + width: diameter, + borderRadius: diameter / 2, + overflow: 'hidden', + }, + }) + ) + : ( + h('img.balance-icon', { + src: '../images/eth_logo.svg', + style: { + height: diameter, + width: diameter, + borderRadius: diameter / 2, + }, + }) + ) } IdenticonComponent.prototype.componentDidMount = function () { var props = this.props - const { address } = props + const { address, useBlockie } = props if (!address) return - // eslint-disable-next-line react/no-find-dom-node - var container = findDOMNode(this) - - var diameter = props.diameter || this.defaultDiameter if (!isNode) { - var img = iconFactory.iconForAddress(address, diameter) - container.appendChild(img) + // eslint-disable-next-line react/no-find-dom-node + var container = findDOMNode(this) + + const diameter = props.diameter || this.defaultDiameter + + if (useBlockie) { + _generateBlockie(container, address, diameter) + } else { + _generateJazzicon(container, address, diameter) + } } } IdenticonComponent.prototype.componentDidUpdate = function () { var props = this.props - const { address } = props + const { address, useBlockie } = props if (!address) return - // eslint-disable-next-line react/no-find-dom-node - var container = findDOMNode(this) + if (!isNode) { + // eslint-disable-next-line react/no-find-dom-node + var container = findDOMNode(this) - var children = container.children - for (var i = 0; i < children.length; i++) { - container.removeChild(children[i]) - } + var children = container.children + for (var i = 0; i < children.length; i++) { + container.removeChild(children[i]) + } - var diameter = props.diameter || this.defaultDiameter - if (!isNode) { - var img = iconFactory.iconForAddress(address, diameter) - container.appendChild(img) + const diameter = props.diameter || this.defaultDiameter + + if (useBlockie) { + _generateBlockie(container, address, diameter) + } else { + _generateJazzicon(container, address, diameter) + } } } +function _generateBlockie (container, address, diameter) { + const img = new Image() + img.src = toDataUrl(address) + const dia = !diameter || diameter < 50 ? 50 : diameter + img.height = dia * 1.25 + img.width = dia * 1.25 + container.appendChild(img) +} + +function _generateJazzicon (container, address, diameter) { + const img = iconFactory.iconForAddress(address, diameter) + container.appendChild(img) +} diff --git a/ui/app/components/input-number.js b/ui/app/components/input-number.js new file mode 100644 index 000000000..fd8c5c309 --- /dev/null +++ b/ui/app/components/input-number.js @@ -0,0 +1,73 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const CurrencyInput = require('./currency-input') +const { + addCurrencies, + conversionGTE, + conversionLTE, + subtractCurrencies, +} = require('../conversion-util') + +module.exports = InputNumber + +inherits(InputNumber, Component) +function InputNumber () { + Component.call(this) + + this.setValue = this.setValue.bind(this) +} + +function isValidInput (text) { + const re = /^([1-9]\d*|0)(\.|\.\d*)?$/ + return re.test(text) +} + +InputNumber.prototype.setValue = function (newValue) { + if (newValue && !isValidInput(newValue)) return + const { fixed, min = -1, max = Infinity, onChange } = this.props + + newValue = fixed ? newValue.toFixed(4) : newValue + + const newValueGreaterThanMin = conversionGTE( + { value: newValue || '0', fromNumericBase: 'dec' }, + { value: min, fromNumericBase: 'hex' }, + ) + + const newValueLessThanMax = conversionLTE( + { value: newValue || '0', fromNumericBase: 'dec' }, + { value: max, fromNumericBase: 'hex' }, + ) + if (newValueGreaterThanMin && newValueLessThanMax) { + onChange(newValue) + } else if (!newValueGreaterThanMin) { + onChange(min) + } else if (!newValueLessThanMax) { + onChange(max) + } +} + +InputNumber.prototype.render = function () { + const { unitLabel, step = 1, placeholder, value = 0 } = this.props + + return h('div.customize-gas-input-wrapper', {}, [ + h(CurrencyInput, { + className: 'customize-gas-input', + value, + placeholder, + onInputChange: newValue => { + this.setValue(newValue) + }, + }), + h('span.gas-tooltip-input-detail', {}, [unitLabel]), + h('div.gas-tooltip-input-arrows', {}, [ + h('i.fa.fa-angle-up', { + onClick: () => this.setValue(addCurrencies(value, step)), + }), + h('i.fa.fa-angle-down', { + style: { cursor: 'pointer' }, + onClick: () => this.setValue(subtractCurrencies(value, step)), + }), + ]), + ]) +} diff --git a/ui/app/components/loading.js b/ui/app/components/loading.js index 163792584..9442121fe 100644 --- a/ui/app/components/loading.js +++ b/ui/app/components/loading.js @@ -1,45 +1,30 @@ -const inherits = require('util').inherits -const Component = require('react').Component +const { Component } = require('react') const h = require('react-hyperscript') - - -inherits(LoadingIndicator, Component) -module.exports = LoadingIndicator - -function LoadingIndicator () { - Component.call(this) +const PropTypes = require('react').PropTypes + +class LoadingIndicator extends Component { + renderMessage () { + const { loadingMessage } = this.props + return loadingMessage && h('span', loadingMessage) + } + + render () { + return ( + h('.full-flex-height.loading-overlay', {}, [ + h('img', { + src: 'images/loading.svg', + }), + + h('br'), + + this.renderMessage(), + ]) + ) + } } -LoadingIndicator.prototype.render = function () { - const { isLoading, loadingMessage } = this.props - - return ( - isLoading ? h('.full-flex-height', { - style: { - left: '0px', - zIndex: 10, - position: 'absolute', - flexDirection: 'column', - display: 'flex', - justifyContent: 'center', - alignItems: 'center', - height: '100%', - width: '100%', - background: 'rgba(255, 255, 255, 0.8)', - }, - }, [ - h('img', { - src: 'images/loading.svg', - }), - - h('br'), - - showMessageIfAny(loadingMessage), - ]) : null - ) +LoadingIndicator.propTypes = { + loadingMessage: PropTypes.string, } -function showMessageIfAny (loadingMessage) { - if (!loadingMessage) return null - return h('span', loadingMessage) -} +module.exports = LoadingIndicator diff --git a/ui/app/components/menu-droppo.js b/ui/app/components/menu-droppo.js index e6276f3b1..c80bee2be 100644 --- a/ui/app/components/menu-droppo.js +++ b/ui/app/components/menu-droppo.js @@ -13,6 +13,7 @@ function MenuDroppoComponent () { } MenuDroppoComponent.prototype.render = function () { + const { containerClassName = '' } = this.props const speed = this.props.speed || '300ms' const useCssTransition = this.props.useCssTransition const zIndex = ('zIndex' in this.props) ? this.props.zIndex : 0 @@ -26,8 +27,9 @@ MenuDroppoComponent.prototype.render = function () { style.zIndex = zIndex return ( - h('.menu-droppo-container', { + h('div', { style, + className: `.menu-droppo-container ${containerClassName}`, }, [ h('style', ` .menu-droppo-enter { diff --git a/ui/app/components/modals/account-details-modal.js b/ui/app/components/modals/account-details-modal.js new file mode 100644 index 000000000..4bf671834 --- /dev/null +++ b/ui/app/components/modals/account-details-modal.js @@ -0,0 +1,75 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const connect = require('react-redux').connect +const actions = require('../../actions') +const AccountModalContainer = require('./account-modal-container') +const { getSelectedIdentity } = require('../../selectors') +const genAccountLink = require('../../../lib/account-link.js') +const QrView = require('../qr-code') +const EditableLabel = require('../editable-label') + +function mapStateToProps (state) { + return { + network: state.metamask.network, + selectedIdentity: getSelectedIdentity(state), + } +} + +function mapDispatchToProps (dispatch) { + return { + // Is this supposed to be used somewhere? + showQrView: (selected, identity) => dispatch(actions.showQrView(selected, identity)), + showExportPrivateKeyModal: () => { + dispatch(actions.showModal({ name: 'EXPORT_PRIVATE_KEY' })) + }, + hideModal: () => dispatch(actions.hideModal()), + saveAccountLabel: (address, label) => dispatch(actions.saveAccountLabel(address, label)), + } +} + +inherits(AccountDetailsModal, Component) +function AccountDetailsModal () { + Component.call(this) +} + +module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountDetailsModal) + +// Not yet pixel perfect todos: + // fonts of qr-header + +AccountDetailsModal.prototype.render = function () { + const { + selectedIdentity, + network, + showExportPrivateKeyModal, + saveAccountLabel, + } = this.props + const { name, address } = selectedIdentity + + return h(AccountModalContainer, {}, [ + h(EditableLabel, { + className: 'account-modal__name', + defaultValue: name, + onSubmit: label => saveAccountLabel(address, label), + }), + + h(QrView, { + Qr: { + data: address, + }, + }), + + h('div.account-modal-divider'), + + h('button.btn-clear', { + onClick: () => global.platform.openWindow({ url: genAccountLink(address, network) }), + }, 'View account on Etherscan'), + + // Holding on redesign for Export Private Key functionality + h('button.btn-clear', { + onClick: () => showExportPrivateKeyModal(), + }, 'Export private key'), + + ]) +} diff --git a/ui/app/components/modals/account-modal-container.js b/ui/app/components/modals/account-modal-container.js new file mode 100644 index 000000000..c548fb7b3 --- /dev/null +++ b/ui/app/components/modals/account-modal-container.js @@ -0,0 +1,74 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const connect = require('react-redux').connect +const actions = require('../../actions') +const { getSelectedIdentity } = require('../../selectors') +const Identicon = require('../identicon') + +function mapStateToProps (state) { + return { + selectedIdentity: getSelectedIdentity(state), + } +} + +function mapDispatchToProps (dispatch) { + return { + hideModal: () => { + dispatch(actions.hideModal()) + }, + } +} + +inherits(AccountModalContainer, Component) +function AccountModalContainer () { + Component.call(this) +} + +module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountModalContainer) + +AccountModalContainer.prototype.render = function () { + const { + selectedIdentity, + showBackButton = false, + backButtonAction, + } = this.props + let { children } = this.props + + if (children.constructor !== Array) { + children = [children] + } + + return h('div', { style: { borderRadius: '4px' }}, [ + h('div.account-modal-container', [ + + h('div', [ + + // Needs a border; requires changes to svg + h(Identicon, { + address: selectedIdentity.address, + diameter: 64, + style: {}, + }), + + ]), + + showBackButton && h('div.account-modal-back', { + onClick: backButtonAction, + }, [ + + h('i.fa.fa-angle-left.fa-lg'), + + h('span.account-modal-back__text', ' Back'), + + ]), + + h('div.account-modal-close', { + onClick: this.props.hideModal, + }), + + ...children, + + ]), + ]) +} diff --git a/ui/app/components/modals/buy-options-modal.js b/ui/app/components/modals/buy-options-modal.js new file mode 100644 index 000000000..d735983f9 --- /dev/null +++ b/ui/app/components/modals/buy-options-modal.js @@ -0,0 +1,95 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const connect = require('react-redux').connect +const actions = require('../../actions') +const networkNames = require('../../../../app/scripts/config.js').networkNames + +function mapStateToProps (state) { + return { + network: state.metamask.network, + address: state.metamask.selectedAddress, + } +} + +function mapDispatchToProps (dispatch) { + return { + toCoinbase: (address) => { + dispatch(actions.buyEth({ network: '1', address, amount: 0 })) + }, + hideModal: () => { + dispatch(actions.hideModal()) + }, + showAccountDetailModal: () => { + dispatch(actions.showModal({ name: 'ACCOUNT_DETAILS' })) + }, + toFaucet: network => dispatch(actions.buyEth({ network })), + } +} + +inherits(BuyOptions, Component) +function BuyOptions () { + Component.call(this) +} + +module.exports = connect(mapStateToProps, mapDispatchToProps)(BuyOptions) + +BuyOptions.prototype.renderModalContentOption = function (title, header, onClick) { + return h('div.buy-modal-content-option', { + onClick, + }, [ + h('div.buy-modal-content-option-title', {}, title), + h('div.buy-modal-content-option-subtitle', {}, header), + ]) +} + +BuyOptions.prototype.render = function () { + const { network, toCoinbase, address, toFaucet } = this.props + const isTestNetwork = ['3', '4', '42'].find(n => n === network) + const networkName = networkNames[network] + + return h('div', {}, [ + h('div.buy-modal-content.transfers-subview', { + }, [ + h('div.buy-modal-content-title-wrapper.flex-column.flex-center', { + style: {}, + }, [ + h('div.buy-modal-content-title', { + style: {}, + }, 'Transfers'), + h('div', {}, 'How would you like to deposit Ether?'), + ]), + + h('div.buy-modal-content-options.flex-column.flex-center', {}, [ + + isTestNetwork + ? this.renderModalContentOption(networkName, 'Test Faucet', () => toFaucet(network)) + : this.renderModalContentOption('Coinbase', 'Deposit with Fiat', () => toCoinbase(address)), + + // h('div.buy-modal-content-option', {}, [ + // h('div.buy-modal-content-option-title', {}, 'Shapeshift'), + // h('div.buy-modal-content-option-subtitle', {}, 'Trade any digital asset for any other'), + // ]), + + this.renderModalContentOption( + 'Direct Deposit', + 'Deposit from another account', + () => this.goToAccountDetailsModal() + ), + + ]), + + h('button', { + style: { + background: 'white', + }, + onClick: () => { this.props.hideModal() }, + }, h('div.buy-modal-content-footer#buy-modal-content-footer-text', {}, 'Cancel')), + ]), + ]) +} + +BuyOptions.prototype.goToAccountDetailsModal = function () { + this.props.hideModal() + this.props.showAccountDetailModal() +} diff --git a/ui/app/components/modals/edit-account-name-modal.js b/ui/app/components/modals/edit-account-name-modal.js new file mode 100644 index 000000000..e2361140d --- /dev/null +++ b/ui/app/components/modals/edit-account-name-modal.js @@ -0,0 +1,77 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const connect = require('react-redux').connect +const actions = require('../../actions') +const { getSelectedAccount } = require('../../selectors') + +function mapStateToProps (state) { + return { + selectedAccount: getSelectedAccount(state), + identity: state.appState.modal.modalState.identity, + } +} + +function mapDispatchToProps (dispatch) { + return { + hideModal: () => { + dispatch(actions.hideModal()) + }, + saveAccountLabel: (account, label) => { + dispatch(actions.saveAccountLabel(account, label)) + }, + } +} + +inherits(EditAccountNameModal, Component) +function EditAccountNameModal (props) { + Component.call(this) + + this.state = { + inputText: props.identity.name, + } +} + +module.exports = connect(mapStateToProps, mapDispatchToProps)(EditAccountNameModal) + +EditAccountNameModal.prototype.render = function () { + const { hideModal, saveAccountLabel, identity } = this.props + + return h('div', {}, [ + h('div.flex-column.edit-account-name-modal-content', { + }, [ + + h('div.edit-account-name-modal-cancel', { + onClick: () => { + hideModal() + }, + }, [ + h('i.fa.fa-times'), + ]), + + h('div.edit-account-name-modal-title', { + }, ['Edit Account Name']), + + h('input.edit-account-name-modal-input', { + placeholder: identity.name, + onChange: (event) => { + this.setState({ inputText: event.target.value }) + }, + value: this.state.inputText, + }, []), + + h('button.btn-clear.edit-account-name-modal-save-button', { + onClick: () => { + if (this.state.inputText.length !== 0) { + saveAccountLabel(identity.address, this.state.inputText) + hideModal() + } + }, + disabled: this.state.inputText.length === 0, + }, [ + 'SAVE', + ]), + + ]), + ]) +} diff --git a/ui/app/components/modals/export-private-key-modal.js b/ui/app/components/modals/export-private-key-modal.js new file mode 100644 index 000000000..193755df5 --- /dev/null +++ b/ui/app/components/modals/export-private-key-modal.js @@ -0,0 +1,137 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const connect = require('react-redux').connect +const ethUtil = require('ethereumjs-util') +const actions = require('../../actions') +const AccountModalContainer = require('./account-modal-container') +const { getSelectedIdentity } = require('../../selectors') +const ReadOnlyInput = require('../readonly-input') +const copyToClipboard = require('copy-to-clipboard') + +function mapStateToProps (state) { + return { + warning: state.appState.warning, + privateKey: state.appState.accountDetail.privateKey, + network: state.metamask.network, + selectedIdentity: getSelectedIdentity(state), + previousModalState: state.appState.modal.previousModalState.name, + } +} + +function mapDispatchToProps (dispatch) { + return { + exportAccount: (password, address) => dispatch(actions.exportAccount(password, address)), + showAccountDetailModal: () => dispatch(actions.showModal({ name: 'ACCOUNT_DETAILS' })), + hideModal: () => dispatch(actions.hideModal()), + } +} + +inherits(ExportPrivateKeyModal, Component) +function ExportPrivateKeyModal () { + Component.call(this) + + this.state = { + password: '', + privateKey: null, + } +} + +module.exports = connect(mapStateToProps, mapDispatchToProps)(ExportPrivateKeyModal) + +ExportPrivateKeyModal.prototype.exportAccountAndGetPrivateKey = function (password, address) { + const { exportAccount } = this.props + + exportAccount(password, address) + .then(privateKey => this.setState({ privateKey })) +} + +ExportPrivateKeyModal.prototype.renderPasswordLabel = function (privateKey) { + return h('span.private-key-password-label', privateKey + ? 'This is your private key (click to copy)' + : 'Type Your Password' + ) +} + +ExportPrivateKeyModal.prototype.renderPasswordInput = function (privateKey) { + const plainKey = privateKey && ethUtil.stripHexPrefix(privateKey) + + return privateKey + ? h(ReadOnlyInput, { + wrapperClass: 'private-key-password-display-wrapper', + inputClass: 'private-key-password-display-textarea', + textarea: true, + value: plainKey, + onClick: () => copyToClipboard(plainKey), + }) + : h('input.private-key-password-input', { + type: 'password', + onChange: event => this.setState({ password: event.target.value }), + }) +} + +ExportPrivateKeyModal.prototype.renderButton = function (className, onClick, label) { + return h('button', { + className, + onClick, + }, label) +} + +ExportPrivateKeyModal.prototype.renderButtons = function (privateKey, password, address, hideModal) { + return h('div.export-private-key-buttons', {}, [ + !privateKey && this.renderButton('btn-clear btn-cancel', () => hideModal(), 'Cancel'), + + (privateKey + ? this.renderButton('btn-clear', () => hideModal(), 'Done') + : this.renderButton('btn-clear', () => this.exportAccountAndGetPrivateKey(this.state.password, address), 'Show') + ), + + ]) +} + +ExportPrivateKeyModal.prototype.render = function () { + const { + selectedIdentity, + warning, + showAccountDetailModal, + hideModal, + previousModalState, + } = this.props + const { name, address } = selectedIdentity + + const { privateKey } = this.state + + return h(AccountModalContainer, { + showBackButton: previousModalState === 'ACCOUNT_DETAILS', + backButtonAction: () => showAccountDetailModal(), + }, [ + + h('span.account-name', name), + + h(ReadOnlyInput, { + wrapperClass: 'ellip-address-wrapper', + inputClass: 'qr-ellip-address ellip-address', + value: address, + }), + + h('div.account-modal-divider'), + + h('span.modal-body-title', 'Show Private Keys'), + + h('div.private-key-password', {}, [ + this.renderPasswordLabel(privateKey), + + this.renderPasswordInput(privateKey), + + !warning ? null : h('span.private-key-password-error', warning), + ]), + + h('div.private-key-password-warning', `Warning: Never disclose this key. + Anyone with your private keys can take steal any assets held in your + account.` + ), + + this.renderButtons(privateKey, this.state.password, address, hideModal), + + ]) +} diff --git a/ui/app/components/modals/hide-token-confirmation-modal.js b/ui/app/components/modals/hide-token-confirmation-modal.js new file mode 100644 index 000000000..fa3ad0b1e --- /dev/null +++ b/ui/app/components/modals/hide-token-confirmation-modal.js @@ -0,0 +1,74 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const connect = require('react-redux').connect +const actions = require('../../actions') +const Identicon = require('../identicon') + +function mapStateToProps (state) { + return { + network: state.metamask.network, + token: state.appState.modal.modalState.token, + } +} + +function mapDispatchToProps (dispatch) { + return { + hideModal: () => dispatch(actions.hideModal()), + hideToken: address => { + dispatch(actions.removeToken(address)) + .then(() => { + dispatch(actions.hideModal()) + }) + }, + } +} + +inherits(HideTokenConfirmationModal, Component) +function HideTokenConfirmationModal () { + Component.call(this) + + this.state = {} +} + +module.exports = connect(mapStateToProps, mapDispatchToProps)(HideTokenConfirmationModal) + +HideTokenConfirmationModal.prototype.render = function () { + const { token, network, hideToken, hideModal } = this.props + const { symbol, address } = token + + return h('div.hide-token-confirmation', {}, [ + h('div.hide-token-confirmation__container', { + }, [ + h('div.hide-token-confirmation__title', {}, [ + 'Hide Token?', + ]), + + h(Identicon, { + className: 'hide-token-confirmation__identicon', + diameter: 45, + address, + network, + }), + + h('div.hide-token-confirmation__symbol', {}, symbol), + + h('div.hide-token-confirmation__copy', {}, [ + 'You can add this token back in the future by going go to “Add token” in your accounts options menu.', + ]), + + h('div.hide-token-confirmation__buttons', {}, [ + h('button.btn-clear', { + onClick: () => hideModal(), + }, [ + 'CANCEL', + ]), + h('button.btn-clear', { + onClick: () => hideToken(address), + }, [ + 'HIDE', + ]), + ]), + ]), + ]) +} diff --git a/ui/app/components/modals/index.js b/ui/app/components/modals/index.js new file mode 100644 index 000000000..1db1d33d4 --- /dev/null +++ b/ui/app/components/modals/index.js @@ -0,0 +1,5 @@ +const Modal = require('./modal') + +module.exports = { + Modal, +} diff --git a/ui/app/components/modals/modal.js b/ui/app/components/modals/modal.js new file mode 100644 index 000000000..2ff6accaa --- /dev/null +++ b/ui/app/components/modals/modal.js @@ -0,0 +1,299 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const connect = require('react-redux').connect +const FadeModal = require('boron').FadeModal +const actions = require('../../actions') +const isMobileView = require('../../../lib/is-mobile-view') +const isPopupOrNotification = require('../../../../app/scripts/lib/is-popup-or-notification') + +// Modal Components +const BuyOptions = require('./buy-options-modal') +const AccountDetailsModal = require('./account-details-modal') +const EditAccountNameModal = require('./edit-account-name-modal') +const ExportPrivateKeyModal = require('./export-private-key-modal') +const NewAccountModal = require('./new-account-modal') +const ShapeshiftDepositTxModal = require('./shapeshift-deposit-tx-modal.js') +const HideTokenConfirmationModal = require('./hide-token-confirmation-modal') +const CustomizeGasModal = require('../customize-gas-modal') +const NotifcationModal = require('./notification-modal') + +const accountModalStyle = { + mobileModalStyle: { + width: '95%', + // top: isPopupOrNotification() === 'popup' ? '52vh' : '36.5vh', + boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px', + borderRadius: '4px', + top: '10%', + transform: 'none', + left: '0', + right: '0', + margin: '0 auto', + }, + laptopModalStyle: { + width: '360px', + // top: 'calc(33% + 45px)', + boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px', + borderRadius: '4px', + top: '10%', + transform: 'none', + left: '0', + right: '0', + margin: '0 auto', + }, + contentStyle: { + borderRadius: '4px', + }, +} + +const MODALS = { + BUY: { + contents: [ + h(BuyOptions, {}, []), + ], + mobileModalStyle: { + width: '95%', + // top: isPopupOrNotification() === 'popup' ? '48vh' : '36.5vh', + transform: 'none', + left: '0', + right: '0', + margin: '0 auto', + boxShadow: '0 0 7px 0 rgba(0,0,0,0.08)', + top: '10%', + }, + laptopModalStyle: { + width: '66%', + maxWidth: '550px', + top: 'calc(10% + 10px)', + left: '0', + right: '0', + margin: '0 auto', + boxShadow: '0 0 7px 0 rgba(0,0,0,0.08)', + transform: 'none', + }, + }, + + EDIT_ACCOUNT_NAME: { + contents: [ + h(EditAccountNameModal, {}, []), + ], + mobileModalStyle: { + width: '95%', + // top: isPopupOrNotification() === 'popup' ? '48vh' : '36.5vh', + top: '10%', + boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px', + transform: 'none', + left: '0', + right: '0', + margin: '0 auto', + }, + laptopModalStyle: { + width: '375px', + // top: 'calc(30% + 10px)', + top: '10%', + boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px', + transform: 'none', + left: '0', + right: '0', + margin: '0 auto', + }, + }, + + ACCOUNT_DETAILS: { + contents: [ + h(AccountDetailsModal, {}, []), + ], + ...accountModalStyle, + }, + + EXPORT_PRIVATE_KEY: { + contents: [ + h(ExportPrivateKeyModal, {}, []), + ], + ...accountModalStyle, + }, + + SHAPESHIFT_DEPOSIT_TX: { + contents: [ + h(ShapeshiftDepositTxModal), + ], + ...accountModalStyle, + }, + + HIDE_TOKEN_CONFIRMATION: { + contents: [ + h(HideTokenConfirmationModal, {}, []), + ], + mobileModalStyle: { + width: '95%', + top: isPopupOrNotification() === 'popup' ? '52vh' : '36.5vh', + }, + laptopModalStyle: { + width: '449px', + top: 'calc(33% + 45px)', + }, + }, + + BETA_UI_NOTIFICATION_MODAL: { + contents: [ + h(NotifcationModal, { + header: 'Welcome to the New UI (Beta)', + message: `You are now using the new Metamask UI. Take a look around, try out new features like sending tokens, + and let us know if you have any issues.`, + }), + ], + mobileModalStyle: { + width: '95%', + top: isPopupOrNotification() === 'popup' ? '52vh' : '36.5vh', + }, + laptopModalStyle: { + width: '449px', + top: 'calc(33% + 45px)', + }, + }, + + OLD_UI_NOTIFICATION_MODAL: { + contents: [ + h(NotifcationModal, { + header: 'Old UI', + message: `You have returned to the old UI. You can switch back to the New UI through the option in the top + right dropdown menu.`, + }), + ], + mobileModalStyle: { + width: '95%', + top: isPopupOrNotification() === 'popup' ? '52vh' : '36.5vh', + }, + laptopModalStyle: { + width: '449px', + top: 'calc(33% + 45px)', + }, + }, + + NEW_ACCOUNT: { + contents: [ + h(NewAccountModal, {}, []), + ], + mobileModalStyle: { + width: '95%', + // top: isPopupOrNotification() === 'popup' ? '52vh' : '36.5vh', + top: '10%', + transform: 'none', + left: '0', + right: '0', + margin: '0 auto', + }, + laptopModalStyle: { + width: '449px', + // top: 'calc(33% + 45px)', + top: '10%', + transform: 'none', + left: '0', + right: '0', + margin: '0 auto', + }, + }, + + CUSTOMIZE_GAS: { + contents: [ + h(CustomizeGasModal, {}, []), + ], + mobileModalStyle: { + width: '100vw', + height: '100vh', + top: '0', + transform: 'none', + left: '0', + right: '0', + margin: '0 auto', + }, + laptopModalStyle: { + width: '720px', + height: '377px', + top: '80px', + transform: 'none', + left: '0', + right: '0', + margin: '0 auto', + }, + }, + + DEFAULT: { + contents: [], + mobileModalStyle: {}, + laptopModalStyle: {}, + }, +} + +const BACKDROPSTYLE = { + backgroundColor: 'rgba(0, 0, 0, 0.5)', +} + +function mapStateToProps (state) { + return { + active: state.appState.modal.open, + modalState: state.appState.modal.modalState, + } +} + +function mapDispatchToProps (dispatch) { + return { + hideModal: () => { + dispatch(actions.hideModal()) + }, + } +} + +// Global Modal Component +inherits(Modal, Component) +function Modal () { + Component.call(this) +} + +module.exports = connect(mapStateToProps, mapDispatchToProps)(Modal) + +Modal.prototype.render = function () { + const modal = MODALS[this.props.modalState.name || 'DEFAULT'] + + const children = modal.contents + const modalStyle = modal[isMobileView() ? 'mobileModalStyle' : 'laptopModalStyle'] + const contentStyle = modal.contentStyle || {} + + return h(FadeModal, + { + className: 'modal', + keyboard: false, + onHide: () => { this.onHide() }, + ref: (ref) => { + this.modalRef = ref + }, + modalStyle, + contentStyle, + backdropStyle: BACKDROPSTYLE, + }, + children, + ) +} + +Modal.prototype.componentWillReceiveProps = function (nextProps) { + if (nextProps.active) { + this.show() + } else if (this.props.active) { + this.hide() + } +} + +Modal.prototype.onHide = function () { + if (this.props.onHideCallback) { + this.props.onHideCallback() + } + this.props.hideModal() +} + +Modal.prototype.hide = function () { + this.modalRef.hide() +} + +Modal.prototype.show = function () { + this.modalRef.show() +} diff --git a/ui/app/components/modals/new-account-modal.js b/ui/app/components/modals/new-account-modal.js new file mode 100644 index 000000000..fc1fd413d --- /dev/null +++ b/ui/app/components/modals/new-account-modal.js @@ -0,0 +1,106 @@ +const { Component } = require('react') +const PropTypes = require('prop-types') +const h = require('react-hyperscript') +const { connect } = require('react-redux') +const actions = require('../../actions') + +class NewAccountModal extends Component { + constructor (props) { + super(props) + const { numberOfExistingAccounts = 0 } = props + const newAccountNumber = numberOfExistingAccounts + 1 + + this.state = { + newAccountName: `Account ${newAccountNumber}`, + } + } + + render () { + const { newAccountName } = this.state + + return h('div', [ + h('div.new-account-modal-wrapper', { + }, [ + h('div.new-account-modal-header', {}, [ + 'New Account', + ]), + + h('div.modal-close-x', { + onClick: this.props.hideModal, + }), + + h('div.new-account-modal-content', {}, [ + 'Account Name', + ]), + + h('div.new-account-input-wrapper', {}, [ + h('input.new-account-input', { + value: this.state.newAccountName, + placeholder: 'E.g. My new account', + onChange: event => this.setState({ newAccountName: event.target.value }), + }, []), + ]), + + h('div.new-account-modal-content.after-input', {}, [ + 'or', + ]), + + h('div.new-account-modal-content.after-input.pointer', { + onClick: () => { + this.props.hideModal() + this.props.showImportPage() + }, + }, 'Import an account'), + + h('div.new-account-modal-content.button', {}, [ + h('button.btn-clear', { + onClick: () => this.props.createAccount(newAccountName), + }, [ + 'SAVE', + ]), + ]), + ]), + ]) + } +} + +NewAccountModal.propTypes = { + hideModal: PropTypes.func, + showImportPage: PropTypes.func, + createAccount: PropTypes.func, + numberOfExistingAccounts: PropTypes.number, +} + +const mapStateToProps = state => { + const { metamask: { network, selectedAddress, identities = {} } } = state + const numberOfExistingAccounts = Object.keys(identities).length + + return { + network, + address: selectedAddress, + numberOfExistingAccounts, + } +} + +const mapDispatchToProps = dispatch => { + return { + toCoinbase: (address) => { + dispatch(actions.buyEth({ network: '1', address, amount: 0 })) + }, + hideModal: () => { + dispatch(actions.hideModal()) + }, + createAccount: (newAccountName) => { + dispatch(actions.addNewAccount()) + .then((newAccountAddress) => { + if (newAccountName) { + dispatch(actions.saveAccountLabel(newAccountAddress, newAccountName)) + } + dispatch(actions.hideModal()) + }) + }, + showImportPage: () => dispatch(actions.showImportPage()), + } +} + +module.exports = connect(mapStateToProps, mapDispatchToProps)(NewAccountModal) diff --git a/ui/app/components/modals/notification-modal.js b/ui/app/components/modals/notification-modal.js new file mode 100644 index 000000000..239144b0c --- /dev/null +++ b/ui/app/components/modals/notification-modal.js @@ -0,0 +1,51 @@ +const { Component } = require('react') +const PropTypes = require('prop-types') +const h = require('react-hyperscript') +const { connect } = require('react-redux') +const actions = require('../../actions') + +class NotificationModal extends Component { + render () { + const { + header, + message, + } = this.props + + return h('div', [ + h('div.notification-modal-wrapper', { + }, [ + + h('div.notification-modal-header', {}, [ + header, + ]), + + h('div.notification-modal-message-wrapper', {}, [ + h('div.notification-modal-message', {}, [ + message, + ]), + ]), + + h('div.modal-close-x', { + onClick: this.props.hideModal, + }), + + ]), + ]) + } +} + +NotificationModal.propTypes = { + hideModal: PropTypes.func, + header: PropTypes.string, + message: PropTypes.string, +} + +const mapDispatchToProps = dispatch => { + return { + hideModal: () => { + dispatch(actions.hideModal()) + }, + } +} + +module.exports = connect(null, mapDispatchToProps)(NotificationModal) diff --git a/ui/app/components/modals/shapeshift-deposit-tx-modal.js b/ui/app/components/modals/shapeshift-deposit-tx-modal.js new file mode 100644 index 000000000..24af5a0de --- /dev/null +++ b/ui/app/components/modals/shapeshift-deposit-tx-modal.js @@ -0,0 +1,40 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const connect = require('react-redux').connect +const actions = require('../../actions') +const QrView = require('../qr-code') +const AccountModalContainer = require('./account-modal-container') + +function mapStateToProps (state) { + return { + Qr: state.appState.modal.modalState.Qr, + } +} + +function mapDispatchToProps (dispatch) { + return { + hideModal: () => { + dispatch(actions.hideModal()) + }, + } +} + +inherits(ShapeshiftDepositTxModal, Component) +function ShapeshiftDepositTxModal () { + Component.call(this) + +} + +module.exports = connect(mapStateToProps, mapDispatchToProps)(ShapeshiftDepositTxModal) + +ShapeshiftDepositTxModal.prototype.render = function () { + const { Qr } = this.props + + return h(AccountModalContainer, { + }, [ + h('div', {}, [ + h(QrView, {key: 'qr', Qr}), + ]), + ]) +} diff --git a/ui/app/components/network.js b/ui/app/components/network.js index 0dbe37cdd..5a8d0763d 100644 --- a/ui/app/components/network.js +++ b/ui/app/components/network.js @@ -1,6 +1,8 @@ const Component = require('react').Component const h = require('react-hyperscript') +const classnames = require('classnames') const inherits = require('util').inherits +const NetworkDropdownIcon = require('./dropdowns/components/network-dropdown-icon') module.exports = Network @@ -37,7 +39,7 @@ Network.prototype.render = function () { }, src: 'images/loading.svg', }), - h('i.fa.fa-caret-down'), + h('i.fa.fa-caret-down.network-caret'), ]) } else if (providerName === 'mainnet') { hoverText = 'Main Ethereum Network' @@ -60,51 +62,74 @@ Network.prototype.render = function () { } return ( - h('#network_component.pointer', { + h('div.network-component.pointer', { + className: classnames({ + 'network-component--disabled': this.props.disabled, + 'ethereum-network': providerName === 'mainnet', + 'ropsten-test-network': providerName === 'ropsten' || parseInt(networkNumber) === 3, + 'kovan-test-network': providerName === 'kovan', + 'rinkeby-test-network': providerName === 'rinkeby', + }), title: hoverText, - onClick: (event) => this.props.onClick(event), + onClick: (event) => { + if (!this.props.disabled) { + this.props.onClick(event) + } + }, }, [ (function () { switch (iconName) { case 'ethereum-network': return h('.network-indicator', [ - h('.menu-icon.diamond'), + h(NetworkDropdownIcon, { + backgroundColor: '#038789', // $blue-lagoon + nonSelectBackgroundColor: '#15afb2', + }), h('.network-name', { style: { color: '#039396', }}, 'Main Network'), - h('i.fa.fa-caret-down.fa-lg'), + h('i.fa.fa-caret-down.fa-lg.network-caret'), ]) case 'ropsten-test-network': return h('.network-indicator', [ - h('.menu-icon.red-dot'), + h(NetworkDropdownIcon, { + backgroundColor: '#e91550', // $crimson + nonSelectBackgroundColor: '#ec2c50', + }), h('.network-name', { style: { color: '#ff6666', }}, 'Ropsten Test Net'), - h('i.fa.fa-caret-down.fa-lg'), + h('i.fa.fa-caret-down.fa-lg.network-caret'), ]) case 'kovan-test-network': return h('.network-indicator', [ - h('.menu-icon.hollow-diamond'), + h(NetworkDropdownIcon, { + backgroundColor: '#690496', // $purple + nonSelectBackgroundColor: '#b039f3', + }), h('.network-name', { style: { color: '#690496', }}, 'Kovan Test Net'), - h('i.fa.fa-caret-down.fa-lg'), + h('i.fa.fa-caret-down.fa-lg.network-caret'), ]) case 'rinkeby-test-network': return h('.network-indicator', [ - h('.menu-icon.golden-square'), + h(NetworkDropdownIcon, { + backgroundColor: '#ebb33f', // $tulip-tree + nonSelectBackgroundColor: '#ecb23e', + }), h('.network-name', { style: { color: '#e7a218', }}, 'Rinkeby Test Net'), - h('i.fa.fa-caret-down.fa-lg'), + h('i.fa.fa-caret-down.fa-lg.network-caret'), ]) default: return h('.network-indicator', [ @@ -120,7 +145,7 @@ Network.prototype.render = function () { color: '#AEAEAE', }}, 'Private Network'), - h('i.fa.fa-caret-down.fa-lg'), + h('i.fa.fa-caret-down.fa-lg.network-caret'), ]) } })(), diff --git a/ui/app/components/notice.js b/ui/app/components/notice.js index 09d461c7b..941ac33e6 100644 --- a/ui/app/components/notice.js +++ b/ui/app/components/notice.js @@ -102,7 +102,7 @@ Notice.prototype.render = function () { }), ]), - h('button', { + h('button.primary', { disabled, onClick: () => { this.setState({disclaimerDisabled: true}) diff --git a/ui/app/components/pending-tx/confirm-deploy-contract.js b/ui/app/components/pending-tx/confirm-deploy-contract.js new file mode 100644 index 000000000..ae6c6ef7b --- /dev/null +++ b/ui/app/components/pending-tx/confirm-deploy-contract.js @@ -0,0 +1,348 @@ +const Component = require('react').Component +const { connect } = require('react-redux') +const h = require('react-hyperscript') +const inherits = require('util').inherits +const actions = require('../../actions') +const clone = require('clone') +const Identicon = require('../identicon') +const ethUtil = require('ethereumjs-util') +const BN = ethUtil.BN +const hexToBn = require('../../../../app/scripts/lib/hex-to-bn') +const { conversionUtil } = require('../../conversion-util') + +const { MIN_GAS_PRICE_HEX } = require('../send/send-constants') + + +module.exports = connect(mapStateToProps, mapDispatchToProps)(ConfirmDeployContract) + +function mapStateToProps (state) { + const { + conversionRate, + identities, + currentCurrency, + } = state.metamask + const accounts = state.metamask.accounts + const selectedAddress = state.metamask.selectedAddress || Object.keys(accounts)[0] + return { + currentCurrency, + conversionRate, + identities, + selectedAddress, + } +} + +function mapDispatchToProps (dispatch) { + return { + backToAccountDetail: address => dispatch(actions.backToAccountDetail(address)), + cancelTransaction: ({ id }) => dispatch(actions.cancelTx({ id })), + } +} + + +inherits(ConfirmDeployContract, Component) +function ConfirmDeployContract () { + Component.call(this) + this.state = {} + this.onSubmit = this.onSubmit.bind(this) +} + +ConfirmDeployContract.prototype.onSubmit = function (event) { + event.preventDefault() + const txMeta = this.gatherTxMeta() + const valid = this.checkValidity() + this.setState({ valid, submitting: true }) + + if (valid && this.verifyGasParams()) { + this.props.sendTransaction(txMeta, event) + } else { + this.props.dispatch(actions.displayWarning('Invalid Gas Parameters')) + this.setState({ submitting: false }) + } +} + +ConfirmDeployContract.prototype.cancel = function (event, txMeta) { + event.preventDefault() + this.props.cancelTransaction(txMeta) +} + +ConfirmDeployContract.prototype.checkValidity = function () { + const form = this.getFormEl() + const valid = form.checkValidity() + return valid +} + +ConfirmDeployContract.prototype.getFormEl = function () { + const form = document.querySelector('form#pending-tx-form') + // Stub out form for unit tests: + if (!form) { + return { checkValidity () { return true } } + } + return form +} + +// After a customizable state value has been updated, +ConfirmDeployContract.prototype.gatherTxMeta = function () { + const props = this.props + const state = this.state + const txData = clone(state.txData) || clone(props.txData) + + // log.debug(`UI has defaulted to tx meta ${JSON.stringify(txData)}`) + return txData +} + +ConfirmDeployContract.prototype.verifyGasParams = function () { + // We call this in case the gas has not been modified at all + if (!this.state) { return true } + return ( + this._notZeroOrEmptyString(this.state.gas) && + this._notZeroOrEmptyString(this.state.gasPrice) + ) +} + +ConfirmDeployContract.prototype._notZeroOrEmptyString = function (obj) { + return obj !== '' && obj !== '0x0' +} + +ConfirmDeployContract.prototype.bnMultiplyByFraction = function (targetBN, numerator, denominator) { + const numBN = new BN(numerator) + const denomBN = new BN(denominator) + return targetBN.mul(numBN).div(denomBN) +} + +ConfirmDeployContract.prototype.getData = function () { + const { identities } = this.props + const txMeta = this.gatherTxMeta() + const txParams = txMeta.txParams || {} + + return { + from: { + address: txParams.from, + name: identities[txParams.from].name, + }, + memo: txParams.memo || '', + } +} + +ConfirmDeployContract.prototype.getAmount = function () { + const { conversionRate, currentCurrency } = this.props + const txMeta = this.gatherTxMeta() + const txParams = txMeta.txParams || {} + + const FIAT = conversionUtil(txParams.value, { + fromNumericBase: 'hex', + toNumericBase: 'dec', + fromCurrency: 'ETH', + toCurrency: currentCurrency, + numberOfDecimals: 2, + fromDenomination: 'WEI', + conversionRate, + }) + const ETH = conversionUtil(txParams.value, { + fromNumericBase: 'hex', + toNumericBase: 'dec', + fromCurrency: 'ETH', + toCurrency: 'ETH', + fromDenomination: 'WEI', + conversionRate, + numberOfDecimals: 6, + }) + + return { + fiat: Number(FIAT), + token: Number(ETH), + } + +} + +ConfirmDeployContract.prototype.getGasFee = function () { + const { conversionRate, currentCurrency } = this.props + const txMeta = this.gatherTxMeta() + const txParams = txMeta.txParams || {} + + // Gas + const gas = txParams.gas + const gasBn = hexToBn(gas) + + // Gas Price + const gasPrice = txParams.gasPrice || MIN_GAS_PRICE_HEX + const gasPriceBn = hexToBn(gasPrice) + + const txFeeBn = gasBn.mul(gasPriceBn) + + const FIAT = conversionUtil(txFeeBn, { + fromNumericBase: 'BN', + toNumericBase: 'dec', + fromDenomination: 'WEI', + fromCurrency: 'ETH', + toCurrency: currentCurrency, + numberOfDecimals: 2, + conversionRate, + }) + const ETH = conversionUtil(txFeeBn, { + fromNumericBase: 'BN', + toNumericBase: 'dec', + fromDenomination: 'WEI', + fromCurrency: 'ETH', + toCurrency: 'ETH', + numberOfDecimals: 6, + conversionRate, + }) + + return { + fiat: Number(FIAT), + eth: Number(ETH), + } +} + +ConfirmDeployContract.prototype.renderGasFee = function () { + const { currentCurrency } = this.props + const { fiat: fiatGas, eth: ethGas } = this.getGasFee() + + return ( + h('section.flex-row.flex-center.confirm-screen-row', [ + h('span.confirm-screen-label.confirm-screen-section-column', [ 'Gas Fee' ]), + h('div.confirm-screen-section-column', [ + h('div.confirm-screen-row-info', `${fiatGas} ${currentCurrency.toUpperCase()}`), + + h( + 'div.confirm-screen-row-detail', + `${ethGas} ETH` + ), + ]), + ]) + ) +} + +ConfirmDeployContract.prototype.renderHeroAmount = function () { + const { currentCurrency } = this.props + const { fiat: fiatAmount } = this.getAmount() + const txMeta = this.gatherTxMeta() + const txParams = txMeta.txParams || {} + const { memo = '' } = txParams + + return ( + h('div.confirm-send-token__hero-amount-wrapper', [ + h('h3.flex-center.confirm-screen-send-amount', `${fiatAmount}`), + h('h3.flex-center.confirm-screen-send-amount-currency', currentCurrency.toUpperCase()), + h('div.flex-center.confirm-memo-wrapper', [ + h('h3.confirm-screen-send-memo', memo), + ]), + ]) + ) +} + +ConfirmDeployContract.prototype.renderTotalPlusGas = function () { + const { currentCurrency } = this.props + const { fiat: fiatAmount, token: tokenAmount } = this.getAmount() + const { fiat: fiatGas, eth: ethGas } = this.getGasFee() + + return ( + h('section.flex-row.flex-center.confirm-screen-total-box ', [ + h('div.confirm-screen-section-column', [ + h('span.confirm-screen-label', [ 'Total ' ]), + h('div.confirm-screen-total-box__subtitle', [ 'Amount + Gas' ]), + ]), + + h('div.confirm-screen-section-column', [ + h('div.confirm-screen-row-info', `${fiatAmount + fiatGas} ${currentCurrency.toUpperCase()}`), + h('div.confirm-screen-row-detail', `${tokenAmount + ethGas} ETH`), + ]), + ]) + ) +} + +ConfirmDeployContract.prototype.render = function () { + const { backToAccountDetail, selectedAddress } = this.props + const txMeta = this.gatherTxMeta() + + const { + from: { + address: fromAddress, + name: fromName, + }, + } = this.getData() + + this.inputs = [] + + return ( + h('div.flex-column.flex-grow.confirm-screen-container', { + style: { minWidth: '355px' }, + }, [ + // Main Send token Card + h('div.confirm-screen-wrapper.flex-column.flex-grow', [ + h('h3.flex-center.confirm-screen-header', [ + h('button.confirm-screen-back-button', { + onClick: () => backToAccountDetail(selectedAddress), + }, 'BACK'), + h('div.confirm-screen-title', 'Confirm Contract'), + h('div.confirm-screen-header-tip'), + ]), + h('div.flex-row.flex-center.confirm-screen-identicons', [ + h('div.confirm-screen-account-wrapper', [ + h( + Identicon, + { + address: fromAddress, + diameter: 60, + }, + ), + h('span.confirm-screen-account-name', fromName), + // h('span.confirm-screen-account-number', fromAddress.slice(fromAddress.length - 4)), + ]), + h('i.fa.fa-arrow-right.fa-lg'), + h('div.confirm-screen-account-wrapper', [ + h('i.fa.fa-file-text-o'), + h('span.confirm-screen-account-name', 'New Contract'), + h('span.confirm-screen-account-number', ' '), + ]), + ]), + + // h('h3.flex-center.confirm-screen-sending-to-message', { + // style: { + // textAlign: 'center', + // fontSize: '16px', + // }, + // }, [ + // `You're deploying a new contract.`, + // ]), + + this.renderHeroAmount(), + + h('div.confirm-screen-rows', [ + h('section.flex-row.flex-center.confirm-screen-row', [ + h('span.confirm-screen-label.confirm-screen-section-column', [ 'From' ]), + h('div.confirm-screen-section-column', [ + h('div.confirm-screen-row-info', fromName), + h('div.confirm-screen-row-detail', `...${fromAddress.slice(fromAddress.length - 4)}`), + ]), + ]), + + h('section.flex-row.flex-center.confirm-screen-row', [ + h('span.confirm-screen-label.confirm-screen-section-column', [ 'To' ]), + h('div.confirm-screen-section-column', [ + h('div.confirm-screen-row-info', 'New Contract'), + ]), + ]), + + this.renderGasFee(), + + this.renderTotalPlusGas(), + + ]), + ]), + + h('form#pending-tx-form', { + onSubmit: this.onSubmit, + }, [ + // Cancel Button + h('div.cancel.btn-light.confirm-screen-cancel-button', { + onClick: (event) => this.cancel(event, txMeta), + }, 'CANCEL'), + + // Accept Button + h('button.confirm-screen-confirm-button', ['CONFIRM']), + + ]), + ]) + ) +} diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js new file mode 100644 index 000000000..566224864 --- /dev/null +++ b/ui/app/components/pending-tx/confirm-send-ether.js @@ -0,0 +1,471 @@ +const Component = require('react').Component +const { connect } = require('react-redux') +const h = require('react-hyperscript') +const inherits = require('util').inherits +const actions = require('../../actions') +const clone = require('clone') +const Identicon = require('../identicon') +const ethUtil = require('ethereumjs-util') +const BN = ethUtil.BN +const hexToBn = require('../../../../app/scripts/lib/hex-to-bn') +const { conversionUtil, addCurrencies } = require('../../conversion-util') + +const { MIN_GAS_PRICE_HEX } = require('../send/send-constants') + +module.exports = connect(mapStateToProps, mapDispatchToProps)(ConfirmSendEther) + +function mapStateToProps (state) { + const { + conversionRate, + identities, + currentCurrency, + send, + } = state.metamask + const accounts = state.metamask.accounts + const selectedAddress = state.metamask.selectedAddress || Object.keys(accounts)[0] + return { + conversionRate, + identities, + selectedAddress, + currentCurrency, + send, + } +} + +function mapDispatchToProps (dispatch) { + return { + clearSend: () => dispatch(actions.clearSend()), + editTransaction: txMeta => { + const { id, txParams } = txMeta + const { + gas: gasLimit, + gasPrice, + to, + value: amount, + } = txParams + dispatch(actions.updateSend({ + gasLimit, + gasPrice, + gasTotal: null, + to, + amount, + errors: { to: null, amount: null }, + editingTransactionId: id, + })) + dispatch(actions.showSendPage()) + }, + cancelTransaction: ({ id }) => dispatch(actions.cancelTx({ id })), + } +} + +inherits(ConfirmSendEther, Component) +function ConfirmSendEther () { + Component.call(this) + this.state = {} + this.onSubmit = this.onSubmit.bind(this) +} + +ConfirmSendEther.prototype.getAmount = function () { + const { conversionRate, currentCurrency } = this.props + const txMeta = this.gatherTxMeta() + const txParams = txMeta.txParams || {} + + const FIAT = conversionUtil(txParams.value, { + fromNumericBase: 'hex', + toNumericBase: 'dec', + fromCurrency: 'ETH', + toCurrency: currentCurrency, + numberOfDecimals: 2, + fromDenomination: 'WEI', + conversionRate, + }) + const ETH = conversionUtil(txParams.value, { + fromNumericBase: 'hex', + toNumericBase: 'dec', + fromCurrency: 'ETH', + toCurrency: 'ETH', + fromDenomination: 'WEI', + conversionRate, + numberOfDecimals: 6, + }) + + return { + FIAT, + ETH, + } + +} + +ConfirmSendEther.prototype.getGasFee = function () { + const { conversionRate, currentCurrency } = this.props + const txMeta = this.gatherTxMeta() + const txParams = txMeta.txParams || {} + + // Gas + const gas = txParams.gas + const gasBn = hexToBn(gas) + + // From latest master +// const gasLimit = new BN(parseInt(blockGasLimit)) +// const safeGasLimitBN = this.bnMultiplyByFraction(gasLimit, 19, 20) +// const saferGasLimitBN = this.bnMultiplyByFraction(gasLimit, 18, 20) +// const safeGasLimit = safeGasLimitBN.toString(10) + + // Gas Price + const gasPrice = txParams.gasPrice || MIN_GAS_PRICE_HEX + const gasPriceBn = hexToBn(gasPrice) + + const txFeeBn = gasBn.mul(gasPriceBn) + + const FIAT = conversionUtil(txFeeBn, { + fromNumericBase: 'BN', + toNumericBase: 'dec', + fromDenomination: 'WEI', + fromCurrency: 'ETH', + toCurrency: currentCurrency, + numberOfDecimals: 2, + conversionRate, + }) + const ETH = conversionUtil(txFeeBn, { + fromNumericBase: 'BN', + toNumericBase: 'dec', + fromDenomination: 'WEI', + fromCurrency: 'ETH', + toCurrency: 'ETH', + numberOfDecimals: 6, + conversionRate, + }) + + return { + FIAT, + ETH, + } +} + +ConfirmSendEther.prototype.getData = function () { + const { identities } = this.props + const txMeta = this.gatherTxMeta() + const txParams = txMeta.txParams || {} + const { FIAT: gasFeeInFIAT, ETH: gasFeeInETH } = this.getGasFee() + const { FIAT: amountInFIAT, ETH: amountInETH } = this.getAmount() + + const totalInFIAT = addCurrencies(gasFeeInFIAT, amountInFIAT, { + toNumericBase: 'dec', + numberOfDecimals: 2, + }) + const totalInETH = addCurrencies(gasFeeInETH, amountInETH, { + toNumericBase: 'dec', + numberOfDecimals: 6, + }) + + return { + from: { + address: txParams.from, + name: identities[txParams.from].name, + }, + to: { + address: txParams.to, + name: identities[txParams.to] ? identities[txParams.to].name : 'New Recipient', + }, + memo: txParams.memo || '', + gasFeeInFIAT, + gasFeeInETH, + amountInFIAT, + amountInETH, + totalInFIAT, + totalInETH, + } +} + +ConfirmSendEther.prototype.render = function () { + const { editTransaction, currentCurrency, clearSend } = this.props + const txMeta = this.gatherTxMeta() + const txParams = txMeta.txParams || {} + + const { + from: { + address: fromAddress, + name: fromName, + }, + to: { + address: toAddress, + name: toName, + }, + memo, + gasFeeInFIAT, + gasFeeInETH, + amountInFIAT, + totalInFIAT, + totalInETH, + } = this.getData() + + // This is from the latest master + // It handles some of the errors that we are not currently handling + // Leaving as comments fo reference + + // const balanceBn = hexToBn(balance) + // const insufficientBalance = balanceBn.lt(maxCost) + // const buyDisabled = insufficientBalance || !this.state.valid || !isValidAddress || this.state.submitting + // const showRejectAll = props.unconfTxListLength > 1 +// const dangerousGasLimit = gasBn.gte(saferGasLimitBN) +// const gasLimitSpecified = txMeta.gasLimitSpecified + + this.inputs = [] + + return ( + h('div.confirm-screen-container.confirm-send-ether', { + style: { minWidth: '355px' }, + }, [ + // Main Send token Card + h('div.confirm-screen-wrapper.flex-column.flex-grow', [ + h('h3.flex-center.confirm-screen-header', [ + h('button.confirm-screen-back-button', { + onClick: () => editTransaction(txMeta), + }, 'EDIT'), + h('div.confirm-screen-title', 'Confirm Transaction'), + h('div.confirm-screen-header-tip'), + ]), + h('div.flex-row.flex-center.confirm-screen-identicons', [ + h('div.confirm-screen-account-wrapper', [ + h( + Identicon, + { + address: fromAddress, + diameter: 60, + }, + ), + h('span.confirm-screen-account-name', fromName), + // h('span.confirm-screen-account-number', fromAddress.slice(fromAddress.length - 4)), + ]), + h('i.fa.fa-arrow-right.fa-lg'), + h('div.confirm-screen-account-wrapper', [ + h( + Identicon, + { + address: txParams.to, + diameter: 60, + }, + ), + h('span.confirm-screen-account-name', toName), + // h('span.confirm-screen-account-number', toAddress.slice(toAddress.length - 4)), + ]), + ]), + + // h('h3.flex-center.confirm-screen-sending-to-message', { + // style: { + // textAlign: 'center', + // fontSize: '16px', + // }, + // }, [ + // `You're sending to Recipient ...${toAddress.slice(toAddress.length - 4)}`, + // ]), + + h('h3.flex-center.confirm-screen-send-amount', [`${amountInFIAT}`]), + h('h3.flex-center.confirm-screen-send-amount-currency', [ currentCurrency.toUpperCase() ]), + h('div.flex-center.confirm-memo-wrapper', [ + h('h3.confirm-screen-send-memo', [ memo ? `"${memo}"` : '' ]), + ]), + + h('div.confirm-screen-rows', [ + h('section.flex-row.flex-center.confirm-screen-row', [ + h('span.confirm-screen-label.confirm-screen-section-column', [ 'From' ]), + h('div.confirm-screen-section-column', [ + h('div.confirm-screen-row-info', fromName), + h('div.confirm-screen-row-detail', `...${fromAddress.slice(fromAddress.length - 4)}`), + ]), + ]), + + h('section.flex-row.flex-center.confirm-screen-row', [ + h('span.confirm-screen-label.confirm-screen-section-column', [ 'To' ]), + h('div.confirm-screen-section-column', [ + h('div.confirm-screen-row-info', toName), + h('div.confirm-screen-row-detail', `...${toAddress.slice(toAddress.length - 4)}`), + ]), + ]), + + h('section.flex-row.flex-center.confirm-screen-row', [ + h('span.confirm-screen-label.confirm-screen-section-column', [ 'Gas Fee' ]), + h('div.confirm-screen-section-column', [ + h('div.confirm-screen-row-info', `${gasFeeInFIAT} ${currentCurrency.toUpperCase()}`), + + h('div.confirm-screen-row-detail', `${gasFeeInETH} ETH`), + ]), + ]), + + + h('section.flex-row.flex-center.confirm-screen-total-box ', [ + h('div.confirm-screen-section-column', [ + h('span.confirm-screen-label', [ 'Total ' ]), + h('div.confirm-screen-total-box__subtitle', [ 'Amount + Gas' ]), + ]), + + h('div.confirm-screen-section-column', [ + h('div.confirm-screen-row-info', `${totalInFIAT} ${currentCurrency.toUpperCase()}`), + h('div.confirm-screen-row-detail', `${totalInETH} ETH`), + ]), + ]), + ]), + +// These are latest errors handling from master +// Leaving as comments as reference when we start implementing error handling +// h('style', ` +// .conf-buttons button { +// margin-left: 10px; +// text-transform: uppercase; +// } +// `), + +// txMeta.simulationFails ? +// h('.error', { +// style: { +// marginLeft: 50, +// fontSize: '0.9em', +// }, +// }, 'Transaction Error. Exception thrown in contract code.') +// : null, + +// !isValidAddress ? +// h('.error', { +// style: { +// marginLeft: 50, +// fontSize: '0.9em', +// }, +// }, 'Recipient address is invalid. Sending this transaction will result in a loss of ETH.') +// : null, + +// insufficientBalance ? +// h('span.error', { +// style: { +// marginLeft: 50, +// fontSize: '0.9em', +// }, +// }, 'Insufficient balance for transaction') +// : null, + +// // send + cancel +// h('.flex-row.flex-space-around.conf-buttons', { +// style: { +// display: 'flex', +// justifyContent: 'flex-end', +// margin: '14px 25px', +// }, +// }, [ +// h('button', { +// onClick: (event) => { +// this.resetGasFields() +// event.preventDefault() +// }, +// }, 'Reset'), + +// // Accept Button or Buy Button +// insufficientBalance ? h('button.btn-green', { onClick: props.buyEth }, 'Buy Ether') : +// h('input.confirm.btn-green', { +// type: 'submit', +// value: 'SUBMIT', +// style: { marginLeft: '10px' }, +// disabled: buyDisabled, +// }), + +// h('button.cancel.btn-red', { +// onClick: props.cancelTransaction, +// }, 'Reject'), +// ]), +// showRejectAll ? h('.flex-row.flex-space-around.conf-buttons', { +// style: { +// display: 'flex', +// justifyContent: 'flex-end', +// margin: '14px 25px', +// }, +// }, [ +// h('button.cancel.btn-red', { +// onClick: props.cancelAllTransactions, +// }, 'Reject All'), +// ]) : null, +// ]), +// ]) +// ) +// } + ]), + + h('form#pending-tx-form', { + onSubmit: this.onSubmit, + }, [ + // Cancel Button + h('div.cancel.btn-light.confirm-screen-cancel-button', { + onClick: (event) => { + clearSend() + this.cancel(event, txMeta) + }, + }, 'CANCEL'), + + // Accept Button + h('button.confirm-screen-confirm-button', ['CONFIRM']), + ]), + ]) + ) +} + +ConfirmSendEther.prototype.onSubmit = function (event) { + event.preventDefault() + const txMeta = this.gatherTxMeta() + const valid = this.checkValidity() + this.setState({ valid, submitting: true }) + + if (valid && this.verifyGasParams()) { + this.props.sendTransaction(txMeta, event) + } else { + this.props.dispatch(actions.displayWarning('Invalid Gas Parameters')) + this.setState({ submitting: false }) + } +} + +ConfirmSendEther.prototype.cancel = function (event, txMeta) { + event.preventDefault() + const { cancelTransaction } = this.props + + cancelTransaction(txMeta) +} + +ConfirmSendEther.prototype.checkValidity = function () { + const form = this.getFormEl() + const valid = form.checkValidity() + return valid +} + +ConfirmSendEther.prototype.getFormEl = function () { + const form = document.querySelector('form#pending-tx-form') + // Stub out form for unit tests: + if (!form) { + return { checkValidity () { return true } } + } + return form +} + +// After a customizable state value has been updated, +ConfirmSendEther.prototype.gatherTxMeta = function () { + const props = this.props + const state = this.state + const txData = clone(state.txData) || clone(props.txData) + + // log.debug(`UI has defaulted to tx meta ${JSON.stringify(txData)}`) + return txData +} + +ConfirmSendEther.prototype.verifyGasParams = function () { + // We call this in case the gas has not been modified at all + if (!this.state) { return true } + return ( + this._notZeroOrEmptyString(this.state.gas) && + this._notZeroOrEmptyString(this.state.gasPrice) + ) +} + +ConfirmSendEther.prototype._notZeroOrEmptyString = function (obj) { + return obj !== '' && obj !== '0x0' +} + +ConfirmSendEther.prototype.bnMultiplyByFraction = function (targetBN, numerator, denominator) { + const numBN = new BN(numerator) + const denomBN = new BN(denominator) + return targetBN.mul(numBN).div(denomBN) +} diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js new file mode 100644 index 000000000..aa4f29fb0 --- /dev/null +++ b/ui/app/components/pending-tx/confirm-send-token.js @@ -0,0 +1,464 @@ +const Component = require('react').Component +const { connect } = require('react-redux') +const h = require('react-hyperscript') +const inherits = require('util').inherits +const tokenAbi = require('human-standard-token-abi') +const abiDecoder = require('abi-decoder') +abiDecoder.addABI(tokenAbi) +const actions = require('../../actions') +const clone = require('clone') +const Identicon = require('../identicon') +const ethUtil = require('ethereumjs-util') +const BN = ethUtil.BN +const { + conversionUtil, + multiplyCurrencies, + addCurrencies, +} = require('../../conversion-util') +const { + calcTokenAmount, +} = require('../../token-util') + +const { MIN_GAS_PRICE_HEX } = require('../send/send-constants') + +const { + getTokenExchangeRate, + getSelectedAddress, + getSelectedTokenContract, +} = require('../../selectors') + +module.exports = connect(mapStateToProps, mapDispatchToProps)(ConfirmSendToken) + +function mapStateToProps (state, ownProps) { + const { token: { symbol }, txData } = ownProps + const { txParams } = txData || {} + const tokenData = txParams.data && abiDecoder.decodeMethod(txParams.data) + + const { + conversionRate, + identities, + currentCurrency, + } = state.metamask + const selectedAddress = getSelectedAddress(state) + const tokenExchangeRate = getTokenExchangeRate(state, symbol) + + return { + conversionRate, + identities, + selectedAddress, + tokenExchangeRate, + tokenData: tokenData || {}, + currentCurrency: currentCurrency.toUpperCase(), + send: state.metamask.send, + tokenContract: getSelectedTokenContract(state), + } +} + +function mapDispatchToProps (dispatch, ownProps) { + const { token: { symbol } } = ownProps + + return { + backToAccountDetail: address => dispatch(actions.backToAccountDetail(address)), + cancelTransaction: ({ id }) => dispatch(actions.cancelTx({ id })), + updateTokenExchangeRate: () => dispatch(actions.updateTokenExchangeRate(symbol)), + editTransaction: txMeta => { + const { token: { address } } = ownProps + const { txParams, id } = txMeta + const tokenData = txParams.data && abiDecoder.decodeMethod(txParams.data) + const { params = [] } = tokenData + const { value: to } = params[0] || {} + const { value: tokenAmountInDec } = params[1] || {} + const tokenAmountInHex = conversionUtil(tokenAmountInDec, { + fromNumericBase: 'dec', + toNumericBase: 'hex', + }) + const { + gas: gasLimit, + gasPrice, + } = txParams + dispatch(actions.setSelectedToken(address)) + dispatch(actions.updateSend({ + gasLimit, + gasPrice, + gasTotal: null, + to, + amount: tokenAmountInHex, + errors: { to: null, amount: null }, + editingTransactionId: id, + })) + dispatch(actions.showSendTokenPage()) + }, + } +} + +inherits(ConfirmSendToken, Component) +function ConfirmSendToken () { + Component.call(this) + this.state = {} + this.onSubmit = this.onSubmit.bind(this) +} + +ConfirmSendToken.prototype.componentWillMount = function () { + const { tokenContract, selectedAddress } = this.props + tokenContract && tokenContract + .balanceOf(selectedAddress) + .then(usersToken => { + }) + this.props.updateTokenExchangeRate() +} + +ConfirmSendToken.prototype.getAmount = function () { + const { + conversionRate, + tokenExchangeRate, + token, + tokenData, + send: { amount, editingTransactionId }, + } = this.props + const { params = [] } = tokenData + let { value } = params[1] || {} + const { decimals } = token + + if (editingTransactionId) { + value = conversionUtil(amount, { + fromNumericBase: 'hex', + toNumericBase: 'dec', + }) + } + + const sendTokenAmount = calcTokenAmount(value, decimals) + + return { + fiat: tokenExchangeRate + ? +(sendTokenAmount * tokenExchangeRate * conversionRate).toFixed(2) + : null, + token: typeof value === 'undefined' + ? 'Unknown' + : +sendTokenAmount.toFixed(decimals), + } + +} + +ConfirmSendToken.prototype.getGasFee = function () { + const { conversionRate, tokenExchangeRate, token, currentCurrency } = this.props + const txMeta = this.gatherTxMeta() + const txParams = txMeta.txParams || {} + const { decimals } = token + + const gas = txParams.gas + const gasPrice = txParams.gasPrice || MIN_GAS_PRICE_HEX + const gasTotal = multiplyCurrencies(gas, gasPrice, { + multiplicandBase: 16, + multiplierBase: 16, + }) + + const FIAT = conversionUtil(gasTotal, { + fromNumericBase: 'BN', + toNumericBase: 'dec', + fromDenomination: 'WEI', + fromCurrency: 'ETH', + toCurrency: currentCurrency, + numberOfDecimals: 2, + conversionRate, + }) + const ETH = conversionUtil(gasTotal, { + fromNumericBase: 'BN', + toNumericBase: 'dec', + fromDenomination: 'WEI', + fromCurrency: 'ETH', + toCurrency: 'ETH', + numberOfDecimals: 6, + conversionRate, + }) + const tokenGas = multiplyCurrencies(gas, gasPrice, { + toNumericBase: 'dec', + multiplicandBase: 16, + multiplierBase: 16, + toCurrency: 'BAT', + conversionRate: tokenExchangeRate, + invertConversionRate: true, + fromDenomination: 'WEI', + numberOfDecimals: decimals || 4, + }) + + return { + fiat: +Number(FIAT).toFixed(2), + eth: ETH, + token: tokenExchangeRate + ? tokenGas + : null, + } +} + +ConfirmSendToken.prototype.getData = function () { + const { identities, tokenData } = this.props + const { params = [] } = tokenData + const { value } = params[0] || {} + const txMeta = this.gatherTxMeta() + const txParams = txMeta.txParams || {} + + return { + from: { + address: txParams.from, + name: identities[txParams.from].name, + }, + to: { + address: value, + name: identities[value] ? identities[value].name : 'New Recipient', + }, + memo: txParams.memo || '', + } +} + +ConfirmSendToken.prototype.renderHeroAmount = function () { + const { token: { symbol }, currentCurrency } = this.props + const { fiat: fiatAmount, token: tokenAmount } = this.getAmount() + const txMeta = this.gatherTxMeta() + const txParams = txMeta.txParams || {} + const { memo = '' } = txParams + + return fiatAmount + ? ( + h('div.confirm-send-token__hero-amount-wrapper', [ + h('h3.flex-center.confirm-screen-send-amount', `${fiatAmount}`), + h('h3.flex-center.confirm-screen-send-amount-currency', currentCurrency), + h('div.flex-center.confirm-memo-wrapper', [ + h('h3.confirm-screen-send-memo', [ memo ? `"${memo}"` : '' ]), + ]), + ]) + ) + : ( + h('div.confirm-send-token__hero-amount-wrapper', [ + h('h3.flex-center.confirm-screen-send-amount', tokenAmount), + h('h3.flex-center.confirm-screen-send-amount-currency', symbol), + h('div.flex-center.confirm-memo-wrapper', [ + h('h3.confirm-screen-send-memo', [ memo ? `"${memo}"` : '' ]), + ]), + ]) + ) +} + +ConfirmSendToken.prototype.renderGasFee = function () { + const { token: { symbol }, currentCurrency } = this.props + const { fiat: fiatGas, token: tokenGas, eth: ethGas } = this.getGasFee() + + return ( + h('section.flex-row.flex-center.confirm-screen-row', [ + h('span.confirm-screen-label.confirm-screen-section-column', [ 'Gas Fee' ]), + h('div.confirm-screen-section-column', [ + h('div.confirm-screen-row-info', `${fiatGas} ${currentCurrency}`), + + h( + 'div.confirm-screen-row-detail', + tokenGas ? `${tokenGas} ${symbol}` : `${ethGas} ETH` + ), + ]), + ]) + ) +} + +ConfirmSendToken.prototype.renderTotalPlusGas = function () { + const { token: { symbol }, currentCurrency } = this.props + const { fiat: fiatAmount, token: tokenAmount } = this.getAmount() + const { fiat: fiatGas, token: tokenGas } = this.getGasFee() + + return fiatAmount && fiatGas + ? ( + h('section.flex-row.flex-center.confirm-screen-total-box ', [ + h('div.confirm-screen-section-column', [ + h('span.confirm-screen-label', [ 'Total ' ]), + h('div.confirm-screen-total-box__subtitle', [ 'Amount + Gas' ]), + ]), + + h('div.confirm-screen-section-column', [ + h('div.confirm-screen-row-info', `${addCurrencies(fiatAmount, fiatGas)} ${currentCurrency}`), + h('div.confirm-screen-row-detail', `${addCurrencies(tokenAmount, tokenGas || '0')} ${symbol}`), + ]), + ]) + ) + : ( + h('section.flex-row.flex-center.confirm-screen-total-box ', [ + h('div.confirm-screen-section-column', [ + h('span.confirm-screen-label', [ 'Total ' ]), + h('div.confirm-screen-total-box__subtitle', [ 'Amount + Gas' ]), + ]), + + h('div.confirm-screen-section-column', [ + h('div.confirm-screen-row-info', `${tokenAmount} ${symbol}`), + h('div.confirm-screen-row-detail', `+ ${fiatGas} ${currentCurrency} Gas`), + ]), + ]) + ) +} + +ConfirmSendToken.prototype.render = function () { + const { editTransaction } = this.props + const txMeta = this.gatherTxMeta() + const { + from: { + address: fromAddress, + name: fromName, + }, + to: { + address: toAddress, + name: toName, + }, + } = this.getData() + + this.inputs = [] + + return ( + h('div.confirm-screen-container.confirm-send-token', { + style: { minWidth: '355px' }, + }, [ + // Main Send token Card + h('div.confirm-screen-wrapper.flex-column.flex-grow', [ + h('h3.flex-center.confirm-screen-header', [ + h('button.confirm-screen-back-button', { + onClick: () => editTransaction(txMeta), + }, 'EDIT'), + h('div.confirm-screen-title', 'Confirm Transaction'), + h('div.confirm-screen-header-tip'), + ]), + h('div.flex-row.flex-center.confirm-screen-identicons', [ + h('div.confirm-screen-account-wrapper', [ + h( + Identicon, + { + address: fromAddress, + diameter: 60, + }, + ), + h('span.confirm-screen-account-name', fromName), + // h('span.confirm-screen-account-number', fromAddress.slice(fromAddress.length - 4)), + ]), + h('i.fa.fa-arrow-right.fa-lg'), + h('div.confirm-screen-account-wrapper', [ + h( + Identicon, + { + address: toAddress, + diameter: 60, + }, + ), + h('span.confirm-screen-account-name', toName), + // h('span.confirm-screen-account-number', toAddress.slice(toAddress.length - 4)), + ]), + ]), + + // h('h3.flex-center.confirm-screen-sending-to-message', { + // style: { + // textAlign: 'center', + // fontSize: '16px', + // }, + // }, [ + // `You're sending to Recipient ...${toAddress.slice(toAddress.length - 4)}`, + // ]), + + this.renderHeroAmount(), + + h('div.confirm-screen-rows', [ + h('section.flex-row.flex-center.confirm-screen-row', [ + h('span.confirm-screen-label.confirm-screen-section-column', [ 'From' ]), + h('div.confirm-screen-section-column', [ + h('div.confirm-screen-row-info', fromName), + h('div.confirm-screen-row-detail', `...${fromAddress.slice(fromAddress.length - 4)}`), + ]), + ]), + + toAddress && h('section.flex-row.flex-center.confirm-screen-row', [ + h('span.confirm-screen-label.confirm-screen-section-column', [ 'To' ]), + h('div.confirm-screen-section-column', [ + h('div.confirm-screen-row-info', toName), + h('div.confirm-screen-row-detail', `...${toAddress.slice(toAddress.length - 4)}`), + ]), + ]), + + this.renderGasFee(), + + this.renderTotalPlusGas(), + + ]), + ]), + + h('form#pending-tx-form', { + onSubmit: this.onSubmit, + }, [ + // Cancel Button + h('div.cancel.btn-light.confirm-screen-cancel-button', { + onClick: (event) => this.cancel(event, txMeta), + }, 'CANCEL'), + + // Accept Button + h('button.confirm-screen-confirm-button', ['CONFIRM']), + ]), + + + ]) + ) +} + +ConfirmSendToken.prototype.onSubmit = function (event) { + event.preventDefault() + const txMeta = this.gatherTxMeta() + const valid = this.checkValidity() + this.setState({ valid, submitting: true }) + + if (valid && this.verifyGasParams()) { + this.props.sendTransaction(txMeta, event) + } else { + this.props.dispatch(actions.displayWarning('Invalid Gas Parameters')) + this.setState({ submitting: false }) + } +} + +ConfirmSendToken.prototype.cancel = function (event, txMeta) { + event.preventDefault() + const { cancelTransaction } = this.props + + cancelTransaction(txMeta) +} + +ConfirmSendToken.prototype.checkValidity = function () { + const form = this.getFormEl() + const valid = form.checkValidity() + return valid +} + +ConfirmSendToken.prototype.getFormEl = function () { + const form = document.querySelector('form#pending-tx-form') + // Stub out form for unit tests: + if (!form) { + return { checkValidity () { return true } } + } + return form +} + +// After a customizable state value has been updated, +ConfirmSendToken.prototype.gatherTxMeta = function () { + const props = this.props + const state = this.state + const txData = clone(state.txData) || clone(props.txData) + + // log.debug(`UI has defaulted to tx meta ${JSON.stringify(txData)}`) + return txData +} + +ConfirmSendToken.prototype.verifyGasParams = function () { + // We call this in case the gas has not been modified at all + if (!this.state) { return true } + return ( + this._notZeroOrEmptyString(this.state.gas) && + this._notZeroOrEmptyString(this.state.gasPrice) + ) +} + +ConfirmSendToken.prototype._notZeroOrEmptyString = function (obj) { + return obj !== '' && obj !== '0x0' +} + +ConfirmSendToken.prototype.bnMultiplyByFraction = function (targetBN, numerator, denominator) { + const numBN = new BN(numerator) + const denomBN = new BN(denominator) + return targetBN.mul(numBN).div(denomBN) +} diff --git a/ui/app/components/pending-tx/index.js b/ui/app/components/pending-tx/index.js new file mode 100644 index 000000000..f4f6afb8f --- /dev/null +++ b/ui/app/components/pending-tx/index.js @@ -0,0 +1,145 @@ +const Component = require('react').Component +const { connect } = require('react-redux') +const h = require('react-hyperscript') +const clone = require('clone') +const abi = require('human-standard-token-abi') +const abiDecoder = require('abi-decoder') +abiDecoder.addABI(abi) +const inherits = require('util').inherits +const actions = require('../../actions') +const util = require('../../util') +const ConfirmSendEther = require('./confirm-send-ether') +const ConfirmSendToken = require('./confirm-send-token') +const ConfirmDeployContract = require('./confirm-deploy-contract') + +const TX_TYPES = { + DEPLOY_CONTRACT: 'deploy_contract', + SEND_ETHER: 'send_ether', + SEND_TOKEN: 'send_token', +} + +module.exports = connect(mapStateToProps, mapDispatchToProps)(PendingTx) + +function mapStateToProps (state) { + const { + conversionRate, + identities, + } = state.metamask + const accounts = state.metamask.accounts + const selectedAddress = state.metamask.selectedAddress || Object.keys(accounts)[0] + return { + conversionRate, + identities, + selectedAddress, + } +} + +function mapDispatchToProps (dispatch) { + return { + backToAccountDetail: address => dispatch(actions.backToAccountDetail(address)), + cancelTransaction: ({ id }) => dispatch(actions.cancelTx({ id })), + } +} + +inherits(PendingTx, Component) +function PendingTx () { + Component.call(this) + this.state = { + isFetching: true, + transactionType: '', + tokenAddress: '', + tokenSymbol: '', + tokenDecimals: '', + } +} + +PendingTx.prototype.componentWillMount = async function () { + const txMeta = this.gatherTxMeta() + const txParams = txMeta.txParams || {} + + if (!txParams.to) { + return this.setState({ + transactionType: TX_TYPES.DEPLOY_CONTRACT, + isFetching: false, + }) + } + + try { + const token = util.getContractAtAddress(txParams.to) + const results = await Promise.all([ + token.symbol(), + token.decimals(), + ]) + + const [ symbol, decimals ] = results + + if (symbol[0] && decimals[0]) { + this.setState({ + transactionType: TX_TYPES.SEND_TOKEN, + tokenAddress: txParams.to, + tokenSymbol: symbol[0], + tokenDecimals: decimals[0], + isFetching: false, + }) + } else { + this.setState({ + transactionType: TX_TYPES.SEND_ETHER, + isFetching: false, + }) + } + } catch (e) { + this.setState({ + transactionType: TX_TYPES.SEND_ETHER, + isFetching: false, + }) + } +} + +PendingTx.prototype.gatherTxMeta = function () { + const props = this.props + const state = this.state + const txData = clone(state.txData) || clone(props.txData) + + return txData +} + +PendingTx.prototype.render = function () { + const { + isFetching, + transactionType, + tokenAddress, + tokenSymbol, + tokenDecimals, + } = this.state + + const { sendTransaction } = this.props + + if (isFetching) { + return h('noscript') + } + + switch (transactionType) { + case TX_TYPES.SEND_ETHER: + return h(ConfirmSendEther, { + txData: this.gatherTxMeta(), + sendTransaction, + }) + case TX_TYPES.SEND_TOKEN: + return h(ConfirmSendToken, { + txData: this.gatherTxMeta(), + sendTransaction, + token: { + address: tokenAddress, + symbol: tokenSymbol, + decimals: tokenDecimals, + }, + }) + case TX_TYPES.DEPLOY_CONTRACT: + return h(ConfirmDeployContract, { + txData: this.gatherTxMeta(), + sendTransaction, + }) + default: + return h('noscript') + } +} diff --git a/ui/app/components/qr-code.js b/ui/app/components/qr-code.js index 06b9aed9b..83885539c 100644 --- a/ui/app/components/qr-code.js +++ b/ui/app/components/qr-code.js @@ -4,13 +4,13 @@ const qrCode = require('qrcode-npm').qrcode const inherits = require('util').inherits const connect = require('react-redux').connect const isHexPrefixed = require('ethereumjs-util').isHexPrefixed -const CopyButton = require('./copyButton') +const ReadOnlyInput = require('./readonly-input') module.exports = connect(mapStateToProps)(QrCodeView) function mapStateToProps (state) { return { - Qr: state.appState.Qr, + // Qr code is not fetched from state. 'message' and 'data' props are passed instead. buyView: state.appState.buyView, warning: state.appState.warning, } @@ -29,46 +29,29 @@ QrCodeView.prototype.render = function () { const qrImage = qrCode(4, 'M') qrImage.addData(address) qrImage.make() - return h('.main-container.flex-column', { - key: 'qr', - style: { - justifyContent: 'center', - paddingBottom: '45px', - paddingLeft: '45px', - paddingRight: '45px', - alignItems: 'center', - }, - }, [ - Array.isArray(Qr.message) ? h('.message-container', this.renderMultiMessage()) : h('.qr-header', Qr.message), + + return h('.div.flex-column.flex-center', [ + Array.isArray(Qr.message) + ? h('.message-container', this.renderMultiMessage()) + : Qr.message && h('.qr-header', Qr.message), this.props.warning ? this.props.warning && h('span.error.flex-center', { style: { - textAlign: 'center', - width: '229px', - height: '82px', }, }, this.props.warning) : null, - h('#qr-container.flex-column', { - style: { - marginTop: '25px', - marginBottom: '15px', - }, + h('.div.qr-wrapper', { + style: {}, dangerouslySetInnerHTML: { __html: qrImage.createTableTag(4), }, }), - h('.flex-row', [ - h('h3.ellip-address', { - style: { - width: '247px', - }, - }, Qr.data), - h(CopyButton, { - value: Qr.data, - }), - ]), + h(ReadOnlyInput, { + wrapperClass: 'ellip-address-wrapper', + inputClass: 'qr-ellip-address', + value: Qr.data, + }), ]) } diff --git a/ui/app/components/readonly-input.js b/ui/app/components/readonly-input.js new file mode 100644 index 000000000..fcf05fb9e --- /dev/null +++ b/ui/app/components/readonly-input.js @@ -0,0 +1,33 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits + +module.exports = ReadOnlyInput + +inherits(ReadOnlyInput, Component) +function ReadOnlyInput () { + Component.call(this) +} + +ReadOnlyInput.prototype.render = function () { + const { + wrapperClass = '', + inputClass = '', + value, + textarea, + onClick, + } = this.props + + const inputType = textarea ? 'textarea' : 'input' + + return h('div', {className: wrapperClass}, [ + h(inputType, { + className: inputClass, + value, + readOnly: true, + onFocus: event => event.target.select(), + onClick, + }), + ]) +} + diff --git a/ui/app/components/send-token/index.js b/ui/app/components/send-token/index.js new file mode 100644 index 000000000..99d078251 --- /dev/null +++ b/ui/app/components/send-token/index.js @@ -0,0 +1,439 @@ +const Component = require('react').Component +const connect = require('react-redux').connect +const h = require('react-hyperscript') +const classnames = require('classnames') +const abi = require('ethereumjs-abi') +const inherits = require('util').inherits +const actions = require('../../actions') +const selectors = require('../../selectors') +const { isValidAddress, allNull } = require('../../util') + +// const BalanceComponent = require('./balance-component') +const Identicon = require('../identicon') +const TokenBalance = require('../token-balance') +const CurrencyToggle = require('../send/currency-toggle') +const GasTooltip = require('../send/gas-tooltip') +const GasFeeDisplay = require('../send/gas-fee-display') + +module.exports = connect(mapStateToProps, mapDispatchToProps)(SendTokenScreen) + +function mapStateToProps (state) { + // const sidebarOpen = state.appState.sidebarOpen + + const { warning } = state.appState + const identities = state.metamask.identities + const addressBook = state.metamask.addressBook + const conversionRate = state.metamask.conversionRate + const currentBlockGasLimit = state.metamask.currentBlockGasLimit + const accounts = state.metamask.accounts + const selectedTokenAddress = state.metamask.selectedTokenAddress + const selectedAddress = state.metamask.selectedAddress || Object.keys(accounts)[0] + const selectedToken = selectors.getSelectedToken(state) + const tokenExchangeRates = state.metamask.tokenExchangeRates + const pair = `${selectedToken.symbol.toLowerCase()}_eth` + const { rate: tokenExchangeRate = 0 } = tokenExchangeRates[pair] || {} + + return { + selectedAddress, + selectedTokenAddress, + identities, + addressBook, + conversionRate, + tokenExchangeRate, + currentBlockGasLimit, + selectedToken, + warning, + } +} + +function mapDispatchToProps (dispatch) { + return { + backToAccountDetail: address => dispatch(actions.backToAccountDetail(address)), + hideWarning: () => dispatch(actions.hideWarning()), + addToAddressBook: (recipient, nickname) => dispatch( + actions.addToAddressBook(recipient, nickname) + ), + signTx: txParams => dispatch(actions.signTx(txParams)), + signTokenTx: (tokenAddress, toAddress, amount, txData) => ( + dispatch(actions.signTokenTx(tokenAddress, toAddress, amount, txData)) + ), + updateTokenExchangeRate: token => dispatch(actions.updateTokenExchangeRate(token)), + estimateGas: params => dispatch(actions.estimateGas(params)), + getGasPrice: () => dispatch(actions.getGasPrice()), + } +} + +inherits(SendTokenScreen, Component) +function SendTokenScreen () { + Component.call(this) + this.state = { + to: '', + amount: '0x0', + amountToSend: '0x0', + selectedCurrency: 'USD', + isGasTooltipOpen: false, + gasPrice: null, + gasLimit: null, + errors: {}, + } +} + +SendTokenScreen.prototype.componentWillMount = function () { + const { + updateTokenExchangeRate, + selectedToken: { symbol }, + getGasPrice, + estimateGas, + selectedAddress, + } = this.props + + updateTokenExchangeRate(symbol) + + const data = Array.prototype.map.call( + abi.rawEncode(['address', 'uint256'], [selectedAddress, '0x0']), + x => ('00' + x.toString(16)).slice(-2) + ).join('') + + console.log(data) + Promise.all([ + getGasPrice(), + estimateGas({ + from: selectedAddress, + value: '0x0', + gas: '746a528800', + data, + }), + ]) + .then(([blockGasPrice, estimatedGas]) => { + console.log({ blockGasPrice, estimatedGas}) + this.setState({ + gasPrice: blockGasPrice, + gasLimit: estimatedGas, + }) + }) +} + +SendTokenScreen.prototype.validate = function () { + const { + to, + amount: stringAmount, + gasPrice: hexGasPrice, + gasLimit: hexGasLimit, + } = this.state + + const gasPrice = parseInt(hexGasPrice, 16) + const gasLimit = parseInt(hexGasLimit, 16) / 1000000000 + const amount = Number(stringAmount) + + const errors = { + to: !to ? 'Required' : null, + amount: !amount ? 'Required' : null, + gasPrice: !gasPrice ? 'Gas Price Required' : null, + gasLimit: !gasLimit ? 'Gas Limit Required' : null, + } + + if (to && !isValidAddress(to)) { + errors.to = 'Invalid address' + } + + const isValid = Object.entries(errors).every(([key, value]) => value === null) + return { + isValid, + errors: isValid ? {} : errors, + } +} + +SendTokenScreen.prototype.setErrorsFor = function (field) { + const { errors: previousErrors } = this.state + + const { + isValid, + errors: newErrors, + } = this.validate() + + const nextErrors = Object.assign({}, previousErrors, { + [field]: newErrors[field] || null, + }) + + if (!isValid) { + this.setState({ + errors: nextErrors, + isValid, + }) + } +} + +SendTokenScreen.prototype.clearErrorsFor = function (field) { + const { errors: previousErrors } = this.state + const nextErrors = Object.assign({}, previousErrors, { + [field]: null, + }) + + this.setState({ + errors: nextErrors, + isValid: allNull(nextErrors), + }) +} + +SendTokenScreen.prototype.getAmountToSend = function (amount, selectedToken) { + const { decimals } = selectedToken || {} + const multiplier = Math.pow(10, Number(decimals || 0)) + const sendAmount = '0x' + Number(amount * multiplier).toString(16) + return sendAmount +} + +SendTokenScreen.prototype.submit = function () { + const { + to, + amount, + gasPrice, + gasLimit, + } = this.state + + const { + identities, + selectedAddress, + selectedTokenAddress, + hideWarning, + addToAddressBook, + signTokenTx, + selectedToken, + } = this.props + + const { nickname = ' ' } = identities[to] || {} + + hideWarning() + addToAddressBook(to, nickname) + + const txParams = { + from: selectedAddress, + value: '0', + gas: gasLimit, + gasPrice: gasPrice, + } + + const sendAmount = this.getAmountToSend(amount, selectedToken) + + signTokenTx(selectedTokenAddress, to, sendAmount, txParams) +} + +SendTokenScreen.prototype.renderToAddressInput = function () { + const { + identities, + addressBook, + } = this.props + + const { + to, + errors: { to: errorMessage }, + } = this.state + + return h('div', { + className: classnames('send-screen-input-wrapper', { + 'send-screen-input-wrapper--error': errorMessage, + }), + }, [ + h('div', ['To:']), + h('input.large-input.send-screen-input', { + name: 'address', + list: 'addresses', + placeholder: 'Address', + value: to, + onChange: e => this.setState({ + to: e.target.value, + errors: {}, + }), + onBlur: () => { + this.setErrorsFor('to') + }, + onFocus: event => { + if (to) event.target.select() + this.clearErrorsFor('to') + }, + }), + h('datalist#addresses', [ + // Corresponds to the addresses owned. + Object.entries(identities).map(([key, { address, name }]) => { + return h('option', { + value: address, + label: name, + key: address, + }) + }), + addressBook.map(({ address, name }) => { + return h('option', { + value: address, + label: name, + key: address, + }) + }), + ]), + h('div.send-screen-input-wrapper__error-message', [ errorMessage ]), + ]) +} + +SendTokenScreen.prototype.renderAmountInput = function () { + const { + selectedCurrency, + amount, + errors: { amount: errorMessage }, + } = this.state + + const { + tokenExchangeRate, + selectedToken: {symbol}, + } = this.props + + return h('div.send-screen-input-wrapper', { + className: classnames('send-screen-input-wrapper', { + 'send-screen-input-wrapper--error': errorMessage, + }), + }, [ + h('div.send-screen-amount-labels', [ + h('span', ['Amount']), + h(CurrencyToggle, { + currentCurrency: tokenExchangeRate ? selectedCurrency : 'USD', + currencies: tokenExchangeRate ? [ symbol, 'USD' ] : [], + onClick: currency => this.setState({ selectedCurrency: currency }), + }), + ]), + h('input.large-input.send-screen-input', { + placeholder: `0 ${symbol}`, + type: 'number', + value: amount, + onChange: e => this.setState({ + amount: e.target.value, + }), + onBlur: () => { + this.setErrorsFor('amount') + }, + onFocus: () => this.clearErrorsFor('amount'), + }), + h('div.send-screen-input-wrapper__error-message', [ errorMessage ]), + ]) +} + +SendTokenScreen.prototype.renderGasInput = function () { + const { + isGasTooltipOpen, + gasPrice, + gasLimit, + selectedCurrency, + errors: { + gasPrice: gasPriceErrorMessage, + gasLimit: gasLimitErrorMessage, + }, + } = this.state + + const { + conversionRate, + tokenExchangeRate, + currentBlockGasLimit, + } = this.props + + return h('div.send-screen-input-wrapper', { + className: classnames('send-screen-input-wrapper', { + 'send-screen-input-wrapper--error': gasPriceErrorMessage || gasLimitErrorMessage, + }), + }, [ + isGasTooltipOpen && h(GasTooltip, { + className: 'send-tooltip', + gasPrice: gasPrice || '0x0', + gasLimit: gasLimit || '0x0', + onClose: () => this.setState({ isGasTooltipOpen: false }), + onFeeChange: ({ gasLimit, gasPrice }) => { + this.setState({ gasLimit, gasPrice, errors: {} }) + }, + onBlur: () => { + this.setErrorsFor('gasLimit') + this.setErrorsFor('gasPrice') + }, + onFocus: () => { + this.clearErrorsFor('gasLimit') + this.clearErrorsFor('gasPrice') + }, + }), + + h('div.send-screen-gas-labels', {}, [ + h('span', [ h('i.fa.fa-bolt'), 'Gas fee:']), + h('span', ['What\'s this?']), + ]), + h('div.large-input.send-screen-gas-input', [ + h(GasFeeDisplay, { + conversionRate, + tokenExchangeRate, + gasPrice: gasPrice || '0x0', + activeCurrency: selectedCurrency, + gas: gasLimit || '0x0', + blockGasLimit: currentBlockGasLimit, + }), + h( + 'div.send-screen-gas-input-customize', + { onClick: () => this.setState({ isGasTooltipOpen: !isGasTooltipOpen }) }, + ['Customize'] + ), + ]), + h('div.send-screen-input-wrapper__error-message', [ + gasPriceErrorMessage || gasLimitErrorMessage, + ]), + ]) +} + +SendTokenScreen.prototype.renderMemoInput = function () { + return h('div.send-screen-input-wrapper', [ + h('div', {}, ['Transaction memo (optional)']), + h( + 'input.large-input.send-screen-input', + { onChange: e => this.setState({ memo: e.target.value }) } + ), + ]) +} + +SendTokenScreen.prototype.renderButtons = function () { + const { selectedAddress, backToAccountDetail } = this.props + const { isValid } = this.validate() + + return h('div.send-token__button-group', [ + h('button.send-token__button-next.btn-secondary', { + className: !isValid && 'send-screen__send-button__disabled', + onClick: () => isValid && this.submit(), + }, ['Next']), + h('button.send-token__button-cancel.btn-tertiary', { + onClick: () => backToAccountDetail(selectedAddress), + }, ['Cancel']), + ]) +} + +SendTokenScreen.prototype.render = function () { + const { + selectedTokenAddress, + selectedToken, + warning, + } = this.props + + return h('div.send-token', [ + h('div.send-token__content', [ + h(Identicon, { + diameter: 75, + address: selectedTokenAddress, + }), + h('div.send-token__title', ['Send Tokens']), + h('div.send-token__description', ['Send Tokens to anyone with an Ethereum account']), + h('div.send-token__balance-text', ['Your Token Balance is:']), + h('div.send-token__token-balance', [ + h(TokenBalance, { token: selectedToken, balanceOnly: true }), + ]), + h('div.send-token__token-symbol', [selectedToken.symbol]), + this.renderToAddressInput(), + this.renderAmountInput(), + this.renderGasInput(), + this.renderMemoInput(), + warning && h('div.send-screen-input-wrapper--error', {}, + h('div.send-screen-input-wrapper__error-message', [ + warning, + ]) + ), + ]), + this.renderButtons(), + ]) +} diff --git a/ui/app/components/send/account-list-item.js b/ui/app/components/send/account-list-item.js new file mode 100644 index 000000000..1ad3f69c1 --- /dev/null +++ b/ui/app/components/send/account-list-item.js @@ -0,0 +1,73 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const connect = require('react-redux').connect +const Identicon = require('../identicon') +const CurrencyDisplay = require('./currency-display') +const { conversionRateSelector, getCurrentCurrency } = require('../../selectors') + +inherits(AccountListItem, Component) +function AccountListItem () { + Component.call(this) +} + +function mapStateToProps (state) { + return { + conversionRate: conversionRateSelector(state), + currentCurrency: getCurrentCurrency(state), + } +} + +module.exports = connect(mapStateToProps)(AccountListItem) + +AccountListItem.prototype.render = function () { + const { + className, + account, + handleClick, + icon = null, + conversionRate, + currentCurrency, + displayBalance = true, + displayAddress = false, + } = this.props + + const { name, address, balance } = account || {} + + return h('div.account-list-item', { + className, + onClick: () => handleClick({ name, address, balance }), + }, [ + + h('div.account-list-item__top-row', {}, [ + + h( + Identicon, + { + address, + diameter: 18, + className: 'account-list-item__identicon', + }, + ), + + h('div.account-list-item__account-name', {}, name || address), + + icon && h('div.account-list-item__icon', [icon]), + + ]), + + displayAddress && name && h('div.account-list-item__account-address', address), + + displayBalance && h(CurrencyDisplay, { + primaryCurrency: 'ETH', + convertedCurrency: currentCurrency, + value: balance, + conversionRate, + readOnly: true, + className: 'account-list-item__account-balances', + primaryBalanceClassName: 'account-list-item__account-primary-balance', + convertedBalanceClassName: 'account-list-item__account-secondary-balance', + }, name), + + ]) +} diff --git a/ui/app/components/send/currency-display.js b/ui/app/components/send/currency-display.js new file mode 100644 index 000000000..819fee0a0 --- /dev/null +++ b/ui/app/components/send/currency-display.js @@ -0,0 +1,116 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const CurrencyInput = require('../currency-input') +const { conversionUtil, multiplyCurrencies } = require('../../conversion-util') + +module.exports = CurrencyDisplay + +inherits(CurrencyDisplay, Component) +function CurrencyDisplay () { + Component.call(this) +} + +function toHexWei (value) { + return conversionUtil(value, { + fromNumericBase: 'dec', + toNumericBase: 'hex', + toDenomination: 'WEI', + }) +} + +CurrencyDisplay.prototype.getAmount = function (value) { + const { selectedToken } = this.props + const { decimals } = selectedToken || {} + const multiplier = Math.pow(10, Number(decimals || 0)) + + const sendAmount = multiplyCurrencies(value, multiplier, {toNumericBase: 'hex'}) + + return selectedToken + ? sendAmount + : toHexWei(value) +} + +CurrencyDisplay.prototype.getValueToRender = function () { + const { selectedToken, conversionRate, value } = this.props + + const { decimals, symbol } = selectedToken || {} + const multiplier = Math.pow(10, Number(decimals || 0)) + + return selectedToken + ? conversionUtil(value, { + fromNumericBase: 'hex', + toCurrency: symbol, + conversionRate: multiplier, + invertConversionRate: true, + }) + : conversionUtil(value, { + fromNumericBase: 'hex', + toNumericBase: 'dec', + fromDenomination: 'WEI', + numberOfDecimals: 6, + conversionRate, + }) +} + +CurrencyDisplay.prototype.render = function () { + const { + className = 'currency-display', + primaryBalanceClassName = 'currency-display__input', + convertedBalanceClassName = 'currency-display__converted-value', + conversionRate, + primaryCurrency, + convertedCurrency, + readOnly = false, + inError = false, + handleChange, + } = this.props + + const valueToRender = this.getValueToRender() + + let convertedValue = conversionUtil(valueToRender, { + fromNumericBase: 'dec', + fromCurrency: primaryCurrency, + toCurrency: convertedCurrency, + numberOfDecimals: 2, + conversionRate, + }) + convertedValue = Number(convertedValue).toFixed(2) + + return h('div', { + className, + style: { + borderColor: inError ? 'red' : null, + }, + onClick: () => this.currencyInput.focus(), + }, [ + + h('div.currency-display__primary-row', [ + + h('div.currency-display__input-wrapper', [ + + h(CurrencyInput, { + className: primaryBalanceClassName, + value: `${valueToRender}`, + placeholder: '0', + readOnly, + onInputChange: newValue => { + handleChange(this.getAmount(newValue)) + }, + inputRef: input => { this.currencyInput = input }, + }), + + h('span.currency-display__currency-symbol', primaryCurrency), + + ]), + + ]), + + h('div', { + className: convertedBalanceClassName, + }, `${convertedValue} ${convertedCurrency.toUpperCase()}`), + + ]) + +} + diff --git a/ui/app/components/send/currency-toggle.js b/ui/app/components/send/currency-toggle.js new file mode 100644 index 000000000..7aaccd490 --- /dev/null +++ b/ui/app/components/send/currency-toggle.js @@ -0,0 +1,44 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const classnames = require('classnames') + +module.exports = CurrencyToggle + +inherits(CurrencyToggle, Component) +function CurrencyToggle () { + Component.call(this) +} + +const defaultCurrencies = [ 'ETH', 'USD' ] + +CurrencyToggle.prototype.renderToggles = function () { + const { onClick, activeCurrency } = this.props + const [currencyA, currencyB] = this.props.currencies || defaultCurrencies + + return [ + h('span', { + className: classnames('currency-toggle__item', { + 'currency-toggle__item--selected': currencyA === activeCurrency, + }), + onClick: () => onClick(currencyA), + }, [ currencyA ]), + '<>', + h('span', { + className: classnames('currency-toggle__item', { + 'currency-toggle__item--selected': currencyB === activeCurrency, + }), + onClick: () => onClick(currencyB), + }, [ currencyB ]), + ] +} + +CurrencyToggle.prototype.render = function () { + const currencies = this.props.currencies || defaultCurrencies + + return h('span.currency-toggle', currencies.length + ? this.renderToggles() + : [] + ) +} + diff --git a/ui/app/components/send/eth-fee-display.js b/ui/app/components/send/eth-fee-display.js new file mode 100644 index 000000000..9eda5ec62 --- /dev/null +++ b/ui/app/components/send/eth-fee-display.js @@ -0,0 +1,37 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const EthBalance = require('../eth-balance') +const { getTxFeeBn } = require('../../util') + +module.exports = EthFeeDisplay + +inherits(EthFeeDisplay, Component) +function EthFeeDisplay () { + Component.call(this) +} + +EthFeeDisplay.prototype.render = function () { + const { + activeCurrency, + conversionRate, + gas, + gasPrice, + blockGasLimit, + } = this.props + + return h(EthBalance, { + value: getTxFeeBn(gas, gasPrice, blockGasLimit), + currentCurrency: activeCurrency, + conversionRate, + showFiat: false, + hideTooltip: true, + styleOveride: { + color: '#5d5d5d', + fontSize: '16px', + fontFamily: 'DIN OT', + lineHeight: '22.4px', + }, + }) +} + diff --git a/ui/app/components/send/from-dropdown.js b/ui/app/components/send/from-dropdown.js new file mode 100644 index 000000000..0686fbe73 --- /dev/null +++ b/ui/app/components/send/from-dropdown.js @@ -0,0 +1,72 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const AccountListItem = require('./account-list-item') + +module.exports = FromDropdown + +inherits(FromDropdown, Component) +function FromDropdown () { + Component.call(this) +} + +FromDropdown.prototype.getListItemIcon = function (currentAccount, selectedAccount) { + const listItemIcon = h(`i.fa.fa-check.fa-lg`, { style: { color: '#02c9b1' } }) + + return currentAccount.address === selectedAccount.address + ? listItemIcon + : null +} + +FromDropdown.prototype.renderDropdown = function () { + const { + accounts, + selectedAccount, + closeDropdown, + onSelect, + } = this.props + + return h('div', {}, [ + + h('div.send-v2__from-dropdown__close-area', { + onClick: closeDropdown, + }), + + h('div.send-v2__from-dropdown__list', {}, [ + + ...accounts.map(account => h(AccountListItem, { + className: 'account-list-item__dropdown', + account, + handleClick: () => { + onSelect(account) + closeDropdown() + }, + icon: this.getListItemIcon(account, selectedAccount), + })), + + ]), + + ]) +} + +FromDropdown.prototype.render = function () { + const { + selectedAccount, + openDropdown, + dropdownOpen, + } = this.props + + return h('div.send-v2__from-dropdown', {}, [ + + h(AccountListItem, { + account: selectedAccount, + handleClick: openDropdown, + icon: h(`i.fa.fa-caret-down.fa-lg`, { style: { color: '#dedede' } }), + }), + + dropdownOpen && this.renderDropdown(), + + ]) + +} + diff --git a/ui/app/components/send/gas-fee-display-v2.js b/ui/app/components/send/gas-fee-display-v2.js new file mode 100644 index 000000000..806c33f0a --- /dev/null +++ b/ui/app/components/send/gas-fee-display-v2.js @@ -0,0 +1,43 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const CurrencyDisplay = require('./currency-display') + +module.exports = GasFeeDisplay + +inherits(GasFeeDisplay, Component) +function GasFeeDisplay () { + Component.call(this) +} + +GasFeeDisplay.prototype.render = function () { + const { + conversionRate, + gasTotal, + onClick, + primaryCurrency = 'ETH', + convertedCurrency, + } = this.props + + return h('div.send-v2__gas-fee-display', [ + + gasTotal + ? h(CurrencyDisplay, { + primaryCurrency, + convertedCurrency, + value: gasTotal, + conversionRate, + convertedPrefix: '$', + readOnly: true, + }) + : h('div.currency-display', 'Loading...'), + + h('div.send-v2__sliders-icon-container', { + onClick, + }, [ + h('i.fa.fa-sliders.send-v2__sliders-icon'), + ]), + + ]) +} + diff --git a/ui/app/components/send/gas-fee-display.js b/ui/app/components/send/gas-fee-display.js new file mode 100644 index 000000000..a9a3f3f49 --- /dev/null +++ b/ui/app/components/send/gas-fee-display.js @@ -0,0 +1,62 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const USDFeeDisplay = require('./usd-fee-display') +const EthFeeDisplay = require('./eth-fee-display') +const { getTxFeeBn, formatBalance, shortenBalance } = require('../../util') + +module.exports = GasFeeDisplay + +inherits(GasFeeDisplay, Component) +function GasFeeDisplay () { + Component.call(this) +} + +GasFeeDisplay.prototype.getTokenValue = function () { + const { + tokenExchangeRate, + gas, + gasPrice, + blockGasLimit, + } = this.props + + const value = formatBalance(getTxFeeBn(gas, gasPrice, blockGasLimit), 6, true) + const [ethNumber] = value.split(' ') + + return shortenBalance(Number(ethNumber) / tokenExchangeRate, 6) +} + +GasFeeDisplay.prototype.render = function () { + const { + activeCurrency, + conversionRate, + gas, + gasPrice, + blockGasLimit, + } = this.props + + switch (activeCurrency) { + case 'USD': + return h(USDFeeDisplay, { + activeCurrency, + conversionRate, + gas, + gasPrice, + blockGasLimit, + }) + case 'ETH': + return h(EthFeeDisplay, { + activeCurrency, + conversionRate, + gas, + gasPrice, + blockGasLimit, + }) + default: + return h('div.token-gas', [ + h('div.token-gas__amount', this.getTokenValue()), + h('div.token-gas__symbol', activeCurrency), + ]) + } +} + diff --git a/ui/app/components/send/gas-tooltip.js b/ui/app/components/send/gas-tooltip.js new file mode 100644 index 000000000..46aff3499 --- /dev/null +++ b/ui/app/components/send/gas-tooltip.js @@ -0,0 +1,100 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const InputNumber = require('../input-number.js') + +module.exports = GasTooltip + +inherits(GasTooltip, Component) +function GasTooltip () { + Component.call(this) + this.state = { + gasLimit: 0, + gasPrice: 0, + } + + this.updateGasPrice = this.updateGasPrice.bind(this) + this.updateGasLimit = this.updateGasLimit.bind(this) + this.onClose = this.onClose.bind(this) +} + +GasTooltip.prototype.componentWillMount = function () { + const { gasPrice = 0, gasLimit = 0} = this.props + + this.setState({ + gasPrice: parseInt(gasPrice, 16) / 1000000000, + gasLimit: parseInt(gasLimit, 16), + }) +} + +GasTooltip.prototype.updateGasPrice = function (newPrice) { + const { onFeeChange } = this.props + const { gasLimit } = this.state + + this.setState({ gasPrice: newPrice }) + onFeeChange({ + gasLimit: gasLimit.toString(16), + gasPrice: (newPrice * 1000000000).toString(16), + }) +} + +GasTooltip.prototype.updateGasLimit = function (newLimit) { + const { onFeeChange } = this.props + const { gasPrice } = this.state + + this.setState({ gasLimit: newLimit }) + onFeeChange({ + gasLimit: newLimit.toString(16), + gasPrice: (gasPrice * 1000000000).toString(16), + }) +} + +GasTooltip.prototype.onClose = function (e) { + e.stopPropagation() + this.props.onClose() +} + +GasTooltip.prototype.render = function () { + const { gasPrice, gasLimit } = this.state + + return h('div.gas-tooltip', {}, [ + h('div.gas-tooltip-close-area', { + onClick: this.onClose, + }), + h('div.customize-gas-tooltip-container', {}, [ + h('div.customize-gas-tooltip', {}, [ + h('div.gas-tooltip-header.gas-tooltip-label', {}, ['Customize Gas']), + h('div.gas-tooltip-input-label', {}, [ + h('span.gas-tooltip-label', {}, ['Gas Price']), + h('i.fa.fa-info-circle'), + ]), + h(InputNumber, { + unitLabel: 'GWEI', + step: 1, + min: 0, + placeholder: '0', + value: gasPrice, + onChange: (newPrice) => this.updateGasPrice(newPrice), + }), + h('div.gas-tooltip-input-label', { + style: { + 'marginTop': '81px', + }, + }, [ + h('span.gas-tooltip-label', {}, ['Gas Limit']), + h('i.fa.fa-info-circle'), + ]), + h(InputNumber, { + unitLabel: 'UNITS', + step: 1, + min: 0, + placeholder: '0', + value: gasLimit, + onChange: (newLimit) => this.updateGasLimit(newLimit), + }), + ]), + h('div.gas-tooltip-arrow', {}), + ]), + ]) +} + diff --git a/ui/app/components/send/memo-textarea.js b/ui/app/components/send/memo-textarea.js new file mode 100644 index 000000000..f4bb24bf8 --- /dev/null +++ b/ui/app/components/send/memo-textarea.js @@ -0,0 +1,33 @@ +// const Component = require('react').Component +// const h = require('react-hyperscript') +// const inherits = require('util').inherits +// const Identicon = require('../identicon') + +// module.exports = MemoTextArea + +// inherits(MemoTextArea, Component) +// function MemoTextArea () { +// Component.call(this) +// } + +// MemoTextArea.prototype.render = function () { +// const { memo, identities, onChange } = this.props + +// return h('div.send-v2__memo-text-area', [ + +// h('textarea.send-v2__memo-text-area__input', { +// placeholder: 'Optional', +// value: memo, +// onChange, +// // onBlur: () => { +// // this.setErrorsFor('memo') +// // }, +// onFocus: event => { +// // this.clearErrorsFor('memo') +// }, +// }), + +// ]) + +// } + diff --git a/ui/app/components/send/send-constants.js b/ui/app/components/send/send-constants.js new file mode 100644 index 000000000..b3ee0899a --- /dev/null +++ b/ui/app/components/send/send-constants.js @@ -0,0 +1,33 @@ +const ethUtil = require('ethereumjs-util') +const { conversionUtil, multiplyCurrencies } = require('../../conversion-util') + +const MIN_GAS_PRICE_HEX = (100000000).toString(16) +const MIN_GAS_PRICE_DEC = '100000000' +const MIN_GAS_LIMIT_DEC = '21000' +const MIN_GAS_LIMIT_HEX = (parseInt(MIN_GAS_LIMIT_DEC)).toString(16) + +const MIN_GAS_PRICE_GWEI = ethUtil.addHexPrefix(conversionUtil(MIN_GAS_PRICE_HEX, { + fromDenomination: 'WEI', + toDenomination: 'GWEI', + fromNumericBase: 'hex', + toNumericBase: 'hex', + numberOfDecimals: 1, +})) + +const MIN_GAS_TOTAL = multiplyCurrencies(MIN_GAS_LIMIT_HEX, MIN_GAS_PRICE_HEX, { + toNumericBase: 'hex', + multiplicandBase: 16, + multiplierBase: 16, +}) + +const TOKEN_TRANSFER_FUNCTION_SIGNATURE = '0xa9059cbb' + +module.exports = { + MIN_GAS_PRICE_GWEI, + MIN_GAS_PRICE_HEX, + MIN_GAS_PRICE_DEC, + MIN_GAS_LIMIT_HEX, + MIN_GAS_LIMIT_DEC, + MIN_GAS_TOTAL, + TOKEN_TRANSFER_FUNCTION_SIGNATURE, +} diff --git a/ui/app/components/send/send-utils.js b/ui/app/components/send/send-utils.js new file mode 100644 index 000000000..d8211930d --- /dev/null +++ b/ui/app/components/send/send-utils.js @@ -0,0 +1,68 @@ +const { + addCurrencies, + conversionUtil, + conversionGTE, +} = require('../../conversion-util') +const { + calcTokenAmount, +} = require('../../token-util') + +function isBalanceSufficient ({ + amount = '0x0', + gasTotal = '0x0', + balance, + primaryCurrency, + amountConversionRate, + conversionRate, +}) { + const totalAmount = addCurrencies(amount, gasTotal, { + aBase: 16, + bBase: 16, + toNumericBase: 'hex', + }) + + const balanceIsSufficient = conversionGTE( + { + value: balance, + fromNumericBase: 'hex', + fromCurrency: primaryCurrency, + conversionRate, + }, + { + value: totalAmount, + fromNumericBase: 'hex', + conversionRate: amountConversionRate, + fromCurrency: primaryCurrency, + }, + ) + + return balanceIsSufficient +} + +function isTokenBalanceSufficient ({ + amount = '0x0', + tokenBalance, + decimals, +}) { + const amountInDec = conversionUtil(amount, { + fromNumericBase: 'hex', + }) + + const tokenBalanceIsSufficient = conversionGTE( + { + value: tokenBalance, + fromNumericBase: 'dec', + }, + { + value: calcTokenAmount(amountInDec, decimals), + fromNumericBase: 'dec', + }, + ) + + return tokenBalanceIsSufficient +} + +module.exports = { + isBalanceSufficient, + isTokenBalanceSufficient, +} diff --git a/ui/app/components/send/send-v2-container.js b/ui/app/components/send/send-v2-container.js new file mode 100644 index 000000000..2d2ed4546 --- /dev/null +++ b/ui/app/components/send/send-v2-container.js @@ -0,0 +1,84 @@ +const connect = require('react-redux').connect +const actions = require('../../actions') +const abi = require('ethereumjs-abi') +const SendEther = require('../../send-v2') + +const { + accountsWithSendEtherInfoSelector, + getCurrentAccountWithSendEtherInfo, + conversionRateSelector, + getSelectedToken, + getSelectedAddress, + getAddressBook, + getSendFrom, + getCurrentCurrency, + getSelectedTokenToFiatRate, + getSelectedTokenContract, +} = require('../../selectors') + +module.exports = connect(mapStateToProps, mapDispatchToProps)(SendEther) + +function mapStateToProps (state) { + const fromAccounts = accountsWithSendEtherInfoSelector(state) + const selectedAddress = getSelectedAddress(state) + const selectedToken = getSelectedToken(state) + const conversionRate = conversionRateSelector(state) + + let data + let primaryCurrency + let tokenToFiatRate + if (selectedToken) { + data = Array.prototype.map.call( + abi.rawEncode(['address', 'uint256'], [selectedAddress, '0x0']), + x => ('00' + x.toString(16)).slice(-2) + ).join('') + + primaryCurrency = selectedToken.symbol + + tokenToFiatRate = getSelectedTokenToFiatRate(state) + } + + return { + ...state.metamask.send, + from: getSendFrom(state) || getCurrentAccountWithSendEtherInfo(state), + fromAccounts, + toAccounts: [...fromAccounts, ...getAddressBook(state)], + conversionRate, + selectedToken, + primaryCurrency, + convertedCurrency: getCurrentCurrency(state), + data, + amountConversionRate: selectedToken ? tokenToFiatRate : conversionRate, + tokenContract: getSelectedTokenContract(state), + unapprovedTxs: state.metamask.unapprovedTxs, + } +} + +function mapDispatchToProps (dispatch) { + return { + showCustomizeGasModal: () => dispatch(actions.showModal({ name: 'CUSTOMIZE_GAS' })), + estimateGas: params => dispatch(actions.estimateGas(params)), + getGasPrice: () => dispatch(actions.getGasPrice()), + updateTokenExchangeRate: token => dispatch(actions.updateTokenExchangeRate(token)), + signTokenTx: (tokenAddress, toAddress, amount, txData) => ( + dispatch(actions.signTokenTx(tokenAddress, toAddress, amount, txData)) + ), + signTx: txParams => dispatch(actions.signTx(txParams)), + updateAndApproveTx: txParams => dispatch(actions.updateAndApproveTx(txParams)), + updateTx: txData => dispatch(actions.updateTransaction(txData)), + setSelectedAddress: address => dispatch(actions.setSelectedAddress(address)), + addToAddressBook: address => dispatch(actions.addToAddressBook(address)), + updateGasTotal: newTotal => dispatch(actions.updateGasTotal(newTotal)), + updateGasPrice: newGasPrice => dispatch(actions.updateGasPrice(newGasPrice)), + updateGasLimit: newGasLimit => dispatch(actions.updateGasLimit(newGasLimit)), + updateSendTokenBalance: tokenBalance => dispatch(actions.updateSendTokenBalance(tokenBalance)), + updateSendFrom: newFrom => dispatch(actions.updateSendFrom(newFrom)), + updateSendTo: newTo => dispatch(actions.updateSendTo(newTo)), + updateSendAmount: newAmount => dispatch(actions.updateSendAmount(newAmount)), + updateSendMemo: newMemo => dispatch(actions.updateSendMemo(newMemo)), + updateSendErrors: newError => dispatch(actions.updateSendErrors(newError)), + goHome: () => dispatch(actions.goHome()), + clearSend: () => dispatch(actions.clearSend()), + setMaxModeTo: bool => dispatch(actions.setMaxModeTo(bool)), + } +} diff --git a/ui/app/components/send/to-autocomplete.js b/ui/app/components/send/to-autocomplete.js new file mode 100644 index 000000000..e0cdd0a58 --- /dev/null +++ b/ui/app/components/send/to-autocomplete.js @@ -0,0 +1,114 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const AccountListItem = require('./account-list-item') + +module.exports = ToAutoComplete + +inherits(ToAutoComplete, Component) +function ToAutoComplete () { + Component.call(this) + + this.state = { accountsToRender: [] } +} + +ToAutoComplete.prototype.getListItemIcon = function (listItemAddress, toAddress) { + const listItemIcon = h(`i.fa.fa-check.fa-lg`, { style: { color: '#02c9b1' } }) + + return toAddress && listItemAddress === toAddress + ? listItemIcon + : null +} + +ToAutoComplete.prototype.renderDropdown = function () { + const { + closeDropdown, + onChange, + to, + } = this.props + const { accountsToRender } = this.state + + return accountsToRender.length && h('div', {}, [ + + h('div.send-v2__from-dropdown__close-area', { + onClick: closeDropdown, + }), + + h('div.send-v2__from-dropdown__list', {}, [ + + ...accountsToRender.map(account => h(AccountListItem, { + account, + className: 'account-list-item__dropdown', + handleClick: () => { + onChange(account.address) + closeDropdown() + }, + icon: this.getListItemIcon(account.address, to), + displayBalance: false, + displayAddress: true, + })), + + ]), + + ]) +} + +ToAutoComplete.prototype.handleInputEvent = function (event = {}, cb) { + const { + to, + accounts, + closeDropdown, + openDropdown, + } = this.props + + const matchingAccounts = accounts.filter(({ address }) => address.match(to || '')) + const matches = matchingAccounts.length + + if (!matches || matchingAccounts[0].address === to) { + this.setState({ accountsToRender: [] }) + event.target && event.target.select() + closeDropdown() + } else { + this.setState({ accountsToRender: matchingAccounts }) + openDropdown() + } + cb && cb(event.target.value) +} + +ToAutoComplete.prototype.componentDidUpdate = function (nextProps, nextState) { + if (this.props.to !== nextProps.to) { + this.handleInputEvent() + } +} + +ToAutoComplete.prototype.render = function () { + const { + to, + dropdownOpen, + onChange, + inError, + } = this.props + + return h('div.send-v2__to-autocomplete', {}, [ + + h('input.send-v2__to-autocomplete__input', { + placeholder: 'Recipient Address', + className: inError ? `send-v2__error-border` : '', + value: to, + onChange: event => onChange(event.target.value), + onFocus: event => this.handleInputEvent(event), + style: { + borderColor: inError ? 'red' : null, + }, + }), + + !to && h(`i.fa.fa-caret-down.fa-lg.send-v2__to-autocomplete__down-caret`, { + style: { color: '#dedede' }, + onClick: () => this.handleInputEvent(), + }), + + dropdownOpen && this.renderDropdown(), + + ]) +} + diff --git a/ui/app/components/send/usd-fee-display.js b/ui/app/components/send/usd-fee-display.js new file mode 100644 index 000000000..4cf31a493 --- /dev/null +++ b/ui/app/components/send/usd-fee-display.js @@ -0,0 +1,35 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const FiatValue = require('../fiat-value') +const { getTxFeeBn } = require('../../util') + +module.exports = USDFeeDisplay + +inherits(USDFeeDisplay, Component) +function USDFeeDisplay () { + Component.call(this) +} + +USDFeeDisplay.prototype.render = function () { + const { + activeCurrency, + conversionRate, + gas, + gasPrice, + blockGasLimit, + } = this.props + + return h(FiatValue, { + value: getTxFeeBn(gas, gasPrice, blockGasLimit), + conversionRate, + currentCurrency: activeCurrency, + style: { + color: '#5d5d5d', + fontSize: '16px', + fontFamily: 'DIN OT', + lineHeight: '22.4px', + }, + }) +} + diff --git a/ui/app/components/shift-list-item.js b/ui/app/components/shift-list-item.js index b555dee84..43973de63 100644 --- a/ui/app/components/shift-list-item.js +++ b/ui/app/components/shift-list-item.js @@ -29,7 +29,7 @@ function ShiftListItem () { ShiftListItem.prototype.render = function () { return ( - h('.transaction-list-item.flex-row', { + h('div.tx-list-item.tx-list-clickable', { style: { paddingTop: '20px', paddingBottom: '20px', diff --git a/ui/app/components/signature-request.js b/ui/app/components/signature-request.js new file mode 100644 index 000000000..c5cc23aa8 --- /dev/null +++ b/ui/app/components/signature-request.js @@ -0,0 +1,253 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const Identicon = require('./identicon') +const connect = require('react-redux').connect +const ethUtil = require('ethereumjs-util') +const classnames = require('classnames') + +const AccountDropdownMini = require('./dropdowns/account-dropdown-mini') + +const actions = require('../actions') +const { conversionUtil } = require('../conversion-util') + +const { + getSelectedAccount, + getCurrentAccountWithSendEtherInfo, + getSelectedAddress, + accountsWithSendEtherInfoSelector, + conversionRateSelector, +} = require('../selectors.js') + +function mapStateToProps (state) { + return { + balance: getSelectedAccount(state).balance, + selectedAccount: getCurrentAccountWithSendEtherInfo(state), + selectedAddress: getSelectedAddress(state), + requester: null, + requesterAddress: null, + accounts: accountsWithSendEtherInfoSelector(state), + conversionRate: conversionRateSelector(state), + } +} + +function mapDispatchToProps (dispatch) { + return { + goHome: () => dispatch(actions.goHome()), + } +} + +module.exports = connect(mapStateToProps, mapDispatchToProps)(SignatureRequest) + +inherits(SignatureRequest, Component) +function SignatureRequest (props) { + Component.call(this) + + this.state = { + selectedAccount: props.selectedAccount, + accountDropdownOpen: false, + } +} + +SignatureRequest.prototype.renderHeader = function () { + return h('div.request-signature__header', [ + + h('div.request-signature__header-background'), + + h('div.request-signature__header__text', 'Signature Request'), + + h('div.request-signature__header__tip-container', [ + h('div.request-signature__header__tip'), + ]), + + ]) +} + +SignatureRequest.prototype.renderAccountDropdown = function () { + const { + selectedAccount, + accountDropdownOpen, + } = this.state + + const { + accounts, + } = this.props + + return h('div.request-signature__account', [ + + h('div.request-signature__account-text', ['Account:']), + + h(AccountDropdownMini, { + selectedAccount, + accounts, + onSelect: selectedAccount => this.setState({ selectedAccount }), + dropdownOpen: accountDropdownOpen, + openDropdown: () => this.setState({ accountDropdownOpen: true }), + closeDropdown: () => this.setState({ accountDropdownOpen: false }), + }), + + ]) +} + +SignatureRequest.prototype.renderBalance = function () { + const { balance, conversionRate } = this.props + + const balanceInEther = conversionUtil(balance, { + fromNumericBase: 'hex', + toNumericBase: 'dec', + fromDenomination: 'WEI', + numberOfDecimals: 6, + conversionRate, + }) + + return h('div.request-signature__balance', [ + + h('div.request-signature__balance-text', ['Balance:']), + + h('div.request-signature__balance-value', `${balanceInEther} ETH`), + + ]) +} + +SignatureRequest.prototype.renderAccountInfo = function () { + return h('div.request-signature__account-info', [ + + this.renderAccountDropdown(), + + this.renderRequestIcon(), + + this.renderBalance(), + + ]) +} + +SignatureRequest.prototype.renderRequestIcon = function () { + const { requesterAddress } = this.props + + return h('div.request-signature__request-icon', [ + h(Identicon, { + diameter: 40, + address: requesterAddress, + }), + ]) +} + +SignatureRequest.prototype.renderRequestInfo = function () { + return h('div.request-signature__request-info', [ + + h('div.request-signature__headline', [ + `Your signature is being requested`, + ]), + + ]) +} + +SignatureRequest.prototype.msgHexToText = function (hex) { + try { + const stripped = ethUtil.stripHexPrefix(hex) + const buff = Buffer.from(stripped, 'hex') + return buff.toString('utf8') + } catch (e) { + return hex + } +} + +SignatureRequest.prototype.renderBody = function () { + let rows + let notice = 'You are signing:' + + const { txData } = this.props + const { type, msgParams: { data } } = txData + + if (type === 'personal_sign') { + rows = [{ name: 'Message', value: this.msgHexToText(data) }] + } else if (type === 'eth_signTypedData') { + rows = data + } else if (type === 'eth_sign') { + rows = [{ name: 'Message', value: data }] + notice = `Signing this message can have + dangerous side effects. Only sign messages from + sites you fully trust with your entire account. + This dangerous method will be removed in a future version. ` + } + + return h('div.request-signature__body', {}, [ + + this.renderAccountInfo(), + + this.renderRequestInfo(), + + h('div.request-signature__notice', { + className: classnames({ + 'request-signature__notice': type === 'personal_sign' || type === 'eth_signTypedData', + 'request-signature__warning': type === 'eth_sign', + }), + }, [notice]), + + h('div.request-signature__rows', [ + + ...rows.map(({ name, value }) => { + return h('div.request-signature__row', [ + h('div.request-signature__row-title', [`${name}:`]), + h('div.request-signature__row-value', value), + ]) + }), + + ]), + + ]) +} + +SignatureRequest.prototype.renderFooter = function () { + const { + signPersonalMessage, + signTypedMessage, + cancelPersonalMessage, + cancelTypedMessage, + signMessage, + cancelMessage, + } = this.props + + const { txData } = this.props + const { type } = txData + + let cancel + let sign + if (type === 'personal_sign') { + cancel = cancelPersonalMessage + sign = signPersonalMessage + } else if (type === 'eth_signTypedData') { + cancel = cancelTypedMessage + sign = signTypedMessage + } else if (type === 'eth_sign') { + cancel = cancelMessage + sign = signMessage + } + + return h('div.request-signature__footer', [ + h('button.request-signature__footer__cancel-button', { + onClick: cancel, + }, 'CANCEL'), + h('button.request-signature__footer__sign-button', { + onClick: sign, + }, 'SIGN'), + ]) +} + +SignatureRequest.prototype.render = function () { + return ( + + h('div.request-signature__container', [ + + this.renderHeader(), + + this.renderBody(), + + this.renderFooter(), + + ]) + + ) + +} + diff --git a/ui/app/components/tab-bar.js b/ui/app/components/tab-bar.js index bef444a48..0edced119 100644 --- a/ui/app/components/tab-bar.js +++ b/ui/app/components/tab-bar.js @@ -1,37 +1,47 @@ -const Component = require('react').Component +const { Component } = require('react') const h = require('react-hyperscript') -const inherits = require('util').inherits +const PropTypes = require('react').PropTypes +const classnames = require('classnames') -module.exports = TabBar +class TabBar extends Component { + constructor (props) { + super(props) + const { defaultTab, tabs } = props -inherits(TabBar, Component) -function TabBar () { - Component.call(this) -} + this.state = { + subview: defaultTab || tabs[0].key, + } + } -TabBar.prototype.render = function () { - const props = this.props - const state = this.state || {} - const { tabs = [], defaultTab, tabSelected } = props - const { subview = defaultTab } = state + render () { + const { tabs = [], tabSelected } = this.props + const { subview } = this.state - return ( - h('.flex-row.space-around.text-transform-uppercase', { - style: { - background: '#EBEBEB', - color: '#AEAEAE', - paddingTop: '4px', - minHeight: '30px', - }, - }, tabs.map((tab) => { - const { key, content } = tab - return h(subview === key ? '.activeForm' : '.inactiveForm.pointer', { - onClick: () => { - this.setState({ subview: key }) - tabSelected(key) - }, - }, content) - })) - ) + return ( + h('.tab-bar', {}, [ + tabs.map((tab) => { + const { key, content } = tab + return h('div', { + className: classnames('tab-bar__tab pointer', { + 'tab-bar__tab--active': subview === key, + }), + onClick: () => { + this.setState({ subview: key }) + tabSelected(key) + }, + key, + }, content) + }), + h('div.tab-bar__tab.tab-bar__grow-tab'), + ]) + ) + } } +TabBar.propTypes = { + defaultTab: PropTypes.string, + tabs: PropTypes.array, + tabSelected: PropTypes.func, +} + +module.exports = TabBar diff --git a/ui/app/components/token-balance.js b/ui/app/components/token-balance.js new file mode 100644 index 000000000..2f71c0687 --- /dev/null +++ b/ui/app/components/token-balance.js @@ -0,0 +1,113 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const TokenTracker = require('eth-token-tracker') +const connect = require('react-redux').connect +const selectors = require('../selectors') + +function mapStateToProps (state) { + return { + userAddress: selectors.getSelectedAddress(state), + } +} + +module.exports = connect(mapStateToProps)(TokenBalance) + + +inherits(TokenBalance, Component) +function TokenBalance () { + this.state = { + string: '', + symbol: '', + isLoading: true, + error: null, + } + Component.call(this) +} + +TokenBalance.prototype.render = function () { + const state = this.state + const { symbol, string, isLoading } = state + const { balanceOnly } = this.props + + return isLoading + ? h('span', '') + : h('span.token-balance', [ + h('span.token-balance__amount', string), + !balanceOnly && h('span.token-balance__symbol', symbol), + ]) +} + +TokenBalance.prototype.componentDidMount = function () { + this.createFreshTokenTracker() +} + +TokenBalance.prototype.createFreshTokenTracker = function () { + if (this.tracker) { + // Clean up old trackers when refreshing: + this.tracker.stop() + this.tracker.removeListener('update', this.balanceUpdater) + this.tracker.removeListener('error', this.showError) + } + + if (!global.ethereumProvider) return + const { userAddress, token } = this.props + + this.tracker = new TokenTracker({ + userAddress, + provider: global.ethereumProvider, + tokens: [token], + pollingInterval: 8000, + }) + + + // Set up listener instances for cleaning up + this.balanceUpdater = this.updateBalance.bind(this) + this.showError = error => { + this.setState({ error, isLoading: false }) + } + this.tracker.on('update', this.balanceUpdater) + this.tracker.on('error', this.showError) + + this.tracker.updateBalances() + .then(() => { + this.updateBalance(this.tracker.serialize()) + }) + .catch((reason) => { + log.error(`Problem updating balances`, reason) + this.setState({ isLoading: false }) + }) +} + +TokenBalance.prototype.componentDidUpdate = function (nextProps) { + const { + userAddress: oldAddress, + token: { address: oldTokenAddress }, + } = this.props + const { + userAddress: newAddress, + token: { address: newTokenAddress }, + } = nextProps + + if ((!oldAddress || !newAddress) && (!oldTokenAddress || !newTokenAddress)) return + if ((oldAddress === newAddress) && (oldTokenAddress === newTokenAddress)) return + + this.setState({ isLoading: true }) + this.createFreshTokenTracker() +} + +TokenBalance.prototype.updateBalance = function (tokens = []) { + const [{ string, symbol }] = tokens + + this.setState({ + string, + symbol, + isLoading: false, + }) +} + +TokenBalance.prototype.componentWillUnmount = function () { + if (!this.tracker) return + this.tracker.stop() +} + diff --git a/ui/app/components/token-cell.js b/ui/app/components/token-cell.js index 19d7139bb..677b66830 100644 --- a/ui/app/components/token-cell.js +++ b/ui/app/components/token-cell.js @@ -1,35 +1,135 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits +const connect = require('react-redux').connect const Identicon = require('./identicon') const prefixForNetwork = require('../../lib/etherscan-prefix-for-network') +const selectors = require('../selectors') +const actions = require('../actions') +const { conversionUtil, multiplyCurrencies } = require('../conversion-util') -module.exports = TokenCell +const TokenMenuDropdown = require('./dropdowns/token-menu-dropdown.js') + +function mapStateToProps (state) { + return { + network: state.metamask.network, + currentCurrency: state.metamask.currentCurrency, + selectedTokenAddress: state.metamask.selectedTokenAddress, + userAddress: selectors.getSelectedAddress(state), + tokenExchangeRates: state.metamask.tokenExchangeRates, + conversionRate: state.metamask.conversionRate, + sidebarOpen: state.appState.sidebarOpen, + } +} + +function mapDispatchToProps (dispatch) { + return { + setSelectedToken: address => dispatch(actions.setSelectedToken(address)), + updateTokenExchangeRate: token => dispatch(actions.updateTokenExchangeRate(token)), + hideSidebar: () => dispatch(actions.hideSidebar()), + } +} + +module.exports = connect(mapStateToProps, mapDispatchToProps)(TokenCell) inherits(TokenCell, Component) function TokenCell () { Component.call(this) + + this.state = { + tokenMenuOpen: false, + } +} + +TokenCell.prototype.componentWillMount = function () { + const { + updateTokenExchangeRate, + symbol, + } = this.props + + updateTokenExchangeRate(symbol) } TokenCell.prototype.render = function () { + const { tokenMenuOpen } = this.state const props = this.props - const { address, symbol, string, network, userAddress } = props + const { + address, + symbol, + string, + network, + setSelectedToken, + selectedTokenAddress, + tokenExchangeRates, + conversionRate, + hideSidebar, + sidebarOpen, + currentCurrency, + // userAddress, + } = props + + const pair = `${symbol.toLowerCase()}_eth` + + let currentTokenToFiatRate + let currentTokenInFiat + let formattedFiat = '' + + if (tokenExchangeRates[pair]) { + currentTokenToFiatRate = multiplyCurrencies( + tokenExchangeRates[pair].rate, + conversionRate + ) + currentTokenInFiat = conversionUtil(string, { + fromNumericBase: 'dec', + fromCurrency: symbol, + toCurrency: currentCurrency.toUpperCase(), + numberOfDecimals: 2, + conversionRate: currentTokenToFiatRate, + }) + formattedFiat = currentTokenInFiat.toString() === '0' + ? '' + : `${currentTokenInFiat} ${currentCurrency.toUpperCase()}` + } + + const showFiat = Boolean(currentTokenInFiat) && currentCurrency.toUpperCase() !== symbol return ( - h('li.token-cell', { - style: { cursor: network === '1' ? 'pointer' : 'default' }, - onClick: this.view.bind(this, address, userAddress, network), + h('div.token-list-item', { + className: `token-list-item ${selectedTokenAddress === address ? 'token-list-item--active' : ''}`, + // style: { cursor: network === '1' ? 'pointer' : 'default' }, + // onClick: this.view.bind(this, address, userAddress, network), + onClick: () => { + setSelectedToken(address) + selectedTokenAddress !== address && sidebarOpen && hideSidebar() + }, }, [ h(Identicon, { - diameter: 50, + className: 'token-list-item__identicon', + diameter: 45, address, network, }), - h('h3', `${string || 0} ${symbol}`), + h('h.token-list-item__balance-wrapper', null, [ + h('h3.token-list-item__token-balance', `${string || 0} ${symbol}`), + + showFiat && h('div.token-list-item__fiat-amount', { + style: {}, + }, formattedFiat), + ]), - h('span', { style: { flex: '1 0 auto' } }), + h('i.fa.fa-ellipsis-h.fa-lg.token-list-item__ellipsis.cursor-pointer', { + onClick: (e) => { + e.stopPropagation() + this.setState({ tokenMenuOpen: true }) + }, + }), + + tokenMenuOpen && h(TokenMenuDropdown, { + onClose: () => this.setState({ tokenMenuOpen: false }), + token: { symbol, address }, + }), /* h('button', { diff --git a/ui/app/components/token-list.js b/ui/app/components/token-list.js index 149733b89..8e06e0f27 100644 --- a/ui/app/components/token-list.js +++ b/ui/app/components/token-list.js @@ -3,8 +3,28 @@ const h = require('react-hyperscript') const inherits = require('util').inherits const TokenTracker = require('eth-token-tracker') const TokenCell = require('./token-cell.js') +const connect = require('react-redux').connect +const selectors = require('../selectors') + +function mapStateToProps (state) { + return { + network: state.metamask.network, + tokens: state.metamask.tokens, + userAddress: selectors.getSelectedAddress(state), + } +} + +const defaultTokens = [] +const contracts = require('eth-contract-metadata') +for (const address in contracts) { + const contract = contracts[address] + if (contract.erc20) { + contract.address = address + defaultTokens.push(contract) + } +} -module.exports = TokenList +module.exports = connect(mapStateToProps)(TokenList) inherits(TokenList, Component) function TokenList () { @@ -17,12 +37,12 @@ function TokenList () { } TokenList.prototype.render = function () { + const { userAddress } = this.props const state = this.state const { tokens, isLoading, error } = state - const { userAddress, network } = this.props if (isLoading) { - return this.message('Loading') + return this.message('Loading Tokens...') } if (error) { @@ -47,87 +67,8 @@ TokenList.prototype.render = function () { ]) } - const tokenViews = tokens.map((tokenData) => { - tokenData.network = network - tokenData.userAddress = userAddress - return h(TokenCell, tokenData) - }) - - return h('.full-flex-height', [ - this.renderTokenStatusBar(), + return h('div', tokens.map((tokenData) => h(TokenCell, tokenData))) - h('ol.full-flex-height.flex-column', { - style: { - overflowY: 'auto', - display: 'flex', - flexDirection: 'column', - }, - }, [ - h('style', ` - - li.token-cell { - display: flex; - flex-direction: row; - align-items: center; - padding: 10px; - min-height: 50px; - } - - li.token-cell > h3 { - margin-left: 12px; - } - - li.token-cell:hover { - background: white; - cursor: pointer; - } - - `), - ...tokenViews, - h('.flex-grow'), - ]), - ]) -} - -TokenList.prototype.renderTokenStatusBar = function () { - const { tokens } = this.state - - let msg - if (tokens.length === 1) { - msg = `You own 1 token` - } else if (tokens.length > 1) { - msg = `You own ${tokens.length} tokens` - } else { - msg = `No tokens found` - } - - return h('div', { - style: { - display: 'flex', - justifyContent: 'space-between', - alignItems: 'center', - minHeight: '70px', - padding: '10px', - }, - }, [ - h('span', msg), - h('button', { - key: 'reveal-account-bar', - onClick: (event) => { - event.preventDefault() - this.props.addToken() - }, - style: { - display: 'flex', - height: '40px', - padding: '10px', - justifyContent: 'center', - alignItems: 'center', - }, - }, [ - 'ADD TOKEN', - ]), - ]) } TokenList.prototype.message = function (body) { @@ -156,6 +97,7 @@ TokenList.prototype.createFreshTokenTracker = function () { if (!global.ethereumProvider) return const { userAddress } = this.props + this.tracker = new TokenTracker({ userAddress, provider: global.ethereumProvider, @@ -182,15 +124,30 @@ TokenList.prototype.createFreshTokenTracker = function () { }) } -TokenList.prototype.componentWillUpdate = function (nextProps) { - if (nextProps.network === 'loading') return - const oldNet = this.props.network - const newNet = nextProps.network - - if (oldNet && newNet && newNet !== oldNet) { - this.setState({ isLoading: true }) - this.createFreshTokenTracker() - } +TokenList.prototype.componentDidUpdate = function (nextProps) { + const { + network: oldNet, + userAddress: oldAddress, + tokens, + } = this.props + const { + network: newNet, + userAddress: newAddress, + tokens: newTokens, + } = nextProps + + const isLoading = newNet === 'loading' + const missingInfo = !oldNet || !newNet || !oldAddress || !newAddress + const sameUserAndNetwork = oldAddress === newAddress && oldNet === newNet + const shouldUpdateTokens = isLoading || missingInfo || sameUserAndNetwork + + const oldTokensLength = tokens ? tokens.length : 0 + const tokensLengthUnchanged = oldTokensLength === newTokens.length + + if (tokensLengthUnchanged && shouldUpdateTokens) return + + this.setState({ isLoading: true }) + this.createFreshTokenTracker() } TokenList.prototype.updateBalances = function (tokens) { @@ -202,3 +159,15 @@ TokenList.prototype.componentWillUnmount = function () { this.tracker.stop() } +// function uniqueMergeTokens (tokensA, tokensB = []) { +// const uniqueAddresses = [] +// const result = [] +// tokensA.concat(tokensB).forEach((token) => { +// const normal = normalizeAddress(token.address) +// if (!uniqueAddresses.includes(normal)) { +// uniqueAddresses.push(normal) +// result.push(token) +// } +// }) +// return result +// } diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js index 42ef665b1..4e3d2cb93 100644 --- a/ui/app/components/transaction-list-item.js +++ b/ui/app/components/transaction-list-item.js @@ -199,34 +199,40 @@ function formatDate (date) { } function renderErrorOrWarning (transaction) { - const { status, err, warning } = transaction + const { status } = transaction // show rejected if (status === 'rejected') { return h('span.error', ' (Rejected)') } - - // show error - if (err) { - const message = err.message || '' - return ( - h(Tooltip, { - title: message, - position: 'bottom', - }, [ - h(`span.error`, ` (Failed)`), - ]) - ) - } - - // show warning - if (warning) { - const message = warning.message - return h(Tooltip, { - title: message, - position: 'bottom', - }, [ - h(`span.warning`, ` (Warning)`), - ]) + if (transaction.err || transaction.warning) { + const { err, warning = {} } = transaction + const errFirst = !!((err && warning) || err) + + errFirst ? err.message : warning.message + + // show error + if (err) { + const message = err.message || '' + return ( + h(Tooltip, { + title: message, + position: 'bottom', + }, [ + h(`span.error`, ` (Failed)`), + ]) + ) + } + + // show warning + if (warning) { + const message = warning.message + return h(Tooltip, { + title: message, + position: 'bottom', + }, [ + h(`span.warning`, ` (Warning)`), + ]) + } } } diff --git a/ui/app/components/tx-list-item.js b/ui/app/components/tx-list-item.js new file mode 100644 index 000000000..8a9253d4d --- /dev/null +++ b/ui/app/components/tx-list-item.js @@ -0,0 +1,249 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const connect = require('react-redux').connect +const inherits = require('util').inherits +const classnames = require('classnames') +const abi = require('human-standard-token-abi') +const abiDecoder = require('abi-decoder') +abiDecoder.addABI(abi) +const Identicon = require('./identicon') +const contractMap = require('eth-contract-metadata') + +const { conversionUtil, multiplyCurrencies } = require('../conversion-util') +const { calcTokenAmount } = require('../token-util') + +const { getCurrentCurrency } = require('../selectors') + +module.exports = connect(mapStateToProps)(TxListItem) + +function mapStateToProps (state) { + return { + tokens: state.metamask.tokens, + currentCurrency: getCurrentCurrency(state), + tokenExchangeRates: state.metamask.tokenExchangeRates, + } +} + +inherits(TxListItem, Component) +function TxListItem () { + Component.call(this) + + this.state = { + total: null, + fiatTotal: null, + } +} + +TxListItem.prototype.componentDidMount = async function () { + const { txParams = {} } = this.props + + const decodedData = txParams.data && abiDecoder.decodeMethod(txParams.data) + const { name: txDataName } = decodedData || {} + + const { total, fiatTotal } = txDataName === 'transfer' + ? await this.getSendTokenTotal() + : this.getSendEtherTotal() + + this.setState({ total, fiatTotal }) +} + +TxListItem.prototype.getAddressText = function () { + const { + address, + txParams = {}, + } = this.props + + const decodedData = txParams.data && abiDecoder.decodeMethod(txParams.data) + const { name: txDataName, params = [] } = decodedData || {} + const { value } = params[0] || {} + + switch (txDataName) { + case 'transfer': + return `${value.slice(0, 10)}...${value.slice(-4)}` + default: + return address + ? `${address.slice(0, 10)}...${address.slice(-4)}` + : 'Contract Published' + } +} + +TxListItem.prototype.getSendEtherTotal = function () { + const { + transactionAmount, + conversionRate, + address, + currentCurrency, + } = this.props + + if (!address) { + return {} + } + + const totalInFiat = conversionUtil(transactionAmount, { + fromNumericBase: 'hex', + toNumericBase: 'dec', + fromCurrency: 'ETH', + toCurrency: currentCurrency, + fromDenomination: 'WEI', + numberOfDecimals: 2, + conversionRate, + }) + const totalInETH = conversionUtil(transactionAmount, { + fromNumericBase: 'hex', + toNumericBase: 'dec', + fromCurrency: 'ETH', + toCurrency: 'ETH', + fromDenomination: 'WEI', + conversionRate, + numberOfDecimals: 6, + }) + + return { + total: `${totalInETH} ETH`, + fiatTotal: `${totalInFiat} ${currentCurrency.toUpperCase()}`, + } +} + +TxListItem.prototype.getTokenInfo = async function () { + const { txParams = {}, tokenInfoGetter, tokens } = this.props + const toAddress = txParams.to + + let decimals + let symbol + + ({ decimals, symbol } = tokens.filter(({ address }) => address === toAddress)[0] || {}) + + if (!decimals && !symbol) { + ({ decimals, symbol } = contractMap[toAddress] || {}) + } + + if (!decimals && !symbol) { + ({ decimals, symbol } = await tokenInfoGetter(toAddress)) + } + + return { decimals, symbol } +} + +TxListItem.prototype.getSendTokenTotal = async function () { + const { + txParams = {}, + conversionRate, + tokenExchangeRates, + currentCurrency, + } = this.props + + const decodedData = txParams.data && abiDecoder.decodeMethod(txParams.data) + const { params = [] } = decodedData || {} + const { value } = params[1] || {} + const { decimals, symbol } = await this.getTokenInfo() + const total = calcTokenAmount(value, decimals) + + const pair = symbol && `${symbol.toLowerCase()}_eth` + + let tokenToFiatRate + let totalInFiat + + if (tokenExchangeRates[pair]) { + tokenToFiatRate = multiplyCurrencies( + tokenExchangeRates[pair].rate, + conversionRate + ) + + totalInFiat = conversionUtil(total, { + fromNumericBase: 'dec', + toNumericBase: 'dec', + fromCurrency: symbol, + toCurrency: currentCurrency, + numberOfDecimals: 2, + conversionRate: tokenToFiatRate, + }) + } + + const showFiat = Boolean(totalInFiat) && currentCurrency.toUpperCase() !== symbol + + return { + total: `${total} ${symbol}`, + fiatTotal: showFiat && `${totalInFiat} ${currentCurrency.toUpperCase()}`, + } +} + +TxListItem.prototype.render = function () { + const { + transactionStatus, + transactionAmount, + onClick, + transActionId, + dateString, + address, + className, + } = this.props + const { total, fiatTotal } = this.state + const showFiatTotal = transactionAmount !== '0x0' && fiatTotal + + return h(`div${className || ''}`, { + key: transActionId, + onClick: () => onClick && onClick(transActionId), + }, [ + h(`div.flex-column.tx-list-item-wrapper`, {}, [ + + h('div.tx-list-date-wrapper', { + style: {}, + }, [ + h('span.tx-list-date', {}, [ + dateString, + ]), + ]), + + h('div.flex-row.tx-list-content-wrapper', { + style: {}, + }, [ + + h('div.tx-list-identicon-wrapper', { + style: {}, + }, [ + h(Identicon, { + address, + diameter: 28, + }), + ]), + + h('div.tx-list-account-and-status-wrapper', {}, [ + h('div.tx-list-account-wrapper', { + style: {}, + }, [ + h('span.tx-list-account', {}, [ + this.getAddressText(address), + ]), + ]), + + h('div.tx-list-status-wrapper', { + style: {}, + }, [ + h('span', { + className: classnames('tx-list-status', { + 'tx-list-status--rejected': transactionStatus === 'rejected', + 'tx-list-status--failed': transactionStatus === 'failed', + }), + }, + transactionStatus, + ), + ]), + ]), + + h('div.flex-column.tx-list-details-wrapper', { + style: {}, + }, [ + + h('span', { + className: classnames('tx-list-value', { + 'tx-list-value--confirmed': transactionStatus === 'confirmed', + }), + }, total), + + showFiatTotal && h('span.tx-list-fiat-value', fiatTotal), + + ]), + ]), + ]), // holding on icon from design + ]) +} diff --git a/ui/app/components/tx-list.js b/ui/app/components/tx-list.js new file mode 100644 index 000000000..70722f43e --- /dev/null +++ b/ui/app/components/tx-list.js @@ -0,0 +1,137 @@ +const Component = require('react').Component +const connect = require('react-redux').connect +const h = require('react-hyperscript') +const inherits = require('util').inherits +const prefixForNetwork = require('../../lib/etherscan-prefix-for-network') +const selectors = require('../selectors') +const TxListItem = require('./tx-list-item') +const ShiftListItem = require('./shift-list-item') +const { formatDate } = require('../util') +const { showConfTxPage } = require('../actions') +const classnames = require('classnames') +const { tokenInfoGetter } = require('../token-util') + +module.exports = connect(mapStateToProps, mapDispatchToProps)(TxList) + +function mapStateToProps (state) { + return { + txsToRender: selectors.transactionsSelector(state), + conversionRate: selectors.conversionRateSelector(state), + } +} + +function mapDispatchToProps (dispatch) { + return { + showConfTxPage: ({ id }) => dispatch(showConfTxPage({ id })), + } +} + +inherits(TxList, Component) +function TxList () { + Component.call(this) +} + +TxList.prototype.componentWillMount = function () { + this.tokenInfoGetter = tokenInfoGetter() +} + +TxList.prototype.render = function () { + return h('div.flex-column.tx-list-container', {}, [ + + h('div.flex-row.tx-list-header-wrapper', [ + h('div.flex-row.tx-list-header', [ + h('div', 'transactions'), + ]), + ]), + + this.renderTransaction(), + + ]) +} + +TxList.prototype.renderTransaction = function () { + const { txsToRender, conversionRate } = this.props + return txsToRender.length + ? txsToRender.map((transaction, i) => this.renderTransactionListItem(transaction, conversionRate)) + : [h( + 'div.tx-list-item.tx-list-item--empty', + { key: 'tx-list-none' }, + [ 'No Transactions' ], + )] +} + +// TODO: Consider moving TxListItem into a separate component +TxList.prototype.renderTransactionListItem = function (transaction, conversionRate) { + // console.log({transaction}) + // refer to transaction-list.js:line 58 + + if (transaction.key === 'shapeshift') { + return h(ShiftListItem, transaction) + } + + const props = { + dateString: formatDate(transaction.time), + address: transaction.txParams.to, + transactionStatus: transaction.status, + transactionAmount: transaction.txParams.value, + transActionId: transaction.id, + transactionHash: transaction.hash, + transactionNetworkId: transaction.metamaskNetworkId, + } + + const { + address, + transactionStatus, + transactionAmount, + dateString, + transActionId, + transactionHash, + transactionNetworkId, + } = props + const { showConfTxPage } = this.props + + const opts = { + key: transActionId || transactionHash, + txParams: transaction.txParams, + transactionStatus, + transActionId, + dateString, + address, + transactionAmount, + transactionHash, + conversionRate, + tokenInfoGetter: this.tokenInfoGetter, + } + + const isUnapproved = transactionStatus === 'unapproved' + + if (isUnapproved) { + opts.onClick = () => showConfTxPage({id: transActionId}) + opts.transactionStatus = 'Not Started' + } else if (transactionHash) { + opts.onClick = () => this.view(transactionHash, transactionNetworkId) + } + + opts.className = classnames('.tx-list-item', { + '.tx-list-pending-item-container': isUnapproved, + '.tx-list-clickable': Boolean(transactionHash) || isUnapproved, + }) + + return h(TxListItem, opts) +} + +TxList.prototype.view = function (txHash, network) { + const url = etherscanLinkFor(txHash, network) + if (url) { + navigateTo(url) + } +} + +function navigateTo (url) { + global.platform.openWindow({ url }) +} + +function etherscanLinkFor (txHash, network) { + const prefix = prefixForNetwork(network) + return `https://${prefix}etherscan.io/tx/${txHash}` +} diff --git a/ui/app/components/tx-view.js b/ui/app/components/tx-view.js new file mode 100644 index 000000000..e42a20c85 --- /dev/null +++ b/ui/app/components/tx-view.js @@ -0,0 +1,156 @@ +const Component = require('react').Component +const connect = require('react-redux').connect +const h = require('react-hyperscript') +const ethUtil = require('ethereumjs-util') +const inherits = require('util').inherits +const actions = require('../actions') +const selectors = require('../selectors') + +const BalanceComponent = require('./balance-component') +const TxList = require('./tx-list') +const Identicon = require('./identicon') + +module.exports = connect(mapStateToProps, mapDispatchToProps)(TxView) + +function mapStateToProps (state) { + const sidebarOpen = state.appState.sidebarOpen + const isMascara = state.appState.isMascara + + const identities = state.metamask.identities + const accounts = state.metamask.accounts + const network = state.metamask.network + const selectedTokenAddress = state.metamask.selectedTokenAddress + const selectedAddress = state.metamask.selectedAddress || Object.keys(accounts)[0] + const checksumAddress = selectedAddress && ethUtil.toChecksumAddress(selectedAddress) + const identity = identities[selectedAddress] + + return { + sidebarOpen, + selectedAddress, + checksumAddress, + selectedTokenAddress, + selectedToken: selectors.getSelectedToken(state), + identity, + network, + isMascara, + } +} + +function mapDispatchToProps (dispatch) { + return { + showSidebar: () => { dispatch(actions.showSidebar()) }, + hideSidebar: () => { dispatch(actions.hideSidebar()) }, + showModal: (payload) => { dispatch(actions.showModal(payload)) }, + showSendPage: () => { dispatch(actions.showSendPage()) }, + showSendTokenPage: () => { dispatch(actions.showSendTokenPage()) }, + } +} + +inherits(TxView, Component) +function TxView () { + Component.call(this) +} + +TxView.prototype.renderHeroBalance = function () { + const { selectedToken } = this.props + + return h('div.hero-balance', {}, [ + + h(BalanceComponent, { token: selectedToken }), + + this.renderButtons(), + ]) +} + +TxView.prototype.renderButtons = function () { + const {selectedToken, showModal, showSendPage, showSendTokenPage } = this.props + + return !selectedToken + ? ( + h('div.flex-row.flex-center.hero-balance-buttons', [ + h('button.btn-clear', { + style: { + textAlign: 'center', + }, + onClick: () => showModal({ + name: 'BUY', + }), + }, 'DEPOSIT'), + + h('button.btn-clear', { + style: { + textAlign: 'center', + marginLeft: '0.8em', + }, + onClick: showSendPage, + }, 'SEND'), + ]) + ) + : ( + h('div.flex-row.flex-center.hero-balance-buttons', [ + h('button.btn-clear', { + style: { + textAlign: 'center', + marginLeft: '0.8em', + }, + onClick: showSendTokenPage, + }, 'SEND'), + ]) + ) +} + +TxView.prototype.render = function () { + const { selectedAddress, identity, network, isMascara } = this.props + + return h('div.tx-view.flex-column', { + style: {}, + }, [ + + h('div.flex-row.phone-visible', { + style: { + margin: '1em 0.9em', + justifyContent: 'space-between', + alignItems: 'center', + }, + }, [ + + h('div.fa.fa-bars', { + style: { + fontSize: '1.3em', + cursor: 'pointer', + }, + onClick: () => { + this.props.sidebarOpen ? this.props.hideSidebar() : this.props.showSidebar() + }, + }, []), + + h('.identicon-wrapper.select-none', { + style: { + marginLeft: '0.9em', + }, + }, [ + h(Identicon, { + diameter: 24, + address: selectedAddress, + network, + }), + ]), + + h('span.account-name', { + style: {}, + }, [ + identity.name, + ]), + + !isMascara && h('div.open-in-browser', { + onClick: () => global.platform.openExtensionInBrowser(), + }, [h('img', { src: 'images/open.svg' })]), + + ]), + + this.renderHeroBalance(), + + h(TxList), + + ]) +} diff --git a/ui/app/components/wallet-content-display.js b/ui/app/components/wallet-content-display.js new file mode 100644 index 000000000..bfa061be4 --- /dev/null +++ b/ui/app/components/wallet-content-display.js @@ -0,0 +1,56 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits + +module.exports = WalletContentDisplay + +inherits(WalletContentDisplay, Component) +function WalletContentDisplay () { + Component.call(this) +} + +WalletContentDisplay.prototype.render = function () { + const { title, amount, fiatValue, active, style } = this.props + + // TODO: Separate component: wallet-content-account + return h('div.flex-column', { + style: { + marginLeft: '1.3em', + alignItems: 'flex-start', + ...style, + }, + }, [ + + h('span', { + style: { + fontSize: '1.1em', + }, + }, title), + + h('span', { + style: { + fontSize: '1.8em', + margin: '0.4em 0em', + }, + }, amount), + + h('span', { + style: { + fontSize: '1.3em', + }, + }, fiatValue), + + active && h('div', { + style: { + position: 'absolute', + marginLeft: '-1.3em', + height: '6em', + width: '0.3em', + background: '#D8D8D8', // $alto + }, + }, [ + ]), + ]) + +} + diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js new file mode 100644 index 000000000..3cb7a8b76 --- /dev/null +++ b/ui/app/components/wallet-view.js @@ -0,0 +1,171 @@ +const Component = require('react').Component +const connect = require('react-redux').connect +const h = require('react-hyperscript') +const inherits = require('util').inherits +const Identicon = require('./identicon') +// const AccountDropdowns = require('./dropdowns/index.js').AccountDropdowns +const copyToClipboard = require('copy-to-clipboard') +const actions = require('../actions') +const BalanceComponent = require('./balance-component') +const TokenList = require('./token-list') +const selectors = require('../selectors') + +module.exports = connect(mapStateToProps, mapDispatchToProps)(WalletView) + +function mapStateToProps (state) { + + return { + network: state.metamask.network, + sidebarOpen: state.appState.sidebarOpen, + identities: state.metamask.identities, + accounts: state.metamask.accounts, + tokens: state.metamask.tokens, + keyrings: state.metamask.keyrings, + selectedAddress: selectors.getSelectedAddress(state), + selectedIdentity: selectors.getSelectedIdentity(state), + selectedAccount: selectors.getSelectedAccount(state), + selectedTokenAddress: state.metamask.selectedTokenAddress, + } +} + +function mapDispatchToProps (dispatch) { + return { + showSendPage: () => dispatch(actions.showSendPage()), + hideSidebar: () => dispatch(actions.hideSidebar()), + unsetSelectedToken: () => dispatch(actions.setSelectedToken()), + showAccountDetailModal: () => { + dispatch(actions.showModal({ name: 'ACCOUNT_DETAILS' })) + }, + showAddTokenPage: () => dispatch(actions.showAddTokenPage()), + } +} + +inherits(WalletView, Component) +function WalletView () { + Component.call(this) + this.state = { + hasCopied: false, + } +} + +WalletView.prototype.renderWalletBalance = function () { + const { + selectedTokenAddress, + selectedAccount, + unsetSelectedToken, + hideSidebar, + sidebarOpen, + } = this.props + + const selectedClass = selectedTokenAddress + ? '' + : 'wallet-balance-wrapper--active' + const className = `flex-column wallet-balance-wrapper ${selectedClass}` + + return h('div', { className }, [ + h('div.wallet-balance', + { + onClick: () => { + unsetSelectedToken() + selectedTokenAddress && sidebarOpen && hideSidebar() + }, + }, + [ + h(BalanceComponent, { + balanceValue: selectedAccount ? selectedAccount.balance : '', + style: {}, + }), + ] + ), + ]) +} + +WalletView.prototype.render = function () { + const { + responsiveDisplayClassname, + selectedAddress, + selectedIdentity, + keyrings, + showAccountDetailModal, + hideSidebar, + showAddTokenPage, + } = this.props + // temporary logs + fake extra wallets + // console.log('walletview, selectedAccount:', selectedAccount) + + const keyring = keyrings.find((kr) => { + return kr.accounts.includes(selectedAddress) || + kr.accounts.includes(selectedIdentity.address) + }) + + const type = keyring.type + const isLoose = type !== 'HD Key Tree' + + return h('div.wallet-view.flex-column' + (responsiveDisplayClassname || ''), { + style: {}, + }, [ + + // TODO: Separate component: wallet account details + h('div.flex-column.wallet-view-account-details', { + style: {}, + }, [ + h('div.wallet-view__sidebar-close', { + onClick: hideSidebar, + }), + + h('div.wallet-view__keyring-label', isLoose ? 'IMPORTED' : ''), + + h('div.flex-column.flex-center.wallet-view__name-container', { + style: { margin: '0 auto' }, + onClick: showAccountDetailModal, + }, [ + h(Identicon, { + diameter: 54, + address: selectedAddress, + }), + + h('span.account-name', { + style: {}, + }, [ + selectedIdentity.name, + ]), + + h('button.wallet-view__details-button', 'DETAILS'), + ]), + ]), + + + h('div.wallet-view__address', { + onClick: () => { + copyToClipboard(selectedAddress) + this.setState({ hasCopied: true }) + setTimeout(() => this.setState({ hasCopied: false }), 3000) + }, + }, [ + this.state.hasCopied && 'Copied to Clipboard', + !this.state.hasCopied && `${selectedAddress.slice(0, 4)}...${selectedAddress.slice(-4)}`, + h('i.fa.fa-clipboard', { style: { marginLeft: '8px' } }), + ]), + + this.renderWalletBalance(), + + h(TokenList), + + h('button.wallet-view__add-token-button', { + onClick: () => { + showAddTokenPage() + hideSidebar() + }, + }, 'Add Token'), + ]) +} + +// TODO: Extra wallets, for dev testing. Remove when PRing to master. +// const extraWallet = h('div.flex-column.wallet-balance-wrapper', {}, [ +// h('div.wallet-balance', {}, [ +// h(BalanceComponent, { +// balanceValue: selectedAccount.balance, +// style: {}, +// }), +// ]), +// ]) diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index cb1afedfe..9f273aaec 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -3,16 +3,24 @@ const Component = require('react').Component const h = require('react-hyperscript') const connect = require('react-redux').connect const actions = require('./actions') -const NetworkIndicator = require('./components/network') const txHelper = require('../lib/tx-helper') -const isPopupOrNotification = require('../../app/scripts/lib/is-popup-or-notification') const PendingTx = require('./components/pending-tx') -const PendingMsg = require('./components/pending-msg') -const PendingPersonalMsg = require('./components/pending-personal-msg') -const PendingTypedMsg = require('./components/pending-typed-msg') +const SignatureRequest = require('./components/signature-request') +// const PendingMsg = require('./components/pending-msg') +// const PendingPersonalMsg = require('./components/pending-personal-msg') +// const PendingTypedMsg = require('./components/pending-typed-msg') const Loading = require('./components/loading') +// const contentDivider = h('div', { +// style: { +// marginLeft: '16px', +// marginRight: '16px', +// height:'1px', +// background:'#E7E7E7', +// }, +// }) + module.exports = connect(mapStateToProps)(ConfirmTxScreen) function mapStateToProps (state) { @@ -42,91 +50,71 @@ function ConfirmTxScreen () { ConfirmTxScreen.prototype.render = function () { const props = this.props - const { network, provider, unapprovedTxs, currentCurrency, computedBalances, - unapprovedMsgs, unapprovedPersonalMsgs, unapprovedTypedMessages, conversionRate, blockGasLimit } = props + const { + network, + unapprovedTxs, + currentCurrency, + unapprovedMsgs, + unapprovedPersonalMsgs, + unapprovedTypedMessages, + conversionRate, + blockGasLimit, + // provider, + // computedBalances, + } = props var unconfTxList = txHelper(unapprovedTxs, unapprovedMsgs, unapprovedPersonalMsgs, unapprovedTypedMessages, network) var txData = unconfTxList[props.index] || {} var txParams = txData.params || {} - var isNotification = isPopupOrNotification() === 'notification' + + // var isNotification = isPopupOrNotification() === 'notification' + /* + Client is using the flag above to render the following in conf screen + // subtitle and nav + h('.section-title.flex-row.flex-center', [ + !isNotification ? h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { + onClick: this.goHome.bind(this), + }) : null, + h('h2.page-subtitle', 'Confirm Transaction'), + isNotification ? h(NetworkIndicator, { + network: network, + provider: provider, + }) : null, + ]), + */ log.info(`rendering a combined ${unconfTxList.length} unconf msg & txs`) - if (unconfTxList.length === 0) return h(Loading, { isLoading: true }) - - const unconfTxListLength = unconfTxList.length - - return ( - - h('.flex-column.flex-grow', [ - - // subtitle and nav - h('.section-title.flex-row.flex-center', [ - !isNotification ? h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { - onClick: this.goHome.bind(this), - }) : null, - h('h2.page-subtitle', 'Confirm Transaction'), - isNotification ? h(NetworkIndicator, { - network: network, - provider: provider, - }) : null, - ]), - - h('h3', { - style: { - alignSelf: 'center', - display: unconfTxList.length > 1 ? 'block' : 'none', - }, - }, [ - h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { - style: { - display: props.index === 0 ? 'none' : 'inline-block', - }, - onClick: () => props.dispatch(actions.previousTx()), - }), - ` ${props.index + 1} of ${unconfTxList.length} `, - h('i.fa.fa-arrow-right.fa-lg.cursor-pointer', { - style: { - display: props.index + 1 === unconfTxList.length ? 'none' : 'inline-block', - }, - onClick: () => props.dispatch(actions.nextTx()), - }), - ]), - - warningIfExists(props.warning), - - currentTxView({ - // Properties - txData: txData, - key: txData.id, - selectedAddress: props.selectedAddress, - accounts: props.accounts, - identities: props.identities, - conversionRate, - currentCurrency, - blockGasLimit, - unconfTxListLength, - computedBalances, - // Actions - buyEth: this.buyEth.bind(this, txParams.from || props.selectedAddress), - sendTransaction: this.sendTransaction.bind(this), - cancelTransaction: this.cancelTransaction.bind(this, txData), - cancelAllTransactions: this.cancelAllTransactions.bind(this, unconfTxList), - signMessage: this.signMessage.bind(this, txData), - signPersonalMessage: this.signPersonalMessage.bind(this, txData), - signTypedMessage: this.signTypedMessage.bind(this, txData), - cancelMessage: this.cancelMessage.bind(this, txData), - cancelPersonalMessage: this.cancelPersonalMessage.bind(this, txData), - cancelTypedMessage: this.cancelTypedMessage.bind(this, txData), - }), - ]) - ) + if (unconfTxList.length === 0) return h(Loading) + + return currentTxView({ + // Properties + txData: txData, + key: txData.id, + selectedAddress: props.selectedAddress, + accounts: props.accounts, + identities: props.identities, + conversionRate, + currentCurrency, + blockGasLimit, + // Actions + buyEth: this.buyEth.bind(this, txParams.from || props.selectedAddress), + sendTransaction: this.sendTransaction.bind(this), + cancelTransaction: this.cancelTransaction.bind(this, txData), + signMessage: this.signMessage.bind(this, txData), + signPersonalMessage: this.signPersonalMessage.bind(this, txData), + signTypedMessage: this.signTypedMessage.bind(this, txData), + cancelMessage: this.cancelMessage.bind(this, txData), + cancelPersonalMessage: this.cancelPersonalMessage.bind(this, txData), + cancelTypedMessage: this.cancelTypedMessage.bind(this, txData), + }) + } function currentTxView (opts) { log.info('rendering current tx view') const { txData } = opts - const { txParams, msgParams, type } = txData + const { txParams, msgParams } = txData if (txParams) { log.debug('txParams detected, rendering pending tx') @@ -134,17 +122,20 @@ function currentTxView (opts) { } else if (msgParams) { log.debug('msgParams detected, rendering pending msg') - if (type === 'eth_sign') { - log.debug('rendering eth_sign message') - return h(PendingMsg, opts) - } else if (type === 'personal_sign') { - log.debug('rendering personal_sign message') - return h(PendingPersonalMsg, opts) - } else if (type === 'eth_signTypedData') { - log.debug('rendering eth_signTypedData message') - return h(PendingTypedMsg, opts) - } + return h(SignatureRequest, opts) + + // if (type === 'eth_sign') { + // log.debug('rendering eth_sign message') + // return h(PendingMsg, opts) + // } else if (type === 'personal_sign') { + // log.debug('rendering personal_sign message') + // return h(PendingPersonalMsg, opts) + // } else if (type === 'eth_signTypedData') { + // log.debug('rendering eth_signTypedData message') + // return h(PendingTypedMsg, opts) + // } } + return h(Loading) } ConfirmTxScreen.prototype.buyEth = function (address, event) { @@ -222,14 +213,14 @@ ConfirmTxScreen.prototype.goHome = function (event) { this.props.dispatch(actions.goHome()) } -function warningIfExists (warning) { - if (warning && - // Do not display user rejections on this screen: - warning.indexOf('User denied transaction signature') === -1) { - return h('.error', { - style: { - margin: 'auto', - }, - }, warning) - } -} +// function warningIfExists (warning) { +// if (warning && +// // Do not display user rejections on this screen: +// warning.indexOf('User denied transaction signature') === -1) { +// return h('.error', { +// style: { +// margin: 'auto', +// }, +// }, warning) +// } +// } diff --git a/ui/app/conversion-util.js b/ui/app/conversion-util.js new file mode 100644 index 000000000..ee42ebea1 --- /dev/null +++ b/ui/app/conversion-util.js @@ -0,0 +1,221 @@ +/* Currency Conversion Utility +* This utility function can be used for converting currency related values within metamask. +* The caller should be able to pass it a value, along with information about the value's +* numeric base, denomination and currency, and the desired numeric base, denomination and +* currency. It should return a single value. +* +* @param {(number | string | BN)} value The value to convert. +* @param {Object} [options] Options to specify details of the conversion +* @param {string} [options.fromCurrency = 'ETH' | 'USD'] The currency of the passed value +* @param {string} [options.toCurrency = 'ETH' | 'USD'] The desired currency of the result +* @param {string} [options.fromNumericBase = 'hex' | 'dec' | 'BN'] The numeric basic of the passed value. +* @param {string} [options.toNumericBase = 'hex' | 'dec' | 'BN'] The desired numeric basic of the result. +* @param {string} [options.fromDenomination = 'WEI'] The denomination of the passed value +* @param {number} [options.numberOfDecimals] The desired number of in the result +* @param {number} [options.conversionRate] The rate to use to make the fromCurrency -> toCurrency conversion +* @returns {(number | string | BN)} +* +* The utility passes value along with the options as a single object to the `converter` function. +* `converter` uses Ramda.js to apply a composition of conditional setters to the `value` property, depending +* on the accompanying options. Some of these conditional setters are selected via key-value maps, where +* the keys are specified in the options parameters and the values are setter functions. +*/ + +const BigNumber = require('bignumber.js') +const ethUtil = require('ethereumjs-util') +const BN = ethUtil.BN +const R = require('ramda') +const { stripHexPrefix } = require('ethereumjs-util') + +BigNumber.config({ + ROUNDING_MODE: BigNumber.ROUND_HALF_DOWN, +}) + +// Big Number Constants +const BIG_NUMBER_WEI_MULTIPLIER = new BigNumber('1000000000000000000') +const BIG_NUMBER_GWEI_MULTIPLIER = new BigNumber('1000000000') + +// Individual Setters +const convert = R.invoker(1, 'times') +const round = R.invoker(2, 'round')(R.__, BigNumber.ROUND_HALF_DOWN) +const invertConversionRate = conversionRate => () => new BigNumber(1.0).div(conversionRate) +const decToBigNumberViaString = n => R.pipe(String, toBigNumber['dec']) + +// Setter Maps +const toBigNumber = { + hex: n => new BigNumber(stripHexPrefix(n), 16), + dec: n => new BigNumber(n, 10), + BN: n => new BigNumber(n.toString(16), 16), +} +const toNormalizedDenomination = { + WEI: bigNumber => bigNumber.div(BIG_NUMBER_WEI_MULTIPLIER), + GWEI: bigNumber => bigNumber.div(BIG_NUMBER_GWEI_MULTIPLIER), +} +const toSpecifiedDenomination = { + WEI: bigNumber => bigNumber.times(BIG_NUMBER_WEI_MULTIPLIER).round(), + GWEI: bigNumber => bigNumber.times(BIG_NUMBER_GWEI_MULTIPLIER).round(9), +} +const baseChange = { + hex: n => n.toString(16), + dec: n => Number(n).toString(10), + BN: n => new BN(n.toString(16)), +} + +// Predicates +const fromAndToCurrencyPropsNotEqual = R.compose( + R.not, + R.eqBy(R.__, 'fromCurrency', 'toCurrency'), + R.flip(R.prop) +) + +// Lens +const valuePropertyLens = R.over(R.lensProp('value')) +const conversionRateLens = R.over(R.lensProp('conversionRate')) + +// conditional conversionRate setting wrapper +const whenPredSetCRWithPropAndSetter = (pred, prop, setter) => R.when( + pred, + R.converge( + conversionRateLens, + [R.pipe(R.prop(prop), setter), R.identity] + ) +) + +// conditional 'value' setting wrappers +const whenPredSetWithPropAndSetter = (pred, prop, setter) => R.when( + pred, + R.converge( + valuePropertyLens, + [R.pipe(R.prop(prop), setter), R.identity] + ) +) +const whenPropApplySetterMap = (prop, setterMap) => whenPredSetWithPropAndSetter( + R.prop(prop), + prop, + R.prop(R.__, setterMap) +) + +// Conversion utility function +const converter = R.pipe( + whenPredSetCRWithPropAndSetter(R.prop('conversionRate'), 'conversionRate', decToBigNumberViaString), + whenPredSetCRWithPropAndSetter(R.prop('invertConversionRate'), 'conversionRate', invertConversionRate), + whenPropApplySetterMap('fromNumericBase', toBigNumber), + whenPropApplySetterMap('fromDenomination', toNormalizedDenomination), + whenPredSetWithPropAndSetter(fromAndToCurrencyPropsNotEqual, 'conversionRate', convert), + whenPropApplySetterMap('toDenomination', toSpecifiedDenomination), + whenPredSetWithPropAndSetter(R.prop('numberOfDecimals'), 'numberOfDecimals', round), + whenPropApplySetterMap('toNumericBase', baseChange), + R.view(R.lensProp('value')) +) + +const conversionUtil = (value, { + fromCurrency = null, + toCurrency = fromCurrency, + fromNumericBase, + toNumericBase, + fromDenomination, + toDenomination, + numberOfDecimals, + conversionRate, + invertConversionRate, +}) => converter({ + fromCurrency, + toCurrency, + fromNumericBase, + toNumericBase, + fromDenomination, + toDenomination, + numberOfDecimals, + conversionRate, + invertConversionRate, + value: value || '0', +}) + +const addCurrencies = (a, b, options = {}) => { + const { + aBase, + bBase, + ...conversionOptions + } = options + const value = (new BigNumber(a, aBase)).add(b, bBase) + + return converter({ + value, + ...conversionOptions, + }) +} + +const subtractCurrencies = (a, b, options = {}) => { + const { + aBase, + bBase, + ...conversionOptions + } = options + const value = (new BigNumber(a, aBase)).minus(b, bBase) + + return converter({ + value, + ...conversionOptions, + }) +} + +const multiplyCurrencies = (a, b, options = {}) => { + const { + multiplicandBase, + multiplierBase, + ...conversionOptions + } = options + + const bigNumberA = new BigNumber(String(a), multiplicandBase) + const bigNumberB = new BigNumber(String(b), multiplierBase) + + const value = bigNumberA.times(bigNumberB) + + return converter({ + value, + ...conversionOptions, + }) +} + +const conversionGreaterThan = ( + { ...firstProps }, + { ...secondProps }, +) => { + const firstValue = converter({ ...firstProps }) + const secondValue = converter({ ...secondProps }) + + return firstValue.gt(secondValue) +} + +const conversionGTE = ( + { ...firstProps }, + { ...secondProps }, +) => { + const firstValue = converter({ ...firstProps }) + const secondValue = converter({ ...secondProps }) + return firstValue.greaterThanOrEqualTo(secondValue) +} + +const conversionLTE = ( + { ...firstProps }, + { ...secondProps }, +) => { + const firstValue = converter({ ...firstProps }) + const secondValue = converter({ ...secondProps }) + return firstValue.lessThanOrEqualTo(secondValue) +} + +const toNegative = (n, options = {}) => { + return multiplyCurrencies(n, -1, options) +} + +module.exports = { + conversionUtil, + addCurrencies, + multiplyCurrencies, + conversionGreaterThan, + conversionGTE, + conversionLTE, + toNegative, + subtractCurrencies, +} diff --git a/ui/app/css/index.scss b/ui/app/css/index.scss new file mode 100644 index 000000000..445c819ff --- /dev/null +++ b/ui/app/css/index.scss @@ -0,0 +1,14 @@ +/* + ITCSS + + http://www.creativebloq.com/web-design/manage-large-css-projects-itcss-101517528 + https://www.xfive.co/blog/itcss-scalable-maintainable-css-architecture/ + */ + +@import './itcss/settings/index.scss'; +@import './itcss/tools/index.scss'; +@import './itcss/generic/index.scss'; +@import './itcss/base/index.scss'; +@import './itcss/objects/index.scss'; +@import './itcss/components/index.scss'; +@import './itcss/trumps/index.scss'; diff --git a/ui/app/css/itcss/base/index.scss b/ui/app/css/itcss/base/index.scss new file mode 100644 index 000000000..baa6ea037 --- /dev/null +++ b/ui/app/css/itcss/base/index.scss @@ -0,0 +1 @@ +// Base diff --git a/ui/app/css/itcss/components/account-dropdown-mini.scss b/ui/app/css/itcss/components/account-dropdown-mini.scss new file mode 100644 index 000000000..996993db7 --- /dev/null +++ b/ui/app/css/itcss/components/account-dropdown-mini.scss @@ -0,0 +1,48 @@ +.account-dropdown-mini { + height: 22px; + background-color: $white; + font-family: Roboto; + line-height: 16px; + font-size: 12px; + width: 124px; + + &__close-area { + position: fixed; + top: 0; + left: 0; + z-index: 1000; + width: 100%; + height: 100%; + } + + &__list { + z-index: 1050; + position: absolute; + height: 180px; + width: 96pxpx; + border: 1px solid $geyser; + border-radius: 4px; + background-color: $white; + box-shadow: 0 3px 6px 0 rgba(0 ,0 ,0 ,.11); + overflow-y: scroll; + } + + .account-list-item { + margin-top: 6px; + } + + .account-list-item__account-name { + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + width: 80px; + } + + .account-list-item__top-row { + margin: 0; + } + + .account-list-item__icon { + position: initial; + } +}
\ No newline at end of file diff --git a/ui/app/css/itcss/components/account-dropdown.scss b/ui/app/css/itcss/components/account-dropdown.scss new file mode 100644 index 000000000..725da9d39 --- /dev/null +++ b/ui/app/css/itcss/components/account-dropdown.scss @@ -0,0 +1,83 @@ +.account-dropdown-name { + font-family: Roboto; +} + +.account-dropdown-balance { + color: $dusty-gray; + line-height: 19px; +} + +.account-dropdown-edit-button { + color: $dusty-gray; + font-family: Roboto; + + &:hover { + color: $white; + } +} + +.account-list-item { + &__top-row { + display: flex; + margin-top: 10px; + margin-left: 8px; + position: relative; + } + + &__account-balances { + height: auto; + border: none; + background-color: transparent; + color: #9b9b9b; + margin-left: 34px; + margin-top: 4px; + position: relative; + } + + &__account-name { + font-size: 16px; + margin-left: 8px; + } + + &__icon { + position: absolute; + right: 12px; + top: 1px; + } + + &__account-primary-balance, + &__account-secondary-balance { + font-family: Roboto; + line-height: 16px; + font-size: 12px; + font-weight: 300; + } + + &__account-primary-balance { + color: $scorpion; + border: none; + outline: 0 !important; + } + + &__account-secondary-balance { + color: $dusty-gray; + } + + &__account-address { + margin-left: 35px; + width: 80%; + overflow: hidden; + text-overflow: ellipsis; + } + + &__dropdown { + &:hover { + background: rgba($alto, .2); + cursor: pointer; + + input { + background: rgba($alto, .1); + } + } + } +} diff --git a/ui/app/css/itcss/components/account-menu.scss b/ui/app/css/itcss/components/account-menu.scss new file mode 100644 index 000000000..e16d2e024 --- /dev/null +++ b/ui/app/css/itcss/components/account-menu.scss @@ -0,0 +1,132 @@ +.account-menu { + position: fixed; + z-index: 100; + top: 58px; + width: 310px; + + @media screen and (max-width: 575px) { + right: calc(((100vw - 100%) / 2) + 8px); + } + + @media screen and (min-width: 576px) { + right: calc((100vw - 85vw) / 2); + } + + @media screen and (min-width: 769px) { + right: calc((100vw - 80vw) / 2); + } + + @media screen and (min-width: 1281px) { + right: calc((100vw - 65vw) / 2); + } + + &__icon { + margin-left: 20px; + cursor: pointer; + } + + &__header { + display: flex; + flex-flow: row nowrap; + justify-content: space-between; + align-items: center; + } + + &__logout-button { + border: 1px solid $dusty-gray; + background-color: transparent; + color: $white; + border-radius: 4px; + font-size: 12px; + line-height: 23px; + padding: 0 24px; + font-weight: 300; + } + + img { + width: 16px; + height: 16px; + } + + &__accounts { + display: flex; + flex-flow: column nowrap; + overflow-y: auto; + max-height: 240px; + position: relative; + z-index: 200; + + &::-webkit-scrollbar { + display: none; + } + + @media screen and (max-width: 575px) { + max-height: 215px; + } + + .keyring-label { + margin-top: 5px; + background-color: $black; + color: $dusty-gray; + } + } + + &__account { + display: flex; + flex-flow: row nowrap; + padding: 16px 14px; + flex: 0 0 auto; + + @media screen and (max-width: 575px) { + padding: 12px 14px; + } + } + + &__account-info { + flex: 1 0 auto; + display: flex; + flex-flow: column nowrap; + padding-top: 4px; + } + + &__check-mark { + width: 14px; + margin-right: 12px; + flex: 0 0 auto; + } + + &__check-mark-icon { + background-image: url("images/check-white.svg"); + height: 18px; + width: 18px; + background-repeat: no-repeat; + background-position: center; + background-size: contain; + margin: 3px 0; + } + + .identicon { + margin: 0 12px 0 0; + flex: 0 0 auto; + } + + &__name { + color: $white; + font-size: 18px; + font-weight: 300; + line-height: 16px; + } + + &__balance { + color: $dusty-gray; + font-size: 14px; + line-height: 19px; + } + + &__action { + font-size: 16px; + line-height: 18px; + font-weight: 300; + cursor: pointer; + } +} diff --git a/ui/app/css/itcss/components/add-token.scss b/ui/app/css/itcss/components/add-token.scss new file mode 100644 index 000000000..5f6d0fcff --- /dev/null +++ b/ui/app/css/itcss/components/add-token.scss @@ -0,0 +1,341 @@ +.add-token { + width: 498px; + display: flex; + flex-flow: column nowrap; + align-items: center; + position: relative; + z-index: 12; + font-family: 'DIN Next Light'; + + &__wrapper { + background-color: $white; + box-shadow: 0 2px 4px 0 rgba($black, .08); + display: flex; + flex-flow: column nowrap; + align-items: center; + flex: 0 0 auto; + } + + &__title-container { + display: flex; + flex-flow: column nowrap; + align-items: center; + padding: 30px 60px 12px; + border-bottom: 1px solid $gallery; + flex: 0 0 auto; + } + + &__title { + color: $scorpion; + font-size: 20px; + line-height: 26px; + text-align: center; + font-weight: 600; + margin-bottom: 12px; + } + + &__description { + text-align: center; + } + + &__description + &__description { + margin-top: 24px; + } + + &__confirmation-description { + margin: 12px 0; + } + + &__content-container { + width: 100%; + border-bottom: 1px solid $gallery; + } + + &__input-container { + padding: 11px 0; + width: 263px; + margin: 0 auto; + position: relative; + } + + &__search-input-error-message { + position: absolute; + bottom: -10px; + font-size: 12px; + width: 100%; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + color: $red; + } + + &__input { + width: 100%; + border: 2px solid $gallery; + border-radius: 4px; + padding: 5px 15px; + font-size: 14px; + line-height: 19px; + + &::placeholder { + color: $silver; + } + } + + &__footers { + width: 100%; + } + + &__add-custom { + color: $scorpion; + font-size: 18px; + line-height: 24px; + text-align: center; + padding: 12px 0; + font-weight: 600; + cursor: pointer; + + &:hover { + background-color: rgba(0, 0, 0, .05); + } + + &:active { + background-color: rgba(0, 0, 0, .1); + } + + .fa { + position: absolute; + right: 24px; + font-size: 24px; + line-height: 24px; + } + } + + &__add-custom-form { + display: flex; + flex-flow: column nowrap; + margin: 8px 0 51px; + } + + &__add-custom-field { + width: 290px; + margin: 0 auto; + position: relative; + + &--error { + .add-token__add-custom-input { + border-color: $red; + } + } + } + + &__add-custom-error-message { + position: absolute; + bottom: -21px; + font-size: 12px; + width: 100%; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + color: $red; + } + + &__add-custom-label { + font-size: 16px; + line-height: 21px; + margin-bottom: 8px; + } + + &__add-custom-input { + width: 100%; + border: 1px solid $silver; + padding: 5px 15px; + font-size: 14px; + line-height: 19px; + + &::placeholder { + color: $silver; + } + } + + &__add-custom-field + &__add-custom-field { + margin-top: 21px; + } + + &__buttons { + display: flex; + flex-flow: column nowrap; + margin: 30px 0 51px; + flex: 0 0 auto; + } + + &__token-icons-container { + display: flex; + flex-flow: row wrap; + } + + &__token-wrapper { + transition: 200ms ease-in-out; + display: flex; + flex-flow: row nowrap; + flex: 0 0 42.5%; + align-items: center; + padding: 12px; + margin: 2.5%; + box-sizing: border-box; + border-radius: 10px; + cursor: pointer; + border: 2px solid transparent; + position: relative; + + &:hover { + border: 2px solid rgba($malibu-blue, .5); + } + + &--selected { + border: 2px solid $malibu-blue !important; + } + + &--disabled { + opacity: .4; + pointer-events: none; + } + } + + &__token-data { + align-self: flex-start; + } + + &__token-name { + font-size: 14px; + line-height: 19px; + } + + &__token-symbol { + font-size: 22px; + line-height: 29px; + font-weight: 600; + } + + &__token-icon { + width: 60px; + height: 60px; + background-repeat: no-repeat; + background-size: contain; + background-position: center; + border-radius: 50%; + background-color: $white; + box-shadow: 0 2px 4px 0 rgba($black, .24); + margin-right: 12px; + flex: 0 0 auto; + } + + &__token-message { + position: absolute; + color: $caribbean-green; + font-size: 11px; + bottom: 0; + left: 85px; + } + + &__confirmation-token-list { + display: flex; + flex-flow: column nowrap; + + .token-balance { + display: flex; + flex-flow: row nowrap; + align-items: flex-start; + + &__amount { + color: $scorpion; + font-size: 43px; + font-weight: 300; + line-height: 43px; + margin-right: 8px; + } + + &__symbol { + color: $scorpion; + font-size: 16px; + line-height: 24px; + } + } + } + + &__confirmation-title { + padding: 30px 120px 12px; + + @media screen and (max-width: $break-small) { + padding: 20px 0; + width: 100%; + } + } + + &__confirmation-content { + padding-bottom: 60px; + } + + &__confirmation-token-list-item { + display: flex; + flex-flow: row nowrap; + margin: 0 auto; + align-items: center; + } + + &__confirmation-token-list-item + &__confirmation-token-list-item { + margin-top: 30px; + } + + &__confirmation-token-icon { + margin-right: 18px; + } + + @media screen and (max-width: $break-small) { + top: 0; + width: 100%; + overflow: hidden; + height: 100%; + + &__wrapper { + box-shadow: none !important; + flex: 1 1 auto; + width: 100%; + overflow-y: auto; + } + + &__footers { + border-bottom: 1px solid $gallery; + } + + &__token-icon { + width: 50px; + height: 50px; + } + + &__token-symbol { + font-size: 18px; + line-height: 24px; + } + + &__token-name { + font-size: 12px; + line-height: 16px; + } + + &__buttons { + flex-flow: row nowrap; + width: 100%; + align-items: center; + justify-content: center; + padding: 12px 0; + margin: 0; + border-top: 1px solid $gallery; + + button { + flex: 1 0 auto; + margin: 0 12px; + } + } + } +} diff --git a/ui/app/css/itcss/components/buttons.scss b/ui/app/css/itcss/components/buttons.scss new file mode 100644 index 000000000..8ba084b4a --- /dev/null +++ b/ui/app/css/itcss/components/buttons.scss @@ -0,0 +1,108 @@ +/* + Buttons + */ + +.btn-green { + background-color: #02c9b1; // TODO: reusable color in colors.css +} + +button.btn-clear { + background: $white; + border: 1px solid; +} + +// No longer used in flat design, remove when modal buttons done +// div.wallet-btn { +// border: 1px solid rgb(91, 93, 103); +// border-radius: 2px; +// height: 30px; +// width: 75px; +// font-size: 0.8em; +// text-align: center; +// line-height: 25px; +// } + +// .btn-red { +// background: rgba(254, 35, 17, 1); +// box-shadow: 0px 3px 6px rgba(254, 35, 17, 0.36); +// } + +button[disabled], +input[type="submit"][disabled] { + cursor: not-allowed; + opacity: .5; + // background: rgba(197, 197, 197, 1); + // box-shadow: 0 3px 6px rgba(197, 197, 197, .36); +} + +// button.spaced { +// margin: 2px; +// } + +// button:not([disabled]):hover, input[type="submit"]:not([disabled]):hover { +// transform: scale(1.1); +// } +// button:not([disabled]):active, input[type="submit"]:not([disabled]):active { +// transform: scale(0.95); +// } + +button.primary { + padding: 8px 12px; + background: #f7861c; + box-shadow: 0 3px 6px rgba(247, 134, 28, .36); + color: $white; + font-size: 1.1em; + font-family: Roboto; + text-transform: uppercase; +} + +.btn-light { + padding: 8px 12px; + // background: #FFFFFF; // $bg-white + box-shadow: 0 3px 6px rgba(247, 134, 28, .36); + color: #585d67; // TODO: make reusable light button color + font-size: 1.1em; + font-family: Roboto; + text-transform: uppercase; + text-align: center; + line-height: 20px; + border-radius: 2px; + border: 1px solid #979797; // #TODO: make reusable light border color + opacity: .5; +} + +// TODO: cleanup: not used anywhere +button.btn-thin { + border: 1px solid; + border-color: #4d4d4d; + color: #4d4d4d; + background: rgb(255, 174, 41); + border-radius: 4px; + min-width: 200px; + margin: 12px 0; + padding: 6px; + font-size: 13px; +} + +.btn-secondary { + border: 1px solid #979797; + border-radius: 2px; + background-color: $white; + font-size: 16px; + line-height: 24px; + padding: 16px 42px; + + &[disabled] { + background-color: $white !important; + opacity: .5; + } +} + +.btn-tertiary { + border: 1px solid transparent; + border-radius: 2px; + background-color: transparent; + font-size: 16px; + line-height: 24px; + padding: 16px 42px; +} diff --git a/ui/app/css/itcss/components/confirm.scss b/ui/app/css/itcss/components/confirm.scss new file mode 100644 index 000000000..4a8232e39 --- /dev/null +++ b/ui/app/css/itcss/components/confirm.scss @@ -0,0 +1,330 @@ +.confirm-screen-container { + position: relative; + align-items: center; + font-family: Roboto; + flex: 0 0 auto; + flex-flow: column nowrap; + box-shadow: 0 2px 4px 0 rgba($black, .08); + border-radius: 8px; + + @media screen and (max-width: 575px) { + width: 100%; + } + + @media screen and (min-width: 576px) { + // top: -26px; + } +} + +.notification { + .confirm-screen-wrapper { + + @media screen and (max-width: $break-small) { + height: calc(100vh - 85px); + } + } +} + +.confirm-screen-wrapper { + height: 100%; + width: 380px; + background-color: $white; + display: flex; + flex-flow: column nowrap; + z-index: 25; + align-items: center; + font-family: Roboto; + position: relative; + overflow-y: auto; + overflow-x: hidden; + border-top-left-radius: 8px; + border-top-right-radius: 8px; + + @media screen and (max-width: $break-small) { + width: 100%; + overflow-x: hidden; + overflow-y: auto; + top: 0; + box-shadow: none; + height: calc(100vh - 58px - 85px); + border-top-left-radius: 0; + border-top-right-radius: 0; + } +} + +.confirm-screen-wrapper > .confirm-screen-total-box { + margin-left: 10px; + margin-right: 10px; +} + +.confirm-screen-wrapper > .confirm-memo-wrapper { + margin: 0; +} + +.confirm-screen-header { + height: 88px; + background-color: $athens-grey; + position: relative; + display: flex; + justify-content: center; + align-items: center; + font-size: 22px; + line-height: 29px; + width: 100%; + padding: 25px 0; + flex: 0 0 auto; + + @media screen and (max-width: $break-small) { + font-size: 20px; + } +} + +.confirm-screen-header-tip { + height: 25px; + width: 25px; + background: $athens-grey; + position: absolute; + transform: rotate(45deg); + top: 71px; + left: 0; + right: 0; + margin: 0 auto; +} + +.confirm-screen-title { + line-height: 27px; + + @media screen and (max-width: $break-small) { + margin-left: 22px; + margin-right: 8px; + } +} + +.confirm-screen-back-button { + background: transparent; + border: 1px solid $curious-blue; + left: 24px; + position: absolute; + text-align: center; + color: $curious-blue; + padding: 6px 13px 7px 12px; + border-radius: 2px; + height: 30px; + width: 54px; + + @media screen and (max-width: $break-small) { + margin-right: 12px; + } +} + +.confirm-screen-account-wrapper { + display: flex; + flex-direction: column; + align-items: center; +} + +.confirm-screen-account-name { + margin-top: 12px; + font-size: 14px; + line-height: 19px; + color: $scorpion; + text-align: center; +} + +.confirm-screen-row-info { + font-size: 16px; + line-height: 21px; +} + +.confirm-screen-account-number { + font-size: 10px; + line-height: 16px; + color: $dusty-gray; + text-align: center; + height: 16px; +} + +.confirm-send-ether, +.confirm-send-token { + i.fa-arrow-right { + align-self: start; + margin: 24px 14px 0 !important; + } +} + +.confirm-screen-identicons { + margin-top: 24px; + flex: 0 0 auto; + + i.fa-arrow-right { + align-self: start; + margin: 42px 14px 0; + } + + i.fa-file-text-o { + font-size: 60px; + margin: 16px 8px 0 8px; + text-align: center; + } +} + +.confirm-screen-sending-to-message { + text-align: center; + font-size: 16px; + margin-top: 30px; + font-family: 'DIN NEXT Light'; +} + +.confirm-screen-send-amount { + color: $scorpion; + margin-top: 12px; + text-align: center; + font-size: 40px; + font-weight: 300; + line-height: 53px; + flex: 0 0 auto; +} + +.confirm-screen-send-amount-currency { + font-size: 20px; + line-height: 20px; + text-align: center; + flex: 0 0 auto; +} + +.confirm-memo-wrapper { + min-height: 24px; + width: 100%; + border-bottom: 1px solid $alto; + flex: 0 0 auto; +} + +.confirm-screen-send-memo { + color: $scorpion; + font-size: 16px; + line-height: 19px; + font-weight: 400; +} + +.confirm-screen-label { + font-size: 18px; + line-height: 40px; + color: $scorpion; + text-align: left; +} + +section .confirm-screen-account-name, +section .confirm-screen-account-number, +.confirm-screen-row-info, +.confirm-screen-row-detail { + text-align: left; +} + +.confirm-screen-rows { + display: flex; + flex-flow: column nowrap; + width: 100%; + flex: 0 0 auto; +} + +.confirm-screen-section-column { + flex: .5; +} + +.confirm-screen-row { + display: flex; + flex-flow: row nowrap; + border-bottom: 1px solid $alto; + width: 100%; + align-items: center; + padding: 12px; + padding-left: 35px; + font-size: 16px; + line-height: 22px; + font-weight: 300; +} + +.confirm-screen-row-detail { + font-size: 12px; + line-height: 16px; + color: $dusty-gray; +} + +.confirm-screen-total-box { + background-color: $wild-sand; + padding: 20px; + padding-left: 35px; + border-bottom: 1px solid $alto; + + .confirm-screen-label { + line-height: 18px; + } + + .confirm-screen-row-detail { + color: $scorpion; + } + + &__subtitle { + font-size: 12px; + line-height: 22px; + } + + .confirm-screen-row-info { + font-size: 16px; + font-weight: 500; + line-height: 21px; + } +} + +.confirm-screen-confirm-button { + height: 62px; + border-radius: 2px; + background-color: #02c9b1; + font-size: 16px; + color: $white; + text-align: center; + font-family: Roboto; + padding-top: 15px; + padding-bottom: 15px; + border-width: 0; + box-shadow: none; + flex: 1 0 auto; + font-weight: 300; + margin: 0 8px; +} + +.btn-light.confirm-screen-cancel-button { + height: 62px; + background: none; + border: none; + opacity: 1; + font-family: Roboto; + border-width: 0; + padding-top: 15px; + padding-bottom: 15px; + font-size: 16px; + line-height: 32px; + box-shadow: none; + cursor: pointer; + flex: 1 0 auto; + font-weight: 300; + margin: 0 8px; +} + +#pending-tx-form { + flex: 1 0 auto; + position: relative; + display: flex; + flex-flow: row nowrap; + background-color: $white; + padding: 12px 18px; + border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; + width: 100%; + + @media screen and (max-width: $break-small) { + border-top: 1px solid $alto; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + } +} diff --git a/ui/app/css/itcss/components/currency-display.scss b/ui/app/css/itcss/components/currency-display.scss new file mode 100644 index 000000000..9459629b6 --- /dev/null +++ b/ui/app/css/itcss/components/currency-display.scss @@ -0,0 +1,56 @@ +.currency-display { + height: 54px; + width: 100%ß; + border: 1px solid $alto; + border-radius: 4px; + background-color: $white; + color: $dusty-gray; + font-family: Roboto; + font-size: 16px; + font-weight: 300; + padding: 8px 10px; + position: relative; + + &__primary-row { + display: flex; + } + + &__input { + color: $scorpion; + font-family: Roboto; + font-size: 16px; + line-height: 22px; + border: none; + outline: 0 !important; + max-width: 100%; + } + + &__primary-currency { + color: $scorpion; + font-weight: 400; + font-family: Roboto; + font-size: 16px; + line-height: 22px; + } + + &__converted-row { + display: flex; + } + + &__converted-value, + &__converted-currency { + color: $dusty-gray; + font-family: Roboto; + font-size: 12px; + line-height: 12px; + } + + &__input-wrapper { + position: relative; + display: flex; + } + + &__currency-symbol { + margin-top: 1px; + } +}
\ No newline at end of file diff --git a/ui/app/css/itcss/components/editable-label.scss b/ui/app/css/itcss/components/editable-label.scss new file mode 100644 index 000000000..c69ea1428 --- /dev/null +++ b/ui/app/css/itcss/components/editable-label.scss @@ -0,0 +1,35 @@ +.editable-label { + display: flex; + align-items: center; + justify-content: center; + position: relative; + + &__value { + max-width: 250px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + + &__input { + width: 250px; + font-size: 14px; + text-align: center; + border: 1px solid $alto; + + &--error { + border: 1px solid $monzo; + } + } + + &__icon-wrapper { + position: absolute; + margin-left: 10px; + left: 100%; + } + + &__icon { + cursor: pointer; + color: $dusty-gray; + } +} diff --git a/ui/app/css/itcss/components/footer.scss b/ui/app/css/itcss/components/footer.scss new file mode 100644 index 000000000..000a53eed --- /dev/null +++ b/ui/app/css/itcss/components/footer.scss @@ -0,0 +1,4 @@ +.app-footer { + padding-bottom: 10px; + align-items: center; +} diff --git a/ui/app/css/itcss/components/gas-slider.scss b/ui/app/css/itcss/components/gas-slider.scss new file mode 100644 index 000000000..c27a560bd --- /dev/null +++ b/ui/app/css/itcss/components/gas-slider.scss @@ -0,0 +1,51 @@ +.gas-slider { + position: relative; + width: 313px; + + &__input { + width: 317px; + margin-left: -2px; + z-index: 2; + } + + input[type=range] { + -webkit-appearance: none !important; + } + + input[type=range]::-webkit-slider-thumb { + -webkit-appearance: none !important; + height: 26px; + width: 26px; + border: 2px solid #B8B8B8; + background-color: #FFFFFF; + box-shadow: 0 2px 4px 0 rgba(0,0,0,0.08); + border-radius: 50%; + position: relative; + z-index: 10; + } + + &__bar { + height: 6px; + width: 313px; + background: $alto; + display: flex; + justify-content: space-between; + position: absolute; + top: 11px; + z-index: 0; + } + + &__low, &__high { + height: 6px; + width: 49px; + z-index: 1; + } + + &__low { + background-color: $crimson; + } + + &__high { + background-color: $caribbean-green; + } +}
\ No newline at end of file diff --git a/ui/app/css/itcss/components/header.scss b/ui/app/css/itcss/components/header.scss new file mode 100644 index 000000000..a6332f819 --- /dev/null +++ b/ui/app/css/itcss/components/header.scss @@ -0,0 +1,100 @@ +.app-header { + align-items: center; + visibility: visible; + background: $gallery; + position: relative; + z-index: $header-z-index; + display: flex; + flex-flow: column nowrap; + + @media screen and (max-width: 575px) { + padding: 12px; + width: 100%; + box-shadow: 0 0 0 1px rgba(0, 0, 0, .08); + z-index: $mobile-header-z-index; + } + + @media screen and (min-width: 576px) { + height: 75px; + justify-content: center; + + &::after { + content: ''; + position: absolute; + width: 100%; + height: 32px; + background: $gallery; + bottom: -32px; + } + } + + .metafox-icon { + cursor: pointer; + } +} + +.app-header-contents { + display: flex; + justify-content: space-between; + flex-flow: row nowrap; + width: 100%; + height: 6.9vh; + + @media screen and (max-width: 575px) { + height: 100%; + } + + @media screen and (min-width: 576px) { + width: 85vw; + } + + @media screen and (min-width: 769px) { + width: 80vw; + } + + @media screen and (min-width: 1281px) { + width: 65vw; + } +} + +.app-header h1 { + font-family: Roboto; + text-transform: uppercase; + font-weight: 400; + color: #22232c; // $shark + line-height: 29px; + + @media screen and (max-width: 575px) { + display: none; + } +} + +h2.page-subtitle { + text-transform: uppercase; + color: #aeaeae; + font-size: 1em; + margin: 12px; +} + +.network-component-wrapper { + display: flex; + flex-direction: row; + align-items: center; +} + +.left-menu-wrapper { + display: flex; + flex-direction: row; + align-items: center; + cursor: pointer; +} + +.header__right-actions { + display: flex; + flex-flow: row nowrap; + align-items: center; + + .identicon { + cursor: pointer; + } +} diff --git a/ui/app/css/itcss/components/hero-balance.scss b/ui/app/css/itcss/components/hero-balance.scss new file mode 100644 index 000000000..bdbdd2645 --- /dev/null +++ b/ui/app/css/itcss/components/hero-balance.scss @@ -0,0 +1,114 @@ +.hero-balance { + + @media screen and (max-width: $break-small) { + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: center; + margin: .3em .9em 0; + // height: 80vh; + // max-height: 225px; + flex: 0 0 auto; + } + + @media screen and (min-width: $break-large) { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: center; + margin: 2.8em 2.37em .8em; + } + + .balance-container { + display: flex; + margin: 0; + justify-content: flex-start; + align-items: center; + + @media screen and (max-width: $break-small) { + flex-direction: column; + flex: 0 0 auto; + } + + @media screen and (min-width: $break-large) { + flex-direction: row; + flex-grow: 3; + } + } + + .balance-display { + + @media screen and (max-width: $break-small) { + text-align: center; + + .token-amount { + font-size: 175%; + margin-top: 12.5%; + } + + .fiat-amount { + font-size: 115%; + margin-top: 8.5%; + color: #a0a0a0; + } + } + + @media screen and (min-width: $break-large) { + margin-left: 3%; + justify-content: flex-start; + align-items: flex-start; + + .token-amount { + font-size: 135%; + } + + .fiat-amount { + margin-top: .25%; + font-size: 105%; + } + } + } + + .balance-icon { + border-radius: 25px; + width: 45px; + height: 45px; + border: 1px solid $alto; + } + + .hero-balance-buttons { + + @media screen and (max-width: $break-small) { + width: 100%; + // height: 100px; // needed a round number to set the heights of the buttons inside + flex: 0 0 auto; + padding: 16px 0; + } + + @media screen and (min-width: $break-large) { + flex-grow: 2; + justify-content: flex-end; + } + + button.btn-clear { + background: $white; + border: 1px solid; + border-radius: 2px; + font-size: 12px; + + @media screen and (max-width: $break-small) { + border-color: $curious-blue; + color: $curious-blue; + height: 36px; + } + + @media screen and (min-width: $break-large) { + border-color: $curious-blue; + color: $curious-blue; + padding: 0; + width: 85px; + height: 34px; + } + } + } +} diff --git a/ui/app/css/itcss/components/index.scss b/ui/app/css/itcss/components/index.scss new file mode 100644 index 000000000..dfb4f23f0 --- /dev/null +++ b/ui/app/css/itcss/components/index.scss @@ -0,0 +1,53 @@ +@import './buttons.scss'; + +@import './header.scss'; + +@import './footer.scss'; + +@import './network.scss'; + +@import './modal.scss'; + +@import './newui-sections.scss'; + +@import './account-dropdown.scss'; + +@import './send.scss'; + +@import './confirm.scss'; + +@import './loading-overlay.scss'; + +// Balances +@import './hero-balance.scss'; + +@import './wallet-balance.scss'; + +// Tx List and Sections +@import './transaction-list.scss'; + +@import './sections.scss'; + +@import './token-list.scss'; + +@import './add-token.scss'; + +@import './currency-display.scss'; + +@import './account-menu.scss'; + +@import './menu.scss'; + +@import './gas-slider.scss'; + +@import './settings.scss'; + +@import './tab-bar.scss'; + +@import './simple-dropdown.scss'; + +@import './request-signature.scss'; + +@import './account-dropdown-mini.scss'; + +@import './editable-label.scss'; diff --git a/ui/app/css/itcss/components/loading-overlay.scss b/ui/app/css/itcss/components/loading-overlay.scss new file mode 100644 index 000000000..15009c1e6 --- /dev/null +++ b/ui/app/css/itcss/components/loading-overlay.scss @@ -0,0 +1,21 @@ +.loading-overlay { + left: 0px; + z-index: 50; + position: absolute; + flex-direction: column; + display: flex; + justify-content: center; + align-items: center; + width: 100%; + background: rgba(255, 255, 255, 0.8); + + @media screen and (max-width: 575px) { + margin-top: 56px; + height: calc(100% - 56px); + } + + @media screen and (min-width: 576px) { + margin-top: 75px; + height: calc(100% - 75px); + } +} diff --git a/ui/app/css/itcss/components/menu.scss b/ui/app/css/itcss/components/menu.scss new file mode 100644 index 000000000..eb92a1b70 --- /dev/null +++ b/ui/app/css/itcss/components/menu.scss @@ -0,0 +1,59 @@ +.menu { + border-radius: 4px; + background: rgba($black, .8); + box-shadow: rgba($black, .15) 0 2px 2px 2px; + min-width: 150px; + color: $white; + + &__item { + padding: 18px; + display: flex; + flex-flow: row nowrap; + align-items: center; + position: relative; + font-weight: 300; + z-index: 201; + + @media screen and (max-width: 575px) { + padding: 14px; + } + + &--clickable { + cursor: pointer; + + &:hover { + background-color: rgba($white, .05); + } + + &:active { + background-color: rgba($white, .1); + } + } + + &__icon { + height: 16px; + width: 16px; + margin-right: 14px; + } + + &__text { + font-size: 16px; + line-height: 21px; + } + } + + &__divider { + background-color: $scorpion; + width: 100%; + height: 1px; + } + + &__close-area { + position: fixed; + width: 100%; + height: 100%; + top: 0; + left: 0; + z-index: 100; + } +} diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss new file mode 100644 index 000000000..9b64564d6 --- /dev/null +++ b/ui/app/css/itcss/components/modal.scss @@ -0,0 +1,601 @@ +.modal > div:focus { + outline: none !important; +} + +// Buy Modal +.buy-modal-content { + flex-direction: column; + align-items: center; + justify-content: center; + text-align: center; + font-family: Roboto; + padding: 0 16px; +} + +.buy-modal-content-option { + cursor: pointer; + color: #5B5D67; +} + +.qr-ellip-address, .ellip-address { + width: 247px; + border: none; + font-family: Roboto; + font-size: 14px; +} + +@media screen and (max-width: 575px) { + .buy-modal-content-title-wrapper { + justify-content: space-around; + width: 100%; + height: 100px; + } + + .buy-modal-content-title { + font-size: 26px; + margin-top: 15px; + } + + .buy-modal-content-options { + flex-direction: column; + padding: 5% 33%; + } + + .buy-modal-content-footer { + text-transform: uppercase; + width: 100%; + height: 50px; + } + + div.buy-modal-content-option { + display: flex; + flex-direction: column; + width: 80vw; + height: 15vh; + margin: 10px; + text-align: center; + border-radius: 6px; + border: 1px solid $black; + padding: 0% 7%; + justify-content: center; + + div.buy-modal-content-option-title { + font-size: 20px; + } + + div.buy-modal-content-option-subtitle { + font-size: 16px; + } + } +} + +@media screen and (min-width: 576px) { + .buy-modal-content-title-wrapper { + justify-content: space-around; + width: 100%; + height: 110px; + } + + .buy-modal-content-title { + font-size: 26px; + margin-top: 15px; + } + + .buy-modal-content-footer { + text-transform: uppercase; + width: 100%; + height: 50px; + } + + .buy-modal-content-options { + flex-direction: row; + margin: 20px 0 60px; + } + + div.buy-modal-content-option { + display: flex; + flex-direction: column; + width: 20vw; + height: 120px; + text-align: center; + border-radius: 6px; + border: 1px solid $black; + margin: 0 8px; + padding: 18px 0; + + div.buy-modal-content-option-title { + font-size: 20px; + margin-bottom: 12px; + + @media screen and (max-width: 679px) { + font-size: 14px; + } + + @media screen and (min-width: 1281px) { + font-size: 20px; + } + } + + div.buy-modal-content-option-subtitle { + font-size: 16px; + padding: 0 10px; + height: 25%; + + @media screen and (max-width: 679px) { + font-size: 10px; + padding: 0 10px; + margin-bottom: 5px; + line-height: 15px; + } + + @media screen and (min-width: 680px) { + font-size: 14px; + padding: 0 4px; + margin-bottom: 2px; + } + + @media screen and (min-width: 1281px) { + font-size: 16px; + padding: 0; + } + } + + div.buy-modal-content-footer { + margin-top: 8vh; + } + } +} + +// Edit Account Name Modal +.edit-account-name-modal-content { + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: center; + position: relative; +} + +.edit-account-name-modal-cancel { + position: absolute; + top: 12px; + right: 20px; + font-size: 25px; +} + +.edit-account-name-modal-title { + margin: 15px; +} + +.edit-account-name-modal-save-button { + width: 33%; + height: 45px; + margin: 15px; + font-weight: 700; + margin-top: 25px; +} + +.edit-account-name-modal-input { + width: 90%; + height: 50px; + text-align: left; + margin: 10px; + padding: 10px; + font-size: 18px; +} + +// Account Modal Container +.account-modal-container { + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: center; + position: relative; + padding: 5px 0 31px 0; + border: 1px solid $silver; + border-radius: 4px; + font-family: Roboto; + + button { + cursor: pointer; + } +} + +.account-modal-back { + color: $dusty-gray; + position: absolute; + top: 13px; + left: 17px; + cursor: pointer; + + &__text { + margin-top: 2px; + font-family: Roboto; + font-size: 14px; + line-height: 18px; + } +} + +.account-modal-close::after { + content: '\00D7'; + font-size: 40px; + color: $dusty-gray; + position: absolute; + top: 10px; + right: 12px; + cursor: pointer; +} + +.account-modal-container .identicon { + position: relative; + left: 0; + right: 0; + margin: 0 auto; + top: -32px; + margin-bottom: -32px; +} + + +// Account Details Modal + +.account-modal-container { + + .qr-header { + margin-top: 9px; + font-size: 20px; + } + + .qr-wrapper { + margin-top: 5px; + } + + .ellip-address-wrapper { + display: flex; + justify-content: center; + border: 1px solid $alto; + padding: 5px 10px; + font-family: Roboto; + margin-top: 7px; + width: 286px; + } + + .btn-clear { + min-height: 28px; + font-size: 14px; + border-color: $curious-blue; + color: $curious-blue; + border-radius: 2px; + flex-basis: 100%; + width: 75%; + margin-top: 17px; + padding: 10px 22px; + height: 44px; + width: 235px; + font-family: Roboto; + } +} + +.account-modal-divider { + width: 100%; + height: 1px; + margin: 19px 0 8px 0; + background-color: $alto; +} + +// Export Private Key Modal + +.account-modal-container .account-name { + margin-top: 9px; + font-size: 20px; +} + +.account-modal-container .modal-body-title { + margin-top: 16px; + margin-bottom: 16px; + font-size: 18px; +} + +.account-modal__name { + margin-top: 9px; + font-size: 20px; +} + +.private-key-password { + display: flex; + flex-direction: column; +} + +.private-key-password-label, .private-key-password-error { + color: $scorpion; + font-size: 14px; + line-height: 18px; + margin-bottom: 10px; +} + +.private-key-password-error { + color: $crimson; + margin-bottom: 0; +} + +.private-key-password-input { + padding: 10px 0 13px 17px; + font-size: 16px; + line-height: 21px; + width: 291px; + height: 44px; +} + +.private-key-password::-webkit-input-placeholder { + color: $dusty-gray; + font-family: Roboto; +} + +.private-key-password-warning { + border-radius: 8px; + background-color: #FFF6F6; + font-size: 12px; + font-weight: 500; + line-height: 15px; + color: $crimson; + width: 292px; + padding: 9px 15px; + margin-top: 18px; + font-family: Roboto; +} + +.export-private-key-buttons { + display: flex; + flex-direction: row; + justify-content: center; + + .btn-clear { + width: 141px; + height: 54px; + } + + .btn-cancel { + margin-right: 15px; + border-color: $dusty-gray; + color: $scorpion; + } +} + +.private-key-password-display-wrapper { + height: 80px; + width: 291px; + border: 1px solid $silver; + border-radius: 2px; +} + +.private-key-password-display-textarea { + color: $crimson; + font-family: Roboto; + font-size: 16px; + line-height: 21px; + border: none; + height: 75px; + width: 100%; + overflow: hidden; + resize: none; + padding: 9px 13px 8px; + text-transform: uppercase; + font-weight: 300; +} + + +// New Account Modal +.new-account-modal-wrapper { + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: center; + position: relative; + border: 1px solid $alto; + box-shadow: 0 0 2px 2px $alto; + font-family: Roboto; +} + +.new-account-modal-header { + background: $wild-sand; + width: 100%; + display: flex; + justify-content: center; + padding: 30px; + font-size: 22px; + color: $nile-blue; + height: 79px; +} + +.modal-close-x::after { + content: '\00D7'; + font-size: 2em; + color: $dusty-gray; + position: absolute; + top: 25px; + right: 17.5px; + font-family: sans-serif; + cursor: pointer; +} + +.new-account-modal-content { + width: 100%; + display: flex; + justify-content: center; + margin-top: 15px; + font-size: 17px; + color: $nile-blue; +} + +.new-account-modal-content.after-input { + margin-top: 15px; + line-height: 25px; +} + +.new-account-input-wrapper { + display: flex; + width: 100%; + justify-content: center; + padding-bottom: 2px; + margin-top: 13px; +} + +.new-account-input { + padding: 15px; + padding-bottom: 20px; + border-radius: 8px; + border: 1px solid $alto; + width: 100%; + font-size: 1em; + color: $dusty-gray; + font-family: Roboto; + font-size: 17px; + margin: 0 60px; +} + +// For reference on below placeholder selectors: https://stackoverflow.com/questions/2610497/change-an-html5-inputs-placeholder-color-with-css +.new-account-input::-webkit-input-placeholder { + color: $dusty-gray; +} + +.new-account-input:-moz-placeholder { + color: $dusty-gray; + opacity: 1; +} + +.new-account-input::-moz-placeholder { + color: $dusty-gray; + opacity: 1; +} + +.new-account-input:-ms-input-placeholder { + color: $dusty-gray; +} + +.new-account-input::-ms-input-placeholder { + color: $dusty-gray; +} + +.new-account-modal-content.button { + margin-top: 22px; + margin-bottom: 30px; + width: 113px; + height: 44px; +} + +.new-account-modal-wrapper .btn-clear { + font-size: 14px; + font-weight: 700; + background: $white; + border: 1px solid; + border-radius: 2px; + color: $tundora; + flex: 1; +} + +// Hide token confirmation + +.hide-token-confirmation { + min-height: 250.72px; + width: 374.49px; + border-radius: 4px; + background-color: #FFFFFF; + box-shadow: 0 1px 7px 0 rgba(0,0,0,0.5); + + &__container { + padding: 24px 27px 21px; + display: flex; + flex-direction: column; + align-items: center; + } + + &__identicon { + margin-bottom: 10px + } + + &__symbol { + color: $tundora; + font-family: Roboto; + font-size: 16px; + line-height: 24px; + text-align: center; + margin-bottom: 7.5px; + } + + &__title { + height: 30px; + width: 271.28px; + color: $tundora; + font-family: Roboto; + font-size: 22px; + line-height: 30px; + text-align: center; + margin-bottom: 10.5px; + } + + &__copy { + height: 41px; + width: 318px; + color: $scorpion; + font-family: Roboto; + font-size: 14px; + line-height: 18px; + text-align: center; + } + + &__buttons { + display: flex; + flex-direction: row; + justify-content: center; + margin-top: 15px; + width: 100%; + + button { + height: 44px; + width: 113px; + border: 1px solid $scorpion; + border-radius: 2px; + color: $tundora; + font-family: Roboto; + font-size: 14px; + line-height: 20px; + text-align: center; + margin-left: 4px; + margin-right: 4px; + } + } +} + +//Notification Modal + +.notification-modal-wrapper { + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: center; + position: relative; + border: 1px solid $alto; + box-shadow: 0 0 2px 2px $alto; + font-family: Roboto; +} + +.notification-modal-header { + background: $wild-sand; + width: 100%; + display: flex; + justify-content: center; + padding: 30px; + font-size: 22px; + color: $nile-blue; + height: 79px; +} + +.notification-modal-message { + padding: 20px; +} + +.notification-modal-message { + width: 100%; + display: flex; + justify-content: center; + font-size: 17px; + color: $nile-blue; +}
\ No newline at end of file diff --git a/ui/app/css/itcss/components/network.scss b/ui/app/css/itcss/components/network.scss new file mode 100644 index 000000000..98dbdffb2 --- /dev/null +++ b/ui/app/css/itcss/components/network.scss @@ -0,0 +1,169 @@ +.network-component--disabled { + // border-color: transparent !important; + cursor: default; + + .fa-caret-down { + opacity: 0; + } +} + +.network-component.pointer { + border: 1px solid $shark; + border-radius: 82px; + padding: 6px; + flex: 0 0 auto; + + &.ethereum-network { + border-color: rgb(3, 135, 137); + + .menu-icon-circle div { + background-color: rgba(3, 135, 137, .7) !important; + } + } + + &.ropsten-test-network { + border-color: rgb(233, 21, 80); + + .menu-icon-circle div { + background-color: rgba(233, 21, 80, .7) !important; + } + } + + &.kovan-test-network { + border-color: rgb(105, 4, 150); + + .menu-icon-circle div { + background-color: rgba(105, 4, 150, .7) !important; + } + } + + &.rinkeby-test-network { + border-color: rgb(235, 179, 63); + + .menu-icon-circle div { + background-color: rgba(235, 179, 63, .7) !important; + } + } +} + +.dropdown-menu-item { + .menu-icon-circle, + .menu-icon-circle--active { + margin: 0 14px; + } +} + +.network-indicator { + display: flex; + align-items: center; + font-size: .6em; + + .fa-caret-down { + line-height: 15px; + font-size: 12px; + padding: 0 4px; + } +} + +.network-name { + line-height: 15px; + padding: 0 4px; + font-family: Roboto; + font-size: 12px; + flex: 1 0 auto; +} + +.network-droppo { + right: 2px; + + @media screen and (min-width: 576px) { + right: calc(((100% - 85vw) / 2) + 2px); + } + + @media screen and (min-width: 769px) { + right: calc(((100% - 80vw) / 2) + 2px); + } + + @media screen and (min-width: 1281px) { + right: calc(((100% - 65vw) / 2) + 2px); + } +} + +.network-name-item { + font-weight: 100; + flex: 1 0 auto; + color: $dusty-gray; +} + +.network-check, +.network-check__transparent { + color: $white; + margin-left: 7px; +} + +.network-check__transparent { + opacity: 0; + width: 16px; + margin: 0; +} + +.menu-icon-circle, +.menu-icon-circle--active { + background: none; + border-radius: 22px; + display: flex; + justify-content: center; + align-items: center; + border: 1px solid transparent; + margin: 0 4px; +} + +.menu-icon-circle--active { + border: 1px solid $white; + background: rgba(100, 100, 100, .4); +} + +.menu-icon-circle div, +.menu-icon-circle--active div { + height: 12px; + width: 12px; + border-radius: 17px; +} + +.menu-icon-circle--active div { + opacity: 1; +} + +.network-dropdown-header { + display: flex; + flex-direction: column; + align-items: center; + width: 100%; +} + +.network-dropdown-divider { + width: 100%; + height: 1px; + margin: 10px 0; + background-color: $scorpion; +} + +.network-dropdown-title { + height: 25px; + width: 75px; + color: $white; + font-family: Roboto; + font-size: 18px; + line-height: 25px; + text-align: center; +} + +.network-dropdown-content { + height: 36px; + width: 265px; + color: $dusty-gray; + font-family: Roboto; + font-size: 14px; + line-height: 18px; +} + diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss new file mode 100644 index 000000000..61dfbd176 --- /dev/null +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -0,0 +1,281 @@ +/* + NewUI Container Elements + */ + +// Component Colors +$tx-view-bg: $white; +$wallet-view-bg: $wild-sand; + +// Main container +.main-container { + // position: absolute; + z-index: $main-container-z-index; + font-family: Roboto; + display: flex; + flex-wrap: wrap; + align-items: stretch; +} + +.main-container::-webkit-scrollbar { + display: none; +} + +// tx view + +.tx-view { + flex: 63.5 0 66.5%; + background: $tx-view-bg; + + // No title on mobile + @media screen and (max-width: 575px) { + .identicon-wrapper { + display: none; + } + + .account-name { + display: none; + } + } +} + +.open-in-browser { + cursor: pointer; +} + +// wallet view and sidebar + +.wallet-view { + display: flex; + flex-direction: column; + flex: 33.5 1 33.5%; + width: 0; + background: $wallet-view-bg; + z-index: 200; + position: relative; + + @media screen and (min-width: 576px) { + overflow-y: scroll; + overflow-x: hidden; + } + + .wallet-view-account-details { + flex: 0 0 auto; + } + + &__name-container { + flex: 0 0 auto; + cursor: pointer; + width: 100%; + } + + &__keyring-label { + height: 40px; + color: $dusty-gray; + font-family: Roboto; + font-size: 10px; + line-height: 40px; + text-align: right; + padding: 0 20px; + } + + &__details-button { + color: $curious-blue; + font-size: 10px; + line-height: 13px; + text-align: center; + border: 1px solid $curious-blue; + border-radius: 10.5px; + background-color: transparent; + margin: 0 auto; + padding: 4px 12px; + flex: 0 0 auto; + } + + &__address { + border-radius: 3px; + background-color: $alto; + color: $scorpion; + font-size: 14px; + line-height: 12px; + padding: 4px 12px; + margin: 24px auto; + font-weight: 300; + cursor: pointer; + flex: 0 0 auto; + } + + &__sidebar-close { + + @media screen and (max-width: 575px) { + &::after { + content: '\00D7'; + font-size: 40px; + color: $tundora; + position: absolute; + top: 12px; + left: 12px; + cursor: pointer; + } + } + } + + &__add-token-button { + flex: 0 0 auto; + color: $dusty-gray; + font-size: 14px; + line-height: 19px; + text-align: center; + margin: 36px auto; + border: 1px solid $dusty-gray; + border-radius: 2px; + font-weight: 300; + background: none; + padding: 9px 30px; + } +} + +@media screen and (min-width: 576px) { + .wallet-view::-webkit-scrollbar { + display: none; + } +} + +.wallet-view-title-wrapper { + flex: 0 0 25px; +} + +.wallet-view-title { + margin-left: 15px; + font-size: 16px; + + // No title on mobile + @media screen and (max-width: 575px) { + display: none; + } +} + +.wallet-view.sidebar { + flex: 1 0 230px; + background: rgb(250, 250, 250); + z-index: $sidebar-z-index; + position: fixed; + top: 56px; + left: 0; + right: 0; + bottom: 0; + opacity: 1; + visibility: visible; + will-change: transform; + overflow-y: auto; + box-shadow: rgba(0, 0, 0, .15) 2px 2px 4px; + width: 85%; + height: calc(100% - 56px); +} + +.sidebar-overlay { + z-index: $sidebar-overlay-z-index; + position: fixed; + // top: 41px; + height: 100%; + width: 100%; + left: 0; + right: 0; + bottom: 0; + opacity: 1; + visibility: visible; + background-color: rgba(0, 0, 0, .3); +} + +// main-container media queries + +@media screen and (min-width: 576px) { + .lap-visible { + display: flex; + } + + .phone-visible { + display: none; + } + + .main-container { + // margin-top: 6.9vh; + width: 85%; + height: 90vh; + box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08); + } +} + +@media screen and (min-width: 769px) { + .main-container { + // margin-top: 6.9vh; + width: 80%; + height: 82vh; + box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08); + } +} + +@media screen and (min-width: 1281px) { + .main-container { + // margin-top: 6.9vh; + width: 65%; + height: 82vh; + box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08); + } +} + +@media screen and (max-width: 575px) { + .lap-visible { + display: none; + } + + .phone-visible { + display: flex; + } + + .main-container { + // margin-top: 41px; + height: 100%; + width: 100%; + overflow-y: auto; + background-color: $white; + } + + button.btn-clear { + width: 93px; + height: 50px; + font-size: .7em; + background: $white; + border: 1px solid; + } +} + +// wallet view +.account-name { + font-size: 24px; + font-weight: 300; + line-height: 20px; + color: $scorpion; + margin-top: 8px; + margin-bottom: 24px; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + width: 100%; + padding: 0 8px; + text-align: center; +} + +// account options dropdown +.account-options-menu { + align-items: center; + justify-content: flex-start; + margin: 5% 7% 0%; +} + +.fiat-amount { + text-transform: uppercase; +} + +.token-balance__amount { + padding-right: 6px; +} diff --git a/ui/app/css/itcss/components/request-signature.scss b/ui/app/css/itcss/components/request-signature.scss new file mode 100644 index 000000000..d81099bfa --- /dev/null +++ b/ui/app/css/itcss/components/request-signature.scss @@ -0,0 +1,230 @@ +.request-signature { + &__container { + width: 380px; + border-radius: 8px; + background-color: $white; + box-shadow: 0 2px 4px 0 rgba(0,0,0,0.08); + display: flex; + flex-flow: column nowrap; + z-index: 25; + align-items: center; + font-family: Roboto; + position: relative; + height: 100%; + + @media screen and (max-width: $break-small) { + width: 100%; + top: 0; + box-shadow: none; + } + + @media screen and (min-width: $break-large) { + max-height: 620px; + } + } + + &__header { + height: 64px; + width: 100%; + position: relative; + display: flex; + flex-flow: column; + justify-content: center; + align-items: center; + flex: 0 0 auto; + } + + &__header-background { + position: absolute; + background-color: $athens-grey; + z-index: 2; + width: 100%; + height: 100%; + } + + &__header__text { + height: 29px; + width: 179px; + color: #5B5D67; + font-family: Roboto; + font-size: 22px; + font-weight: 300; + line-height: 29px; + z-index: 3; + } + + &__header__tip-container { + width: 100%; + display: flex; + justify-content: center; + } + + &__header__tip { + height: 25px; + width: 25px; + background: $athens-grey; + transform: rotate(45deg); + position: absolute; + bottom: -8px; + z-index: 1; + } + + &__account-info { + display: flex; + justify-content: space-between; + margin-top: 18px; + margin-bottom: 20px; + } + + &__account { + color: $dusty-gray; + margin-left: 17px; + } + + &__account-text { + font-size: 14px; + } + + &__balance { + color: $dusty-gray; + margin-right: 17px; + width: 124px; + } + + &__balance-text { + text-align: right; + font-size: 14px; + } + + &__balance-value { + text-align: right; + margin-top: 2.5px; + } + + &__request-icon { + margin-top: 25px; + } + + &__body { + width: 100%; + height: 100%; + display: flex; + flex-flow: column; + flex: 1 1 auto; + height: 0; + } + + &__request-info { + display: flex; + justify-content: center; + } + + &__headline { + height: 48px; + width: 240px; + color: $tundora; + font-family: Roboto; + font-size: 18px; + font-weight: 300; + line-height: 24px; + text-align: center; + margin-top: 20px; + } + + &__notice, + &__warning { + font-family: "Avenir Next"; + font-size: 14px; + line-height: 19px; + text-align: center; + margin-top: 41px; + margin-bottom: 11px; + width: 100%; + } + + &__notice { + color: $dusty-gray; + } + + &__warning { + color: $crimson; + } + + &__rows { + height: 100%; + overflow-y: scroll; + overflow-x: hidden; + border-top: 1px solid $geyser; + display: flex; + flex-flow: column; + } + + &__row { + display: flex; + flex-flow: column; + } + + &__row-title { + width: 80px; + color: $dusty-gray; + font-family: Roboto; + font-size: 16px; + line-height: 22px; + margin-top: 12px; + margin-left: 18px; + width: 100%; + } + + &__row-value { + color: $scorpion; + font-family: Roboto; + font-size: 14px; + line-height: 19px; + width: 100%; + overflow-wrap: break-word; + border-bottom: 1px solid #d2d8dd; + padding: 6px 18px 15px; + } + + &__footer { + width: 100%; + display: flex; + align-items: center; + justify-content: space-evenly; + font-size: 22px; + position: relative; + flex: 0 0 auto; + border-top: 1px solid $geyser; + + &__cancel-button, + &__sign-button { + display: flex; + align-items: center; + justify-content: center; + flex: 1 0 auto; + font-family: Roboto; + font-size: 16px; + font-weight: 300; + height: 55px; + line-height: 32px; + cursor: pointer; + border-radius: 2px; + box-shadow: none; + max-width: 162px; + margin: 12px; + } + + &__cancel-button { + background: none; + border: 1px solid $dusty-gray; + margin-right: 6px; + } + + &__sign-button { + background-color: $caribbean-green; + border-width: 0; + color: $white; + margin-left: 6px; + } + } +}
\ No newline at end of file diff --git a/ui/app/css/itcss/components/sections.scss b/ui/app/css/itcss/components/sections.scss new file mode 100644 index 000000000..388aea175 --- /dev/null +++ b/ui/app/css/itcss/components/sections.scss @@ -0,0 +1,476 @@ +// Old scss, do not lint - clean up later +/* stylelint-disable */ + + +/* +App Sections + TODO: Move into separate files. +*/ + +/* initialize */ +textarea.twelve-word-phrase { + padding: 12px; + width: 300px; + height: 140px; + font-size: 16px; + background: $white; + resize: none; +} + +.initialize-screen hr { + width: 60px; + margin: 12px; + border-color: #f7861c; + border-style: solid; +} + +.initialize-screen label { + margin-top: 20px; +} + +.initialize-screen button.create-vault { + margin-top: 40px; +} + +.initialize-screen .warning { + font-size: 14px; + margin: 0 16px; +} + +/* unlock */ +.error { + // color: #e20202; + color: #f7861c; + margin-bottom: 9px; +} + +.warning { + color: #ffae00; +} + +.lock { + width: 50px; + height: 50px; +} + +.lock.locked { + transform: scale(1.5); + opacity: 0; + transition: opacity 400ms ease-in, transform 400ms ease-in; +} + +.lock.unlocked { + transform: scale(1); + opacity: 1; + transition: opacity 500ms ease-out, transform 500ms ease-out, background 200ms ease-in; +} + +.lock.locked .lock-top { + transform: scaleX(1) translateX(0); + transition: transform 250ms ease-in; +} + +.lock.unlocked .lock-top { + transform: scaleX(-1) translateX(-12px); + transition: transform 250ms ease-in; +} + +.lock.unlocked:hover { + border-radius: 4px; + background: #e5e5e5; + border: 1px solid #b1b1b1; +} + +.lock.unlocked:active { + background: #c3c3c3; +} + +.section-title .fa-arrow-left { + margin: -2px 8px 0px -8px; +} + +.unlock-screen #metamask-mascot-container { + margin-top: 24px; +} + +.unlock-screen h1 { + margin-top: -28px; + margin-bottom: 42px; +} + +.unlock-screen input[type=password] { + width: 260px; +} + +.sizing-input { + font-size: 14px; + height: 30px; + padding-left: 5px; +} + +.editable-label { + display: flex; +} + +/* Webkit */ + +.unlock-screen input::-webkit-input-placeholder { + text-align: center; + font-size: 1.2em; +} + +/* Firefox 18- */ + +.unlock-screen input:-moz-placeholder { + text-align: center; + font-size: 1.2em; +} + +/* Firefox 19+ */ + +.unlock-screen input::-moz-placeholder { + text-align: center; + font-size: 1.2em; +} + +/* IE */ + +.unlock-screen input:-ms-input-placeholder { + text-align: center; + font-size: 1.2em; +} + +/* accounts */ + +.accounts-section { + margin: 0 0px; +} + +.accounts-section .horizontal-line { + margin: 0 18px; +} + +.accounts-list-option { + height: 120px; +} + +.accounts-list-option .identicon-wrapper { + width: 100px; +} + +.unconftx-link { + margin-top: 24px; + cursor: pointer; +} + +.unconftx-link .fa-arrow-right { + margin: 0 -8px 0px 8px; +} + +/* identity panel */ + +.identity-panel { + font-weight: 500; +} + +.identity-panel .identicon-wrapper { + margin: 4px; + margin-top: 8px; + display: flex; + align-items: center; +} + +.identity-panel .identicon-wrapper span { + margin: 0 auto; +} + +.identity-panel .identity-data { + margin: 8px 8px 8px 18px; +} + +.identity-panel i { + margin-top: 32px; + margin-right: 6px; + color: #b9b9b9; +} + +.identity-panel .arrow-right { + padding-left: 18px; + width: 42px; + min-width: 18px; + height: 100%; +} + +.identity-copy.flex-column { + flex: .25 0 auto; + justify-content: center; +} + +/* accounts screen */ + +.identity-section { +} + +.identity-section .identity-panel { + background: #e9e9e9; + border-bottom: 1px solid #b1b1b1; + cursor: pointer; +} + +.identity-section .identity-panel.selected { + background: $white; + color: #f3c83e; +} + +.identity-section .identity-panel.selected .identicon { + border-color: $orange; +} + +.identity-section .accounts-list-option:hover, +.identity-section .accounts-list-option.selected { + background: $white; +} + +/* account detail screen */ + +.account-detail-section { + display: flex; + flex-wrap: wrap; + overflow-y: auto; + flex-direction: inherit; +} + +.grow-tenx { + flex-grow: 10; +} + +.name-label { +} + +.unapproved-tx-icon { + height: 16px; + width: 16px; + background: rgb(47, 174, 244); + border-color: $silver-chalice; + border-radius: 13px; +} + +.edit-text { + height: 100%; + visibility: hidden; +} + +.editing-label { + display: flex; + justify-content: flex-start; + margin-left: 50px; + margin-bottom: 2px; + font-size: 11px; + text-rendering: geometricPrecision; + color: #f7861c; +} + +.name-label:hover .edit-text { + visibility: visible; +} +/* tx confirm */ + +.unconftx-section input[type=password] { + height: 22px; + padding: 2px; + margin: 12px; + margin-bottom: 24px; + border-radius: 4px; + border: 2px solid #f3c83e; + background: #faf6f0; +} + +/* Ether Balance Widget */ + +.ether-balance-amount { + color: #f7861c; +} + +.ether-balance-label { + color: #aba9aa; +} + +/* Info screen */ +.info-gray { + font-family: Roboto; + text-transform: uppercase; + color: $silver-chalice; +} + +.icon-size { + width: 20px; +} + +.info { + font-family: Roboto, Arial; + padding-bottom: 10px; + display: inline-block; + padding-left: 5px; +} + +/* buy eth warning screen */ +.custom-radios { + justify-content: space-around; + align-items: center; +} + +.custom-radio-selected { + width: 17px; + height: 17px; + border: solid; + border-style: double; + border-radius: 15px; + border-width: 5px; + background: rgba(247, 134, 28, 1); + border-color: #f7f7f7; +} + +.custom-radio-inactive { + width: 14px; + height: 14px; + border: solid; + border-width: 1px; + border-radius: 24px; + border-color: $silver-chalice; +} + +.radio-titles { + color: rgba(247, 134, 28, 1); +} + +.eth-warning { + transition: opacity 400ms ease-in, transform 400ms ease-in; +} + +.buy-subview { + transition: opacity 400ms ease-in, transform 400ms ease-in; +} + +.input-container:hover .edit-text { + visibility: visible; +} + +.buy-inputs { + font-family: Roboto; + font-size: 13px; + height: 20px; + background: transparent; + box-sizing: border-box; + border: solid; + border-color: transparent; + border-width: .5px; + border-radius: 2px; +} + +.input-container:hover .buy-inputs { + box-sizing: inherit; + border: solid; + border-color: #f7861c; + border-width: .5px; + border-radius: 2px; +} + +.buy-inputs:focus { + border: solid; + border-color: #f7861c; + border-width: .5px; + border-radius: 2px; +} + +.activeForm { + background: #f7f7f7; + border: none; + border-radius: 8px 8px 0px 0px; + width: 50%; + text-align: center; + padding-bottom: 4px; +} + +.inactiveForm { + border: none; + border-radius: 8px 8px 0px 0px; + width: 50%; + text-align: center; + padding-bottom: 4px; +} + +.ex-coins { + font-family: Roboto; + text-transform: uppercase; + text-align: center; + font-size: 33px; + width: 118px; + height: 42px; + padding: 1px; + color: #4d4d4d; +} + +.marketinfo { + font-family: Roboto; + color: $silver-chalice; + font-size: 15px; + line-height: 17px; +} + +#fromCoin::-webkit-calendar-picker-indicator { + display: none; +} + +#coinList { + width: 400px; + height: 500px; + overflow: scroll; +} + +.icon-control .fa-refresh { + visibility: hidden; +} + +.icon-control:hover .fa-refresh { + visibility: visible; +} + +.icon-control:hover .fa-chevron-right { + visibility: hidden; +} + +.inactive { + color: $silver-chalice; +} + +.inactive button { + background: $silver-chalice; + color: $white; +} + +.qr-ellip-address, .ellip-address { + overflow: hidden; + text-overflow: ellipsis; +} + +.qr-header { + font-size: 25px; + margin-top: 40px; +} + +.qr-message { + font-size: 12px; + color: #f7861c; +} + +div.message-container > div:first-child { + margin-top: 18px; + font-size: 15px; + color: #4d4d4d; +} + +.pop-hover:hover { + transform: scale(1.1); +} + +/* stylelint-enable */ diff --git a/ui/app/css/itcss/components/send.scss b/ui/app/css/itcss/components/send.scss new file mode 100644 index 000000000..2bd192788 --- /dev/null +++ b/ui/app/css/itcss/components/send.scss @@ -0,0 +1,892 @@ +.send-screen-wrapper { + display: flex; + flex-flow: column nowrap; + z-index: 25; + font-family: Roboto; + + @media screen and (max-width: $break-small) { + width: 100%; + overflow-y: auto; + } + + section { + flex: 0 0 auto; + } +} + +.send-screen-card { + background-color: #fff; + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .08); + padding: 46px 40.5px 26px; + position: relative; + // top: -26px; + align-items: center; + display: flex; + flex-flow: column nowrap; + width: 498px; + flex: 1 0 auto; + + @media screen and (max-width: $break-small) { + top: 0; + width: 100%; + box-shadow: none; + padding: 12px; + } +} + +/* Send Screen */ + +.send-screen section { + margin: 4px 16px; +} + +.send-screen input { + width: 100%; + font-size: 12px; +} + +.send-eth-icon { + border-radius: 50%; + width: 70px; + height: 70px; + border: 1px solid $alto; + box-shadow: 0 0 4px 0 rgba(0, 0, 0, .2); + position: absolute; + top: -35px; + z-index: 25; + padding: 4px; + background-color: $white; + + @media screen and (max-width: $break-small) { + position: relative; + top: 0; + } +} + +.send-screen-input-wrapper { + width: 95%; + position: relative; + + .fa-bolt { + padding-right: 4px; + } + + .large-input { + border: 1px solid $dusty-gray; + border-radius: 4px; + margin: 4px 0 20px; + font-size: 16px; + line-height: 22.4px; + font-family: Roboto; + } + + .send-screen-gas-input { + border: 1px solid transparent; + } + + &__error-message { + display: none; + } + + &--error { + input, + .send-screen-gas-input { + border-color: $red !important; + } + + .send-screen-input-wrapper__error-message { + display: block; + position: absolute; + bottom: 4px; + font-size: 12px; + line-height: 12px; + left: 8px; + color: $red; + } + } + + .send-screen-input-wrapper__error-message { + display: block; + position: absolute; + bottom: 4px; + font-size: 12px; + line-height: 12px; + left: 8px; + color: $red; + } +} + +.send-screen-input { + width: 100%; +} + +.send-screen-gas-input { + width: 100%; + height: 41px; + border-radius: 3px; + background-color: #f3f3f3; + border-width: 0; + border-style: none; + display: flex; + justify-content: space-between; + align-items: center; + padding-left: 10px; + padding-right: 12px; + font-size: 16px; + color: $scorpion; +} + +.send-screen-amount-labels { + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.send-screen-gas-labels { + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.currency-toggle { + &__item { + color: $curious-blue; + cursor: pointer; + + &--selected { + color: $black; + cursor: default; + } + } +} + +.send-screen-gas-input-customize { + color: $curious-blue; + font-size: 12px; + cursor: pointer; +} + +.gas-tooltip-close-area { + position: fixed; + top: 0; + left: 0; + z-index: 1000; + width: 100%; + height: 100%; +} + +.customize-gas-tooltip-container { + position: absolute; + bottom: 50px; + width: 237px; + height: 307px; + background-color: $white; + opacity: 1; + box-shadow: $alto 0 0 5px; + z-index: 1050; + padding: 13px 19px; + font-size: 16px; + border-radius: 4px; + font-family: "Lato"; + font-weight: 500; +} + +.gas-tooltip-arrow { + height: 25px; + width: 25px; + z-index: 1200; + background: $white; + position: absolute; + transform: rotate(45deg); + left: 107px; + top: 294px; + box-shadow: 2px 2px 2px $alto; +} + +.customize-gas-tooltip-container input[type="number"]::-webkit-inner-spin-button { + -webkit-appearance: none; + display: none; +} + +.customize-gas-tooltip-container input[type="number"]:hover::-webkit-inner-spin-button { + -webkit-appearance: none; + display: none; +} + +.customize-gas-tooltip { + position: relative; +} + +.gas-tooltip { + display: flex; + justify-content: center; +} + +.gas-tooltip-label { + font-size: 16px; + color: $tundora; +} + +.gas-tooltip-header { + padding-bottom: 12px; +} + +.gas-tooltip-input-label { + margin-bottom: 5px; +} + +.gas-tooltip-input-label i { + color: $silver-chalice; + margin-left: 6px; +} + +.customize-gas-input { + width: 178px; + height: 28px; + border: 1px solid $alto; + font-size: 16px; + color: $nile-blue; + padding-left: 8px; +} + +.customize-gas-input-wrapper { + position: relative; +} + +.gas-tooltip-input-detail { + position: absolute; + top: 4px; + right: 26px; + font-size: 12px; + color: $silver-chalice; +} + +.gas-tooltip-input-arrows { + position: absolute; + top: 0; + right: 4px; + width: 17px; + height: 28px; + border: 1px solid #dadada; + border-left: 0; + display: flex; + flex-direction: column; + color: #9b9b9b; + font-size: .8em; + padding: 1px 4px; + cursor: pointer; +} + +.token-gas { + &__amount { + display: inline-block; + margin-right: 4px; + } + + &__symbol { + display: inline-block; + } +} + +.send-screen { + &__title { + color: $scorpion; + font-size: 18px; + line-height: 29px; + } + + &__subtitle { + margin: 10px 0 20px; + font-size: 14px; + line-height: 24px; + } + + &__send-button, + &__cancel-button { + width: 163px; + text-align: center; + } + + &__send-button__disabled { + opacity: .5; + cursor: auto; + } +} + +.send-token { + display: flex; + flex-flow: column nowrap; + z-index: 25; + font-family: Roboto; + + &__content { + width: 498px; + height: 605px; + background-color: #fff; + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .08); + padding: 46px 40.5px 26px; + position: relative; + // top: -26px; + align-items: center; + display: flex; + flex-flow: column nowrap; + flex: 1 0 auto; + + @media screen and (max-width: $break-small) { + top: 0; + width: 100%; + box-shadow: none; + padding: 12px; + } + } + + .identicon { + position: absolute; + top: -35px; + z-index: 25; + + @media screen and (max-width: $break-small) { + position: relative; + top: 0; + flex: 0 0 auto; + } + } + + &__title { + color: $scorpion; + font-size: 18px; + line-height: 29px; + } + + &__description, + &__balance-text, + &__token-symbol { + margin-top: 10px; + font-size: 14px; + line-height: 24px; + text-align: center; + } + + &__token-balance { + font-size: 40px; + line-height: 40px; + margin-top: 13px; + + .token-balance__amount { + padding-right: 12px; + } + } + + &__button-group { + display: flex; + flex-flow: column nowrap; + align-items: center; + flex: 0 0 auto; + + @media screen and (max-width: $break-small) { + margin-top: 24px; + } + + button { + width: 163px; + } + } +} + +.confirm-send-token { + &__hero-amount-wrapper { + width: 100%; + } +} + +.send-v2 { + &__container { + // height: 701px; + width: 380px; + border-radius: 8px; + background-color: $white; + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .08); + display: flex; + flex-flow: column nowrap; + z-index: 25; + align-items: center; + font-family: Roboto; + position: relative; + + @media screen and (max-width: $break-small) { + width: 100%; + top: 0; + box-shadow: none; + flex: 1 1 auto; + } + } + + &__send-header-icon-container { + z-index: 25; + + @media screen and (max-width: $break-small) { + position: relative; + top: 0; + } + } + + &__send-header-icon { + border-radius: 50%; + width: 48px; + height: 48px; + border: 1px solid $alto; + z-index: 25; + padding: 4px; + background-color: $white; + } + + &__send-arrow-icon { + color: #f28930; + transform: rotate(-45deg); + position: absolute; + top: -2px; + left: 0; + font-size: 1.12em; + } + + &__arrow-background { + background-color: $white; + height: 14px; + width: 14px; + position: absolute; + top: 52px; + left: 199px; + border-radius: 50%; + z-index: 100; + + @media screen and (max-width: $break-small) { + top: 36px; + } + } + + &__header { + height: 88px; + width: 380px; + background-color: $athens-grey; + position: relative; + display: flex; + justify-content: center; + align-items: center; + + @media screen and (max-width: $break-small) { + height: 59px; + width: 100vw; + } + } + + &__header-tip { + height: 25px; + width: 25px; + background: $athens-grey; + position: absolute; + transform: rotate(45deg); + left: 178px; + top: 75px; + + @media screen and (max-width: $break-small) { + top: 46px; + left: 0; + right: 0; + margin: 0 auto; + } + } + + &__title { + color: $scorpion; + font-size: 22px; + line-height: 29px; + text-align: center; + margin-top: 25px; + } + + &__copy { + color: $gray; + font-size: 14px; + font-weight: 300; + line-height: 19px; + text-align: center; + margin-top: 10px; + width: 287px; + } + + &__error { + font-size: 12px; + line-height: 12px; + left: 8px; + color: $red; + } + + &__error-border { + color: $red; + } + + &__form { + margin: 13px 0; + width: 100%; + + @media screen and (max-width: $break-small) { + padding: 13px 0; + margin: 0; + height: 0; + overflow-y: auto; + flex: 1 1 auto; + } + } + + &__form-header, + &__form-header-copy { + width: 100%; + display: flex; + flex-flow: column; + align-items: center; + } + + &__form-row { + margin: 14.5px 18px 0px; + position: relative; + display: flex; + flex-flow: row; + flex: 1 0 auto; + justify-content: space-between; + } + + &__form-field { + flex: 1 1 auto; + } + + &__form-label { + color: $scorpion; + font-family: Roboto; + font-size: 16px; + line-height: 22px; + width: 88px; + } + + &__from-dropdown { + height: 73px; + width: 100%; + border: 1px solid $alto; + border-radius: 4px; + background-color: $white; + font-family: Roboto; + line-height: 16px; + font-size: 12px; + color: $tundora; + position: relative; + + &__close-area { + position: fixed; + top: 0; + left: 0; + z-index: 1000; + width: 100%; + height: 100%; + } + + &__list { + z-index: 1050; + position: absolute; + height: 220px; + width: 100%; + border: 1px solid $geyser; + border-radius: 4px; + background-color: $white; + box-shadow: 0 3px 6px 0 rgba(0 ,0 ,0 ,.11); + margin-top: 11px; + margin-left: -1px; + overflow-y: scroll; + } + } + + &__to-autocomplete { + position: relative; + + &__down-caret { + position: absolute; + top: 18px; + right: 12px; + } + } + + &__to-autocomplete, &__memo-text-area { + &__input { + height: 54px; + width: 100%; + border: 1px solid $alto; + border-radius: 4px; + background-color: $white; + color: $dusty-gray; + padding: 10px; + font-family: Roboto; + font-size: 16px; + line-height: 21px; + font-weight: 300; + } + } + + &__amount-max { + color: $curious-blue; + font-family: Roboto; + font-size: 12px; + left: 8px; + border: none; + cursor: pointer; + } + + &__gas-fee-display { + width: 100%; + } + + &__sliders-icon-container { + display: flex; + align-items: center; + justify-content: center; + height: 24px; + width: 24px; + border: 1px solid $curious-blue; + border-radius: 4px; + background-color: $white; + padding: 5px; + position: absolute; + right: 15px; + top: 14px; + cursor: pointer; + } + + &__sliders-icon { + color: $curious-blue; + } + + &__memo-text-area { + &__input { + padding: 6px 10px; + } + } + + &__footer { + height: 92px; + width: 100%; + display: flex; + justify-content: space-evenly; + align-items: center; + border-top: 1px solid $alto; + background: $white; + padding: 0 12px; + } + + &__next-btn, + &__cancel-btn, + &__next-btn__disabled { + width: 163px; + text-align: center; + height: 55px; + border-radius: 2px; + background-color: $white; + font-family: Roboto; + font-size: 16px; + font-weight: 300; + line-height: 21px; + border: 1px solid; + margin: 0 4px; + } + + &__next-btn, + &__next-btn__disabled { + color: $curious-blue; + border-color: $curious-blue; + } + + &__next-btn__disabled { + opacity: .5; + cursor: auto; + } + + &__cancel-btn { + color: $dusty-gray; + border-color: $dusty-gray; + } + + &__customize-gas { + border: 1px solid #D8D8D8; + border-radius: 4px; + background-color: #FFFFFF; + box-shadow: 0 2px 4px 0 rgba(0,0,0,0.14); + font-family: Roboto; + display: flex; + flex-flow: column; + + @media screen and (max-width: $break-small) { + width: 100vw; + height: 100vh; + } + + &__header { + height: 52px; + border-bottom: 1px solid $alto; + display: flex; + align-items: center; + justify-content: space-between; + font-size: 22px; + + @media screen and (max-width: $break-small) { + flex: 0 0 auto; + } + } + + &__title { + margin-left: 19.25px; + } + + &__close::after { + content: '\00D7'; + font-size: 1.8em; + color: $dusty-gray; + font-family: sans-serif; + cursor: pointer; + margin-right: 19.25px; + } + + &__content { + display: flex; + flex-flow: column nowrap; + height: 100%; + } + + &__body { + display: flex; + margin-bottom: 24px; + + @media screen and (max-width: $break-small) { + flex-flow: column; + flex: 1 1 auto; + } + } + + &__footer { + height: 75px; + border-top: 1px solid $alto; + display: flex; + align-items: center; + justify-content: space-between; + font-size: 22px; + position: relative; + + @media screen and (max-width: $break-small) { + flex: 0 0 auto; + } + } + + &__buttons { + display: flex; + justify-content: space-between; + width: 181.75px; + margin-right: 21.25px; + } + + &__revert, &__cancel, &__save, &__save__error { + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; + } + + &__revert { + color: $silver-chalice; + font-size: 16px; + margin-left: 21.25px; + } + + &__cancel, &__save, &__save__error { + height: 34.64px; + width: 85.74px; + border: 1px solid $dusty-gray; + border-radius: 2px; + font-family: 'DIN OT'; + font-size: 12px; + color: $dusty-gray; + } + + &__save__error { + opacity: 0.5; + cursor: auto; + } + + &__error-message { + display: block; + position: absolute; + top: 4px; + right: 4px; + font-size: 12px; + line-height: 12px; + color: $red; + } + } + + &__gas-modal-card { + width: 360px; + display: flex; + flex-flow: column; + align-items: flex-start; + padding-left: 20px; + + &__title { + height: 26px; + color: $tundora; + font-family: Roboto; + font-size: 20px; + font-weight: 300; + line-height: 26px; + margin-top: 17px; + } + + &__copy { + height: 38px; + width: 314px; + color: $tundora; + font-family: Roboto; + font-size: 14px; + line-height: 19px; + margin-top: 17px; + } + + .customize-gas-input-wrapper { + margin-top: 17px; + } + + .customize-gas-input { + height: 54px; + width: 315px; + border: 1px solid $geyser; + background-color: $white; + padding-left: 15px; + } + + .gas-tooltip-input-arrows { + width: 32px; + height: 54px; + border-left: 1px solid #dadada; + font-size: 18px; + color: $tundora; + right: 0px; + padding: 1px 4px; + display: flex; + justify-content: space-around; + align-items: center; + } + + input[type="number"]::-webkit-inner-spin-button { + -webkit-appearance: none; + display: none; + } + + input[type="number"]:hover::-webkit-inner-spin-button { + -webkit-appearance: none; + display: none; + } + } +} diff --git a/ui/app/css/itcss/components/settings.scss b/ui/app/css/itcss/components/settings.scss new file mode 100644 index 000000000..d60ebd934 --- /dev/null +++ b/ui/app/css/itcss/components/settings.scss @@ -0,0 +1,206 @@ +.settings { + position: relative; + background: $white; + display: flex; + flex-flow: column nowrap; + height: auto; + overflow: auto; +} + +.settings__header { + padding: 25px; +} + +.settings__close-button::after { + content: '\00D7'; + font-size: 40px; + color: $dusty-gray; + position: absolute; + top: 25px; + right: 30px; + cursor: pointer; +} + +.settings__error { + padding-bottom: 20px; + text-align: center; + color: $crimson; +} + +.settings__content { + padding: 0 25px; +} + +.settings__content-row { + display: flex; + flex-direction: row; + padding: 10px 0 20px; + + @media screen and (max-width: 575px) { + flex-direction: column; + padding: 10px 0; + } +} + +.settings__content-item { + flex: 1; + min-width: 0; + display: flex; + flex-direction: column; + padding: 0 5px; + height: 71px; + + @media screen and (max-width: 575px) { + height: initial; + padding: 5px 0; + } + + &--without-height { + height: initial; + } +} + +.settings__content-item-col { + max-width: 300px; + display: flex; + flex-direction: column; + + @media screen and (max-width: 575px) { + max-width: 100%; + width: 100%; + } +} + +.settings__content-description { + font-size: 14px; + color: $dusty-gray; + padding-top: 5px; +} + +.settings__input { + padding-left: 10px; + font-size: 14px; + height: 40px; + border: 1px solid $alto; +} + +.settings__input::-webkit-input-placeholder { + font-weight: 100; + color: $dusty-gray; +} + +.settings__input::-moz-placeholder { + font-weight: 100; + color: $dusty-gray; +} + +.settings__input:-ms-input-placeholder { + font-weight: 100; + color: $dusty-gray; +} + +.settings__input:-moz-placeholder { + font-weight: 100; + color: $dusty-gray; +} + +.settings__provider-wrapper { + font-size: 16px; + border: 1px solid $alto; + border-radius: 2px; + padding: 15px; + background-color: $white; + display: flex; + align-items: center; + justify-content: flex-start; +} + +.settings__provider-icon { + height: 10px; + width: 10px; + margin-right: 10px; + border-radius: 10px; +} + +.settings__rpc-save-button { + align-self: flex-end; + padding: 5px; + text-transform: uppercase; + color: $dusty-gray; + cursor: pointer; +} + +.settings__clear-button { + font-size: 16px; + border: 1px solid $curious-blue; + color: $curious-blue; + border-radius: 2px; + padding: 18px; + background-color: $white; + text-transform: uppercase; +} + +.settings__clear-button--red { + border: 1px solid $monzo; + color: $monzo; +} + +.settings__clear-button--orange { + border: 1px solid rgba(247, 134, 28, 1); + color: rgba(247, 134, 28, 1); +} + +.settings__info-logo-wrapper { + height: 80px; + margin-bottom: 20px; +} + +.settings__info-logo { + max-height: 100%; + max-width: 100%; +} + +.settings__info-item { + padding: 10px 0; +} + +.settings__info-link-header { + padding-bottom: 15px; + + @media screen and (max-width: 575px) { + padding-bottom: 5px; + } +} + +.settings__info-link-item { + padding: 15px 0; + + @media screen and (max-width: 575px) { + padding: 5px 0; + } +} + +.settings__info-version-number { + padding-top: 5px; + font-size: 13px; + color: $dusty-gray; +} + +.settings__info-about { + color: $dusty-gray; + margin-bottom: 15px; +} + +.settings__info-link { + color: $curious-blue; +} + +.settings__info-separator { + margin: 15px 0; + width: 80px; + border-color: $alto; + border: none; + height: 1px; + background-color: $alto; + color: $alto; +} diff --git a/ui/app/css/itcss/components/simple-dropdown.scss b/ui/app/css/itcss/components/simple-dropdown.scss new file mode 100644 index 000000000..a21095a3e --- /dev/null +++ b/ui/app/css/itcss/components/simple-dropdown.scss @@ -0,0 +1,65 @@ +.simple-dropdown { + height: 56px; + display: flex; + justify-content: flex-start; + align-items: center; + border: 1px solid $alto; + border-radius: 4px; + background-color: $white; + font-size: 16px; + color: #4d4d4d; + cursor: pointer; + position: relative; +} + +.simple-dropdown__caret { + color: $silver; + padding: 0 10px; +} + +.simple-dropdown__selected { + flex-grow: 1; + padding: 0 15px; +} + +.simple-dropdown__options { + z-index: 1050; + position: absolute; + height: 220px; + width: 100%; + border: 1px solid #d2d8dd; + border-radius: 4px; + background-color: #fff; + -webkit-box-shadow: 0 3px 6px 0 rgba(0, 0, 0, .11); + box-shadow: 0 3px 6px 0 rgba(0, 0, 0, .11); + margin-top: 10px; + overflow-y: scroll; + left: 0; + top: 100%; +} + +.simple-dropdown__option { + padding: 10px; + + &:hover { + background-color: $gallery; + } +} + +.simple-dropdown__option--selected { + background-color: $alto; + + &:hover { + background-color: $alto; + cursor: default; + } +} + +.simple-dropdown__close-area { + position: fixed; + top: 0; + left: 0; + z-index: 1000; + width: 100%; + height: 100%; +} diff --git a/ui/app/css/itcss/components/tab-bar.scss b/ui/app/css/itcss/components/tab-bar.scss new file mode 100644 index 000000000..4f3077974 --- /dev/null +++ b/ui/app/css/itcss/components/tab-bar.scss @@ -0,0 +1,23 @@ +.tab-bar { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: flex-end; +} + +.tab-bar__tab { + min-width: 0; + flex: 0 0 auto; + padding: 15px 25px; + border-bottom: 1px solid $alto; + box-sizing: border-box; + font-size: 18px; +} + +.tab-bar__tab--active { + border-color: $black; +} + +.tab-bar__grow-tab { + flex-grow: 1; +} diff --git a/ui/app/css/itcss/components/token-list.scss b/ui/app/css/itcss/components/token-list.scss new file mode 100644 index 000000000..d4add71b1 --- /dev/null +++ b/ui/app/css/itcss/components/token-list.scss @@ -0,0 +1,101 @@ +$wallet-balance-breakpoint: 890px; +$wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and (max-width: #{$wallet-balance-breakpoint})"; + +.token-list-item { + display: flex; + flex-flow: row nowrap; + align-items: center; + padding: 20px 24px; + cursor: pointer; + transition: linear 200ms; + background-color: rgba($wallet-balance-bg, 0); + position: relative; + + &__token-balance { + font-size: 130%; + + @media #{$wallet-balance-breakpoint-range} { + font-size: 105%; + } + } + + &__fiat-amount { + margin-top: .25%; + font-size: 105%; + text-transform: uppercase; + + @media #{$wallet-balance-breakpoint-range} { + font-size: 95%; + } + } + + @media #{$wallet-balance-breakpoint-range} { + padding: 10% 4%; + } + + &--active { + background-color: rgba($wallet-balance-bg, 1); + } + + &__identicon { + margin-right: 15px; + border: '1px solid #dedede'; + + @media #{$wallet-balance-breakpoint-range} { + margin-right: 4%; + } + } + + &__ellipsis { + // position: absolute; + // top: 20px; + // right: 24px; + line-height: 45px; + } + + &__balance-wrapper { + flex: 1 1 auto; + } +} + +.token-menu-dropdown { + height: 55px; + width: 191px; + border-radius: 4px; + background-color: rgba(0,0,0,0.82); + box-shadow: 0 2px 4px 0 rgba(0,0,0,0.5); + position: fixed; + margin-top: 20px; + margin-left: 105px; + z-index: 2000; + + &__close-area { + position: fixed; + top: 0; + left: 0; + z-index: 2100; + width: 100%; + height: 100%; + cursor: default; + } + + &__container { + padding: 16px 34px 32px; + z-index: 2200; + position: relative; + } + + &__options { + display: flex; + flex-direction: column; + justify-content: center; + } + + &__option { + color: $white; + font-family: Roboto; + font-size: 16px; + line-height: 21px; + text-align: center; + } +}
\ No newline at end of file diff --git a/ui/app/css/itcss/components/transaction-list.scss b/ui/app/css/itcss/components/transaction-list.scss new file mode 100644 index 000000000..a5d508f11 --- /dev/null +++ b/ui/app/css/itcss/components/transaction-list.scss @@ -0,0 +1,270 @@ +.tx-list-container { + height: 87.5%; + + @media screen and (min-width: $break-large) { + overflow-y: scroll; + } +} + +.tx-list-header { + text-transform: capitalize; +} + +@media screen and (max-width: $break-small) { + .tx-list-header-wrapper { + margin-top: .2em; + margin-bottom: .6em; + // TODO: Resolve Layout Conflicst in Wallet View + // - This fixes txlist "transactions" title dispay + // margin-top: 0.2em; + // margin-bottom: 0.6em; + justify-content: center; + flex: 0 0 auto; + } + + .tx-list-header { + align-self: center; + font-size: 12px; + color: $dusty-gray; + font-family: Roboto; + text-transform: uppercase; + } +} + +@media screen and (min-width: $break-large) { + .tx-list-header-wrapper { + flex: 0 0 55px; + } + + .tx-list-header { + font-size: 16px; + margin: 1.5em 2.37em; + } + + .tx-list-container::-webkit-scrollbar { + display: none; + } +} + +.tx-list-content-divider { + height: 1px; + background: rgb(231, 231, 231); + flex: 0 0 1px; + + @media screen and (max-width: $break-small) { + margin: .1em 0; + } + + @media screen and (min-width: $break-large) { + margin: .1em 2.37em; + } +} + +.tx-list-item-wrapper { + flex: 1 1 auto; + width: 0; + align-items: stretch; + justify-content: flex-start; + display: flex; + flex-flow: column nowrap; + + @media screen and (max-width: $break-small) { + padding: 0 1.3em .8em; + } + + @media screen and (min-width: $break-large) { + padding-bottom: 12px; + } +} + +.tx-list-clickable { + cursor: pointer; + + &:hover { + background: rgba($alto, .2); + } +} + +.tx-list-pending-item-container { + cursor: pointer; + opacity: .5; +} + +.tx-list-date-wrapper { + flex: 1 1 auto; + + @media screen and (max-width: $break-small) { + margin-top: 6px; + } + + @media screen and (min-width: $break-large) { + margin-top: 12px; + } +} + +.tx-list-content-wrapper { + align-items: stretch; + margin-bottom: 4px; + margin-top: 2px; + flex: 1 0 auto; + width: 100%; + display: flex; + flex-flow: row nowrap; + + @media screen and (max-width: $break-small) { + font-size: 12px; + + .tx-list-status { + font-size: 14px !important; + } + + .tx-list-account { + font-size: 14px !important; + } + + .tx-list-value { + font-size: 14px; + line-height: 18px; + } + + .tx-list-fiat-value { + font-size: 12px; + line-height: 16px; + } + } +} + +.tx-list-date { + color: $dusty-gray; + font-size: 12px; + font-family: Roboto; +} + +.tx-list-identicon-wrapper { + align-self: center; + flex: 0 0 auto; + margin-right: 16px; +} + +.tx-list-account-and-status-wrapper { + display: flex; + flex: 1 1 auto; + flex-flow: row wrap; + width: 0; + + @media screen and (max-width: $break-small) { + flex-direction: column; + justify-content: flex-start; + align-items: flex-start; + align-self: center; + + .tx-list-account-wrapper { + height: 18px; + + .tx-list-account { + line-height: 14px; + } + } + } + + @media screen and (min-width: $break-large) { + flex-direction: row; + justify-content: flex-start; + align-items: center; + + .tx-list-account-wrapper { + flex: 1.3 2 auto; + min-width: 153px; + } + + .tx-list-status-wrapper { + flex: 6 6 auto; + } + } + + .tx-list-account { + font-size: 16px; + color: $scorpion; + } + + .tx-list-status { + color: $dusty-gray; + font-size: 16px; + text-transform: capitalize; + } + + .tx-list-status--rejected, + .tx-list-status--failed { + color: $monzo; + } +} + +.tx-list-item { + border-top: 1px solid rgb(231, 231, 231); + flex: 0 0 auto; + display: flex; + flex-flow: row nowrap; + + @media screen and (max-width: $break-small) { + // margin: 0 1.3em .95em; !important + } + + @media screen and (min-width: $break-large) { + margin: 0 2.37em; + } + + &:last-of-type { + border-bottom: 1px solid rgb(231, 231, 231); + margin-bottom: 32px; + } + + &__wrapper { + align-self: center; + flex: 2 2 auto; + color: $dusty-gray; + + .tx-list-value { + font-size: 16px; + text-align: right; + } + + .tx-list-value--confirmed { + color: $caribbean-green; + } + + .tx-list-fiat-value { + font-size: 12px; + text-align: right; + } + } + + &--empty { + text-align: center; + border-bottom: none !important; + padding: 16px; + } +} + +.tx-list-details-wrapper { + overflow: hidden; + flex: 0 0 35%; +} + +.tx-list-value { + font-size: 16px; + text-align: right; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; +} + +.tx-list-fiat-value { + text-align: right; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; +} + +.tx-list-value--confirmed { + color: $caribbean-green; +} diff --git a/ui/app/css/itcss/components/wallet-balance.scss b/ui/app/css/itcss/components/wallet-balance.scss new file mode 100644 index 000000000..64b291b89 --- /dev/null +++ b/ui/app/css/itcss/components/wallet-balance.scss @@ -0,0 +1,71 @@ +$wallet-balance-bg: #e7e7e7; +$wallet-balance-breakpoint: 890px; +$wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and (max-width: #{$wallet-balance-breakpoint})"; + +.wallet-balance-wrapper { + flex: 0 0 auto; + transition: linear 200ms; + background: rgba($wallet-balance-bg, 0); + + &--active { + background: rgba($wallet-balance-bg, 1); + } +} + +.wallet-balance { + background: inherit; + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: center; + flex: 0 0 auto; + cursor: pointer; + border-top: 1px solid $wallet-balance-bg; + + .balance-container { + display: flex; + justify-content: flex-start; + align-items: center; + margin: 20px 24px; + flex-direction: row; + flex-grow: 3; + + @media #{$wallet-balance-breakpoint-range} { + margin: 10% 4%; + } + } + + .balance-display { + margin-left: 15px; + justify-content: flex-start; + align-items: flex-start; + + .token-amount { + font-size: 135%; + } + + .fiat-amount { + margin-top: .25%; + font-size: 105%; + } + + @media #{$wallet-balance-breakpoint-range} { + margin-left: 4%; + + .token-amount { + font-size: 105%; + } + + .fiat-amount { + font-size: 95%; + } + } + } + + .balance-icon { + border-radius: 25px; + width: 45px; + height: 45px; + border: 1px solid $alto; + } +} diff --git a/ui/app/css/itcss/generic/index.scss b/ui/app/css/itcss/generic/index.scss new file mode 100644 index 000000000..9d55324e3 --- /dev/null +++ b/ui/app/css/itcss/generic/index.scss @@ -0,0 +1,71 @@ +/* + Generic + */ + +@import './reset.scss'; + +* { + box-sizing: border-box; +} + +html, +body { + font-family: Roboto, Arial; + color: #4d4d4d; + font-weight: 300; + line-height: 1.4em; + background: #f7f7f7; + width: 100%; + height: 100%; + margin: 0; + padding: 0; +} + +html { + min-height: 500px; +} + +.app-root { + overflow: hidden; + position: relative; +} + +.app-primary { + display: flex; +} + +input:focus, +textarea:focus { + outline: none; +} + +/* stylelint-disable */ +#app-content { + overflow-x: hidden; + height: 100%; + display: flex; + flex-direction: column; + + @media screen and (max-width: $break-small) { + background-color: $white; + } +} +/* stylelint-enable */ + +a { + text-decoration: none; + color: inherit; +} + +a:hover { + color: #df6b0e; +} + +input.large-input, +textarea.large-input { + padding: 8px; +} + +input.large-input { + height: 36px; +} diff --git a/ui/app/css/itcss/generic/reset.scss b/ui/app/css/itcss/generic/reset.scss new file mode 100644 index 000000000..e054d533e --- /dev/null +++ b/ui/app/css/itcss/generic/reset.scss @@ -0,0 +1,147 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ + +html, +body, +div, +span, +applet, +object, +iframe, +h1, +h2, +h3, +h4, +h5, +h6, +p, +blockquote, +pre, +a, +abbr, +acronym, +address, +big, +cite, +code, +del, +dfn, +em, +img, +ins, +kbd, +q, +s, +samp, +small, +strike, +strong, +sub, +sup, +tt, +var, +b, +u, +i, +center, +dl, +dt, +dd, +ol, +ul, +li, +fieldset, +form, +label, +legend, +table, +caption, +tbody, +tfoot, +thead, +tr, +th, +td, +article, +aside, +canvas, +details, +embed, +figure, +figcaption, +footer, +header, +hgroup, +menu, +nav, +output, +ruby, +section, +summary, +time, +mark, +audio, +video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + /* stylelint-disable */ + font: inherit; + /* stylelint-enable */ + vertical-align: baseline; +} + +/* HTML5 display-role reset for older browsers */ + +/* stylelint-disable */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +menu, +nav, +section { + display: block; +} + +body { + line-height: 1; +} + +ol, +ul { + list-style: none; +} + +blockquote, +q { + quotes: none; +} + +blockquote:before, +blockquote:after, +q:before, +q:after { + content: ''; + content: none; +} + +table { + border-collapse: collapse; + border-spacing: 0; +} + +button { + border-style: none; + cursor: pointer; +} + +/* stylelint-enable */ diff --git a/ui/app/css/itcss/objects/index.scss b/ui/app/css/itcss/objects/index.scss new file mode 100644 index 000000000..220775682 --- /dev/null +++ b/ui/app/css/itcss/objects/index.scss @@ -0,0 +1 @@ +// Objects diff --git a/ui/app/css/itcss/settings/index.scss b/ui/app/css/itcss/settings/index.scss new file mode 100644 index 000000000..58a7ca7b7 --- /dev/null +++ b/ui/app/css/itcss/settings/index.scss @@ -0,0 +1,3 @@ +@import './variables.scss'; + +@import './typography.scss'; diff --git a/ui/app/css/itcss/settings/typography.scss b/ui/app/css/itcss/settings/typography.scss new file mode 100644 index 000000000..58e2d444e --- /dev/null +++ b/ui/app/css/itcss/settings/typography.scss @@ -0,0 +1,71 @@ +@import url('https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900'); + +@import url('https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css'); + +@font-face { + font-family: 'Montserrat Regular'; + src: url('/fonts/Montserrat/Montserrat-Regular.woff') format('woff'); + src: url('/fonts/Montserrat/Montserrat-Regular.ttf') format('truetype'); + font-weight: 400; + font-style: normal; + font-size: 'small'; +} + +@font-face { + font-family: 'Montserrat Bold'; + src: url('/fonts/Montserrat/Montserrat-Bold.woff') format('woff'); + src: url('/fonts/Montserrat/Montserrat-Bold.ttf') format('truetype'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'Montserrat Light'; + src: url('/fonts/Montserrat/Montserrat-Light.woff') format('woff'); + src: url('/fonts/Montserrat/Montserrat-Light.ttf') format('truetype'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'Montserrat UltraLight'; + src: url('/fonts/Montserrat/Montserrat-UltraLight.woff') format('woff'); + src: url('/fonts/Montserrat/Montserrat-UltraLight.ttf') format('truetype'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'DIN OT'; + src: url('/fonts/DIN_OT/DINOT-2.otf') format('opentype'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'DIN OT Light'; + src: url('/fonts/DIN_OT/DINOT-2.otf') format('opentype'); + font-weight: 200; + font-style: normal; +} + +@font-face { + font-family: 'DIN NEXT'; + src: url('/fonts/DIN NEXT/DIN NEXT W01 Regular.otf') format('opentype'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'DIN NEXT Light'; + src: url('/fonts/DIN NEXT/DIN NEXT W10 Light.otf') format('opentype'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'Lato'; + src: url('/fonts/Lato/Lato-Regular.ttf') format('truetype'); + font-weight: 400; + font-style: normal; +} diff --git a/ui/app/css/itcss/settings/variables.scss b/ui/app/css/itcss/settings/variables.scss new file mode 100644 index 000000000..387d14b5f --- /dev/null +++ b/ui/app/css/itcss/settings/variables.scss @@ -0,0 +1,77 @@ +/* + Variables + */ + +// Base Colors +$white: #fff; +$black: #000; +$orange: #ffa500; +$red: #f00; +$gray: #808080; + +/* + Colors + http://chir.ag/projects/name-that-color + */ +$white-linen: #faf6f0; // formerly 'faint orange (textfield shades)' +$rajah: #f5c26d; // formerly 'light orange (button shades)' +$buttercup: #f5a623; // formerly 'dark orange (text)' +$tundora: #4a4a4a; // formerly 'borders/font/any gray' +$gallery: #efefef; +$alabaster: #f7f7f7; +$shark: #22232c; +$wild-sand: #f6f6f6; +$white: #fff; +$dusty-gray: #9b9b9b; +$alto: #dedede; +$alabaster: #fafafa; +$silver-chalice: #aeaeae; +$curious-blue: #2f9ae0; +$concrete: #f3f3f3; +$tundora: #4d4d4d; +$nile-blue: #1b344d; +$scorpion: #5d5d5d; +$silver: #cdcdcd; +$caribbean-green: #02c9b1; +$monzo: #d0021b; +$crimson: #e91550; +$blue-lagoon: #038789; +$purple: #690496; +$tulip-tree: #ebb33f; +$malibu-blue: #7ac9fd; +$athens-grey: #e9edf0; +$jaffa: #f28930; +$geyser: #d2d8dd; + +/* + Z-Indicies + */ +$dropdown-z-index: 30; +$token-icon-z-index: 15; +$container-z-index: 15; +$header-z-index: 12; +$mobile-header-z-index: 26; +$main-container-z-index: 18; +$send-card-z-index: 20; +$sidebar-z-index: 26; +$sidebar-overlay-z-index: 25; + +/* + Z Indicies - Current + app - 11 + hex/bn as decimal input - 1 - remove? + dropdown - 11 + loading - 10 - higher? + mascot - 0 - remove? + */ + +/* + Responsive Breakpoints + */ +$break-small: 575px; +$break-midpoint: 780px; +$break-large: 576px; + + +$primary-font-type: Roboto; + diff --git a/ui/app/css/itcss/tools/index.scss b/ui/app/css/itcss/tools/index.scss new file mode 100644 index 000000000..2236729e8 --- /dev/null +++ b/ui/app/css/itcss/tools/index.scss @@ -0,0 +1 @@ +@import './utilities.scss'; diff --git a/ui/app/css/itcss/tools/utilities.scss b/ui/app/css/itcss/tools/utilities.scss new file mode 100644 index 000000000..ee867640d --- /dev/null +++ b/ui/app/css/itcss/tools/utilities.scss @@ -0,0 +1,309 @@ +/* + Utility Classes + */ + +/* color */ + +.color-orange { + color: #f7861c; // TODO: move to settings/variables +} + +.color-forest { + color: #0a5448; // TODO: move to settings/variables +} + +/* lib */ + +.full-size { + height: 100%; + width: 100%; +} + +.full-width { + width: 100%; +} + +.full-flex-height { + display: flex; + flex: 1 1 auto; + flex-direction: column; +} + +.full-height { + height: 100%; +} + +.flex-column { + display: flex; + flex-direction: column; +} + +.space-between { + justify-content: space-between; +} + +.space-around { + justify-content: space-around; +} + +.flex-column-bottom { + display: flex; + flex-direction: column-reverse; +} + +.flex-row { + display: flex; + flex-direction: row; +} + +.flex-space-between { + justify-content: space-between; +} + +.flex-space-around { + justify-content: space-around; +} + +.flex-right { + display: flex; + flex-direction: row; + justify-content: flex-end; +} + +.flex-left { + display: flex; + flex-direction: row; + justify-content: flex-start; +} + +.flex-fixed { + flex: none; +} + +.flex-basis-auto { + flex-basis: auto; +} + +.flex-grow { + flex: 1 1 auto; +} + +.flex-wrap { + flex-wrap: wrap; +} + +.flex-center { + display: flex; + justify-content: center; + align-items: center; +} + +.flex-justify-center { + justify-content: center; +} + +.flex-align-center { + align-items: center; +} + +.flex-self-end { + align-self: flex-end; +} + +.flex-self-stretch { + align-self: stretch; +} + +.flex-vertical { + flex-direction: column; +} + +.z-bump { + z-index: 1; +} + +.select-none { + cursor: inherit; + -moz-user-select: none; + -webkit-user-select: none; + -ms-user-select: none; + user-select: none; +} + +.pointer { + cursor: pointer; +} + +.cursor-pointer { + cursor: pointer; + transform-origin: center center; + transition: transform 50ms ease-in-out; +} + +.cursor-pointer:hover { + transform: scale(1.1); +} + +.cursor-pointer:active { + transform: scale(.95); +} + +.cursor-disabled { + cursor: not-allowed; +} + +.margin-bottom-sml { + margin-bottom: 20px; +} + +.margin-bottom-med { + margin-bottom: 40px; +} + +.margin-right-left { + margin: 0 20px; +} + +.bold { + font-weight: 700; +} + +.text-transform-uppercase { + text-transform: uppercase; +} + +.font-small { + font-size: 12px; +} + +.font-medium { + font-size: 1.2em; +} + +hr.horizontal-line { + display: block; + height: 1px; + border: 0; + border-top: 1px solid #ccc; + margin: 1em 0; + padding: 0; +} + +.hover-white:hover { + background: $white; +} + +.red-dot { + background: #e91550; + color: $white; + border-radius: 10px; +} + +.diamond { + transform: rotate(45deg); + background: #038789; +} + +.hollow-diamond { + transform: rotate(45deg); + border: 3px solid #690496; +} + +.golden-square { + background: #ebb33f; +} + +.pending-dot { + background: $red; + left: 14px; + top: 14px; + color: $white; + border-radius: 10px; + height: 20px; + min-width: 20px; + position: relative; + display: flex; + align-items: center; + justify-content: center; + padding: 4px; + z-index: 1; +} + +.keyring-label { + z-index: 1; + font-size: 8px; + line-height: 8px; + background: rgba(255, 255, 255, 0.4); + color: #fff; + border-radius: 10px; + padding: 4px; + text-align: center; + height: 15px; +} + +.ether-balance { + display: flex; + align-items: center; +} + +.tabSection { + min-width: 350px; +} + +.menu-icon { + display: inline-block; + height: 12px; + min-width: 12px; + margin: 13px; +} + +.ether-icon { + background: rgb(0, 163, 68); + border-radius: 20px; +} + +.testnet-icon { + background: #2465e1; +} + +.drop-menu-item { + display: flex; + align-items: center; +} + +.invisible { + visibility: hidden; +} + +.one-line-concat { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.critical-error { + text-align: center; + margin-top: 20px; + color: $red; +} + +/* + Misc + */ + +// TODO: move into component-level contextual 'active' state +.letter-spacey { + letter-spacing: .1em; +} + +.active { + color: #909090; +} + +.check { + margin-left: 7px; + color: #f7861c; + flex: 1 0 auto; + display: flex; + justify-content: flex-end; +} diff --git a/ui/app/css/itcss/trumps/index.scss b/ui/app/css/itcss/trumps/index.scss new file mode 100644 index 000000000..d9a4202a4 --- /dev/null +++ b/ui/app/css/itcss/trumps/index.scss @@ -0,0 +1,72 @@ +/* + Trumps + */ + +// Transitions + +/* universal */ +.app-primary .main-enter { + position: absolute; + width: 100%; +} + +/* center position */ +.app-primary.from-right .main-enter-active, +.app-primary.from-left .main-enter-active { + overflow-x: hidden; + transform: translateX(0); + transition: transform 300ms ease-in; +} + +/* exited positions */ +.app-primary.from-left .main-leave-active { + transform: translateX(360px); + transition: transform 300ms ease-in; +} + +.app-primary.from-right .main-leave-active { + transform: translateX(-360px); + transition: transform 300ms ease-in; +} + +.sidebar.from-left { + transform: translateX(-320px); + transition: transform 300ms ease-in; +} + +/* loader transitions */ +.loader-enter, +.loader-leave-active { + opacity: 0; + transition: opacity 150 ease-in; +} + +.loader-enter-active, +.loader-leave { + opacity: 1; + transition: opacity 150 ease-in; +} + +/* entering positions */ +.app-primary.from-right .main-enter:not(.main-enter-active) { + transform: translateX(360px); +} + +.app-primary.from-left .main-enter:not(.main-enter-active) { + transform: translateX(-360px); +} + +i.fa.fa-question-circle.fa-lg.menu-icon { + font-size: 18px; +} + +// This text is contained inside a div. +// ID needed to override user agent stylesheet. +// See components/modal.scss + +/* stylelint-disable */ +#buy-modal-content-footer-text { + font-family: 'DIN OT'; + font-size: 16px; +} +/* stylelint-enable */ diff --git a/ui/app/main-container.js b/ui/app/main-container.js new file mode 100644 index 000000000..031f61e84 --- /dev/null +++ b/ui/app/main-container.js @@ -0,0 +1,67 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +const AccountAndTransactionDetails = require('./account-and-transaction-details') +const HDRestoreVaultScreen = require('./keychains/hd/restore-vault') +const Settings = require('./settings') +const UnlockScreen = require('./unlock') + +module.exports = MainContainer + +inherits(MainContainer, Component) +function MainContainer () { + Component.call(this) +} + +MainContainer.prototype.render = function () { + // 3. summarize: + // switch statement goes inside MainContainer, + // or a method in renderPrimary + // - pass resulting h() to MainContainer + // - error checking in separate func + // - router in separate func + let contents = { + component: AccountAndTransactionDetails, + key: 'account-detail', + style: {}, + } + + if (this.props.isUnlocked === false) { + switch (this.props.currentViewName) { + case 'restoreVault': + log.debug('rendering restore vault screen') + contents = { + component: HDRestoreVaultScreen, + key: 'HDRestoreVaultScreen', + } + break + case 'config': + log.debug('rendering config screen from unlock screen.') + return h(Settings, {key: 'config'}) + default: + log.debug('rendering locked screen') + contents = { + component: UnlockScreen, + style: { + boxShadow: 'none', + display: 'flex', + alignItems: 'center', + justifyContent: 'center', + background: '#F7F7F7', + // must force 100%, because lock screen is full-width + width: '100%', + }, + key: 'locked', + } + } + } + + return h('div.main-container', { + style: contents.style, + }, [ + h(contents.component, { + key: contents.key, + }, []), + ]) +} + diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 8558d6dca..3a4fb536d 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -14,6 +14,7 @@ function reduceApp (state, action) { if (selectedAddress) { name = 'accountDetail' } + if (hasUnconfActions) { log.debug('pending txs detected, defaulting to conf-tx view.') name = 'confTx' @@ -36,6 +37,17 @@ function reduceApp (state, action) { var appState = extend({ shouldClose: false, menuOpen: false, + modal: { + open: false, + modalState: { + name: null, + }, + previousModalState: { + name: null, + }, + }, + sidebarOpen: false, + networkDropdownOpen: false, currentView: seedWords ? seedConfView : defaultView, accountDetail: { subview: 'transactions', @@ -49,9 +61,50 @@ function reduceApp (state, action) { }, state.appState) switch (action.type) { + // dropdown methods + case actions.NETWORK_DROPDOWN_OPEN: + return extend(appState, { + networkDropdownOpen: true, + }) - // transition methods + case actions.NETWORK_DROPDOWN_CLOSE: + return extend(appState, { + networkDropdownOpen: false, + }) + + // sidebar methods + case actions.SIDEBAR_OPEN: + return extend(appState, { + sidebarOpen: true, + }) + case actions.SIDEBAR_CLOSE: + return extend(appState, { + sidebarOpen: false, + }) + + // modal methods: + case actions.MODAL_OPEN: + return extend(appState, { + modal: Object.assign( + state.appState.modal, + { open: true }, + { modalState: action.payload }, + { previousModalState: appState.modal.modalState}, + ), + }) + + case actions.MODAL_CLOSE: + return extend(appState, { + modal: Object.assign( + state.appState.modal, + { open: false }, + { modalState: { name: null } }, + { previousModalState: appState.modal.modalState}, + ), + }) + + // transition methods case actions.TRANSITION_FORWARD: return extend(appState, { transForward: true, @@ -134,7 +187,7 @@ function reduceApp (state, action) { transForward: true, }) - case actions.CREATE_NEW_VAULT_IN_PROGRESS: + case actions.CREATE_NEW_VAULT_IN_PROGRESS: return extend(appState, { currentView: { name: 'createVault', @@ -173,6 +226,16 @@ function reduceApp (state, action) { warning: null, }) + case actions.SHOW_SEND_TOKEN_PAGE: + return extend(appState, { + currentView: { + name: 'sendToken', + context: appState.currentView.context, + }, + transForward: true, + warning: null, + }) + case actions.SHOW_NEW_KEYCHAIN: return extend(appState, { currentView: { @@ -308,7 +371,7 @@ function reduceApp (state, action) { return extend(appState, { currentView: { name: 'confTx', - context: 0, + context: action.id ? indexForPending(state, action.id) : indexForLastPending(state), }, transForward: action.transForward, warning: null, @@ -328,36 +391,36 @@ function reduceApp (state, action) { case actions.COMPLETED_TX: log.debug('reducing COMPLETED_TX for tx ' + action.value) - const otherUnconfActions = getUnconfActionList(state) - .filter(tx => tx.id !== action.value) - const hasOtherUnconfActions = otherUnconfActions.length > 0 - - if (hasOtherUnconfActions) { - log.debug('reducer detected txs - rendering confTx view') - return extend(appState, { - transForward: false, - currentView: { - name: 'confTx', - context: 0, - }, - warning: null, - }) - } else { - log.debug('attempting to close popup') - return extend(appState, { - // indicate notification should close - shouldClose: true, - transForward: false, - warning: null, - currentView: { - name: 'accountDetail', - context: state.metamask.selectedAddress, - }, - accountDetail: { - subview: 'transactions', - }, - }) - } + // const otherUnconfActions = getUnconfActionList(state) + // .filter(tx => tx.id !== action.value) + // const hasOtherUnconfActions = otherUnconfActions.length > 0 + + // if (hasOtherUnconfActions) { + // log.debug('reducer detected txs - rendering confTx view') + // return extend(appState, { + // transForward: false, + // currentView: { + // name: 'confTx', + // context: 0, + // }, + // warning: null, + // }) + // } else { + log.debug('attempting to close popup') + return extend(appState, { + // indicate notification should close + shouldClose: true, + transForward: false, + warning: null, + currentView: { + name: 'accountDetail', + context: state.metamask.selectedAddress, + }, + accountDetail: { + subview: 'transactions', + }, + }) + // } case actions.NEXT_TX: return extend(appState, { @@ -597,3 +660,7 @@ function indexForPending (state, txId) { const index = unconfTxList.indexOf(match) return index } + +function indexForLastPending (state) { + return getUnconfActionList(state).length +} diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 85ac3e201..294c29948 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -1,6 +1,7 @@ const extend = require('xtend') const actions = require('../actions') const MetamascaraPlatform = require('../../../app/scripts/platforms/window') +const { OLD_UI_NETWORK_TYPE } = require('../../../app/scripts/config').enums module.exports = reduceMetamask @@ -11,6 +12,7 @@ function reduceMetamask (state, action) { var metamaskState = extend({ isInitialized: false, isUnlocked: false, + isAccountMenuOpen: false, isMascara: window.platform instanceof MetamascaraPlatform, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: {}, @@ -19,8 +21,26 @@ function reduceMetamask (state, action) { lastUnreadNotice: undefined, frequentRpcList: [], addressBook: [], + selectedTokenAddress: null, tokenExchangeRates: {}, + tokens: [], + send: { + gasLimit: null, + gasPrice: null, + gasTotal: null, + tokenBalance: null, + from: '', + to: '', + amount: '0x0', + memo: '', + errors: {}, + maxModeOn: false, + editingTransactionId: null, + }, coinOptions: {}, + useBlockie: false, + featureFlags: {}, + networkEndpointType: OLD_UI_NETWORK_TYPE, }, state.metamask) switch (action.type) { @@ -94,6 +114,14 @@ function reduceMetamask (state, action) { } return newState + case actions.EDIT_TX: + return extend(metamaskState, { + send: { + ...metamaskState.send, + editingTransactionId: action.value, + }, + }) + case actions.SHOW_NEW_VAULT_SEED: return extend(metamaskState, { isUnlocked: true, @@ -119,12 +147,17 @@ function reduceMetamask (state, action) { delete newState.seedWords return newState + case actions.SET_SELECTED_TOKEN: + return extend(metamaskState, { + selectedTokenAddress: action.value, + }) + case actions.SAVE_ACCOUNT_LABEL: const account = action.value.account const name = action.value.label - var id = {} + const id = {} id[account] = extend(metamaskState.identities[account], { name }) - var identities = extend(metamaskState.identities, id) + const identities = extend(metamaskState.identities, id) return extend(metamaskState, { identities }) case actions.SET_CURRENT_FIAT: @@ -134,6 +167,147 @@ function reduceMetamask (state, action) { conversionDate: action.value.conversionDate, }) + case actions.UPDATE_TOKEN_EXCHANGE_RATE: + const { payload: { pair, marketinfo } } = action + return extend(metamaskState, { + tokenExchangeRates: { + ...metamaskState.tokenExchangeRates, + [pair]: marketinfo, + }, + }) + + case actions.UPDATE_TOKENS: + return extend(metamaskState, { + tokens: action.newTokens, + }) + + // metamask.send + case actions.UPDATE_GAS_LIMIT: + return extend(metamaskState, { + send: { + ...metamaskState.send, + gasLimit: action.value, + }, + }) + + case actions.UPDATE_GAS_PRICE: + return extend(metamaskState, { + send: { + ...metamaskState.send, + gasPrice: action.value, + }, + }) + + case actions.TOGGLE_ACCOUNT_MENU: + return extend(metamaskState, { + isAccountMenuOpen: !metamaskState.isAccountMenuOpen, + }) + + case actions.UPDATE_GAS_TOTAL: + return extend(metamaskState, { + send: { + ...metamaskState.send, + gasTotal: action.value, + }, + }) + + case actions.UPDATE_SEND_TOKEN_BALANCE: + return extend(metamaskState, { + send: { + ...metamaskState.send, + tokenBalance: action.value, + }, + }) + + case actions.UPDATE_SEND_FROM: + return extend(metamaskState, { + send: { + ...metamaskState.send, + from: action.value, + }, + }) + + case actions.UPDATE_SEND_TO: + return extend(metamaskState, { + send: { + ...metamaskState.send, + to: action.value, + }, + }) + + case actions.UPDATE_SEND_AMOUNT: + return extend(metamaskState, { + send: { + ...metamaskState.send, + amount: action.value, + }, + }) + + case actions.UPDATE_SEND_MEMO: + return extend(metamaskState, { + send: { + ...metamaskState.send, + memo: action.value, + }, + }) + + case actions.UPDATE_SEND_ERRORS: + return extend(metamaskState, { + send: { + ...metamaskState.send, + errors: { + ...metamaskState.send.errors, + ...action.value, + }, + }, + }) + + case actions.UPDATE_MAX_MODE: + return extend(metamaskState, { + send: { + ...metamaskState.send, + maxModeOn: action.value, + }, + }) + + case actions.UPDATE_SEND: + return extend(metamaskState, { + send: { + ...metamaskState.send, + ...action.value, + }, + }) + + case actions.CLEAR_SEND: + return extend(metamaskState, { + send: { + gasLimit: null, + gasPrice: null, + gasTotal: null, + tokenBalance: null, + from: '', + to: '', + amount: '0x0', + memo: '', + errors: {}, + editingTransactionId: null, + }, + }) + + case actions.UPDATE_TRANSACTION_PARAMS: + const { id: txId, value } = action + let { selectedAddressTxList } = metamaskState + selectedAddressTxList = selectedAddressTxList.map(tx => { + if (tx.id === txId) { + tx.txParams = value + } + return tx + }) + + return extend(metamaskState, { + selectedAddressTxList, + }) + case actions.PAIR_UPDATE: const { value: { marketinfo: pairMarketInfo } } = action return extend(metamaskState, { @@ -144,15 +318,30 @@ function reduceMetamask (state, action) { }) case actions.SHAPESHIFT_SUBVIEW: - const { value: { marketinfo, coinOptions } } = action + const { value: { marketinfo: ssMarketInfo, coinOptions } } = action return extend(metamaskState, { tokenExchangeRates: { ...metamaskState.tokenExchangeRates, - [marketinfo.pair]: marketinfo, + [ssMarketInfo.pair]: ssMarketInfo, }, coinOptions, }) + case actions.SET_USE_BLOCKIE: + return extend(metamaskState, { + useBlockie: action.value, + }) + + case actions.UPDATE_FEATURE_FLAGS: + return extend(metamaskState, { + featureFlags: action.value, + }) + + case actions.UPDATE_NETWORK_ENDPOINT_TYPE: + return extend(metamaskState, { + networkEndpointType: action.value, + }) + default: return metamaskState diff --git a/ui/app/root.js b/ui/app/root.js index 9e7314b20..21d6d1829 100644 --- a/ui/app/root.js +++ b/ui/app/root.js @@ -2,7 +2,7 @@ const inherits = require('util').inherits const Component = require('react').Component const Provider = require('react-redux').Provider const h = require('react-hyperscript') -const App = require('./app') +const SelectedApp = require('./select-app') module.exports = Root @@ -15,7 +15,7 @@ Root.prototype.render = function () { h(Provider, { store: this.props.store, }, [ - h(App), + h(SelectedApp), ]) ) diff --git a/ui/app/select-app.js b/ui/app/select-app.js new file mode 100644 index 000000000..ac6867aeb --- /dev/null +++ b/ui/app/select-app.js @@ -0,0 +1,61 @@ +const inherits = require('util').inherits +const Component = require('react').Component +const connect = require('react-redux').connect +const h = require('react-hyperscript') +const App = require('./app') +const OldApp = require('../../old-ui/app/app') +const { autoAddToBetaUI } = require('./selectors') +const { setFeatureFlag, setNetworkEndpoints } = require('./actions') +const { BETA_UI_NETWORK_TYPE } = require('../../app/scripts/config').enums + +function mapStateToProps (state) { + return { + betaUI: state.metamask.featureFlags.betaUI, + autoAdd: autoAddToBetaUI(state), + isUnlocked: state.metamask.isUnlocked, + isMascara: state.metamask.isMascara, + firstTime: Object.keys(state.metamask.identities).length === 0, + } +} + +function mapDispatchToProps (dispatch) { + return { + setFeatureFlagWithModal: () => { + return dispatch(setFeatureFlag('betaUI', true, 'BETA_UI_NOTIFICATION_MODAL')) + .then(() => dispatch(setNetworkEndpoints(BETA_UI_NETWORK_TYPE))) + }, + setFeatureFlagWithoutModal: () => { + return dispatch(setFeatureFlag('betaUI', true)) + .then(() => dispatch(setNetworkEndpoints(BETA_UI_NETWORK_TYPE))) + }, + } +} +module.exports = connect(mapStateToProps, mapDispatchToProps)(SelectedApp) + +inherits(SelectedApp, Component) +function SelectedApp () { + Component.call(this) +} + +SelectedApp.prototype.componentWillReceiveProps = function (nextProps) { + const { + isUnlocked, + setFeatureFlagWithModal, + setFeatureFlagWithoutModal, + isMascara, + firstTime, + } = this.props + + if (isMascara || firstTime) { + setFeatureFlagWithoutModal() + } else if (!isUnlocked && nextProps.isUnlocked && (nextProps.autoAdd)) { + setFeatureFlagWithModal() + } +} + +SelectedApp.prototype.render = function () { + const { betaUI, isMascara, firstTime } = this.props + + const Selected = betaUI || isMascara || firstTime ? App : OldApp + return h(Selected) +} diff --git a/ui/app/selectors.js b/ui/app/selectors.js new file mode 100644 index 000000000..22ef439c4 --- /dev/null +++ b/ui/app/selectors.js @@ -0,0 +1,183 @@ +const valuesFor = require('./util').valuesFor +const abi = require('human-standard-token-abi') + +const { + multiplyCurrencies, +} = require('./conversion-util') + +const selectors = { + getSelectedAddress, + getSelectedIdentity, + getSelectedAccount, + getSelectedToken, + getSelectedTokenExchangeRate, + getTokenExchangeRate, + conversionRateSelector, + transactionsSelector, + accountsWithSendEtherInfoSelector, + getCurrentAccountWithSendEtherInfo, + getGasPrice, + getGasLimit, + getAddressBook, + getSendFrom, + getCurrentCurrency, + getSendAmount, + getSelectedTokenToFiatRate, + getSelectedTokenContract, + autoAddToBetaUI, + getSendMaxModeState, +} + +module.exports = selectors + +function getSelectedAddress (state) { + const selectedAddress = state.metamask.selectedAddress || Object.keys(state.metamask.accounts)[0] + + return selectedAddress +} + +function getSelectedIdentity (state) { + const selectedAddress = getSelectedAddress(state) + const identities = state.metamask.identities + + return identities[selectedAddress] +} + +function getSelectedAccount (state) { + const accounts = state.metamask.accounts + const selectedAddress = getSelectedAddress(state) + + return accounts[selectedAddress] +} + +function getSelectedToken (state) { + const tokens = state.metamask.tokens || [] + const selectedTokenAddress = state.metamask.selectedTokenAddress + const selectedToken = tokens.filter(({ address }) => address === selectedTokenAddress)[0] + + return selectedToken || null +} + +function getSelectedTokenExchangeRate (state) { + const tokenExchangeRates = state.metamask.tokenExchangeRates + const selectedToken = getSelectedToken(state) || {} + const { symbol = '' } = selectedToken + + const pair = `${symbol.toLowerCase()}_eth` + const { rate: tokenExchangeRate = 0 } = tokenExchangeRates[pair] || {} + + return tokenExchangeRate +} + +function getTokenExchangeRate (state, tokenSymbol) { + const pair = `${tokenSymbol.toLowerCase()}_eth` + const tokenExchangeRates = state.metamask.tokenExchangeRates + const { rate: tokenExchangeRate = 0 } = tokenExchangeRates[pair] || {} + + return tokenExchangeRate +} + +function conversionRateSelector (state) { + return state.metamask.conversionRate +} + +function getAddressBook (state) { + return state.metamask.addressBook +} + +function accountsWithSendEtherInfoSelector (state) { + const { + accounts, + identities, + } = state.metamask + + const accountsWithSendEtherInfo = Object.entries(accounts).map(([key, account]) => { + return Object.assign({}, account, identities[key]) + }) + + return accountsWithSendEtherInfo +} + +function getCurrentAccountWithSendEtherInfo (state) { + const currentAddress = getSelectedAddress(state) + const accounts = accountsWithSendEtherInfoSelector(state) + + return accounts.find(({ address }) => address === currentAddress) +} + +function transactionsSelector (state) { + const { network, selectedTokenAddress } = state.metamask + const unapprovedMsgs = valuesFor(state.metamask.unapprovedMsgs) + const shapeShiftTxList = (network === '1') ? state.metamask.shapeShiftTxList : undefined + const transactions = state.metamask.selectedAddressTxList || [] + const txsToRender = !shapeShiftTxList ? transactions.concat(unapprovedMsgs) : transactions.concat(unapprovedMsgs, shapeShiftTxList) + + // console.log({txsToRender, selectedTokenAddress}) + return selectedTokenAddress + ? txsToRender + .filter(({ txParams: { to } }) => to === selectedTokenAddress) + .sort((a, b) => b.time - a.time) + : txsToRender + .sort((a, b) => b.time - a.time) +} + +function getGasPrice (state) { + return state.metamask.send.gasPrice +} + +function getGasLimit (state) { + return state.metamask.send.gasLimit +} + +function getSendFrom (state) { + return state.metamask.send.from +} + +function getSendAmount (state) { + return state.metamask.send.amount +} + +function getSendMaxModeState (state) { + return state.metamask.send.maxModeOn +} + +function getCurrentCurrency (state) { + return state.metamask.currentCurrency +} + +function getSelectedTokenToFiatRate (state) { + const selectedTokenExchangeRate = getSelectedTokenExchangeRate(state) + const conversionRate = conversionRateSelector(state) + + const tokenToFiatRate = multiplyCurrencies( + conversionRate, + selectedTokenExchangeRate, + { toNumericBase: 'dec' } + ) + + return tokenToFiatRate +} + +function getSelectedTokenContract (state) { + const selectedToken = getSelectedToken(state) + return selectedToken + ? global.eth.contract(abi).at(selectedToken.address) + : null +} + +function autoAddToBetaUI (state) { + const autoAddTransactionThreshold = 12 + const autoAddAccountsThreshold = 2 + const autoAddTokensThreshold = 1 + + const numberOfTransactions = state.metamask.selectedAddressTxList.length + const numberOfAccounts = Object.keys(state.metamask.accounts).length + const numberOfTokensAdded = state.metamask.tokens.length + + const userPassesThreshold = (numberOfTransactions > autoAddTransactionThreshold) && + (numberOfAccounts > autoAddAccountsThreshold) && + (numberOfTokensAdded > autoAddTokensThreshold) + const userIsNotInBeta = !state.metamask.featureFlags.betaUI + + return userIsNotInBeta && userPassesThreshold +}
\ No newline at end of file diff --git a/ui/app/send-v2.js b/ui/app/send-v2.js new file mode 100644 index 000000000..7c9b6dbc6 --- /dev/null +++ b/ui/app/send-v2.js @@ -0,0 +1,645 @@ +const { inherits } = require('util') +const PersistentForm = require('../lib/persistent-form') +const h = require('react-hyperscript') + +const ethAbi = require('ethereumjs-abi') +const ethUtil = require('ethereumjs-util') + +const Identicon = require('./components/identicon') +const FromDropdown = require('./components/send/from-dropdown') +const ToAutoComplete = require('./components/send/to-autocomplete') +const CurrencyDisplay = require('./components/send/currency-display') +const MemoTextArea = require('./components/send/memo-textarea') +const GasFeeDisplay = require('./components/send/gas-fee-display-v2') + +const { + MIN_GAS_TOTAL, + TOKEN_TRANSFER_FUNCTION_SIGNATURE, +} = require('./components/send/send-constants') + +const { + multiplyCurrencies, + conversionGreaterThan, + subtractCurrencies, +} = require('./conversion-util') +const { + calcTokenAmount, +} = require('./token-util') +const { + isBalanceSufficient, + isTokenBalanceSufficient, +} = require('./components/send/send-utils') +const { isValidAddress } = require('./util') + +module.exports = SendTransactionScreen + +inherits(SendTransactionScreen, PersistentForm) +function SendTransactionScreen () { + PersistentForm.call(this) + + this.state = { + fromDropdownOpen: false, + toDropdownOpen: false, + errors: { + to: null, + amount: null, + }, + } + + this.handleToChange = this.handleToChange.bind(this) + this.handleAmountChange = this.handleAmountChange.bind(this) + this.validateAmount = this.validateAmount.bind(this) +} + +const getParamsForGasEstimate = function (selectedAddress, symbol, data) { + const estimatedGasParams = { + from: selectedAddress, + gas: '746a528800', + } + + if (symbol) { + Object.assign(estimatedGasParams, { value: '0x0' }) + } + + if (data) { + Object.assign(estimatedGasParams, { data }) + } + + return estimatedGasParams +} + +SendTransactionScreen.prototype.updateSendTokenBalance = function (usersToken) { + if (!usersToken) return + + const { + selectedToken = {}, + updateSendTokenBalance, + } = this.props + const { decimals } = selectedToken || {} + const tokenBalance = calcTokenAmount(usersToken.balance.toString(), decimals) + + updateSendTokenBalance(tokenBalance) +} + +SendTransactionScreen.prototype.componentWillMount = function () { + const { + updateTokenExchangeRate, + selectedToken = {}, + getGasPrice, + estimateGas, + selectedAddress, + data, + updateGasTotal, + from, + tokenContract, + editingTransactionId, + gasPrice, + gasLimit, + } = this.props + const { symbol } = selectedToken || {} + + if (symbol) { + updateTokenExchangeRate(symbol) + } + + const estimateGasParams = getParamsForGasEstimate(selectedAddress, symbol, data) + + const tokenBalancePromise = tokenContract && tokenContract.balanceOf(from.address) + let newGasTotal + if (!editingTransactionId) { + Promise + .all([ + getGasPrice(), + estimateGas(estimateGasParams), + tokenBalancePromise, + ]) + .then(([gasPrice, gas, usersToken]) => { + + const newGasTotal = multiplyCurrencies(gas, gasPrice, { + toNumericBase: 'hex', + multiplicandBase: 16, + multiplierBase: 16, + }) + updateGasTotal(newGasTotal) + this.updateSendTokenBalance(usersToken) + }) + } else { + newGasTotal = multiplyCurrencies(gasLimit, gasPrice, { + toNumericBase: 'hex', + multiplicandBase: 16, + multiplierBase: 16, + }) + updateGasTotal(newGasTotal) + tokenBalancePromise && tokenBalancePromise.then( + usersToken => this.updateSendTokenBalance(usersToken)) + } +} + +SendTransactionScreen.prototype.componentDidUpdate = function (prevProps) { + const { + from: { balance }, + gasTotal, + tokenBalance, + amount, + selectedToken, + } = this.props + const { + from: { balance: prevBalance }, + gasTotal: prevGasTotal, + tokenBalance: prevTokenBalance, + } = prevProps + + const notFirstRender = [prevBalance, prevGasTotal].every(n => n !== null) + + const balanceHasChanged = balance !== prevBalance + const gasTotalHasChange = gasTotal !== prevGasTotal + const tokenBalanceHasChanged = selectedToken && tokenBalance !== prevTokenBalance + const amountValidationChange = balanceHasChanged || gasTotalHasChange || tokenBalanceHasChanged + + if (notFirstRender && amountValidationChange) { + this.validateAmount(amount) + } +} + +SendTransactionScreen.prototype.renderHeaderIcon = function () { + const { selectedToken } = this.props + + return h('div.send-v2__send-header-icon-container', [ + selectedToken + ? h(Identicon, { + diameter: 40, + address: selectedToken.address, + }) + : h('img.send-v2__send-header-icon', { src: '../images/eth_logo.svg' }), + ]) +} + +SendTransactionScreen.prototype.renderTitle = function () { + const { selectedToken } = this.props + + return h('div.send-v2__title', [selectedToken ? 'Send Tokens' : 'Send Funds']) +} + +SendTransactionScreen.prototype.renderCopy = function () { + const { selectedToken } = this.props + + const tokenText = selectedToken ? 'tokens' : 'ETH' + + return h('div.send-v2__form-header-copy', [ + + h('div.send-v2__copy', `Only send ${tokenText} to an Ethereum address.`), + + h('div.send-v2__copy', 'Sending to a different crytpocurrency that is not Ethereum may result in permanent loss.'), + + ]) +} + +SendTransactionScreen.prototype.renderHeader = function () { + return h('div', [ + h('div.send-v2__header', {}, [ + + this.renderHeaderIcon(), + + h('div.send-v2__arrow-background', [ + h('i.fa.fa-lg.fa-arrow-circle-right.send-v2__send-arrow-icon'), + ]), + + h('div.send-v2__header-tip'), + + ]), + + ]) +} + +SendTransactionScreen.prototype.renderErrorMessage = function (errorType) { + const { errors } = this.props + const errorMessage = errors[errorType] + + return errorMessage + ? h('div.send-v2__error', [ errorMessage ]) + : null +} + +SendTransactionScreen.prototype.handleFromChange = async function (newFrom) { + const { + updateSendFrom, + tokenContract, + } = this.props + + if (tokenContract) { + const usersToken = await tokenContract.balanceOf(newFrom.address) + this.updateSendTokenBalance(usersToken) + } + updateSendFrom(newFrom) +} + +SendTransactionScreen.prototype.renderFromRow = function () { + const { + from, + fromAccounts, + conversionRate, + } = this.props + + const { fromDropdownOpen } = this.state + + return h('div.send-v2__form-row', [ + + h('div.send-v2__form-label', 'From:'), + + h('div.send-v2__form-field', [ + h(FromDropdown, { + dropdownOpen: fromDropdownOpen, + accounts: fromAccounts, + selectedAccount: from, + onSelect: newFrom => this.handleFromChange(newFrom), + openDropdown: () => this.setState({ fromDropdownOpen: true }), + closeDropdown: () => this.setState({ fromDropdownOpen: false }), + conversionRate, + }), + ]), + + ]) +} + +SendTransactionScreen.prototype.handleToChange = function (to) { + const { + updateSendTo, + updateSendErrors, + from: {address: from}, + } = this.props + let toError = null + + if (!to) { + toError = 'Required' + } else if (!isValidAddress(to)) { + toError = 'Recipient address is invalid' + } else if (to === from) { + toError = 'From and To address cannot be the same' + } + + updateSendTo(to) + updateSendErrors({ to: toError }) +} + +SendTransactionScreen.prototype.renderToRow = function () { + const { toAccounts, errors, to } = this.props + + const { toDropdownOpen } = this.state + + return h('div.send-v2__form-row', [ + + h('div.send-v2__form-label', [ + + 'To:', + + this.renderErrorMessage('to'), + + ]), + + h('div.send-v2__form-field', [ + h(ToAutoComplete, { + to, + accounts: Object.entries(toAccounts).map(([key, account]) => account), + dropdownOpen: toDropdownOpen, + openDropdown: () => this.setState({ toDropdownOpen: true }), + closeDropdown: () => this.setState({ toDropdownOpen: false }), + onChange: this.handleToChange, + inError: Boolean(errors.to), + }), + ]), + + ]) +} + +SendTransactionScreen.prototype.handleAmountChange = function (value) { + const amount = value + const { updateSendAmount, setMaxModeTo } = this.props + + setMaxModeTo(false) + this.validateAmount(amount) + updateSendAmount(amount) +} + +SendTransactionScreen.prototype.setAmountToMax = function () { + const { + from: { balance }, + updateSendAmount, + updateSendErrors, + tokenBalance, + selectedToken, + gasTotal, + } = this.props + const { decimals } = selectedToken || {} + const multiplier = Math.pow(10, Number(decimals || 0)) + + const maxAmount = selectedToken + ? multiplyCurrencies(tokenBalance, multiplier, {toNumericBase: 'hex'}) + : subtractCurrencies( + ethUtil.addHexPrefix(balance), + ethUtil.addHexPrefix(gasTotal), + { toNumericBase: 'hex' } + ) + + updateSendErrors({ amount: null }) + + updateSendAmount(maxAmount) +} + +SendTransactionScreen.prototype.validateAmount = function (value) { + const { + from: { balance }, + updateSendErrors, + amountConversionRate, + conversionRate, + primaryCurrency, + selectedToken, + gasTotal, + tokenBalance, + } = this.props + const { decimals } = selectedToken || {} + const amount = value + + let amountError = null + const sufficientBalance = isBalanceSufficient({ + amount: selectedToken ? '0x0' : amount, + gasTotal, + balance, + primaryCurrency, + amountConversionRate, + conversionRate, + }) + + let sufficientTokens + if (selectedToken) { + sufficientTokens = isTokenBalanceSufficient({ + tokenBalance, + amount, + decimals, + }) + } + + const amountLessThanZero = conversionGreaterThan( + { value: 0, fromNumericBase: 'dec' }, + { value: amount, fromNumericBase: 'hex' }, + ) + + if (!sufficientBalance) { + amountError = 'Insufficient funds.' + } else if (selectedToken && !sufficientTokens) { + amountError = 'Insufficient tokens.' + } else if (amountLessThanZero) { + amountError = 'Can not send negative amounts of ETH.' + } + + updateSendErrors({ amount: amountError }) +} + +SendTransactionScreen.prototype.renderAmountRow = function () { + const { + selectedToken, + primaryCurrency = 'ETH', + convertedCurrency, + amountConversionRate, + errors, + amount, + setMaxModeTo, + maxModeOn, + } = this.props + + return h('div.send-v2__form-row', [ + + h('div.send-v2__form-label', [ + 'Amount:', + this.renderErrorMessage('amount'), + !errors.amount && h('div.send-v2__amount-max', { + onClick: (event) => { + event.preventDefault() + setMaxModeTo(true) + this.setAmountToMax() + }, + }, [ !maxModeOn ? 'Max' : '' ]), + ]), + + h('div.send-v2__form-field', [ + h(CurrencyDisplay, { + inError: Boolean(errors.amount), + primaryCurrency, + convertedCurrency, + selectedToken, + value: amount || '0x0', + conversionRate: amountConversionRate, + handleChange: this.handleAmountChange, + }), + ]), + + ]) +} + +SendTransactionScreen.prototype.renderGasRow = function () { + const { + conversionRate, + convertedCurrency, + showCustomizeGasModal, + gasTotal = MIN_GAS_TOTAL, + } = this.props + + return h('div.send-v2__form-row', [ + + h('div.send-v2__form-label', 'Gas fee:'), + + h('div.send-v2__form-field', [ + + h(GasFeeDisplay, { + gasTotal, + conversionRate, + convertedCurrency, + onClick: showCustomizeGasModal, + }), + + h('div.send-v2__sliders-icon-container', { + onClick: showCustomizeGasModal, + }, [ + h('i.fa.fa-sliders.send-v2__sliders-icon'), + ]), + + ]), + + ]) +} + +SendTransactionScreen.prototype.renderMemoRow = function () { + const { updateSendMemo, memo } = this.props + + return h('div.send-v2__form-row', [ + + h('div.send-v2__form-label', 'Transaction Memo:'), + + h('div.send-v2__form-field', [ + h(MemoTextArea, { + memo, + onChange: (event) => updateSendMemo(event.target.value), + }), + ]), + + ]) +} + +SendTransactionScreen.prototype.renderForm = function () { + return h('div.send-v2__form', {}, [ + + h('div.sendV2__form-header', [ + + this.renderTitle(), + + this.renderCopy(), + + ]), + + this.renderFromRow(), + + this.renderToRow(), + + this.renderAmountRow(), + + this.renderGasRow(), + + // this.renderMemoRow(), + + ]) +} + +SendTransactionScreen.prototype.renderFooter = function () { + const { + goHome, + clearSend, + errors: { amount: amountError, to: toError }, + } = this.props + + const noErrors = !amountError && toError === null + const errorClass = noErrors ? '' : '__disabled' + + return h('div.send-v2__footer', [ + h('button.send-v2__cancel-btn', { + onClick: () => { + clearSend() + goHome() + }, + }, 'Cancel'), + h(`button.send-v2__next-btn${errorClass}`, { + onClick: event => this.onSubmit(event), + }, 'Next'), + ]) +} + +SendTransactionScreen.prototype.render = function () { + return ( + + h('div.send-v2__container', [ + + this.renderHeader(), + + this.renderForm(), + + this.renderFooter(), + ]) + + ) +} + +SendTransactionScreen.prototype.addToAddressBookIfNew = function (newAddress) { + const { toAccounts, addToAddressBook } = this.props + if (!toAccounts.find(({ address }) => newAddress === address)) { + // TODO: nickname, i.e. addToAddressBook(recipient, nickname) + addToAddressBook(newAddress) + } +} + +SendTransactionScreen.prototype.getEditedTx = function () { + const { + from: {address: from}, + to, + amount, + gasLimit: gas, + gasPrice, + selectedToken, + editingTransactionId, + unapprovedTxs, + } = this.props + + const editingTx = { + ...unapprovedTxs[editingTransactionId], + txParams: { + from: ethUtil.addHexPrefix(from), + gas: ethUtil.addHexPrefix(gas), + gasPrice: ethUtil.addHexPrefix(gasPrice), + }, + } + + if (selectedToken) { + const data = TOKEN_TRANSFER_FUNCTION_SIGNATURE + Array.prototype.map.call( + ethAbi.rawEncode(['address', 'uint256'], [to, ethUtil.addHexPrefix(amount)]), + x => ('00' + x.toString(16)).slice(-2) + ).join('') + + Object.assign(editingTx.txParams, { + value: ethUtil.addHexPrefix('0'), + to: ethUtil.addHexPrefix(selectedToken.address), + data, + }) + } else { + Object.assign(editingTx.txParams, { + value: ethUtil.addHexPrefix(amount), + to: ethUtil.addHexPrefix(to), + }) + } + + return editingTx +} + +SendTransactionScreen.prototype.onSubmit = function (event) { + event.preventDefault() + const { + from: {address: from}, + to, + amount, + gasLimit: gas, + gasPrice, + signTokenTx, + signTx, + updateTx, + selectedToken, + editingTransactionId, + errors: { amount: amountError, to: toError }, + } = this.props + + const noErrors = !amountError && toError === null + + if (!noErrors) { + return + } + + this.addToAddressBookIfNew(to) + + if (editingTransactionId) { + const editedTx = this.getEditedTx() + + updateTx(editedTx) + } else { + + const txParams = { + from, + value: '0', + gas, + gasPrice, + } + + if (!selectedToken) { + txParams.value = amount + txParams.to = to + } + + selectedToken + ? signTokenTx(selectedToken.address, to, amount, txParams) + : signTx(txParams) + } +} diff --git a/ui/app/send.js b/ui/app/send.js index 09c9e03d4..517b7690d 100644 --- a/ui/app/send.js +++ b/ui/app/send.js @@ -1,309 +1,547 @@ -const inherits = require('util').inherits -const PersistentForm = require('../lib/persistent-form') -const h = require('react-hyperscript') -const connect = require('react-redux').connect -const Identicon = require('./components/identicon') -const actions = require('./actions') -const util = require('./util') -const numericBalance = require('./util').numericBalance -const addressSummary = require('./util').addressSummary -const isHex = require('./util').isHex -const EthBalance = require('./components/eth-balance') -const EnsInput = require('./components/ens-input') -const ethUtil = require('ethereumjs-util') -module.exports = connect(mapStateToProps)(SendTransactionScreen) - -function mapStateToProps (state) { - var result = { - address: state.metamask.selectedAddress, - accounts: state.metamask.accounts, - identities: state.metamask.identities, - warning: state.appState.warning, - network: state.metamask.network, - addressBook: state.metamask.addressBook, - conversionRate: state.metamask.conversionRate, - currentCurrency: state.metamask.currentCurrency, - } - - result.error = result.warning && result.warning.split('.')[0] - - result.account = result.accounts[result.address] - result.identity = result.identities[result.address] - result.balance = result.account ? numericBalance(result.account.balance) : null - - return result -} - -inherits(SendTransactionScreen, PersistentForm) -function SendTransactionScreen () { - PersistentForm.call(this) -} - -SendTransactionScreen.prototype.render = function () { - this.persistentFormParentId = 'send-tx-form' - - const props = this.props - const { - address, - account, - identity, - network, - identities, - addressBook, - conversionRate, - currentCurrency, - } = props - - return ( - - h('.send-screen.flex-column.flex-grow', [ - - // - // Sender Profile - // - - h('.account-data-subsection.flex-row.flex-grow', { - style: { - margin: '0 20px', - }, - }, [ - - // header - identicon + nav - h('.flex-row.flex-space-between', { - style: { - marginTop: '15px', - }, - }, [ - // back button - h('i.fa.fa-arrow-left.fa-lg.cursor-pointer.color-orange', { - onClick: this.back.bind(this), - }), - - // large identicon - h('.identicon-wrapper.flex-column.flex-center.select-none', [ - h(Identicon, { - diameter: 62, - address: address, - }), - ]), - - // invisible place holder - h('i.fa.fa-users.fa-lg.invisible', { - style: { - marginTop: '28px', - }, - }), - - ]), - - // account label - - h('.flex-column', { - style: { - marginTop: '10px', - alignItems: 'flex-start', - }, - }, [ - h('h2.font-medium.color-forest.flex-center', { - style: { - paddingTop: '8px', - marginBottom: '8px', - }, - }, identity && identity.name), - - // address and getter actions - h('.flex-row.flex-center', { - style: { - marginBottom: '8px', - }, - }, [ - - h('div', { - style: { - lineHeight: '16px', - }, - }, addressSummary(address)), - - ]), - - // balance - h('.flex-row.flex-center', [ - - h(EthBalance, { - value: account && account.balance, - conversionRate, - currentCurrency, - }), - - ]), - ]), - ]), - - // - // Required Fields - // - - h('h3.flex-center.text-transform-uppercase', { - style: { - background: '#EBEBEB', - color: '#AEAEAE', - marginTop: '15px', - marginBottom: '16px', - }, - }, [ - 'Send Transaction', - ]), - - // error message - props.error && h('span.error.flex-center', props.error), - - // 'to' field - h('section.flex-row.flex-center', [ - h(EnsInput, { - name: 'address', - placeholder: 'Recipient Address', - onChange: this.recipientDidChange.bind(this), - network, - identities, - addressBook, - }), - ]), - - // 'amount' and send button - h('section.flex-row.flex-center', [ - - h('input.large-input', { - name: 'amount', - placeholder: 'Amount', - type: 'number', - style: { - marginRight: '6px', - }, - dataset: { - persistentFormId: 'tx-amount', - }, - }), - - h('button.primary', { - onClick: this.onSubmit.bind(this), - style: { - textTransform: 'uppercase', - }, - }, 'Next'), - - ]), - - // - // Optional Fields - // - h('h3.flex-center.text-transform-uppercase', { - style: { - background: '#EBEBEB', - color: '#AEAEAE', - marginTop: '16px', - marginBottom: '16px', - }, - }, [ - 'Transaction Data (optional)', - ]), - - // 'data' field - h('section.flex-column.flex-center', [ - h('input.large-input', { - name: 'txData', - placeholder: '0x01234', - style: { - width: '100%', - resize: 'none', - }, - dataset: { - persistentFormId: 'tx-data', - }, - }), - ]), - ]) - ) -} - -SendTransactionScreen.prototype.navigateToAccounts = function (event) { - event.stopPropagation() - this.props.dispatch(actions.showAccountsPage()) -} - -SendTransactionScreen.prototype.back = function () { - var address = this.props.address - this.props.dispatch(actions.backToAccountDetail(address)) -} - -SendTransactionScreen.prototype.recipientDidChange = function (recipient, nickname) { - this.setState({ - recipient: recipient, - nickname: nickname, - }) -} - -SendTransactionScreen.prototype.onSubmit = function () { - const state = this.state || {} - const recipient = state.recipient || document.querySelector('input[name="address"]').value.replace(/^[.\s]+|[.\s]+$/g, '') - const nickname = state.nickname || ' ' - const input = document.querySelector('input[name="amount"]').value - const parts = input.split('') - - let message - - if (isNaN(input) || input === '') { - message = 'Invalid ether value.' - return this.props.dispatch(actions.displayWarning(message)) - } - - if (parts[1]) { - var decimal = parts[1] - if (decimal.length > 18) { - message = 'Ether amount is too precise.' - return this.props.dispatch(actions.displayWarning(message)) - } - } - - const value = util.normalizeEthStringToWei(input) - const txData = document.querySelector('input[name="txData"]').value - const balance = this.props.balance - - if (value.gt(balance)) { - message = 'Insufficient funds.' - return this.props.dispatch(actions.displayWarning(message)) - } - - if (input < 0) { - message = 'Can not send negative amounts of ETH.' - return this.props.dispatch(actions.displayWarning(message)) - } - - if ((util.isInvalidChecksumAddress(recipient))) { - message = 'Recipient address checksum is invalid.' - return this.props.dispatch(actions.displayWarning(message)) - } - - if ((!util.isValidAddress(recipient) && !txData) || (!recipient && !txData)) { - message = 'Recipient address is invalid.' - return this.props.dispatch(actions.displayWarning(message)) - } - - if (!isHex(ethUtil.stripHexPrefix(txData)) && txData) { - message = 'Transaction data must be hex string.' - return this.props.dispatch(actions.displayWarning(message)) - } - - this.props.dispatch(actions.hideWarning()) - - this.props.dispatch(actions.addToAddressBook(recipient, nickname)) - - var txParams = { - from: this.props.address, - value: '0x' + value.toString(16), - } - - if (recipient) txParams.to = ethUtil.addHexPrefix(recipient) - if (txData) txParams.data = txData - - this.props.dispatch(actions.signTx(txParams)) -} +// const { inherits } = require('util') +// const PersistentForm = require('../lib/persistent-form') +// const h = require('react-hyperscript') +// const connect = require('react-redux').connect +// const Identicon = require('./components/identicon') +// const EnsInput = require('./components/ens-input') +// const GasTooltip = require('./components/send/gas-tooltip') +// const CurrencyToggle = require('./components/send/currency-toggle') +// const GasFeeDisplay = require('./components/send/gas-fee-display') +// const { getSelectedIdentity } = require('./selectors') + +// const { +// showAccountsPage, +// backToAccountDetail, +// displayWarning, +// hideWarning, +// addToAddressBook, +// signTx, +// estimateGas, +// getGasPrice, +// } = require('./actions') +// const { stripHexPrefix, addHexPrefix } = require('ethereumjs-util') +// const { isHex, numericBalance, isValidAddress, allNull } = require('./util') +// const { conversionUtil, conversionGreaterThan } = require('./conversion-util') + +// module.exports = connect(mapStateToProps)(SendTransactionScreen) + +// function mapStateToProps (state) { +// const { +// selectedAddress: address, +// accounts, +// identities, +// network, +// addressBook, +// conversionRate, +// currentBlockGasLimit: blockGasLimit, +// } = state.metamask +// const { warning } = state.appState +// const selectedIdentity = getSelectedIdentity(state) +// const account = accounts[address] + +// return { +// address, +// accounts, +// identities, +// network, +// addressBook, +// conversionRate, +// blockGasLimit, +// warning, +// selectedIdentity, +// error: warning && warning.split('.')[0], +// account, +// identity: identities[address], +// balance: account ? account.balance : null, +// } +// } + +// inherits(SendTransactionScreen, PersistentForm) +// function SendTransactionScreen () { +// PersistentForm.call(this) + +// // [WIP] These are the bare minimum of tx props needed to sign a transaction +// // We will need a few more for contract-related interactions +// this.state = { +// newTx: { +// from: '', +// to: '', +// amountToSend: '0x0', +// gasPrice: null, +// gas: null, +// amount: '0x0', +// txData: null, +// memo: '', +// }, +// activeCurrency: 'USD', +// tooltipIsOpen: false, +// errors: {}, +// isValid: false, +// } + +// this.back = this.back.bind(this) +// this.closeTooltip = this.closeTooltip.bind(this) +// this.onSubmit = this.onSubmit.bind(this) +// this.setActiveCurrency = this.setActiveCurrency.bind(this) +// this.toggleTooltip = this.toggleTooltip.bind(this) +// this.validate = this.validate.bind(this) +// this.getAmountToSend = this.getAmountToSend.bind(this) +// this.setErrorsFor = this.setErrorsFor.bind(this) +// this.clearErrorsFor = this.clearErrorsFor.bind(this) + +// this.renderFromInput = this.renderFromInput.bind(this) +// this.renderToInput = this.renderToInput.bind(this) +// this.renderAmountInput = this.renderAmountInput.bind(this) +// this.renderGasInput = this.renderGasInput.bind(this) +// this.renderMemoInput = this.renderMemoInput.bind(this) +// this.renderErrorMessage = this.renderErrorMessage.bind(this) +// } + +// SendTransactionScreen.prototype.componentWillMount = function () { +// const { newTx } = this.state +// const { address } = this.props + +// Promise.all([ +// this.props.dispatch(getGasPrice()), +// this.props.dispatch(estimateGas({ +// from: address, +// gas: '746a528800', +// })), +// ]) +// .then(([blockGasPrice, estimatedGas]) => { +// console.log({ blockGasPrice, estimatedGas}) +// this.setState({ +// newTx: { +// ...newTx, +// gasPrice: blockGasPrice, +// gas: estimatedGas, +// }, +// }) +// }) +// } + +// SendTransactionScreen.prototype.renderErrorMessage = function(errorType, warning) { +// const { errors } = this.state +// const errorMessage = errors[errorType]; + +// return errorMessage || warning +// ? h('div.send-screen-input-wrapper__error-message', [ errorMessage || warning ]) +// : null +// } + +// SendTransactionScreen.prototype.renderFromInput = function (from, identities) { +// return h('div.send-screen-input-wrapper', [ + +// h('div', 'From:'), + +// h('input.large-input.send-screen-input', { +// list: 'accounts', +// placeholder: 'Account', +// value: from, +// onChange: (event) => { +// this.setState({ +// newTx: { +// ...this.state.newTx, +// from: event.target.value, +// }, +// }) +// }, +// onBlur: () => this.setErrorsFor('from'), +// onFocus: event => { +// this.clearErrorsFor('from') +// this.state.newTx.from && event.target.select() +// }, +// }), + +// h('datalist#accounts', [ +// Object.entries(identities).map(([key, { address, name }]) => { +// return h('option', { +// value: address, +// label: name, +// key: address, +// }) +// }), +// ]), + +// this.renderErrorMessage('from'), + +// ]) +// } + +// SendTransactionScreen.prototype.renderToInput = function (to, identities, addressBook) { +// return h('div.send-screen-input-wrapper', [ + +// h('div', 'To:'), + +// h('input.large-input.send-screen-input', { +// name: 'address', +// list: 'addresses', +// placeholder: 'Address', +// value: to, +// onChange: (event) => { +// this.setState({ +// newTx: { +// ...this.state.newTx, +// to: event.target.value, +// }, +// }) +// }, +// onBlur: () => { +// this.setErrorsFor('to') +// }, +// onFocus: event => { +// this.clearErrorsFor('to') +// this.state.newTx.to && event.target.select() +// }, +// }), + +// h('datalist#addresses', [ +// // Corresponds to the addresses owned. +// ...Object.entries(identities).map(([key, { address, name }]) => { +// return h('option', { +// value: address, +// label: name, +// key: address, +// }) +// }), +// // Corresponds to previously sent-to addresses. +// ...addressBook.map(({ address, name }) => { +// return h('option', { +// value: address, +// label: name, +// key: address, +// }) +// }), +// ]), + +// this.renderErrorMessage('to'), + +// ]) +// } + +// SendTransactionScreen.prototype.renderAmountInput = function (activeCurrency) { +// return h('div.send-screen-input-wrapper', [ + +// h('div.send-screen-amount-labels', [ +// h('span', 'Amount'), +// h(CurrencyToggle, { +// activeCurrency, +// onClick: (newCurrency) => this.setActiveCurrency(newCurrency), +// }), // holding on icon from design +// ]), + +// h('input.large-input.send-screen-input', { +// placeholder: `0 ${activeCurrency}`, +// type: 'number', +// onChange: (event) => { +// const amountToSend = event.target.value +// ? this.getAmountToSend(event.target.value) +// : '0x0' + +// this.setState({ +// newTx: Object.assign( +// this.state.newTx, +// { +// amount: event.target.value, +// amountToSend: amountToSend, +// } +// ), +// }) +// }, +// onBlur: () => { +// this.setErrorsFor('amount') +// }, +// onFocus: () => this.clearErrorsFor('amount'), +// }), + +// this.renderErrorMessage('amount'), + +// ]) +// } + +// SendTransactionScreen.prototype.renderGasInput = function (gasPrice, gas, activeCurrency, conversionRate, blockGasLimit) { +// return h('div.send-screen-input-wrapper', [ +// this.state.tooltipIsOpen && h(GasTooltip, { +// className: 'send-tooltip', +// gasPrice, +// gasLimit: gas, +// onClose: this.closeTooltip, +// onFeeChange: ({gasLimit, gasPrice}) => { +// this.setState({ +// newTx: { +// ...this.state.newTx, +// gas: gasLimit, +// gasPrice, +// }, +// }) +// }, +// }), + +// h('div.send-screen-gas-labels', [ +// h('span', [ +// h('i.fa.fa-bolt'), +// 'Gas fee:', +// ]), +// h('span', 'What\'s this?'), +// ]), + +// // TODO: handle loading time when switching to USD +// h('div.large-input.send-screen-gas-input', {}, [ +// h(GasFeeDisplay, { +// activeCurrency, +// conversionRate, +// gas, +// gasPrice, +// blockGasLimit, +// }), +// h('div.send-screen-gas-input-customize', { +// onClick: this.toggleTooltip, +// }, [ +// 'Customize', +// ]), +// ]), + +// ]) +// } + +// SendTransactionScreen.prototype.renderMemoInput = function () { +// return h('div.send-screen-input-wrapper', [ +// h('div', 'Transaction memo (optional)'), +// h('input.large-input.send-screen-input', { +// onChange: () => { +// this.setState({ +// newTx: Object.assign( +// this.state.newTx, +// { +// memo: event.target.value, +// } +// ), +// }) +// }, +// }), +// ]) +// } + +// SendTransactionScreen.prototype.render = function () { +// this.persistentFormParentId = 'send-tx-form' + +// const props = this.props +// const { +// warning, +// identities, +// addressBook, +// conversionRate, +// } = props + +// const { +// blockGasLimit, +// newTx, +// activeCurrency, +// isValid, +// } = this.state +// const { gas, gasPrice } = newTx + +// return ( + +// h('div.send-screen-wrapper', [ +// // Main Send token Card +// h('div.send-screen-card', [ + +// h('img.send-eth-icon', { src: '../images/eth_logo.svg' }), + +// h('div.send-screen__title', 'Send'), + +// h('div.send-screen__subtitle', 'Send Ethereum to anyone with an Ethereum account'), + +// this.renderFromInput(this.state.newTx.from, identities), + +// this.renderToInput(this.state.newTx.to, identities, addressBook), + +// this.renderAmountInput(activeCurrency), + +// this.renderGasInput( +// gasPrice || '0x0', +// gas || '0x0', +// activeCurrency, +// conversionRate, +// blockGasLimit +// ), + +// this.renderMemoInput(), + +// this.renderErrorMessage(null, warning), + +// ]), + +// // Buttons underneath card +// h('section.flex-column.flex-center', [ +// h('button.btn-secondary.send-screen__send-button', { +// className: !isValid && 'send-screen__send-button__disabled', +// onClick: (event) => isValid && this.onSubmit(event), +// }, 'Next'), +// h('button.btn-tertiary.send-screen__cancel-button', { +// onClick: this.back, +// }, 'Cancel'), +// ]), +// ]) + +// ) +// } + +// SendTransactionScreen.prototype.toggleTooltip = function () { +// this.setState({ tooltipIsOpen: !this.state.tooltipIsOpen }) +// } + +// SendTransactionScreen.prototype.closeTooltip = function () { +// this.setState({ tooltipIsOpen: false }) +// } + +// SendTransactionScreen.prototype.setActiveCurrency = function (newCurrency) { +// this.setState({ activeCurrency: newCurrency }) +// } + +// SendTransactionScreen.prototype.back = function () { +// var address = this.props.address +// this.props.dispatch(backToAccountDetail(address)) +// } + +// SendTransactionScreen.prototype.validate = function (balance, amountToSend, { to, from }) { +// const sufficientBalance = conversionGreaterThan( +// { +// value: balance, +// fromNumericBase: 'hex', +// }, +// { +// value: amountToSend, +// fromNumericBase: 'hex', +// }, +// ) + +// const amountLessThanZero = conversionGreaterThan( +// { +// value: 0, +// fromNumericBase: 'dec', +// }, +// { +// value: amountToSend, +// fromNumericBase: 'hex', +// }, +// ) + +// const errors = {} + +// if (!sufficientBalance) { +// errors.amount = 'Insufficient funds.' +// } + +// if (amountLessThanZero) { +// errors.amount = 'Can not send negative amounts of ETH.' +// } + +// if (!from) { +// errors.from = 'Required' +// } + +// if (from && !isValidAddress(from)) { +// errors.from = 'Sender address is invalid.' +// } + +// if (!to) { +// errors.to = 'Required' +// } + +// if (to && !isValidAddress(to)) { +// errors.to = 'Recipient address is invalid.' +// } + +// // if (txData && !isHex(stripHexPrefix(txData))) { +// // message = 'Transaction data must be hex string.' +// // return this.props.dispatch(displayWarning(message)) +// // } + +// return { +// isValid: allNull(errors), +// errors, +// } +// } + +// SendTransactionScreen.prototype.getAmountToSend = function (amount) { +// const { activeCurrency } = this.state +// const { conversionRate } = this.props + +// return conversionUtil(amount, { +// fromNumericBase: 'dec', +// toNumericBase: 'hex', +// fromCurrency: activeCurrency, +// toCurrency: 'ETH', +// toDenomination: 'WEI', +// conversionRate, +// invertConversionRate: activeCurrency !== 'ETH', +// }) +// } + +// SendTransactionScreen.prototype.setErrorsFor = function (field) { +// const { balance } = this.props +// const { newTx, errors: previousErrors } = this.state +// const { amountToSend } = newTx + +// const { +// isValid, +// errors: newErrors +// } = this.validate(balance, amountToSend, newTx) + +// const nextErrors = Object.assign({}, previousErrors, { +// [field]: newErrors[field] || null +// }) + +// if (!isValid) { +// this.setState({ +// errors: nextErrors, +// isValid, +// }) +// } +// } + +// SendTransactionScreen.prototype.clearErrorsFor = function (field) { +// const { errors: previousErrors } = this.state +// const nextErrors = Object.assign({}, previousErrors, { +// [field]: null +// }) + +// this.setState({ +// errors: nextErrors, +// isValid: allNull(nextErrors), +// }) +// } + +// SendTransactionScreen.prototype.onSubmit = function (event) { +// event.preventDefault() +// const { warning, balance } = this.props +// const state = this.state || {} + +// const recipient = state.newTx.to +// const sender = state.newTx.from +// const nickname = state.nickname || ' ' + +// // TODO: convert this to hex when created and include it in send +// const txData = state.newTx.memo + +// this.props.dispatch(hideWarning()) + +// this.props.dispatch(addToAddressBook(recipient, nickname)) + +// var txParams = { +// from: this.state.newTx.from, +// to: this.state.newTx.to, + +// value: this.state.newTx.amountToSend, + +// gas: this.state.newTx.gas, +// gasPrice: this.state.newTx.gasPrice, +// } + +// if (recipient) txParams.to = addHexPrefix(recipient) +// if (txData) txParams.data = txData + +// this.props.dispatch(signTx(txParams)) +// } diff --git a/ui/app/settings.js b/ui/app/settings.js index 454cc95e0..a3dd65f14 100644 --- a/ui/app/settings.js +++ b/ui/app/settings.js @@ -1,59 +1,416 @@ -const inherits = require('util').inherits -const Component = require('react').Component +const { Component } = require('react') +const PropTypes = require('prop-types') const h = require('react-hyperscript') -const connect = require('react-redux').connect +const { connect } = require('react-redux') const actions = require('./actions') +const infuraCurrencies = require('./infura-conversion.json') +const validUrl = require('valid-url') +const { exportAsFile } = require('./util') +const TabBar = require('./components/tab-bar') +const SimpleDropdown = require('./components/dropdowns/simple-dropdown') +const ToggleButton = require('react-toggle-button') +const { OLD_UI_NETWORK_TYPE } = require('../../app/scripts/config').enums -module.exports = connect(mapStateToProps)(AppSettingsPage) +const getInfuraCurrencyOptions = () => { + const sortedCurrencies = infuraCurrencies.objects.sort((a, b) => { + return a.quote.name.toLocaleLowerCase().localeCompare(b.quote.name.toLocaleLowerCase()) + }) -function mapStateToProps (state) { - return {} + return sortedCurrencies.map(({ quote: { code, name } }) => { + return { + displayValue: `${code.toUpperCase()} - ${name}`, + key: code, + value: code, + } + }) } -inherits(AppSettingsPage, Component) -function AppSettingsPage () { - Component.call(this) -} +class Settings extends Component { + constructor (props) { + super(props) -AppSettingsPage.prototype.render = function () { - return ( + const { tab } = props + const activeTab = tab === 'info' ? 'info' : 'settings' - h('.account-detail-section.flex-column.flex-grow', [ + this.state = { + activeTab, + newRpc: '', + } + } - // subtitle and nav - h('.flex-row.flex-center', [ - h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { - onClick: this.navigateToAccounts.bind(this), - }), - h('h2.page-subtitle', 'Settings'), - ]), + renderTabs () { + const { activeTab } = this.state - h('label', { - htmlFor: 'settings-rpc-endpoint', - }, 'RPC Endpoint:'), - h('input', { - type: 'url', - id: 'settings-rpc-endpoint', - onKeyPress: this.onKeyPress.bind(this), + return h('div.settings__tabs', [ + h(TabBar, { + tabs: [ + { content: 'Settings', key: 'settings' }, + { content: 'Info', key: 'info' }, + ], + defaultTab: activeTab, + tabSelected: key => this.setState({ activeTab: key }), }), + ]) + } + + renderBlockieOptIn () { + const { metamask: { useBlockie }, setUseBlockie } = this.props + + return h('div.settings__content-row', [ + h('div.settings__content-item', [ + h('span', 'Use Blockies Identicon'), + ]), + h('div.settings__content-item', [ + h('div.settings__content-item-col', [ + h(ToggleButton, { + value: useBlockie, + onToggle: (value) => setUseBlockie(!value), + activeLabel: '', + inactiveLabel: '', + }), + ]), + ]), + ]) + } + renderCurrentConversion () { + const { metamask: { currentCurrency, conversionDate }, setCurrentCurrency } = this.props + + return h('div.settings__content-row', [ + h('div.settings__content-item', [ + h('span', 'Current Conversion'), + h('span.settings__content-description', `Updated ${Date(conversionDate)}`), + ]), + h('div.settings__content-item', [ + h('div.settings__content-item-col', [ + h(SimpleDropdown, { + placeholder: 'Select Currency', + options: getInfuraCurrencyOptions(), + selectedOption: currentCurrency, + onSelect: newCurrency => setCurrentCurrency(newCurrency), + }), + ]), + ]), ]) + } + + renderCurrentProvider () { + const { metamask: { provider = {} } } = this.props + let title, value, color + + switch (provider.type) { + + case 'mainnet': + title = 'Current Network' + value = 'Main Ethereum Network' + color = '#038789' + break + + case 'ropsten': + title = 'Current Network' + value = 'Ropsten Test Network' + color = '#e91550' + break + + case 'kovan': + title = 'Current Network' + value = 'Kovan Test Network' + color = '#690496' + break + + case 'rinkeby': + title = 'Current Network' + value = 'Rinkeby Test Network' + color = '#ebb33f' + break + + default: + title = 'Current RPC' + value = provider.rpcTarget + } + + return h('div.settings__content-row', [ + h('div.settings__content-item', title), + h('div.settings__content-item', [ + h('div.settings__content-item-col', [ + h('div.settings__provider-wrapper', [ + h('div.settings__provider-icon', { style: { background: color } }), + h('div', value), + ]), + ]), + ]), + ]) + } + + renderNewRpcUrl () { + return ( + h('div.settings__content-row', [ + h('div.settings__content-item', [ + h('span', 'New RPC URL'), + ]), + h('div.settings__content-item', [ + h('div.settings__content-item-col', [ + h('input.settings__input', { + placeholder: 'New RPC URL', + onChange: event => this.setState({ newRpc: event.target.value }), + onKeyPress: event => { + if (event.key === 'Enter') { + this.validateRpc(this.state.newRpc) + } + }, + }), + h('div.settings__rpc-save-button', { + onClick: event => { + event.preventDefault() + this.validateRpc(this.state.newRpc) + }, + }, 'Save'), + ]), + ]), + ]) + ) + } + + validateRpc (newRpc) { + const { setRpcTarget, displayWarning } = this.props + + if (validUrl.isWebUri(newRpc)) { + setRpcTarget(newRpc) + } else { + const appendedRpc = `http://${newRpc}` + + if (validUrl.isWebUri(appendedRpc)) { + displayWarning('URIs require the appropriate HTTP/HTTPS prefix.') + } else { + displayWarning('Invalid RPC URI') + } + } + } + + renderStateLogs () { + return ( + h('div.settings__content-row', [ + h('div.settings__content-item', [ + h('div', 'State Logs'), + h( + 'div.settings__content-description', + 'State logs contain your public account addresses and sent transactions.' + ), + ]), + h('div.settings__content-item', [ + h('div.settings__content-item-col', [ + h('button.settings__clear-button', { + onClick (event) { + exportAsFile('MetaMask State Logs', window.logState()) + }, + }, 'Download State Logs'), + ]), + ]), + ]) + ) + } + + renderSeedWords () { + const { revealSeedConfirmation } = this.props + + return ( + h('div.settings__content-row', [ + h('div.settings__content-item', 'Reveal Seed Words'), + h('div.settings__content-item', [ + h('div.settings__content-item-col', [ + h('button.settings__clear-button.settings__clear-button--red', { + onClick (event) { + event.preventDefault() + revealSeedConfirmation() + }, + }, 'Reveal Seed Words'), + ]), + ]), + ]) + ) + } + + renderOldUI () { + const { setFeatureFlagToBeta } = this.props + + return ( + h('div.settings__content-row', [ + h('div.settings__content-item', 'Use old UI'), + h('div.settings__content-item', [ + h('div.settings__content-item-col', [ + h('button.settings__clear-button.settings__clear-button--orange', { + onClick (event) { + event.preventDefault() + setFeatureFlagToBeta() + }, + }, 'Use old UI'), + ]), + ]), + ]) + ) + } + + renderSettingsContent () { + const { warning, isMascara } = this.props - ) + return ( + h('div.settings__content', [ + warning && h('div.settings__error', warning), + this.renderBlockieOptIn(), + this.renderCurrentConversion(), + // this.renderCurrentProvider(), + this.renderNewRpcUrl(), + this.renderStateLogs(), + this.renderSeedWords(), + !isMascara && this.renderOldUI(), + ]) + ) + } + + renderLogo () { + return ( + h('div.settings__info-logo-wrapper', [ + h('img.settings__info-logo', { src: 'images/info-logo.png' }), + ]) + ) + } + + renderInfoLinks () { + return ( + h('div.settings__content-item.settings__content-item--without-height', [ + h('div.settings__info-link-header', 'Links'), + h('div.settings__info-link-item', [ + h('a', { + href: 'https://metamask.io/privacy.html', + target: '_blank', + }, [ + h('span.settings__info-link', 'Privacy Policy'), + ]), + ]), + h('div.settings__info-link-item', [ + h('a', { + href: 'https://metamask.io/terms.html', + target: '_blank', + }, [ + h('span.settings__info-link', 'Terms of Use'), + ]), + ]), + h('div.settings__info-link-item', [ + h('a', { + href: 'https://metamask.io/attributions.html', + target: '_blank', + }, [ + h('span.settings__info-link', 'Attributions'), + ]), + ]), + h('hr.settings__info-separator'), + h('div.settings__info-link-item', [ + h('a', { + href: 'https://support.metamask.io', + target: '_blank', + }, [ + h('span.settings__info-link', 'Visit our Support Center'), + ]), + ]), + h('div.settings__info-link-item', [ + h('a', { + href: 'https://metamask.io/', + target: '_blank', + }, [ + h('span.settings__info-link', 'Visit our web site'), + ]), + ]), + h('div.settings__info-link-item', [ + h('a', { + target: '_blank', + href: 'mailto:help@metamask.io?subject=Feedback', + }, [ + h('span.settings__info-link', 'Email us!'), + ]), + ]), + ]) + ) + } + + renderInfoContent () { + return ( + h('div.settings__content', [ + h('div.settings__content-row', [ + h('div.settings__content-item.settings__content-item--without-height', [ + this.renderLogo(), + h('div.settings__info-item', [ + h('div.settings__info-version-header', 'MetaMask Version'), + h('div.settings__info-version-number', '4.0.0'), + ]), + h('div.settings__info-item', [ + h( + 'div.settings__info-about', + 'MetaMask is designed and built in California.' + ), + ]), + ]), + this.renderInfoLinks(), + ]), + ]) + ) + } + + render () { + const { goHome } = this.props + const { activeTab } = this.state + + return ( + h('.main-container.settings', {}, [ + h('.settings__header', [ + h('div.settings__close-button', { + onClick: goHome, + }), + this.renderTabs(), + ]), + + activeTab === 'settings' + ? this.renderSettingsContent() + : this.renderInfoContent(), + ]) + ) + } } -AppSettingsPage.prototype.componentDidMount = function () { - document.querySelector('input').focus() +Settings.propTypes = { + tab: PropTypes.string, + metamask: PropTypes.object, + setUseBlockie: PropTypes.func, + setCurrentCurrency: PropTypes.func, + setRpcTarget: PropTypes.func, + displayWarning: PropTypes.func, + revealSeedConfirmation: PropTypes.func, + setFeatureFlagToBeta: PropTypes.func, + warning: PropTypes.string, + goHome: PropTypes.func, + isMascara: PropTypes.bool, } -AppSettingsPage.prototype.onKeyPress = function (event) { - // get submit event - if (event.key === 'Enter') { - // this.submitPassword(event) +const mapStateToProps = state => { + return { + metamask: state.metamask, + warning: state.appState.warning, + isMascara: state.metamask.isMascara, } } -AppSettingsPage.prototype.navigateToAccounts = function (event) { - event.stopPropagation() - this.props.dispatch(actions.showAccountsPage()) +const mapDispatchToProps = dispatch => { + return { + goHome: () => dispatch(actions.goHome()), + setCurrentCurrency: currency => dispatch(actions.setCurrentCurrency(currency)), + setRpcTarget: newRpc => dispatch(actions.setRpcTarget(newRpc)), + displayWarning: warning => dispatch(actions.displayWarning(warning)), + revealSeedConfirmation: () => dispatch(actions.revealSeedConfirmation()), + setUseBlockie: value => dispatch(actions.setUseBlockie(value)), + setFeatureFlagToBeta: () => { + return dispatch(actions.setFeatureFlag('betaUI', false, 'OLD_UI_NOTIFICATION_MODAL')) + .then(() => dispatch(actions.setNetworkEndpoints(OLD_UI_NETWORK_TYPE))) + }, + } } + +module.exports = connect(mapStateToProps, mapDispatchToProps)(Settings) diff --git a/ui/app/token-tracker.js b/ui/app/token-tracker.js new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ui/app/token-tracker.js diff --git a/ui/app/token-util.js b/ui/app/token-util.js new file mode 100644 index 000000000..f84051ef5 --- /dev/null +++ b/ui/app/token-util.js @@ -0,0 +1,45 @@ +const abi = require('human-standard-token-abi') +const Eth = require('ethjs-query') +const EthContract = require('ethjs-contract') + +const tokenInfoGetter = function () { + if (typeof global.ethereumProvider === 'undefined') return + + const eth = new Eth(global.ethereumProvider) + const contract = new EthContract(eth) + const TokenContract = contract(abi) + + const tokens = {} + + return async (address) => { + if (tokens[address]) { + return tokens[address] + } + + const contract = TokenContract.at(address) + + const result = await Promise.all([ + contract.symbol(), + contract.decimals(), + ]) + + const [ symbol = [], decimals = [] ] = result + + tokens[address] = { symbol: symbol[0], decimals: decimals[0] } + + return tokens[address] + } +} + +function calcTokenAmount (value, decimals) { + const multiplier = Math.pow(10, Number(decimals || 0)) + const amount = Number(value / multiplier) + + return amount +} + + +module.exports = { + tokenInfoGetter, + calcTokenAmount, +} diff --git a/ui/app/unlock.js b/ui/app/unlock.js index 4180791c4..ec97b03bf 100644 --- a/ui/app/unlock.js +++ b/ui/app/unlock.js @@ -50,7 +50,7 @@ UnlockScreen.prototype.render = function () { id: 'password-box', placeholder: 'enter password', style: { - + background: 'white', }, onKeyPress: this.onKeyPress.bind(this), onInput: this.inputChanged.bind(this), diff --git a/ui/app/util.js b/ui/app/util.js index 293f4228c..70c503550 100644 --- a/ui/app/util.js +++ b/ui/app/util.js @@ -1,4 +1,16 @@ +const abi = require('human-standard-token-abi') const ethUtil = require('ethereumjs-util') +const hexToBn = require('../../app/scripts/lib/hex-to-bn') +const vreme = new (require('vreme'))() + +const MIN_GAS_PRICE_GWEI_BN = new ethUtil.BN(1) +const GWEI_FACTOR = new ethUtil.BN(1e9) +const MIN_GAS_PRICE_BN = MIN_GAS_PRICE_GWEI_BN.mul(GWEI_FACTOR) + +// formatData :: ( date: <Unix Timestamp> ) -> String +function formatDate (date) { + return vreme.format(new Date(date), 'March 16 2014 14:30') +} var valueTable = { wei: '1000000000000000000', @@ -36,8 +48,14 @@ module.exports = { valueTable: valueTable, bnTable: bnTable, isHex: isHex, + formatDate, + bnMultiplyByFraction, + getTxFeeBn, + shortenBalance, + getContractAtAddress, exportAsFile: exportAsFile, isInvalidChecksumAddress, + allNull, } function valuesFor (obj) { @@ -227,6 +245,24 @@ function isHex (str) { return Boolean(str.match(/^(0x)?[0-9a-fA-F]+$/)) } +function bnMultiplyByFraction (targetBN, numerator, denominator) { + const numBN = new ethUtil.BN(numerator) + const denomBN = new ethUtil.BN(denominator) + return targetBN.mul(numBN).div(denomBN) +} + +function getTxFeeBn (gas, gasPrice = MIN_GAS_PRICE_BN.toString(16), blockGasLimit) { + const gasBn = hexToBn(gas) + const gasPriceBn = hexToBn(gasPrice) + const txFeeBn = gasBn.mul(gasPriceBn) + + return txFeeBn.toString(16) +} + +function getContractAtAddress (tokenAddress) { + return global.eth.contract(abi).at(tokenAddress) +} + function exportAsFile (filename, data) { // source: https://stackoverflow.com/a/33542499 by Ludovic Feltz const blob = new Blob([data], {type: 'text/csv'}) @@ -241,3 +277,7 @@ function exportAsFile (filename, data) { document.body.removeChild(elem) } } + +function allNull (obj) { + return Object.entries(obj).every(([key, value]) => value === null) +} @@ -4,11 +4,7 @@ const path = require('path') module.exports = bundleCss var cssFiles = { - 'fonts.css': fs.readFileSync(path.join(__dirname, '/app/css/fonts.css'), 'utf8'), - 'reset.css': fs.readFileSync(path.join(__dirname, '/app/css/reset.css'), 'utf8'), - 'lib.css': fs.readFileSync(path.join(__dirname, '/app/css/lib.css'), 'utf8'), - 'index.css': fs.readFileSync(path.join(__dirname, '/app/css/index.css'), 'utf8'), - 'transitions.css': fs.readFileSync(path.join(__dirname, '/app/css/transitions.css'), 'utf8'), + 'index.css': fs.readFileSync(path.join(__dirname, '/app/css/output/index.css'), 'utf8'), 'first-time.css': fs.readFileSync(path.join(__dirname, '../mascara/src/app/first-time/index.css'), 'utf8'), 'react-tooltip-component.css': fs.readFileSync(path.join(__dirname, '..', 'node_modules', 'react-tooltip-component', 'dist', 'react-tooltip-component.css'), 'utf8'), 'react-css': fs.readFileSync(path.join(__dirname, '..', 'node_modules', 'react-select', 'dist', 'react-select.css'), 'utf8'), diff --git a/ui/index.js b/ui/index.js index ae05cbe67..bc3676c1f 100644 --- a/ui/index.js +++ b/ui/index.js @@ -4,11 +4,12 @@ const Root = require('./app/root') const actions = require('./app/actions') const configureStore = require('./app/store') const txHelper = require('./lib/tx-helper') +const { OLD_UI_NETWORK_TYPE, BETA_UI_NETWORK_TYPE } = require('../app/scripts/config').enums + global.log = require('loglevel') module.exports = launchMetamaskUi - log.setLevel(global.METAMASK_DEBUG ? 'debug' : 'warn') function launchMetamaskUi (opts, cb) { @@ -36,10 +37,17 @@ function startApp (metamaskState, accountManager, opts) { networkVersion: opts.networkVersion, }) + const useBetaUi = metamaskState.featureFlags.betaUI + const networkEndpointType = useBetaUi ? BETA_UI_NETWORK_TYPE : OLD_UI_NETWORK_TYPE + store.dispatch(actions.setNetworkEndpoints(networkEndpointType)) + // if unconfirmed txs, start on txConf page const unapprovedTxsAll = txHelper(metamaskState.unapprovedTxs, metamaskState.unapprovedMsgs, metamaskState.unapprovedPersonalMsgs, metamaskState.unapprovedTypedMessages, metamaskState.network) - if (unapprovedTxsAll.length > 0) { - store.dispatch(actions.showConfTxPage()) + const numberOfUnapprivedTx = unapprovedTxsAll.length + if (numberOfUnapprivedTx > 0) { + store.dispatch(actions.showConfTxPage({ + id: unapprovedTxsAll[numberOfUnapprivedTx - 1].id, + })) } accountManager.on('update', function (metamaskState) { diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js new file mode 100644 index 000000000..037d990fa --- /dev/null +++ b/ui/lib/account-link.js @@ -0,0 +1,26 @@ +module.exports = function (address, network) { + const net = parseInt(network) + let link + switch (net) { + case 1: // main net + link = `https://etherscan.io/address/${address}` + break + case 2: // morden test net + link = `https://morden.etherscan.io/address/${address}` + break + case 3: // ropsten test net + link = `https://ropsten.etherscan.io/address/${address}` + break + case 4: // rinkeby test net + link = `https://rinkeby.etherscan.io/address/${address}` + break + case 42: // kovan test net + link = `https://kovan.etherscan.io/address/${address}` + break + default: + link = '' + break + } + + return link +} diff --git a/ui/lib/blockies.js b/ui/lib/blockies.js new file mode 100644 index 000000000..ee5a2a5ca --- /dev/null +++ b/ui/lib/blockies.js @@ -0,0 +1,364 @@ +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) : + typeof define === 'function' && define.amd ? define(['exports'], factory) : + (factory((global.blockies = {}))); +}(this, (function (exports) { 'use strict'; + + /** + * A handy class to calculate color values. + * + * @version 1.0 + * @author Robert Eisele <robert@xarg.org> + * @copyright Copyright (c) 2010, Robert Eisele + * @link http://www.xarg.org/2010/03/generate-client-side-png-files-using-javascript/ + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * + */ + + +// helper functions for that ctx + function write(buffer, offs) { + for (var i = 2; i < arguments.length; i++) { + for (var j = 0; j < arguments[i].length; j++) { + buffer[offs++] = arguments[i].charAt(j); + } + } + } + + function byte2(w) { + return String.fromCharCode((w >> 8) & 255, w & 255); + } + + function byte4(w) { + return String.fromCharCode((w >> 24) & 255, (w >> 16) & 255, (w >> 8) & 255, w & 255); + } + + function byte2lsb(w) { + return String.fromCharCode(w & 255, (w >> 8) & 255); + } + + var PNG = function(width,height,depth) { + + this.width = width; + this.height = height; + this.depth = depth; + + // pixel data and row filter identifier size + this.pix_size = height * (width + 1); + + // deflate header, pix_size, block headers, adler32 checksum + this.data_size = 2 + this.pix_size + 5 * Math.floor((0xfffe + this.pix_size) / 0xffff) + 4; + + // offsets and sizes of Png chunks + this.ihdr_offs = 0; // IHDR offset and size + this.ihdr_size = 4 + 4 + 13 + 4; + this.plte_offs = this.ihdr_offs + this.ihdr_size; // PLTE offset and size + this.plte_size = 4 + 4 + 3 * depth + 4; + this.trns_offs = this.plte_offs + this.plte_size; // tRNS offset and size + this.trns_size = 4 + 4 + depth + 4; + this.idat_offs = this.trns_offs + this.trns_size; // IDAT offset and size + this.idat_size = 4 + 4 + this.data_size + 4; + this.iend_offs = this.idat_offs + this.idat_size; // IEND offset and size + this.iend_size = 4 + 4 + 4; + this.buffer_size = this.iend_offs + this.iend_size; // total PNG size + + this.buffer = new Array(); + this.palette = new Object(); + this.pindex = 0; + + var _crc32 = new Array(); + + // initialize buffer with zero bytes + for (var i = 0; i < this.buffer_size; i++) { + this.buffer[i] = "\x00"; + } + + // initialize non-zero elements + write(this.buffer, this.ihdr_offs, byte4(this.ihdr_size - 12), 'IHDR', byte4(width), byte4(height), "\x08\x03"); + write(this.buffer, this.plte_offs, byte4(this.plte_size - 12), 'PLTE'); + write(this.buffer, this.trns_offs, byte4(this.trns_size - 12), 'tRNS'); + write(this.buffer, this.idat_offs, byte4(this.idat_size - 12), 'IDAT'); + write(this.buffer, this.iend_offs, byte4(this.iend_size - 12), 'IEND'); + + // initialize deflate header + var header = ((8 + (7 << 4)) << 8) | (3 << 6); + header+= 31 - (header % 31); + + write(this.buffer, this.idat_offs + 8, byte2(header)); + + // initialize deflate block headers + for (var i = 0; (i << 16) - 1 < this.pix_size; i++) { + var size, bits; + if (i + 0xffff < this.pix_size) { + size = 0xffff; + bits = "\x00"; + } else { + size = this.pix_size - (i << 16) - i; + bits = "\x01"; + } + write(this.buffer, this.idat_offs + 8 + 2 + (i << 16) + (i << 2), bits, byte2lsb(size), byte2lsb(~size)); + } + + /* Create crc32 lookup table */ + for (var i = 0; i < 256; i++) { + var c = i; + for (var j = 0; j < 8; j++) { + if (c & 1) { + c = -306674912 ^ ((c >> 1) & 0x7fffffff); + } else { + c = (c >> 1) & 0x7fffffff; + } + } + _crc32[i] = c; + } + + // compute the index into a png for a given pixel + this.index = function(x,y) { + var i = y * (this.width + 1) + x + 1; + var j = this.idat_offs + 8 + 2 + 5 * Math.floor((i / 0xffff) + 1) + i; + return j; + }; + + // convert a color and build up the palette + this.color = function(red, green, blue, alpha) { + + alpha = alpha >= 0 ? alpha : 255; + var color = (((((alpha << 8) | red) << 8) | green) << 8) | blue; + + if (typeof this.palette[color] == "undefined") { + if (this.pindex == this.depth) return "\x00"; + + var ndx = this.plte_offs + 8 + 3 * this.pindex; + + this.buffer[ndx + 0] = String.fromCharCode(red); + this.buffer[ndx + 1] = String.fromCharCode(green); + this.buffer[ndx + 2] = String.fromCharCode(blue); + this.buffer[this.trns_offs+8+this.pindex] = String.fromCharCode(alpha); + + this.palette[color] = String.fromCharCode(this.pindex++); + } + return this.palette[color]; + }; + + // output a PNG string, Base64 encoded + this.getBase64 = function() { + + var s = this.getDump(); + + var ch = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; + var c1, c2, c3, e1, e2, e3, e4; + var l = s.length; + var i = 0; + var r = ""; + + do { + c1 = s.charCodeAt(i); + e1 = c1 >> 2; + c2 = s.charCodeAt(i+1); + e2 = ((c1 & 3) << 4) | (c2 >> 4); + c3 = s.charCodeAt(i+2); + if (l < i+2) { e3 = 64; } else { e3 = ((c2 & 0xf) << 2) | (c3 >> 6); } + if (l < i+3) { e4 = 64; } else { e4 = c3 & 0x3f; } + r+= ch.charAt(e1) + ch.charAt(e2) + ch.charAt(e3) + ch.charAt(e4); + } while ((i+= 3) < l); + return r; + }; + + // output a PNG string + this.getDump = function() { + + // compute adler32 of output pixels + row filter bytes + var BASE = 65521; /* largest prime smaller than 65536 */ + var NMAX = 5552; /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ + var s1 = 1; + var s2 = 0; + var n = NMAX; + + for (var y = 0; y < this.height; y++) { + for (var x = -1; x < this.width; x++) { + s1+= this.buffer[this.index(x, y)].charCodeAt(0); + s2+= s1; + if ((n-= 1) == 0) { + s1%= BASE; + s2%= BASE; + n = NMAX; + } + } + } + s1%= BASE; + s2%= BASE; + write(this.buffer, this.idat_offs + this.idat_size - 8, byte4((s2 << 16) | s1)); + + // compute crc32 of the PNG chunks + function crc32(png, offs, size) { + var crc = -1; + for (var i = 4; i < size-4; i += 1) { + crc = _crc32[(crc ^ png[offs+i].charCodeAt(0)) & 0xff] ^ ((crc >> 8) & 0x00ffffff); + } + write(png, offs+size-4, byte4(crc ^ -1)); + } + + crc32(this.buffer, this.ihdr_offs, this.ihdr_size); + crc32(this.buffer, this.plte_offs, this.plte_size); + crc32(this.buffer, this.trns_offs, this.trns_size); + crc32(this.buffer, this.idat_offs, this.idat_size); + crc32(this.buffer, this.iend_offs, this.iend_size); + + // convert PNG to string + return "\x89PNG\r\n\x1A\n"+this.buffer.join(''); + }; + + this.fillRect = function (x, y, w, h, color) { + for(var i = 0; i < w; i++) { + for (var j = 0; j < h; j++) { + this.buffer[this.index(x+i, y+j)] = color; + } + } + }; + }; + +// https://stackoverflow.com/questions/2353211/hsl-to-rgb-color-conversion + /** + * Converts an HSL color value to RGB. Conversion formula + * adapted from http://en.wikipedia.org/wiki/HSL_color_space. + * Assumes h, s, and l are contained in the set [0, 1] and + * returns r, g, and b in the set [0, 255]. + * + * @param {number} h The hue + * @param {number} s The saturation + * @param {number} l The lightness + * @return {Array} The RGB representation + */ + + function hue2rgb(p, q, t) { + if(t < 0) t += 1; + if(t > 1) t -= 1; + if(t < 1/6) return p + (q - p) * 6 * t; + if(t < 1/2) return q; + if(t < 2/3) return p + (q - p) * (2/3 - t) * 6; + return p; + } + + function hsl2rgb(h, s, l){ + var r, g, b; + + if(s == 0){ + r = g = b = l; // achromatic + }else{ + var q = l < 0.5 ? l * (1 + s) : l + s - l * s; + var p = 2 * l - q; + r = hue2rgb(p, q, h + 1/3); + g = hue2rgb(p, q, h); + b = hue2rgb(p, q, h - 1/3); + } + + return [Math.round(r * 255), Math.round(g * 255), Math.round(b * 255), 255]; + } + +// The random number is a js implementation of the Xorshift PRNG + var randseed = new Array(4); // Xorshift: [x, y, z, w] 32 bit values + + function seedrand(seed) { + for (var i = 0; i < randseed.length; i++) { + randseed[i] = 0; + } + for (var i = 0; i < seed.length; i++) { + randseed[i % 4] = (randseed[i % 4] << 5) - randseed[i % 4] + seed.charCodeAt(i); + } + } + + function rand() { + // based on Java's String.hashCode(), expanded to 4 32bit values + var t = randseed[0] ^ (randseed[0] << 11); + + randseed[0] = randseed[1]; + randseed[1] = randseed[2]; + randseed[2] = randseed[3]; + randseed[3] = randseed[3] ^ (randseed[3] >> 19) ^ t ^ (t >> 8); + + return (randseed[3] >>> 0) / (1 << 31 >>> 0); + } + + function createColor() { + //saturation is the whole color spectrum + var h = Math.floor(rand() * 360); + //saturation goes from 40 to 100, it avoids greyish colors + var s = rand() * 60 + 40; + //lightness can be anything from 0 to 100, but probabilities are a bell curve around 50% + var l = (rand() + rand() + rand() + rand()) * 25; + + return [h / 360,s / 100,l / 100]; + } + + function createImageData(size) { + var width = size; // Only support square icons for now + var height = size; + + var dataWidth = Math.ceil(width / 2); + var mirrorWidth = width - dataWidth; + + var data = []; + for (var y = 0; y < height; y++) { + var row = []; + for (var x = 0; x < dataWidth; x++) { + // this makes foreground and background color to have a 43% (1/2.3) probability + // spot color has 13% chance + row[x] = Math.floor(rand() * 2.3); + } + var r = row.slice(0, mirrorWidth); + r.reverse(); + row = row.concat(r); + + for (var i = 0; i < row.length; i++) { + data.push(row[i]); + } + } + + return data; + } + + function buildOpts(opts) { + if (!opts.seed) { + throw 'No seed provided' + } + + seedrand(opts.seed); + + return Object.assign({ + size: 8, + scale: 16, + color: createColor(), + bgcolor: createColor(), + spotcolor: createColor(), + }, opts) + } + + function toDataUrl(address) { + const opts = buildOpts({seed: address.toLowerCase()}); + + const imageData = createImageData(opts.size); + const width = Math.sqrt(imageData.length); + + const p = new PNG(opts.size*opts.scale, opts.size*opts.scale, 3); + const bgcolor = p.color(...hsl2rgb(...opts.bgcolor)); + const color = p.color(...hsl2rgb(...opts.color)); + const spotcolor = p.color(...hsl2rgb(...opts.spotcolor)); + + for (var i = 0; i < imageData.length; i++) { + var row = Math.floor(i / width); + var col = i % width; + // if data is 0, leave the background + if (imageData[i]) { + // if data is 2, choose spot color, if 1 choose foreground + const pngColor = imageData[i] == 1 ? color : spotcolor; + p.fillRect(col * opts.scale, row * opts.scale, opts.scale, opts.scale, pngColor); + } + } + return `data:image/png;base64,${p.getBase64()}`; + } + + exports.toDataUrl = toDataUrl; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}))); diff --git a/ui/lib/feature-toggle-utils.js b/ui/lib/feature-toggle-utils.js new file mode 100644 index 000000000..6d4e461ca --- /dev/null +++ b/ui/lib/feature-toggle-utils.js @@ -0,0 +1,11 @@ +function checkFeatureToggle (name) { + const queryPairMap = window.location.search.substr(1).split('&') + .map(pair => pair.split('=')) + .reduce((pairs, [key, value]) => ({...pairs, [key]: value }), {}) + const featureToggles = queryPairMap['ft'] ? queryPairMap['ft'].split(',') : [] + return Boolean(featureToggles.find(ft => ft === name)) +} + +module.exports = { + checkFeatureToggle, +} diff --git a/ui/lib/icon-factory.js b/ui/lib/icon-factory.js index 27a74de66..31498a3a9 100644 --- a/ui/lib/icon-factory.js +++ b/ui/lib/icon-factory.js @@ -53,7 +53,7 @@ function imageElFor (address) { const path = `images/contract/${fileName}` const img = document.createElement('img') img.src = path - img.style.width = '75%' + img.style.width = '100%' return img } diff --git a/ui/lib/is-mobile-view.js b/ui/lib/is-mobile-view.js new file mode 100644 index 000000000..78fd6cb54 --- /dev/null +++ b/ui/lib/is-mobile-view.js @@ -0,0 +1,5 @@ +// Checks if viewport at invoke time fits mobile dimensions +// isMobileView :: () => Bool +const isMobileView = () => window.matchMedia('screen and (max-width: 575px)').matches + +module.exports = isMobileView @@ -2,6 +2,59 @@ # yarn lockfile v1 +"@babel/code-frame@7.0.0-beta.31": + version "7.0.0-beta.31" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.31.tgz#473d021ecc573a2cce1c07d5b509d5215f46ba35" + dependencies: + chalk "^2.0.0" + esutils "^2.0.2" + js-tokens "^3.0.0" + +"@babel/helper-function-name@7.0.0-beta.31": + version "7.0.0-beta.31" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.31.tgz#afe63ad799209989348b1109b44feb66aa245f57" + dependencies: + "@babel/helper-get-function-arity" "7.0.0-beta.31" + "@babel/template" "7.0.0-beta.31" + "@babel/traverse" "7.0.0-beta.31" + "@babel/types" "7.0.0-beta.31" + +"@babel/helper-get-function-arity@7.0.0-beta.31": + version "7.0.0-beta.31" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.31.tgz#1176d79252741218e0aec872ada07efb2b37a493" + dependencies: + "@babel/types" "7.0.0-beta.31" + +"@babel/template@7.0.0-beta.31": + version "7.0.0-beta.31" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.31.tgz#577bb29389f6c497c3e7d014617e7d6713f68bda" + dependencies: + "@babel/code-frame" "7.0.0-beta.31" + "@babel/types" "7.0.0-beta.31" + babylon "7.0.0-beta.31" + lodash "^4.2.0" + +"@babel/traverse@7.0.0-beta.31": + version "7.0.0-beta.31" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.31.tgz#db399499ad74aefda014f0c10321ab255134b1df" + dependencies: + "@babel/code-frame" "7.0.0-beta.31" + "@babel/helper-function-name" "7.0.0-beta.31" + "@babel/types" "7.0.0-beta.31" + babylon "7.0.0-beta.31" + debug "^3.0.1" + globals "^10.0.0" + invariant "^2.2.0" + lodash "^4.2.0" + +"@babel/types@7.0.0-beta.31": + version "7.0.0-beta.31" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.31.tgz#42c9c86784f674c173fb21882ca9643334029de4" + dependencies: + esutils "^2.0.2" + lodash "^4.2.0" + to-fast-properties "^2.0.0" + "@gulp-sourcemaps/identity-map@1.X": version "1.0.1" resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/identity-map/-/identity-map-1.0.1.tgz#cfa23bc5840f9104ce32a65e74db7e7a974bbee1" @@ -19,34 +72,44 @@ normalize-path "^2.0.1" through2 "^2.0.3" -"@types/node@^6.0.46": - version "6.0.88" - resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.88.tgz#f618f11a944f6a18d92b5c472028728a3e3d4b66" +"@types/node@*": + version "8.5.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.2.tgz#83b8103fa9a2c2e83d78f701a9aa7c9539739aa5" + +JSONStream@^0.8.4: + version "0.8.4" + resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.8.4.tgz#91657dfe6ff857483066132b4618b62e8f4887bd" + dependencies: + jsonparse "0.0.5" + through ">=2.2.7 <3" JSONStream@^1.0.3: - version "1.3.1" - resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a" + version "1.3.2" + resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea" dependencies: jsonparse "^1.2.0" through ">=2.2.7 <3" abab@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d" + version "1.0.4" + resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e" abbrev@1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" -abbrev@1.0.x: +abi-decoder@^1.0.9: version "1.0.9" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135" - -abstract-leveldown@2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-2.7.0.tgz#985052daf3d7d0ac0029dca8eb793f4cdd2a6834" + resolved "https://registry.yarnpkg.com/abi-decoder/-/abi-decoder-1.0.9.tgz#6bcfd86f7f63fbec8573d9778b3a4f92bb92e01f" dependencies: - xtend "~4.0.0" + babel-core "^6.23.1" + babel-loader "^6.3.2" + babel-plugin-add-module-exports "^0.2.1" + babel-plugin-transform-es2015-modules-amd "^6.22.0" + babel-preset-es2015 "^6.22.0" + chai "^3.5.0" + web3 "^0.18.4" + webpack "^2.2.1" abstract-leveldown@~2.6.0: version "2.6.3" @@ -54,6 +117,12 @@ abstract-leveldown@~2.6.0: dependencies: xtend "~4.0.0" +abstract-leveldown@~2.7.1: + version "2.7.2" + resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-2.7.2.tgz#87a44d7ebebc341d59665204834c8b7e0932cc93" + dependencies: + xtend "~4.0.0" + accepts@1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca" @@ -61,18 +130,24 @@ accepts@1.3.3: mime-types "~2.1.11" negotiator "0.6.1" -accepts@~1.3.3, accepts@~1.3.4: +accepts@~1.3.4: version "1.3.4" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f" dependencies: mime-types "~2.1.16" negotiator "0.6.1" -acorn-globals@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf" +acorn-dynamic-import@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4" + dependencies: + acorn "^4.0.3" + +acorn-globals@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.1.0.tgz#ab716025dbe17c54d3ef81d32ece2b2d99fe2538" dependencies: - acorn "^4.0.4" + acorn "^5.0.0" acorn-jsx@^3.0.0: version "3.0.1" @@ -80,17 +155,17 @@ acorn-jsx@^3.0.0: dependencies: acorn "^3.0.4" -acorn@4.X, acorn@^4.0.3, acorn@^4.0.4: - version "4.0.13" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" +acorn@5.X, acorn@^5.0.0, acorn@^5.0.3, acorn@^5.1.2, acorn@^5.2.1: + version "5.3.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822" acorn@^3.0.4: version "3.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" -acorn@^5.0.0, acorn@^5.0.3, acorn@^5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.2.tgz#911cb53e036807cf0fa778dc5d370fbd864246d7" +acorn@^4.0.3: + version "4.0.13" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" aes-js@^0.2.3: version "0.2.4" @@ -104,10 +179,14 @@ after@0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" -ajv-keywords@^1.0.0: +ajv-keywords@^1.1.1: version "1.5.1" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c" +ajv-keywords@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" + ajv@^4.7.0, ajv@^4.9.1: version "4.11.8" resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" @@ -115,14 +194,14 @@ ajv@^4.7.0, ajv@^4.9.1: co "^4.6.0" json-stable-stringify "^1.0.1" -ajv@^5.2.0: - version "5.2.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.2.tgz#47c68d69e86f5d953103b0074a9430dc63da5e39" +ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0: + version "5.5.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" dependencies: co "^4.6.0" fast-deep-equal "^1.0.0" + fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" - json-stable-stringify "^1.0.1" align-text@^0.1.1, align-text@^0.1.3: version "0.1.4" @@ -136,10 +215,22 @@ amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" +ansi-colors@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.0.1.tgz#e94c6c306005af8b482240241e2f3dea4b855ff3" + dependencies: + ansi-wrap "^0.1.0" + ansi-escapes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92" +ansi-gray@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251" + dependencies: + ansi-wrap "0.1.0" + ansi-regex@^0.2.0, ansi-regex@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9" @@ -166,6 +257,10 @@ ansi-styles@^3.1.0: dependencies: color-convert "^1.9.0" +ansi-wrap@0.1.0, ansi-wrap@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" + ansicolors@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979" @@ -185,6 +280,12 @@ anymatch@^1.3.0: micromatch "^2.1.5" normalize-path "^2.0.0" +append-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1" + dependencies: + buffer-equal "^1.0.0" + append-transform@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991" @@ -192,8 +293,8 @@ append-transform@^0.4.0: default-require-extensions "^1.0.0" aproba@^1.0.3: - version "1.1.2" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1" + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" archy@^1.0.0: version "1.0.0" @@ -212,23 +313,23 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -argsparser@^0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/argsparser/-/argsparser-0.0.7.tgz#41c85e0c3de757b350f12e6ed0e490b1e82dbe06" - arr-diff@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" dependencies: arr-flatten "^1.0.1" +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + arr-filter@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/arr-filter/-/arr-filter-1.1.2.tgz#43fdddd091e8ef11aa4c45d9cdc18e2dff1711ee" dependencies: make-iterator "^1.0.0" -arr-flatten@^1.0.1: +arr-flatten@^1.0.1, arr-flatten@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" @@ -238,6 +339,10 @@ arr-map@^2.0.0, arr-map@^2.0.2: dependencies: make-iterator "^1.0.0" +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + array-differ@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" @@ -254,6 +359,10 @@ array-filter@~0.0.0: version "0.0.1" resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec" +array-find-index@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" + array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" @@ -266,17 +375,21 @@ array-includes@^3.0.3: es-abstract "^1.7.0" array-initial@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/array-initial/-/array-initial-1.0.1.tgz#86122222a29c1ed42347f6334111afa40f8b20ec" + version "1.1.0" + resolved "https://registry.yarnpkg.com/array-initial/-/array-initial-1.1.0.tgz#2fa74b26739371c3947bd7a7adc73be334b3d795" dependencies: array-slice "^1.0.0" - is-number "^3.0.0" + is-number "^4.0.0" + +array-iterate@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-iterate/-/array-iterate-1.1.1.tgz#865bf7f8af39d6b0982c60902914ac76bc0108f6" array-last@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/array-last/-/array-last-1.2.0.tgz#0884a67ec2ac2a08133fc00f66779cfedb010986" + version "1.3.0" + resolved "https://registry.yarnpkg.com/array-last/-/array-last-1.3.0.tgz#7aa77073fec565ddab2493f5f88185f404a9d336" dependencies: - is-number "^3.0.0" + is-number "^4.0.0" array-map@~0.0.0: version "0.0.0" @@ -291,8 +404,16 @@ array-slice@^0.2.3: resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5" array-slice@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4" + +array-sort@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.0.0.tgz#e73034f00dcc1f40876008fd20feae77bd4b7c2f" + resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a" + dependencies: + default-compare "^1.0.0" + get-value "^2.0.6" + kind-of "^5.0.2" array-union@^1.0.1: version "1.0.2" @@ -308,6 +429,10 @@ array-unique@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + arraybuffer.slice@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca" @@ -321,8 +446,8 @@ asap@~2.0.3: resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" asn1.js@^4.0.0: - version "4.9.1" - resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40" + version "4.9.2" + resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.2.tgz#8117ef4f7ed87cd8f89044b5bff97ac243a16c9a" dependencies: bn.js "^4.0.0" inherits "^2.0.1" @@ -340,7 +465,7 @@ assert-plus@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" -assert@^1.4.0: +assert@^1.1.1, assert@^1.4.0: version "1.4.1" resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" dependencies: @@ -350,6 +475,14 @@ assertion-error@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c" +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + +ast-types@0.9.6: + version "0.9.6" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9" + astw@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/astw/-/astw-2.2.0.tgz#7bd41784d32493987aeb239b6b4e1c57a873b917" @@ -370,17 +503,21 @@ async-each@^1.0.0: resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" async-eventemitter@^0.2.2: - version "0.2.3" - resolved "https://registry.yarnpkg.com/async-eventemitter/-/async-eventemitter-0.2.3.tgz#f79f480dfda6645a97bd6142c017150d63b4e70e" + version "0.2.4" + resolved "https://registry.yarnpkg.com/async-eventemitter/-/async-eventemitter-0.2.4.tgz#f5e7c8ca7d3e46aab9ec40a292baf686a0bafaca" dependencies: async "^2.4.0" -async-eventemitter@ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c: +"async-eventemitter@github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c": version "0.2.3" resolved "https://codeload.github.com/ahultgren/async-eventemitter/tar.gz/fa06e39e56786ba541c180061dbf2c0a5bbf951c" dependencies: async "^2.4.0" +async-foreach@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" + async-reduce@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/async-reduce/-/async-reduce-0.0.1.tgz#b236b5f376d6fae381cded9006aa7f2c73b17f31" @@ -391,13 +528,13 @@ async-settle@^1.0.0: dependencies: async-done "^1.2.2" -async@1.x, async@^1.4.0, async@^1.4.2: +async@^1.4.0, async@^1.4.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" async@^2.0.1, async@^2.1.2, async@^2.4.0, async@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d" + version "2.6.0" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" dependencies: lodash "^4.14.0" @@ -417,30 +554,52 @@ asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" +atob@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d" + atob@~1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773" +autoprefixer@^6.0.0: + version "6.7.7" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014" + dependencies: + browserslist "^1.7.6" + caniuse-db "^1.0.30000634" + normalize-range "^0.1.2" + num2fraction "^1.2.2" + postcss "^5.2.16" + postcss-value-parser "^3.2.3" + +autoprefixer@^7.0.0, autoprefixer@^7.1.2: + version "7.2.3" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.3.tgz#c2841e38b7940c2d0a9bbffd72c75f33637854f8" + dependencies: + browserslist "^2.10.0" + caniuse-lite "^1.0.30000783" + normalize-range "^0.1.2" + num2fraction "^1.2.2" + postcss "^6.0.14" + postcss-value-parser "^3.2.3" + await-semaphore@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/await-semaphore/-/await-semaphore-0.1.2.tgz#0ceba1bdb2cfc537496032f167bd8b7dedb97493" + version "0.1.3" + resolved "https://registry.yarnpkg.com/await-semaphore/-/await-semaphore-0.1.3.tgz#2b88018cc8c28e06167ae1cdff02504f1f9688d3" aws-sign2@~0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" -aws4@^1.2.1: +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + +aws4@^1.2.1, aws4@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" -babel-code-frame@7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-7.0.0-beta.0.tgz#418a7b5f3f7dc9a4670e61b1158b4c5661bec98d" - dependencies: - chalk "^2.0.0" - esutils "^2.0.2" - js-tokens "^3.0.0" - babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" @@ -449,7 +608,7 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: esutils "^2.0.2" js-tokens "^3.0.2" -babel-core@^6.0.14, babel-core@^6.24.1, babel-core@^6.26.0: +babel-core@^6.0.14, babel-core@^6.23.1, babel-core@^6.24.1, babel-core@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8" dependencies: @@ -474,13 +633,15 @@ babel-core@^6.0.14, babel-core@^6.24.1, babel-core@^6.26.0: source-map "^0.5.6" babel-eslint@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.0.0.tgz#ce06f385bdfb5b6d7e603f06222f891abd14c240" + version "8.1.2" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.1.2.tgz#a39230b0c20ecbaa19a35d5633bf9b9ca2c8116f" dependencies: - babel-code-frame "7.0.0-beta.0" - babel-traverse "7.0.0-beta.0" - babel-types "7.0.0-beta.0" - babylon "7.0.0-beta.22" + "@babel/code-frame" "7.0.0-beta.31" + "@babel/traverse" "7.0.0-beta.31" + "@babel/types" "7.0.0-beta.31" + babylon "7.0.0-beta.31" + eslint-scope "~3.7.1" + eslint-visitor-keys "^1.0.0" babel-generator@^6.18.0, babel-generator@^6.26.0: version "6.26.0" @@ -554,15 +715,6 @@ babel-helper-explode-class@^6.24.1: babel-traverse "^6.24.1" babel-types "^6.24.1" -babel-helper-function-name@7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-7.0.0-beta.0.tgz#d1b6779b647e5c5c31ebeb05e13b998e4d352d56" - dependencies: - babel-helper-get-function-arity "7.0.0-beta.0" - babel-template "7.0.0-beta.0" - babel-traverse "7.0.0-beta.0" - babel-types "7.0.0-beta.0" - babel-helper-function-name@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" @@ -573,12 +725,6 @@ babel-helper-function-name@^6.24.1: babel-traverse "^6.24.1" babel-types "^6.24.1" -babel-helper-get-function-arity@7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-7.0.0-beta.0.tgz#9d1ab7213bb5efe1ef1638a8ea1489969b5a8b6e" - dependencies: - babel-types "7.0.0-beta.0" - babel-helper-get-function-arity@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" @@ -636,9 +782,14 @@ babel-helpers@^6.24.1: babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-messages@7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-7.0.0-beta.0.tgz#6df01296e49fc8fbd0637394326a167f36da817b" +babel-loader@^6.3.2: + version "6.4.1" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.1.tgz#0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca" + dependencies: + find-cache-dir "^0.1.1" + loader-utils "^0.2.16" + mkdirp "^0.5.1" + object-assign "^4.0.1" babel-messages@^6.23.0: version "6.23.0" @@ -646,6 +797,10 @@ babel-messages@^6.23.0: dependencies: babel-runtime "^6.22.0" +babel-plugin-add-module-exports@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz#9ae9a1f4a8dc67f0cdec4f4aeda1e43a5ff65e25" + babel-plugin-check-es2015-constants@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" @@ -1018,8 +1173,8 @@ babel-polyfill@^6.23.0: regenerator-runtime "^0.10.5" babel-preset-env@^1.3.2: - version "1.6.0" - resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.0.tgz#2de1c782a780a0a5d605d199c957596da43c44e4" + version "1.6.1" + resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48" dependencies: babel-plugin-check-es2015-constants "^6.22.0" babel-plugin-syntax-trailing-function-commas "^6.22.0" @@ -1152,15 +1307,6 @@ babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runti core-js "^2.4.0" regenerator-runtime "^0.11.0" -babel-template@7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-7.0.0-beta.0.tgz#85083cf9e4395d5e48bf5154d7a8d6991cafecfb" - dependencies: - babel-traverse "7.0.0-beta.0" - babel-types "7.0.0-beta.0" - babylon "7.0.0-beta.22" - lodash "^4.2.0" - babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" @@ -1171,20 +1317,6 @@ babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0: babylon "^6.18.0" lodash "^4.17.4" -babel-traverse@7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-7.0.0-beta.0.tgz#da14be9b762f62a2f060db464eaafdd8cd072a41" - dependencies: - babel-code-frame "7.0.0-beta.0" - babel-helper-function-name "7.0.0-beta.0" - babel-messages "7.0.0-beta.0" - babel-types "7.0.0-beta.0" - babylon "7.0.0-beta.22" - debug "^3.0.1" - globals "^10.0.0" - invariant "^2.2.0" - lodash "^4.2.0" - babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" @@ -1199,14 +1331,6 @@ babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0: invariant "^2.2.2" lodash "^4.17.4" -babel-types@7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-7.0.0-beta.0.tgz#eb8b6e556470e6dcc4aef982d79ad229469b5169" - dependencies: - esutils "^2.0.2" - lodash "^4.2.0" - to-fast-properties "^2.0.0" - babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" @@ -1216,16 +1340,20 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26 lodash "^4.17.4" to-fast-properties "^1.0.3" -babelify@^7.2.0, babelify@^7.3.0: +babelify@^7.3.0: version "7.3.0" resolved "https://registry.yarnpkg.com/babelify/-/babelify-7.3.0.tgz#aa56aede7067fd7bd549666ee16dc285087e88e5" dependencies: babel-core "^6.0.14" object-assign "^4.0.0" -babylon@7.0.0-beta.22: - version "7.0.0-beta.22" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.22.tgz#74f0ad82ed7c7c3cfeab74cf684f815104161b65" +babelify@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/babelify/-/babelify-8.0.0.tgz#6f60f5f062bfe7695754ef2403b842014a580ed3" + +babylon@7.0.0-beta.31: + version "7.0.0-beta.31" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.31.tgz#7ec10f81e0e456fd0f855ad60fa30c2ac454283f" babylon@^6.18.0: version "6.18.0" @@ -1255,6 +1383,14 @@ backo2@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" +bail@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.2.tgz#f7d6c1731630a9f9f0d4d35ed1f962e2074a1764" + +balanced-match@^0.4.0: + version "0.4.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" + balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -1263,14 +1399,14 @@ base-x@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/base-x/-/base-x-1.1.0.tgz#42d3d717474f9ea02207f6d1aa1f426913eeb7ac" +base62@0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/base62/-/base62-0.1.1.tgz#7b4174c2f94449753b11c2651c083da841a7b084" + base64-arraybuffer@0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8" -base64-js@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.2.tgz#024f0f72afa25b75f9c0ee73cd4f55ec1bed9784" - base64-js@^1.0.2: version "1.2.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886" @@ -1283,6 +1419,18 @@ base64id@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6" +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + bcrypt-pbkdf@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" @@ -1322,13 +1470,25 @@ better-assert@~1.0.0: dependencies: callsite "1.0.0" +big.js@^3.1.3: + version "3.2.0" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" + +bignumber.js@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1" + +"bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2": + version "2.0.7" + resolved "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2" + "bignumber.js@git+https://github.com/frozeman/bignumber.js-nolookahead.git": version "2.0.7" resolved "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934" binary-extensions@^1.0.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0" + version "1.11.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" binaryextensions@~1.0.0: version "1.0.1" @@ -1354,19 +1514,7 @@ bip66@^1.1.3: dependencies: safe-buffer "^5.0.1" -bl@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-0.7.0.tgz#3fb0670602ac2878eb770dc2039f1836be62ae5b" - dependencies: - readable-stream "~1.0.2" - -bl@^0.9.1: - version "0.9.5" - resolved "https://registry.yarnpkg.com/bl/-/bl-0.9.5.tgz#c06b797af085ea00bc527afc8efcf11de2232054" - dependencies: - readable-stream "~1.0.26" - -bl@^1.0.0: +bl@^1.2.0, bl@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e" dependencies: @@ -1382,9 +1530,9 @@ block-stream@*: dependencies: inherits "~2.0.0" -bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.4.6, bluebird@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c" +bluebird@^3.0.5, bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.4.6, bluebird@^3.5.0: + version "3.5.1" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" bn.js@4.11.6: version "4.11.6" @@ -1394,7 +1542,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.10.0, bn.js@^4.11.3, bn.js@^4 version "4.11.8" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" -body-parser@1.18.2: +body-parser@1.18.2, body-parser@^1.16.1: version "1.18.2" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454" dependencies: @@ -1409,21 +1557,6 @@ body-parser@1.18.2: raw-body "2.3.2" type-is "~1.6.15" -body-parser@^1.16.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.1.tgz#9c1629370bcfd42917f30641a2dcbe2ec50d4c26" - dependencies: - bytes "3.0.0" - content-type "~1.0.4" - debug "2.6.8" - depd "~1.1.1" - http-errors "~1.6.2" - iconv-lite "0.4.19" - on-finished "~2.3.0" - qs "6.5.1" - raw-body "2.3.2" - type-is "~1.6.15" - body-parser@~1.14.0: version "1.14.2" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.14.2.tgz#1015cb1fe2c443858259581db53332f8d0cf50f9" @@ -1449,12 +1582,23 @@ boom@2.x.x: dependencies: hoek "2.x.x" -bops@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/bops/-/bops-0.0.6.tgz#082d1d55fa01e60dbdc2ebc2dba37f659554cf3a" +boom@4.x.x: + version "4.3.1" + resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31" + dependencies: + hoek "4.x.x" + +boom@5.x.x: + version "5.2.0" + resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02" + dependencies: + hoek "4.x.x" + +boron@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/boron/-/boron-0.2.3.tgz#63a1800771c0cb2b0d8f616687c62c1248cfb8a0" dependencies: - base64-js "0.0.2" - to-utf8 "0.0.1" + domkit "^0.0.1" brace-expansion@^1.1.7: version "1.1.8" @@ -1477,6 +1621,22 @@ braces@^1.8.2: preserve "^0.2.0" repeat-element "^1.1.2" +braces@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.0.tgz#a46941cb5fb492156b3d6a656e06c35364e3e66e" + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + define-property "^1.0.0" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + brfs@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.4.3.tgz#db675d6f5e923e6df087fca5859c9090aaed3216" @@ -1490,6 +1650,16 @@ brorand@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" +browser-pack@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-5.0.1.tgz#4197719b20c6e0aaa09451c5111e53efb6fbc18d" + dependencies: + JSONStream "^1.0.3" + combine-source-map "~0.6.1" + defined "^1.0.0" + through2 "^1.0.0" + umd "^3.0.0" + browser-pack@^6.0.1: version "6.0.2" resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.0.2.tgz#f86cd6cef4f5300c8e63e07a4d512f65fbff4531" @@ -1506,6 +1676,10 @@ browser-passworder@^2.0.3: dependencies: browserify-unibabel "^3.0.0" +browser-process-hrtime@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz#425d68a58d3447f02a04aa894187fce8af8b7b8e" + browser-resolve@^1.11.0, browser-resolve@^1.7.0: version "1.11.2" resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce" @@ -1516,17 +1690,18 @@ browser-stdout@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f" -browser-unpack@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/browser-unpack/-/browser-unpack-0.2.3.tgz#88fe04cc266257e52650095cd8e0585dc7b6e2f1" +browser-unpack@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/browser-unpack/-/browser-unpack-1.2.0.tgz#357aee31fc467831684d063e4355e070a782970d" dependencies: - concat-stream "~1.2.1" - esprima-fb "3001.1.0-dev-harmony-fb" - minimist "0.0.5" + acorn "^4.0.3" + browser-pack "^5.0.1" + concat-stream "^1.5.0" + minimist "^1.1.1" browserify-aes@^1.0.0, browserify-aes@^1.0.4, browserify-aes@^1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.8.tgz#c8fa3b1b7585bb7ba77c5560b60996ddec6d5309" + version "1.1.1" + resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f" dependencies: buffer-xor "^1.0.3" cipher-base "^1.0.0" @@ -1587,21 +1762,21 @@ browserify-unibabel@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/browserify-unibabel/-/browserify-unibabel-3.0.0.tgz#5a6b8f0f704ce388d3927df47337e25830f71dda" -browserify-zlib@~0.1.2: - version "0.1.4" - resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d" +browserify-zlib@^0.2.0, browserify-zlib@~0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" dependencies: - pako "~0.2.0" + pako "~1.0.5" browserify@^14.0.0, browserify@^14.4.0: - version "14.4.0" - resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.4.0.tgz#089a3463af58d0e48d8cd4070b3f74654d5abca9" + version "14.5.0" + resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.5.0.tgz#0bbbce521acd6e4d1d54d8e9365008efb85a9cc5" dependencies: JSONStream "^1.0.3" assert "^1.4.0" browser-pack "^6.0.1" browser-resolve "^1.11.0" - browserify-zlib "~0.1.2" + browserify-zlib "~0.2.0" buffer "^5.0.2" cached-path-relative "^1.0.0" concat-stream "~1.5.1" @@ -1621,7 +1796,7 @@ browserify@^14.0.0, browserify@^14.4.0: insert-module-globals "^7.0.0" labeled-stream-splicer "^2.0.0" module-deps "^4.0.8" - os-browserify "~0.1.1" + os-browserify "~0.3.0" parents "^1.0.1" path-browserify "~0.0.0" process "~0.11.0" @@ -1645,12 +1820,19 @@ browserify@^14.0.0, browserify@^14.4.0: vm-browserify "~0.0.1" xtend "^4.0.0" -browserslist@^2.1.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.4.0.tgz#693ee93d01e66468a6348da5498e011f578f87f8" +browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.7.6: + version "1.7.7" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9" + dependencies: + caniuse-db "^1.0.30000639" + electron-to-chromium "^1.2.7" + +browserslist@^2.1.2, browserslist@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.10.0.tgz#bac5ee1cc69ca9d96403ffb8a3abdc5b6aed6346" dependencies: - caniuse-lite "^1.0.30000718" - electron-to-chromium "^1.3.18" + caniuse-lite "^1.0.30000780" + electron-to-chromium "^1.3.28" bs58@^2.0.1: version "2.0.1" @@ -1677,13 +1859,25 @@ buffer-equal@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b" +buffer-equal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" + buffer-xor@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" +buffer@^4.3.0: + version "4.9.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" + dependencies: + base64-js "^1.0.2" + ieee754 "^1.1.4" + isarray "^1.0.0" + buffer@^5.0.2: - version "5.0.7" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.0.7.tgz#570a290b625cf2603290c1149223d27ccf04db97" + version "5.0.8" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.0.8.tgz#84daa52e7cf2fa8ce4195bc5cf0f7809e0930b24" dependencies: base64-js "^1.0.2" ieee754 "^1.1.4" @@ -1712,6 +1906,20 @@ bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + cached-path-relative@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7" @@ -1738,11 +1946,26 @@ callsites@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca" +camelcase-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" + dependencies: + camelcase "^2.0.0" + map-obj "^1.0.0" + +camelcase-keys@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77" + dependencies: + camelcase "^4.1.0" + map-obj "^2.0.0" + quick-lru "^1.0.0" + camelcase@^1.0.2: version "1.2.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" -camelcase@^2.0.1: +camelcase@^2.0.0, camelcase@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" @@ -1754,14 +1977,26 @@ camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" -caniuse-lite@^1.0.30000718: - version "1.0.30000733" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000733.tgz#ebfc48254117cc0c66197a4536cb4397a6cfbccd" +caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: + version "1.0.30000784" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000784.tgz#1be95012d9489c7719074f81aee57dbdffe6361b" + +caniuse-lite@^1.0.30000780, caniuse-lite@^1.0.30000783: + version "1.0.30000784" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000784.tgz#129ced74e9a1280a441880b6cd2bce30ef59e6c0" + +caseless@~0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7" caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" +ccount@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.2.tgz#53b6a2f815bb77b9c2871f7b9a72c3a25f1d8e89" + center-align@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" @@ -1769,7 +2004,7 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -"chai@>=1.9.2 <4.0.0": +"chai@>=1.9.2 <4.0.0", chai@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247" dependencies: @@ -1812,9 +2047,9 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e" +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba" dependencies: ansi-styles "^3.1.0" escape-string-regexp "^1.0.5" @@ -1824,6 +2059,26 @@ change-emitter@^0.1.2: version "0.1.6" resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515" +character-entities-html4@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.1.tgz#359a2a4a0f7e29d3dc2ac99bdbe21ee39438ea50" + +character-entities-legacy@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz#f40779df1a101872bb510a3d295e1fccf147202f" + +character-entities@^1.0.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.1.tgz#f76871be5ef66ddb7f8f8e3478ecc374c27d6dca" + +character-reference-invalid@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz#942835f750e4ec61a308e60c2ef8cc1011202efc" + +chardet@^0.4.0: + version "0.4.2" + resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" + charm@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35" @@ -1840,28 +2095,33 @@ checkpoint-store@^1.1.0: dependencies: functional-red-black-tree "^1.0.1" -cheerio@^0.22.0: - version "0.22.0" - resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" +cheerio@^1.0.0-rc.2: + version "1.0.0-rc.2" + resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db" dependencies: css-select "~1.2.0" dom-serializer "~0.1.0" entities "~1.1.1" htmlparser2 "^3.9.1" - lodash.assignin "^4.0.9" - lodash.bind "^4.1.4" - lodash.defaults "^4.0.1" - lodash.filter "^4.4.0" - lodash.flatten "^4.2.0" - lodash.foreach "^4.3.0" - lodash.map "^4.4.0" - lodash.merge "^4.4.0" - lodash.pick "^4.2.1" - lodash.reduce "^4.4.0" - lodash.reject "^4.4.0" - lodash.some "^4.4.0" - -chokidar@^1.0.0, chokidar@^1.4.1, chokidar@^1.4.3, chokidar@^1.6.1: + lodash "^4.15.0" + parse5 "^3.0.1" + +chokidar@1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.1.tgz#2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2" + dependencies: + anymatch "^1.3.0" + async-each "^1.0.0" + glob-parent "^2.0.0" + inherits "^2.0.1" + is-binary-path "^1.0.0" + is-glob "^2.0.0" + path-is-absolute "^1.0.0" + readdirp "^2.0.0" + optionalDependencies: + fsevents "^1.0.0" + +chokidar@^1.0.0, chokidar@^1.4.1, chokidar@^1.4.3, chokidar@^1.6.1, chokidar@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" dependencies: @@ -1876,10 +2136,6 @@ chokidar@^1.0.0, chokidar@^1.4.1, chokidar@^1.4.3, chokidar@^1.6.1: optionalDependencies: fsevents "^1.0.0" -chownr@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" - cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" @@ -1891,6 +2147,16 @@ circular-json@^0.3.1: version "0.3.3" resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66" +class-utils@^0.3.5: + version "0.3.5" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.5.tgz#17e793103750f9627b2176ea34cfd1b565903c80" + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + lazy-cache "^2.0.2" + static-extend "^0.1.1" + classnames@^2.2.4, classnames@^2.2.5: version "2.2.5" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d" @@ -1901,12 +2167,6 @@ cli-cursor@^2.1.0: dependencies: restore-cursor "^2.0.0" -cli-table@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23" - dependencies: - colors "1.0.3" - cli-width@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" @@ -1931,22 +2191,45 @@ cliui@^3.0.3, cliui@^3.2.0: strip-ansi "^3.0.1" wrap-ansi "^2.0.0" +clone-buffer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" + +clone-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.0.tgz#eae0a2413f55c0942f818c229fefce845d7f3b1c" + dependencies: + is-regexp "^1.0.0" + is-supported-regexp-flag "^1.0.0" + clone-stats@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" +clone-stats@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" + clone@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f" clone@^1.0.0, clone@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149" + version "1.0.3" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f" clone@^2.0.0, clone@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb" +cloneable-readable@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117" + dependencies: + inherits "^2.0.1" + process-nextick-args "^1.0.6" + through2 "^2.0.1" + co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -1962,6 +2245,10 @@ coinstring@^2.0.0: bs58 "^2.0.1" create-hash "^1.1.1" +collapse-white-space@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.3.tgz#4b906f670e5a963a87b76b0e1689643341b6023c" + collection-map@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-map/-/collection-map-1.0.0.tgz#aea0f06f8d26c780c2b75494385544b2255af18c" @@ -1970,12 +2257,23 @@ collection-map@^1.0.0: for-own "^1.0.0" make-iterator "^1.0.0" +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + color-convert@^1.3.0, color-convert@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a" + version "1.9.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed" dependencies: color-name "^1.1.1" +color-diff@^0.1.3: + version "0.1.7" + resolved "https://registry.yarnpkg.com/color-diff/-/color-diff-0.1.7.tgz#6db78cd9482a8e459d40821eaf4b503283dcb8e2" + color-name@^1.0.0, color-name@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" @@ -1986,6 +2284,10 @@ color-string@^0.3.0: dependencies: color-name "^1.0.0" +color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + color@^0.11.1: version "0.11.4" resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764" @@ -1994,7 +2296,26 @@ color@^0.11.1: color-convert "^1.3.0" color-string "^0.3.0" -colors@1.0.3, colors@1.0.x: +colorguard@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/colorguard/-/colorguard-1.2.1.tgz#249647c9702481d9143384fc9813662311afde98" + dependencies: + chalk "^1.1.1" + color-diff "^0.1.3" + log-symbols "^1.0.2" + object-assign "^4.0.1" + pipetteur "^2.0.0" + plur "^2.0.0" + postcss "^5.0.4" + postcss-reporter "^1.2.1" + text-table "^0.2.0" + yargs "^1.2.6" + +colors@0.5.x: + version "0.5.1" + resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774" + +colors@1.0.x: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" @@ -2008,6 +2329,15 @@ combine-lists@^1.0.0: dependencies: lodash "^4.5.0" +combine-source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.6.1.tgz#9b4a09c316033d768e0f11e029fa2730e079ad96" + dependencies: + convert-source-map "~1.1.0" + inline-source-map "~0.5.0" + lodash.memoize "~3.0.3" + source-map "~0.4.2" + combine-source-map@~0.7.1: version "0.7.2" resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.7.2.tgz#0870312856b307a87cc4ac486f3a9a62aeccc09e" @@ -2023,10 +2353,20 @@ combined-stream@^1.0.5, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" -commander@2.11.0, commander@^2.6.0, commander@~2.11.0: +commander@2.11.0: version "2.11.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" +commander@2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" + dependencies: + graceful-readlink ">= 1.0.0" + +commander@^2.5.0, commander@^2.6.0, commander@^2.9.0, commander@~2.12.1: + version "2.12.2" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555" + commondir@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-0.0.1.tgz#89f00fdcd51b519c578733fec563e6a6da7f5be2" @@ -2035,23 +2375,19 @@ commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" -commonmark-react-renderer@^4.2.4: - version "4.3.3" - resolved "https://registry.yarnpkg.com/commonmark-react-renderer/-/commonmark-react-renderer-4.3.3.tgz#9c4bca138bc83287bae792ccf133738be9cbc6fa" - dependencies: - in-publish "^2.0.0" - lodash.assign "^4.2.0" - lodash.isplainobject "^4.0.6" - pascalcase "^0.1.1" - xss-filters "^1.2.6" - -commonmark@^0.24.0: - version "0.24.0" - resolved "https://registry.yarnpkg.com/commonmark/-/commonmark-0.24.0.tgz#b80de0182c546355643aa15db12bfb282368278f" +commoner@^0.10.0: + version "0.10.8" + resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5" dependencies: - entities "~ 1.1.1" - mdurl "~ 1.0.1" - string.prototype.repeat "^0.2.0" + commander "^2.5.0" + detective "^4.3.1" + glob "^5.0.15" + graceful-fs "^4.1.2" + iconv-lite "^0.4.5" + mkdirp "^0.5.0" + private "^0.1.6" + q "^1.1.2" + recast "^0.11.17" component-bind@1.0.0: version "1.0.0" @@ -2061,7 +2397,7 @@ component-emitter@1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3" -component-emitter@1.2.1: +component-emitter@1.2.1, component-emitter@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" @@ -2073,7 +2409,7 @@ concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" -concat-stream@^1.4.3, concat-stream@^1.4.6, concat-stream@^1.5.0, concat-stream@^1.6.0, concat-stream@~1.6.0: +concat-stream@^1.4.3, concat-stream@^1.4.6, concat-stream@^1.5.0, concat-stream@^1.5.1, concat-stream@^1.6.0, concat-stream@~1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" dependencies: @@ -2081,12 +2417,6 @@ concat-stream@^1.4.3, concat-stream@^1.4.6, concat-stream@^1.5.0, concat-stream@ readable-stream "^2.2.2" typedarray "^0.0.6" -concat-stream@~1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.2.1.tgz#f35100b6c46378bfba8b6b80f9f0d0ccdf13dc60" - dependencies: - bops "0.0.6" - concat-stream@~1.5.0, concat-stream@~1.5.1: version "1.5.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266" @@ -2103,13 +2433,13 @@ config-chain@~1.1.5: proto-list "~1.2.1" connect@^3.6.0: - version "3.6.3" - resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.3.tgz#f7320d46a25b4be7b483a2236517f24b1e27e301" + version "3.6.5" + resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.5.tgz#fb8dde7ba0763877d0ec9df9dac0b4b40e72c7da" dependencies: - debug "2.6.8" - finalhandler "1.0.4" - parseurl "~1.3.1" - utils-merge "1.0.0" + debug "2.6.9" + finalhandler "1.0.6" + parseurl "~1.3.2" + utils-merge "1.0.1" console-browserify@^1.1.0: version "1.1.0" @@ -2127,7 +2457,7 @@ consolidate@^0.14.0: dependencies: bluebird "^3.1.1" -constants-browserify@~1.0.0: +constants-browserify@^1.0.0, constants-browserify@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -2136,16 +2466,16 @@ content-disposition@0.5.2: resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" content-type-parser@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.1.tgz#c3e56988c53c65127fb46d4032a3a900246fdc94" + version "1.0.2" + resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz#caabe80623e63638b2502fd4c7f12ff4ce2352e7" -content-type@~1.0.1, content-type@~1.0.2, content-type@~1.0.4: +content-type@~1.0.1, content-type@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" -convert-source-map@1.X, convert-source-map@^1.1.1, convert-source-map@^1.3.0, convert-source-map@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5" +convert-source-map@1.X, convert-source-map@^1.3.0, convert-source-map@^1.5.0: + version "1.5.1" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" convert-source-map@~1.1.0: version "1.1.3" @@ -2159,11 +2489,15 @@ cookie@0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" -copy-props@^1.4.1: - version "1.6.0" - resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-1.6.0.tgz#f0324bbee99771101e7b3ada112f313c393db8ed" +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + +copy-props@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-2.0.1.tgz#665fc32046ca84a898abaa3c5945e7f248ccba00" dependencies: - each-props "^1.2.1" + each-props "^1.3.0" is-plain-object "^2.0.1" copy-to-clipboard@^3.0.8: @@ -2177,13 +2511,34 @@ core-js@^1.0.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.0: - version "2.5.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b" + version "2.5.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" +cosmiconfig@^2.1.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892" + dependencies: + is-directory "^0.3.1" + js-yaml "^3.4.3" + minimist "^1.2.0" + object-assign "^4.1.0" + os-homedir "^1.0.1" + parse-json "^2.2.0" + require-from-string "^1.1.0" + +cosmiconfig@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-3.1.0.tgz#640a94bf9847f321800403cd273af60665c73397" + dependencies: + is-directory "^0.3.1" + js-yaml "^3.9.0" + parse-json "^3.0.0" + require-from-string "^2.0.1" + coveralls@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.0.0.tgz#22ef730330538080d29b8c151dc9146afde88a99" @@ -2221,14 +2576,21 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -create-react-class@^15.5.2, create-react-class@^15.6.0: - version "15.6.0" - resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.0.tgz#ab448497c26566e1e29413e883207d57cfe7bed4" +create-react-class@^15.6.0: + version "15.6.2" + resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a" dependencies: fbjs "^0.8.9" loose-envify "^1.3.1" object-assign "^4.1.1" +cross-spawn@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" + dependencies: + lru-cache "^4.0.1" + which "^1.2.9" + cross-spawn@^4: version "4.0.2" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41" @@ -2250,9 +2612,15 @@ cryptiles@2.x.x: dependencies: boom "2.x.x" -crypto-browserify@^3.0.0: - version "3.11.1" - resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.1.tgz#948945efc6757a400d6e5e5af47194d10064279f" +cryptiles@3.x.x: + version "3.1.2" + resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe" + dependencies: + boom "5.x.x" + +crypto-browserify@^3.0.0, crypto-browserify@^3.11.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" dependencies: browserify-cipher "^1.0.0" browserify-sign "^4.0.0" @@ -2264,11 +2632,35 @@ crypto-browserify@^3.0.0: pbkdf2 "^3.0.3" public-encrypt "^4.0.0" randombytes "^2.0.0" + randomfill "^1.0.3" crypto-js@^3.1.4: version "3.1.8" resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.8.tgz#715f070bf6014f2ae992a98b3929258b713f08d5" +css-color-list@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/css-color-list/-/css-color-list-0.0.1.tgz#8718e8695ae7a2cc8787be8715f1c008a7f28b15" + dependencies: + css-color-names "0.0.1" + +css-color-names@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.1.tgz#5d0548fa256456ede4a9a0c2ac7ab19d3eb1ad81" + +css-color-names@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.3.tgz#de0cef16f4d8aa8222a320d5b6d7e9bbada7b9f6" + +css-rule-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/css-rule-stream/-/css-rule-stream-1.1.0.tgz#3786e7198983d965a26e31957e09078cbb7705a2" + dependencies: + css-tokenize "^1.0.1" + duplexer2 "0.0.2" + ldjson-stream "^1.2.1" + through2 "^0.6.3" + css-select@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" @@ -2278,6 +2670,13 @@ css-select@~1.2.0: domutils "1.5.1" nth-check "~1.0.1" +css-tokenize@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/css-tokenize/-/css-tokenize-1.0.1.tgz#4625cb1eda21c143858b7f81d6803c1d26fc14be" + dependencies: + inherits "^2.0.1" + readable-stream "^1.0.33" + css-what@2.1: version "2.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd" @@ -2307,6 +2706,12 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": dependencies: cssom "0.3.x" +currently-unhandled@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" + dependencies: + array-find-index "^1.0.1" + custom-event@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" @@ -2340,20 +2745,20 @@ date-now@^0.1.4: resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" dateformat@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17" + version "2.2.0" + resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062" debounce@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.0.2.tgz#503cc674d8d7f737099664fb75ddbd36b9626dc6" + version "1.1.0" + resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.1.0.tgz#6a1a4ee2a9dc4b7c24bb012558dbcdb05b37f408" -debug-fabulous@>=0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/debug-fabulous/-/debug-fabulous-0.1.1.tgz#1b970878c9fa4fbd1c88306eab323c830c58f1d6" +debug-fabulous@1.X: + version "1.0.0" + resolved "https://registry.yarnpkg.com/debug-fabulous/-/debug-fabulous-1.0.0.tgz#57f6648646097b1b0849dcda0017362c1ec00f8b" dependencies: - debug "2.3.0" - memoizee "^0.4.5" - object-assign "4.1.0" + debug "3.X" + memoizee "0.4.X" + object-assign "4.X" debug-log@^1.0.1: version "1.0.1" @@ -2365,46 +2770,39 @@ debug@2.2.0, debug@~2.2.0: dependencies: ms "0.7.1" -debug@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.0.tgz#3912dc55d7167fc3af17d2b85c13f93deaedaa43" - dependencies: - ms "0.7.2" - debug@2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c" dependencies: ms "0.7.2" -debug@2.6.8, debug@^2.1.0, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8: - version "2.6.8" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" - dependencies: - ms "2.0.0" - -debug@2.6.9: +debug@2.6.9, debug@^2.1.0, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" dependencies: ms "2.0.0" -debug@3.1.0: +debug@3.1.0, debug@3.X, debug@^3.0.0, debug@^3.0.1, debug@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" dependencies: ms "2.0.0" -debug@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.1.tgz#0564c612b521dc92d9f2988f0549e34f9c98db64" +decamelize-keys@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" dependencies: - ms "2.0.0" + decamelize "^1.1.0" + map-obj "^1.0.0" -decamelize@^1.0.0, decamelize@^1.1.1: +decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + deep-diff@^0.3.5: version "0.3.8" resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84" @@ -2449,6 +2847,12 @@ deepmerge@~0.2.7: version "0.2.10" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-0.2.10.tgz#8906bf9e525a4fbf1b203b2afcb4640249821219" +default-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" + dependencies: + kind-of "^5.0.2" + default-require-extensions@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8" @@ -2472,6 +2876,18 @@ define-properties@^1.1.2: foreach "^2.0.5" object-keys "^1.0.8" +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + dependencies: + is-descriptor "^1.0.0" + defined@^1.0.0, defined@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" @@ -2547,6 +2963,10 @@ detect-file@^0.1.0: dependencies: fs-exists-sync "^0.1.0" +detect-file@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" + detect-indent@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-2.0.0.tgz#720ff51e4d97b76884f6bf57292348b13dfde939" @@ -2561,6 +2981,10 @@ detect-indent@^4.0.0: dependencies: repeating "^2.0.0" +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + detect-newline@2.X: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" @@ -2569,21 +2993,25 @@ detect-node@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127" -detective@^4.0.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/detective/-/detective-4.5.0.tgz#6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1" +detective@^4.0.0, detective@^4.3.1: + version "4.7.1" + resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e" dependencies: - acorn "^4.0.3" + acorn "^5.2.1" defined "^1.0.0" di@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" -diff@3.3.1, diff@^3.1.0: +diff@3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75" +diff@^3.1.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c" + diffie-hellman@^5.0.0: version "5.0.2" resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e" @@ -2592,12 +3020,19 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" +dir-glob@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034" + dependencies: + arrify "^1.0.1" + path-type "^3.0.0" + disc@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/disc/-/disc-1.3.2.tgz#32a6f02e486edf77860a5363d22718425d296e40" + version "1.3.3" + resolved "https://registry.yarnpkg.com/disc/-/disc-1.3.3.tgz#61d455180c2a115468bb85015a33e71a82fc02c2" dependencies: - bl "^0.7.0" - browser-unpack "^0.2.3" + bl "^1.2.0" + browser-unpack "^1.2.0" builtins "0.0.3" commondir "0.0.1" d3 "^3.4.3" @@ -2611,6 +3046,10 @@ disc@^1.3.2: through "^2.3.4" uniq "^1.0.0" +discontinuous-range@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a" + dnode-protocol@~0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/dnode-protocol/-/dnode-protocol-0.2.2.tgz#51151d16fc3b5f84815ee0b9497a1061d0d1949d" @@ -2627,16 +3066,32 @@ dnode@^1.2.2: optionalDependencies: weak "^1.0.0" -doctrine@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63" +doctrine@^2.0.0, doctrine@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.2.tgz#68f96ce8efc56cc42651f1faadb4f175273b0075" dependencies: esutils "^2.0.2" - isarray "^1.0.0" + +doiuse@^2.4.1: + version "2.6.0" + resolved "https://registry.yarnpkg.com/doiuse/-/doiuse-2.6.0.tgz#1892d10b61a9a356addbf2b614933e81f8bb3834" + dependencies: + browserslist "^1.1.1" + caniuse-db "^1.0.30000187" + css-rule-stream "^1.1.0" + duplexer2 "0.0.2" + jsonfilter "^1.1.2" + ldjson-stream "^1.2.1" + lodash "^4.0.0" + multimatch "^2.0.0" + postcss "^5.0.8" + source-map "^0.4.2" + through2 "^0.6.3" + yargs "^3.5.4" dom-helpers@^3.2.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.2.1.tgz#3203e07fed217bd1f424b019735582fc37b2825a" + version "3.3.1" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.3.1.tgz#fc1a4e15ffdf60ddde03a480a9c0fece821dd4a6" dom-serialize@^2.2.0: version "2.2.1" @@ -2658,7 +3113,7 @@ dom-walk@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018" -domain-browser@~1.1.0: +domain-browser@^1.1.1, domain-browser@~1.1.0: version "1.1.7" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" @@ -2670,12 +3125,20 @@ domelementtype@~1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b" +domexception@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.0.tgz#81fe5df81b3f057052cde3a9fa9bf536a85b9ab0" + domhandler@^2.3.0: version "2.4.1" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259" dependencies: domelementtype "1" +domkit@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/domkit/-/domkit-0.0.1.tgz#88399d586794efc1154fec6c22cfe50f19bd4dbb" + domutils@1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" @@ -2690,6 +3153,12 @@ domutils@^1.5.1: dom-serializer "0" domelementtype "1" +dot-prop@^4.1.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" + dependencies: + is-obj "^1.0.0" + drbg.js@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/drbg.js/-/drbg.js-1.0.1.tgz#3e36b6c42b37043823cdbc332d58f31e2445480b" @@ -2714,7 +3183,7 @@ duplexer@^0.1.1, duplexer@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" -duplexify@^3.1.2, duplexify@^3.2.0, duplexify@^3.4.2, duplexify@^3.5.0: +duplexify@^3.1.2, duplexify@^3.4.2, duplexify@^3.5.0: version "3.5.1" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.1.tgz#4e1516be68838bc90a49994f0b39a6e5960befcd" dependencies: @@ -2723,7 +3192,7 @@ duplexify@^3.1.2, duplexify@^3.2.0, duplexify@^3.4.2, duplexify@^3.5.0: readable-stream "^2.0.0" stream-shift "^1.0.0" -each-props@^1.2.1: +each-props@^1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/each-props/-/each-props-1.3.1.tgz#fc138f51e3a2774286d4858e02d6e7de462de158" dependencies: @@ -2736,13 +3205,29 @@ ecc-jsbn@~0.1.1: dependencies: jsbn "~0.1.0" +editorconfig@^0.13.2: + version "0.13.3" + resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.3.tgz#e5219e587951d60958fd94ea9a9a008cdeff1b34" + dependencies: + bluebird "^3.0.5" + commander "^2.9.0" + lru-cache "^3.2.0" + semver "^5.1.0" + sigmund "^1.0.1" + ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -electron-to-chromium@^1.3.18: - version "1.3.21" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.21.tgz#a967ebdcfe8ed0083fc244d1894022a8e8113ea2" +electron-releases@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e" + +electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.28: + version "1.3.30" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80" + dependencies: + electron-releases "^2.1.0" elliptic@^6.0.0, elliptic@^6.2.3: version "6.4.0" @@ -2756,6 +3241,10 @@ elliptic@^6.0.0, elliptic@^6.2.3: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" +emojis-list@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" + encodeurl@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20" @@ -2850,17 +3339,30 @@ engine.io@1.8.3: engine.io-parser "1.3.2" ws "1.1.2" +enhanced-resolve@^3.3.0: + version "3.4.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e" + dependencies: + graceful-fs "^4.1.2" + memory-fs "^0.4.0" + object-assign "^4.0.1" + tapable "^0.2.7" + ensnare@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ensnare/-/ensnare-1.0.0.tgz#72d2bf7ef48aba21f66adf29d00a0904eddb61c7" dependencies: tape "^4.6.0" +ensure-posix-path@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz#a65b3e42d0b71cfc585eb774f9943c8d9b91b0c2" + ent@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" -entities@^1.1.1, "entities@~ 1.1.1", entities@~1.1.1: +entities@^1.1.1, entities@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" @@ -2871,36 +3373,60 @@ envify@^4.0.0: esprima "^4.0.0" through "~2.3.4" -enzyme@^2.8.2: - version "2.9.1" - resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-2.9.1.tgz#07d5ce691241240fb817bf2c4b18d6e530240df6" +enzyme-adapter-react-15@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/enzyme-adapter-react-15/-/enzyme-adapter-react-15-1.0.5.tgz#99f9a03ff2c2303e517342935798a6bdfbb75fac" dependencies: - cheerio "^0.22.0" - function.prototype.name "^1.0.0" + enzyme-adapter-utils "^1.1.0" + lodash "^4.17.4" + object.assign "^4.0.4" + object.values "^1.0.4" + prop-types "^15.5.10" + +enzyme-adapter-utils@^1.1.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.3.0.tgz#d6c85756826c257a8544d362cc7a67e97ea698c7" + dependencies: + lodash "^4.17.4" + object.assign "^4.0.4" + prop-types "^15.6.0" + +enzyme@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.3.0.tgz#0971abd167f2d4bf3f5bd508229e1c4b6dc50479" + dependencies: + cheerio "^1.0.0-rc.2" + function.prototype.name "^1.0.3" + has "^1.0.1" + is-boolean-object "^1.0.0" + is-callable "^1.1.3" + is-number-object "^1.0.3" + is-string "^1.0.4" is-subset "^0.1.1" lodash "^4.17.4" + object-inspect "^1.5.0" object-is "^1.0.1" - object.assign "^4.0.4" + object.assign "^4.1.0" object.entries "^1.0.4" object.values "^1.0.4" - prop-types "^15.5.10" - uuid "^3.0.1" + raf "^3.4.0" + rst-selector-parser "^2.2.3" -errno@~0.1.1: - version "0.1.4" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d" +errno@^0.1.3, errno@~0.1.1: + version "0.1.6" + resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.6.tgz#c386ce8a6283f14fc09563b71560908c9bf53026" dependencies: - prr "~0.0.0" + prr "~1.0.1" -error-ex@^1.2.0: +error-ex@^1.2.0, error-ex@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" dependencies: is-arrayish "^0.2.1" es-abstract@^1.5.0, es-abstract@^1.6.1, es-abstract@^1.7.0: - version "1.8.2" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.8.2.tgz#25103263dc4decbda60e0c737ca32313518027ee" + version "1.10.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864" dependencies: es-to-primitive "^1.1.1" function-bind "^1.1.1" @@ -2916,20 +3442,20 @@ es-to-primitive@^1.1.1: is-date-object "^1.0.1" is-symbol "^1.0.1" -es5-ext@^0.10.14, es5-ext@^0.10.30, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2: - version "0.10.30" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.30.tgz#7141a16836697dbabfaaaeee41495ce29f52c939" +es5-ext@^0.10.14, es5-ext@^0.10.30, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2: + version "0.10.37" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.37.tgz#0ee741d148b80069ba27d020393756af257defc3" dependencies: - es6-iterator "2" - es6-symbol "~3.1" + es6-iterator "~2.0.1" + es6-symbol "~3.1.1" -es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512" +es6-iterator@^2.0.1, es6-iterator@~2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" dependencies: d "1" - es5-ext "^0.10.14" - es6-symbol "^3.1" + es5-ext "^0.10.35" + es6-symbol "^3.1.1" es6-map@^0.1.3: version "0.1.5" @@ -2952,7 +3478,7 @@ es6-set@~0.1.5: es6-symbol "3.1.1" event-emitter "~0.3.5" -es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1: +es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" dependencies: @@ -2976,18 +3502,7 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0, escape-string-regexp@^1 version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" -escodegen@1.8.x: - version "1.8.1" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018" - dependencies: - esprima "^2.7.1" - estraverse "^1.9.1" - esutils "^2.0.2" - optionator "^0.8.1" - optionalDependencies: - source-map "~0.2.0" - -escodegen@^1.6.1: +escodegen@^1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852" dependencies: @@ -3037,47 +3552,51 @@ eslint-plugin-mocha@^4.9.0: ramda "^0.24.1" eslint-plugin-react@^7.4.0: - version "7.4.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.4.0.tgz#300a95861b9729c087d362dd64abcc351a74364a" + version "7.5.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.5.1.tgz#52e56e8d80c810de158859ef07b880d2f56ee30b" dependencies: doctrine "^2.0.0" has "^1.0.1" jsx-ast-utils "^2.0.0" - prop-types "^15.5.10" + prop-types "^15.6.0" -eslint-scope@^3.7.1: +eslint-scope@^3.7.1, eslint-scope@~3.7.1: version "3.7.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" dependencies: esrecurse "^4.1.0" estraverse "^4.1.1" +eslint-visitor-keys@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" + eslint@^4.0.0, eslint@^4.2.0: - version "4.7.1" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.7.1.tgz#849804136953ebe366782f9f8611e2cbd1b54681" + version "4.14.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.14.0.tgz#96609768d1dd23304faba2d94b7fefe5a5447a82" dependencies: - ajv "^5.2.0" + ajv "^5.3.0" babel-code-frame "^6.22.0" chalk "^2.1.0" concat-stream "^1.6.0" cross-spawn "^5.1.0" - debug "^3.0.1" - doctrine "^2.0.0" + debug "^3.1.0" + doctrine "^2.0.2" eslint-scope "^3.7.1" - espree "^3.5.1" + eslint-visitor-keys "^1.0.0" + espree "^3.5.2" esquery "^1.0.0" - estraverse "^4.2.0" esutils "^2.0.2" file-entry-cache "^2.0.0" functional-red-black-tree "^1.0.1" glob "^7.1.2" - globals "^9.17.0" + globals "^11.0.1" ignore "^3.3.3" imurmurhash "^0.1.4" inquirer "^3.0.6" is-resolvable "^1.0.0" js-yaml "^3.9.1" - json-stable-stringify "^1.0.1" + json-stable-stringify-without-jsonify "^1.0.1" levn "^0.3.0" lodash "^4.17.4" minimatch "^3.0.2" @@ -3094,22 +3613,18 @@ eslint@^4.0.0, eslint@^4.2.0: table "^4.0.1" text-table "~0.2.0" -espree@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.1.tgz#0c988b8ab46db53100a1954ae4ba995ddd27d87e" +espree@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca" dependencies: - acorn "^5.1.1" + acorn "^5.2.1" acorn-jsx "^3.0.0" -esprima-fb@3001.1.0-dev-harmony-fb: - version "3001.1.0-dev-harmony-fb" - resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz#b77d37abcd38ea0b77426bb8bc2922ce6b426411" +esprima-fb@13001.1001.0-dev-harmony-fb: + version "13001.1001.0-dev-harmony-fb" + resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz#633acdb40d9bd4db8a1c1d68c06a942959fad2b0" -esprima@2.7.x, esprima@^2.7.1: - version "2.7.3" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" - -esprima@^3.1.3: +esprima@^3.1.3, esprima@~3.1.0: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" @@ -3138,10 +3653,6 @@ esrecurse@^4.1.0: estraverse "^4.1.0" object-assign "^4.0.1" -estraverse@^1.9.1: - version "1.9.3" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44" - estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" @@ -3162,7 +3673,7 @@ esutils@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.0.0.tgz#8151d358e20c8acc7fb745e7472c0025fe496570" -etag@~1.8.0, etag@~1.8.1: +etag@~1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" @@ -3184,18 +3695,7 @@ eth-block-tracker@^1.0.7: pify "^2.3.0" tape "^4.6.3" -eth-block-tracker@^2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/eth-block-tracker/-/eth-block-tracker-2.1.3.tgz#ef24ab415f18445bd5c0ef49b9ac248f847e34f9" - dependencies: - async-eventemitter "^0.2.2" - babelify "^7.3.0" - eth-query "^2.1.0" - ethjs-util "^0.1.3" - pify "^2.3.0" - tape "^4.6.3" - -eth-block-tracker@^2.2.0, eth-block-tracker@^2.2.2: +eth-block-tracker@^2.1.2, eth-block-tracker@^2.2.0, eth-block-tracker@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/eth-block-tracker/-/eth-block-tracker-2.2.2.tgz#b3d72cd82ba5ee37471d22bac4f56387ee4137cf" dependencies: @@ -3206,9 +3706,9 @@ eth-block-tracker@^2.2.0, eth-block-tracker@^2.2.2: pify "^2.3.0" tape "^4.6.3" -eth-contract-metadata@^1.1.4: - version "1.1.5" - resolved "https://registry.yarnpkg.com/eth-contract-metadata/-/eth-contract-metadata-1.1.5.tgz#301f51b0460b8dd044997dc05870751fb7f4cfcb" +eth-contract-metadata@^1.1.5: + version "1.3.0" + resolved "https://registry.yarnpkg.com/eth-contract-metadata/-/eth-contract-metadata-1.3.0.tgz#caf3cdc3d69995b6d7532c9d96fedbad46361ca8" eth-ens-namehash@^1.0.2: version "1.0.2" @@ -3217,16 +3717,6 @@ eth-ens-namehash@^1.0.2: idna-uts46 "^1.0.1" js-sha3 "^0.5.7" -eth-hd-keyring@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/eth-hd-keyring/-/eth-hd-keyring-1.2.0.tgz#40bcc7ea877ef5c746f54c0c87a6b39ceb5edde3" - dependencies: - bip39 "^2.2.0" - eth-sig-util "^1.1.0" - ethereumjs-util "^5.1.1" - ethereumjs-wallet "^0.6.0" - events "^1.1.1" - eth-hd-keyring@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/eth-hd-keyring/-/eth-hd-keyring-1.2.1.tgz#15ab3919b4153a8497e14673e8e8039e5965131c" @@ -3238,22 +3728,32 @@ eth-hd-keyring@^1.2.1: events "^1.1.1" eth-json-rpc-filters@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-1.2.4.tgz#716109b1cf4d0ec01f30f848d65c60c34400e975" + version "1.2.5" + resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-1.2.5.tgz#2d119830d91c300396e0b00a00e884de69a5cd8b" dependencies: await-semaphore "^0.1.1" eth-json-rpc-middleware "^1.0.0" json-rpc-engine "^3.4.0" lodash.flatmap "^4.5.0" -eth-json-rpc-middleware@^1.0.0, eth-json-rpc-middleware@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/eth-json-rpc-middleware/-/eth-json-rpc-middleware-1.2.7.tgz#7c36e0972945255bdb486f18df53d4314a1c048a" +eth-json-rpc-infura@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/eth-json-rpc-infura/-/eth-json-rpc-infura-1.0.2.tgz#f0c5e7e04e2b65336b2a5c049bc64a2980da7a0a" + dependencies: + eth-json-rpc-middleware "^1.5.0" + json-rpc-engine "^3.4.0" + tape "^4.8.0" + +eth-json-rpc-middleware@^1.0.0, eth-json-rpc-middleware@^1.2.7, eth-json-rpc-middleware@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/eth-json-rpc-middleware/-/eth-json-rpc-middleware-1.5.0.tgz#16b1053386aa3803b125732aa6de07eadf068729" dependencies: async "^2.5.0" eth-query "^2.1.2" + eth-tx-summary "^3.1.2" ethereumjs-block "^1.6.0" ethereumjs-tx "^1.3.3" + ethereumjs-util "^5.1.2" ethereumjs-vm "^2.1.0" fetch-ponyfill "^4.0.0" json-rpc-error "^2.0.0" @@ -3261,63 +3761,41 @@ eth-json-rpc-middleware@^1.0.0, eth-json-rpc-middleware@^1.2.7: promise-to-callback "^1.0.0" tape "^4.6.3" -eth-keyring-controller@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/eth-keyring-controller/-/eth-keyring-controller-2.1.2.tgz#1af179d8fd7ff470eb91e113a0fd3a440bd66bcc" +eth-keyring-controller@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/eth-keyring-controller/-/eth-keyring-controller-2.1.3.tgz#4ba11f677daaf68f48e1b438df420f616b876aeb" dependencies: bip39 "^2.4.0" bluebird "^3.5.0" browser-passworder "^2.0.3" - eth-hd-keyring "^1.2.0" - eth-sig-util "^1.2.2" - eth-simple-keyring "^1.1.1" + eth-hd-keyring "^1.2.1" + eth-sig-util "^1.4.0" + eth-simple-keyring "^1.2.0" ethereumjs-util "^5.1.2" loglevel "^1.5.0" obs-store "^2.4.1" promise-filter "^1.1.0" eth-phishing-detect@^1.1.4: - version "1.1.11" - resolved "https://registry.yarnpkg.com/eth-phishing-detect/-/eth-phishing-detect-1.1.11.tgz#e29c38b84abed3d41df4131c56d6a41308c3e56d" + version "1.1.12" + resolved "https://registry.yarnpkg.com/eth-phishing-detect/-/eth-phishing-detect-1.1.12.tgz#3db7e88c754510c94e6736db85108b90e227fe41" dependencies: fast-levenshtein "^2.0.6" -eth-query@^2.1.0, eth-query@^2.1.2: +eth-query@^2.0.2, eth-query@^2.1.0, eth-query@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/eth-query/-/eth-query-2.1.2.tgz#d6741d9000106b51510c72db92d6365456a6da5e" dependencies: json-rpc-random-id "^1.0.0" xtend "^4.0.1" -eth-sig-util@^1.1.0, eth-sig-util@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-1.2.2.tgz#7e982f5f8d94e79027d8c69e6006cdbd2f57942f" - dependencies: - ethereumjs-util "^5.1.1" - -eth-sig-util@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-1.3.0.tgz#14c1c02367a4264dbfeae611b4dc7f8d9d6ee4ba" - dependencies: - ethereumjs-abi "git+https://github.com/ethereumjs/ethereumjs-abi.git" - ethereumjs-util "^5.1.1" - -eth-sig-util@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-1.4.0.tgz#ad42fd1d9c60fff19bdef7377b42fb38e92ee7e1" +eth-sig-util@^1.3.0, eth-sig-util@^1.4.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-1.4.1.tgz#dfcde3cbd03c38d429ad8695938a2678ec56f1ae" dependencies: ethereumjs-abi "git+https://github.com/ethereumjs/ethereumjs-abi.git" ethereumjs-util "^5.1.1" -eth-simple-keyring@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/eth-simple-keyring/-/eth-simple-keyring-1.1.1.tgz#6dd75d7cc6edea7c788cf19ef9431c830cd961ae" - dependencies: - eth-sig-util "^1.1.0" - ethereumjs-util "^5.1.1" - ethereumjs-wallet "^0.6.0" - events "^1.1.1" - eth-simple-keyring@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/eth-simple-keyring/-/eth-simple-keyring-1.2.0.tgz#b151d2c75877e2cddf94ae5feae78214cf198846" @@ -3338,21 +3816,38 @@ eth-token-tracker@^1.1.4: ethjs-query "^0.2.6" human-standard-token-abi "^1.0.2" -ethereum-common@0.0.18, ethereum-common@^0.0.18: +eth-tx-summary@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/eth-tx-summary/-/eth-tx-summary-3.1.2.tgz#e38836fc9f8b56f14d75952f0f5e570f88fb2220" + dependencies: + async "^2.1.2" + clone "^2.0.0" + concat-stream "^1.5.1" + end-of-stream "^1.1.0" + eth-query "^2.0.2" + ethereumjs-block "^1.4.1" + ethereumjs-tx "^1.1.1" + ethereumjs-util "^5.0.1" + ethereumjs-vm "^2.0.2" + through2 "^2.0.3" + treeify "^1.0.1" + web3-provider-engine "^13.3.2" + +ethereum-common@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.2.0.tgz#13bf966131cce1eeade62a1b434249bb4cb120ca" + +ethereum-common@^0.0.18: version "0.0.18" resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f" -ethereum-common@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.1.0.tgz#874dd0fae5e962a56c50ebf28efa6fe39492b0e7" - ethereum-ens-network-map@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ethereum-ens-network-map/-/ethereum-ens-network-map-1.0.0.tgz#43cd7669ce950a789e151001118d4d65f210eeb7" -"ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git": - version "0.6.4" - resolved "git+https://github.com/ethereumjs/ethereumjs-abi.git#ee6ded67235a98f3ef4ae2a338aee70a9f68fe20" +ethereumjs-abi@^0.6.4, "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git": + version "0.6.5" + resolved "git+https://github.com/ethereumjs/ethereumjs-abi.git#71f123b676f2b2d81bc20f343670d90045a3d3d8" dependencies: bn.js "^4.10.0" ethereumjs-util "^4.3.0" @@ -3364,24 +3859,24 @@ ethereumjs-account@^2.0.3: ethereumjs-util "^4.0.1" rlp "^2.0.0" -ethereumjs-block@^1.2.2, ethereumjs-block@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/ethereumjs-block/-/ethereumjs-block-1.6.0.tgz#cded4962deaca1eef17372b4d290e84b35c84372" +ethereumjs-block@^1.2.2, ethereumjs-block@^1.4.1, ethereumjs-block@^1.6.0, ethereumjs-block@~1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/ethereumjs-block/-/ethereumjs-block-1.7.0.tgz#23d6a765b069500a9f35d1c093ab6b216cbbeb06" dependencies: async "^2.0.1" - ethereum-common "0.0.18" + ethereum-common "0.2.0" ethereumjs-tx "^1.2.2" ethereumjs-util "^5.0.0" merkle-patricia-tree "^2.1.2" -ethereumjs-tx@^1.2.0, ethereumjs-tx@^1.2.2, ethereumjs-tx@^1.3.0, ethereumjs-tx@^1.3.3: +ethereumjs-tx@^1.1.1, ethereumjs-tx@^1.2.0, ethereumjs-tx@^1.2.2, ethereumjs-tx@^1.3.0, ethereumjs-tx@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/ethereumjs-tx/-/ethereumjs-tx-1.3.3.tgz#ece051d3efdbe771ad2a518d61632ca2ab75ecbb" dependencies: ethereum-common "^0.0.18" ethereumjs-util "^5.0.0" -ethereumjs-util@4.5.0, ethereumjs-util@^4.0.0, ethereumjs-util@^4.0.1, ethereumjs-util@^4.3.0, ethereumjs-util@^4.4.0: +ethereumjs-util@4.5.0, ethereumjs-util@^4.0.1, ethereumjs-util@^4.3.0, ethereumjs-util@^4.4.0: version "4.5.0" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6" dependencies: @@ -3391,7 +3886,7 @@ ethereumjs-util@4.5.0, ethereumjs-util@^4.0.0, ethereumjs-util@^4.0.1, ethereumj rlp "^2.0.0" secp256k1 "^3.0.1" -ethereumjs-util@^5.0.0, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2: +ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.1.2.tgz#25ba0215cbb4c2f0b108a6f96af2a2e62e45921f" dependencies: @@ -3415,18 +3910,20 @@ ethereumjs-util@^5.0.0, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2: secp256k1 "^3.0.1" ethereumjs-vm@^2.0.0, ethereumjs-vm@^2.0.2, ethereumjs-vm@^2.1.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-2.2.1.tgz#183406cc40e4d9f4248e7e047dea7c191beab3a1" + version "2.3.2" + resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-2.3.2.tgz#4f939e22b89e9b298f0c87a7e0f0d8949f485abd" dependencies: async "^2.1.2" async-eventemitter "^0.2.2" - ethereum-common "0.1.0" + ethereum-common "0.2.0" ethereumjs-account "^2.0.3" - ethereumjs-block "^1.2.2" + ethereumjs-block "~1.7.0" ethereumjs-util "4.5.0" fake-merkle-patricia-tree "^1.0.1" functional-red-black-tree "^1.0.1" merkle-patricia-tree "^2.1.2" + rustbn.js "~0.1.1" + safe-buffer "^5.1.1" ethereumjs-wallet@^0.6.0: version "0.6.0" @@ -3474,9 +3971,9 @@ ethjs-filter@0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/ethjs-filter/-/ethjs-filter-0.1.5.tgz#0112af6017c24677e32b8fdeb20e6196019b7598" -ethjs-format@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/ethjs-format/-/ethjs-format-0.2.0.tgz#b4aa513fc1d50270d8f102bf06f03c9490d31391" +ethjs-format@0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/ethjs-format/-/ethjs-format-0.2.2.tgz#d73b3a605c2e1257079f7077fd5448e998ce0fcd" dependencies: bn.js "4.11.6" ethjs-schema "0.1.5" @@ -3485,12 +3982,23 @@ ethjs-format@0.2.0: number-to-bn "1.7.0" strip-hex-prefix "1.0.0" -ethjs-format@0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/ethjs-format/-/ethjs-format-0.2.2.tgz#d73b3a605c2e1257079f7077fd5448e998ce0fcd" +ethjs-format@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/ethjs-format/-/ethjs-format-0.2.3.tgz#9bd867caee82b2dbed984600bb30220cf3cb5830" dependencies: bn.js "4.11.6" - ethjs-schema "0.1.5" + ethjs-schema "^0.1.6" + ethjs-util "0.1.3" + is-hex-prefixed "1.0.0" + number-to-bn "1.7.0" + strip-hex-prefix "1.0.0" + +ethjs-format@0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/ethjs-format/-/ethjs-format-0.2.4.tgz#5bbbc44a5ad24e68ab393312ff9039a73b65bf81" + dependencies: + bn.js "4.11.6" + ethjs-schema "^0.1.9" ethjs-util "0.1.3" is-hex-prefixed "1.0.0" number-to-bn "1.7.0" @@ -3502,11 +4010,11 @@ ethjs-provider-http@0.1.6: dependencies: xhr2 "0.1.3" -ethjs-query@0.2.6: - version "0.2.6" - resolved "https://registry.yarnpkg.com/ethjs-query/-/ethjs-query-0.2.6.tgz#9d8e6044b8bf76dd3340f843716a2259b9c91d3c" +ethjs-query@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/ethjs-query/-/ethjs-query-0.3.0.tgz#08098d610f81bd5f954a7a57ab4989f7e9815fc4" dependencies: - ethjs-format "0.2.0" + ethjs-format "0.2.3" ethjs-rpc "0.1.5" ethjs-query@^0.2.4, ethjs-query@^0.2.6, ethjs-query@^0.2.9: @@ -3516,14 +4024,29 @@ ethjs-query@^0.2.4, ethjs-query@^0.2.6, ethjs-query@^0.2.9: ethjs-format "0.2.2" ethjs-rpc "0.1.5" +ethjs-query@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/ethjs-query/-/ethjs-query-0.3.2.tgz#f488a48ce1994cd4c77eccb7b52902c6f29cfd85" + dependencies: + ethjs-format "0.2.4" + ethjs-rpc "0.1.8" + ethjs-rpc@0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/ethjs-rpc/-/ethjs-rpc-0.1.5.tgz#099e22f27dc4c18b6978a485fc36b1b0f7969080" +ethjs-rpc@0.1.8: + version "0.1.8" + resolved "https://registry.yarnpkg.com/ethjs-rpc/-/ethjs-rpc-0.1.8.tgz#1676740e41c7228196a71189d33f15c9c85b599d" + ethjs-schema@0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/ethjs-schema/-/ethjs-schema-0.1.5.tgz#59740e3b3977bcdbb9b11bc3068201e8aceabb0d" +ethjs-schema@^0.1.6, ethjs-schema@^0.1.9: + version "0.1.9" + resolved "https://registry.yarnpkg.com/ethjs-schema/-/ethjs-schema-0.1.9.tgz#858c2a5da706ae04812b4ce8b1eb4b4921e33092" + ethjs-unit@0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/ethjs-unit/-/ethjs-unit-0.1.6.tgz#c665921e476e87bce2a9d588a6fe0405b2c41699" @@ -3545,16 +4068,16 @@ ethjs-util@^0.1.3: is-hex-prefixed "1.0.0" strip-hex-prefix "1.0.0" -ethjs@^0.2.7: - version "0.2.8" - resolved "https://registry.yarnpkg.com/ethjs/-/ethjs-0.2.8.tgz#65ed276c5e58e89d51d4573585b7a16142ccf8f0" +ethjs@^0.2.7, ethjs@^0.2.8: + version "0.2.9" + resolved "https://registry.yarnpkg.com/ethjs/-/ethjs-0.2.9.tgz#c9a80d47bc9d560f59e778049d22255e581f312b" dependencies: bn.js "4.11.6" ethjs-abi "0.2.0" ethjs-contract "0.1.9" ethjs-filter "0.1.5" ethjs-provider-http "0.1.6" - ethjs-query "0.2.6" + ethjs-query "0.3.0" ethjs-unit "0.1.6" ethjs-util "0.1.3" js-sha3 "0.5.5" @@ -3591,7 +4114,7 @@ events-to-array@^1.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.1.2.tgz#2d41f563e1fe400ed4962fe1a4d5c6a7539df7f6" -events@^1.1.1, events@~1.1.0: +events@^1.0.0, events@^1.1.1, events@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" @@ -3614,6 +4137,16 @@ execa@^0.7.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execall@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/execall/-/execall-1.0.0.tgz#73d0904e395b3cab0658b08d09ec25307f29bb73" + dependencies: + clone-regexp "^1.0.0" + +exists-stat@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/exists-stat/-/exists-stat-1.0.0.tgz#0660e3525a2e89d9e446129440c272edfa24b529" + expand-braces@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea" @@ -3628,6 +4161,18 @@ expand-brackets@^0.1.4: dependencies: is-posix-bracket "^0.1.0" +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + expand-range@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044" @@ -3641,58 +4186,21 @@ expand-range@^1.8.1: dependencies: fill-range "^2.1.0" -expand-template@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-1.1.0.tgz#e09efba977bf98f9ee0ed25abd0c692e02aec3fc" - expand-tilde@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449" dependencies: os-homedir "^1.0.1" -expand-tilde@^2.0.2: +expand-tilde@^2.0.0, expand-tilde@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" dependencies: homedir-polyfill "^1.0.1" -express@^4.10.7: - version "4.15.4" - resolved "https://registry.yarnpkg.com/express/-/express-4.15.4.tgz#032e2253489cf8fce02666beca3d11ed7a2daed1" - dependencies: - accepts "~1.3.3" - array-flatten "1.1.1" - content-disposition "0.5.2" - content-type "~1.0.2" - cookie "0.3.1" - cookie-signature "1.0.6" - debug "2.6.8" - depd "~1.1.1" - encodeurl "~1.0.1" - escape-html "~1.0.3" - etag "~1.8.0" - finalhandler "~1.0.4" - fresh "0.5.0" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.1" - path-to-regexp "0.1.7" - proxy-addr "~1.1.5" - qs "6.5.0" - range-parser "~1.2.0" - send "0.15.4" - serve-static "1.12.4" - setprototypeof "1.0.3" - statuses "~1.3.1" - type-is "~1.6.15" - utils-merge "1.0.0" - vary "~1.1.1" - -express@^4.15.5: - version "4.16.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.16.1.tgz#6b33b560183c9b253b7b62144df33a4654ac9ed0" +express@^4.10.7, express@^4.15.5: + version "4.16.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c" dependencies: accepts "~1.3.4" array-flatten "1.1.1" @@ -3731,11 +4239,18 @@ extend-shallow@^2.0.1: dependencies: is-extendable "^0.1.0" +extend-shallow@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + extend@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/extend/-/extend-1.3.0.tgz#d1516fb0ff5624d2ebf9123ea1dac5a1994004f8" -extend@^3.0.0, extend@~3.0.0: +extend@^3.0.0, extend@~3.0.0, extend@~3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" @@ -3750,12 +4265,12 @@ extensionizer@^1.0.0: resolved "https://registry.yarnpkg.com/extensionizer/-/extensionizer-1.0.0.tgz#01c209bbea6d9c0acba77129c3aa4a9a98fc3538" external-editor@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.4.tgz#1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972" + version "2.1.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48" dependencies: + chardet "^0.4.0" iconv-lite "^0.4.17" - jschardet "^1.4.2" - tmp "^0.0.31" + tmp "^0.0.33" extglob@^0.3.1: version "0.3.2" @@ -3763,10 +4278,27 @@ extglob@^0.3.1: dependencies: is-extglob "^1.0.0" -extsprintf@1.3.0, extsprintf@^1.2.0: +extglob@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.3.tgz#55e019d0c95bf873949c737b7e5172dba84ebb29" + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +extsprintf@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + eyes@0.1.x: version "0.1.8" resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" @@ -3787,10 +4319,11 @@ falafel@^2.1.0: object-keys "^1.0.6" fancy-log@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948" + version "1.3.2" + resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1" dependencies: - chalk "^1.1.1" + ansi-gray "^0.1.1" + color-support "^1.1.3" time-stamp "^1.0.0" fast-deep-equal@^1.0.0: @@ -3798,11 +4331,15 @@ fast-deep-equal@^1.0.0: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff" fast-json-patch@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-2.0.5.tgz#a712e829be69ab707514440c5404bdd9b0d3c609" + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-2.0.6.tgz#86fff8f8662391aa819722864d632e603e6ee605" dependencies: deep-equal "^1.0.1" +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -3813,19 +4350,7 @@ faye-websocket@~0.7.2: dependencies: websocket-driver ">=0.3.6" -fbjs@^0.8.1, fbjs@^0.8.9: - version "0.8.15" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.15.tgz#4f0695fdfcc16c37c0b07facec8cb4c4091685b9" - dependencies: - core-js "^1.0.0" - isomorphic-fetch "^2.1.1" - loose-envify "^1.0.0" - object-assign "^4.1.0" - promise "^7.1.1" - setimmediate "^1.0.5" - ua-parser-js "^0.7.9" - -fbjs@^0.8.16: +fbjs@^0.8.1, fbjs@^0.8.16, fbjs@^0.8.9: version "0.8.16" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db" dependencies: @@ -3878,21 +4403,18 @@ fill-range@^2.1.0: repeat-element "^1.1.2" repeat-string "^1.5.2" -finalhandler@1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.4.tgz#18574f2e7c4b98b8ae3b230c21f201f31bdb3fb7" +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" dependencies: - debug "2.6.8" - encodeurl "~1.0.1" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.1" - statuses "~1.3.1" - unpipe "~1.0.0" + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" -finalhandler@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5" +finalhandler@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.6.tgz#007aea33d1a4d3e42017f624848ad58d212f814f" dependencies: debug "2.6.9" encodeurl "~1.0.1" @@ -3902,11 +4424,11 @@ finalhandler@1.1.0: statuses "~1.3.1" unpipe "~1.0.0" -finalhandler@~1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.5.tgz#a701303d257a1bc82fea547a33e5ae89531723df" +finalhandler@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5" dependencies: - debug "2.6.8" + debug "2.6.9" encodeurl "~1.0.1" escape-html "~1.0.3" on-finished "~2.3.0" @@ -3941,7 +4463,7 @@ find-up@^2.0.0, find-up@^2.1.0: dependencies: locate-path "^2.0.0" -findup-sync@^0.4.2: +findup-sync@0.4.3: version "0.4.3" resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12" dependencies: @@ -3950,11 +4472,14 @@ findup-sync@^0.4.2: micromatch "^2.3.7" resolve-dir "^0.1.0" -findup-sync@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.3.0.tgz#37930aa5d816b777c03445e1966cc6790a4c0b16" +findup-sync@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" dependencies: - glob "~5.0.0" + detect-file "^1.0.0" + is-glob "^3.1.0" + micromatch "^3.0.4" + resolve-dir "^1.0.1" fined@^1.0.1: version "1.1.0" @@ -3976,23 +4501,19 @@ fireworm@^0.7.0: lodash.flatten "^3.0.2" minimatch "^3.0.2" -first-chunk-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" - first-chunk-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz#1bdecdb8e083c0664b91945581577a43a9f31d70" dependencies: readable-stream "^2.0.2" -flagged-respawn@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5" +flagged-respawn@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.0.tgz#4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7" flat-cache@^1.2.1: - version "1.2.2" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96" + version "1.3.0" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481" dependencies: circular-json "^0.3.1" del "^2.0.2" @@ -4007,7 +4528,11 @@ flatten@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/flatten/-/flatten-0.0.1.tgz#554440766da0a0d603999f433453f6c2fc6a75c1" -flush-write-stream@^1.0.0: +flatten@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" + +flush-write-stream@^1.0.0, flush-write-stream@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.2.tgz#c81b90d8746766f1a609a46809946c45dd8ae417" dependencies: @@ -4020,7 +4545,7 @@ for-each@^0.3.2, for-each@~0.3.2: dependencies: is-function "~1.0.0" -for-in@^1.0.1: +for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -4063,19 +4588,29 @@ form-data@~2.1.1: combined-stream "^1.0.5" mime-types "^2.1.12" +form-data@~2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf" + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.5" + mime-types "^2.1.12" + formatio@1.2.0, formatio@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.2.0.tgz#f3b2167d9068c4698a8d51f4f760a39a54d818eb" dependencies: samsam "1.x" -forwarded@~0.1.0, forwarded@~0.1.2: +forwarded@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" -fresh@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e" +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + dependencies: + map-cache "^0.2.2" fresh@0.5.2: version "0.5.2" @@ -4119,6 +4654,13 @@ fs-extra@^2.0.0: graceful-fs "^4.1.2" jsonfile "^2.1.0" +fs-mkdirp-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb" + dependencies: + graceful-fs "^4.1.11" + through2 "^2.0.3" + fs-promise@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-2.0.3.tgz#f64e4f854bcf689aa8bddcba268916db3db46854" @@ -4133,11 +4675,11 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" fsevents@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4" + version "1.1.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" dependencies: nan "^2.3.0" - node-pre-gyp "^0.6.36" + node-pre-gyp "^0.6.39" fstream-ignore@^1.0.5: version "1.0.5" @@ -4160,7 +4702,7 @@ function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1, function-bind@ version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" -function.prototype.name@^1.0.0: +function.prototype.name@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.0.3.tgz#0099ae5572e9dd6f03c97d023fd92bcc5e639eac" dependencies: @@ -4172,6 +4714,14 @@ functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" +fuse.js@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.2.0.tgz#f0448e8069855bf2a3e683cdc1d320e7e2a07ef4" + +gather-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/gather-stream/-/gather-stream-1.0.0.tgz#b33994af457a8115700d410f317733cbe7a0904b" + gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -4185,6 +4735,22 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" +gaze@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105" + dependencies: + globule "^1.0.0" + +generate-function@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74" + +generate-object-property@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0" + dependencies: + is-property "^1.0.0" + get-caller-file@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" @@ -4197,20 +4763,28 @@ get-stdin@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-3.0.2.tgz#c1ced24b9039b38ded85bdf161e57713b6dd4abe" +get-stdin@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" + +get-stdin@^5.0.0, get-stdin@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398" + get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" dependencies: assert-plus "^1.0.0" -github-from-package@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" - gl-mat4@1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/gl-mat4/-/gl-mat4-1.1.4.tgz#1e895b55892e56a896867abd837d38f37a178086" @@ -4239,36 +4813,38 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" -glob-parent@^3.0.0, glob-parent@^3.0.1: +glob-parent@^3.0.1, glob-parent@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" dependencies: is-glob "^3.1.0" path-dirname "^1.0.0" -glob-stream@^5.3.2: - version "5.3.5" - resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22" +glob-stream@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4" dependencies: extend "^3.0.0" - glob "^5.0.3" - glob-parent "^3.0.0" - micromatch "^2.3.7" - ordered-read-streams "^0.3.0" - through2 "^0.6.0" - to-absolute-glob "^0.1.1" + glob "^7.1.1" + glob-parent "^3.1.0" + is-negated-glob "^1.0.0" + ordered-read-streams "^1.0.0" + pumpify "^1.3.5" + readable-stream "^2.1.5" + remove-trailing-separator "^1.0.1" + to-absolute-glob "^2.0.0" unique-stream "^2.0.2" -glob-watcher@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-3.2.0.tgz#ffc1a2d3d07783b672f5e21799a4d0b3fed92daf" +glob-watcher@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-4.0.0.tgz#9e63a8ff6e61e932de6cc2caece5071a6d737329" dependencies: async-done "^1.2.0" chokidar "^1.4.3" - lodash.debounce "^4.0.6" - object.defaults "^1.0.0" + just-debounce "^1.0.0" + object.defaults "^1.1.0" -glob@7.1.2, glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.0.6, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@~7.1.2: +glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.0.6, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1, glob@~7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" dependencies: @@ -4279,7 +4855,7 @@ glob@7.1.2, glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.0.6, glob@^7.1.0, glo once "^1.3.0" path-is-absolute "^1.0.0" -glob@^5.0.15, glob@^5.0.3, glob@~5.0.0: +glob@^5.0.15: version "5.0.15" resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" dependencies: @@ -4289,6 +4865,16 @@ glob@^5.0.15, glob@^5.0.3, glob@~5.0.0: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^6.0.4: + version "6.0.4" + resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + global-modules@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d" @@ -4296,6 +4882,14 @@ global-modules@^0.2.3: global-prefix "^0.1.4" is-windows "^0.2.0" +global-modules@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" + dependencies: + global-prefix "^1.0.1" + is-windows "^1.0.1" + resolve-dir "^1.0.0" + global-prefix@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f" @@ -4305,6 +4899,16 @@ global-prefix@^0.1.4: is-windows "^0.2.0" which "^1.2.12" +global-prefix@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" + dependencies: + expand-tilde "^2.0.2" + homedir-polyfill "^1.0.1" + ini "^1.3.4" + is-windows "^1.0.1" + which "^1.2.14" + global@~4.3.0: version "4.3.2" resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" @@ -4313,10 +4917,14 @@ global@~4.3.0: process "~0.5.1" globals@^10.0.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-10.1.0.tgz#4425a1881be0d336b4a823a82a7be725d5dd987c" + version "10.4.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-10.4.0.tgz#5c477388b128a9e4c5c5d01c7a2aca68c68b2da7" + +globals@^11.0.1: + version "11.1.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4" -globals@^9.17.0, globals@^9.18.0: +globals@^9.18.0: version "9.18.0" resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" @@ -4331,7 +4939,7 @@ globby@^5.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" -globby@^6.1.0: +globby@^6.0.0, globby@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" dependencies: @@ -4341,16 +4949,49 @@ globby@^6.1.0: pify "^2.0.0" pinkie-promise "^2.0.0" +globby@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680" + dependencies: + array-union "^1.0.1" + dir-glob "^2.0.0" + glob "^7.1.2" + ignore "^3.3.5" + pify "^3.0.0" + slash "^1.0.0" + +globjoin@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" + +globule@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09" + dependencies: + glob "~7.1.1" + lodash "~4.17.4" + minimatch "~3.0.2" + glogg@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5" dependencies: sparkles "^1.0.0" +gonzales-pe@^4.0.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.3.tgz#41091703625433285e0aee3aa47829fc1fbeb6f2" + dependencies: + minimist "1.1.x" + graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" +"graceful-readlink@>= 1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" + growl@1.10.3: version "1.10.3" resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f" @@ -4359,28 +5000,38 @@ growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" -gulp-cli@^1.0.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-1.4.0.tgz#6f5bbe2cd0bdb4849d12cf9e1246a5861f8b4f88" +gulp-autoprefixer@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/gulp-autoprefixer/-/gulp-autoprefixer-4.0.0.tgz#e00a8c571b85d06516ac26341be90dfd9fc1eab0" + dependencies: + autoprefixer "^7.0.0" + gulp-util "^3.0.0" + postcss "^6.0.1" + through2 "^2.0.0" + vinyl-sourcemaps-apply "^0.2.0" + +gulp-cli@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.0.0.tgz#7f049ad298ed388cda9bd813b5d7062407d62cad" dependencies: + ansi-colors "^1.0.1" archy "^1.0.0" - chalk "^1.1.0" - copy-props "^1.4.1" + array-sort "^1.0.0" + color-support "^1.1.3" + concat-stream "^1.6.0" + copy-props "^2.0.1" fancy-log "^1.1.0" gulplog "^1.0.0" interpret "^1.0.0" + isobject "^3.0.1" liftoff "^2.3.0" - lodash.isfunction "^3.0.8" - lodash.isplainobject "^4.0.4" - lodash.sortby "^4.5.0" - matchdep "^1.0.0" + matchdep "^2.0.0" mute-stdout "^1.0.0" pretty-hrtime "^1.0.0" + replace-homedir "^1.0.0" semver-greatest-satisfied-range "^1.0.0" - tildify "^1.0.0" - v8flags "^2.0.9" - wreck "^6.3.0" - yargs "^3.28.0" + v8flags "^3.0.1" + yargs "^7.1.0" gulp-eslint@^4.0.0: version "4.0.0" @@ -4432,34 +5083,56 @@ gulp-replace@^0.6.1: readable-stream "^2.0.1" replacestream "^4.0.0" -gulp-sourcemaps@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz#b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c" +gulp-sass@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/gulp-sass/-/gulp-sass-3.1.0.tgz#53dc4b68a1f5ddfe4424ab4c247655269a8b74b7" dependencies: - convert-source-map "^1.1.1" - graceful-fs "^4.1.2" - strip-bom "^2.0.0" + gulp-util "^3.0" + lodash.clonedeep "^4.3.2" + node-sass "^4.2.0" through2 "^2.0.0" - vinyl "^1.0.0" + vinyl-sourcemaps-apply "^0.2.0" gulp-sourcemaps@^2.6.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-2.6.1.tgz#833a4e28f0b8f4661075032cd782417f7cd8fb0b" + version "2.6.2" + resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-2.6.2.tgz#4f41c72b35a7ea06b666d2e3f57917e2c0e71c4e" dependencies: "@gulp-sourcemaps/identity-map" "1.X" "@gulp-sourcemaps/map-sources" "1.X" - acorn "4.X" + acorn "5.X" convert-source-map "1.X" css "2.X" - debug-fabulous ">=0.1.1" + debug-fabulous "1.X" detect-newline "2.X" graceful-fs "4.X" source-map "0.X" strip-bom-string "1.X" through2 "2.X" - vinyl "1.X" -gulp-util@^3.0.0, gulp-util@^3.0.2, gulp-util@^3.0.7, gulp-util@^3.0.8, gulp-util@~3.0.0: +gulp-stylefmt@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/gulp-stylefmt/-/gulp-stylefmt-1.1.0.tgz#7aea00a0a9bd2fbd8a2482dc01f133edca303d52" + dependencies: + gulp-util "^3.0.7" + postcss "^5.0.21" + postcss-scss "^0.4.0" + stylefmt "^5.0.4" + through2 "^2.0.1" + +gulp-stylelint@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/gulp-stylelint/-/gulp-stylelint-4.0.0.tgz#440fa7e6c447e92644700e1e2a06a73e6e457750" + dependencies: + chalk "^2.0.1" + deep-extend "^0.5.0" + gulp-util "^3.0.8" + mkdirp "^0.5.1" + promise "^8.0.1" + strip-ansi "^4.0.0" + stylelint "^8.0.0" + through2 "^2.0.3" + +gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.2, gulp-util@^3.0.7, gulp-util@^3.0.8, gulp-util@~3.0.0: version "3.0.8" resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" dependencies: @@ -4507,13 +5180,13 @@ gulp-zip@^4.0.0: yazl "^2.1.0" "gulp@github:gulpjs/gulp#4.0": - version "4.0.0-alpha.2" - resolved "https://codeload.github.com/gulpjs/gulp/tar.gz/6d71a658c61edb3090221579d8f97dbe086ba2ed" + version "4.0.0-alpha.3" + resolved "https://codeload.github.com/gulpjs/gulp/tar.gz/71c094a51c7972d26f557899ddecab0210ef3776" dependencies: - glob-watcher "^3.0.0" - gulp-cli "^1.0.0" + glob-watcher "^4.0.0" + gulp-cli "^2.0.0" undertaker "^1.0.0" - vinyl-fs "^2.0.0" + vinyl-fs "^3.0.0" gulplog@^1.0.0: version "1.0.0" @@ -4521,9 +5194,9 @@ gulplog@^1.0.0: dependencies: glogg "^1.0.0" -handlebars@^4.0.1, handlebars@^4.0.3: - version "4.0.10" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f" +handlebars@^4.0.3: + version "4.0.11" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc" dependencies: async "^1.4.0" optimist "^0.6.1" @@ -4535,6 +5208,19 @@ har-schema@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + +har-validator@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d" + dependencies: + chalk "^1.1.1" + commander "^2.9.0" + is-my-json-valid "^2.12.4" + pinkie-promise "^2.0.0" + har-validator@~4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" @@ -4542,6 +5228,13 @@ har-validator@~4.2.1: ajv "^4.9.1" har-schema "^1.0.5" +har-validator@~5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd" + dependencies: + ajv "^5.1.0" + har-schema "^2.0.0" + has-ansi@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e" @@ -4584,10 +5277,41 @@ has-gulplog@^0.1.0: dependencies: sparkles "^1.0.0" +has-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + has@^1.0.0, has@^1.0.1, has@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28" @@ -4618,7 +5342,7 @@ hat@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/hat/-/hat-0.0.3.tgz#bb014a9e64b3788aed8005917413d4ff3d502d8a" -hawk@~3.1.3: +hawk@3.1.3, hawk@~3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" dependencies: @@ -4627,6 +5351,15 @@ hawk@~3.1.3: hoek "2.x.x" sntp "1.x.x" +hawk@~6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038" + dependencies: + boom "4.x.x" + cryptiles "3.x.x" + hoek "4.x.x" + sntp "2.x.x" + hdkey@^0.7.0: version "0.7.1" resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-0.7.1.tgz#caee4be81aa77921e909b8d228dd0f29acaee632" @@ -4650,11 +5383,11 @@ hoek@2.x.x: version "2.16.3" resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" -hoist-non-react-statics@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb" +hoek@4.x.x: + version "4.2.0" + resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d" -hoist-non-react-statics@^2.2.1: +hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0" @@ -4676,8 +5409,8 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c" html-encoding-sniffer@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz#79bf7a785ea495fe66165e734153f363ff5437da" + version "1.0.2" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8" dependencies: whatwg-encoding "^1.0.1" @@ -4694,6 +5427,10 @@ html-select@^2.3.5: stream-splicer "^1.2.0" through2 "^1.0.0" +html-tags@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b" + html-tokenize@^1.1.1: version "1.2.5" resolved "https://registry.yarnpkg.com/html-tokenize/-/html-tokenize-1.2.5.tgz#7e5ba99ecb51ef906ec9a7fcdee6ca3267c7897e" @@ -4707,7 +5444,7 @@ htmlescape@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351" -htmlparser2@^3.9.1: +htmlparser2@^3.9.1, htmlparser2@^3.9.2: version "3.9.2" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338" dependencies: @@ -4735,8 +5472,8 @@ http-errors@~1.3.1: statuses "1" http-parser-js@>=0.4.0: - version "0.4.6" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.6.tgz#195273f58704c452d671076be201329dd341dc55" + version "0.4.9" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.9.tgz#ea1a04fb64adff0242e9974f297dd4c3cad271e1" http-proxy@^1.13.0, http-proxy@^1.13.1: version "1.16.2" @@ -4753,6 +5490,14 @@ http-signature@~1.1.0: jsprim "^1.2.2" sshpk "^1.7.0" +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" @@ -4762,14 +5507,14 @@ human-standard-token-abi@^1.0.2: resolved "https://registry.yarnpkg.com/human-standard-token-abi/-/human-standard-token-abi-1.0.2.tgz#207d7846796ee5bb85fdd336e769cb38045b2ae0" i@0.3.x: - version "0.3.5" - resolved "https://registry.yarnpkg.com/i/-/i-0.3.5.tgz#1d2b854158ec8169113c6cb7f6b6801e99e211d5" + version "0.3.6" + resolved "https://registry.yarnpkg.com/i/-/i-0.3.6.tgz#d96c92732076f072711b6b10fd7d4f65ad8ee23d" iconv-lite@0.4.13: version "0.4.13" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2" -iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@~0.4.13: +iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@^0.4.5, iconv-lite@~0.4.13: version "0.4.19" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" @@ -4803,9 +5548,9 @@ iframe@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/iframe/-/iframe-1.0.0.tgz#58e74822b178a0579d09cd169640fb9537470ef5" -ignore@^3.3.3: - version "3.3.5" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.5.tgz#c4e715455f6073a8d7e5dae72d2fc9d71663dba6" +ignore@^3.2.0, ignore@^3.3.3, ignore@^3.3.5: + version "3.3.7" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021" ignorepatterns@^1.0.1: version "1.1.0" @@ -4823,6 +5568,20 @@ in-publish@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51" +indent-string@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" + dependencies: + repeating "^2.0.0" + +indent-string@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" + +indexes-of@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" + indexof@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" @@ -4843,13 +5602,19 @@ inherits@2.0.1: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" ini@^1.3.4, ini@~1.3.0: - version "1.3.4" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e" + version "1.3.5" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" inject-css@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/inject-css/-/inject-css-0.1.1.tgz#ef3ffc78ec026c96e2355da0df32917e3526415c" +inline-source-map@~0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.5.0.tgz#4a4c5dd8e4fb5e9b3cda60c822dfadcaee66e0af" + dependencies: + source-map "~0.4.0" + inline-source-map@~0.6.0: version "0.6.2" resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz#f9393471c18a79d1724f863fa38b586370ade2a5" @@ -4889,8 +5654,8 @@ insert-module-globals@^7.0.0: xtend "^4.0.0" interpret@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0" + version "1.1.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" invariant@^2.0.0, invariant@^2.2.0, invariant@^2.2.2: version "2.2.2" @@ -4902,24 +5667,47 @@ invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" -ipaddr.js@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.4.0.tgz#296aca878a821816e5b85d0a285a99bcff4582f0" - ipaddr.js@1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0" irregular-plurals@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.3.0.tgz#7af06931bdf74be33dcf585a13e06fccc16caecf" + version "1.4.0" + resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.4.0.tgz#2ca9b033651111855412f16be5d77c62a458a766" -is-absolute@^0.2.3: - version "0.2.6" - resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb" +is-absolute@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" dependencies: - is-relative "^0.2.1" - is-windows "^0.2.0" + is-relative "^1.0.0" + is-windows "^1.0.1" + +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + dependencies: + kind-of "^6.0.0" + +is-alphabetical@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.1.tgz#c77079cc91d4efac775be1034bf2d243f95e6f08" + +is-alphanumeric@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz#4a9cef71daf4c001c1d81d63d140cf53fd6889f4" + +is-alphanumerical@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz#dfb4aa4d1085e33bdb61c2dee9c80e9c6c19f53b" + dependencies: + is-alphabetical "^1.0.0" + is-decimal "^1.0.0" is-arrayish@^0.2.1: version "0.2.1" @@ -4931,9 +5719,13 @@ is-binary-path@^1.0.0: dependencies: binary-extensions "^1.0.0" -is-buffer@^1.1.0, is-buffer@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc" +is-boolean-object@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93" + +is-buffer@^1.1.0, is-buffer@^1.1.4, is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" is-builtin-module@^1.0.0: version "1.0.0" @@ -4945,10 +5737,46 @@ is-callable@^1.1.1, is-callable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2" +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + dependencies: + kind-of "^6.0.0" + is-date-object@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" +is-decimal@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.1.tgz#f5fb6a94996ad9e8e3761fbfbd091f1fca8c4e82" + +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + +is-directory@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" + is-dotfile@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" @@ -4963,6 +5791,12 @@ is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + dependencies: + is-plain-object "^2.0.4" + is-extglob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" @@ -5011,6 +5845,27 @@ is-hex-prefixed@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554" +is-hexadecimal@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz#6e084bbc92061fbb0971ec58b6ce6d404e24da69" + +is-my-json-valid@^2.12.4: + version "2.17.1" + resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz#3da98914a70a22f0a8563ef1511a246c6fc55471" + dependencies: + generate-function "^2.0.0" + generate-object-property "^1.1.0" + jsonpointer "^4.0.0" + xtend "^4.0.0" + +is-negated-glob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2" + +is-number-object@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799" + is-number@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806" @@ -5027,6 +5882,20 @@ is-number@^3.0.0: dependencies: kind-of "^3.0.2" +is-number@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" + +is-obj@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + +is-odd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-1.0.0.tgz#3b8a932eb028b3775c39bb09e91767accdb69088" + dependencies: + is-number "^3.0.0" + is-path-cwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" @@ -5038,12 +5907,16 @@ is-path-in-cwd@^1.0.0: is-path-inside "^1.0.0" is-path-inside@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f" + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" dependencies: path-is-inside "^1.0.1" -is-plain-object@^2.0.1, is-plain-object@^2.0.3: +is-plain-obj@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" + +is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" dependencies: @@ -5061,32 +5934,46 @@ is-promise@^2.1, is-promise@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" +is-property@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" + is-regex@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" dependencies: has "^1.0.1" -is-relative@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5" - dependencies: - is-unc-path "^0.1.1" +is-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" -is-resolvable@^1.0.0: +is-relative@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62" + resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" dependencies: - tryit "^1.0.1" + is-unc-path "^1.0.0" + +is-resolvable@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.1.tgz#acca1cd36dbe44b974b924321555a70ba03b1cf4" is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" +is-string@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64" + is-subset@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" +is-supported-regexp-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz#8b520c85fae7a253382d4b02652e045576e13bb8" + is-symbol@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572" @@ -5101,24 +5988,36 @@ is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" -is-unc-path@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9" +is-unc-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" dependencies: - unc-path-regex "^0.1.0" + unc-path-regex "^0.1.2" -is-utf8@^0.2.0: +is-utf8@^0.2.0, is-utf8@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" -is-valid-glob@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe" +is-valid-glob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" + +is-whitespace-character@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.1.tgz#9ae0176f3282b65457a1992cdb084f8a5f833e3b" is-windows@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c" +is-windows@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9" + +is-word-character@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.1.tgz#5a03fa1ea91ace8a6eb0c7cd770eb86d65c8befb" + isarray@0.0.1, isarray@~0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" @@ -5160,15 +6059,15 @@ istanbul-lib-coverage@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da" -istanbul-lib-hook@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.7.tgz#dd6607f03076578fe7d6f2a630cf143b49bacddc" +istanbul-lib-hook@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz#8538d970372cb3716d53e55523dd54b557a8d89b" dependencies: append-transform "^0.4.0" -istanbul-lib-instrument@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.8.0.tgz#66f6c9421cc9ec4704f76f2db084ba9078a2b532" +istanbul-lib-instrument@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz#250b30b3531e5d3251299fdd64b0b2c9db6b558e" dependencies: babel-generator "^6.18.0" babel-template "^6.16.0" @@ -5178,50 +6077,31 @@ istanbul-lib-instrument@^1.8.0: istanbul-lib-coverage "^1.1.1" semver "^5.3.0" -istanbul-lib-report@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#f0e55f56655ffa34222080b7a0cd4760e1405fc9" +istanbul-lib-report@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz#922be27c13b9511b979bd1587359f69798c1d425" dependencies: istanbul-lib-coverage "^1.1.1" mkdirp "^0.5.1" path-parse "^1.0.5" supports-color "^3.1.2" -istanbul-lib-source-maps@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.1.tgz#a6fe1acba8ce08eebc638e572e294d267008aa0c" +istanbul-lib-source-maps@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz#750578602435f28a0c04ee6d7d9e0f2960e62c1c" dependencies: - debug "^2.6.3" + debug "^3.1.0" istanbul-lib-coverage "^1.1.1" mkdirp "^0.5.1" rimraf "^2.6.1" source-map "^0.5.3" -istanbul-reports@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.2.tgz#0fb2e3f6aa9922bd3ce45d05d8ab4d5e8e07bd4f" +istanbul-reports@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.3.tgz#3b9e1e8defb6d18b1d425da8e8b32c5a163f2d10" dependencies: handlebars "^4.0.3" -istanbul@0.4.5: - version "0.4.5" - resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b" - dependencies: - abbrev "1.0.x" - async "1.x" - escodegen "1.8.x" - esprima "2.7.x" - glob "^5.0.15" - handlebars "^4.0.1" - js-yaml "3.x" - mkdirp "0.5.x" - nopt "3.x" - once "1.x" - resolve "1.1.x" - supports-color "^3.1.0" - which "^1.1.1" - wordwrap "^1.0.0" - istextorbinary@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-1.0.2.tgz#ace19354d1a9a0173efeb1084ce0f87b0ad7decf" @@ -5237,6 +6117,10 @@ jazzicon@^1.2.0: mersenne-twister "^1.0.1" raphael "^2.2.0" +js-base64@^2.1.8, js-base64@^2.1.9: + version "2.4.0" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa" + js-beautify@~1.5.4: version "1.5.10" resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.5.10.tgz#4d95371702699344a516ca26bf59f0a27bb75719" @@ -5245,6 +6129,10 @@ js-beautify@~1.5.4: mkdirp "~0.5.0" nopt "~3.0.1" +js-reporters@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/js-reporters/-/js-reporters-1.2.0.tgz#7cf2cb698196684790350d0c4ca07f4aed9ec17e" + js-sha3@0.5.5: version "0.5.5" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.5.tgz#baf0c0e8c54ad5903447df96ade7a4a1bca79a4a" @@ -5261,7 +6149,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" -js-yaml@3.x, js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.6.1, js-yaml@^3.9.1: +js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.4.3, js-yaml@^3.6.1, js-yaml@^3.9.0, js-yaml@^3.9.1: version "3.10.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc" dependencies: @@ -5272,38 +6160,37 @@ jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" -jschardet@^1.4.2: - version "1.5.1" - resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.5.1.tgz#c519f629f86b3a5bedba58a88d311309eec097f9" - jsdom-global@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9" jsdom@^11.1.0: - version "11.2.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.2.0.tgz#4f6b8736af3357c3af7227a3b54a5bda1c513fd6" + version "11.5.1" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.5.1.tgz#5df753b8d0bca20142ce21f4f6c039f99a992929" dependencies: abab "^1.0.3" - acorn "^4.0.4" - acorn-globals "^3.1.0" + acorn "^5.1.2" + acorn-globals "^4.0.0" array-equal "^1.0.0" + browser-process-hrtime "^0.1.2" content-type-parser "^1.0.1" cssom ">= 0.3.2 < 0.4.0" cssstyle ">= 0.2.37 < 0.3.0" - escodegen "^1.6.1" + domexception "^1.0.0" + escodegen "^1.9.0" html-encoding-sniffer "^1.0.1" - nwmatcher "^1.4.1" + left-pad "^1.2.0" + nwmatcher "^1.4.3" parse5 "^3.0.2" pn "^1.0.0" - request "^2.79.0" + request "^2.83.0" request-promise-native "^1.0.3" sax "^1.2.1" symbol-tree "^3.2.1" - tough-cookie "^2.3.2" - webidl-conversions "^4.0.0" + tough-cookie "^2.3.3" + webidl-conversions "^4.0.2" whatwg-encoding "^1.0.1" - whatwg-url "^6.1.0" + whatwg-url "^6.3.0" xml-name-validator "^2.0.1" jsesc@^1.3.0: @@ -5325,15 +6212,15 @@ jshint-stylish@~2.2.1: string-length "^1.0.0" text-table "^0.2.0" -json-rpc-engine@^3.0.1: - version "3.1.0" - resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-3.1.0.tgz#09285363372857569d75f61df6591b1b0afb0758" - dependencies: - async "^2.0.1" - babel-preset-env "^1.3.2" - babelify "^7.3.0" +json-loader@^0.5.4: + version "0.5.7" + resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" -json-rpc-engine@^3.1.0, json-rpc-engine@^3.2.0: +json-parse-better-errors@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a" + +json-rpc-engine@3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-3.2.0.tgz#d34dff106c8339c337a894da801f73b1f77b1bc8" dependencies: @@ -5342,7 +6229,7 @@ json-rpc-engine@^3.1.0, json-rpc-engine@^3.2.0: babelify "^7.3.0" json-rpc-error "^2.0.0" -json-rpc-engine@^3.4.0: +json-rpc-engine@^3.0.1, json-rpc-engine@^3.1.0, json-rpc-engine@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-3.4.0.tgz#8a1647a7f2cc7018f4802f41ec8208d281f78bfc" dependencies: @@ -5380,6 +6267,10 @@ json-schema@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" @@ -5400,7 +6291,7 @@ json3@3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1" -json5@^0.5.1: +json5@^0.5.0, json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" @@ -5410,14 +6301,31 @@ jsonfile@^2.1.0: optionalDependencies: graceful-fs "^4.1.6" +jsonfilter@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/jsonfilter/-/jsonfilter-1.1.2.tgz#21ef7cedc75193813c75932e96a98be205ba5a11" + dependencies: + JSONStream "^0.8.4" + minimist "^1.1.0" + stream-combiner "^0.2.1" + through2 "^0.6.3" + jsonify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" +jsonparse@0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-0.0.5.tgz#330542ad3f0a654665b778f3eb2d9a9fa507ac64" + jsonparse@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" +jsonpointer@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" + jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -5427,15 +6335,27 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" +jstransform@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/jstransform/-/jstransform-10.1.0.tgz#b4c49bf63f162c108b0348399a8737c713b0a83a" + dependencies: + base62 "0.1.1" + esprima-fb "13001.1001.0-dev-harmony-fb" + source-map "0.1.31" + jsx-ast-utils@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f" dependencies: array-includes "^3.0.3" -just-extend@^1.1.22: - version "1.1.22" - resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-1.1.22.tgz#3330af756cab6a542700c64b2e4e4aa062d52fff" +just-debounce@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.0.0.tgz#87fccfaeffc0b68cd19d55f6722943f929ea35ea" + +just-extend@^1.1.26: + version "1.1.27" + resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-1.1.27.tgz#ec6e79410ff914e472652abfa0e603c03d60e905" karma-chrome-launcher@^2.2.0: version "2.2.0" @@ -5451,8 +6371,8 @@ karma-cli@^1.0.1: resolve "^1.1.6" karma-firefox-launcher@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.0.1.tgz#ce58f47c2013a88156d55a5d61337c099cf5bb51" + version "1.1.0" + resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz#2c47030452f04531eb7d13d4fc7669630bb93339" karma-qunit@^1.2.1: version "1.2.1" @@ -5491,13 +6411,12 @@ karma@^1.7.1: useragent "^2.1.12" keccak@^1.0.2: - version "1.3.0" - resolved "https://registry.yarnpkg.com/keccak/-/keccak-1.3.0.tgz#3681bd99ad3d0354ddb29b9040c1b6560cce08ac" + version "1.4.0" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-1.4.0.tgz#572f8a6dbee8e7b3aa421550f9e6408ca2186f80" dependencies: bindings "^1.2.1" inherits "^2.0.3" nan "^2.2.1" - prebuild-install "^2.0.0" safe-buffer "^5.1.0" keccakjs@^0.2.0: @@ -5507,7 +6426,7 @@ keccakjs@^0.2.0: browserify-sha3 "^0.0.1" sha3 "^1.1.0" -kind-of@^3.0.2, kind-of@^3.1.0: +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" dependencies: @@ -5519,12 +6438,28 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" +kind-of@^5.0.0, kind-of@^5.0.2: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" + klaw@^1.0.0: version "1.3.1" resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" optionalDependencies: graceful-fs "^4.1.9" +known-css-properties@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.2.0.tgz#899c94be368e55b42d7db8d5be7d73a4a4a41454" + +known-css-properties@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.5.0.tgz#6ff66943ed4a5b55657ee095779a91f4536f8084" + labeled-stream-splicer@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz#a52e1d138024c00b86b1c0c91f677918b8ae0a59" @@ -5544,6 +6479,12 @@ lazy-cache@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" +lazy-cache@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264" + dependencies: + set-getter "^0.1.0" + lazystream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4" @@ -5560,6 +6501,23 @@ lcov-parse@^0.0.10: version "0.0.10" resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3" +ldjson-stream@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ldjson-stream/-/ldjson-stream-1.2.1.tgz#91beceda5ac4ed2b17e649fb777e7abfa0189c2b" + dependencies: + split2 "^0.2.1" + through2 "^0.6.1" + +lead@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42" + dependencies: + flush-write-stream "^1.0.2" + +left-pad@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.2.0.tgz#d30a73c6b8201d8f7d8e7956ba9616087a68e0ee" + leftpad@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/leftpad/-/leftpad-0.0.0.tgz#020c9ad0787216ba0f30d79d479b4b355d7d39c3" @@ -5569,8 +6527,8 @@ level-codec@~7.0.0: resolved "https://registry.yarnpkg.com/level-codec/-/level-codec-7.0.1.tgz#341f22f907ce0f16763f24bddd681e395a0fb8a7" level-errors@^1.0.3: - version "1.1.1" - resolved "https://registry.yarnpkg.com/level-errors/-/level-errors-1.1.1.tgz#52fdc2dbbaf395cf767db843929a38b7015678d2" + version "1.1.2" + resolved "https://registry.yarnpkg.com/level-errors/-/level-errors-1.1.2.tgz#4399c2f3d3ab87d0625f7e3676e2d807deff404d" dependencies: errno "~0.1.1" @@ -5622,16 +6580,15 @@ lexical-scope@^1.2.0: astw "^2.0.0" liftoff@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385" + version "2.5.0" + resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec" dependencies: extend "^3.0.0" - findup-sync "^0.4.2" + findup-sync "^2.0.0" fined "^1.0.1" - flagged-respawn "^0.3.2" - lodash.isplainobject "^4.0.4" - lodash.isstring "^4.0.1" - lodash.mapvalues "^4.4.0" + flagged-respawn "^1.0.0" + is-plain-object "^2.0.4" + object.map "^1.0.0" rechoir "^0.6.2" resolve "^1.1.7" @@ -5649,15 +6606,28 @@ load-json-file@^1.0.0: pinkie-promise "^2.0.0" strip-bom "^2.0.0" -load-json-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" +load-json-file@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" dependencies: graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" + parse-json "^4.0.0" + pify "^3.0.0" strip-bom "^3.0.0" +loader-runner@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" + +loader-utils@^0.2.16: + version "0.2.17" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" + dependencies: + big.js "^3.1.3" + emojis-list "^2.0.0" + json5 "^0.5.0" + object-assign "^4.0.1" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -5743,15 +6713,11 @@ lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" -lodash.assignin@^4.0.9, lodash.assignin@^4.1.0: +lodash.assignin@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" -lodash.bind@^4.1.4: - version "4.2.1" - resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35" - -lodash.clonedeep@^4.4.1: +lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.4.1: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" @@ -5761,24 +6727,16 @@ lodash.debounce@^3.1.1: dependencies: lodash._getnative "^3.0.0" -lodash.debounce@^4.0.6, lodash.debounce@^4.0.8: +lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" -lodash.defaults@^4.0.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" - lodash.escape@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698" dependencies: lodash._root "^3.0.0" -lodash.filter@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" - lodash.find@^4.5.1: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1" @@ -5794,13 +6752,9 @@ lodash.flatten@^3.0.2: lodash._baseflatten "^3.0.0" lodash._isiterateecall "^3.0.0" -lodash.flatten@^4.2.0: +lodash.flattendeep@^4.4.0: version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" - -lodash.foreach@^4.3.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" + resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" lodash.get@^4.4.2: version "4.4.2" @@ -5814,22 +6768,6 @@ lodash.isarray@^3.0.0: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" -lodash.isequal@^4.0.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - -lodash.isfunction@^3.0.8: - version "3.0.8" - resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.8.tgz#4db709fc81bc4a8fd7127a458a5346c5cdce2c6b" - -lodash.isplainobject@^4.0.4, lodash.isplainobject@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - -lodash.isstring@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" - lodash.keys@^3.0.0: version "3.1.2" resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" @@ -5838,14 +6776,6 @@ lodash.keys@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" -lodash.map@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" - -lodash.mapvalues@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c" - lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" @@ -5854,21 +6784,9 @@ lodash.memoize@~3.0.3: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f" -lodash.merge@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5" - -lodash.pick@^4.2.1: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" - -lodash.reduce@^4.4.0: +lodash.mergewith@^4.6.0: version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" - -lodash.reject@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415" + resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55" lodash.restparam@^3.0.0: version "3.6.1" @@ -5878,11 +6796,7 @@ lodash.shuffle@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.shuffle/-/lodash.shuffle-4.2.0.tgz#145b5053cf875f6f5c2a33f48b6e9948c6ec7b4b" -lodash.some@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" - -lodash.sortby@^4.5.0, lodash.sortby@^4.7.0: +lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" @@ -5915,7 +6829,7 @@ lodash@^3.8.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@~4.17.2: +lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@~4.17.2, lodash@~4.17.4: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -5923,12 +6837,18 @@ log-driver@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056" -log-symbols@^1.0.0: +log-symbols@^1.0.0, log-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" dependencies: chalk "^1.0.0" +log-symbols@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.1.0.tgz#f35fa60e278832b538dc4dddcbb478a45d3e3be6" + dependencies: + chalk "^2.0.1" + log4js@^0.6.31: version "0.6.38" resolved "https://registry.yarnpkg.com/log4js/-/log4js-0.6.38.tgz#2c494116695d6fb25480943d3fc872e662a522fd" @@ -5937,16 +6857,20 @@ log4js@^0.6.31: semver "~4.3.3" loglevel@^1.4.1, loglevel@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.5.0.tgz#3863984a2c326b986fbb965f378758a6dc8a4324" + version "1.6.0" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.0.tgz#ae0caa561111498c5ba13723d6fb631d24003934" lolex@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6" -lolex@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.1.2.tgz#2694b953c9ea4d013e5b8bfba891c991025b2629" +lolex@^2.2.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.3.1.tgz#3d2319894471ea0950ef64692ead2a5318cff362" + +longest-streak@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz#2421b6ba939a443bb9ffebf596585a50b4c38e2e" longest@^1.0.1: version "1.0.1" @@ -5958,10 +6882,23 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1: dependencies: js-tokens "^3.0.0" +loud-rejection@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" + dependencies: + currently-unhandled "^0.4.1" + signal-exit "^3.0.0" + lru-cache@2.2.x: version "2.2.4" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d" +lru-cache@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee" + dependencies: + pseudomap "^1.0.1" + lru-cache@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55" @@ -5989,22 +6926,54 @@ map-async@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/map-async/-/map-async-0.1.1.tgz#c897c0449f85864c74b5a3f196edb42156431745" -map-cache@^0.2.0: +map-cache@^0.2.0, map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" +map-obj@^1.0.0, map-obj@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + +map-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9" + map-stream@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194" -matchdep@^1.0.0: +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + dependencies: + object-visit "^1.0.0" + +markdown-escapes@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/matchdep/-/matchdep-1.0.1.tgz#a57a33804491fbae208aba8f68380437abc2dca5" + resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.1.tgz#1994df2d3af4811de59a6714934c2b2292734518" + +markdown-table@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.1.tgz#4b3dd3a133d1518b8ef0dbc709bf2a1b4824bc8c" + +matchdep@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/matchdep/-/matchdep-2.0.0.tgz#c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e" dependencies: - findup-sync "~0.3.0" - micromatch "^2.3.7" - resolve "~1.1.6" - stack-trace "0.0.9" + findup-sync "^2.0.0" + micromatch "^3.0.4" + resolve "^1.4.0" + stack-trace "0.0.10" + +matcher-collection@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.0.5.tgz#2ee095438372cb8884f058234138c05c644ec339" + dependencies: + minimatch "^3.0.2" + +mathml-tag-names@^2.0.0, mathml-tag-names@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.0.1.tgz#8d41268168bf86d1102b98109e28e531e7a34578" md5-hex@^1.2.0: version "1.3.0" @@ -6023,9 +6992,12 @@ md5.js@^1.3.4: hash-base "^3.0.0" inherits "^2.0.1" -"mdurl@~ 1.0.1": +mdast-util-compact@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" + resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz#cdb5f84e2b6a2d3114df33bd05d9cb32e3c4083a" + dependencies: + unist-util-modify-children "^1.0.0" + unist-util-visit "^1.1.0" media-typer@0.3.0: version "0.3.0" @@ -6038,16 +7010,17 @@ mem@^1.1.0: mimic-fn "^1.0.0" memdown@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/memdown/-/memdown-1.3.1.tgz#071499332e3a74b88c3d9551b0750d61fdf0c5b7" + version "1.4.1" + resolved "https://registry.yarnpkg.com/memdown/-/memdown-1.4.1.tgz#b4e4e192174664ffbae41361aa500f3119efe215" dependencies: - abstract-leveldown "2.7.0" + abstract-leveldown "~2.7.1" functional-red-black-tree "^1.0.1" immediate "^3.2.3" inherits "~2.0.1" ltgt "~2.2.0" + safe-buffer "~5.1.1" -memoizee@^0.4.5: +memoizee@0.4.X: version "0.4.11" resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.11.tgz#bde9817663c9e40fdb2a4ea1c367296087ae8c8f" dependencies: @@ -6060,19 +7033,55 @@ memoizee@^0.4.5: next-tick "1" timers-ext "^0.1.2" +memory-fs@^0.4.0, memory-fs@~0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" + dependencies: + errno "^0.1.3" + readable-stream "^2.0.1" + memorystream@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2" +meow@^3.3.0, meow@^3.7.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" + dependencies: + camelcase-keys "^2.0.0" + decamelize "^1.1.2" + loud-rejection "^1.0.0" + map-obj "^1.0.1" + minimist "^1.1.3" + normalize-package-data "^2.3.4" + object-assign "^4.0.1" + read-pkg-up "^1.0.1" + redent "^1.0.0" + trim-newlines "^1.0.0" + +meow@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.0.tgz#fd5855dd008db5b92c552082db1c307cba20b29d" + dependencies: + camelcase-keys "^4.0.0" + decamelize-keys "^1.0.0" + loud-rejection "^1.0.0" + minimist "^1.1.3" + minimist-options "^3.0.1" + normalize-package-data "^2.3.4" + read-pkg-up "^3.0.0" + redent "^2.0.0" + trim-newlines "^2.0.0" + merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" merge-source-map@^1.0.2: - version "1.0.4" - resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f" + version "1.1.0" + resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" dependencies: - source-map "^0.5.6" + source-map "^0.6.1" merge-stream@^1.0.0: version "1.0.1" @@ -6081,11 +7090,11 @@ merge-stream@^1.0.0: readable-stream "^2.0.1" merkle-patricia-tree@^2.1.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/merkle-patricia-tree/-/merkle-patricia-tree-2.2.0.tgz#7a4787b1262ab00fe9b204ab471b005332306efa" + version "2.3.0" + resolved "https://registry.yarnpkg.com/merkle-patricia-tree/-/merkle-patricia-tree-2.3.0.tgz#84c606232ef343f1b96fc972e697708754f08573" dependencies: async "^1.4.2" - ethereumjs-util "^4.0.0" + ethereumjs-util "^5.0.0" level-ws "0.0.0" levelup "^1.2.1" memdown "^1.0.0" @@ -6138,9 +7147,27 @@ micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7: parse-glob "^3.0.4" regex-cache "^0.4.2" +micromatch@^3.0.4: + version "3.1.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.4.tgz#bb812e741a41f982c854e42b421a7eac458796f4" + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.0" + define-property "^1.0.0" + extend-shallow "^2.0.1" + extglob "^2.0.2" + fragment-cache "^0.2.1" + kind-of "^6.0.0" + nanomatch "^1.2.5" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + miller-rabin@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.0.tgz#4a62fb1d42933c05583982f4c716f6fb9e6c6d3d" + version "4.0.1" + resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" dependencies: bn.js "^4.0.0" brorand "^1.0.1" @@ -6149,23 +7176,19 @@ mime-db@~1.30.0: version "1.30.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01" -mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.7: +mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.7: version "2.1.17" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a" dependencies: mime-db "~1.30.0" -mime@1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" - mime@1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" mime@^1.3.4: - version "1.4.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.0.tgz#69e9e0db51d44f2a3b56e48b7817d7d137f1a343" + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" mime@~1.2.9: version "1.2.11" @@ -6200,25 +7223,32 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" -"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: +"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: brace-expansion "^1.1.7" -minimist@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.5.tgz#d7aa327bcecf518f9106ac6b8f003fa3bcea8566" +minimist-options@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954" + dependencies: + arrify "^1.0.1" + is-plain-obj "^1.1.0" minimist@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" +minimist@1.1.x: + version "1.1.3" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8" + minimist@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de" -minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0: +minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" @@ -6241,11 +7271,18 @@ mississippi@^1.2.0: stream-each "^1.1.0" through2 "^2.0.0" +mixin-deep@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.0.tgz#47a8732ba97799457c8c1eca28f95132d7e8150a" + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + mkdirp@0.0.x: version "0.0.7" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.0.7.tgz#d89b4f0e4c3e5e5ca54235931675e094fe1a5072" -mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@0.x.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0: +mkdirp@0.5.1, mkdirp@0.x.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: @@ -6269,8 +7306,8 @@ mocha-sinon@^2.0.0: resolved "https://registry.yarnpkg.com/mocha-sinon/-/mocha-sinon-2.0.0.tgz#723a9310e7d737d7b77c7a66821237425b032d48" mocha@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-4.0.1.tgz#0aee5a95cf69a4618820f5e51fa31717117daf1b" + version "4.1.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-4.1.0.tgz#7d86cfbcf35cb829e2754c32e17355ec05338794" dependencies: browser-stdout "1.3.0" commander "2.11.0" @@ -6315,6 +7352,15 @@ ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" +multimatch@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b" + dependencies: + array-differ "^1.0.0" + array-union "^1.0.1" + arrify "^1.0.0" + minimatch "^3.0.0" + multipipe@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b" @@ -6351,13 +7397,25 @@ mz@^2.6.0: object-assign "^4.0.1" thenify-all "^1.0.0" -nan@^2.0.5, nan@^2.0.8, nan@^2.2.1, nan@^2.3.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" +nan@^2.0.5, nan@^2.0.8, nan@^2.2.1, nan@^2.3.0, nan@^2.3.2: + version "2.8.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" -native-promise-only@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/native-promise-only/-/native-promise-only-0.8.1.tgz#20a318c30cb45f71fe7adfbf7b21c99c1472ef11" +nanomatch@^1.2.5: + version "1.2.6" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.6.tgz#f27233e97c34a8706b7e781a4bc611c957a81625" + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^1.0.0" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + is-odd "^1.0.0" + kind-of "^5.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" natural-compare@^1.4.0: version "1.4.0" @@ -6367,6 +7425,14 @@ ncp@1.0.x: version "1.0.1" resolved "https://registry.yarnpkg.com/ncp/-/ncp-1.0.1.tgz#d15367e5cb87432ba117d2bf80fdf45aecfb4246" +nearley@^2.7.10: + version "2.11.0" + resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.11.0.tgz#5e626c79a6cd2f6ab9e7e5d5805e7668967757ae" + dependencies: + nomnom "~1.6.2" + railroad-diagrams "^1.0.0" + randexp "^0.4.2" + negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" @@ -6375,19 +7441,19 @@ next-tick@1: version "1.0.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" -nise@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/nise/-/nise-1.1.0.tgz#37e41b9bf0041ccb83d1bf03e79440bbc0db10ad" +nise@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/nise/-/nise-1.2.0.tgz#079d6cadbbcb12ba30e38f1c999f36ad4d6baa53" dependencies: formatio "^1.2.0" - just-extend "^1.1.22" + just-extend "^1.1.26" lolex "^1.6.0" path-to-regexp "^1.7.0" text-encoding "^0.6.4" nock@^9.0.14: - version "9.0.14" - resolved "https://registry.yarnpkg.com/nock/-/nock-9.0.14.tgz#2211550253173ce298bcd89fca825e83813ca72b" + version "9.1.5" + resolved "https://registry.yarnpkg.com/nock/-/nock-9.1.5.tgz#9e4878e0e1c050bdd93ae1e326e89461ea15618b" dependencies: chai ">=1.9.2 <4.0.0" debug "^2.2.0" @@ -6396,13 +7462,9 @@ nock@^9.0.14: lodash "~4.17.2" mkdirp "^0.5.0" propagate "0.4.0" - qs "^6.0.2" + qs "^6.5.1" semver "^5.3.0" -node-abi@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.1.1.tgz#c9cda256ec8aa99bcab2f6446db38af143338b2a" - node-fetch@^1.0.1, node-fetch@~1.7.1: version "1.7.3" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" @@ -6410,6 +7472,52 @@ node-fetch@^1.0.1, node-fetch@~1.7.1: encoding "^0.1.11" is-stream "^1.0.1" +node-gyp@^3.3.1: + version "3.6.2" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60" + dependencies: + fstream "^1.0.0" + glob "^7.0.3" + graceful-fs "^4.1.2" + minimatch "^3.0.2" + mkdirp "^0.5.0" + nopt "2 || 3" + npmlog "0 || 1 || 2 || 3 || 4" + osenv "0" + request "2" + rimraf "2" + semver "~5.3.0" + tar "^2.0.0" + which "1" + +node-libs-browser@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df" + dependencies: + assert "^1.1.1" + browserify-zlib "^0.2.0" + buffer "^4.3.0" + console-browserify "^1.1.0" + constants-browserify "^1.0.0" + crypto-browserify "^3.11.0" + domain-browser "^1.1.1" + events "^1.0.0" + https-browserify "^1.0.0" + os-browserify "^0.3.0" + path-browserify "0.0.0" + process "^0.11.10" + punycode "^1.2.4" + querystring-es3 "^0.2.0" + readable-stream "^2.3.3" + stream-browserify "^2.0.1" + stream-http "^2.7.2" + string_decoder "^1.0.0" + timers-browserify "^2.0.4" + tty-browserify "0.0.0" + url "^0.11.0" + util "^0.10.3" + vm-browserify "0.0.4" + node-notifier@^5.0.1: version "5.1.2" resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.1.2.tgz#2fa9e12605fa10009d44549d6fcd8a63dde0e4ff" @@ -6419,26 +7527,54 @@ node-notifier@^5.0.1: shellwords "^0.1.0" which "^1.2.12" -node-pre-gyp@^0.6.36: - version "0.6.37" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.37.tgz#3c872b236b2e266e4140578fe1ee88f693323a05" +node-pre-gyp@^0.6.39: + version "0.6.39" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" dependencies: + detect-libc "^1.0.2" + hawk "3.1.3" mkdirp "^0.5.1" nopt "^4.0.1" npmlog "^4.0.2" rc "^1.1.7" - request "^2.81.0" + request "2.81.0" rimraf "^2.6.1" semver "^5.3.0" - tape "^4.6.3" tar "^2.2.1" tar-pack "^3.4.0" -noop-logger@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" +node-sass@^4.2.0: + version "4.7.2" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.7.2.tgz#9366778ba1469eb01438a9e8592f4262bcb6794e" + dependencies: + async-foreach "^0.1.3" + chalk "^1.1.1" + cross-spawn "^3.0.0" + gaze "^1.0.0" + get-stdin "^4.0.1" + glob "^7.0.3" + in-publish "^2.0.0" + lodash.assign "^4.2.0" + lodash.clonedeep "^4.3.2" + lodash.mergewith "^4.6.0" + meow "^3.7.0" + mkdirp "^0.5.1" + nan "^2.3.2" + node-gyp "^3.3.1" + npmlog "^4.0.0" + request "~2.79.0" + sass-graph "^2.2.4" + stdout-stream "^1.4.0" + "true-case-path" "^1.0.2" + +nomnom@~1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.6.2.tgz#84a66a260174408fc5b77a18f888eccc44fb6971" + dependencies: + colors "0.5.x" + underscore "~1.4.4" -nopt@3.x, nopt@~3.0.1: +"nopt@2 || 3", nopt@~3.0.1: version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" dependencies: @@ -6451,7 +7587,7 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -normalize-package-data@^2.3.2: +normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.4.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" dependencies: @@ -6466,6 +7602,14 @@ normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: dependencies: remove-trailing-separator "^1.0.1" +normalize-range@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" + +normalize-selector@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03" + now-and-later@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.0.tgz#bc61cbb456d79cb32207ce47ca05136ff2e7d6ee" @@ -6478,7 +7622,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" dependencies: @@ -6497,6 +7641,10 @@ null-check@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd" +num2fraction@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" + number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" @@ -6508,13 +7656,13 @@ number-to-bn@1.7.0, number-to-bn@^1.7.0: bn.js "4.11.6" strip-hex-prefix "1.0.0" -nwmatcher@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.1.tgz#7ae9b07b0ea804db7e25f05cb5fe4097d4e4949f" +nwmatcher@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c" nyc@^11.0.3: - version "11.2.1" - resolved "https://registry.yarnpkg.com/nyc/-/nyc-11.2.1.tgz#ad850afe9dbad7f4970728b4b2e47fed1c38721c" + version "11.4.1" + resolved "https://registry.yarnpkg.com/nyc/-/nyc-11.4.1.tgz#13fdf7e7ef22d027c61d174758f6978a68f4f5e5" dependencies: archy "^1.0.0" arrify "^1.0.1" @@ -6527,11 +7675,11 @@ nyc@^11.0.3: foreground-child "^1.5.3" glob "^7.0.6" istanbul-lib-coverage "^1.1.1" - istanbul-lib-hook "^1.0.7" - istanbul-lib-instrument "^1.8.0" - istanbul-lib-report "^1.1.1" - istanbul-lib-source-maps "^1.2.1" - istanbul-reports "^1.1.1" + istanbul-lib-hook "^1.1.0" + istanbul-lib-instrument "^1.9.1" + istanbul-lib-report "^1.1.2" + istanbul-lib-source-maps "^1.2.2" + istanbul-reports "^1.1.3" md5-hex "^1.2.0" merge-source-map "^1.0.2" micromatch "^2.3.11" @@ -6539,12 +7687,12 @@ nyc@^11.0.3: resolve-from "^2.0.0" rimraf "^2.5.4" signal-exit "^3.0.1" - spawn-wrap "^1.3.8" + spawn-wrap "^1.4.2" test-exclude "^4.1.1" - yargs "^8.0.1" - yargs-parser "^5.0.0" + yargs "^10.0.3" + yargs-parser "^8.0.0" -oauth-sign@~0.8.1: +oauth-sign@~0.8.1, oauth-sign@~0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" @@ -6564,7 +7712,7 @@ object-assign@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0" -object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@4.X, object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -6572,6 +7720,18 @@ object-component@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291" +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + +object-inspect@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.5.0.tgz#9d876c11e40f485c79215670281b767488f9bfe3" + object-inspect@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-0.4.0.tgz#f5157c116c1455b243b06ee97703392c5ad89fec" @@ -6584,7 +7744,7 @@ object-is@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6" -object-keys@^1.0.10, object-keys@^1.0.6, object-keys@^1.0.8: +object-keys@^1.0.11, object-keys@^1.0.6, object-keys@^1.0.8: version "1.0.11" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d" @@ -6592,13 +7752,20 @@ object-keys@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336" -object.assign@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc" +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + dependencies: + isobject "^3.0.0" + +object.assign@^4.0.4, object.assign@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" dependencies: define-properties "^1.1.2" - function-bind "^1.1.0" - object-keys "^1.0.10" + function-bind "^1.1.1" + has-symbols "^1.0.0" + object-keys "^1.0.11" object.defaults@^1.0.0, object.defaults@^1.1.0: version "1.1.0" @@ -6618,6 +7785,13 @@ object.entries@^1.0.4: function-bind "^1.1.0" has "^1.0.1" +object.map@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37" + dependencies: + for-own "^1.0.0" + make-iterator "^1.0.0" + object.omit@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" @@ -6625,7 +7799,7 @@ object.omit@^2.0.0: for-own "^0.1.4" is-extendable "^0.1.1" -object.pick@^1.2.0: +object.pick@^1.2.0, object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" dependencies: @@ -6647,7 +7821,7 @@ object.values@^1.0.4: function-bind "^1.1.0" has "^1.0.1" -obs-store@^2.3.1, obs-store@^2.4.1: +obs-store@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/obs-store/-/obs-store-2.4.1.tgz#5425b85dabaf08d913464000ba65aaf25296492f" dependencies: @@ -6657,18 +7831,32 @@ obs-store@^2.3.1, obs-store@^2.4.1: through2 "^2.0.3" xtend "^4.0.1" +obs-store@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/obs-store/-/obs-store-3.0.0.tgz#f44aa9ad73c65ceeeaa00476d434d4e5c3f0a9e8" + dependencies: + babel-preset-es2015 "^6.22.0" + babelify "^7.3.0" + readable-stream "^2.2.2" + through2 "^2.0.3" + xtend "^4.0.1" + on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" dependencies: ee-first "1.1.1" -once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.3.3, once@^1.4.0: +once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.3.3, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" dependencies: wrappy "1" +onecolor@^3.0.4: + version "3.0.5" + resolved "https://registry.yarnpkg.com/onecolor/-/onecolor-3.0.5.tgz#36eff32201379efdf1180fb445e51a8e2425f9f6" + onetime@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" @@ -6709,16 +7897,15 @@ options@>=0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" -ordered-read-streams@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b" +ordered-read-streams@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e" dependencies: - is-stream "^1.0.1" readable-stream "^2.0.1" -os-browserify@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.1.2.tgz#49ca0293e0b19590a5f5de10c7f265a617d8fe54" +os-browserify@^0.3.0, os-browserify@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" @@ -6742,7 +7929,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" -osenv@^0.1.4: +osenv@0, osenv@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644" dependencies: @@ -6773,9 +7960,9 @@ p-map@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" -pako@~0.2.0: - version "0.2.9" - resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" +pako@~1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258" parallel-transform@^1.1.0: version "1.1.0" @@ -6801,11 +7988,22 @@ parse-asn1@^5.0.0: evp_bytestokey "^1.0.0" pbkdf2 "^3.0.3" +parse-entities@^1.0.2: + version "1.1.1" + resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.1.1.tgz#8112d88471319f27abae4d64964b122fe4e1b890" + dependencies: + character-entities "^1.0.0" + character-entities-legacy "^1.0.0" + character-reference-invalid "^1.0.0" + is-alphanumerical "^1.0.0" + is-decimal "^1.0.0" + is-hexadecimal "^1.0.0" + parse-filepath@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73" + version "1.0.2" + resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891" dependencies: - is-absolute "^0.2.3" + is-absolute "^1.0.0" map-cache "^0.2.0" path-root "^0.1.1" @@ -6831,15 +8029,28 @@ parse-json@^2.2.0: dependencies: error-ex "^1.2.0" +parse-json@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-3.0.0.tgz#fa6f47b18e23826ead32f263e744d0e1e847fb13" + dependencies: + error-ex "^1.3.1" + +parse-json@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" + dependencies: + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" -parse5@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.2.tgz#05eff57f0ef4577fb144a79f8b9a967a6cc44510" +parse5@^3.0.1, parse5@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c" dependencies: - "@types/node" "^6.0.46" + "@types/node" "*" parsejson@0.0.3: version "0.0.3" @@ -6859,7 +8070,7 @@ parseuri@0.0.5: dependencies: better-assert "~1.0.0" -parseurl@~1.3.0, parseurl@~1.3.1, parseurl@~1.3.2: +parseurl@~1.3.0, parseurl@~1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" @@ -6867,7 +8078,7 @@ pascalcase@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" -path-browserify@~0.0.0: +path-browserify@0.0.0, path-browserify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a" @@ -6933,11 +8144,11 @@ path-type@^1.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" -path-type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" +path-type@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" dependencies: - pify "^2.0.0" + pify "^3.0.0" pathval@^1.0.0: version "1.1.0" @@ -6963,6 +8174,10 @@ performance-now@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + pify@^2.0.0, pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -6989,6 +8204,13 @@ pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" +pipetteur@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/pipetteur/-/pipetteur-2.0.3.tgz#1955760959e8d1a11cb2a50ec83eec470633e49f" + dependencies: + onecolor "^3.0.4" + synesthesia "^1.0.1" + pkg-dir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" @@ -7007,7 +8229,7 @@ plucker@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/plucker/-/plucker-0.0.0.tgz#2ffa24e03ab2cffa4e75adc1df70f25623c45d09" -plur@^2.1.0: +plur@^2.0.0, plur@^2.1.0, plur@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a" dependencies: @@ -7037,30 +8259,139 @@ portfinder@~0.2.1: dependencies: mkdirp "0.0.x" +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + post-message-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/post-message-stream/-/post-message-stream-3.0.0.tgz#90d9f54bd209e6b6f5d74795b87588205b547048" dependencies: readable-stream "^2.1.4" -prebuild-install@^2.0.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.2.2.tgz#dd47c4d61f3754fb17bbf601759e5922e16e0671" +postcss-html@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.12.0.tgz#39b6adb4005dfc5464df7999c0f81c95bced7e50" dependencies: - expand-template "^1.0.2" - github-from-package "0.0.0" - minimist "^1.2.0" - mkdirp "^0.5.1" - node-abi "^2.0.0" - noop-logger "^0.1.1" - npmlog "^4.0.1" - os-homedir "^1.0.1" - pump "^1.0.1" - rc "^1.1.6" - simple-get "^1.4.2" - tar-fs "^1.13.0" - tunnel-agent "^0.6.0" - xtend "4.0.1" + htmlparser2 "^3.9.2" + remark "^8.0.0" + unist-util-find-all-after "^1.0.1" + +postcss-less@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-0.14.0.tgz#c631b089c6cce422b9a10f3a958d2bedd3819324" + dependencies: + postcss "^5.0.21" + +postcss-less@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-1.1.3.tgz#6930525271bfe38d5793d33ac09c1a546b87bb51" + dependencies: + postcss "^5.2.16" + +postcss-media-query-parser@^0.2.0, postcss-media-query-parser@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244" + +postcss-reporter@^1.2.1, postcss-reporter@^1.3.3: + version "1.4.1" + resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-1.4.1.tgz#c136f0a5b161915f379dd3765c61075f7e7b9af2" + dependencies: + chalk "^1.0.0" + lodash "^4.1.0" + log-symbols "^1.0.2" + postcss "^5.0.0" + +postcss-reporter@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-3.0.0.tgz#09ea0f37a444c5693878606e09b018ebeff7cf8f" + dependencies: + chalk "^1.0.0" + lodash "^4.1.0" + log-symbols "^1.0.2" + postcss "^5.0.0" + +postcss-reporter@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-5.0.0.tgz#a14177fd1342829d291653f2786efd67110332c3" + dependencies: + chalk "^2.0.1" + lodash "^4.17.4" + log-symbols "^2.0.0" + postcss "^6.0.8" + +postcss-resolve-nested-selector@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e" + +postcss-safe-parser@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-3.0.1.tgz#b753eff6c7c0aea5e8375fbe4cde8bf9063ff142" + dependencies: + postcss "^6.0.6" + +postcss-sass@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.2.0.tgz#e55516441e9526ba4b380a730d3a02e9eaa78c7a" + dependencies: + gonzales-pe "^4.0.3" + postcss "^6.0.6" + +postcss-scss@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-0.4.1.tgz#ad771b81f0f72f5f4845d08aa60f93557653d54c" + dependencies: + postcss "^5.2.13" + +postcss-scss@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-1.0.2.tgz#ff45cf3354b879ee89a4eb68680f46ac9bb14f94" + dependencies: + postcss "^6.0.3" + +postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.1.1: + version "2.2.3" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90" + dependencies: + flatten "^1.0.2" + indexes-of "^1.0.1" + uniq "^1.0.1" + +postcss-selector-parser@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865" + dependencies: + dot-prop "^4.1.1" + indexes-of "^1.0.1" + uniq "^1.0.1" + +postcss-sorting@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/postcss-sorting/-/postcss-sorting-2.1.0.tgz#32b1e9afa913bb225a6ad076d503d8f983bb4a82" + dependencies: + lodash "^4.17.4" + postcss "^5.2.17" + +postcss-value-parser@^3.1.1, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15" + +postcss@^5.0.0, postcss@^5.0.18, postcss@^5.0.20, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.8, postcss@^5.2.13, postcss@^5.2.16, postcss@^5.2.17, postcss@^5.2.4, postcss@^5.2.5: + version "5.2.18" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5" + dependencies: + chalk "^1.1.3" + js-base64 "^2.1.9" + source-map "^0.5.6" + supports-color "^3.2.3" + +postcss@^6.0.1, postcss@^6.0.14, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.8: + version "6.0.14" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.14.tgz#5534c72114739e75d0afcf017db853099f562885" + dependencies: + chalk "^2.3.0" + source-map "^0.6.1" + supports-color "^4.4.0" prelude-ls@~1.1.2: version "1.1.2" @@ -7082,15 +8413,15 @@ printf@^0.2.3: version "0.2.5" resolved "https://registry.yarnpkg.com/printf/-/printf-0.2.5.tgz#c438ca2ca33e3927671db4ab69c0e52f936a4f0f" -private@^0.1.6, private@^0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1" +private@^0.1.6, private@^0.1.7, private@~0.1.5: + version "0.1.8" + resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" -process-nextick-args@^1.0.7, process-nextick-args@~1.0.6: +process-nextick-args@^1.0.6, process-nextick-args@^1.0.7, process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" -process@~0.11.0: +process@^0.11.10, process@~0.11.0: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" @@ -7121,6 +8452,12 @@ promise@^7.1.1: dependencies: asap "~2.0.3" +promise@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/promise/-/promise-8.0.1.tgz#e45d68b00a17647b6da711bf85ed6ed47208f450" + dependencies: + asap "~2.0.3" + prompt@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/prompt/-/prompt-1.0.0.tgz#8e57123c396ab988897fb327fd3aedc3e735e4fe" @@ -7132,14 +8469,7 @@ prompt@^1.0.0: utile "0.3.x" winston "2.1.x" -prop-types@^15.5.1, prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.8: - version "15.5.10" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154" - dependencies: - fbjs "^0.8.9" - loose-envify "^1.3.1" - -prop-types@^15.5.7: +prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0: version "15.6.0" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" dependencies: @@ -7155,13 +8485,6 @@ proto-list@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" -proxy-addr@~1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.5.tgz#71c0ee3b102de3f202f3b64f608d173fcba1a918" - dependencies: - forwarded "~0.1.0" - ipaddr.js "1.4.0" - proxy-addr@~2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec" @@ -7169,15 +8492,11 @@ proxy-addr@~2.0.2: forwarded "~0.1.2" ipaddr.js "1.5.2" -prr@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" - prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" -pseudomap@^1.0.2: +pseudomap@^1.0.1, pseudomap@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" @@ -7191,14 +8510,14 @@ public-encrypt@^4.0.0: parse-asn1 "^5.0.0" randombytes "^2.0.1" -pump@^1.0.0, pump@^1.0.1, pump@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.2.tgz#3b3ee6512f94f0e575538c17995f9f16990a5d51" +pump@^1.0.0, pump@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954" dependencies: end-of-stream "^1.1.0" once "^1.3.1" -pumpify@^1.3.3, pumpify@^1.3.4: +pumpify@^1.3.3, pumpify@^1.3.4, pumpify@^1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.3.5.tgz#1b671c619940abcaeac0ad0e3a3c164be760993b" dependencies: @@ -7210,7 +8529,7 @@ punycode@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" -punycode@^1.3.2, punycode@^1.4.1: +punycode@^1.2.4, punycode@^1.3.2, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" @@ -7218,6 +8537,10 @@ punycode@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d" +q@^1.1.2: + version "1.5.1" + resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" + qjobs@^1.1.4: version "1.1.5" resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73" @@ -7230,11 +8553,7 @@ qs@5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/qs/-/qs-5.2.0.tgz#a9f31142af468cb72b25b30136ba2456834916be" -qs@6.5.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.0.tgz#8d04954d364def3efc55b5a0793e1e2c8b1e6e49" - -qs@6.5.1, qs@^6.0.2, qs@^6.2.0: +qs@6.5.1, qs@^6.2.0, qs@^6.5.1, qs@~6.5.1: version "6.5.1" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" @@ -7242,11 +8561,15 @@ qs@~2.2.3: version "2.2.5" resolved "https://registry.yarnpkg.com/qs/-/qs-2.2.5.tgz#1088abaf9dcc0ae5ae45b709e6c6b5888b23923c" +qs@~6.3.0: + version "6.3.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c" + qs@~6.4.0: version "6.4.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" -querystring-es3@~0.2.0: +querystring-es3@^0.2.0, querystring-es3@~0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" @@ -7254,22 +8577,21 @@ querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" -qunit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/qunit/-/qunit-1.0.0.tgz#1d3dcfbfaec81979cb4bdaee45450bb5e5914f8c" - dependencies: - argsparser "^0.0.7" - cli-table "^0.3.0" - co "^4.6.0" - qunitjs "2.1.1" - tracejs "^0.1.8" - underscore "^1.6.0" - optionalDependencies: - istanbul "0.4.5" +quick-lru@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" -qunitjs@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/qunitjs/-/qunitjs-2.1.1.tgz#c3087c864d9a9443103bdbdecc0ef359c7a82281" +qunitjs@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/qunitjs/-/qunitjs-2.4.1.tgz#88aba055a9e2ec3dbebfaad02471b2cb002c530b" + dependencies: + chokidar "1.6.1" + commander "2.9.0" + exists-stat "1.0.0" + findup-sync "0.4.3" + js-reporters "1.2.0" + resolve "1.3.2" + walk-sync "0.3.1" quote-stream@^1.0.1: version "1.0.2" @@ -7286,10 +8608,27 @@ quote-stream@~0.0.0: minimist "0.0.8" through2 "~0.4.1" +raf@^3.1.0, raf@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575" + dependencies: + performance-now "^2.1.0" + +railroad-diagrams@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e" + ramda@^0.24.1: version "0.24.1" resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.24.1.tgz#c3b7755197f35b8dc3502228262c4c91ddb6b857" +randexp@^0.4.2: + version "0.4.6" + resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3" + dependencies: + discontinuous-range "1.0.0" + ret "~0.1.10" + randomatic@^1.1.3: version "1.1.7" resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" @@ -7297,12 +8636,19 @@ randomatic@^1.1.3: is-number "^3.0.0" kind-of "^4.0.0" -randombytes@^2.0.0, randombytes@^2.0.1: +randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79" dependencies: safe-buffer "^5.1.0" +randomfill@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62" + dependencies: + randombytes "^2.0.5" + safe-buffer "^5.1.0" + range-parser@^1.2.0, range-parser@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" @@ -7330,9 +8676,9 @@ raw-body@~2.1.5: iconv-lite "0.4.13" unpipe "1.0.0" -rc@^1.1.6, rc@^1.1.7: - version "1.2.1" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95" +rc@^1.1.7: + version "1.2.2" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077" dependencies: deep-extend "~0.4.0" ini "~1.3.0" @@ -7340,18 +8686,18 @@ rc@^1.1.6, rc@^1.1.7: strip-json-comments "~2.0.1" react-addons-css-transition-group@^15.6.0: - version "15.6.0" - resolved "https://registry.yarnpkg.com/react-addons-css-transition-group/-/react-addons-css-transition-group-15.6.0.tgz#69887cf6e4874d25cd66e22a699e29f0d648aba0" + version "15.6.2" + resolved "https://registry.yarnpkg.com/react-addons-css-transition-group/-/react-addons-css-transition-group-15.6.2.tgz#9e4376bcf40b5217d14ec68553081cee4b08a6d6" dependencies: react-transition-group "^1.2.0" react-addons-test-utils@^15.5.1: - version "15.6.0" - resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.6.0.tgz#062d36117fe8d18f3ba5e06eb33383b0b85ea5b9" + version "15.6.2" + resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.6.2.tgz#c12b6efdc2247c10da7b8770d185080a7b047156" -react-dom@^15.0.2, react-dom@^15.5.4: - version "15.6.1" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.1.tgz#2cb0ed4191038e53c209eb3a79a23e2a4cf99470" +react-dom@^15.0.2, react-dom@^15.6.2: + version "15.6.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730" dependencies: fbjs "^0.8.9" loose-envify "^1.1.0" @@ -7368,21 +8714,29 @@ react-hyperscript@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/react-hyperscript/-/react-hyperscript-3.0.0.tgz#3c16010b33175de6bc01fd1ebad0a16a9a6dc9ab" -react-input-autosize@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.0.1.tgz#e92190497b4026c2780ad0f2fd703c835ba03e33" +react-input-autosize@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.1.2.tgz#a3dc11a5517c434db25229925541309de3f7a8f5" dependencies: - create-react-class "^15.5.2" prop-types "^15.5.8" -react-markdown@^2.3.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-2.5.0.tgz#b1c61904fee5895886803bd9df7db23c3dc3a89e" +react-markdown@^3.0.0: + version "3.1.3" + resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-3.1.3.tgz#5ac1f20cb5a3e8c47b6ae3c8522e813b08f58c34" dependencies: - commonmark "^0.24.0" - commonmark-react-renderer "^4.2.4" - in-publish "^2.0.0" - prop-types "^15.5.1" + prop-types "^15.6.0" + remark-parse "^4.0.0" + unified "^6.1.5" + unist-util-visit "^1.1.3" + xtend "^4.0.1" + +react-motion@^0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/react-motion/-/react-motion-0.5.2.tgz#0dd3a69e411316567927917c6626551ba0607316" + dependencies: + performance-now "^0.2.0" + prop-types "^15.5.8" + raf "^3.1.0" react-redux@^5.0.5: version "5.0.6" @@ -7395,41 +8749,55 @@ react-redux@^5.0.5: loose-envify "^1.1.0" prop-types "^15.5.10" -react-select@^1.0.0-rc.2: - version "1.0.0-rc.10" - resolved "https://registry.yarnpkg.com/react-select/-/react-select-1.0.0-rc.10.tgz#f137346250f9255c979fbfa21860899928772350" +react-select@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/react-select/-/react-select-1.1.0.tgz#626a2de839fdea2ade74dd1b143a9bde34be6c82" dependencies: classnames "^2.2.4" prop-types "^15.5.8" - react-input-autosize "^2.0.1" + react-input-autosize "^2.1.0" react-simple-file-input@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/react-simple-file-input/-/react-simple-file-input-2.0.0.tgz#3686982ee26f50b22a69468e22aeeb2f392826c9" + version "2.0.1" + resolved "https://registry.yarnpkg.com/react-simple-file-input/-/react-simple-file-input-2.0.1.tgz#15ad4ffc78feb1b882649ad6b01c033ef27571e6" dependencies: prop-types "^15.5.7" -react-test-renderer@^15.5.4: - version "15.6.1" - resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.6.1.tgz#026f4a5bb5552661fd2cc4bbcd0d4bc8a35ebf7e" +react-test-renderer@^15.6.2: + version "15.6.2" + resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.6.2.tgz#d0333434fc2c438092696ca770da5ed48037efa8" dependencies: fbjs "^0.8.9" object-assign "^4.1.0" react-testutils-additions@^15.2.0: - version "15.2.0" - resolved "https://registry.yarnpkg.com/react-testutils-additions/-/react-testutils-additions-15.2.0.tgz#7802a6f28dff9cfb673cbeaf32801cd6a054e6b7" + version "15.3.0" + resolved "https://registry.yarnpkg.com/react-testutils-additions/-/react-testutils-additions-15.3.0.tgz#0ee96a5998f54e2bda2cf0a3430a345df04b7f64" dependencies: object-assign "3.0.0" sizzle "2.3.3" +react-toggle-button@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/react-toggle-button/-/react-toggle-button-2.2.0.tgz#a1b92143aa0df414642fcb141f0879f545bc5a89" + dependencies: + prop-types "^15.6.0" + react-motion "^0.5.2" + +react-tools@~0.13.0: + version "0.13.3" + resolved "https://registry.yarnpkg.com/react-tools/-/react-tools-0.13.3.tgz#da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c" + dependencies: + commoner "^0.10.0" + jstransform "^10.1.0" + react-tooltip-component@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/react-tooltip-component/-/react-tooltip-component-0.3.0.tgz#fb3ec78c3270fe919692bc31f1404108bcf4785e" react-transition-group@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.0.tgz#b51fc921b0c3835a7ef7c571c79fc82c73e9204f" + version "1.2.1" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6" dependencies: chain-function "^1.0.0" dom-helpers "^3.2.0" @@ -7437,13 +8805,24 @@ react-transition-group@^1.2.0: prop-types "^15.5.6" warning "^3.0.0" +react-transition-group@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.2.1.tgz#e9fb677b79e6455fd391b03823afe84849df4a10" + dependencies: + chain-function "^1.0.0" + classnames "^2.2.5" + dom-helpers "^3.2.0" + loose-envify "^1.3.1" + prop-types "^15.5.8" + warning "^3.0.0" + react-trigger-change@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/react-trigger-change/-/react-trigger-change-1.0.2.tgz#af573398ecef2475362b84f8c08c07fea23914c3" -"react@>= 0.12.0 < 16.0.0", react@^15.0.2: - version "15.6.1" - resolved "https://registry.yarnpkg.com/react/-/react-15.6.1.tgz#baa8434ec6780bde997cdc380b79cd33b96393df" +"react@>= 0.12.0 < 16.0.0", react@^15.0.2, react@^15.6.2: + version "15.6.2" + resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72" dependencies: create-react-class "^15.6.0" fbjs "^0.8.9" @@ -7451,6 +8830,19 @@ react-trigger-change@^1.0.2: object-assign "^4.1.0" prop-types "^15.5.10" +reactify@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/reactify/-/reactify-1.1.1.tgz#a8f119596273c0d4bfb1abea0c14c2601ea03bba" + dependencies: + react-tools "~0.13.0" + through "~2.3.4" + +read-file-stdin@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/read-file-stdin/-/read-file-stdin-0.2.1.tgz#25eccff3a153b6809afacb23ee15387db9e0ee61" + dependencies: + gather-stream "^1.0.0" + read-only-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0" @@ -7464,12 +8856,12 @@ read-pkg-up@^1.0.1: find-up "^1.0.0" read-pkg "^1.0.0" -read-pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" +read-pkg-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" dependencies: find-up "^2.0.0" - read-pkg "^2.0.0" + read-pkg "^3.0.0" read-pkg@^1.0.0: version "1.1.0" @@ -7479,13 +8871,13 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -read-pkg@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" +read-pkg@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" dependencies: - load-json-file "^2.0.0" + load-json-file "^4.0.0" normalize-package-data "^2.3.2" - path-type "^2.0.0" + path-type "^3.0.0" read@1.0.x: version "1.0.7" @@ -7493,7 +8885,7 @@ read@1.0.x: dependencies: mute-stream "~0.0.4" -"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.15, readable-stream@~1.0.17, readable-stream@~1.0.2, readable-stream@~1.0.26, readable-stream@~1.0.27-1: +"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.15, readable-stream@~1.0.17, readable-stream@~1.0.2, readable-stream@~1.0.27-1: version "1.0.34" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" dependencies: @@ -7549,6 +8941,15 @@ readdirp@^2.0.0: readable-stream "^2.0.2" set-immediate-shim "^1.0.1" +recast@^0.11.17: + version "0.11.23" + resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3" + dependencies: + ast-types "0.9.6" + esprima "~3.1.0" + private "~0.1.5" + source-map "~0.5.0" + rechoir@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" @@ -7556,20 +8957,38 @@ rechoir@^0.6.2: resolve "^1.1.6" recompose@^0.25.0: - version "0.25.0" - resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.25.0.tgz#e2ec723692ff0fdab3d62bd22c1da69af1985acd" + version "0.25.1" + resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.25.1.tgz#5eb9d6cf6e25a9ffad73cbbae5658b5b55d6e728" dependencies: change-emitter "^0.1.2" fbjs "^0.8.1" - hoist-non-react-statics "^1.0.0" + hoist-non-react-statics "^2.3.1" symbol-observable "^1.0.4" +redent@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" + dependencies: + indent-string "^2.1.0" + strip-indent "^1.0.1" + +redent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa" + dependencies: + indent-string "^3.0.0" + strip-indent "^2.0.0" + redux-logger@^3.0.6: version "3.0.6" resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf" dependencies: deep-diff "^0.3.5" +redux-test-utils@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/redux-test-utils/-/redux-test-utils-0.1.3.tgz#0d89100f100f86c7c7214976eaece88e7e45bf74" + redux-thunk@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5" @@ -7592,8 +9011,8 @@ regenerator-runtime@^0.10.5: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" regenerator-runtime@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1" + version "0.11.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" regenerator-transform@^0.10.0: version "0.10.1" @@ -7609,6 +9028,12 @@ regex-cache@^0.4.2: dependencies: is-equal-shallow "^0.1.3" +regex-not@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.0.tgz#42f83e39771622df826b02af176525d6a5f157f9" + dependencies: + extend-shallow "^2.0.1" + regexpu-core@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" @@ -7627,7 +9052,69 @@ regjsparser@^0.1.4: dependencies: jsesc "~0.5.0" -remove-trailing-separator@^1.0.1: +remark-parse@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-4.0.0.tgz#99f1f049afac80382366e2e0d0bd55429dd45d8b" + dependencies: + collapse-white-space "^1.0.2" + is-alphabetical "^1.0.0" + is-decimal "^1.0.0" + is-whitespace-character "^1.0.0" + is-word-character "^1.0.0" + markdown-escapes "^1.0.0" + parse-entities "^1.0.2" + repeat-string "^1.5.4" + state-toggle "^1.0.0" + trim "0.0.1" + trim-trailing-lines "^1.0.0" + unherit "^1.0.4" + unist-util-remove-position "^1.0.0" + vfile-location "^2.0.0" + xtend "^4.0.1" + +remark-stringify@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-4.0.0.tgz#4431884c0418f112da44991b4e356cfe37facd87" + dependencies: + ccount "^1.0.0" + is-alphanumeric "^1.0.0" + is-decimal "^1.0.0" + is-whitespace-character "^1.0.0" + longest-streak "^2.0.1" + markdown-escapes "^1.0.0" + markdown-table "^1.1.0" + mdast-util-compact "^1.0.0" + parse-entities "^1.0.2" + repeat-string "^1.5.4" + state-toggle "^1.0.0" + stringify-entities "^1.0.1" + unherit "^1.0.4" + xtend "^4.0.1" + +remark@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/remark/-/remark-8.0.0.tgz#287b6df2fe1190e263c1d15e486d3fa835594d6d" + dependencies: + remark-parse "^4.0.0" + remark-stringify "^4.0.0" + unified "^6.0.0" + +remove-bom-buffer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53" + dependencies: + is-buffer "^1.1.5" + is-utf8 "^0.2.1" + +remove-bom-stream@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523" + dependencies: + remove-bom-buffer "^3.0.0" + safe-buffer "^5.1.0" + through2 "^2.0.3" + +remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -7639,7 +9126,7 @@ repeat-string@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae" -repeat-string@^1.5.2: +repeat-string@^1.5.2, repeat-string@^1.5.4, repeat-string@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" @@ -7659,6 +9146,18 @@ replace-ext@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" +replace-ext@1.0.0, replace-ext@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" + +replace-homedir@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/replace-homedir/-/replace-homedir-1.0.0.tgz#e87f6d513b928dde808260c12be7fec6ff6e798c" + dependencies: + homedir-polyfill "^1.0.1" + is-absolute "^1.0.0" + remove-trailing-separator "^1.1.0" + replaceall@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/replaceall/-/replaceall-0.1.6.tgz#81d81ac7aeb72d7f5c4942adf2697a3220688d8e" @@ -7678,12 +9177,12 @@ request-promise-core@1.1.1: lodash "^4.13.1" request-promise-native@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.4.tgz#86988ec8eee408e45579fce83bfd05b3adf9a155" + version "1.0.5" + resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5" dependencies: request-promise-core "1.1.1" stealthy-require "^1.1.0" - tough-cookie ">=2.3.0" + tough-cookie ">=2.3.3" request-promise@^4.2.1: version "4.2.2" @@ -7694,7 +9193,34 @@ request-promise@^4.2.1: stealthy-require "^1.1.0" tough-cookie ">=2.3.3" -request@^2.67.0, request@^2.79.0, request@^2.81.0: +request@2, request@^2.67.0, request@^2.79.0, request@^2.83.0: + version "2.83.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.6.0" + caseless "~0.12.0" + combined-stream "~1.0.5" + extend "~3.0.1" + forever-agent "~0.6.1" + form-data "~2.3.1" + har-validator "~5.0.3" + hawk "~6.0.2" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.17" + oauth-sign "~0.8.2" + performance-now "^2.1.0" + qs "~6.5.1" + safe-buffer "^5.1.1" + stringstream "~0.0.5" + tough-cookie "~2.3.3" + tunnel-agent "^0.6.0" + uuid "^3.1.0" + +request@2.81.0: version "2.81.0" resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" dependencies: @@ -7721,6 +9247,31 @@ request@^2.67.0, request@^2.79.0, request@^2.81.0: tunnel-agent "^0.6.0" uuid "^3.0.0" +request@~2.79.0: + version "2.79.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" + dependencies: + aws-sign2 "~0.6.0" + aws4 "^1.2.1" + caseless "~0.11.0" + combined-stream "~1.0.5" + extend "~3.0.0" + forever-agent "~0.6.1" + form-data "~2.1.1" + har-validator "~2.0.6" + hawk "~3.1.3" + http-signature "~1.1.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.7" + oauth-sign "~0.8.1" + qs "~6.3.0" + stringstream "~0.0.4" + tough-cookie "~2.3.0" + tunnel-agent "~0.4.1" + uuid "^3.0.0" + require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -7729,6 +9280,10 @@ require-from-string@^1.1.0: version "1.2.1" resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418" +require-from-string@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.1.tgz#c545233e9d7da6616e9d59adfb39fc9f588676ff" + require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" @@ -7751,6 +9306,13 @@ resolve-dir@^0.1.0: expand-tilde "^1.2.2" global-modules "^0.2.3" +resolve-dir@^1.0.0, resolve-dir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" + dependencies: + expand-tilde "^2.0.0" + global-modules "^1.0.0" + resolve-from@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" @@ -7759,19 +9321,45 @@ resolve-from@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57" -resolve-url@~0.2.1: +resolve-from@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + +resolve-options@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131" + dependencies: + value-or-function "^3.0.0" + +resolve-url@^0.2.1, resolve-url@~0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" -resolve@1.1.7, resolve@1.1.x, resolve@~1.1.6: +resolve@1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" +resolve@1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235" + dependencies: + path-parse "^1.0.5" + resolve@^0.6.1: version "0.6.3" resolved "https://registry.yarnpkg.com/resolve/-/resolve-0.6.3.tgz#dd957982e7e736debdf53b58a4dd91754575dd46" -resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@~1.4.0: +resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.4.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36" + dependencies: + path-parse "^1.0.5" + +resolve@~1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86" dependencies: @@ -7794,6 +9382,10 @@ resumer@~0.0.0: dependencies: through "~2.3.4" +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + revalidator@0.1.x: version "0.1.8" resolved "https://registry.yarnpkg.com/revalidator/-/revalidator-0.1.8.tgz#fece61bfa0c1b52a206bd6b18198184bdd523a3b" @@ -7804,7 +9396,7 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@2.x.x, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1: +rimraf@2, rimraf@2.x.x, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" dependencies: @@ -7821,12 +9413,23 @@ rlp@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/rlp/-/rlp-2.0.0.tgz#9db384ff4b89a8f61563d92395d8625b18f3afb0" +rst-selector-parser@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91" + dependencies: + lodash.flattendeep "^4.4.0" + nearley "^2.7.10" + run-async@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" dependencies: is-promise "^2.1.0" +rustbn.js@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/rustbn.js/-/rustbn.js-0.1.1.tgz#088b8c29d5f6d7d9f56ffb545f5d110e4a6801eb" + rx-lite-aggregates@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be" @@ -7841,9 +9444,9 @@ safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" -samsam@1.x, samsam@^1.1.3: - version "1.2.1" - resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.2.1.tgz#edd39093a3184370cb859243b2bdf255e7d8ea67" +samsam@1.x: + version "1.3.0" + resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50" sandwich-expando@^1.1.3: version "1.1.3" @@ -7855,6 +9458,15 @@ sandwich-expando@^1.1.3: react-dom "^15.0.2" react-hyperscript "^2.4.0" +sass-graph@^2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" + dependencies: + glob "^7.0.0" + lodash "^4.0.0" + scss-tokenizer "^0.2.3" + yargs "^7.0.0" + sax@^1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -7886,9 +9498,16 @@ scryptsy@^1.2.1: dependencies: pbkdf2 "^3.0.3" +scss-tokenizer@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" + dependencies: + js-base64 "^2.1.8" + source-map "^0.4.2" + secp256k1@^3.0.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-3.3.0.tgz#50ec9b201ba401403dd13ccbf21d31eeb3ff43cf" + version "3.4.0" + resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-3.4.0.tgz#1c905b256fa4ae5b9cc170e672dd59b4c5de46a4" dependencies: bindings "^1.2.1" bip66 "^1.1.3" @@ -7897,7 +9516,6 @@ secp256k1@^3.0.1: drbg.js "^1.0.1" elliptic "^6.2.3" nan "^2.2.1" - prebuild-install "^2.0.0" safe-buffer "^5.1.0" semaphore@>=1.0.1, semaphore@^1.0.3, semaphore@^1.0.5: @@ -7910,7 +9528,7 @@ semver-greatest-satisfied-range@^1.0.0: dependencies: sver-compat "^1.5.0" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@~5.4.1: +"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@~5.4.1: version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" @@ -7918,23 +9536,9 @@ semver@~4.3.3: version "4.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" -send@0.15.4: - version "0.15.4" - resolved "https://registry.yarnpkg.com/send/-/send-0.15.4.tgz#985faa3e284b0273c793364a35c6737bd93905b9" - dependencies: - debug "2.6.8" - depd "~1.1.1" - destroy "~1.0.4" - encodeurl "~1.0.1" - escape-html "~1.0.3" - etag "~1.8.0" - fresh "0.5.0" - http-errors "~1.6.2" - mime "1.3.4" - ms "2.0.0" - on-finished "~2.3.0" - range-parser "~1.2.0" - statuses "~1.3.1" +semver@~5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" send@0.16.1: version "0.16.1" @@ -7954,15 +9558,6 @@ send@0.16.1: range-parser "~1.2.0" statuses "~1.3.1" -serve-static@1.12.4: - version "1.12.4" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.4.tgz#9b6aa98eeb7253c4eedc4c1f6fdbca609901a961" - dependencies: - encodeurl "~1.0.1" - escape-html "~1.0.3" - parseurl "~1.3.1" - send "0.15.4" - serve-static@1.13.1: version "1.13.1" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719" @@ -7976,11 +9571,35 @@ set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" +set-getter@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.0.tgz#d769c182c9d5a51f409145f2fba82e5e86e80376" + dependencies: + to-object-path "^0.3.0" + set-immediate-shim@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" -setimmediate@^1.0.5: +set-value@^0.4.3: + version "0.4.3" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.1" + to-object-path "^0.3.0" + +set-value@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + +setimmediate@^1.0.4, setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" @@ -7993,10 +9612,11 @@ setprototypeof@1.1.0: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4: - version "2.4.8" - resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f" + version "2.4.9" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.9.tgz#98f64880474b74f4a38b8da9d3c0f2d104633e7d" dependencies: inherits "^2.0.1" + safe-buffer "^5.0.1" sha3@^1.1.0: version "1.2.0" @@ -8004,7 +9624,7 @@ sha3@^1.1.0: dependencies: nan "^2.0.5" -shallow-copy@~0.0.1: +shallow-copy@0.0.1, shallow-copy@~0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170" @@ -8038,32 +9658,25 @@ shellwords@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" +sigmund@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" + signal-exit@^3.0.0, signal-exit@^3.0.1, signal-exit@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" -simple-get@^1.4.2: - version "1.4.3" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-1.4.3.tgz#e9755eda407e96da40c5e5158c9ea37b33becbeb" - dependencies: - once "^1.3.1" - unzip-response "^1.0.0" - xtend "^4.0.0" - sinon@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/sinon/-/sinon-4.0.0.tgz#a54a5f0237aa1dd2215e5e81c89b42b50c4fdb6b" + version "4.1.3" + resolved "https://registry.yarnpkg.com/sinon/-/sinon-4.1.3.tgz#fc599eda47ed9f1a694ce774b94ab44260bd7ac5" dependencies: diff "^3.1.0" formatio "1.2.0" lodash.get "^4.4.2" - lolex "^2.1.2" - native-promise-only "^0.8.1" - nise "^1.1.0" - path-to-regexp "^1.7.0" - samsam "^1.1.3" - text-encoding "0.6.4" - type-detect "^4.0.0" + lolex "^2.2.0" + nise "^1.2.0" + supports-color "^4.4.0" + type-detect "^4.0.5" sizzle@2.3.3: version "2.3.3" @@ -8073,20 +9686,55 @@ slash@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" -slice-ansi@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35" +slice-ansi@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d" + dependencies: + is-fullwidth-code-point "^2.0.0" slide@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.1.tgz#e12b5487faded3e3dea0ac91e9400bf75b401370" + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^2.0.0" + sntp@1.x.x: version "1.0.9" resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" dependencies: hoek "2.x.x" +sntp@2.x.x: + version "2.1.0" + resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8" + dependencies: + hoek "4.x.x" + socket.io-adapter@0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b" @@ -8160,8 +9808,8 @@ socket.io@1.7.3: socket.io-parser "2.3.1" solc@^0.4.2: - version "0.4.16" - resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.16.tgz#809a5b1257c7c200e11a841b377eaec274698539" + version "0.4.19" + resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.19.tgz#1af1c4c292a0365a6977d4cbe3fbee7139b4b561" dependencies: fs-extra "^0.30.0" memorystream "^0.3.1" @@ -8169,6 +9817,10 @@ solc@^0.4.2: semver "^5.3.0" yargs "^4.7.1" +source-list-map@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" + source-map-resolve@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.3.1.tgz#610f6122a445b8dd51535a2a71b783dfc1248761" @@ -8178,19 +9830,39 @@ source-map-resolve@^0.3.0: source-map-url "~0.3.0" urix "~0.1.0" +source-map-resolve@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a" + dependencies: + atob "^2.0.0" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + source-map-support@^0.4.15: version "0.4.18" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" dependencies: source-map "^0.5.6" +source-map-url@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" + source-map-url@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9" -source-map@0.X, "source-map@>= 0.1.2", source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3, source-map@~0.5.6: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" +source-map@0.1.31: + version "0.1.31" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.31.tgz#9f704d0d69d9e138a81badf6ebb4fde33d151c61" + dependencies: + amdefine ">=0.0.4" + +source-map@0.X, "source-map@>= 0.1.2", source-map@^0.6.1, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" source-map@^0.1.38, source-map@~0.1.33: version "0.1.43" @@ -8198,17 +9870,15 @@ source-map@^0.1.38, source-map@~0.1.33: dependencies: amdefine ">=0.0.4" -source-map@^0.4.4: +source-map@^0.4.2, source-map@^0.4.4, source-map@~0.4.0, source-map@~0.4.2: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" dependencies: amdefine ">=0.0.4" -source-map@~0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d" - dependencies: - amdefine ">=0.0.4" +source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3, source-map@~0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" sparkles@^1.0.0: version "1.0.0" @@ -8218,16 +9888,16 @@ spawn-args@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/spawn-args/-/spawn-args-0.2.0.tgz#fb7d0bd1d70fd4316bd9e3dec389e65f9d6361bb" -spawn-wrap@^1.3.8: - version "1.3.8" - resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.3.8.tgz#fa2a79b990cbb0bb0018dca6748d88367b19ec31" +spawn-wrap@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.4.2.tgz#cff58e73a8224617b6561abdc32586ea0c82248c" dependencies: foreground-child "^1.5.6" mkdirp "^0.5.0" os-homedir "^1.0.1" - rimraf "^2.3.3" + rimraf "^2.6.2" signal-exit "^3.0.2" - which "^1.2.4" + which "^1.3.0" spdx-correct@~1.0.0: version "1.0.2" @@ -8243,6 +9913,22 @@ spdx-license-ids@^1.0.2: version "1.2.2" resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57" +specificity@^0.3.0, specificity@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.3.2.tgz#99e6511eceef0f8d9b57924937aac2cb13d13c42" + +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + dependencies: + extend-shallow "^3.0.0" + +split2@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/split2/-/split2-0.2.1.tgz#02ddac9adc03ec0bb78c1282ec079ca6e85ae900" + dependencies: + through2 "~0.6.1" + split@0.3, split@~0.3.0: version "0.3.3" resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" @@ -8267,20 +9953,27 @@ sshpk@^1.7.0: jsbn "~0.1.0" tweetnacl "~0.14.0" -stack-trace@0.0.9: - version "0.0.9" - resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.9.tgz#a8f6eaeca90674c333e7c43953f275b451510695" - -stack-trace@0.0.x: +stack-trace@0.0.10, stack-trace@0.0.x: version "0.0.10" resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" +state-toggle@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.0.tgz#d20f9a616bb4f0c3b98b91922d25b640aa2bc425" + static-eval@~0.2.0: version "0.2.4" resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-0.2.4.tgz#b7d34d838937b969f9641ca07d48f8ede263ea7b" dependencies: escodegen "~0.0.24" +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + static-module@^1.1.0: version "1.5.0" resolved "https://registry.yarnpkg.com/static-module/-/static-module-1.5.0.tgz#27da9883c41a8cd09236f842f0c1ebc6edf63d86" @@ -8297,15 +9990,29 @@ static-module@^1.1.0: static-eval "~0.2.0" through2 "~0.4.1" -statuses@1, "statuses@>= 1.3.1 < 2", statuses@~1.3.1: +statuses@1, "statuses@>= 1.3.1 < 2": + version "1.4.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" + +statuses@~1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" +stdin@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/stdin/-/stdin-0.0.1.tgz#d3041981aaec3dfdbc77a1b38d6372e38f5fb71e" + +stdout-stream@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b" + dependencies: + readable-stream "^2.0.1" + stealthy-require@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" -stream-browserify@^2.0.0: +stream-browserify@^2.0.0, stream-browserify@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" dependencies: @@ -8319,6 +10026,13 @@ stream-combiner2@^1.1.1: duplexer2 "~0.1.0" readable-stream "^2.0.2" +stream-combiner@^0.2.1: + version "0.2.2" + resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858" + dependencies: + duplexer "~0.1.1" + through "~2.3.4" + stream-combiner@~0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14" @@ -8326,8 +10040,8 @@ stream-combiner@~0.0.4: duplexer "~0.1.1" stream-each@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.0.tgz#1e95d47573f580d814dc0ff8cd0f66f1ce53c991" + version "1.2.2" + resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd" dependencies: end-of-stream "^1.1.0" stream-shift "^1.0.0" @@ -8336,7 +10050,7 @@ stream-exhaust@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d" -stream-http@^2.0.0: +stream-http@^2.0.0, stream-http@^2.7.2: version "2.7.2" resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad" dependencies: @@ -8382,17 +10096,13 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -string-width@^2.0.0, string-width@^2.1.0: +string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" dependencies: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string.prototype.repeat@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf" - string.prototype.trim@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea" @@ -8401,17 +10111,26 @@ string.prototype.trim@~1.1.2: es-abstract "^1.5.0" function-bind "^1.0.2" +string_decoder@^1.0.0, string_decoder@~1.0.0, string_decoder@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" + dependencies: + safe-buffer "~5.1.0" + string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" -string_decoder@~1.0.0, string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" +stringify-entities@^1.0.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-1.3.1.tgz#b150ec2d72ac4c1b5f324b51fb6b28c9cdff058c" dependencies: - safe-buffer "~5.1.0" + character-entities-html4 "^1.0.0" + character-entities-legacy "^1.0.0" + is-alphanumerical "^1.0.0" + is-hexadecimal "^1.0.0" -stringstream@~0.0.4: +stringstream@~0.0.4, stringstream@~0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" @@ -8433,13 +10152,6 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-bom-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee" - dependencies: - first-chunk-stream "^1.0.0" - strip-bom "^2.0.0" - strip-bom-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca" @@ -8471,21 +10183,187 @@ strip-hex-prefix@1.0.0: dependencies: is-hex-prefixed "1.0.0" +strip-indent@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" + dependencies: + get-stdin "^4.0.1" + +strip-indent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" + strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" +style-search@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902" + styled_string@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/styled_string/-/styled_string-0.0.1.tgz#d22782bd81295459bc4f1df18c4bad8e94dd124a" +stylefmt@^5.0.4: + version "5.3.2" + resolved "https://registry.yarnpkg.com/stylefmt/-/stylefmt-5.3.2.tgz#32013437aa54d8c5253cbc107ac914dfb5ee9eea" + dependencies: + chalk "^1.1.3" + css-color-list "0.0.1" + diff "^3.1.0" + editorconfig "^0.13.2" + globby "^6.1.0" + minimist "^1.2.0" + postcss "^5.2.5" + postcss-scss "^0.4.0" + postcss-sorting "^2.0.1" + postcss-value-parser "^3.3.0" + stdin "0.0.1" + stylelint "^7.5.0" + stylelint-order "0.4.x" + +stylehacks@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-2.3.2.tgz#64c83e0438a68c9edf449e8c552a7d9ab6009b0b" + dependencies: + browserslist "^1.1.3" + chalk "^1.1.1" + log-symbols "^1.0.2" + minimist "^1.2.0" + plur "^2.1.2" + postcss "^5.0.18" + postcss-reporter "^1.3.3" + postcss-selector-parser "^2.0.0" + read-file-stdin "^0.2.1" + text-table "^0.2.0" + write-file-stdout "0.0.2" + +stylelint-config-recommended@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-1.0.0.tgz#752c17fc68fa64cd5e7589e24f6e46e77e14a735" + +stylelint-config-standard@^17.0.0: + version "17.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-17.0.0.tgz#42103a090054ee2a3dde9ecaed55e5d4d9d059fc" + dependencies: + stylelint-config-recommended "^1.0.0" + +stylelint-order@0.4.x: + version "0.4.4" + resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-0.4.4.tgz#db7dfca0541b5062010c7e2e21e745791fc088ac" + dependencies: + lodash "^4.17.4" + postcss "^5.2.16" + stylelint "^7.9.0" + +stylelint@^7.5.0, stylelint@^7.9.0: + version "7.13.0" + resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.13.0.tgz#111f97b6da72e775c80800d6bb6f5f869997785d" + dependencies: + autoprefixer "^6.0.0" + balanced-match "^0.4.0" + chalk "^2.0.1" + colorguard "^1.2.0" + cosmiconfig "^2.1.1" + debug "^2.6.0" + doiuse "^2.4.1" + execall "^1.0.0" + file-entry-cache "^2.0.0" + get-stdin "^5.0.0" + globby "^6.0.0" + globjoin "^0.1.4" + html-tags "^2.0.0" + ignore "^3.2.0" + imurmurhash "^0.1.4" + known-css-properties "^0.2.0" + lodash "^4.17.4" + log-symbols "^1.0.2" + mathml-tag-names "^2.0.0" + meow "^3.3.0" + micromatch "^2.3.11" + normalize-selector "^0.2.0" + pify "^2.3.0" + postcss "^5.0.20" + postcss-less "^0.14.0" + postcss-media-query-parser "^0.2.0" + postcss-reporter "^3.0.0" + postcss-resolve-nested-selector "^0.1.1" + postcss-scss "^0.4.0" + postcss-selector-parser "^2.1.1" + postcss-value-parser "^3.1.1" + resolve-from "^3.0.0" + specificity "^0.3.0" + string-width "^2.0.0" + style-search "^0.1.0" + stylehacks "^2.3.2" + sugarss "^0.2.0" + svg-tags "^1.0.0" + table "^4.0.1" + +stylelint@^8.0.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-8.4.0.tgz#c2dbaeb17236917819f9206e1c0df5fddf6f83c3" + dependencies: + autoprefixer "^7.1.2" + balanced-match "^1.0.0" + chalk "^2.0.1" + cosmiconfig "^3.1.0" + debug "^3.0.0" + execall "^1.0.0" + file-entry-cache "^2.0.0" + get-stdin "^5.0.1" + globby "^7.0.0" + globjoin "^0.1.4" + html-tags "^2.0.0" + ignore "^3.3.3" + imurmurhash "^0.1.4" + known-css-properties "^0.5.0" + lodash "^4.17.4" + log-symbols "^2.0.0" + mathml-tag-names "^2.0.1" + meow "^4.0.0" + micromatch "^2.3.11" + normalize-selector "^0.2.0" + pify "^3.0.0" + postcss "^6.0.6" + postcss-html "^0.12.0" + postcss-less "^1.1.0" + postcss-media-query-parser "^0.2.3" + postcss-reporter "^5.0.0" + postcss-resolve-nested-selector "^0.1.1" + postcss-safe-parser "^3.0.1" + postcss-sass "^0.2.0" + postcss-scss "^1.0.2" + postcss-selector-parser "^3.1.0" + postcss-value-parser "^3.3.0" + resolve-from "^4.0.0" + specificity "^0.3.1" + string-width "^2.1.0" + style-search "^0.1.0" + sugarss "^1.0.0" + svg-tags "^1.0.0" + table "^4.0.1" + subarg@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2" dependencies: minimist "^1.1.0" -supports-color@4.4.0, supports-color@^4.0.0: +sugarss@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-0.2.0.tgz#ac34237563327c6ff897b64742bf6aec190ad39e" + dependencies: + postcss "^5.2.4" + +sugarss@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.1.tgz#be826d9003e0f247735f92365dc3fd7f1bae9e44" + dependencies: + postcss "^6.0.14" + +supports-color@4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e" dependencies: @@ -8499,12 +10377,18 @@ supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" -supports-color@^3.1.0, supports-color@^3.1.2: +supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" dependencies: has-flag "^1.0.0" +supports-color@^4.0.0, supports-color@^4.4.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" + dependencies: + has-flag "^2.0.0" + sver-compat@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/sver-compat/-/sver-compat-1.5.0.tgz#3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8" @@ -8512,23 +10396,36 @@ sver-compat@^1.5.0: es6-iterator "^2.0.1" es6-symbol "^3.1.1" +svg-tags@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" + sw-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/sw-stream/-/sw-stream-2.0.0.tgz#628ebbeeb9eee0b66b03ec52fc55fcc4eeb23cf3" + version "2.0.2" + resolved "https://registry.yarnpkg.com/sw-stream/-/sw-stream-2.0.2.tgz#68cd1ce959f3fe79b76f583f98c9172543880a0f" dependencies: + babel-preset-es2015 "^6.22.0" + babel-runtime "^6.23.0" + babelify "^7.3.0" end-of-stream "^1.1.0" pump "^1.0.2" readable-stream "^2.2.2" through2 "^2.0.3" symbol-observable@^1.0.3, symbol-observable@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d" + version "1.1.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.1.0.tgz#5c68fd8d54115d9dfb72a84720549222e8db9b32" symbol-tree@^3.2.1: version "3.2.2" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6" +synesthesia@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/synesthesia/-/synesthesia-1.0.1.tgz#5ef95ea548c0d5c6e6f9bb4b0d0731dff864a777" + dependencies: + css-color-names "0.0.3" + syntax-error@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.3.0.tgz#1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1" @@ -8536,15 +10433,15 @@ syntax-error@^1.1.1: acorn "^4.0.3" table@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/table/-/table-4.0.1.tgz#a8116c133fac2c61f4a420ab6cdf5c4d61f0e435" + version "4.0.2" + resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36" dependencies: - ajv "^4.7.0" - ajv-keywords "^1.0.0" - chalk "^1.1.1" - lodash "^4.0.0" - slice-ansi "0.0.4" - string-width "^2.0.0" + ajv "^5.2.3" + ajv-keywords "^2.1.0" + chalk "^2.1.0" + lodash "^4.17.4" + slice-ansi "1.0.0" + string-width "^2.1.1" tap-parser@^5.1.0: version "5.4.0" @@ -8555,7 +10452,11 @@ tap-parser@^5.1.0: optionalDependencies: readable-stream "^2" -tape@^4.4.0, tape@^4.5.1, tape@^4.6.0, tape@^4.6.2, tape@^4.6.3: +tapable@^0.2.7, tapable@~0.2.5: + version "0.2.8" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22" + +tape@^4.4.0, tape@^4.5.1, tape@^4.6.0, tape@^4.6.2, tape@^4.6.3, tape@^4.8.0: version "4.8.0" resolved "https://registry.yarnpkg.com/tape/-/tape-4.8.0.tgz#f6a9fec41cc50a1de50fa33603ab580991f6068e" dependencies: @@ -8573,18 +10474,9 @@ tape@^4.4.0, tape@^4.5.1, tape@^4.6.0, tape@^4.6.2, tape@^4.6.3: string.prototype.trim "~1.1.2" through "~2.3.8" -tar-fs@^1.13.0: - version "1.15.3" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.15.3.tgz#eccf935e941493d8151028e636e51ce4c3ca7f20" - dependencies: - chownr "^1.0.1" - mkdirp "^0.5.1" - pump "^1.0.0" - tar-stream "^1.1.2" - tar-pack@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984" + version "3.4.1" + resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" dependencies: debug "^2.2.0" fstream "^1.0.10" @@ -8595,16 +10487,7 @@ tar-pack@^3.4.0: tar "^2.2.1" uid-number "^0.0.6" -tar-stream@^1.1.2: - version "1.5.4" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.4.tgz#36549cf04ed1aee9b2a30c0143252238daf94016" - dependencies: - bl "^1.0.0" - end-of-stream "^1.0.0" - readable-stream "^2.0.0" - xtend "^4.0.0" - -tar@^2.2.1: +tar@^2.0.0, tar@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" dependencies: @@ -8662,7 +10545,7 @@ testem@^1.10.3: tap-parser "^5.1.0" xmldom "^0.1.19" -text-encoding@0.6.4, text-encoding@^0.6.4: +text-encoding@^0.6.4: version "0.6.4" resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19" @@ -8704,7 +10587,7 @@ through2@2.X, through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0 readable-stream "^2.1.5" xtend "~4.0.1" -through2@^0.6.0, through2@^0.6.1, through2@^0.6.5: +through2@^0.6.1, through2@^0.6.3, through2@^0.6.5, through2@~0.6.1: version "0.6.5" resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" dependencies: @@ -8740,12 +10623,6 @@ through@~2.2.0: version "2.2.7" resolved "https://registry.yarnpkg.com/through/-/through-2.2.7.tgz#6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd" -tildify@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a" - dependencies: - os-homedir "^1.0.0" - time-stamp@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3" @@ -8756,6 +10633,12 @@ timers-browserify@^1.0.1: dependencies: process "~0.11.0" +timers-browserify@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.4.tgz#96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6" + dependencies: + setimmediate "^1.0.4" + timers-ext@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.2.tgz#61cc47a76c1abd3195f14527f978d58ae94c5204" @@ -8763,23 +10646,24 @@ timers-ext@^0.1.2: es5-ext "~0.10.14" next-tick "1" -tmp@0.0.31, tmp@^0.0.31: +tmp@0.0.31: version "0.0.31" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7" dependencies: os-tmpdir "~1.0.1" -tmp@0.0.x: +tmp@0.0.x, tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" dependencies: os-tmpdir "~1.0.2" -to-absolute-glob@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f" +to-absolute-glob@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b" dependencies: - extend-shallow "^2.0.1" + is-absolute "^1.0.0" + is-negated-glob "^1.0.0" to-array@0.1.4: version "0.1.4" @@ -8797,21 +10681,38 @@ to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" -to-utf8@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/to-utf8/-/to-utf8-0.0.1.tgz#d17aea72ff2fba39b9e43601be7b3ff72e089852" +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.1.tgz#15358bee4a2c83bd76377ba1dc049d0f18837aae" + dependencies: + define-property "^0.2.5" + extend-shallow "^2.0.1" + regex-not "^1.0.0" + +to-through@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6" + dependencies: + through2 "^2.0.3" toggle-selection@^1.0.3: version "1.0.6" resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32" -tough-cookie@>=2.3.0, tough-cookie@^2.3.2, tough-cookie@~2.3.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a" - dependencies: - punycode "^1.4.1" - -tough-cookie@>=2.3.3: +tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561" dependencies: @@ -8823,22 +10724,44 @@ tr46@^1.0.0: dependencies: punycode "^2.1.0" -tracejs@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/tracejs/-/tracejs-0.1.8.tgz#6c26787b1853f1371634622c1c80bc44026c5d70" - traverse@~0.6.3: version "0.6.6" resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137" +treeify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.0.1.tgz#69b3cd022022a168424e7cfa1ced44c939d3eb2f" + +trim-newlines@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" + +trim-newlines@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20" + trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" +trim-trailing-lines@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz#7aefbb7808df9d669f6da2e438cac8c46ada7684" + trim@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" +trough@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.1.tgz#a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86" + +"true-case-path@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62" + dependencies: + glob "^6.0.4" + trumpet@^1.7.1: version "1.7.2" resolved "https://registry.yarnpkg.com/trumpet/-/trumpet-1.7.2.tgz#b02c69e465d171f55e44924bf9b5bdd20974c830" @@ -8850,11 +10773,7 @@ trumpet@^1.7.1: readable-stream "^1.0.27-1" through2 "^1.0.0" -tryit@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb" - -tty-browserify@~0.0.0: +tty-browserify@0.0.0, tty-browserify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" @@ -8864,6 +10783,10 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" +tunnel-agent@~0.4.1: + version "0.4.3" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" + tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" @@ -8882,9 +10805,9 @@ type-detect@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2" -type-detect@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.3.tgz#0e3f2670b44099b0b46c284d136a7ef49c74c2ea" +type-detect@^4.0.0, type-detect@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.5.tgz#d70e5bc81db6de2a381bcaca0c6e0cbdc7635de2" type-is@~1.6.10, type-is@~1.6.15: version "1.6.15" @@ -8898,17 +10821,17 @@ typedarray@^0.0.6, typedarray@~0.0.5: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" ua-parser-js@^0.7.9: - version "0.7.14" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.14.tgz#110d53fa4c3f326c121292bbeac904d2e03387ca" + version "0.7.17" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac" uglify-es@^3.0.15: - version "3.1.1" - resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.1.1.tgz#27615a1203cd0b351d8b5bda743ac92ed482b826" + version "3.3.3" + resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.3.tgz#095f5314d2a5d27e215390e50fa90751473dac2f" dependencies: - commander "~2.11.0" - source-map "~0.5.1" + commander "~2.12.1" + source-map "~0.6.1" -uglify-js@^2.6: +uglify-js@^2.6, uglify-js@^2.8.27: version "2.8.29" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" dependencies: @@ -8922,8 +10845,8 @@ uglify-to-browserify@~1.0.0: resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" uglifyify@^4.0.2: - version "4.0.3" - resolved "https://registry.yarnpkg.com/uglifyify/-/uglifyify-4.0.3.tgz#ff16ce11033faa54f782a050e0a77a55e7416724" + version "4.0.5" + resolved "https://registry.yarnpkg.com/uglifyify/-/uglifyify-4.0.5.tgz#49c1fca9828c10a5a8e8d70f191a95f7ab475911" dependencies: convert-source-map "~1.1.0" extend "^1.2.1" @@ -8943,17 +10866,21 @@ umd@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.1.tgz#8ae556e11011f63c2596708a8837259f01b3d60e" -unc-path-regex@^0.1.0: +unc-path-regex@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" -underscore@>=1.8.3, underscore@^1.6.0: +underscore@>=1.8.3: version "1.8.3" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" +underscore@~1.4.4: + version "1.4.4" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604" + undertaker-registry@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.0.tgz#2da716c765999d8c94b9f9ed2c006df4923b052b" + version "1.0.1" + resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50" undertaker@^1.0.0: version "1.2.0" @@ -8969,7 +10896,35 @@ undertaker@^1.0.0: object.reduce "^1.0.0" undertaker-registry "^1.0.0" -uniq@^1.0.0: +unherit@^1.0.4: + version "1.1.0" + resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.0.tgz#6b9aaedfbf73df1756ad9e316dd981885840cd7d" + dependencies: + inherits "^2.0.1" + xtend "^4.0.1" + +unified@^6.0.0, unified@^6.1.5: + version "6.1.6" + resolved "https://registry.yarnpkg.com/unified/-/unified-6.1.6.tgz#5ea7f807a0898f1f8acdeefe5f25faa010cc42b1" + dependencies: + bail "^1.0.0" + extend "^3.0.0" + is-plain-obj "^1.1.0" + trough "^1.0.0" + vfile "^2.0.0" + x-is-function "^1.0.4" + x-is-string "^0.1.0" + +union-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^0.4.3" + +uniq@^1.0.0, uniq@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" @@ -8980,6 +10935,38 @@ unique-stream@^2.0.2: json-stable-stringify "^1.0.0" through2-filter "^2.0.0" +unist-util-find-all-after@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-1.0.1.tgz#4e5512abfef7e0616781aecf7b1ed751c00af908" + dependencies: + unist-util-is "^2.0.0" + +unist-util-is@^2.0.0, unist-util-is@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.1.tgz#0c312629e3f960c66e931e812d3d80e77010947b" + +unist-util-modify-children@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unist-util-modify-children/-/unist-util-modify-children-1.1.1.tgz#66d7e6a449e6f67220b976ab3cb8b5ebac39e51d" + dependencies: + array-iterate "^1.0.0" + +unist-util-remove-position@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz#5a85c1555fc1ba0c101b86707d15e50fa4c871bb" + dependencies: + unist-util-visit "^1.1.0" + +unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.1.tgz#3ccbdc53679eed6ecf3777dd7f5e3229c1b6aa3c" + +unist-util-visit@^1.1.0, unist-util-visit@^1.1.3: + version "1.3.0" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.3.0.tgz#41ca7c82981fd1ce6c762aac397fc24e35711444" + dependencies: + unist-util-is "^2.1.1" + unorm@^1.3.3: version "1.4.1" resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.4.1.tgz#364200d5f13646ca8bcd44490271335614792300" @@ -8988,24 +10975,31 @@ unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" -unzip-response@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe" +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" urix@^0.1.0, urix@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" -url@~0.11.0: +url@^0.11.0, url@~0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" dependencies: punycode "1.3.2" querystring "0.2.0" -user-home@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" +use@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/use/-/use-2.0.2.tgz#ae28a0d72f93bf22422a18a2e379993112dec8e8" + dependencies: + define-property "^0.2.5" + isobject "^3.0.0" + lazy-cache "^2.0.2" useragent@^2.1.12: version "2.2.1" @@ -9022,7 +11016,7 @@ util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" -util@0.10.3, util@~0.10.1: +util@0.10.3, util@^0.10.3, util@~0.10.1: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" dependencies: @@ -9039,10 +11033,6 @@ utile@0.3.x: ncp "1.0.x" rimraf "2.x.x" -utils-merge@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8" - utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" @@ -9051,19 +11041,15 @@ uuid@^2.0.1: version "2.0.3" resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" -uuid@^3.0.0, uuid@^3.0.1: +uuid@^3.0.0, uuid@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" -v8flags@^2.0.9: - version "2.1.1" - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" +v8flags@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.0.1.tgz#dce8fc379c17d9f2c9e9ed78d89ce00052b1b76b" dependencies: - user-home "^1.1.1" - -vali-date@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6" + homedir-polyfill "^1.0.1" valid-url@^1.0.9: version "1.0.9" @@ -9076,14 +11062,14 @@ validate-npm-package-license@^3.0.1: spdx-correct "~1.0.0" spdx-expression-parse "~1.0.0" +value-or-function@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813" + varint@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/varint/-/varint-4.0.1.tgz#490829b942d248463b2b35097995c3bf737198e9" -vary@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37" - vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" @@ -9096,12 +11082,31 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vinyl-buffer@^1.0.0: +vfile-location@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.2.tgz#d3675c59c877498e492b4756ff65e4af1a752255" + +vfile-message@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/vinyl-buffer/-/vinyl-buffer-1.0.0.tgz#ca067ea08431d507722b1de5083f602616ebc234" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.0.0.tgz#a6adb0474ea400fa25d929f1d673abea6a17e359" dependencies: - bl "^0.9.1" - through2 "^0.6.1" + unist-util-stringify-position "^1.1.1" + +vfile@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz#e62d8e72b20e83c324bc6c67278ee272488bf84a" + dependencies: + is-buffer "^1.1.4" + replace-ext "1.0.0" + unist-util-stringify-position "^1.0.0" + vfile-message "^1.0.0" + +vinyl-buffer@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/vinyl-buffer/-/vinyl-buffer-1.0.1.tgz#96c1a3479b8c5392542c612029013b5b27f88bbf" + dependencies: + bl "^1.2.1" + through2 "^2.0.3" vinyl-file@^2.0.0: version "2.0.0" @@ -9114,42 +11119,52 @@ vinyl-file@^2.0.0: strip-bom-stream "^2.0.0" vinyl "^1.1.0" -vinyl-fs@^2.0.0: - version "2.4.4" - resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-2.4.4.tgz#be6ff3270cb55dfd7d3063640de81f25d7532239" +vinyl-fs@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.1.tgz#74af5f6836a1cf414d35eeb3c10f2e65fc2a2c10" dependencies: - duplexify "^3.2.0" - glob-stream "^5.3.2" + flush-write-stream "^1.0.0" + fs-mkdirp-stream "^1.0.0" + glob-stream "^6.1.0" graceful-fs "^4.0.0" - gulp-sourcemaps "1.6.0" - is-valid-glob "^0.3.0" + is-valid-glob "^1.0.0" lazystream "^1.0.0" - lodash.isequal "^4.0.0" - merge-stream "^1.0.0" - mkdirp "^0.5.0" - object-assign "^4.0.0" - readable-stream "^2.0.4" - strip-bom "^2.0.0" - strip-bom-stream "^1.0.0" + lead "^1.0.0" + object.assign "^4.0.4" + pumpify "^1.3.5" + remove-bom-buffer "^3.0.0" + remove-bom-stream "^1.2.0" + resolve-options "^1.1.0" through2 "^2.0.0" - through2-filter "^2.0.0" - vali-date "^1.0.0" - vinyl "^1.0.0" + to-through "^2.0.0" + value-or-function "^3.0.0" + vinyl "^2.0.0" + vinyl-sourcemap "^1.1.0" vinyl-source-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/vinyl-source-stream/-/vinyl-source-stream-1.1.0.tgz#44cbe5108205279deb0c5653c094a2887938b1ab" + version "1.1.2" + resolved "https://registry.yarnpkg.com/vinyl-source-stream/-/vinyl-source-stream-1.1.2.tgz#62b53a135610a896e98ca96bee3a87f008a8e780" dependencies: - through2 "^0.6.1" + through2 "^2.0.3" vinyl "^0.4.3" -vinyl@1.X, vinyl@^1.0.0, vinyl@^1.1.0, vinyl@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884" +vinyl-sourcemap@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16" dependencies: - clone "^1.0.0" - clone-stats "^0.0.1" - replace-ext "0.0.1" + append-buffer "^1.0.2" + convert-source-map "^1.5.0" + graceful-fs "^4.1.6" + normalize-path "^2.1.1" + now-and-later "^2.0.0" + remove-bom-buffer "^3.0.0" + vinyl "^2.0.0" + +vinyl-sourcemaps-apply@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705" + dependencies: + source-map "^0.5.1" vinyl@^0.4.3: version "0.4.6" @@ -9166,7 +11181,26 @@ vinyl@^0.5.0: clone-stats "^0.0.1" replace-ext "0.0.1" -vm-browserify@~0.0.1: +vinyl@^1.1.0, vinyl@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884" + dependencies: + clone "^1.0.0" + clone-stats "^0.0.1" + replace-ext "0.0.1" + +vinyl@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.1.0.tgz#021f9c2cf951d6b939943c89eb5ee5add4fd924c" + dependencies: + clone "^2.1.1" + clone-buffer "^1.0.0" + clone-stats "^1.0.0" + cloneable-readable "^1.0.0" + remove-trailing-separator "^1.0.1" + replace-ext "^1.0.0" + +vm-browserify@0.0.4, vm-browserify@~0.0.1: version "0.0.4" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" dependencies: @@ -9180,6 +11214,13 @@ vreme@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/vreme/-/vreme-3.0.2.tgz#4721376b449457fefde8a849d3340933b90b5686" +walk-sync@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.3.1.tgz#558a16aeac8c0db59c028b73c66f397684ece465" + dependencies: + ensure-posix-path "^1.0.0" + matcher-collection "^1.0.0" + warning@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" @@ -9198,6 +11239,14 @@ watchify@^3.9.0: through2 "^2.0.0" xtend "^4.0.0" +watchpack@^1.3.1: + version "1.4.0" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac" + dependencies: + async "^2.1.2" + chokidar "^1.7.0" + graceful-fs "^4.1.2" + weak@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/weak/-/weak-1.0.1.tgz#ab99aab30706959aa0200cb8cf545bb9cb33b99e" @@ -9205,9 +11254,9 @@ weak@^1.0.0: bindings "^1.2.1" nan "^2.0.5" -web3-provider-engine@^13.3.2: - version "13.3.2" - resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-13.3.2.tgz#a5954aa637f96f0dde5131bc20a6ce9e33e6fcd1" +web3-provider-engine@^13.3.2, web3-provider-engine@^13.4.0: + version "13.4.0" + resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-13.4.0.tgz#78c2794ba926d0c5b94c6e8955abb994bb8e8854" dependencies: async "^2.5.0" clone "^2.0.0" @@ -9235,9 +11284,19 @@ web3-stream-provider@^3.0.1: dependencies: readable-stream "^2.0.5" +web3@^0.18.4: + version "0.18.4" + resolved "https://registry.yarnpkg.com/web3/-/web3-0.18.4.tgz#81ec1784145491f2eaa8955b31c06049e07c5e7d" + dependencies: + bignumber.js "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2" + crypto-js "^3.1.4" + utf8 "^2.1.1" + xhr2 "*" + xmlhttprequest "*" + web3@^0.20.1: - version "0.20.2" - resolved "https://registry.yarnpkg.com/web3/-/web3-0.20.2.tgz#c54dac5fc0e377399c04c1a6ecbb12e4513278d6" + version "0.20.3" + resolved "https://registry.yarnpkg.com/web3/-/web3-0.20.3.tgz#caa44373dc8815ac8767bddb6ba73073964caa8b" dependencies: bignumber.js "git+https://github.com/frozeman/bignumber.js-nolookahead.git" crypto-js "^3.1.4" @@ -9245,10 +11304,43 @@ web3@^0.20.1: xhr2 "*" xmlhttprequest "*" -webidl-conversions@^4.0.0, webidl-conversions@^4.0.1: +webidl-conversions@^4.0.1, webidl-conversions@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" +webpack-sources@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54" + dependencies: + source-list-map "^2.0.0" + source-map "~0.6.1" + +webpack@^2.2.1: + version "2.7.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.7.0.tgz#b2a1226804373ffd3d03ea9c6bd525067034f6b1" + dependencies: + acorn "^5.0.0" + acorn-dynamic-import "^2.0.0" + ajv "^4.7.0" + ajv-keywords "^1.1.1" + async "^2.1.2" + enhanced-resolve "^3.3.0" + interpret "^1.0.0" + json-loader "^0.5.4" + json5 "^0.5.1" + loader-runner "^2.3.0" + loader-utils "^0.2.16" + memory-fs "~0.4.1" + mkdirp "~0.5.0" + node-libs-browser "^2.0.0" + source-map "^0.5.3" + supports-color "^3.1.0" + tapable "~0.2.5" + uglify-js "^2.8.27" + watchpack "^1.3.1" + webpack-sources "^1.0.1" + yargs "^6.0.0" + websocket-driver@>=0.3.6: version "0.7.0" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb" @@ -9257,22 +11349,22 @@ websocket-driver@>=0.3.6: websocket-extensions ">=0.1.1" websocket-extensions@>=0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.2.tgz#0e18781de629a18308ce1481650f67ffa2693a5d" + version "0.1.3" + resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" whatwg-encoding@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz#3c6c451a198ee7aec55b1ec61d0920c67801a5f4" + version "1.0.3" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3" dependencies: - iconv-lite "0.4.13" + iconv-lite "0.4.19" whatwg-fetch@>=0.10.0: version "2.0.3" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84" -whatwg-url@^6.1.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.2.1.tgz#db8fb96d7f02661af266e3cefc18425923900a00" +whatwg-url@^6.3.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.4.0.tgz#08fdf2b9e872783a7a1f6216260a1d66cc722e08" dependencies: lodash.sortby "^4.7.0" tr46 "^1.0.0" @@ -9286,7 +11378,7 @@ which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" -which@^1.0.5, which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.4, which@^1.2.9: +which@1, which@^1.0.5, which@^1.2.1, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" dependencies: @@ -9330,14 +11422,14 @@ wordwrap@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" -wordwrap@^1.0.0, wordwrap@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" +wordwrap@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + wrap-ansi@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" @@ -9349,13 +11441,6 @@ wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" -wreck@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/wreck/-/wreck-6.3.0.tgz#a1369769f07bbb62d6a378336a7871fc773c740b" - dependencies: - boom "2.x.x" - hoek "2.x.x" - write-file-atomic@^1.1.4: version "1.3.4" resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f" @@ -9364,6 +11449,10 @@ write-file-atomic@^1.1.4: imurmurhash "^0.1.4" slide "^1.1.5" +write-file-stdout@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/write-file-stdout/-/write-file-stdout-0.0.2.tgz#c252d7c7c5b1b402897630e3453c7bfe690d9ca1" + write@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757" @@ -9388,6 +11477,14 @@ wtf-8@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a" +x-is-function@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/x-is-function/-/x-is-function-1.0.4.tgz#5d294dc3d268cbdd062580e0c5df77a391d1fa1e" + +x-is-string@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82" + xhr2@*: version "0.1.4" resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f" @@ -9397,8 +11494,8 @@ xhr2@0.1.3: resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.3.tgz#cbfc4759a69b4a888e78cf4f20b051038757bd11" xhr@^2.2.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.4.0.tgz#e16e66a45f869861eeefab416d5eff722dc40993" + version "2.4.1" + resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.4.1.tgz#ba982cced205ae5eec387169ac9dc77ca4853d38" dependencies: global "~4.3.0" is-function "^1.0.1" @@ -9421,11 +11518,7 @@ xmlhttprequest@*: version "1.8.0" resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" -xss-filters@^1.2.6: - version "1.2.7" - resolved "https://registry.yarnpkg.com/xss-filters/-/xss-filters-1.2.7.tgz#59fa1de201f36f2f3470dcac5f58ccc2830b0a9a" - -xtend@4.0.1, "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: +"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" @@ -9466,13 +11559,34 @@ yargs-parser@^5.0.0: dependencies: camelcase "^3.0.0" -yargs-parser@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9" +yargs-parser@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950" dependencies: camelcase "^4.1.0" -yargs@^3.28.0: +yargs@^1.2.6: + version "1.3.3" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.3.3.tgz#054de8b61f22eefdb7207059eaef9d6b83fb931a" + +yargs@^10.0.3: + version "10.0.3" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.0.3.tgz#6542debd9080ad517ec5048fb454efe9e4d4aaae" + dependencies: + cliui "^3.2.0" + decamelize "^1.1.1" + find-up "^2.1.0" + get-caller-file "^1.0.1" + os-locale "^2.0.0" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^2.0.0" + which-module "^2.0.0" + y18n "^3.2.1" + yargs-parser "^8.0.0" + +yargs@^3.5.4: version "3.32.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" dependencies: @@ -9503,7 +11617,7 @@ yargs@^4.7.1: y18n "^3.2.1" yargs-parser "^2.4.1" -yargs@^6.5.0: +yargs@^6.0.0, yargs@^6.5.0: version "6.6.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" dependencies: @@ -9521,23 +11635,23 @@ yargs@^6.5.0: y18n "^3.2.1" yargs-parser "^4.2.0" -yargs@^8.0.1: - version "8.0.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360" +yargs@^7.0.0, yargs@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" dependencies: - camelcase "^4.1.0" + camelcase "^3.0.0" cliui "^3.2.0" decamelize "^1.1.1" get-caller-file "^1.0.1" - os-locale "^2.0.0" - read-pkg-up "^2.0.0" + os-locale "^1.4.0" + read-pkg-up "^1.0.1" require-directory "^2.1.1" require-main-filename "^1.0.1" set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" + string-width "^1.0.2" + which-module "^1.0.0" y18n "^3.2.1" - yargs-parser "^7.0.0" + yargs-parser "^5.0.0" yargs@~1.2.6: version "1.2.6" @@ -9555,8 +11669,8 @@ yargs@~3.10.0: window-size "0.1.0" yazl@^2.1.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.4.2.tgz#14cb19083e1e25a70092c1588aabe0f4e4dd4d88" + version "2.4.3" + resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.4.3.tgz#ec26e5cc87d5601b9df8432dbdd3cd2e5173a071" dependencies: buffer-crc32 "~0.2.3" |