From cc0cea38635d27d52032e06c2a519fa058743288 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Tue, 19 Feb 2019 11:26:37 +0100
Subject: [PATCH 001/100] chore(storybook): some more stories + AddNoticeLink
 refacto

---
 .../AddNoticeLink/AddIcon.js}                 |  0
 .../{ => AddNoticeLink}/AddNoticeLink.js      | 15 ++++++++--
 .../AddNoticeLink/AddNoticeLink.stories.jsx   | 24 +++++++++++++++
 .../atoms/Buttons/AddNoticeLink/index.js      |  3 ++
 src/components/atoms/icons/index.js           |  1 -
 src/components/molecules/AddNotice.js         |  9 ++----
 .../screens/Account/About.stories.jsx         | 29 +++++++++++++++++++
 7 files changed, 71 insertions(+), 10 deletions(-)
 rename src/components/atoms/{icons/Add.js => Buttons/AddNoticeLink/AddIcon.js} (100%)
 rename src/components/atoms/Buttons/{ => AddNoticeLink}/AddNoticeLink.js (67%)
 create mode 100644 src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.jsx
 create mode 100644 src/components/atoms/Buttons/AddNoticeLink/index.js
 create mode 100644 src/components/screens/Account/About.stories.jsx

diff --git a/src/components/atoms/icons/Add.js b/src/components/atoms/Buttons/AddNoticeLink/AddIcon.js
similarity index 100%
rename from src/components/atoms/icons/Add.js
rename to src/components/atoms/Buttons/AddNoticeLink/AddIcon.js
diff --git a/src/components/atoms/Buttons/AddNoticeLink.js b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.js
similarity index 67%
rename from src/components/atoms/Buttons/AddNoticeLink.js
rename to src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.js
index 124dc62b0..5dae90b0c 100644
--- a/src/components/atoms/Buttons/AddNoticeLink.js
+++ b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.js
@@ -1,7 +1,9 @@
+import React from 'react';
 import styled from 'styled-components';
-import BorderButton from './BorderButton';
+import BorderButton from '../BorderButton';
+import AddIcon from './AddIcon';
 
-export default styled(BorderButton)`
+const Button = styled(BorderButton)`
     display: flex;
     align-items: center;
     margin-top: 25px;
@@ -23,4 +25,11 @@ export default styled(BorderButton)`
         fill: #fff;
       }
     }
-`;
\ No newline at end of file
+`;
+
+export default () => (
+  <Button>
+    <AddIcon />
+    Créer votre notification
+  </Button>
+);
diff --git a/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.jsx b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.jsx
new file mode 100644
index 000000000..55460e2ae
--- /dev/null
+++ b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.jsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { ThemeProvider, createGlobalStyle } from 'styled-components';
+import theme from '../../../../app/theme';
+import AddNoticeLink from './AddNoticeLink';
+import 'typeface-lato';
+import 'typeface-sedgwick-ave';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+storiesOf('atoms/Buttons/AddNoticeLink', module)
+  .addDecorator(getStory => (
+    <div>
+      <Global />
+      <ThemeProvider theme={theme}>
+        {getStory()}
+      </ThemeProvider>
+    </div>
+  ))
+  .add('normal', () => <AddNoticeLink />);
diff --git a/src/components/atoms/Buttons/AddNoticeLink/index.js b/src/components/atoms/Buttons/AddNoticeLink/index.js
new file mode 100644
index 000000000..bcff5cbd0
--- /dev/null
+++ b/src/components/atoms/Buttons/AddNoticeLink/index.js
@@ -0,0 +1,3 @@
+import AddNoticeLink from './AddNoticeLink';
+
+export default AddNoticeLink;
diff --git a/src/components/atoms/icons/index.js b/src/components/atoms/icons/index.js
index c732a9d89..6d3568c40 100644
--- a/src/components/atoms/icons/index.js
+++ b/src/components/atoms/icons/index.js
@@ -2,6 +2,5 @@ export { default as Arrow } from './Arrow';
 export { default as Bubble } from './Bubble';
 export { default as Close } from './Close';
 export { default as Delete } from './Delete';
-export { default as Add } from './Add';
 export { default as Anchor } from './Anchor';
 export { default as Logo } from './Logo';
diff --git a/src/components/molecules/AddNotice.js b/src/components/molecules/AddNotice.js
index 13579f06d..2ab2ced0b 100644
--- a/src/components/molecules/AddNotice.js
+++ b/src/components/molecules/AddNotice.js
@@ -1,14 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { AddNoticeLink, CenterContainer, } from '../atoms';
-import { Add } from '../atoms/icons';
+
 
 const AddNotice = ({ onClick, ...props }) => (
   <CenterContainer>
-    <AddNoticeLink onClick={onClick} {...props}>
-      <Add />
-      Créer votre notification
-    </AddNoticeLink>
+    <AddNoticeLink onClick={onClick} />
   </CenterContainer>
 );
 
@@ -20,4 +17,4 @@ AddNotice.defaultProps = {
   onClick: () => { },
 };
 
-export default AddNotice;
\ No newline at end of file
+export default AddNotice;
diff --git a/src/components/screens/Account/About.stories.jsx b/src/components/screens/Account/About.stories.jsx
new file mode 100644
index 000000000..e0aab9584
--- /dev/null
+++ b/src/components/screens/Account/About.stories.jsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import { ThemeProvider, createGlobalStyle } from 'styled-components';
+import theme from '../../../app/theme';
+import { NotificationContainer } from '../../atoms';
+import About from './About';
+import 'typeface-lato';
+import 'typeface-sedgwick-ave';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+storiesOf('screens/NewAbout', module)
+  .addDecorator(getStory => (
+    <Router>
+      <ThemeProvider theme={theme}>
+        <NotificationContainer>
+          <Global />
+          {getStory()}
+        </NotificationContainer>
+      </ThemeProvider>
+    </Router>
+  ))
+  .add('normal', () => <About extensionVersion="1.2.3" close={action('close')} installationDate="01/01/2042" />);

From c86fed365d1da8ad48234cef45e8bac3884ce0a7 Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Tue, 19 Feb 2019 11:46:13 +0100
Subject: [PATCH 002/100] feat: added new button story

---
 .../{ => BorderButton}/BorderButton.js        |  2 +-
 .../BorderButton/BorderButton.stories.jsx     | 25 +++++++++++++++++++
 .../atoms/Buttons/BorderButton/index.js       |  3 +++
 3 files changed, 29 insertions(+), 1 deletion(-)
 rename src/components/atoms/Buttons/{ => BorderButton}/BorderButton.js (91%)
 create mode 100644 src/components/atoms/Buttons/BorderButton/BorderButton.stories.jsx
 create mode 100644 src/components/atoms/Buttons/BorderButton/index.js

diff --git a/src/components/atoms/Buttons/BorderButton.js b/src/components/atoms/Buttons/BorderButton/BorderButton.js
similarity index 91%
rename from src/components/atoms/Buttons/BorderButton.js
rename to src/components/atoms/Buttons/BorderButton/BorderButton.js
index 074ad0f15..8b5f41956 100644
--- a/src/components/atoms/Buttons/BorderButton.js
+++ b/src/components/atoms/Buttons/BorderButton/BorderButton.js
@@ -1,5 +1,5 @@
 import styled from 'styled-components';
-import Button from '../Button';
+import Button from '../../Button';
 
 export default styled(Button)`
    height: 28px;
diff --git a/src/components/atoms/Buttons/BorderButton/BorderButton.stories.jsx b/src/components/atoms/Buttons/BorderButton/BorderButton.stories.jsx
new file mode 100644
index 000000000..f9c6d63d1
--- /dev/null
+++ b/src/components/atoms/Buttons/BorderButton/BorderButton.stories.jsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { ThemeProvider, createGlobalStyle } from 'styled-components';
+import theme from '../../../../app/theme';
+import BorderButton from './BorderButton';
+import 'typeface-lato';
+import 'typeface-sedgwick-ave';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+storiesOf('atoms/Buttons/BorderButton', module)
+  .addDecorator(getStory => (
+    <div>
+      <Global />
+      <ThemeProvider theme={theme}>
+        {getStory()}
+      </ThemeProvider>
+    </div>
+  ))
+  .add('normal', () => <BorderButton>Ajouter</BorderButton>);
+ 
\ No newline at end of file
diff --git a/src/components/atoms/Buttons/BorderButton/index.js b/src/components/atoms/Buttons/BorderButton/index.js
new file mode 100644
index 000000000..77731726c
--- /dev/null
+++ b/src/components/atoms/Buttons/BorderButton/index.js
@@ -0,0 +1,3 @@
+import BorderButton from './BorderButton';
+
+export default BorderButton;

From 354c8c408ead3eef5166d867dc20874b2886749d Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Tue, 19 Feb 2019 12:40:48 +0100
Subject: [PATCH 003/100] added NotificationFooter story and refacto

---
 src/components/atoms/Notification/index.js    |  1 -
 src/components/atoms/icons/nav/index.js       |  4 --
 src/components/atoms/index.js                 |  4 +-
 .../molecules/NotificationFooter.js           | 24 ------------
 .../NotificationFooter/AccountIcon.js}        |  0
 .../NotificationFooter/BubbleIcon.js}         |  0
 .../NotificationFooter/CheckListIcon.js}      |  0
 .../NotificationFooter}/FooterContainer.js    |  1 +
 .../NotificationFooter/HelpIcon.js}           |  0
 .../NotificationFooter}/NavLink.js            |  0
 .../NotificationFooter/NotificationFooter.js  | 26 +++++++++++++
 .../NotificationFooter.stories.jsx            | 39 +++++++++++++++++++
 .../molecules/NotificationFooter/index.js     |  3 ++
 13 files changed, 71 insertions(+), 31 deletions(-)
 delete mode 100644 src/components/atoms/icons/nav/index.js
 delete mode 100644 src/components/molecules/NotificationFooter.js
 rename src/components/{atoms/icons/nav/Account.js => molecules/NotificationFooter/AccountIcon.js} (100%)
 rename src/components/{atoms/icons/nav/Bubble.js => molecules/NotificationFooter/BubbleIcon.js} (100%)
 rename src/components/{atoms/icons/nav/CheckList.js => molecules/NotificationFooter/CheckListIcon.js} (100%)
 rename src/components/{atoms/Notification => molecules/NotificationFooter}/FooterContainer.js (92%)
 rename src/components/{atoms/icons/nav/Help.js => molecules/NotificationFooter/HelpIcon.js} (100%)
 rename src/components/{atoms => molecules/NotificationFooter}/NavLink.js (100%)
 create mode 100644 src/components/molecules/NotificationFooter/NotificationFooter.js
 create mode 100644 src/components/molecules/NotificationFooter/NotificationFooter.stories.jsx
 create mode 100644 src/components/molecules/NotificationFooter/index.js

diff --git a/src/components/atoms/Notification/index.js b/src/components/atoms/Notification/index.js
index 0ec49d4ad..9f93089c7 100644
--- a/src/components/atoms/Notification/index.js
+++ b/src/components/atoms/Notification/index.js
@@ -1,6 +1,5 @@
 export { default as Container } from './Container';
 export { default as ContentTitle } from './ContentTitle';
-export { default as FooterContainer } from './FooterContainer';
 export { default as HeaderContainer } from './HeaderContainer';
 export { default as Main } from './Main';
 export { default as NoNoticeTitle } from './NoNoticeTitle';
diff --git a/src/components/atoms/icons/nav/index.js b/src/components/atoms/icons/nav/index.js
deleted file mode 100644
index bd9e52e46..000000000
--- a/src/components/atoms/icons/nav/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as Account } from './Account';
-export { default as Bubble } from './Bubble';
-export { default as CheckList } from './CheckList';
-export { default as Help } from './Help';
\ No newline at end of file
diff --git a/src/components/atoms/index.js b/src/components/atoms/index.js
index 3b4711d37..a28ba4289 100644
--- a/src/components/atoms/index.js
+++ b/src/components/atoms/index.js
@@ -17,7 +17,7 @@ export { default as OpenButton } from './OpenButton';
 export { default as MenuButton } from './Buttons/MenuButton';
 export { default as NotificationContainer } from './Notification/Container';
 export { default as NotificationContentTitle } from './Notification/ContentTitle';
-export { default as NotificationFooterContainer } from './Notification/FooterContainer';
+export { default as NotificationFooterContainer } from '../molecules/NotificationFooter/FooterContainer';
 export { default as NotificationHeaderContainer } from './Notification/HeaderContainer';
 export { default as NotificationMain } from './Notification/Main';
 export { default as Feedbacks } from './Feedbacks';
@@ -29,7 +29,7 @@ export { default as SourceURLContainer } from './SourceURLContainer';
 export { default as Time } from './Time';
 export { default as Title } from './Title';
 export { default as Truncated } from './Truncated';
-export { default as NavLink } from './NavLink';
+export { default as NavLink } from '../molecules/NotificationFooter/NavLink';
 export { default as NoNoticeImg } from './Notice/NoNoticeImg';
 export { default as CenterContainer } from './CenterContainer';
 export { default as Date } from './Date';
diff --git a/src/components/molecules/NotificationFooter.js b/src/components/molecules/NotificationFooter.js
deleted file mode 100644
index 1611a27ee..000000000
--- a/src/components/molecules/NotificationFooter.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import { NavLink, NotificationFooterContainer } from '../atoms';
-import {
-  Account, Bubble, CheckList, Help 
-} from '../atoms/icons/nav';
-
-const NotificationFooter = () => (
-  <NotificationFooterContainer>
-    <NavLink to="/notices">
-      <Bubble />
-    </NavLink>
-    <NavLink to="/subscriptions">
-      <CheckList />
-    </NavLink>
-    <NavLink to="/help">
-      <Help />
-    </NavLink>
-    <NavLink to="/account">
-      <Account />
-    </NavLink>
-  </NotificationFooterContainer>
-);
-
-export default NotificationFooter;
diff --git a/src/components/atoms/icons/nav/Account.js b/src/components/molecules/NotificationFooter/AccountIcon.js
similarity index 100%
rename from src/components/atoms/icons/nav/Account.js
rename to src/components/molecules/NotificationFooter/AccountIcon.js
diff --git a/src/components/atoms/icons/nav/Bubble.js b/src/components/molecules/NotificationFooter/BubbleIcon.js
similarity index 100%
rename from src/components/atoms/icons/nav/Bubble.js
rename to src/components/molecules/NotificationFooter/BubbleIcon.js
diff --git a/src/components/atoms/icons/nav/CheckList.js b/src/components/molecules/NotificationFooter/CheckListIcon.js
similarity index 100%
rename from src/components/atoms/icons/nav/CheckList.js
rename to src/components/molecules/NotificationFooter/CheckListIcon.js
diff --git a/src/components/atoms/Notification/FooterContainer.js b/src/components/molecules/NotificationFooter/FooterContainer.js
similarity index 92%
rename from src/components/atoms/Notification/FooterContainer.js
rename to src/components/molecules/NotificationFooter/FooterContainer.js
index 982592ba0..efff6e064 100644
--- a/src/components/atoms/Notification/FooterContainer.js
+++ b/src/components/molecules/NotificationFooter/FooterContainer.js
@@ -10,5 +10,6 @@ export default styled.nav`
     padding-bottom: 5px;
     padding-left: 38px;
     margin-top: auto;
+    background-color: #fff;
     border-top: 1px solid ${props => props.theme.bottomBar};
 `;
\ No newline at end of file
diff --git a/src/components/atoms/icons/nav/Help.js b/src/components/molecules/NotificationFooter/HelpIcon.js
similarity index 100%
rename from src/components/atoms/icons/nav/Help.js
rename to src/components/molecules/NotificationFooter/HelpIcon.js
diff --git a/src/components/atoms/NavLink.js b/src/components/molecules/NotificationFooter/NavLink.js
similarity index 100%
rename from src/components/atoms/NavLink.js
rename to src/components/molecules/NotificationFooter/NavLink.js
diff --git a/src/components/molecules/NotificationFooter/NotificationFooter.js b/src/components/molecules/NotificationFooter/NotificationFooter.js
new file mode 100644
index 000000000..10ae85a48
--- /dev/null
+++ b/src/components/molecules/NotificationFooter/NotificationFooter.js
@@ -0,0 +1,26 @@
+import React from 'react';
+import FooterContainer from './FooterContainer';
+import NavLink from './NavLink';
+import AccountIcon from './AccountIcon';
+import BubbleIcon from './BubbleIcon';
+import CheckListIcon from './CheckListIcon';
+import HelpIcon from './HelpIcon';
+
+const NotificationFooter = () => (
+  <FooterContainer>
+    <NavLink to="/notices">
+      <BubbleIcon />
+    </NavLink>
+    <NavLink to="/subscriptions">
+      <CheckListIcon />
+    </NavLink>
+    <NavLink to="/help">
+      <HelpIcon />
+    </NavLink>
+    <NavLink to="/account">
+      <AccountIcon />
+    </NavLink>
+  </FooterContainer>
+);
+
+export default NotificationFooter;
diff --git a/src/components/molecules/NotificationFooter/NotificationFooter.stories.jsx b/src/components/molecules/NotificationFooter/NotificationFooter.stories.jsx
new file mode 100644
index 000000000..43ee5037a
--- /dev/null
+++ b/src/components/molecules/NotificationFooter/NotificationFooter.stories.jsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import { StaticRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
+import NotificationFooter from './NotificationFooter';
+import theme from '../../../app/theme';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+const Wrapper = styled.div`
+  width: 384px;
+  height: 414px;
+`;
+
+storiesOf('molecules/NotificationFooter', module)
+  .addDecorator(getStory => (
+    <div>
+      <Global />
+      <ThemeProvider theme={theme}>
+        <Wrapper>
+          {getStory()}
+        </Wrapper>
+      </ThemeProvider>
+    </div>
+  ))
+  .add('On nothing', () => (
+    <Router><NotificationFooter /></Router>
+  ))
+  .add('On notice', () => (
+    <Router location="/notices"><NotificationFooter /></Router>
+  ))
+  .add('On subscriptions', () => (
+    <Router location="/subscriptions"><NotificationFooter /></Router>
+  ));
diff --git a/src/components/molecules/NotificationFooter/index.js b/src/components/molecules/NotificationFooter/index.js
new file mode 100644
index 000000000..ef3405306
--- /dev/null
+++ b/src/components/molecules/NotificationFooter/index.js
@@ -0,0 +1,3 @@
+import NotificationFooter from './NotificationFooter';
+
+export default NotificationFooter;
\ No newline at end of file

From 971b1d533b898aef68d51813107a3609b72dae0f Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Tue, 19 Feb 2019 12:41:47 +0100
Subject: [PATCH 004/100] added storybook addon Knobs

---
 .storybook/addons.js |   3 +-
 package.json         |   1 +
 yarn.lock            | 419 ++++++++++---------------------------------
 3 files changed, 98 insertions(+), 325 deletions(-)

diff --git a/.storybook/addons.js b/.storybook/addons.js
index 17bb3281b..218bf7a5e 100644
--- a/.storybook/addons.js
+++ b/.storybook/addons.js
@@ -1 +1,2 @@
-import '@storybook/addon-actions/register'
+import '@storybook/addon-actions/register';
+import '@storybook/addon-knobs/register';
diff --git a/package.json b/package.json
index 42c10ce8e..d51b37eaa 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
     "@semantic-release/git": "^7.0.1",
     "@semantic-release/github": "^5.0.1",
     "@storybook/addon-actions": "^4.1.11",
+    "@storybook/addon-knobs": "^4.1.12",
     "@storybook/addons": "^4.1.11",
     "@storybook/react": "^4.1.11",
     "babel-eslint": "^10.0.1",
diff --git a/yarn.lock b/yarn.lock
index 6af1375a4..66076ac65 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -27,7 +27,6 @@
 "@babel/core@7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.0.tgz#08958f1371179f62df6966d8a614003d11faeb04"
-  integrity sha512-9EWmD0cQAbcXSc+31RIoYgEHx3KQ2CCSMDBhnXrShWvo45TMw+3/55KVxlhkG53kw9tl87DqINgHDgFVhZJV/Q==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/generator" "^7.0.0"
@@ -66,7 +65,6 @@
 "@babel/core@^7.1.6":
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.2.2.tgz#07adba6dde27bb5ad8d8672f15fde3e08184a687"
-  integrity sha512-59vB0RWt09cAct5EIe58+NzGP4TFSD3Bz//2/ELy3ZeTeKF6VTD1AXlH8BGGbCX0PuobZBsIzO7IAI9PH67eKw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/generator" "^7.2.2"
@@ -86,7 +84,6 @@
 "@babel/generator@^7.0.0", "@babel/generator@^7.2.2":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.2.tgz#fff31a7b2f2f3dad23ef8e01be45b0d5c2fc0132"
-  integrity sha512-f3QCuPppXxtZOEm5GWPra/uYUjmNQlu9pbAD8D/9jze4pTY83rTtB1igTBSwvkeNlC5gR24zFFkz+2WHLFQhqQ==
   dependencies:
     "@babel/types" "^7.3.2"
     jsesc "^2.5.1"
@@ -135,7 +132,6 @@
 "@babel/helper-create-class-features-plugin@^7.3.0":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.3.2.tgz#ba1685603eb1c9f2f51c9106d5180135c163fe73"
-  integrity sha512-tdW8+V8ceh2US4GsYdNVNoohq5uVwOf9k6krjwW4E1lINcHgttnWcNqgdoessn12dAy8QkbezlbQh2nXISNY+A==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-member-expression-to-functions" "^7.0.0"
@@ -239,7 +235,6 @@
 "@babel/helper-replace-supers@^7.2.3":
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.2.3.tgz#19970020cf22677d62b3a689561dbd9644d8c5e5"
-  integrity sha512-GyieIznGUfPXPWu0yLS6U55Mz67AZD9cUk0BfirOWlPrXlBcan9Gz+vHGz+cPfuoweZSnPzPIm67VtQM0OWZbA==
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.0.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
@@ -271,7 +266,6 @@
 "@babel/helpers@^7.1.0", "@babel/helpers@^7.2.0":
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.3.1.tgz#949eec9ea4b45d3210feb7dc1c22db664c9e44b9"
-  integrity sha512-Q82R3jKsVpUV99mgX50gOPCWwco9Ec5Iln/8Vyu4osNIOQgSrd9RFrQeUvmvddFNoLwMyOUWU+5ckioEKpDoGA==
   dependencies:
     "@babel/template" "^7.1.2"
     "@babel/traverse" "^7.1.5"
@@ -312,7 +306,6 @@
 "@babel/parser@^7.1.0", "@babel/parser@^7.2.2", "@babel/parser@^7.2.3":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.2.tgz#95cdeddfc3992a6ca2a1315191c1679ca32c55cd"
-  integrity sha512-QzNUC2RO1gadg+fs21fi0Uu0OuGNzRKEmgCxoLNzbCdoprLwjfmZwzUrpUNfJPaVRwBpDY47A17yYEGWyRelnQ==
 
 "@babel/plugin-proposal-async-generator-functions@^7.1.0":
   version "7.1.0"
@@ -325,7 +318,6 @@
 "@babel/plugin-proposal-async-generator-functions@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e"
-  integrity sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-remap-async-to-generator" "^7.1.0"
@@ -345,7 +337,6 @@
 "@babel/plugin-proposal-class-properties@^7.2.0":
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.0.tgz#272636bc0fa19a0bc46e601ec78136a173ea36cd"
-  integrity sha512-wNHxLkEKTQ2ay0tnsam2z7fGZUi+05ziDJflEt3AZTP3oXLKHJp9HqhfroB/vdMvt3sda9fAbq7FsG8QPDrZBg==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.3.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -369,7 +360,6 @@
 "@babel/plugin-proposal-json-strings@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
-  integrity sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
@@ -384,7 +374,6 @@
 "@babel/plugin-proposal-object-rest-spread@^7.3.1":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.2.tgz#6d1859882d4d778578e41f82cc5d7bf3d5daf6c1"
-  integrity sha512-DjeMS+J2+lpANkYLLO+m6GjoTMygYglKmRe6cDTbFv3L9i6mmiE8fe6B8MtCSLZpVXscD5kn7s6SgtHrDoBWoA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
@@ -399,7 +388,6 @@
 "@babel/plugin-proposal-optional-catch-binding@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5"
-  integrity sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
@@ -415,7 +403,6 @@
 "@babel/plugin-proposal-unicode-property-regex@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz#abe7281fe46c95ddc143a65e5358647792039520"
-  integrity sha512-LvRVYb7kikuOtIoUeWTkOxQEV1kYvL5B6U3iWEGCzPNRus1MzJweFqORTj+0jkxozkTSYNJozPOddxmqdqsRpw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
@@ -430,7 +417,6 @@
 "@babel/plugin-syntax-async-generators@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"
-  integrity sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -455,7 +441,6 @@
 "@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz#a765f061f803bc48f240c26f8747faf97c26bf7c"
-  integrity sha512-r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -468,7 +453,6 @@
 "@babel/plugin-syntax-json-strings@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
-  integrity sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -487,7 +471,6 @@
 "@babel/plugin-syntax-object-rest-spread@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
-  integrity sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -500,14 +483,12 @@
 "@babel/plugin-syntax-optional-catch-binding@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c"
-  integrity sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-syntax-typescript@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.2.0.tgz#55d240536bd314dcbbec70fd949c5cabaed1de29"
-  integrity sha512-WhKr6yu6yGpGcNMVgIBuI9MkredpVc7Y3YR4UzEZmDztHoL6wV56YBHLhWnjO1EvId1B32HrD3DRFc+zSoKI1g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -520,7 +501,6 @@
 "@babel/plugin-transform-arrow-functions@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550"
-  integrity sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -535,7 +515,6 @@
 "@babel/plugin-transform-async-to-generator@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.2.0.tgz#68b8a438663e88519e65b776f8938f3445b1a2ff"
-  integrity sha512-CEHzg4g5UraReozI9D4fblBYABs7IM6UerAVG7EJVrTLC5keh00aEuLUT+O40+mJCEzaXkYfTCUKIyeDfMOFFQ==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -550,7 +529,6 @@
 "@babel/plugin-transform-block-scoped-functions@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"
-  integrity sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -564,7 +542,6 @@
 "@babel/plugin-transform-block-scoping@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.2.0.tgz#f17c49d91eedbcdf5dd50597d16f5f2f770132d4"
-  integrity sha512-vDTgf19ZEV6mx35yiPJe4fS02mPQUUcBNwWQSZFXSzTSbsJFQvHt7DqyS3LK8oOWALFOsJ+8bbqBgkirZteD5Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.10"
@@ -585,7 +562,6 @@
 "@babel/plugin-transform-classes@^7.2.0":
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.2.2.tgz#6c90542f210ee975aa2aa8c8b5af7fa73a126953"
-  integrity sha512-gEZvgTy1VtcDOaQty1l10T3jQmJKlNVxLDCs+3rCVPr6nMkODLELxViq5X9l+rfxbie3XrfrMCYYY6eX3aOcOQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-define-map" "^7.1.0"
@@ -605,14 +581,12 @@
 "@babel/plugin-transform-computed-properties@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da"
-  integrity sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-destructuring@7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0.tgz#68e911e1935dda2f06b6ccbbf184ffb024e9d43a"
-  integrity sha512-Fr2GtF8YJSXGTyFPakPFB4ODaEKGU04bPsAllAIabwoXdFrPxL0LVXQX5dQWoxOjjgozarJcC9eWGsj0fD6Zsg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -625,7 +599,6 @@
 "@babel/plugin-transform-destructuring@^7.2.0":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.3.2.tgz#f2f5520be055ba1c38c41c0e094d8a461dd78f2d"
-  integrity sha512-Lrj/u53Ufqxl/sGxyjsJ2XNtNuEjDyjpqdhMNh5aZ+XFOdThL46KBj27Uem4ggoezSYBxKWAil6Hu8HtwqesYw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -640,7 +613,6 @@
 "@babel/plugin-transform-dotall-regex@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz#f0aabb93d120a8ac61e925ea0ba440812dbe0e49"
-  integrity sha512-sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
@@ -655,7 +627,6 @@
 "@babel/plugin-transform-duplicate-keys@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz#d952c4930f312a4dbfff18f0b2914e60c35530b3"
-  integrity sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -669,7 +640,6 @@
 "@babel/plugin-transform-exponentiation-operator@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008"
-  integrity sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==
   dependencies:
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -677,7 +647,6 @@
 "@babel/plugin-transform-flow-strip-types@7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.0.0.tgz#c40ced34c2783985d90d9f9ac77a13e6fb396a01"
-  integrity sha512-WhXUNb4It5a19RsgKKbQPrjmy4yWOY1KynpEbNw7bnd1QTcrT/EIl3MJvnGgpgvrKyKbqX7nUNOJfkpLOnoDKA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-flow" "^7.0.0"
@@ -685,7 +654,6 @@
 "@babel/plugin-transform-flow-strip-types@^7.0.0":
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.2.3.tgz#e3ac2a594948454e7431c7db33e1d02d51b5cd69"
-  integrity sha512-xnt7UIk9GYZRitqCnsVMjQK1O2eKZwFB3CvvHjf5SGx6K6vr/MScCKQDnf1DxRaj501e3pXjti+inbSXX2ZUoQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-flow" "^7.2.0"
@@ -699,7 +667,6 @@
 "@babel/plugin-transform-for-of@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.2.0.tgz#ab7468befa80f764bb03d3cb5eef8cc998e1cad9"
-  integrity sha512-Kz7Mt0SsV2tQk6jG5bBv5phVbkd0gd27SgYD4hH1aLMJRchM0dzHaXvrWhVZ+WxAlDoAKZ7Uy3jVTW2mKXQ1WQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -713,7 +680,6 @@
 "@babel/plugin-transform-function-name@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz#f7930362829ff99a3174c39f0afcc024ef59731a"
-  integrity sha512-kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -727,7 +693,6 @@
 "@babel/plugin-transform-literals@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1"
-  integrity sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -741,7 +706,6 @@
 "@babel/plugin-transform-modules-amd@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz#82a9bce45b95441f617a24011dc89d12da7f4ee6"
-  integrity sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==
   dependencies:
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -757,7 +721,6 @@
 "@babel/plugin-transform-modules-commonjs@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz#c4f1933f5991d5145e9cfad1dfd848ea1727f404"
-  integrity sha512-V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ==
   dependencies:
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -773,7 +736,6 @@
 "@babel/plugin-transform-modules-systemjs@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.2.0.tgz#912bfe9e5ff982924c81d0937c92d24994bb9068"
-  integrity sha512-aYJwpAhoK9a+1+O625WIjvMY11wkB/ok0WClVwmeo3mCjcNRjt+/8gHWrB5i+00mUju0gWsBkQnPpdvQ7PImmQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -788,7 +750,6 @@
 "@babel/plugin-transform-modules-umd@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae"
-  integrity sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==
   dependencies:
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -796,7 +757,6 @@
 "@babel/plugin-transform-named-capturing-groups-regex@^7.3.0":
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.3.0.tgz#140b52985b2d6ef0cb092ef3b29502b990f9cd50"
-  integrity sha512-NxIoNVhk9ZxS+9lSoAQ/LM0V2UEvARLttEHUrRDGKFaAxOYQcrkN/nLRE+BbbicCAvZPl7wMP0X60HsHE5DtQw==
   dependencies:
     regexp-tree "^0.1.0"
 
@@ -816,7 +776,6 @@
 "@babel/plugin-transform-object-super@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz#b35d4c10f56bab5d650047dad0f1d8e8814b6598"
-  integrity sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-replace-supers" "^7.1.0"
@@ -832,7 +791,6 @@
 "@babel/plugin-transform-parameters@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.2.0.tgz#0d5ad15dc805e2ea866df4dd6682bfe76d1408c2"
-  integrity sha512-kB9+hhUidIgUoBQ0MsxMewhzr8i60nMa2KgeJKQWYrqQpqcBYtnpR+JgkadZVZoaEZ/eKu9mclFaVwhRpLNSzA==
   dependencies:
     "@babel/helper-call-delegate" "^7.1.0"
     "@babel/helper-get-function-arity" "^7.0.0"
@@ -848,7 +806,6 @@
 "@babel/plugin-transform-react-constant-elements@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.2.0.tgz#ed602dc2d8bff2f0cb1a5ce29263dbdec40779f7"
-  integrity sha512-YYQFg6giRFMsZPKUM9v+VcHOdfSQdz9jHCx3akAi3UYgyjndmdYGSXylQ/V+HswQt4fL8IklchD9HTsaOCrWQQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -905,7 +862,6 @@
 "@babel/plugin-transform-shorthand-properties@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0"
-  integrity sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -918,7 +874,6 @@
 "@babel/plugin-transform-spread@^7.2.0":
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406"
-  integrity sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -932,7 +887,6 @@
 "@babel/plugin-transform-sticky-regex@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1"
-  integrity sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
@@ -947,7 +901,6 @@
 "@babel/plugin-transform-template-literals@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz#d87ed01b8eaac7a92473f608c97c089de2ba1e5b"
-  integrity sha512-FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -961,14 +914,12 @@
 "@babel/plugin-transform-typeof-symbol@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2"
-  integrity sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-typescript@^7.1.0":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.3.2.tgz#59a7227163e55738842f043d9e5bd7c040447d96"
-  integrity sha512-Pvco0x0ZSCnexJnshMfaibQ5hnK8aUHSvjCQhC1JR8eeg+iBwt0AtCO7gWxJ358zZevuf9wPSO5rv+WJcbHPXQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-typescript" "^7.2.0"
@@ -984,7 +935,6 @@
 "@babel/plugin-transform-unicode-regex@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz#4eb8db16f972f8abb5062c161b8b115546ade08b"
-  integrity sha512-m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
@@ -1053,7 +1003,6 @@
 "@babel/preset-env@^7.1.6", "@babel/preset-env@^7.2.0":
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.3.1.tgz#389e8ca6b17ae67aaf9a2111665030be923515db"
-  integrity sha512-FHKrD6Dxf30e8xgHQO0zJZpUPfVZg+Xwgz5/RdSWCbza9QLNk4Qbp40ctRoqDxml3O8RMzB1DU55SXeDG6PqHQ==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -1102,7 +1051,6 @@
 "@babel/preset-flow@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz#afd764835d9535ec63d8c7d4caf1c06457263da2"
-  integrity sha512-bJOHrYOPqJZCkPVbG1Lot2r5OSsB+iUOaxiHdlOeB1yPWS6evswVHwvkDLZ54WTaTRIk89ds0iHmGZSnxlPejQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-transform-flow-strip-types" "^7.0.0"
@@ -1120,7 +1068,6 @@
 "@babel/preset-typescript@7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.1.0.tgz#49ad6e2084ff0bfb5f1f7fb3b5e76c434d442c7f"
-  integrity sha512-LYveByuF9AOM8WrsNne5+N79k1YxjNB6gmpCQsnuSBAcV8QUeB+ZUxQzL7Rz7HksPbahymKkq2qBR+o36ggFZA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-transform-typescript" "^7.1.0"
@@ -1140,14 +1087,12 @@
 "@babel/runtime@7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c"
-  integrity sha512-7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA==
   dependencies:
     regenerator-runtime "^0.12.0"
 
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.2.0":
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.1.tgz#574b03e8e8a9898eaf4a872a92ea20b7846f6f2a"
-  integrity sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA==
   dependencies:
     regenerator-runtime "^0.12.0"
 
@@ -1168,7 +1113,6 @@
 "@babel/template@^7.2.2":
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907"
-  integrity sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/parser" "^7.2.2"
@@ -1191,7 +1135,6 @@
 "@babel/traverse@^7.1.5", "@babel/traverse@^7.2.2", "@babel/traverse@^7.2.3":
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8"
-  integrity sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/generator" "^7.2.2"
@@ -1214,7 +1157,6 @@
 "@babel/types@^7.1.6", "@babel/types@^7.2.2", "@babel/types@^7.3.0", "@babel/types@^7.3.2":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.2.tgz#424f5be4be633fff33fb83ab8d67e4a8290f5a2f"
-  integrity sha512-3Y6H8xlUlpbGR+XvawiH0UXehqydTmNmEpozWcXymqwcrwYAl5KMvKtQ+TF6f6E08V6Jur7v/ykdDSF+WDEIXQ==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.10"
@@ -1223,7 +1165,6 @@
 "@emotion/cache@^0.8.8":
   version "0.8.8"
   resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-0.8.8.tgz#2c3bd1aa5fdb88f1cc2325176a3f3201739e726c"
-  integrity sha512-yaQQjNAVkKclMX6D8jTU3rhQKjCnXU1KS+Ok0lgZcarGHI2yydU/kKHyF3PZnQhbTpIFBK5W4+HmLCtCie7ESw==
   dependencies:
     "@emotion/sheet" "^0.8.1"
     "@emotion/stylis" "^0.7.1"
@@ -1232,7 +1173,6 @@
 "@emotion/core@^0.13.1":
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/@emotion/core/-/core-0.13.1.tgz#4fa4983e18dbf089fa16584486c8033ca50013ea"
-  integrity sha512-5qzKP6bTe2Ah7Wvh1sgtzgy6ycdpxwgMAjQ/K/VxvqBxveG9PCpq+Z0GdVg7Houb1AwYjTfNtXstjSk4sqi/7g==
   dependencies:
     "@emotion/cache" "^0.8.8"
     "@emotion/css" "^0.9.8"
@@ -1243,7 +1183,6 @@
 "@emotion/css@^0.9.8":
   version "0.9.8"
   resolved "https://registry.yarnpkg.com/@emotion/css/-/css-0.9.8.tgz#43fd45c576656d4ed9cc3b8b427c66a2ed6af30a"
-  integrity sha512-Stov3+9+KWZAte/ED9Hts3r4DVBADd5erDrhrywokM31ctQsRPD3qk8W4d1ca48ry57g/nc0qUHNis/xd1SoFg==
   dependencies:
     "@emotion/serialize" "^0.9.1"
     "@emotion/utils" "^0.8.2"
@@ -1251,7 +1190,6 @@
 "@emotion/hash@^0.6.6":
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.6.tgz#62266c5f0eac6941fece302abad69f2ee7e25e44"
-  integrity sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ==
 
 "@emotion/is-prop-valid@^0.6.8":
   version "0.6.8"
@@ -1266,7 +1204,6 @@
 "@emotion/provider@^0.11.2":
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/@emotion/provider/-/provider-0.11.2.tgz#7099f1df5641969ee4d6ff5cf1561295914030aa"
-  integrity sha512-y/BRd6cJ9tyxsy4EK8WheD2X1/RfmudMYILpa8sgI3dKCjVWeEZuQM17wXRVEyhrisaRaIp1qT4h0eWUaaqNLg==
   dependencies:
     "@emotion/cache" "^0.8.8"
     "@emotion/weak-memoize" "^0.1.3"
@@ -1274,7 +1211,6 @@
 "@emotion/serialize@^0.9.1":
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.9.1.tgz#a494982a6920730dba6303eb018220a2b629c145"
-  integrity sha512-zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ==
   dependencies:
     "@emotion/hash" "^0.6.6"
     "@emotion/memoize" "^0.6.6"
@@ -1284,12 +1220,10 @@
 "@emotion/sheet@^0.8.1":
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.8.1.tgz#6eed686c927a1c39f5045ec45ecfa36de896819d"
-  integrity sha512-p82hFBHbNkPLZ410HOeaRJZMrN1uh9rI7JAaRXIp62PP5evspPXyi3xYtxZc1+sCSlwjnQPuOIa6N88iJNtPXw==
 
 "@emotion/styled-base@^0.10.6":
   version "0.10.6"
   resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-0.10.6.tgz#c95631b6b4f19da97e7b44ee4e3ee1931afde264"
-  integrity sha512-7RfdJm2oEXiy3isFRY63mHRmWWjScFXFoZTFkCJPaL8NhX+H724WwIoQOt3WA1Jd+bb97xkJg31JbYYsSqnEaQ==
   dependencies:
     "@emotion/is-prop-valid" "^0.6.8"
     "@emotion/serialize" "^0.9.1"
@@ -1298,29 +1232,28 @@
 "@emotion/styled@^0.10.6":
   version "0.10.6"
   resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-0.10.6.tgz#1f6af1d3d4bf9fdeb05a4d220046ce11ad21a7ca"
-  integrity sha512-DFNW8jlMjy1aYCj/PKsvBoJVZAQXzjmSCwtKXLs31qZzNPaUEPbTYSIKnMUtIiAOYsu0pUTGXM+l0a+MYNm4lA==
   dependencies:
     "@emotion/styled-base" "^0.10.6"
 
 "@emotion/stylis@^0.7.1":
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.1.tgz#50f63225e712d99e2b2b39c19c70fff023793ca5"
-  integrity sha512-/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ==
 
 "@emotion/unitless@^0.6.7":
   version "0.6.7"
   resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.6.7.tgz#53e9f1892f725b194d5e6a1684a7b394df592397"
-  integrity sha512-Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg==
 
 "@emotion/utils@^0.8.2":
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz#576ff7fb1230185b619a75d258cbc98f0867a8dc"
-  integrity sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw==
 
 "@emotion/weak-memoize@^0.1.3":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.1.3.tgz#b700d97385fa91affed60c71dfd51c67e9dad762"
-  integrity sha512-QsYGKdhhuDFNq7bjm2r44y0mp5xW3uO3csuTPDWZc0OIiMQv+AIY5Cqwd4mJiC5N8estVl7qlvOx1hbtOuUWbw==
+
+"@icons/material@^0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8"
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
@@ -1475,7 +1408,6 @@
 "@storybook/addon-actions@^4.1.11":
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-4.1.11.tgz#8946ea78f050ae2d06a2f2231ec56d1831942e15"
-  integrity sha512-iVsxEPmOCuPMAaJhHbpxQhzEPzKnZad4GELNfKrwmmvv3mY+3UN/z208HguW4NHjhMJZVYSS3H/qic8CQS+pHw==
   dependencies:
     "@emotion/core" "^0.13.1"
     "@emotion/provider" "^0.11.2"
@@ -1492,20 +1424,46 @@
     react-inspector "^2.3.0"
     uuid "^3.3.2"
 
+"@storybook/addon-knobs@^4.1.12":
+  version "4.1.12"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-4.1.12.tgz#6066443f0700036b07025844c87b007e8f8bd715"
+  dependencies:
+    "@emotion/styled" "^0.10.6"
+    "@storybook/addons" "4.1.12"
+    "@storybook/components" "4.1.12"
+    "@storybook/core-events" "4.1.12"
+    copy-to-clipboard "^3.0.8"
+    core-js "^2.5.7"
+    escape-html "^1.0.3"
+    fast-deep-equal "^2.0.1"
+    global "^4.3.2"
+    prop-types "^15.6.2"
+    qs "^6.5.2"
+    react-color "^2.14.1"
+    react-lifecycles-compat "^3.0.4"
+    util-deprecate "^1.0.2"
+
 "@storybook/addons@4.1.11", "@storybook/addons@^4.1.11":
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-4.1.11.tgz#a0d537bd10d123ecee6cb1f5f149b148ce250e57"
-  integrity sha512-n9oDs7GgJbiN5NYPkR3B3e5W0Tr6bIZvFfcJzgyP4dn50AUvS1IE1CEthezfn1L/nc2suw/8Oe30bOXOyTl/SQ==
   dependencies:
     "@storybook/channels" "4.1.11"
     "@storybook/components" "4.1.11"
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
+"@storybook/addons@4.1.12":
+  version "4.1.12"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-4.1.12.tgz#ab38bfd0be97ed02a7d43d97cc631fa4c3a6f3a2"
+  dependencies:
+    "@storybook/channels" "4.1.12"
+    "@storybook/components" "4.1.12"
+    global "^4.3.2"
+    util-deprecate "^1.0.2"
+
 "@storybook/channel-postmessage@4.1.11":
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-4.1.11.tgz#3320a5f3e05652466eff1c53843205c262a92dfb"
-  integrity sha512-/9p4I5CZWVl6mszY5AR5XPRdQ88LUaAt4iyhdxMIaqNRiVo3Rq4ptMXiw35eCr+sLQuG2KO2SiPIwaA4/FgQuw==
   dependencies:
     "@storybook/channels" "4.1.11"
     global "^4.3.2"
@@ -1514,17 +1472,33 @@
 "@storybook/channels@4.1.11":
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-4.1.11.tgz#d161497fa3cd848cc9d518aa1c37052857e22e3c"
-  integrity sha512-zYusY8cno4keMozn2lDpBgyNSOueFh+hrPETioSB5Z8Kd3F5OjM7681vJC8QA67yOBEie2hHk0CVxRpuxziMwA==
+
+"@storybook/channels@4.1.12":
+  version "4.1.12"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-4.1.12.tgz#656161e48467c0fef0dedce1ab21972d2eb7fa27"
 
 "@storybook/client-logger@4.1.11":
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-4.1.11.tgz#2b1e34e892045199592fdb01656e5dcdcd1999d7"
-  integrity sha512-Xxy6sY7Zd405o28wUAhlpqY2FbSZsTrsN3g/uo4Mqo4XD2f0Z4wIv1GOuM5DI2KlHpHGI+36YPO2VFx5Bq+yiQ==
 
 "@storybook/components@4.1.11":
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-4.1.11.tgz#25458a4a4f2edd836b1e4b944cfcfcb4a3567036"
-  integrity sha512-KJA8Nr8MbXiibDLcndx1GRVmVDyBBL2Tbb1kfQfr58vDwz6qhYxempejY6W+voaEqohnFxrOtnnbqlCyf8peUQ==
+  dependencies:
+    "@emotion/core" "^0.13.1"
+    "@emotion/provider" "^0.11.2"
+    "@emotion/styled" "^0.10.6"
+    global "^4.3.2"
+    lodash "^4.17.11"
+    prop-types "^15.6.2"
+    react-inspector "^2.3.0"
+    react-split-pane "^0.1.84"
+    react-textarea-autosize "^7.0.4"
+    render-fragment "^0.1.1"
+
+"@storybook/components@4.1.12":
+  version "4.1.12"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-4.1.12.tgz#c497167562907ce2adb31b275b60109c9f3269da"
   dependencies:
     "@emotion/core" "^0.13.1"
     "@emotion/provider" "^0.11.2"
@@ -1540,12 +1514,14 @@
 "@storybook/core-events@4.1.11":
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-4.1.11.tgz#78cfb2b4014ca27909421cdebfa9c96533929a5a"
-  integrity sha512-rVb76xFLJkTFcBHL1oTdJW8O2N7q+Cc6Mo7v9u3TnM4WuRk08/GyzzO7sRvEg3Mvo59AOLu1uqYovRMo4tZEnQ==
+
+"@storybook/core-events@4.1.12":
+  version "4.1.12"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-4.1.12.tgz#1a861c1c450f076c146f6cc3c8a4ccd0d4dc0d35"
 
 "@storybook/core@4.1.11":
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/@storybook/core/-/core-4.1.11.tgz#f91cf77d4750edeb92717f6b2a2a4258b0a06c64"
-  integrity sha512-iUrtFCav7xJicCLhp4zdqbhaOXRWXrx4wMPSs0keBD2G7NQtSg/TQMUdx2VYFBl5thIFT1jt5dAm66y0Q2OCTQ==
   dependencies:
     "@babel/plugin-proposal-class-properties" "^7.2.0"
     "@babel/preset-env" "^7.2.0"
@@ -1615,7 +1591,6 @@
 "@storybook/mantra-core@^1.7.2":
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/@storybook/mantra-core/-/mantra-core-1.7.2.tgz#e10c7faca29769e97131e0e0308ef7cfb655b70c"
-  integrity sha512-GD4OYJ8GsayVhIg306sfgcKDk9j8YfuSKIAWvdB/g7IDlw0pDgueONALVEEE2XWJtCwcsUyDtCYzXFgCBWLEjA==
   dependencies:
     "@storybook/react-komposer" "^2.0.1"
     "@storybook/react-simple-di" "^1.2.1"
@@ -1624,7 +1599,6 @@
 "@storybook/node-logger@4.1.11":
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-4.1.11.tgz#8ea9779eb6260a02bf06c02eafbff5925b883f9f"
-  integrity sha512-rCXk1PUcakkV72oyTR+nOVDUGnkk1On8/sm9u3NtBEUuwsCtm4p+jh42Pp4jsTtWpG36AVABDtiN65VgCfS+9w==
   dependencies:
     chalk "^2.4.1"
     core-js "^2.5.7"
@@ -1635,7 +1609,6 @@
 "@storybook/podda@^1.2.3":
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/podda/-/podda-1.2.3.tgz#53c4a1a3f8c7bbd5755dff5c34576fd1af9d38ba"
-  integrity sha512-g7dsdsn50AhlGZ8iIDKdF8bi7Am++iFOq+QN+hNKz3FvgLuf8Dz+mpC/BFl90eE9bEYxXqXKeMf87399Ec5Qhw==
   dependencies:
     babel-runtime "^6.11.6"
     immutable "^3.8.1"
@@ -1643,7 +1616,6 @@
 "@storybook/react-komposer@^2.0.1", "@storybook/react-komposer@^2.0.5":
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/@storybook/react-komposer/-/react-komposer-2.0.5.tgz#0c23163f28b2e1bd2aeeb4421fed382bb512de0e"
-  integrity sha512-zX5UITgAh37tmD0MWnUFR29S5YM8URMHc/9iwczX/P1f3tM4nPn8VAzxG/UWQecg1xZVphmqkZoux+SDrtTZOQ==
   dependencies:
     "@storybook/react-stubber" "^1.0.0"
     babel-runtime "^6.11.6"
@@ -1654,7 +1626,6 @@
 "@storybook/react-simple-di@^1.2.1":
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/@storybook/react-simple-di/-/react-simple-di-1.3.0.tgz#13116d89a2f42898716a7f8c4095b47415526371"
-  integrity sha512-RH6gPQaYMs/VzQX2dgbZU8DQMKFXVOv1ruohHjjNPys4q+YdqMFMDe5jOP1AUE3j9g01x0eW7bVjRawSpl++Ew==
   dependencies:
     babel-runtime "6.x.x"
     create-react-class "^15.6.2"
@@ -1664,14 +1635,12 @@
 "@storybook/react-stubber@^1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@storybook/react-stubber/-/react-stubber-1.0.1.tgz#8c312c2658b9eeafce470e1c39e4193f0b5bf9b1"
-  integrity sha512-k+CHH+vA8bQfCmzBTtJsPkITFgD+C/w19KuByZ9WeEvNUFtnDaCqfP+Vp3/OR+3IAfAXYYOWolqPLxNPcEqEjw==
   dependencies:
     babel-runtime "^6.5.0"
 
 "@storybook/react@^4.1.11":
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/@storybook/react/-/react-4.1.11.tgz#fb3cda82fd3334a6653325ec281a2da284ac6895"
-  integrity sha512-NPNcfOlWmFBevza/+GXIK23h46HqdWKFmId19E0PtoWGoR5xOR56rnwagr2+yHngUb4AATUCzhzTwxfWGxSvBg==
   dependencies:
     "@babel/plugin-transform-react-constant-elements" "^7.2.0"
     "@babel/preset-flow" "^7.0.0"
@@ -1697,7 +1666,6 @@
 "@storybook/ui@4.1.11":
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-4.1.11.tgz#0c6fc34a8096028ef236a5196e7b91831702f2fb"
-  integrity sha512-bgIagh2Z4flGA7jv4JN++ThLwGq8CI8Wq+1/vhCiTxjTE3H1j9VNPdJfhNgxrQypcLRVHl5AKhf0mlSMyz0S1A==
   dependencies:
     "@emotion/core" "^0.13.1"
     "@emotion/provider" "^0.11.2"
@@ -1725,47 +1693,38 @@
 "@svgr/babel-plugin-add-jsx-attribute@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.0.0.tgz#5acf239cd2747b1a36ec7e708de05d914cb9b948"
-  integrity sha512-PDvHV2WhSGCSExp+eIMEKxYd1Q0SBvXLb4gAOXbdh0dswHFFgXWzxGjCmx5aln4qGrhkuN81khzYzR/44DYaMA==
 
 "@svgr/babel-plugin-remove-jsx-attribute@^4.0.3":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-4.0.3.tgz#32564b5c4d761b51e34492b6a4894196c0f75803"
-  integrity sha512-fpG7AzzJxz1tc8ITYS1jCAt1cq4ydK2R+sx//BMTJgvOjfk91M5GiqFolP8aYTzLcum92IGNAVFS3zEcucOQEA==
 
 "@svgr/babel-plugin-remove-jsx-empty-expression@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-4.0.0.tgz#0b59338c00671cf8137eb823bd84a3efac686502"
-  integrity sha512-nBGVl6LzXTdk1c6w3rMWcjq3mYGz+syWc5b3CdqAiEeY/nswYDoW/cnGUKKC8ofD6/LaG+G/IUnfv3jKoHz43A==
 
 "@svgr/babel-plugin-replace-jsx-attribute-value@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-4.0.0.tgz#91785643540c2300f3d89e515b37af9b5ce4e695"
-  integrity sha512-ejQqpTfORy6TT5w1x/2IQkscgfbtNFjitcFDu63GRz7qfhVTYhMdiJvJ1+Aw9hmv9bO4tXThGQDr1IF5lIvgew==
 
 "@svgr/babel-plugin-svg-dynamic-title@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.0.0.tgz#eb8d50b80ba0a26f9b27c7268e2a803d90f1bc9e"
-  integrity sha512-OE6GT9WRKWqd0Dk6NJ5TYXTF5OxAyn74+c/D+gTLbCXnK2A0luEXuwMbe5zR5Px4A/jow2OeEBboTENl4vtuQg==
 
 "@svgr/babel-plugin-svg-em-dimensions@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-4.0.0.tgz#0de3972c46ff1960bed765646037a3a7f9e1da3d"
-  integrity sha512-QeDRGHXfjYEBTXxV0TsjWmepsL9Up5BOOlMFD557x2JrSiVGUn2myNxHIrHiVW0+nnWnaDcrkjg/jUvbJ5nKCg==
 
 "@svgr/babel-plugin-transform-react-native-svg@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-4.0.0.tgz#5e8ecc2a9870ae05fb1e553b1fe9c6b5853a1c66"
-  integrity sha512-c6eE6ovs14k6dmHKoy26h7iRFhjWNnwYVrDWIPfouVm/gcLIeMw/ME4i91O5LEfaDHs6kTRCcVpbAVbNULZOtw==
 
 "@svgr/babel-plugin-transform-svg-component@^4.1.0":
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-4.1.0.tgz#257159e28a21ac20988b1eaa5f59d4724f37fdaa"
-  integrity sha512-uulxdx2p3nrM2BkrtADQHK8IhEzCxdUILfC/ddvFC8tlFWuKiA3ych8C6q0ulyQHq34/3hzz+3rmUbhWF9redg==
 
 "@svgr/babel-preset@^4.1.0":
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-4.1.0.tgz#f6fa8ad90064b85dd7a3566a70b7006e789e8385"
-  integrity sha512-Nat5aJ3VO3LE8KfMyIbd3sGWnaWPiFCeWIdEV+lalga0To/tpmzsnPDdnrR9fNYhvSSLJbwhU/lrLYt9wXY0ZQ==
   dependencies:
     "@svgr/babel-plugin-add-jsx-attribute" "^4.0.0"
     "@svgr/babel-plugin-remove-jsx-attribute" "^4.0.3"
@@ -1779,7 +1738,6 @@
 "@svgr/core@^4.1.0":
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/@svgr/core/-/core-4.1.0.tgz#4f8ad24fb4ab25c787c12a6bbb511c6430558f83"
-  integrity sha512-ahv3lvOKuUAcs0KbQ4Jr5fT5pGHhye4ew8jZVS4lw8IQdWrbG/o3rkpgxCPREBk7PShmEoGQpteeXVwp2yExuQ==
   dependencies:
     "@svgr/plugin-jsx" "^4.1.0"
     camelcase "^5.0.0"
@@ -1788,14 +1746,12 @@
 "@svgr/hast-util-to-babel-ast@^4.1.0":
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-4.1.0.tgz#a1eb0f47059769896f759f47995b636fce5d9fa4"
-  integrity sha512-tdkEZHmigYYiVhIEzycAMKN5aUSpddUnjr6v7bPwaNTFuSyqGUrpCg1JlIGi7PUaaJVHbn6whGQMGUpKOwT5nw==
   dependencies:
     "@babel/types" "^7.1.6"
 
 "@svgr/plugin-jsx@^4.1.0":
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-4.1.0.tgz#4045e9cc0589374a6c182a1217c80e6734b5cbec"
-  integrity sha512-xwu+9TGziuN7cu7p+vhCw2EJIfv8iDNMzn2dR0C7fBYc8q+SRtYTcg4Uyn8ZWh6DM+IZOlVrS02VEMT0FQzXSA==
   dependencies:
     "@babel/core" "^7.1.6"
     "@svgr/babel-preset" "^4.1.0"
@@ -1807,7 +1763,6 @@
 "@svgr/plugin-svgo@^4.0.3":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-4.0.3.tgz#a07ea0a736c26fa3a5440fe8e222e2e887764cab"
-  integrity sha512-MgL1CrlxvNe+1tQjPUc2bIJtsdJOIE5arbHlPgW+XVWGjMZTUcyNNP8R7/IjM2Iyrc98UJY+WYiiWHrinnY9ZQ==
   dependencies:
     cosmiconfig "^5.0.7"
     merge-deep "^3.0.2"
@@ -1816,7 +1771,6 @@
 "@svgr/webpack@^4.0.3":
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-4.1.0.tgz#20c88f32f731c7b1d4711045b2b993887d731c28"
-  integrity sha512-d09ehQWqLMywP/PT/5JvXwPskPK9QCXUjiSkAHehreB381qExXf5JFCBWhfEyNonRbkIneCeYM99w+Ud48YIQQ==
   dependencies:
     "@babel/core" "^7.1.6"
     "@babel/plugin-transform-react-constant-elements" "^7.0.0"
@@ -1844,17 +1798,14 @@
 "@types/q@^1.5.1":
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.1.tgz#48fd98c1561fe718b61733daed46ff115b496e18"
-  integrity sha512-eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA==
 
 "@types/unist@*", "@types/unist@^2.0.0":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.2.tgz#5dc0a7f76809b7518c0df58689cd16a19bd751c6"
-  integrity sha512-iHI60IbyfQilNubmxsq4zqSjdynlmc2Q/QvH9kjzg9+CCYVVzq1O6tc7VBzSygIwnmOt07w80IG6HDQvjv3Liw==
 
 "@types/vfile-message@*":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/vfile-message/-/vfile-message-1.0.1.tgz#e1e9895cc6b36c462d4244e64e6d0b6eaf65355a"
-  integrity sha512-mlGER3Aqmq7bqR1tTTIVHq8KSAFFRyGbrxuM8C/H82g6k7r2fS+IMEkIu3D7JHzG10NvPdR8DNx0jr0pwpp4dA==
   dependencies:
     "@types/node" "*"
     "@types/unist" "*"
@@ -1862,7 +1813,6 @@
 "@types/vfile@^3.0.0":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@types/vfile/-/vfile-3.0.2.tgz#19c18cd232df11ce6fa6ad80259bc86c366b09b9"
-  integrity sha512-b3nLFGaGkJ9rzOcuXRfHkZMdjsawuDD0ENL9fzTophtBg8FJHSGbH7daXkEpcwy3v7Xol3pAvsmlYyFhR4pqJw==
   dependencies:
     "@types/node" "*"
     "@types/unist" "*"
@@ -2075,7 +2025,6 @@ acorn@^6.0.2:
 address@1.0.3, address@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
-  integrity sha512-z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg==
 
 adm-zip@0.4.4:
   version "0.4.4"
@@ -2103,7 +2052,6 @@ aggregate-error@^1.0.0:
 "airbnb-js-shims@^1 || ^2":
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/airbnb-js-shims/-/airbnb-js-shims-2.1.1.tgz#a509611480db7e6d9db62fe2acfaeb473b6842ac"
-  integrity sha512-h8UtyB/TCdOwWoEPQJGHgsWwSnTqPrRZbhyZYjAwY9/AbjdjfkKy9L/T3fIFS6MKX8YrpWFRm6xqFSgU+2DRGw==
   dependencies:
     array-includes "^3.0.3"
     array.prototype.flat "^1.2.1"
@@ -2175,7 +2123,6 @@ ansi-align@^2.0.0:
 ansi-align@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
-  integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==
   dependencies:
     string-width "^3.0.0"
 
@@ -2202,7 +2149,6 @@ ansi-escapes@^3.0.0:
 ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
-  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
 ansi-html@0.0.7:
   version "0.0.7"
@@ -2225,7 +2171,6 @@ ansi-regex@^3.0.0:
 ansi-regex@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
-  integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
 
 ansi-styles@^2.2.1:
   version "2.2.1"
@@ -2263,7 +2208,6 @@ anymatch@^2.0.0:
 app-root-dir@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/app-root-dir/-/app-root-dir-1.0.2.tgz#38187ec2dea7577fff033ffcb12172692ff6e118"
-  integrity sha1-OBh+wt6nV3//Az/8sSFyaS/24Rg=
 
 aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2, aproba@~1.2.0:
   version "1.2.0"
@@ -2365,7 +2309,6 @@ array-equal@^1.0.0:
 array-filter@~0.0.0:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
-  integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw=
 
 array-find-index@^1.0.1:
   version "1.0.2"
@@ -2397,12 +2340,10 @@ array-includes@^3.0.3:
 array-map@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
-  integrity sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=
 
 array-reduce@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
-  integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
 
 array-slice@^0.2.3:
   version "0.2.3"
@@ -2437,7 +2378,6 @@ array.prototype.flat@^1.2.1:
 array.prototype.flatmap@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.1.tgz#3103cd4826ef90019c9b0a4839b2535fa6faf4e9"
-  integrity sha512-i18e2APdsiezkcqDyZor78Pbfjfds3S94dG6dgIV2ZASJaUf1N0dz2tGdrmwrmlZuNUgxH+wz6Z0zYVH2c5xzQ==
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.10.0"
@@ -2498,12 +2438,10 @@ ast-types-flow@0.0.7, ast-types-flow@^0.0.7:
 ast-types@0.11.3:
   version "0.11.3"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.3.tgz#c20757fe72ee71278ea0ff3d87e5c2ca30d9edf8"
-  integrity sha512-XA5o5dsNw8MhyW0Q7MWXJWc4oOzZKbdsEJq45h7c8q/d9DwWZ5F2ugUc1PuMLPGsUnphCt/cNDHu8JeBbxf1qA==
 
 ast-types@0.11.7:
   version "0.11.7"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.7.tgz#f318bf44e339db6a320be0009ded64ec1471f46c"
-  integrity sha512-2mP3TwtkY/aTv5X3ZsMpNAbOnyoC/aMJwJSoaELPkHId0nSQgFcnU4dRW3isxiz7+zBexk0ym3WNVjMiQBnJSw==
 
 async-each@^1.0.0:
   version "1.0.1"
@@ -2549,7 +2487,6 @@ autoprefixer@^9.0.0:
 autoprefixer@^9.3.1:
   version "9.4.7"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.7.tgz#f997994f9a810eae47b38fa6d8a119772051c4ff"
-  integrity sha512-qS5wW6aXHkm53Y4z73tFGsUhmZu4aMPV9iHXYlF0c/wxjknXNHuj/1cIQb+6YH692DbJGGWcckAXX+VxKvahMA==
   dependencies:
     browserslist "^4.4.1"
     caniuse-lite "^1.0.30000932"
@@ -2579,7 +2516,6 @@ axobject-query@^2.0.1:
 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"
-  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
   dependencies:
     chalk "^1.1.3"
     esutils "^2.0.2"
@@ -2599,37 +2535,30 @@ babel-eslint@^10.0.1:
 babel-helper-evaluate-path@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.5.0.tgz#a62fa9c4e64ff7ea5cea9353174ef023a900a67c"
-  integrity sha512-mUh0UhS607bGh5wUMAQfOpt2JX2ThXMtppHRdRU1kL7ZLRWIXxoV2UIV1r2cAeeNeU1M5SB5/RSUgUxrK8yOkA==
 
 babel-helper-flip-expressions@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.4.3.tgz#3696736a128ac18bc25254b5f40a22ceb3c1d3fd"
-  integrity sha1-NpZzahKKwYvCUlS19AoizrPB0/0=
 
 babel-helper-is-nodes-equiv@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz#34e9b300b1479ddd98ec77ea0bbe9342dfe39684"
-  integrity sha1-NOmzALFHnd2Y7HfqC76TQt/jloQ=
 
 babel-helper-is-void-0@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/babel-helper-is-void-0/-/babel-helper-is-void-0-0.4.3.tgz#7d9c01b4561e7b95dbda0f6eee48f5b60e67313e"
-  integrity sha1-fZwBtFYee5Xb2g9u7kj1tg5nMT4=
 
 babel-helper-mark-eval-scopes@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.4.3.tgz#d244a3bef9844872603ffb46e22ce8acdf551562"
-  integrity sha1-0kSjvvmESHJgP/tG4izorN9VFWI=
 
 babel-helper-remove-or-void@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.4.3.tgz#a4f03b40077a0ffe88e45d07010dee241ff5ae60"
-  integrity sha1-pPA7QAd6D/6I5F0HAQ3uJB/1rmA=
 
 babel-helper-to-multiple-sequence-expressions@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.5.0.tgz#a3f924e3561882d42fcf48907aa98f7979a4588d"
-  integrity sha512-m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA==
 
 babel-loader@8.0.4, babel-loader@^8.0.4:
   version "8.0.4"
@@ -2649,7 +2578,6 @@ babel-plugin-add-module-exports@^1.0.0:
 babel-plugin-dynamic-import-node@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.2.0.tgz#c0adfb07d95f4a4495e9aaac6ec386c4d7c2524e"
-  integrity sha512-fP899ELUnTaBcIzmrW7nniyqqdYWrWuJUyPWHxFa/c7r7hS6KC8FscNfLlBNIoPSc55kYMGEEKjPjJGCLbE1qA==
   dependencies:
     object.assign "^4.1.0"
 
@@ -2663,19 +2591,16 @@ babel-plugin-macros@2.4.2, babel-plugin-macros@^2.4.2:
 babel-plugin-minify-builtins@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.5.0.tgz#31eb82ed1a0d0efdc31312f93b6e4741ce82c36b"
-  integrity sha512-wpqbN7Ov5hsNwGdzuzvFcjgRlzbIeVv1gMIlICbPj0xkexnfoIDe7q+AZHMkQmAE/F9R5jkrB6TLfTegImlXag==
 
 babel-plugin-minify-constant-folding@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.5.0.tgz#f84bc8dbf6a561e5e350ff95ae216b0ad5515b6e"
-  integrity sha512-Vj97CTn/lE9hR1D+jKUeHfNy+m1baNiJ1wJvoGyOBUx7F7kJqDZxr9nCHjO/Ad+irbR3HzR6jABpSSA29QsrXQ==
   dependencies:
     babel-helper-evaluate-path "^0.5.0"
 
 babel-plugin-minify-dead-code-elimination@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.5.0.tgz#d23ef5445238ad06e8addf5c1cf6aec835bcda87"
-  integrity sha512-XQteBGXlgEoAKc/BhO6oafUdT4LBa7ARi55mxoyhLHNuA+RlzRmeMAfc31pb/UqU01wBzRc36YqHQzopnkd/6Q==
   dependencies:
     babel-helper-evaluate-path "^0.5.0"
     babel-helper-mark-eval-scopes "^0.4.3"
@@ -2685,43 +2610,36 @@ babel-plugin-minify-dead-code-elimination@^0.5.0:
 babel-plugin-minify-flip-comparisons@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.4.3.tgz#00ca870cb8f13b45c038b3c1ebc0f227293c965a"
-  integrity sha1-AMqHDLjxO0XAOLPB68DyJyk8llo=
   dependencies:
     babel-helper-is-void-0 "^0.4.3"
 
 babel-plugin-minify-guarded-expressions@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.3.tgz#cc709b4453fd21b1f302877444c89f88427ce397"
-  integrity sha1-zHCbRFP9IbHzAod0RMifiEJ845c=
   dependencies:
     babel-helper-flip-expressions "^0.4.3"
 
 babel-plugin-minify-infinity@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.4.3.tgz#dfb876a1b08a06576384ef3f92e653ba607b39ca"
-  integrity sha1-37h2obCKBldjhO8/kuZTumB7Oco=
 
 babel-plugin-minify-mangle-names@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.5.0.tgz#bcddb507c91d2c99e138bd6b17a19c3c271e3fd3"
-  integrity sha512-3jdNv6hCAw6fsX1p2wBGPfWuK69sfOjfd3zjUXkbq8McbohWy23tpXfy5RnToYWggvqzuMOwlId1PhyHOfgnGw==
   dependencies:
     babel-helper-mark-eval-scopes "^0.4.3"
 
 babel-plugin-minify-numeric-literals@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.4.3.tgz#8e4fd561c79f7801286ff60e8c5fd9deee93c0bc"
-  integrity sha1-jk/VYcefeAEob/YOjF/Z3u6TwLw=
 
 babel-plugin-minify-replace@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.5.0.tgz#d3e2c9946c9096c070efc96761ce288ec5c3f71c"
-  integrity sha512-aXZiaqWDNUbyNNNpWs/8NyST+oU7QTpK7J9zFEFSA0eOmtUNMU3fczlTTTlnCxHmq/jYNFEmkkSG3DDBtW3Y4Q==
 
 babel-plugin-minify-simplify@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.5.0.tgz#1f090018afb90d8b54d3d027fd8a4927f243da6f"
-  integrity sha512-TM01J/YcKZ8XIQd1Z3nF2AdWHoDsarjtZ5fWPDksYZNsoOjQ2UO2EWm824Ym6sp127m44gPlLFiO5KFxU8pA5Q==
   dependencies:
     babel-helper-flip-expressions "^0.4.3"
     babel-helper-is-nodes-equiv "^0.0.1"
@@ -2730,19 +2648,16 @@ babel-plugin-minify-simplify@^0.5.0:
 babel-plugin-minify-type-constructors@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.4.3.tgz#1bc6f15b87f7ab1085d42b330b717657a2156500"
-  integrity sha1-G8bxW4f3qxCF1CszC3F2V6IVZQA=
   dependencies:
     babel-helper-is-void-0 "^0.4.3"
 
 babel-plugin-named-asset-import@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.2.3.tgz#b40ed50a848e7bb0a2a7e34d990d1f9d46fe9b38"
-  integrity sha512-9mx2Z9M4EGbutvXxoLV7aUBCY6ps3sqLFl094FeA2tFQzQffIh0XSsmwwQRxiSfpg3rnb5x/o46qRLxS/OzFTg==
 
 babel-plugin-react-docgen@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/babel-plugin-react-docgen/-/babel-plugin-react-docgen-2.0.2.tgz#3307e27414c370365710576b7fadbcaf8984d862"
-  integrity sha512-fFendfUUU2KqqE1ki2NyQoZm4uHPoEWPUgBZiPBiowcPZos+4q+chdQh0nlwY5hxs08AMHSH4Pp98RQL0VFS/g==
   dependencies:
     lodash "^4.17.10"
     react-docgen "^3.0.0"
@@ -2758,34 +2673,28 @@ babel-plugin-react-docgen@^2.0.0:
 babel-plugin-transform-inline-consecutive-adds@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.4.3.tgz#323d47a3ea63a83a7ac3c811ae8e6941faf2b0d1"
-  integrity sha1-Mj1Ho+pjqDp6w8gRro5pQfrysNE=
 
 babel-plugin-transform-member-expression-literals@^6.9.4:
   version "6.9.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.4.tgz#37039c9a0c3313a39495faac2ff3a6b5b9d038bf"
-  integrity sha1-NwOcmgwzE6OUlfqsL/OmtbnQOL8=
 
 babel-plugin-transform-merge-sibling-variables@^6.9.4:
   version "6.9.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.4.tgz#85b422fc3377b449c9d1cde44087203532401dae"
-  integrity sha1-hbQi/DN3tEnJ0c3kQIcgNTJAHa4=
 
 babel-plugin-transform-minify-booleans@^6.9.4:
   version "6.9.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.4.tgz#acbb3e56a3555dd23928e4b582d285162dd2b198"
-  integrity sha1-rLs+VqNVXdI5KOS1gtKFFi3SsZg=
 
 babel-plugin-transform-property-literals@^6.9.4:
   version "6.9.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.4.tgz#98c1d21e255736573f93ece54459f6ce24985d39"
-  integrity sha1-mMHSHiVXNlc/k+zlRFn2ziSYXTk=
   dependencies:
     esutils "^2.0.2"
 
 babel-plugin-transform-react-remove-prop-types@0.4.18:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.18.tgz#85ff79d66047b34288c6f7cc986b8854ab384f8c"
-  integrity sha512-azed2nHo8vmOy7EY26KH+om5oOcWRs0r1U8wOmhwta+SBMMnmJ4H6yaBZRCcHBtMeWp9AVhvBTL/lpR1kEx+Xw==
 
 babel-plugin-transform-react-remove-prop-types@^0.4.19:
   version "0.4.19"
@@ -2794,39 +2703,32 @@ babel-plugin-transform-react-remove-prop-types@^0.4.19:
 babel-plugin-transform-regexp-constructors@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.4.3.tgz#58b7775b63afcf33328fae9a5f88fbd4fb0b4965"
-  integrity sha1-WLd3W2OvzzMyj66aX4j71PsLSWU=
 
 babel-plugin-transform-remove-console@^6.9.4:
   version "6.9.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz#b980360c067384e24b357a588d807d3c83527780"
-  integrity sha1-uYA2DAZzhOJLNXpYjYB9PINSd4A=
 
 babel-plugin-transform-remove-debugger@^6.9.4:
   version "6.9.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.4.tgz#42b727631c97978e1eb2d199a7aec84a18339ef2"
-  integrity sha1-QrcnYxyXl44estGZp67IShgznvI=
 
 babel-plugin-transform-remove-undefined@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.5.0.tgz#80208b31225766c630c97fa2d288952056ea22dd"
-  integrity sha512-+M7fJYFaEE/M9CXa0/IRkDbiV3wRELzA1kKQFCJ4ifhrzLKn/9VCCgj9OFmYWwBd8IB48YdgPkHYtbYq+4vtHQ==
   dependencies:
     babel-helper-evaluate-path "^0.5.0"
 
 babel-plugin-transform-simplify-comparison-operators@^6.9.4:
   version "6.9.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.4.tgz#f62afe096cab0e1f68a2d753fdf283888471ceb9"
-  integrity sha1-9ir+CWyrDh9ootdT/fKDiIRxzrk=
 
 babel-plugin-transform-undefined-to-void@^6.9.4:
   version "6.9.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz#be241ca81404030678b748717322b89d0c8fe280"
-  integrity sha1-viQcqBQEAwZ4t0hxcyK4nQyP4oA=
 
 "babel-preset-minify@^0.5.0 || 0.6.0-alpha.5":
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.5.0.tgz#e25bb8d3590087af02b650967159a77c19bfb96b"
-  integrity sha512-xj1s9Mon+RFubH569vrGCayA9Fm2GMsCgDRm1Jb8SgctOB7KFcrVc2o8K3YHUyMz+SWP8aea75BoS8YfsXXuiA==
   dependencies:
     babel-plugin-minify-builtins "^0.5.0"
     babel-plugin-minify-constant-folding "^0.5.0"
@@ -2855,7 +2757,6 @@ babel-plugin-transform-undefined-to-void@^6.9.4:
 babel-preset-react-app@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-6.1.0.tgz#477ae7f8557eb99ce26d179530127913b733310d"
-  integrity sha512-8PJ4N+acfYsjhDK4gMWkqJMVRMjDKb93D+nz7lWlNe73Jcv38FNu37i5K/dVQnFDdRYHbe1SjII+Y0mCgink9A==
   dependencies:
     "@babel/core" "7.1.0"
     "@babel/plugin-proposal-class-properties" "7.1.0"
@@ -2977,7 +2878,6 @@ block-stream@*:
 bluebird@^3.3.5:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
-  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
 
 bluebird@^3.5.0, bluebird@^3.5.1, bluebird@~3.5.1:
   version "3.5.2"
@@ -3042,7 +2942,6 @@ boxen@^1.2.1:
 boxen@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-2.1.0.tgz#8d576156e33fc26a34d6be8635fd16b1d745f0b2"
-  integrity sha512-luq3RQOt2U5sUX+fiu+qnT+wWnHDcATLpEe63jvge6GUZO99AKbVRfp97d2jgLvq1iQa0ORzaAm4lGVG52ZSlw==
   dependencies:
     ansi-align "^3.0.0"
     camelcase "^5.0.0"
@@ -3153,7 +3052,6 @@ browserify-zlib@^0.2.0:
 browserslist@4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.1.1.tgz#328eb4ff1215b12df6589e9ab82f8adaa4fc8cd6"
-  integrity sha512-VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q==
   dependencies:
     caniuse-lite "^1.0.30000884"
     electron-to-chromium "^1.3.62"
@@ -3178,7 +3076,6 @@ browserslist@^4.3.3:
 browserslist@^4.3.4, browserslist@^4.4.1:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.1.tgz#42e828954b6b29a7a53e352277be429478a69062"
-  integrity sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==
   dependencies:
     caniuse-lite "^1.0.30000929"
     electron-to-chromium "^1.3.103"
@@ -3384,12 +3281,10 @@ camelcase@^4.0.0, camelcase@^4.1.0:
 camelcase@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
-  integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
 
 caniuse-lite@^1.0.30000884, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000932:
   version "1.0.30000936"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000936.tgz#5d33b118763988bf721b9b8ad436d0400e4a116b"
-  integrity sha512-orX4IdpbFhdNO7bTBhSbahp1EBpqzBc+qrvTRVUFfZgA4zta7TdM6PN5ZxkEUgDnz36m+PfWGcdX7AVfFWItJw==
 
 caniuse-lite@^1.0.30000898:
   version "1.0.30000899"
@@ -3413,7 +3308,6 @@ cardinal@^1.0.0:
 case-sensitive-paths-webpack-plugin@^2.1.2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz#3371ef6365ef9c25fa4b81c16ace0e9c7dc58c3e"
-  integrity sha512-u5ElzokS8A1pm9vM3/iDgTcI3xqHxuCao94Oz8etI3cf0Tio0p8izkDYbTIn09uP3yUUr6+veaE6IkjnTYS46g==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -3467,7 +3361,6 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
 chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
@@ -3513,7 +3406,6 @@ cheerio@^1.0.0-rc.2:
 child-process-promise@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/child-process-promise/-/child-process-promise-2.2.1.tgz#4730a11ef610fad450b8f223c79d31d7bdad8074"
-  integrity sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=
   dependencies:
     cross-spawn "^4.0.2"
     node-version "^1.0.0"
@@ -3683,7 +3575,6 @@ clone-buffer@^1.0.0:
 clone-deep@^0.2.4:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.2.4.tgz#4e73dd09e9fb971cc38670c5dced9c1896481cc6"
-  integrity sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=
   dependencies:
     for-own "^0.1.3"
     is-plain-object "^2.0.1"
@@ -3751,7 +3642,6 @@ co@^4.0.0, co@^4.6.0:
 coa@~2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
-  integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==
   dependencies:
     "@types/q" "^1.5.1"
     chalk "^2.4.1"
@@ -3797,7 +3687,6 @@ colors@^1.1.2:
 colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
 
 columnify@~1.5.4:
   version "1.5.4"
@@ -3815,7 +3704,6 @@ combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@~1.0.5, combined
 comma-separated-tokens@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.5.tgz#b13793131d9ea2d2431cf5b507ddec258f0ce0db"
-  integrity sha512-Cg90/fcK93n0ecgYTAz1jaA3zvnQ0ExlmKY1rdbyHqAx6BHxwoJc+J7HDu0iuQ7ixEs1qaa+WyQ6oeuBpYP1iA==
   dependencies:
     trim "0.0.1"
 
@@ -3838,7 +3726,6 @@ commander@~2.13.0:
 common-tags@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
-  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
 
 commondir@^1.0.1:
   version "1.0.1"
@@ -3928,7 +3815,6 @@ connect-history-api-fallback@^1.3.0:
 connected-react-router@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-6.3.1.tgz#b68e505cca553ce9b6a179d4166cf43b948c85bf"
-  integrity sha512-nhuQiLOAQlCgkCypGSUhycgaqqTh2IUwVFvzw2y13v8JqB92yTk3yeAKG6X1b0IcD7S4gQizYbjgejf7DJjbyw==
   dependencies:
     immutable "^3.8.1"
     seamless-immutable "^7.1.3"
@@ -4044,6 +3930,12 @@ copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
 
+copy-to-clipboard@^3.0.8:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.0.8.tgz#f4e82f4a8830dce4666b7eb8ded0c9bcc313aba9"
+  dependencies:
+    toggle-selection "^1.0.3"
+
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
@@ -4063,7 +3955,6 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
 cosmiconfig@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
-  integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
   dependencies:
     is-directory "^0.3.1"
     js-yaml "^3.9.0"
@@ -4145,7 +4036,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
 create-react-class@^15.6.2:
   version "15.6.3"
   resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
-  integrity sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==
   dependencies:
     fbjs "^0.8.9"
     loose-envify "^1.3.1"
@@ -4171,7 +4061,6 @@ cross-spawn@^3.0.0:
 cross-spawn@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
-  integrity sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=
   dependencies:
     lru-cache "^4.0.1"
     which "^1.2.9"
@@ -4221,7 +4110,6 @@ css-color-keywords@^1.0.0:
 css-loader@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.1.tgz#6885bb5233b35ec47b006057da01cc640b6b79fe"
-  integrity sha512-+ZHAZm/yqvJ2kDtPne3uX0C+Vr3Zn5jFn2N4HywtS5ujwvsVkyg0VArEXpl3BgczDA8anieki1FIzhchX4yrDw==
   dependencies:
     babel-code-frame "^6.26.0"
     css-selector-tokenizer "^0.7.0"
@@ -4254,7 +4142,6 @@ css-loader@^2.0.1:
 css-select-base-adapter@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7"
-  integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==
 
 css-select@^1.1.0, css-select@~1.2.0:
   version "1.2.0"
@@ -4268,7 +4155,6 @@ css-select@^1.1.0, css-select@~1.2.0:
 css-select@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.0.2.tgz#ab4386cec9e1f668855564b17c3733b43b2a5ede"
-  integrity sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==
   dependencies:
     boolbase "^1.0.0"
     css-what "^2.1.2"
@@ -4294,7 +4180,6 @@ css-to-react-native@^2.2.2:
 css-tree@1.0.0-alpha.28:
   version "1.0.0-alpha.28"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.28.tgz#8e8968190d886c9477bc8d61e96f61af3f7ffa7f"
-  integrity sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==
   dependencies:
     mdn-data "~1.1.0"
     source-map "^0.5.3"
@@ -4302,7 +4187,6 @@ css-tree@1.0.0-alpha.28:
 css-tree@1.0.0-alpha.29:
   version "1.0.0-alpha.29"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz#3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39"
-  integrity sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==
   dependencies:
     mdn-data "~1.1.0"
     source-map "^0.5.3"
@@ -4310,7 +4194,6 @@ css-tree@1.0.0-alpha.29:
 css-url-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/css-url-regex/-/css-url-regex-1.1.0.tgz#83834230cc9f74c457de59eebd1543feeb83b7ec"
-  integrity sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=
 
 css-what@2.1:
   version "2.1.0"
@@ -4319,7 +4202,6 @@ css-what@2.1:
 css-what@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.2.tgz#c0876d9d0480927d7d4920dcd72af3595649554d"
-  integrity sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==
 
 cssesc@^0.1.0:
   version "0.1.0"
@@ -4328,7 +4210,6 @@ cssesc@^0.1.0:
 csso@^3.5.0:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b"
-  integrity sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==
   dependencies:
     css-tree "1.0.0-alpha.29"
 
@@ -4415,7 +4296,6 @@ debug@^4.0.0, debug@^4.0.1:
 debug@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
   dependencies:
     ms "^2.1.1"
 
@@ -4489,7 +4369,6 @@ define-properties@^1.1.2, define-properties@~1.1.2:
 define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
   dependencies:
     object-keys "^1.0.12"
 
@@ -4587,7 +4466,6 @@ detect-node@^2.0.3:
 detect-port-alt@1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275"
-  integrity sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==
   dependencies:
     address "^1.0.1"
     debug "^2.6.0"
@@ -4595,7 +4473,6 @@ detect-port-alt@1.1.6:
 detect-port@^1.2.3:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.3.0.tgz#d9c40e9accadd4df5cac6a782aefd014d573d1f1"
-  integrity sha512-E+B1gzkl2gqxt1IhUzwjrxBKRqx1UzC3WLONHinn8S3T6lwV/agVCyitiFOsGJ/eYuEUBvD71MZHy3Pv1G9doQ==
   dependencies:
     address "^1.0.1"
     debug "^2.6.0"
@@ -4673,7 +4550,6 @@ dom-converter@~0.2:
 dom-helpers@^3.3.1:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
-  integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
   dependencies:
     "@babel/runtime" "^7.1.2"
 
@@ -4732,7 +4608,6 @@ domutils@1.5.1, domutils@^1.5.1:
 domutils@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
-  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
   dependencies:
     dom-serializer "0"
     domelementtype "1"
@@ -4752,19 +4627,16 @@ dot-prop@^4.1.0, dot-prop@^4.1.1:
 dotenv-defaults@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/dotenv-defaults/-/dotenv-defaults-1.0.2.tgz#441cf5f067653fca4bbdce9dd3b803f6f84c585d"
-  integrity sha512-iXFvHtXl/hZPiFj++1hBg4lbKwGM+t/GlvELDnRtOFdjXyWP7mubkVr+eZGWG62kdsbulXAef6v/j6kiWc/xGA==
   dependencies:
     dotenv "^6.2.0"
 
 dotenv-expand@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275"
-  integrity sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU=
 
 dotenv-webpack@^1.5.7:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.7.0.tgz#4384d8c57ee6f405c296278c14a9f9167856d3a1"
-  integrity sha512-wwNtOBW/6gLQSkb8p43y0Wts970A3xtNiG/mpwj9MLUhtPCQG6i+/DSXXoNN7fbPCU/vQ7JjwGmgOeGZSSZnsw==
   dependencies:
     dotenv-defaults "^1.0.2"
 
@@ -4775,7 +4647,6 @@ dotenv@^5.0.1:
 dotenv@^6.0.0, dotenv@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
-  integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
 
 duplexer2@0.0.2:
   version "0.0.2"
@@ -4796,7 +4667,6 @@ duplexer3@^0.1.4:
 duplexer@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.6.1"
@@ -4825,12 +4695,10 @@ ee-first@1.1.1:
 ejs@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
-  integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
 
 electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.62:
   version "1.3.113"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9"
-  integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==
 
 electron-to-chromium@^1.3.81:
   version "1.3.82"
@@ -4859,7 +4727,6 @@ emoji-regex@^6.5.1:
 emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
 emojis-list@^2.0.0:
   version "2.1.0"
@@ -4971,7 +4838,6 @@ es-abstract@^1.10.0, es-abstract@^1.5.0, es-abstract@^1.5.1, es-abstract@^1.7.0:
 es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.4.3, es-abstract@^1.9.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
-  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
   dependencies:
     es-to-primitive "^1.2.0"
     function-bind "^1.1.1"
@@ -5000,7 +4866,6 @@ es-to-primitive@^1.1.1:
 es-to-primitive@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
-  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
   dependencies:
     is-callable "^1.1.4"
     is-date-object "^1.0.1"
@@ -5009,7 +4874,6 @@ es-to-primitive@^1.2.0:
 es5-shim@^4.5.10:
   version "4.5.12"
   resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.12.tgz#508c13dda1c87dd3df1b50e69e7b96b82149b649"
-  integrity sha512-MjoCAHE6P2Dirme70Cxd9i2Ng8rhXiaVSsxDWdSwimfLERJL/ypR2ed2rTYkeeYrMk8gq281dzKLiGcdrmc8qg==
 
 es6-promise@^3.2.1:
   version "3.3.1"
@@ -5028,9 +4892,8 @@ es6-promisify@^5.0.0:
 es6-shim@^0.35.3:
   version "0.35.4"
   resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.4.tgz#8d5a4109756383d3f0323421089c423acf8378f1"
-  integrity sha512-oJidbXjN/VWXZJs41E9JEqWzcFbjt43JupimIoVX82Thzt5qy1CiYezdhRmWkj3KOuwJ106IG/ZZrcFC6fgIUQ==
 
-escape-html@~1.0.3:
+escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
 
@@ -5260,7 +5123,6 @@ events@^1.0.0:
 eventsource@0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
-  integrity sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=
   dependencies:
     original ">=0.0.5"
 
@@ -5310,7 +5172,6 @@ execall@^1.0.0:
 exenv@^1.2.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d"
-  integrity sha1-KueOhdmJQVhnCwPUe+wfA72Ru50=
 
 expand-brackets@^0.1.4:
   version "0.1.5"
@@ -5580,7 +5441,6 @@ file-loader@^2.0.0:
 file-system-cache@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/file-system-cache/-/file-system-cache-1.0.5.tgz#84259b36a2bbb8d3d6eb1021d3132ffe64cfff4f"
-  integrity sha1-hCWbNqK7uNPW6xAh0xMv/mTP/08=
   dependencies:
     bluebird "^3.3.5"
     fs-extra "^0.30.0"
@@ -5593,7 +5453,6 @@ filename-regex@^2.0.0:
 filesize@3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
-  integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==
 
 fill-range@^2.1.0:
   version "2.2.4"
@@ -5645,7 +5504,6 @@ find-cache-dir@^1.0.0:
 find-cache-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
-  integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==
   dependencies:
     commondir "^1.0.1"
     make-dir "^1.0.0"
@@ -5745,7 +5603,6 @@ follow-redirects@^1.0.0:
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
-  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
@@ -5820,7 +5677,6 @@ fs-exists-sync@^0.1.0:
 fs-extra@^0.30.0:
   version "0.30.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
-  integrity sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^2.1.0"
@@ -5839,7 +5695,6 @@ fs-extra@^7.0.0:
 fs-extra@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
@@ -5915,7 +5770,6 @@ functional-red-black-tree@^1.0.1:
 fuse.js@^3.0.1, fuse.js@^3.3.0:
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.4.2.tgz#d7a638c436ecd7b9c4c0051478c09594eb956212"
-  integrity sha512-WVbrm+cAxPtyMqdtL7cYhR7aZJPhtOfjNClPya8GKMVukKDYs7pEnPINeRVX1C9WmWgU8MdYGYbUPAP2AJXdoQ==
 
 gauge@~2.7.1, gauge@~2.7.3:
   version "2.7.4"
@@ -6248,7 +6102,6 @@ graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6,
 graceful-fs@^4.1.9:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
-  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
 graceful-fs@~1.2.0:
   version "1.2.3"
@@ -6341,7 +6194,6 @@ gulplog@^1.0.0:
 gzip-size@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.0.0.tgz#a55ecd99222f4c48fd8c01c625ce3b349d0a0e80"
-  integrity sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==
   dependencies:
     duplexer "^0.1.1"
     pify "^3.0.0"
@@ -6462,7 +6314,6 @@ hash.js@^1.0.0, hash.js@^1.0.3:
 hast-util-from-parse5@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-5.0.0.tgz#a505a05766e0f96e389bfb0b1dd809eeefcef47b"
-  integrity sha512-A7ev5OseS/J15214cvDdcI62uwovJO2PB60Xhnq7kaxvvQRFDEccuqbkrFXU03GPBGopdPqlpQBRqIcDS/Fjbg==
   dependencies:
     ccount "^1.0.3"
     hastscript "^5.0.0"
@@ -6473,12 +6324,10 @@ hast-util-from-parse5@^5.0.0:
 hast-util-parse-selector@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.1.tgz#4ddbae1ae12c124e3eb91b581d2556441766f0ab"
-  integrity sha512-Xyh0v+nHmQvrOqop2Jqd8gOdyQtE8sIP9IQf7mlVDqp924W4w/8Liuguk2L2qei9hARnQSG2m+wAOCxM7npJVw==
 
 hastscript@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-5.0.0.tgz#fee10382c1bc4ba3f1be311521d368c047d2c43a"
-  integrity sha512-xJtuJ8D42Xtq5yJrnDg/KAIxl2cXBXKoiIJwmWX9XMf8113qHTGl/Bf7jEsxmENJ4w6q4Tfl8s/Y6mEZo8x8qw==
   dependencies:
     comma-separated-tokens "^1.0.0"
     hast-util-parse-selector "^2.2.0"
@@ -6505,7 +6354,6 @@ he@1.2.x:
 history@^4.7.2:
   version "4.7.2"
   resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b"
-  integrity sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA==
   dependencies:
     invariant "^2.2.1"
     loose-envify "^1.2.0"
@@ -6528,7 +6376,6 @@ hoek@2.x.x:
 hoist-non-react-statics@1.x.x, hoist-non-react-statics@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
-  integrity sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=
 
 hoist-non-react-statics@^2.5.0:
   version "2.5.5"
@@ -6537,7 +6384,6 @@ hoist-non-react-statics@^2.5.0:
 hoist-non-react-statics@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
-  integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
   dependencies:
     react-is "^16.7.0"
 
@@ -6603,7 +6449,6 @@ html-webpack-plugin@^3.2.0:
 html-webpack-plugin@^4.0.0-beta.2:
   version "4.0.0-beta.5"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.5.tgz#2c53083c1151bfec20479b1f8aaf0039e77b5513"
-  integrity sha512-y5l4lGxOW3pz3xBTFdfB9rnnrWRPVxlAhX6nrBYIcW+2k2zC3mSp/3DxlWVCMBfnO6UAnoF8OcFn0IMy6kaKAQ==
   dependencies:
     html-minifier "^3.5.20"
     loader-utils "^1.1.0"
@@ -6744,7 +6589,6 @@ icss-replace-symbols@^1.1.0:
 icss-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
-  integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=
   dependencies:
     postcss "^6.0.1"
 
@@ -6783,7 +6627,6 @@ ignore@^4.0.0, ignore@^4.0.6:
 immer@1.7.2:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/immer/-/immer-1.7.2.tgz#a51e9723c50b27e132f6566facbec1c85fc69547"
-  integrity sha512-4Urocwu9+XLDJw4Tc6ZCg7APVjjLInCFvO4TwGsAYV5zT6YYSor14dsZR0+0tHlDIN92cFUOq+i7fC00G5vTxA==
 
 immutable@^3.8.1:
   version "3.8.1"
@@ -6792,7 +6635,6 @@ immutable@^3.8.1:
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
-  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
   dependencies:
     import-from "^2.1.0"
 
@@ -6907,7 +6749,6 @@ inquirer@6.2.0, inquirer@^6.1.0:
 inquirer@^6.2.0:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406"
-  integrity sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==
   dependencies:
     ansi-escapes "^3.2.0"
     chalk "^2.4.2"
@@ -6937,7 +6778,6 @@ interpret@^0.6.2:
 interpret@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
-  integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
 
 interpret@^1.1.0:
   version "1.1.0"
@@ -7111,7 +6951,6 @@ is-directory@^0.3.1:
 is-dom@^1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/is-dom/-/is-dom-1.0.9.tgz#483832d52972073de12b9fe3f60320870da8370d"
-  integrity sha1-SDgy1SlyBz3hK5/j9gMghw2oNw0=
 
 is-dotfile@^1.0.0:
   version "1.0.3"
@@ -7314,7 +7153,6 @@ is-retry-allowed@^1.0.0:
 is-root@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.0.0.tgz#838d1e82318144e5a6f77819d90207645acc7019"
-  integrity sha512-F/pJIk8QD6OX5DNhRB7hWamLsUilmkDGho48KbgZ6xg/lmAZXHxzXQ91jzB3yRSw5kdQGGGc4yz8HYhTYIMWPg==
 
 is-ssh@^1.3.0:
   version "1.3.0"
@@ -7345,7 +7183,6 @@ is-symbol@^1.0.1:
 is-symbol@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
-  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
   dependencies:
     has-symbols "^1.0.0"
 
@@ -7458,7 +7295,6 @@ 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"
-  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
 js-yaml@^3.12.0, js-yaml@^3.9.0:
   version "3.12.0"
@@ -7546,14 +7382,12 @@ json5@^0.5.0:
 json5@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
-  integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==
   dependencies:
     minimist "^1.2.0"
 
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
   optionalDependencies:
     graceful-fs "^4.1.6"
 
@@ -7604,7 +7438,6 @@ kew@^0.7.0:
 keycode@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
-  integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=
 
 killable@^1.0.0:
   version "1.0.1"
@@ -7617,7 +7450,6 @@ kind-of@^1.1.0:
 kind-of@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5"
-  integrity sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=
   dependencies:
     is-buffer "^1.0.2"
 
@@ -7644,7 +7476,6 @@ kind-of@^6.0.0, kind-of@^6.0.2:
 klaw@^1.0.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
-  integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk=
   optionalDependencies:
     graceful-fs "^4.1.9"
 
@@ -7661,7 +7492,6 @@ latest-version@^3.0.0:
 lazy-cache@^0.2.3:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
-  integrity sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=
 
 lazy-cache@^1.0.3:
   version "1.0.4"
@@ -7674,7 +7504,6 @@ lazy-property@~1.0.0:
 lazy-universal-dotenv@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lazy-universal-dotenv/-/lazy-universal-dotenv-2.0.0.tgz#e015ad9f77be9ef811956d53ea9519b1c0ab0214"
-  integrity sha512-1Wi0zgZMfRLaRAK21g3odYuU+HE1d85Loe2tb44YhcNwIzhmD49mTPR9aKckpB9Q9Q9mA+hUMLI2xlkcCAe3yw==
   dependencies:
     "@babel/runtime" "^7.0.0"
     app-root-dir "^1.0.2"
@@ -7999,7 +7828,6 @@ lodash.restparam@^3.0.0:
 lodash.some@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
-  integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
 
 lodash.template@^3.0.0:
   version "3.6.2"
@@ -8038,14 +7866,14 @@ lodash.without@~4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
 
+lodash@>4.17.4, lodash@^4.0.1, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.5, lodash@^4.2.0:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+
 lodash@^4.0.0, lodash@^4.11.1, lodash@^4.17.4, lodash@^4.2.1, lodash@~4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
-lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.5, lodash@^4.2.0:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-
 lodash@^4.17.10, lodash@^4.8.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
@@ -8130,7 +7958,6 @@ make-dir@^1.0.0:
 make-error@^1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
-  integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
 
 "make-fetch-happen@^2.5.0 || 3 || 4", make-fetch-happen@^4.0.1:
   version "4.0.1"
@@ -8210,6 +8037,10 @@ marked@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.4.0.tgz#9ad2c2a7a1791f10a852e0112f77b571dce10c66"
 
+material-colors@^1.2.1:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
+
 math-random@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
@@ -8235,7 +8066,6 @@ mdast-util-compact@^1.0.0:
 mdn-data@~1.1.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01"
-  integrity sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==
 
 meant@~1.0.1:
   version "1.0.1"
@@ -8316,7 +8146,6 @@ meow@^5.0.0:
 merge-deep@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/merge-deep/-/merge-deep-3.0.2.tgz#f39fa100a4f1bd34ff29f7d2bf4508fbb8d83ad2"
-  integrity sha512-T7qC8kg4Zoti1cFd8Cr0M+qaZfOwjlPDEdZIIPPB2JZctjaPM4fX+i7HOId69tAti2fvO6X5ldfYUONDODsrkA==
   dependencies:
     arr-union "^3.1.0"
     clone-deep "^0.2.4"
@@ -8408,7 +8237,6 @@ min-document@^2.19.0:
 mini-css-extract-plugin@^0.4.4:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.5.tgz#c99e9e78d54f3fa775633aee5933aeaa4e80719a"
-  integrity sha512-dqBanNfktnp2hwL2YguV9Jh91PFX7gu7nRLs4TGsbAfAG6WOtlynFRYzwDwmmeSb5uIwHo9nx1ta0f7vAZVp2w==
   dependencies:
     loader-utils "^1.1.0"
     schema-utils "^1.0.0"
@@ -8517,7 +8345,6 @@ mixin-deep@^1.2.0:
 mixin-object@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
-  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
   dependencies:
     for-in "^0.1.3"
     is-extendable "^0.1.1"
@@ -8687,7 +8514,6 @@ no-case@^2.2.0:
 node-dir@^0.1.10:
   version "0.1.17"
   resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
-  integrity sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=
   dependencies:
     minimatch "^3.0.2"
 
@@ -8719,7 +8545,6 @@ node-fetch@^2.1.1:
 node-fetch@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.3.0.tgz#1a1d940bbfb916a1d3e0219f037e89e71f8c5fa5"
-  integrity sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==
 
 node-forge@0.7.5:
   version "0.7.5"
@@ -8792,7 +8617,6 @@ node-pre-gyp@^0.10.0:
 node-releases@^1.0.0-alpha.11, node-releases@^1.1.3:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.7.tgz#b09a10394d0ed8f7778f72bb861dde68b146303b"
-  integrity sha512-bKdrwaqJUPHqlCzDD7so/R+Nk0jGv9a11ZhLrD9f6i947qGLrGAhU3OxRENa19QQmwzGy/g6zCDEuLGDO8HPvA==
   dependencies:
     semver "^5.3.0"
 
@@ -8835,7 +8659,6 @@ node-sass@^4.9.4:
 node-version@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.2.0.tgz#34fde3ffa8e1149bd323983479dda620e1b5060d"
-  integrity sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==
 
 nomnom@~1.6.2:
   version "1.6.2"
@@ -9146,7 +8969,6 @@ npmlog@^4.0.0:
 nth-check@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
-  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
   dependencies:
     boolbase "~1.0.0"
 
@@ -9219,7 +9041,6 @@ object-keys@^1.0.11:
 object-keys@^1.0.12:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
-  integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
 
 object-keys@^1.0.8, object-keys@^1.0.9:
   version "1.0.11"
@@ -9256,7 +9077,6 @@ object.entries@^1.0.4:
 object.fromentries@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-1.0.0.tgz#e90ec27445ec6e37f48be9af9077d9aa8bef0d40"
-  integrity sha512-F7XUm84lg0uNXNzrRAC5q8KJe0yYaxgLU9hTSqWYM6Rfnh0YjP24EG3xq7ncj2Wu1AdfueNHKCOlamIonG4UHQ==
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.11.0"
@@ -9627,7 +9447,6 @@ parse5@^3.0.1:
 parse5@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
-  integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==
 
 parseurl@~1.3.2:
   version "1.3.2"
@@ -9782,7 +9601,6 @@ pkg-dir@^3.0.0:
 pkg-up@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
-  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
   dependencies:
     find-up "^2.1.0"
 
@@ -9824,7 +9642,6 @@ posix-character-classes@^0.1.0:
 postcss-flexbugs-fixes@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.1.0.tgz#e094a9df1783e2200b7b19f875dcad3b3aff8b20"
-  integrity sha512-jr1LHxQvStNNAHlgco6PzY308zvLklh7SJVYuWUwyUQncofaAlD2l+P/gxKHOdqWKe7xJSkVLFF/2Tp+JqMSZA==
   dependencies:
     postcss "^7.0.0"
 
@@ -9851,7 +9668,6 @@ postcss-less@^3.0.1:
 postcss-load-config@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"
-  integrity sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==
   dependencies:
     cosmiconfig "^4.0.0"
     import-cwd "^2.0.0"
@@ -9859,7 +9675,6 @@ postcss-load-config@^2.0.0:
 postcss-loader@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
-  integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
   dependencies:
     loader-utils "^1.1.0"
     postcss "^7.0.0"
@@ -9880,7 +9695,6 @@ postcss-media-query-parser@^0.2.3:
 postcss-modules-extract-imports@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a"
-  integrity sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==
   dependencies:
     postcss "^6.0.1"
 
@@ -9893,7 +9707,6 @@ postcss-modules-extract-imports@^2.0.0:
 postcss-modules-local-by-default@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
-  integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=
   dependencies:
     css-selector-tokenizer "^0.7.0"
     postcss "^6.0.1"
@@ -9909,7 +9722,6 @@ postcss-modules-local-by-default@^2.0.2:
 postcss-modules-scope@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
-  integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A=
   dependencies:
     css-selector-tokenizer "^0.7.0"
     postcss "^6.0.1"
@@ -9924,7 +9736,6 @@ postcss-modules-scope@^2.0.0:
 postcss-modules-values@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
-  integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=
   dependencies:
     icss-replace-symbols "^1.1.0"
     postcss "^6.0.1"
@@ -10007,7 +9818,6 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.3, postcss@^7.0.5:
 postcss@^7.0.14:
   version "7.0.14"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
-  integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -10083,7 +9893,6 @@ promise-inflight@^1.0.1, promise-inflight@~1.0.1:
 promise-polyfill@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-6.1.0.tgz#dfa96943ea9c121fca4de9b5868cb39d3472e057"
-  integrity sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=
 
 promise-retry@^1.1.1:
   version "1.1.1"
@@ -10095,7 +9904,6 @@ promise-retry@^1.1.1:
 promise.prototype.finally@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.0.tgz#66f161b1643636e50e7cf201dc1b84a857f3864e"
-  integrity sha512-7p/K2f6dI+dM8yjRQEGrTQs5hTQixUAdOGpMEA3+pVxpX5oHKRSKAXyLw9Q9HUWDTdwtoo39dSHGQtN90HcEwQ==
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.9.0"
@@ -10122,7 +9930,6 @@ promzard@^0.3.0:
 prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.5.9:
   version "15.7.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.1.tgz#2fa61e0a699d428b40320127733ee2931f05d9d1"
-  integrity sha512-f8Lku2z9kERjOCcnDOPm68EBJAO2K00Q5mSgPAUE/gJuBgsYLbVy6owSrtcHj90zt8PvW+z0qaIIgsIhHOa1Qw==
   dependencies:
     object-assign "^4.1.1"
     react-is "^16.8.1"
@@ -10137,7 +9944,6 @@ prop-types@^15.5.4:
 prop-types@^15.6.0:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
-  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
   dependencies:
     loose-envify "^1.4.0"
     object-assign "^4.1.1"
@@ -10153,7 +9959,6 @@ prop-types@^15.6.1, prop-types@^15.6.2:
 property-information@^5.0.0, property-information@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.0.1.tgz#c3b09f4f5750b1634c0b24205adbf78f18bdf94f"
-  integrity sha512-nAtBDVeSwFM3Ot/YxT7s4NqZmqXI7lLzf46BThvotEtYf2uk2yH0ACYuWQkJ7gxKs49PPtKVY0UlDGkyN9aJlw==
   dependencies:
     xtend "^4.0.1"
 
@@ -10351,7 +10156,6 @@ qs@6.5.2, qs@~6.5.2:
 qs@^6.5.2:
   version "6.6.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.6.0.tgz#a99c0f69a8d26bf7ef012f871cdabb0aee4424c2"
-  integrity sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==
 
 qs@~6.4.0:
   version "6.4.0"
@@ -10397,7 +10201,6 @@ railroad-diagrams@^1.0.0:
 ramda@^0.21.0:
   version "0.21.0"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.21.0.tgz#a001abedb3ff61077d4ff1d577d44de77e8d0a35"
-  integrity sha1-oAGr7bP/YQd9T/HVd9RN536NCjU=
 
 randexp@0.4.6:
   version "0.4.6"
@@ -10453,10 +10256,20 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+react-color@^2.14.1:
+  version "2.17.0"
+  resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.17.0.tgz#e14b8a11f4e89163f65a34c8b43faf93f7f02aaa"
+  dependencies:
+    "@icons/material" "^0.2.4"
+    lodash ">4.17.4"
+    material-colors "^1.2.1"
+    prop-types "^15.5.10"
+    reactcss "^1.2.0"
+    tinycolor2 "^1.4.1"
+
 react-dev-utils@^6.1.0:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-6.1.1.tgz#a07e3e8923c4609d9f27e5af5207e3ca20724895"
-  integrity sha512-ThbJ86coVd6wV/QiTo8klDTvdAJ1WsFCGQN07+UkN+QN9CtCSsl/+YuDJToKGeG8X4j9HMGXNKbk2QhPAZr43w==
   dependencies:
     "@babel/code-frame" "7.0.0"
     address "1.0.3"
@@ -10486,7 +10299,6 @@ react-dev-utils@^6.1.0:
 react-docgen@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-3.0.0.tgz#79c6e1b1870480c3c2bc1a65bede0577a11c38cd"
-  integrity sha512-2UseoLWabFNXuk1Foz4VDPSIAkxz+1Hmmq4qijzUmYHDq0ZSloKDLXtGLpQRcAi/M76hRpPtH1rV4BI5jNAOnQ==
   dependencies:
     "@babel/parser" "^7.1.3"
     "@babel/runtime" "^7.0.0"
@@ -10508,7 +10320,6 @@ react-dom@^16.6.0:
 react-dom@^16.6.3, react-dom@^16.7.0:
   version "16.8.1"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.1.tgz#ec860f98853d09d39bafd3a6f1e12389d283dbb4"
-  integrity sha512-N74IZUrPt6UiDjXaO7UbDDFXeUXnVhZzeRLy/6iqqN1ipfjrhR60Bp5NuBK+rv3GMdqdIuwIl22u1SYwf330bg==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -10518,12 +10329,10 @@ react-dom@^16.6.3, react-dom@^16.7.0:
 react-error-overlay@^5.1.0:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-5.1.3.tgz#16fcbde75ed4dc6161dc6dc959b48e92c6ffa9ad"
-  integrity sha512-GoqeM3Xadie7XUApXOjkY3Qhs8RkwB/Za4WMedBGrOKH1eTuKGyoAECff7jiVonJchOx6KZ9i8ILO5XIoHB+Tg==
 
 react-fuzzy@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/react-fuzzy/-/react-fuzzy-0.5.2.tgz#fc13bf6f0b785e5fefe908724efebec4935eaefe"
-  integrity sha512-qIZZxaCheb/HhcBi5fABbiCFg85+K5r1TCps1D4uaL0LAMMD/1zm/x1/kNR130Tx7nnY9V7mbFyY0DquPYeLAw==
   dependencies:
     babel-runtime "^6.23.0"
     classnames "^2.2.5"
@@ -10544,7 +10353,6 @@ react-hot-loader@^4.3.11:
 react-inspector@^2.3.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-2.3.1.tgz#f0eb7f520669b545b441af9d38ec6d706e5f649c"
-  integrity sha512-tUUK7t3KWgZEIUktOYko5Ic/oYwvjEvQUFAGC1UeMeDaQ5za2yZFtItJa2RTwBJB//NxPr000WQK6sEbqC6y0Q==
   dependencies:
     babel-runtime "^6.26.0"
     is-dom "^1.0.9"
@@ -10557,7 +10365,6 @@ react-is@^16.6.0:
 react-is@^16.6.3, react-is@^16.7.0, react-is@^16.8.1:
   version "16.8.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.1.tgz#a80141e246eb894824fb4f2901c0c50ef31d4cdb"
-  integrity sha512-ioMCzVDWvCvKD8eeT+iukyWrBGrA3DiFYkXfBsVYIRdaREZuBjENG+KjrikavCLasozqRWTwFUagU/O4vPpRMA==
 
 react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4:
   version "3.0.4"
@@ -10566,7 +10373,6 @@ react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4:
 react-modal@^3.6.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.8.1.tgz#7300f94a6f92a2e17994de0be6ccb61734464c9e"
-  integrity sha512-aLKeZM9pgXpIKVwopRHMuvqKWiBajkqisDA8UzocdCF6S4fyKVfLWmZR5G1Q0ODBxxxxf2XIwiCP8G/11GJAuw==
   dependencies:
     exenv "^1.2.0"
     prop-types "^15.5.10"
@@ -10576,7 +10382,6 @@ react-modal@^3.6.1:
 react-redux@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-6.0.0.tgz#09e86eeed5febb98e9442458ad2970c8f1a173ef"
-  integrity sha512-EmbC3uLl60pw2VqSSkj6HpZ6jTk12RMrwXMBdYtM6niq0MdEaRq9KYCwpJflkOZj349BLGQm1MI/JO1W96kLWQ==
   dependencies:
     "@babel/runtime" "^7.2.0"
     hoist-non-react-statics "^3.2.1"
@@ -10611,7 +10416,6 @@ react-router@^4.3.1:
 react-split-pane@^0.1.84:
   version "0.1.85"
   resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.85.tgz#64819946a99b617ffa2d20f6f45a0056b6ee4faa"
-  integrity sha512-3GhaYs6+eVNrewgN4eQKJoNMQ4pcegNMTMhR5bO/NFO91K6/98qdD1sCuWPpsefCjzxNTjkvVYWQC0bMaC45mA==
   dependencies:
     prop-types "^15.5.10"
     react "^16.6.3"
@@ -10622,14 +10426,12 @@ react-split-pane@^0.1.84:
 react-style-proptype@^3.0.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/react-style-proptype/-/react-style-proptype-3.2.2.tgz#d8e998e62ce79ec35b087252b90f19f1c33968a0"
-  integrity sha512-ywYLSjNkxKHiZOqNlso9PZByNEY+FTyh3C+7uuziK0xFXu9xzdyfHwg4S9iyiRRoPCR4k2LqaBBsWVmSBwCWYQ==
   dependencies:
     prop-types "^15.5.4"
 
 react-textarea-autosize@^7.0.4:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-7.1.0.tgz#3132cb77e65d94417558d37c0bfe415a5afd3445"
-  integrity sha512-c2FlR/fP0qbxmlrW96SdrbgP/v0XZMTupqB90zybvmDVDutytUgPl7beU35klwcTeMepUIQEpQUn3P3bdshGPg==
   dependencies:
     "@babel/runtime" "^7.1.2"
     prop-types "^15.6.0"
@@ -10637,7 +10439,6 @@ react-textarea-autosize@^7.0.4:
 react-transition-group@^2.0.0:
   version "2.5.3"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.5.3.tgz#26de363cab19e5c88ae5dbae105c706cf953bb92"
-  integrity sha512-2DGFck6h99kLNr8pOFk+z4Soq3iISydwOFeeEVPjTN6+Y01CmvbWmnN02VuTWyFdnRtIDPe+wy2q6Ui8snBPZg==
   dependencies:
     dom-helpers "^3.3.1"
     loose-envify "^1.4.0"
@@ -10647,7 +10448,6 @@ react-transition-group@^2.0.0:
 react-treebeard@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/react-treebeard/-/react-treebeard-3.1.0.tgz#e380b9e75f900e538044280ac365d29092583642"
-  integrity sha512-u4OEzwZk1Xcxp2s55Ny/Ofp8fHRwlabKOAeGbzQ7XUE9YXFbPj8ajl0FInbXEP4Ys9+E1vHCtgqJ6VBsgbCPVg==
   dependencies:
     "@babel/runtime" "^7.0.0"
     "@emotion/core" "^0.13.1"
@@ -10669,13 +10469,18 @@ react@^16.6.0:
 react@^16.6.3, react@^16.7.0:
   version "16.8.1"
   resolved "https://registry.yarnpkg.com/react/-/react-16.8.1.tgz#ae11831f6cb2a05d58603a976afc8a558e852c4a"
-  integrity sha512-wLw5CFGPdo7p/AgteFz7GblI2JPOos0+biSoxf1FPsGxWQZdN/pj6oToJs1crn61DL3Ln7mN86uZ4j74p31ELQ==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
     scheduler "^0.13.1"
 
+reactcss@^1.2.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
+  dependencies:
+    lodash "^4.0.1"
+
 read-cmd-shim@^1.0.1, read-cmd-shim@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
@@ -10852,7 +10657,6 @@ readdirp@^2.0.0:
 recast@^0.14.7:
   version "0.14.7"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.14.7.tgz#4f1497c2b5826d42a66e8e3c9d80c512983ff61d"
-  integrity sha512-/nwm9pkrcWagN40JeJhkPaRxiHXBRkXyRh/hgU088Z/v+qCy+zIHHY6bC6o7NaKAxPqtE6nD8zBH1LfU0/Wx6A==
   dependencies:
     ast-types "0.11.3"
     esprima "~4.0.0"
@@ -10862,7 +10666,6 @@ recast@^0.14.7:
 recast@^0.16.0:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.16.2.tgz#3796ebad5fe49ed85473b479cd6df554ad725dc2"
-  integrity sha512-O/7qXi51DPjRVdbrpNzoBQH5dnAPQNbfoOFyRiUwreTMJfIHYOEBzwuH+c0+/BTSJ3CQyKs6ILSWXhESH6Op3A==
   dependencies:
     ast-types "0.11.7"
     esprima "~4.0.0"
@@ -10878,7 +10681,6 @@ rechoir@^0.6.2:
 recursive-readdir@2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f"
-  integrity sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==
   dependencies:
     minimatch "3.0.4"
 
@@ -11025,7 +10827,6 @@ regex-not@^1.0.0, regex-not@^1.0.2:
 regexp-tree@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.1.tgz#27b455f9b138ca2e84c090e9aff1ffe2a04d97fa"
-  integrity sha512-HwRjOquc9QOwKTgbxvZTcddS5mlNlwePMQ3NFL8broajMLD5CXDAqas8Y5yxJH5QtZp5iRor3YCILd5pz71Cgw==
   dependencies:
     cli-table3 "^0.5.0"
     colors "^1.1.2"
@@ -11034,7 +10835,6 @@ regexp-tree@^0.1.0:
 regexp.prototype.flags@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c"
-  integrity sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==
   dependencies:
     define-properties "^1.1.2"
 
@@ -11097,7 +10897,6 @@ regjsparser@^0.3.0:
 rehype-parse@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/rehype-parse/-/rehype-parse-6.0.0.tgz#f681555f2598165bee2c778b39f9073d17b16bca"
-  integrity sha512-V2OjMD0xcSt39G4uRdMTqDXXm6HwkUbLMDayYKA/d037j8/OtVSQ+tqKwYWOuyBeoCs/3clXRe30VUjeMDTBSA==
   dependencies:
     hast-util-from-parse5 "^5.0.0"
     parse5 "^5.0.0"
@@ -11188,7 +10987,6 @@ remove-trailing-separator@^1.0.1:
 render-fragment@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/render-fragment/-/render-fragment-0.1.1.tgz#b231f259b7eee333d34256aee0ef3169be7bef30"
-  integrity sha512-+DnAcalJYR8GE5VRuQGGu78Q0GDe8EXnkuk4DF8gbAhIeS6LRt4j+aaggLLj4PtQVfXNC61McXvXI58WqmRleQ==
 
 renderkid@^2.0.1:
   version "2.0.2"
@@ -11285,7 +11083,6 @@ require-directory@^2.1.1:
 require-from-string@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
 require-main-filename@^1.0.1:
   version "1.0.1"
@@ -11430,14 +11227,12 @@ rxjs@^6.1.0:
 rxjs@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
-  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
   dependencies:
     tslib "^1.9.0"
 
 safe-buffer@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-  integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
 
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
@@ -11502,7 +11297,6 @@ scheduler@^0.10.0:
 scheduler@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.1.tgz#1a217df1bfaabaf4f1b92a9127d5d732d85a9591"
-  integrity sha512-VJKOkiKIN2/6NOoexuypwSrybx13MY7NSy9RNt8wPvZDMRT1CW6qlpF5jXRToXNHz3uWzbm2elNpZfXfGPqP9A==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -11532,7 +11326,6 @@ scss-tokenizer@^0.2.3:
 seamless-immutable@^7.1.3:
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/seamless-immutable/-/seamless-immutable-7.1.4.tgz#6e9536def083ddc4dea0207d722e0e80d0f372f8"
-  integrity sha512-XiUO1QP4ki4E2PHegiGAlu6r82o5A+6tRh7IkGGTVg/h+UoeX4nFBeCGPOhb4CYjvkqsfm/TUtvOMYC1xmV30A==
 
 select-hose@^2.0.0:
   version "2.0.0"
@@ -11650,7 +11443,6 @@ serialize-javascript@^1.4.0:
 serve-favicon@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/serve-favicon/-/serve-favicon-2.5.0.tgz#935d240cdfe0f5805307fdfe967d88942a2cbcf0"
-  integrity sha1-k10kDN/g9YBTB/3+ln2IlCosvPA=
   dependencies:
     etag "~1.8.1"
     fresh "0.5.2"
@@ -11726,7 +11518,6 @@ sha@~2.0.1:
 shallow-clone@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060"
-  integrity sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=
   dependencies:
     is-extendable "^0.1.1"
     kind-of "^2.0.1"
@@ -11750,7 +11541,6 @@ shebang-regex@^1.0.0:
 shell-quote@1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
-  integrity sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=
   dependencies:
     array-filter "~0.0.0"
     array-map "~0.0.0"
@@ -11760,7 +11550,6 @@ shell-quote@1.6.1:
 shelljs@^0.8.2:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.3.tgz#a7f3319520ebf09ee81275b2368adb286659b097"
-  integrity sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
@@ -11875,7 +11664,6 @@ socketcluster-client@^13.0.0:
 sockjs-client@1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.5.tgz#1bb7c0f7222c40f42adf14f4442cbd1269771a83"
-  integrity sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=
   dependencies:
     debug "^2.6.6"
     eventsource "0.1.6"
@@ -11965,7 +11753,6 @@ source-map-support@^0.5.9:
 source-map-support@~0.5.9:
   version "0.5.10"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
-  integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -12007,7 +11794,6 @@ sourcemapped-stacktrace@^1.1.6:
 space-separated-tokens@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.2.tgz#e95ab9d19ae841e200808cd96bc7bd0adbbb3412"
-  integrity sha512-G3jprCEw+xFEs0ORweLmblJ3XLymGGr6hxZYTYZjIlvDti9vOBUjRQa1Rzjt012aRrocKstHwdNi+F7HguPsEA==
   dependencies:
     trim "0.0.1"
 
@@ -12022,7 +11808,6 @@ spawn-error-forwarder@~1.0.0:
 spawn-promise@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/spawn-promise/-/spawn-promise-0.1.8.tgz#a5bea98814c48f52cbe02720e7fe2d6fc3b5119a"
-  integrity sha512-pTkEOFxvYLq9SaI1d8bwepj0yD9Yyz65+4e979YZLv/L3oYPxZpDTabcm6e+KIZniGK9mQ+LGrwB5s1v2z67nQ==
   dependencies:
     co "^4.6.0"
 
@@ -12139,7 +11924,6 @@ ssri@^6.0.0:
 stable@~0.1.6:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
-  integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
 stackframe@^0.3.1:
   version "0.3.1"
@@ -12245,7 +12029,6 @@ string-width@^2.0.0:
 string-width@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.0.0.tgz#5a1690a57cc78211fffd9bf24bbe24d090604eb1"
-  integrity sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==
   dependencies:
     emoji-regex "^7.0.1"
     is-fullwidth-code-point "^2.0.0"
@@ -12254,7 +12037,6 @@ string-width@^3.0.0:
 string.prototype.matchall@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-3.0.1.tgz#5a9e0b64bcbeb336aa4814820237c2006985646d"
-  integrity sha512-NSiU0ILQr9PQ1SZmM1X327U5LsM+KfDTassJfqN1al1+0iNpKzmQ4BfXOJwRnTEqv8nKJ67mFpqRoPaGWwvy5A==
   dependencies:
     define-properties "^1.1.3"
     es-abstract "^1.12.0"
@@ -12265,7 +12047,6 @@ string.prototype.matchall@^3.0.0:
 string.prototype.padend@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
-  integrity sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.4.3"
@@ -12274,7 +12055,6 @@ string.prototype.padend@^3.0.0:
 string.prototype.padstart@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/string.prototype.padstart/-/string.prototype.padstart-3.0.0.tgz#5bcfad39f4649bb2d031292e19bcf0b510d4b242"
-  integrity sha1-W8+tOfRkm7LQMSkuGbzwtRDUskI=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.4.3"
@@ -12336,7 +12116,6 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
 strip-ansi@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
-  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
   dependencies:
     ansi-regex "^4.0.0"
 
@@ -12507,7 +12286,6 @@ supports-color@^5.1.0, supports-color@^5.4.0, supports-color@^5.5.0:
 supports-color@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
   dependencies:
     has-flag "^3.0.0"
 
@@ -12525,7 +12303,6 @@ svg-url-loader@^2.0.2, svg-url-loader@^2.3.2:
 svgo@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.1.1.tgz#12384b03335bcecd85cfa5f4e3375fed671cb985"
-  integrity sha512-GBkJbnTuFpM4jFbiERHDWhZc/S/kpHToqmZag3aEBjPYK44JAN2QBjvrGIxLOoCyMZjuFQIfTO2eJd8uwLY/9g==
   dependencies:
     coa "~2.0.1"
     colors "~1.1.2"
@@ -12553,7 +12330,6 @@ symbol-observable@^1.0.2, symbol-observable@^1.2.0:
 symbol.prototype.description@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/symbol.prototype.description/-/symbol.prototype.description-1.0.0.tgz#6e355660eb1e44ca8ad53a68fdb72ef131ca4b12"
-  integrity sha512-I9mrbZ5M96s7QeJDv95toF1svkUjeBybe8ydhY7foPaBmr0SPJMFupArmMkDrOKTTj0sJVr+nvQNxWLziQ7nDQ==
   dependencies:
     has-symbols "^1.0.0"
 
@@ -12611,7 +12387,6 @@ term-size@^1.2.0:
 terser-webpack-plugin@^1.1.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz#9bff3a891ad614855a7dde0d707f7db5a927e3d9"
-  integrity sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==
   dependencies:
     cacache "^11.0.2"
     find-cache-dir "^2.0.0"
@@ -12625,7 +12400,6 @@ terser-webpack-plugin@^1.1.0:
 terser@^3.16.1:
   version "3.16.1"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.16.1.tgz#5b0dd4fa1ffd0b0b43c2493b2c364fd179160493"
-  integrity sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==
   dependencies:
     commander "~2.17.1"
     source-map "~0.6.1"
@@ -12696,6 +12470,10 @@ tiny-relative-date@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
 
+tinycolor2@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
+
 tmatch@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/tmatch/-/tmatch-2.0.1.tgz#0c56246f33f30da1b8d3d72895abaf16660f38cf"
@@ -12748,6 +12526,10 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+toggle-selection@^1.0.3:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
+
 token-stream@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"
@@ -12988,7 +12770,6 @@ unified@^6.0.0:
 unified@^7.0.2:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/unified/-/unified-7.1.0.tgz#5032f1c1ee3364bd09da12e27fdd4a7553c7be13"
-  integrity sha512-lbk82UOIGuCEsZhPj8rNAkXSDXd6p0QLzIuSsCdxrqnqU56St4eyOB+AlXsVgVeRmetPTYydIuvFfpDIed8mqw==
   dependencies:
     "@types/unist" "^2.0.0"
     "@types/vfile" "^3.0.0"
@@ -13077,7 +12858,6 @@ unpipe@1.0.0, unpipe@~1.0.0:
 unquote@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
-  integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=
 
 unset-value@^1.0.0:
   version "1.0.0"
@@ -13130,7 +12910,6 @@ url-join@^4.0.0:
 url-loader@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.2.tgz#b971d191b83af693c5e3fea4064be9e1f2d7f8d8"
-  integrity sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==
   dependencies:
     loader-utils "^1.1.0"
     mime "^2.0.3"
@@ -13145,7 +12924,6 @@ url-parse-lax@^1.0.0:
 url-parse@^1.1.8:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"
-  integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==
   dependencies:
     querystringify "^2.0.0"
     requires-port "^1.0.0"
@@ -13259,12 +13037,10 @@ vary@~1.1.2:
 velocity-animate@^1.4.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-1.5.2.tgz#5a351d75fca2a92756f5c3867548b873f6c32105"
-  integrity sha512-m6EXlCAMetKztO1ppBhGU1/1MR3IiEevO6ESq6rcrSQ3Q77xYSW13jkfXW88o4xMrkXJhy/U7j4wFR/twMB0Eg==
 
 velocity-react@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/velocity-react/-/velocity-react-1.4.1.tgz#1d0b41859cdf2521c08a8b57f44e93ed2d54b5fc"
-  integrity sha512-ZyXBm+9C/6kNUNyc+aeNKEhtTu/Mn+OfpsNBGuTxU8S2DUcis/KQL0rTN6jWL+7ygdOrun18qhheNZTA7YERmg==
   dependencies:
     lodash "^4.17.5"
     prop-types "^15.5.8"
@@ -13301,7 +13077,6 @@ vfile@^2.0.0:
 vfile@^3.0.0, vfile@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/vfile/-/vfile-3.0.1.tgz#47331d2abe3282424f4a4bb6acd20a44c4121803"
-  integrity sha512-y7Y3gH9BsUSdD4KzHsuMaCzRjglXN0W2EcMf0gpvu6+SbsGhMje7xDc8AEoeXy6mIwCKMI6BkjMsRjzQbhMEjQ==
   dependencies:
     is-buffer "^2.0.0"
     replace-ext "1.0.0"
@@ -13392,7 +13167,6 @@ wcwidth@^1.0.0:
 web-namespaces@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.2.tgz#c8dc267ab639505276bae19e129dbd6ae72b22b4"
-  integrity sha512-II+n2ms4mPxK+RnIxRPOw3zwF2jRscdJIUE9BfkKHm4FYEg9+biIoTMnaZF5MpemE3T+VhMLrhbyD4ilkPCSbg==
 
 webidl-conversions@^3.0.0, webidl-conversions@^3.0.1:
   version "3.0.1"
@@ -13425,7 +13199,6 @@ webpack-dev-middleware@3.4.0:
 webpack-dev-middleware@^3.4.0:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.2.tgz#d768b6194f3fe8d72d51feded49de359e8d96ffb"
-  integrity sha512-nPmshdt1ckcwWjI0Ubrdp8KroeuprW6xFKYqk0u3MflNMBXvHPnMATsC7/L/enwav2zvLCfj/Usr47qnF3KQyA==
   dependencies:
     memory-fs "~0.4.1"
     mime "^2.3.1"
@@ -13707,7 +13480,6 @@ yargs-parser@^10.0.0, yargs-parser@^10.1.0:
 yargs-parser@^11.1.1:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
-  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -13778,7 +13550,6 @@ yargs@^12.0.0:
 yargs@^12.0.5:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
   dependencies:
     cliui "^4.0.0"
     decamelize "^1.2.0"

From 874887331a3eea01ba27c007b1a46da704dfef0f Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Tue, 19 Feb 2019 12:42:26 +0100
Subject: [PATCH 005/100] added Knobs to BorderButton

---
 .../atoms/Buttons/BorderButton/BorderButton.stories.jsx      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/atoms/Buttons/BorderButton/BorderButton.stories.jsx b/src/components/atoms/Buttons/BorderButton/BorderButton.stories.jsx
index f9c6d63d1..f3d4e0d7a 100644
--- a/src/components/atoms/Buttons/BorderButton/BorderButton.stories.jsx
+++ b/src/components/atoms/Buttons/BorderButton/BorderButton.stories.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
+import { withKnobs, text } from '@storybook/addon-knobs';
 import { ThemeProvider, createGlobalStyle } from 'styled-components';
 import theme from '../../../../app/theme';
 import BorderButton from './BorderButton';
@@ -13,6 +14,7 @@ const Global = createGlobalStyle`
 `;
 
 storiesOf('atoms/Buttons/BorderButton', module)
+  .addDecorator(withKnobs)
   .addDecorator(getStory => (
     <div>
       <Global />
@@ -21,5 +23,4 @@ storiesOf('atoms/Buttons/BorderButton', module)
       </ThemeProvider>
     </div>
   ))
-  .add('normal', () => <BorderButton>Ajouter</BorderButton>);
- 
\ No newline at end of file
+  .add('normal', () => <BorderButton dangerouslySetInnerHTML={{__html: text('content', 'Ajouter')}} />);

From 8a625ee04402223eb4d1455d0ee2a757fe7cc875 Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Tue, 19 Feb 2019 12:42:50 +0100
Subject: [PATCH 006/100] corrected Message render

---
 src/components/atoms/Message.js | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/components/atoms/Message.js b/src/components/atoms/Message.js
index 031cb3339..576110dfd 100644
--- a/src/components/atoms/Message.js
+++ b/src/components/atoms/Message.js
@@ -1,24 +1,10 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import { sanitize } from 'dompurify';
 
-export const MessageContainer = styled.div`
-    p {
-        margin: 6px 0 12px;
-        font-size: 15px;
-        line-height: 1.4;
-        color: ${props => props.theme.primaryColor}
-    }
+export const Message = styled.p`
+  margin: 6px 0 12px;
+  font-size: 15px;
+  line-height: 1.4;
+  color: ${props => props.theme.primaryColor};
 `;
 
-// eslint-disable-next-line react/no-danger
-export const Message = ({ children }) => (
-  <MessageContainer dangerouslySetInnerHTML={{ __html: sanitize(children) }} />
-);
-
-Message.propTypes = {
-  children: PropTypes.string.isRequired,
-};
-
-export default Message;
\ No newline at end of file
+export default Message;

From 948121437eb4fa0498930265bd984fa69a490a20 Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Wed, 20 Feb 2019 14:09:23 +0100
Subject: [PATCH 007/100] stories for Buttons

---
 .../Buttons/{ => BackButton}/BackButton.js    |  4 +--
 .../Buttons/BackButton/BackButton.stories.jsx | 26 +++++++++++++++++++
 .../Buttons/{ => CloseButton}/CloseButton.js  |  4 +--
 .../CloseButton/CloseButton.stories.jsx       | 26 +++++++++++++++++++
 .../{ => DeleteButton}/DeleteButton.js        |  4 +--
 .../DeleteButton/DeleteButton.stories.jsx     | 26 +++++++++++++++++++
 src/components/atoms/Buttons/MenuButton.js    |  7 -----
 src/components/atoms/index.js                 |  7 +++--
 8 files changed, 87 insertions(+), 17 deletions(-)
 rename src/components/atoms/Buttons/{ => BackButton}/BackButton.js (74%)
 create mode 100644 src/components/atoms/Buttons/BackButton/BackButton.stories.jsx
 rename src/components/atoms/Buttons/{ => CloseButton}/CloseButton.js (75%)
 create mode 100644 src/components/atoms/Buttons/CloseButton/CloseButton.stories.jsx
 rename src/components/atoms/Buttons/{ => DeleteButton}/DeleteButton.js (86%)
 create mode 100644 src/components/atoms/Buttons/DeleteButton/DeleteButton.stories.jsx
 delete mode 100644 src/components/atoms/Buttons/MenuButton.js

diff --git a/src/components/atoms/Buttons/BackButton.js b/src/components/atoms/Buttons/BackButton/BackButton.js
similarity index 74%
rename from src/components/atoms/Buttons/BackButton.js
rename to src/components/atoms/Buttons/BackButton/BackButton.js
index c54904e87..42724c173 100644
--- a/src/components/atoms/Buttons/BackButton.js
+++ b/src/components/atoms/Buttons/BackButton/BackButton.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
-import Button from '../Button';
-import ArrowIcon from '../icons/Arrow';
+import Button from '../../Button';
+import ArrowIcon from '../../icons/Arrow';
 
 export default styled(Button).attrs({ children: <ArrowIcon /> })`
     height: 30px;
diff --git a/src/components/atoms/Buttons/BackButton/BackButton.stories.jsx b/src/components/atoms/Buttons/BackButton/BackButton.stories.jsx
new file mode 100644
index 000000000..2e7def9de
--- /dev/null
+++ b/src/components/atoms/Buttons/BackButton/BackButton.stories.jsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { withKnobs, text } from '@storybook/addon-knobs';
+import { ThemeProvider, createGlobalStyle } from 'styled-components';
+import theme from '../../../../app/theme';
+import BackButton from './BackButton';
+import 'typeface-lato';
+import 'typeface-sedgwick-ave';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+storiesOf('atoms/Buttons/BackButton', module)
+  .addDecorator(withKnobs)
+  .addDecorator(getStory => (
+    <div>
+      <Global />
+      <ThemeProvider theme={theme}>
+        {getStory()}
+      </ThemeProvider>
+    </div>
+  ))
+  .add('normal', () => <BackButton />);
diff --git a/src/components/atoms/Buttons/CloseButton.js b/src/components/atoms/Buttons/CloseButton/CloseButton.js
similarity index 75%
rename from src/components/atoms/Buttons/CloseButton.js
rename to src/components/atoms/Buttons/CloseButton/CloseButton.js
index 7580a0cfc..40667645e 100644
--- a/src/components/atoms/Buttons/CloseButton.js
+++ b/src/components/atoms/Buttons/CloseButton/CloseButton.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
-import Button from '../Button';
-import CloseIcon from '../icons/Close';
+import Button from '../../Button';
+import CloseIcon from '../../icons/Close';
 
 export default styled(Button).attrs({ children: <CloseIcon /> })`
    margin-left: auto;
diff --git a/src/components/atoms/Buttons/CloseButton/CloseButton.stories.jsx b/src/components/atoms/Buttons/CloseButton/CloseButton.stories.jsx
new file mode 100644
index 000000000..79042b4c4
--- /dev/null
+++ b/src/components/atoms/Buttons/CloseButton/CloseButton.stories.jsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { withKnobs, text } from '@storybook/addon-knobs';
+import { ThemeProvider, createGlobalStyle } from 'styled-components';
+import theme from '../../../../app/theme';
+import CloseButton from './CloseButton';
+import 'typeface-lato';
+import 'typeface-sedgwick-ave';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+storiesOf('atoms/Buttons/CloseButton', module)
+  .addDecorator(withKnobs)
+  .addDecorator(getStory => (
+    <div>
+      <Global />
+      <ThemeProvider theme={theme}>
+        {getStory()}
+      </ThemeProvider>
+    </div>
+  ))
+  .add('normal', () => <CloseButton />);
diff --git a/src/components/atoms/Buttons/DeleteButton.js b/src/components/atoms/Buttons/DeleteButton/DeleteButton.js
similarity index 86%
rename from src/components/atoms/Buttons/DeleteButton.js
rename to src/components/atoms/Buttons/DeleteButton/DeleteButton.js
index 96bd64ef3..8b5a68482 100644
--- a/src/components/atoms/Buttons/DeleteButton.js
+++ b/src/components/atoms/Buttons/DeleteButton/DeleteButton.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
-import Button from '../Button';
-import DeleteIcon from '../icons/Delete';
+import Button from '../../Button';
+import DeleteIcon from '../../icons/Delete';
 
 export default styled(Button).attrs({ children: <DeleteIcon /> })`
   box-sizing: border-box;
diff --git a/src/components/atoms/Buttons/DeleteButton/DeleteButton.stories.jsx b/src/components/atoms/Buttons/DeleteButton/DeleteButton.stories.jsx
new file mode 100644
index 000000000..463b10589
--- /dev/null
+++ b/src/components/atoms/Buttons/DeleteButton/DeleteButton.stories.jsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { withKnobs, text } from '@storybook/addon-knobs';
+import { ThemeProvider, createGlobalStyle } from 'styled-components';
+import theme from '../../../../app/theme';
+import DeleteButton from './DeleteButton';
+import 'typeface-lato';
+import 'typeface-sedgwick-ave';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+storiesOf('atoms/Buttons/DeleteButton', module)
+  .addDecorator(withKnobs)
+  .addDecorator(getStory => (
+    <div>
+      <Global />
+      <ThemeProvider theme={theme}>
+        {getStory()}
+      </ThemeProvider>
+    </div>
+  ))
+  .add('normal', () => <DeleteButton />);
diff --git a/src/components/atoms/Buttons/MenuButton.js b/src/components/atoms/Buttons/MenuButton.js
deleted file mode 100644
index 949e75d52..000000000
--- a/src/components/atoms/Buttons/MenuButton.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import styled from 'styled-components';
-import Button from '../Button';
-
-export default styled(Button).attrs({ children: 'Afficher le menu' })`
-    font-size: 1.3em;
-    color: ${props => props.theme.otherText};
-`;
\ No newline at end of file
diff --git a/src/components/atoms/index.js b/src/components/atoms/index.js
index a28ba4289..06b726529 100644
--- a/src/components/atoms/index.js
+++ b/src/components/atoms/index.js
@@ -1,5 +1,5 @@
 export { default as AddNoticeLink } from './Buttons/AddNoticeLink';
-export { default as BackButton } from './Buttons/BackButton';
+export { default as BackButton } from './Buttons/BackButton/BackButton';
 export { default as NoticeContainer } from './Notice/Container';
 export { default as NoticeContent } from './Notice/Content';
 export { default as NoticeDeleted } from './Notice/Deleted';
@@ -10,11 +10,10 @@ export { default as NoticeDetailsMeta } from './Notice/DetailsMeta';
 export { default as NoticeDetailsDislike } from './Notice/DetailsDislike';
 export { default as Button } from './Button';
 export { default as BorderButton } from './Buttons/BorderButton';
-export { default as CloseButton } from './Buttons/CloseButton';
+export { default as CloseButton } from './Buttons/CloseButton/CloseButton';
 export { default as Contributor } from './Contributor';
-export { default as DeleteButton } from './Buttons/DeleteButton';
+export { default as DeleteButton } from './Buttons/DeleteButton/DeleteButton';
 export { default as OpenButton } from './OpenButton';
-export { default as MenuButton } from './Buttons/MenuButton';
 export { default as NotificationContainer } from './Notification/Container';
 export { default as NotificationContentTitle } from './Notification/ContentTitle';
 export { default as NotificationFooterContainer } from '../molecules/NotificationFooter/FooterContainer';

From 6a7a5f0963d88452716294961800ab99c590fce3 Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Wed, 20 Feb 2019 14:17:20 +0100
Subject: [PATCH 008/100] added OpenButton

---
 .../{ => Buttons/OpenButton}/OpenButton.js    |  3 +--
 .../Buttons/OpenButton/OpenButton.stories.jsx | 26 +++++++++++++++++++
 src/components/atoms/index.js                 |  2 +-
 3 files changed, 28 insertions(+), 3 deletions(-)
 rename src/components/atoms/{ => Buttons/OpenButton}/OpenButton.js (78%)
 create mode 100644 src/components/atoms/Buttons/OpenButton/OpenButton.stories.jsx

diff --git a/src/components/atoms/OpenButton.js b/src/components/atoms/Buttons/OpenButton/OpenButton.js
similarity index 78%
rename from src/components/atoms/OpenButton.js
rename to src/components/atoms/Buttons/OpenButton/OpenButton.js
index 8013fe3db..387e1633f 100644
--- a/src/components/atoms/OpenButton.js
+++ b/src/components/atoms/Buttons/OpenButton/OpenButton.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import styled from 'styled-components';
-import { Link } from 'react-router-dom';
-import OpenIcon from './icons/Arrow';
+import OpenIcon from '../../icons/Arrow';
 
 export default styled.div.attrs({ children: <OpenIcon /> })`
    padding:0;
diff --git a/src/components/atoms/Buttons/OpenButton/OpenButton.stories.jsx b/src/components/atoms/Buttons/OpenButton/OpenButton.stories.jsx
new file mode 100644
index 000000000..84e64a939
--- /dev/null
+++ b/src/components/atoms/Buttons/OpenButton/OpenButton.stories.jsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { withKnobs, text } from '@storybook/addon-knobs';
+import { ThemeProvider, createGlobalStyle } from 'styled-components';
+import theme from '../../../../app/theme';
+import OpenButton from './OpenButton';
+import 'typeface-lato';
+import 'typeface-sedgwick-ave';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+storiesOf('atoms/Buttons/OpenButton', module)
+  .addDecorator(withKnobs)
+  .addDecorator(getStory => (
+    <div>
+      <Global />
+      <ThemeProvider theme={theme}>
+        {getStory()}
+      </ThemeProvider>
+    </div>
+  ))
+  .add('normal', () => <OpenButton />);
diff --git a/src/components/atoms/index.js b/src/components/atoms/index.js
index 06b726529..cd44b6dc1 100644
--- a/src/components/atoms/index.js
+++ b/src/components/atoms/index.js
@@ -13,7 +13,7 @@ export { default as BorderButton } from './Buttons/BorderButton';
 export { default as CloseButton } from './Buttons/CloseButton/CloseButton';
 export { default as Contributor } from './Contributor';
 export { default as DeleteButton } from './Buttons/DeleteButton/DeleteButton';
-export { default as OpenButton } from './OpenButton';
+export { default as OpenButton } from './Buttons/OpenButton/OpenButton';
 export { default as NotificationContainer } from './Notification/Container';
 export { default as NotificationContentTitle } from './Notification/ContentTitle';
 export { default as NotificationFooterContainer } from '../molecules/NotificationFooter/FooterContainer';

From 21b744ae9066a6cd9a91e980052c08ebe5316e52 Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Wed, 20 Feb 2019 14:21:41 +0100
Subject: [PATCH 009/100] moved About and its stories to a folder

---
 src/components/screens/Account/{ => About}/About.js         | 6 +++---
 .../screens/Account/{ => About}/About.stories.jsx           | 4 ++--
 src/components/screens/Account/index.js                     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename src/components/screens/Account/{ => About}/About.js (87%)
 rename src/components/screens/Account/{ => About}/About.stories.jsx (88%)

diff --git a/src/components/screens/Account/About.js b/src/components/screens/Account/About/About.js
similarity index 87%
rename from src/components/screens/Account/About.js
rename to src/components/screens/Account/About/About.js
index 11a9e3121..5f354f5b7 100644
--- a/src/components/screens/Account/About.js
+++ b/src/components/screens/Account/About/About.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Container, Content, ContentTitle } from '../../atoms/About';
-import { ExternalLink, Time } from '../../atoms';
-import { Notification } from '../../organisms';
+import { Container, Content, ContentTitle } from '../../../atoms/About';
+import { ExternalLink, Time } from '../../../atoms';
+import { Notification } from '../../../organisms';
 
 const About = ({ close, installationDate, extensionVersion }) => (
   <Notification title="À propos" close={close}>
diff --git a/src/components/screens/Account/About.stories.jsx b/src/components/screens/Account/About/About.stories.jsx
similarity index 88%
rename from src/components/screens/Account/About.stories.jsx
rename to src/components/screens/Account/About/About.stories.jsx
index e0aab9584..074f991cd 100644
--- a/src/components/screens/Account/About.stories.jsx
+++ b/src/components/screens/Account/About/About.stories.jsx
@@ -3,8 +3,8 @@ import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../app/theme';
-import { NotificationContainer } from '../../atoms';
+import theme from '../../../../app/theme';
+import { NotificationContainer } from '../../../atoms';
 import About from './About';
 import 'typeface-lato';
 import 'typeface-sedgwick-ave';
diff --git a/src/components/screens/Account/index.js b/src/components/screens/Account/index.js
index 159c96517..deea4cc7a 100644
--- a/src/components/screens/Account/index.js
+++ b/src/components/screens/Account/index.js
@@ -2,7 +2,7 @@ import { Route, Switch } from 'react-router-dom';
 import React from 'react';
 import Filters from './Filters';
 import Menu from './Menu';
-import About from './About';
+import About from './About/About';
 import Error from '../Error';
 import Loading from '../Loading';
 

From b688f6d6d08868513295dfe065a92bc10b58a786 Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Wed, 20 Feb 2019 14:25:34 +0100
Subject: [PATCH 010/100] added Textarea stories

---
 .../atoms/Forms/{ => Textarea}/Textarea.js    |  0
 .../atoms/Forms/Textarea/Textarea.stories.jsx | 26 +++++++++++++++++++
 src/components/atoms/Forms/index.js           |  2 +-
 3 files changed, 27 insertions(+), 1 deletion(-)
 rename src/components/atoms/Forms/{ => Textarea}/Textarea.js (100%)
 create mode 100644 src/components/atoms/Forms/Textarea/Textarea.stories.jsx

diff --git a/src/components/atoms/Forms/Textarea.js b/src/components/atoms/Forms/Textarea/Textarea.js
similarity index 100%
rename from src/components/atoms/Forms/Textarea.js
rename to src/components/atoms/Forms/Textarea/Textarea.js
diff --git a/src/components/atoms/Forms/Textarea/Textarea.stories.jsx b/src/components/atoms/Forms/Textarea/Textarea.stories.jsx
new file mode 100644
index 000000000..cd9f76984
--- /dev/null
+++ b/src/components/atoms/Forms/Textarea/Textarea.stories.jsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { withKnobs, text } from '@storybook/addon-knobs';
+import { ThemeProvider, createGlobalStyle } from 'styled-components';
+import theme from '../../../../app/theme';
+import Textarea from './Textarea';
+import 'typeface-lato';
+import 'typeface-sedgwick-ave';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+storiesOf('atoms/Forms/Textarea', module)
+  .addDecorator(withKnobs)
+  .addDecorator(getStory => (
+    <div>
+      <Global />
+      <ThemeProvider theme={theme}>
+        {getStory()}
+      </ThemeProvider>
+    </div>
+  ))
+  .add('normal', () => <Textarea />);
diff --git a/src/components/atoms/Forms/index.js b/src/components/atoms/Forms/index.js
index e90277ade..9b5eb9a18 100644
--- a/src/components/atoms/Forms/index.js
+++ b/src/components/atoms/Forms/index.js
@@ -1,2 +1,2 @@
-export { default as Textarea } from './Textarea';
+export { default as Textarea } from './Textarea/Textarea';
 export { default as Form } from './Form';
\ No newline at end of file

From f18745cbd56a15d7076f53f2c6546d49b90ea178 Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Wed, 20 Feb 2019 15:04:23 +0100
Subject: [PATCH 011/100] WIP: NoticeDetails story and moved atoms used only in
 the organism in the folder

---
 src/components/atoms/About/ContentTitle.js    |  2 +-
 .../atoms/{ => ContentTitle}/ContentTitle.js  |  0
 .../ContentTitle/ContentTitle.stories.jsx     | 24 ++++++++
 .../atoms/Notification/ContentTitle.js        |  2 +-
 src/components/atoms/index.js                 | 15 ++---
 .../NoticeDetails}/Date.js                    |  0
 .../NoticeDetails}/DetailsContainer.js        |  0
 .../NoticeDetails}/DetailsContent.js          |  0
 .../NoticeDetails}/DetailsDislike.js          |  0
 .../NoticeDetails}/DetailsMeta.js             |  0
 .../NoticeDetails}/Feedbacks.js               |  2 +-
 .../NoticeDetails}/Message.js                 |  0
 .../{ => NoticeDetails}/NoticeDetails.js      | 44 +++++++-------
 .../NoticeDetails/NoticeDetails.stories.jsx   | 57 +++++++++++++++++++
 .../NoticeDetails}/Source.js                  |  0
 src/components/organisms/Notification.js      |  2 +-
 src/components/organisms/index.js             |  2 +-
 17 files changed, 113 insertions(+), 37 deletions(-)
 rename src/components/atoms/{ => ContentTitle}/ContentTitle.js (100%)
 create mode 100644 src/components/atoms/ContentTitle/ContentTitle.stories.jsx
 rename src/components/{atoms => organisms/NoticeDetails}/Date.js (100%)
 rename src/components/{atoms/Notice => organisms/NoticeDetails}/DetailsContainer.js (100%)
 rename src/components/{atoms/Notice => organisms/NoticeDetails}/DetailsContent.js (100%)
 rename src/components/{atoms/Notice => organisms/NoticeDetails}/DetailsDislike.js (100%)
 rename src/components/{atoms/Notice => organisms/NoticeDetails}/DetailsMeta.js (100%)
 rename src/components/{atoms => organisms/NoticeDetails}/Feedbacks.js (95%)
 rename src/components/{atoms => organisms/NoticeDetails}/Message.js (100%)
 rename src/components/organisms/{ => NoticeDetails}/NoticeDetails.js (77%)
 create mode 100644 src/components/organisms/NoticeDetails/NoticeDetails.stories.jsx
 rename src/components/{atoms => organisms/NoticeDetails}/Source.js (100%)

diff --git a/src/components/atoms/About/ContentTitle.js b/src/components/atoms/About/ContentTitle.js
index 250a21e22..0cb0bf844 100644
--- a/src/components/atoms/About/ContentTitle.js
+++ b/src/components/atoms/About/ContentTitle.js
@@ -1,5 +1,5 @@
 import styled from 'styled-components';
-import ContentTitle from '../ContentTitle';
+import ContentTitle from '../ContentTitle/ContentTitle';
 
 export default styled(ContentTitle)`
     margin: 0 0 18px;
diff --git a/src/components/atoms/ContentTitle.js b/src/components/atoms/ContentTitle/ContentTitle.js
similarity index 100%
rename from src/components/atoms/ContentTitle.js
rename to src/components/atoms/ContentTitle/ContentTitle.js
diff --git a/src/components/atoms/ContentTitle/ContentTitle.stories.jsx b/src/components/atoms/ContentTitle/ContentTitle.stories.jsx
new file mode 100644
index 000000000..8d4a9f6c2
--- /dev/null
+++ b/src/components/atoms/ContentTitle/ContentTitle.stories.jsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { ThemeProvider, createGlobalStyle } from 'styled-components';
+import theme from '../../../app/theme';
+import ContentTitle from './ContentTitle';
+import 'typeface-lato';
+import 'typeface-sedgwick-ave';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+storiesOf('atoms/ContentTitle', module)
+  .addDecorator(getStory => (
+    <div>
+      <Global />
+      <ThemeProvider theme={theme}>
+        {getStory()}
+      </ThemeProvider>
+    </div>
+  ))
+  .add('normal', () => <ContentTitle>Title</ContentTitle>);
diff --git a/src/components/atoms/Notification/ContentTitle.js b/src/components/atoms/Notification/ContentTitle.js
index d6f1f396d..cc0489eb2 100644
--- a/src/components/atoms/Notification/ContentTitle.js
+++ b/src/components/atoms/Notification/ContentTitle.js
@@ -1,5 +1,5 @@
 import styled from 'styled-components';
-import ContentTitle from '../ContentTitle';
+import ContentTitle from '../ContentTitle/ContentTitle';
 
 export default styled(ContentTitle)`
     margin: 12px 0 0;
diff --git a/src/components/atoms/index.js b/src/components/atoms/index.js
index cd44b6dc1..0ab30c361 100644
--- a/src/components/atoms/index.js
+++ b/src/components/atoms/index.js
@@ -4,10 +4,10 @@ export { default as NoticeContainer } from './Notice/Container';
 export { default as NoticeContent } from './Notice/Content';
 export { default as NoticeDeleted } from './Notice/Deleted';
 export { default as NoticeTypeBackground } from './Notice/TypeBackground';
-export { default as NoticeDetailsContainer } from './Notice/DetailsContainer';
-export { default as NoticeDetailsContent } from './Notice/DetailsContent';
-export { default as NoticeDetailsMeta } from './Notice/DetailsMeta';
-export { default as NoticeDetailsDislike } from './Notice/DetailsDislike';
+export { default as NoticeDetailsContainer } from '../organisms/NoticeDetails/DetailsContainer';
+export { default as NoticeDetailsContent } from '../organisms/NoticeDetails/DetailsContent';
+export { default as NoticeDetailsMeta } from '../organisms/NoticeDetails/DetailsMeta';
+export { default as NoticeDetailsDislike } from '../organisms/NoticeDetails/DetailsDislike';
 export { default as Button } from './Button';
 export { default as BorderButton } from './Buttons/BorderButton';
 export { default as CloseButton } from './Buttons/CloseButton/CloseButton';
@@ -19,11 +19,9 @@ export { default as NotificationContentTitle } from './Notification/ContentTitle
 export { default as NotificationFooterContainer } from '../molecules/NotificationFooter/FooterContainer';
 export { default as NotificationHeaderContainer } from './Notification/HeaderContainer';
 export { default as NotificationMain } from './Notification/Main';
-export { default as Feedbacks } from './Feedbacks';
 export { default as GlobalStyle } from './GlobalStyle';
 export { default as Logo } from './Logo';
-export { default as Message } from './Message';
-export { default as Source } from './Source';
+export { default as Source } from '../organisms/NoticeDetails/Source';
 export { default as SourceURLContainer } from './SourceURLContainer';
 export { default as Time } from './Time';
 export { default as Title } from './Title';
@@ -31,9 +29,8 @@ export { default as Truncated } from './Truncated';
 export { default as NavLink } from '../molecules/NotificationFooter/NavLink';
 export { default as NoNoticeImg } from './Notice/NoNoticeImg';
 export { default as CenterContainer } from './CenterContainer';
-export { default as Date } from './Date';
 export { default as LoadingContainer } from './LoadingContainer';
 export { default as List } from './List';
 export { default as Account } from './Account';
-export { default as ContentTitle } from './ContentTitle';
+export { default as ContentTitle } from './ContentTitle/ContentTitle';
 export { default as ExternalLink } from './ExternalLink';
diff --git a/src/components/atoms/Date.js b/src/components/organisms/NoticeDetails/Date.js
similarity index 100%
rename from src/components/atoms/Date.js
rename to src/components/organisms/NoticeDetails/Date.js
diff --git a/src/components/atoms/Notice/DetailsContainer.js b/src/components/organisms/NoticeDetails/DetailsContainer.js
similarity index 100%
rename from src/components/atoms/Notice/DetailsContainer.js
rename to src/components/organisms/NoticeDetails/DetailsContainer.js
diff --git a/src/components/atoms/Notice/DetailsContent.js b/src/components/organisms/NoticeDetails/DetailsContent.js
similarity index 100%
rename from src/components/atoms/Notice/DetailsContent.js
rename to src/components/organisms/NoticeDetails/DetailsContent.js
diff --git a/src/components/atoms/Notice/DetailsDislike.js b/src/components/organisms/NoticeDetails/DetailsDislike.js
similarity index 100%
rename from src/components/atoms/Notice/DetailsDislike.js
rename to src/components/organisms/NoticeDetails/DetailsDislike.js
diff --git a/src/components/atoms/Notice/DetailsMeta.js b/src/components/organisms/NoticeDetails/DetailsMeta.js
similarity index 100%
rename from src/components/atoms/Notice/DetailsMeta.js
rename to src/components/organisms/NoticeDetails/DetailsMeta.js
diff --git a/src/components/atoms/Feedbacks.js b/src/components/organisms/NoticeDetails/Feedbacks.js
similarity index 95%
rename from src/components/atoms/Feedbacks.js
rename to src/components/organisms/NoticeDetails/Feedbacks.js
index 3ed34c978..1d2b92db9 100644
--- a/src/components/atoms/Feedbacks.js
+++ b/src/components/organisms/NoticeDetails/Feedbacks.js
@@ -1,5 +1,5 @@
 import styled from 'styled-components';
-import Button from './Button';
+import Button from '../../atoms/Button';
 
 export default styled.div`
     display: flex;
diff --git a/src/components/atoms/Message.js b/src/components/organisms/NoticeDetails/Message.js
similarity index 100%
rename from src/components/atoms/Message.js
rename to src/components/organisms/NoticeDetails/Message.js
diff --git a/src/components/organisms/NoticeDetails.js b/src/components/organisms/NoticeDetails/NoticeDetails.js
similarity index 77%
rename from src/components/organisms/NoticeDetails.js
rename to src/components/organisms/NoticeDetails/NoticeDetails.js
index e00c2fbe8..635f08b08 100644
--- a/src/components/organisms/NoticeDetails.js
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.js
@@ -1,24 +1,22 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { sanitize } from 'dompurify';
 import { withRouter } from 'react-router';
 import {
-  NoticeDetailsContainer,
-  NoticeDetailsContent,
-  NoticeDetailsMeta,
-  NoticeDetailsDislike,
   Contributor,
-  Message,
-  Source,
-  Feedbacks,
-  Date,
   Button,
   BorderButton
-} from '../atoms';
-import { Anchor } from '../atoms/icons';
-import { Like, Dislike } from '../atoms/icons/types';
-import { NoticeType, SourceURL } from '../molecules';
-
+} from '../../atoms';
+import { Anchor } from '../../atoms/icons';
+import { Like, Dislike } from '../../atoms/icons/types';
+import { NoticeType, SourceURL } from '../../molecules';
+import DetailsContainer from './DetailsContainer';
+import DetailsContent from './DetailsContent';
+import DetailsMeta from './DetailsMeta';
+import DetailsDislike from './DetailsDislike';
+import MessageWrapper from './Message';
+import Source from './Source';
+import Feedbacks from './Feedbacks';
+import Date from './Date';
 
 class NoticeDetails extends PureComponent {
   static propTypes = {
@@ -77,9 +75,9 @@ class NoticeDetails extends PureComponent {
     } = this.props;
 
     return (
-      <NoticeDetailsContainer>
-        <NoticeDetailsContent>
-          <NoticeDetailsMeta>
+      <DetailsContainer>
+        <DetailsContent>
+          <DetailsMeta>
             <Date>
               Le
               &nbsp;
@@ -91,8 +89,8 @@ class NoticeDetails extends PureComponent {
               :
             </Contributor>
             <NoticeType type={type} />
-          </NoticeDetailsMeta>
-          <Message>{message}</Message>
+          </DetailsMeta>
+          <MessageWrapper>{message}</MessageWrapper>
           <Source>
             <Anchor />
               En savoir plus :
@@ -110,16 +108,16 @@ class NoticeDetails extends PureComponent {
           </Feedbacks>
 
           {(disliked) && (
-            <NoticeDetailsDislike>
+            <DetailsDislike>
             Merci pour votre retour, cette notification ne s’affichera plus
               <div>
                 <Button onClick={this.handleDislikeClick}>Annuler</Button>
                 <BorderButton onClick={this.handleGoBack}>OK</BorderButton>
               </div>
-            </NoticeDetailsDislike>
+            </DetailsDislike>
           )}
-        </NoticeDetailsContent>
-      </NoticeDetailsContainer>
+        </DetailsContent>
+      </DetailsContainer>
     );
   }
 }
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.stories.jsx b/src/components/organisms/NoticeDetails/NoticeDetails.stories.jsx
new file mode 100644
index 000000000..6ecb144b4
--- /dev/null
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.stories.jsx
@@ -0,0 +1,57 @@
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
+import theme from '../../../app/theme';
+import NoticeDetails from './NoticeDetails';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`
+
+const Wrapper = styled.div`
+  width: 384px;
+  height: 414px;
+`
+
+const notices = [
+  {
+    id: '123',
+    description: 'Description',
+    title: 'title',
+    contributor: { name: 'John Doe' },
+    criteria: [{ label: 'label', slug: 'slug' }],
+    isApproved: true,
+    isDismissed: false,
+    resource: {
+      author: 'Jack Daniels',
+      editor: 'LMEM',
+      label: 'label',
+      url: 'url',
+    },
+    alternatives: [{
+      label: 'some alternative',
+      url_to_redirect: 'url'
+    }]
+  }
+];
+
+storiesOf('organisms/NoticeDetails', module)
+  .addDecorator(getStory => (
+    <div>
+      <Global />
+      <Router>
+        <ThemeProvider theme={theme}>
+          <Wrapper>
+            {getStory()}
+          </Wrapper>
+        </ThemeProvider>
+      </Router>
+    </div>
+  ))
+  .add('Approval', () => (
+    <NoticeDetails type='Approval' contributor='Jalil' id='123' message='message' dismiss={action('dismiss')} />
+  ));
diff --git a/src/components/atoms/Source.js b/src/components/organisms/NoticeDetails/Source.js
similarity index 100%
rename from src/components/atoms/Source.js
rename to src/components/organisms/NoticeDetails/Source.js
diff --git a/src/components/organisms/Notification.js b/src/components/organisms/Notification.js
index b90095712..5d864a4b2 100644
--- a/src/components/organisms/Notification.js
+++ b/src/components/organisms/Notification.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { NotificationMain } from '../atoms';
 import { NotificationHeader } from '../molecules';
 import Notice from './Notice';
-import NoticeDetails from './NoticeDetails';
+import NoticeDetails from './NoticeDetails/NoticeDetails';
 import isChildInstanceOf from '../../app/utils/isChildInstanceOf';
 
 export default class Notification extends PureComponent {
diff --git a/src/components/organisms/index.js b/src/components/organisms/index.js
index e3b7f925c..b985122d6 100644
--- a/src/components/organisms/index.js
+++ b/src/components/organisms/index.js
@@ -1,4 +1,4 @@
 export { default as Notice } from './Notice';
 export { default as Notification } from './Notification';
 export { default as NotificationNavigation } from './NotificationNavigation';
-export { default as NoticeDetails } from './NoticeDetails';
\ No newline at end of file
+export { default as NoticeDetails } from './NoticeDetails/NoticeDetails';
\ No newline at end of file

From d7c4843543dc9015d9d7f8595c93b933fa360531 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Sat, 23 Feb 2019 01:03:12 +0100
Subject: [PATCH 012/100] refacto(storybook): simplify stories

---
 .storybook/config.js                          |  25 ++++-
 .../NotificationFooter/AccountIcon.js         |  10 ++
 .../NotificationFooter/BubbleIcon.js          |  44 ++++++++
 .../components/NotificationFooter/HelpIcon.js |  10 ++
 .../NotificationFooter.js                     |  12 +-
 .../components/NotificationFooter/index.js    |   3 +
 .../components/screens/About.stories.jsx      |  42 ++-----
 .../screens/Notice/List.stories.jsx           |  38 ++-----
 .../AddNoticeLink/AddNoticeLink.stories.jsx   |  18 ---
 .../Buttons/BackButton/BackButton.stories.jsx |  20 ----
 .../BorderButton/BorderButton.stories.jsx     |  22 +---
 .../CloseButton/CloseButton.stories.jsx       |  20 ----
 .../DeleteButton/DeleteButton.stories.jsx     |  20 ----
 .../Buttons/OpenButton/OpenButton.stories.jsx |  20 ----
 .../ContentTitle/ContentTitle.stories.jsx     |  24 +---
 .../atoms/Forms/Textarea/Textarea.stories.jsx |  20 ----
 src/components/atoms/icons/types/index.js     |   2 +
 .../NotificationFooter.stories.jsx            |  24 ----
 .../molecules/NotificationHeader.stories.jsx  |  38 ++-----
 src/components/organisms/Notice.stories.jsx   | 103 ++++++++----------
 .../organisms/NoticeDetails/NoticeDetails.js  |   4 +-
 .../NoticeDetails/NoticeDetails.stories.jsx   |  88 +++++++--------
 .../screens/Account/About/About.stories.jsx   |  18 +--
 23 files changed, 230 insertions(+), 395 deletions(-)
 create mode 100644 src/app/content/components/NotificationFooter/AccountIcon.js
 create mode 100644 src/app/content/components/NotificationFooter/BubbleIcon.js
 create mode 100644 src/app/content/components/NotificationFooter/HelpIcon.js
 rename src/app/content/components/{ => NotificationFooter}/NotificationFooter.js (61%)
 create mode 100644 src/app/content/components/NotificationFooter/index.js

diff --git a/.storybook/config.js b/.storybook/config.js
index 792803817..d698e1092 100644
--- a/.storybook/config.js
+++ b/.storybook/config.js
@@ -1,4 +1,27 @@
-import { configure } from '@storybook/react';
+import { configure, addDecorator } from '@storybook/react';
+import React from 'react';
+import { createGlobalStyle, ThemeProvider } from 'styled-components';
+import theme from '../src/app/theme';
+import 'typeface-lato';
+import 'typeface-sedgwick-ave';
+import { NotificationContainer } from '../src/components/atoms';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+addDecorator(getStory => (
+  <div>
+    <Global />
+    <ThemeProvider theme={theme}>
+      <NotificationContainer>
+        {getStory()}
+      </NotificationContainer>
+    </ThemeProvider>
+  </div>
+));
 
 // automatically import all files ending in *.stories.js
 const req = require.context('../src', true, /stories.jsx?$/);
diff --git a/src/app/content/components/NotificationFooter/AccountIcon.js b/src/app/content/components/NotificationFooter/AccountIcon.js
new file mode 100644
index 000000000..aa331e230
--- /dev/null
+++ b/src/app/content/components/NotificationFooter/AccountIcon.js
@@ -0,0 +1,10 @@
+/* eslint-disable max-len */
+import React from 'react';
+
+export default () => (
+  <svg viewBox="0 0 24.715 28.008">
+    <path
+      d="M24.713 21.79v-.01-.1-.068c-.034-1.133-.125-4.141-2.931-5.1l-.063-.019-.032-.003a23.323 23.323 0 0 1-4.942-2.274c.045-.048.09-.1.134-.146 2.328-2.625 1.987-7.021 1.933-7.574-.158-3.3-1.739-4.875-3.038-5.618A6.908 6.908 0 0 0 12.426 0h-.1a6.9 6.9 0 0 0-3.339.852c-1.321.746-2.922 2.33-3.079 5.638-.053.553-.393 4.95 1.933 7.573.048.055.1.108.148.16a24.57 24.57 0 0 1-4.952 2.253 1.153 1.153 0 0 0-.084.024h-.014c-2.807.963-2.9 3.966-2.932 5.105v.104a.458.458 0 0 0 0 .056v.009a9.154 9.154 0 0 0 .325 2.8 1.193 1.193 0 0 0 .481.586 22.468 22.468 0 0 0 11.554 2.848 22.489 22.489 0 0 0 11.561-2.844 1.234 1.234 0 0 0 .479-.586 9.57 9.57 0 0 0 .306-2.788zM8.369 6.643c.168-3.623 2.547-4.163 3.95-4.163h.059c1.719.039 3.8.792 3.96 4.158a.56.56 0 0 0 .011.117c.031.348.291 3.856-1.323 5.674a3.324 3.324 0 0 1-2.639 1.086h-.053a3.348 3.348 0 0 1-2.647-1.087c-1.681-1.889-1.335-5.608-1.326-5.7v-.011a.487.487 0 0 0 .008-.074zm2.018 9.061a6.8 6.8 0 0 0 1.875.286h.193a6.736 6.736 0 0 0 1.907-.3 30.97 30.97 0 0 0 6.656 3.177c.954.351 1.175 1.34 1.221 2.818 0 .05 0 .1.006.165a11.68 11.68 0 0 1-.08 1.472 21.017 21.017 0 0 1-9.805 2.213 21.135 21.135 0 0 1-9.811-2.22 10.517 10.517 0 0 1-.078-1.5v-.042-.1c.047-1.478.268-2.468 1.221-2.818a32.175 32.175 0 0 0 6.695-3.151z" />
+  </svg>
+
+);
\ No newline at end of file
diff --git a/src/app/content/components/NotificationFooter/BubbleIcon.js b/src/app/content/components/NotificationFooter/BubbleIcon.js
new file mode 100644
index 000000000..80a621af2
--- /dev/null
+++ b/src/app/content/components/NotificationFooter/BubbleIcon.js
@@ -0,0 +1,44 @@
+/* eslint-disable max-len */
+import React from 'react';
+
+export default () => (
+  <svg viewBox="0 0 27.621 25.227">
+    <defs />
+    <g transform="translate(.48)">
+      <path
+        d="M23.571 0H13.358a3.6 3.6 0 0 0-3.619 3.573V7.7H3.128A3.607 3.607 0 0 0-.48 11.3v7.5a3.59 3.59 0 0 0 3.608 3.563h9.252l2.817 2.584a1.038 1.038 0 0 0 .7.279.993.993 0 0 0 .413-.085 1.031 1.031 0 0 0 .61-.941v-7.849a1.037 1.037 0 0 0-2.073 0v5.489l-1.373-1.265a1.037 1.037 0 0 0-.694-.285H3.128a1.515 1.515 0 0 1-1.535-1.49v-7.5a1.531 1.531 0 0 1 1.535-1.524h6.611v6.7a1.052 1.052 0 0 0 1.756.766l2.446-2.229.083-.076.093-.084.209-.19H23.571a3.583 3.583 0 0 0 3.57-3.588v-7.5A3.576 3.576 0 0 0 23.571 0zm1.5 3.573v7.5a1.507 1.507 0 0 1-1.5 1.514h-9.033a2.027 2.027 0 0 0-1.825.735c-.02.019-.044.038-.068.057s-.076.063-.111.1l-.721.652V3.573a1.525 1.525 0 0 1 1.546-1.5h10.212a1.482 1.482 0 0 1 1.497 1.5z"
+      />
+      <circle
+        cx=".657"
+        cy=".657"
+        r=".657"
+        className="a"
+        transform="rotate(-13.286 63.397 -13.8)"
+      />
+      <circle
+        cx=".657"
+        cy=".657"
+        r=".657"
+        transform="rotate(-45 21.26 -1.173)"
+      />
+      <circle
+        cx=".657"
+        cy=".657"
+        r=".657"
+        transform="rotate(-45 16.474 -14.677)"
+      />
+      <circle
+        cx=".657"
+        cy=".657"
+        r=".657"
+        transform="rotate(-13.286 38.285 -72.421)"
+      />
+      <circle
+        cx=".657"
+        cy=".657"
+        r=".657"
+        transform="rotate(-45 18.801 -20.296)"
+      />
+    </g>
+  </svg>
+);
\ No newline at end of file
diff --git a/src/app/content/components/NotificationFooter/HelpIcon.js b/src/app/content/components/NotificationFooter/HelpIcon.js
new file mode 100644
index 000000000..031a72386
--- /dev/null
+++ b/src/app/content/components/NotificationFooter/HelpIcon.js
@@ -0,0 +1,10 @@
+/* eslint-disable max-len */
+import React from 'react';
+
+export default () => (
+  <svg viewBox="0 0 27.807 27.807">
+    <path 
+      d="M13.9 0a13.9 13.9 0 1 0 13.9 13.9A13.9 13.9 0 0 0 13.9 0zm0 25.634A11.731 11.731 0 1 1 25.634 13.9 11.724 11.724 0 0 1 13.9 25.634zm4.345-14.31a4.352 4.352 0 0 1-3.259 4.207V17.3a1.086 1.086 0 0 1-2.172 0v-2.718A1.086 1.086 0 0 1 13.9 13.5a2.172 2.172 0 1 0-2.172-2.172 1.086 1.086 0 0 1-2.172 0 4.345 4.345 0 1 1 8.689 0zm-2.987 9.233A1.358 1.358 0 1 1 13.9 19.2a1.358 1.358 0 0 1 1.361 1.356z" />
+  </svg>
+
+);
\ No newline at end of file
diff --git a/src/app/content/components/NotificationFooter.js b/src/app/content/components/NotificationFooter/NotificationFooter.js
similarity index 61%
rename from src/app/content/components/NotificationFooter.js
rename to src/app/content/components/NotificationFooter/NotificationFooter.js
index 2d5b1ecb4..5c05cd382 100644
--- a/src/app/content/components/NotificationFooter.js
+++ b/src/app/content/components/NotificationFooter/NotificationFooter.js
@@ -1,11 +1,13 @@
 import React from 'react';
-import { NavLink, NotificationFooterContainer} from '../../../components/atoms';
-import { Account, Bubble, Help } from '../../../components/atoms/icons/nav';
+import { NavLink, NotificationFooterContainer} from '../../../../components/atoms';
+import AccountIcon from './AccountIcon';
+import BubbleIcon from './BubbleIcon';
+import HelpIcon from './HelpIcon';
 
 const NotificationFooter = () => (
   <NotificationFooterContainer>
     <NavLink to="/notices">
-      <Bubble />
+      <BubbleIcon />
     </NavLink>
     <NavLink
       as="a"
@@ -13,10 +15,10 @@ const NotificationFooter = () => (
       target="_blank"
       rel="noopener noreferrer"
     >
-      <Help />
+      <HelpIcon />
     </NavLink>
     <NavLink to="/about">
-      <Account />
+      <AccountIcon />
     </NavLink>
   </NotificationFooterContainer>
 );
diff --git a/src/app/content/components/NotificationFooter/index.js b/src/app/content/components/NotificationFooter/index.js
new file mode 100644
index 000000000..063529202
--- /dev/null
+++ b/src/app/content/components/NotificationFooter/index.js
@@ -0,0 +1,3 @@
+import NotificationFooter from './NotificationFooter';
+
+export default NotificationFooter;
diff --git a/src/app/content/components/screens/About.stories.jsx b/src/app/content/components/screens/About.stories.jsx
index ad6479a3d..98fc8ac0c 100644
--- a/src/app/content/components/screens/About.stories.jsx
+++ b/src/app/content/components/screens/About.stories.jsx
@@ -1,36 +1,18 @@
-import React from 'react'
-import { MemoryRouter as Router } from 'react-router-dom'
-import { storiesOf } from '@storybook/react'
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
-import styled, { ThemeProvider, createGlobalStyle } from 'styled-components'
-import theme from '../../../theme'
-import About from './About'
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`
-
-const Wrapper = styled.div`
-  width: 384px;
-  height: 414px;
-`
+import About from './About';
 
 storiesOf('screens/About', module)
   .addDecorator(getStory => (
-    <div>
-      <Global/>
-      <Router>
-        <ThemeProvider theme={theme}>
-          <Wrapper>
-            {getStory()}
-          </Wrapper>
-        </ThemeProvider>
-      </Router>
-    </div>
+    <Router>
+      {getStory()}
+    </Router>
   ))
-  .add('normal', () => <About extensionVersion='1.2.3' close={action('close')} installationDate='01/01/2042'/>)
-  .add('missing installation date', () => (
-    <About extensionVersion='1.2.3' close={action('close')}/>
+  .add('normal', () => (
+    <About extensionVersion="1.2.3" close={action('close')} installationDate="01/01/2042" />
   ))
+  .add('missing installation date', () => (
+    <About extensionVersion="1.2.3" close={action('close')} />
+  ));
diff --git a/src/app/content/components/screens/Notice/List.stories.jsx b/src/app/content/components/screens/Notice/List.stories.jsx
index ee77eca73..cd44a1282 100644
--- a/src/app/content/components/screens/Notice/List.stories.jsx
+++ b/src/app/content/components/screens/Notice/List.stories.jsx
@@ -1,21 +1,8 @@
-import React from 'react'
-import { MemoryRouter as Router } from 'react-router-dom'
-import { storiesOf } from '@storybook/react'
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
-import styled, { ThemeProvider, createGlobalStyle } from 'styled-components'
-import theme from '../../../../theme'
-import List from './List'
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`
-
-const Wrapper = styled.div`
-  width: 384px;
-  height: 414px;
-`
+import List from './List';
 
 const notices = [
   {
@@ -37,24 +24,17 @@ const notices = [
       url_to_redirect: 'url'
     }]
   }
-]
+];
 
 storiesOf('screens/Notice/List', module)
   .addDecorator(getStory => (
-    <div>
-      <Global/>
-      <Router>
-        <ThemeProvider theme={theme}>
-          <Wrapper>
-            {getStory()}
-          </Wrapper>
-        </ThemeProvider>
-      </Router>
-    </div>
+    <Router>
+      {getStory()}
+    </Router>
   ))
   .add('with 1 notification', () => (
     <List close={action('close')} dismiss={action('dismiss')} notices={notices} />
   ))
   .add('empty list', () => (
     <List close={action('close')} dismiss={action('dismiss')} notices={[]} />
-  ))
+  ));
diff --git a/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.jsx b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.jsx
index 55460e2ae..0937282ad 100644
--- a/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.jsx
+++ b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.jsx
@@ -1,24 +1,6 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../../app/theme';
 import AddNoticeLink from './AddNoticeLink';
-import 'typeface-lato';
-import 'typeface-sedgwick-ave';
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
 
 storiesOf('atoms/Buttons/AddNoticeLink', module)
-  .addDecorator(getStory => (
-    <div>
-      <Global />
-      <ThemeProvider theme={theme}>
-        {getStory()}
-      </ThemeProvider>
-    </div>
-  ))
   .add('normal', () => <AddNoticeLink />);
diff --git a/src/components/atoms/Buttons/BackButton/BackButton.stories.jsx b/src/components/atoms/Buttons/BackButton/BackButton.stories.jsx
index 2e7def9de..e849a14d2 100644
--- a/src/components/atoms/Buttons/BackButton/BackButton.stories.jsx
+++ b/src/components/atoms/Buttons/BackButton/BackButton.stories.jsx
@@ -1,26 +1,6 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { withKnobs, text } from '@storybook/addon-knobs';
-import { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../../app/theme';
 import BackButton from './BackButton';
-import 'typeface-lato';
-import 'typeface-sedgwick-ave';
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
 
 storiesOf('atoms/Buttons/BackButton', module)
-  .addDecorator(withKnobs)
-  .addDecorator(getStory => (
-    <div>
-      <Global />
-      <ThemeProvider theme={theme}>
-        {getStory()}
-      </ThemeProvider>
-    </div>
-  ))
   .add('normal', () => <BackButton />);
diff --git a/src/components/atoms/Buttons/BorderButton/BorderButton.stories.jsx b/src/components/atoms/Buttons/BorderButton/BorderButton.stories.jsx
index f3d4e0d7a..22a53009c 100644
--- a/src/components/atoms/Buttons/BorderButton/BorderButton.stories.jsx
+++ b/src/components/atoms/Buttons/BorderButton/BorderButton.stories.jsx
@@ -1,26 +1,10 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { withKnobs, text } from '@storybook/addon-knobs';
-import { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../../app/theme';
 import BorderButton from './BorderButton';
-import 'typeface-lato';
-import 'typeface-sedgwick-ave';
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
 
 storiesOf('atoms/Buttons/BorderButton', module)
   .addDecorator(withKnobs)
-  .addDecorator(getStory => (
-    <div>
-      <Global />
-      <ThemeProvider theme={theme}>
-        {getStory()}
-      </ThemeProvider>
-    </div>
-  ))
-  .add('normal', () => <BorderButton dangerouslySetInnerHTML={{__html: text('content', 'Ajouter')}} />);
+  .add('normal', () => (
+    <BorderButton dangerouslySetInnerHTML={{__html: text('content', 'Ajouter')}} />
+  ));
diff --git a/src/components/atoms/Buttons/CloseButton/CloseButton.stories.jsx b/src/components/atoms/Buttons/CloseButton/CloseButton.stories.jsx
index 79042b4c4..9b293e3d1 100644
--- a/src/components/atoms/Buttons/CloseButton/CloseButton.stories.jsx
+++ b/src/components/atoms/Buttons/CloseButton/CloseButton.stories.jsx
@@ -1,26 +1,6 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { withKnobs, text } from '@storybook/addon-knobs';
-import { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../../app/theme';
 import CloseButton from './CloseButton';
-import 'typeface-lato';
-import 'typeface-sedgwick-ave';
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
 
 storiesOf('atoms/Buttons/CloseButton', module)
-  .addDecorator(withKnobs)
-  .addDecorator(getStory => (
-    <div>
-      <Global />
-      <ThemeProvider theme={theme}>
-        {getStory()}
-      </ThemeProvider>
-    </div>
-  ))
   .add('normal', () => <CloseButton />);
diff --git a/src/components/atoms/Buttons/DeleteButton/DeleteButton.stories.jsx b/src/components/atoms/Buttons/DeleteButton/DeleteButton.stories.jsx
index 463b10589..7b7bd9a8b 100644
--- a/src/components/atoms/Buttons/DeleteButton/DeleteButton.stories.jsx
+++ b/src/components/atoms/Buttons/DeleteButton/DeleteButton.stories.jsx
@@ -1,26 +1,6 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { withKnobs, text } from '@storybook/addon-knobs';
-import { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../../app/theme';
 import DeleteButton from './DeleteButton';
-import 'typeface-lato';
-import 'typeface-sedgwick-ave';
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
 
 storiesOf('atoms/Buttons/DeleteButton', module)
-  .addDecorator(withKnobs)
-  .addDecorator(getStory => (
-    <div>
-      <Global />
-      <ThemeProvider theme={theme}>
-        {getStory()}
-      </ThemeProvider>
-    </div>
-  ))
   .add('normal', () => <DeleteButton />);
diff --git a/src/components/atoms/Buttons/OpenButton/OpenButton.stories.jsx b/src/components/atoms/Buttons/OpenButton/OpenButton.stories.jsx
index 84e64a939..a0904cef6 100644
--- a/src/components/atoms/Buttons/OpenButton/OpenButton.stories.jsx
+++ b/src/components/atoms/Buttons/OpenButton/OpenButton.stories.jsx
@@ -1,26 +1,6 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { withKnobs, text } from '@storybook/addon-knobs';
-import { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../../app/theme';
 import OpenButton from './OpenButton';
-import 'typeface-lato';
-import 'typeface-sedgwick-ave';
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
 
 storiesOf('atoms/Buttons/OpenButton', module)
-  .addDecorator(withKnobs)
-  .addDecorator(getStory => (
-    <div>
-      <Global />
-      <ThemeProvider theme={theme}>
-        {getStory()}
-      </ThemeProvider>
-    </div>
-  ))
   .add('normal', () => <OpenButton />);
diff --git a/src/components/atoms/ContentTitle/ContentTitle.stories.jsx b/src/components/atoms/ContentTitle/ContentTitle.stories.jsx
index 8d4a9f6c2..e7d646a51 100644
--- a/src/components/atoms/ContentTitle/ContentTitle.stories.jsx
+++ b/src/components/atoms/ContentTitle/ContentTitle.stories.jsx
@@ -1,24 +1,8 @@
-import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../app/theme';
+import { withKnobs, text } from '@storybook/addon-knobs';
+import React from 'react';
 import ContentTitle from './ContentTitle';
-import 'typeface-lato';
-import 'typeface-sedgwick-ave';
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
 
 storiesOf('atoms/ContentTitle', module)
-  .addDecorator(getStory => (
-    <div>
-      <Global />
-      <ThemeProvider theme={theme}>
-        {getStory()}
-      </ThemeProvider>
-    </div>
-  ))
-  .add('normal', () => <ContentTitle>Title</ContentTitle>);
+  .addDecorator(withKnobs)
+  .add('normal', () => <ContentTitle>{text('title', 'Title')}</ContentTitle>);
diff --git a/src/components/atoms/Forms/Textarea/Textarea.stories.jsx b/src/components/atoms/Forms/Textarea/Textarea.stories.jsx
index cd9f76984..152bafc32 100644
--- a/src/components/atoms/Forms/Textarea/Textarea.stories.jsx
+++ b/src/components/atoms/Forms/Textarea/Textarea.stories.jsx
@@ -1,26 +1,6 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { withKnobs, text } from '@storybook/addon-knobs';
-import { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../../app/theme';
 import Textarea from './Textarea';
-import 'typeface-lato';
-import 'typeface-sedgwick-ave';
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
 
 storiesOf('atoms/Forms/Textarea', module)
-  .addDecorator(withKnobs)
-  .addDecorator(getStory => (
-    <div>
-      <Global />
-      <ThemeProvider theme={theme}>
-        {getStory()}
-      </ThemeProvider>
-    </div>
-  ))
   .add('normal', () => <Textarea />);
diff --git a/src/components/atoms/icons/types/index.js b/src/components/atoms/icons/types/index.js
index 3059f905d..c5383b1c9 100644
--- a/src/components/atoms/icons/types/index.js
+++ b/src/components/atoms/icons/types/index.js
@@ -1,5 +1,7 @@
 export { default as Like } from './Like';
+export { default as Approval } from './Like';
 export { default as Dislike } from './Dislike';
+export { default as Disapproval } from './Dislike';
 export { default as Tip } from './Tip';
 export { default as Alternative } from './Alternative';
 export { default as Other } from './Other';
diff --git a/src/components/molecules/NotificationFooter/NotificationFooter.stories.jsx b/src/components/molecules/NotificationFooter/NotificationFooter.stories.jsx
index 43ee5037a..8c5ec55ae 100644
--- a/src/components/molecules/NotificationFooter/NotificationFooter.stories.jsx
+++ b/src/components/molecules/NotificationFooter/NotificationFooter.stories.jsx
@@ -1,33 +1,9 @@
 import React from 'react';
 import { StaticRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
-import { action } from '@storybook/addon-actions';
-import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
 import NotificationFooter from './NotificationFooter';
-import theme from '../../../app/theme';
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
-
-const Wrapper = styled.div`
-  width: 384px;
-  height: 414px;
-`;
 
 storiesOf('molecules/NotificationFooter', module)
-  .addDecorator(getStory => (
-    <div>
-      <Global />
-      <ThemeProvider theme={theme}>
-        <Wrapper>
-          {getStory()}
-        </Wrapper>
-      </ThemeProvider>
-    </div>
-  ))
   .add('On nothing', () => (
     <Router><NotificationFooter /></Router>
   ))
diff --git a/src/components/molecules/NotificationHeader.stories.jsx b/src/components/molecules/NotificationHeader.stories.jsx
index eca255340..0072757c4 100644
--- a/src/components/molecules/NotificationHeader.stories.jsx
+++ b/src/components/molecules/NotificationHeader.stories.jsx
@@ -1,35 +1,15 @@
-import React from 'react'
-import { MemoryRouter as Router } from 'react-router-dom'
-import { storiesOf } from '@storybook/react'
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
-import styled, { ThemeProvider, createGlobalStyle } from 'styled-components'
-import NotificationHeader from './NotificationHeader'
-import theme from '../../app/theme'
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`
-
-const Wrapper = styled.div`
-  width: 384px;
-  height: 414px;
-`
+import NotificationHeader from './NotificationHeader';
 
 storiesOf('molecules/NotificationHeader', module)
   .addDecorator(getStory => (
-    <div>
-      <Global/>
-      <Router>
-        <ThemeProvider theme={theme}>
-          <Wrapper>
-            {getStory()}
-          </Wrapper>
-        </ThemeProvider>
-      </Router>
-    </div>
+    <Router>
+      {getStory()}
+    </Router>
   ))
   .add('normal', () => (
-    <NotificationHeader title={'title'} close={action('close')} onBack={action('onback')}/>
-  ))
+    <NotificationHeader title="title" close={action('close')} onBack={action('onback')} />
+  ));
diff --git a/src/components/organisms/Notice.stories.jsx b/src/components/organisms/Notice.stories.jsx
index e41169a3f..52cc28387 100644
--- a/src/components/organisms/Notice.stories.jsx
+++ b/src/components/organisms/Notice.stories.jsx
@@ -1,69 +1,62 @@
-import React from 'react'
-import { MemoryRouter as Router } from 'react-router-dom'
-import { storiesOf } from '@storybook/react'
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
-import styled, { ThemeProvider, createGlobalStyle } from 'styled-components'
-import theme from '../../app/theme'
-import Notice from './Notice'
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`
-
-const Wrapper = styled.div`
-  width: 384px;
-  height: 414px;
-`
-
-const notices = [
-  {
-    id: '123',
-    description: 'Description',
-    title: 'title',
-    contributor: { name: 'John Doe' },
-    criteria: [{ label: 'label', slug: 'slug' }],
-    isApproved: true,
-    isDismissed: false,
-    resource: {
-      author: 'Jack Daniels',
-      editor: 'LMEM',
-      label: 'label',
-      url: 'url',
-    },
-    alternatives: [{
-      label: 'some alternative',
-      url_to_redirect: 'url'
-    }]
-  }
-]
+import Notice from './Notice';
 
 storiesOf('organisms/Notice', module)
   .addDecorator(getStory => (
-    <div>
-      <Global/>
-      <Router>
-        <ThemeProvider theme={theme}>
-          <Wrapper>
-            {getStory()}
-          </Wrapper>
-        </ThemeProvider>
-      </Router>
-    </div>
+    <Router>
+      {getStory()}
+    </Router>
   ))
   .add('Approval', () => (
-    <Notice type='Approval' contributor='Jalil' id='123' message='message' dismiss={action('dismiss')} dismissed={false} />
+    <Notice
+      type="Approval"
+      contributor="Jalil"
+      id="123"
+      message="message"
+      dismiss={action('dismiss')}
+      dismissed={false}
+    />
   ))
   .add('Disapproval', () => (
-    <Notice type='Disapproval' contributor='Jalil' id='123' message='message' dismiss={action('dismiss')} dismissed={false} />
+    <Notice
+      type="Disapproval"
+      contributor="Jalil"
+      id="123"
+      message="message"
+      dismiss={action('dismiss')}
+      dismissed={false}
+    />
   ))
   .add('Tip', () => (
-    <Notice type='Tip' contributor='Jalil' id='123' message='message' dismiss={action('dismiss')} dismissed={false} />
+    <Notice
+      type="Tip"
+      contributor="Jalil"
+      id="123"
+      message="message"
+      dismiss={action('dismiss')}
+      dismissed={false}
+    />
   ))
   .add('Other', () => (
-    <Notice type='Other' contributor='Jalil' id='123' message='message' dismiss={action('dismiss')} dismissed={false} />
+    <Notice
+      type="Other"
+      contributor="Jalil"
+      id="123"
+      message="message"
+      dismiss={action('dismiss')}
+      dismissed={false}
+    />
   ))
   .add('dismissed', () => (
-    <Notice type='Disapproval' contributor='Jalil' id='123' message='message' dismiss={action('dismiss')} dismissed={true} />
-  ))
+    <Notice
+      type="Disapproval"
+      contributor="Jalil"
+      id="123"
+      message="message"
+      dismiss={action('dismiss')}
+      dismissed
+    />
+  ));
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.js b/src/components/organisms/NoticeDetails/NoticeDetails.js
index 635f08b08..b88928350 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.js
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.js
@@ -71,7 +71,7 @@ class NoticeDetails extends PureComponent {
 
   render() {
     const {
-      type, date, message, contributor, source, liked, disliked,
+      type, date, message, contributor, source, liked, disliked, dismissed
     } = this.props;
 
     return (
@@ -107,7 +107,7 @@ class NoticeDetails extends PureComponent {
             </Button>
           </Feedbacks>
 
-          {(disliked) && (
+          {(disliked || dismissed) && (
             <DetailsDislike>
             Merci pour votre retour, cette notification ne s’affichera plus
               <div>
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.stories.jsx b/src/components/organisms/NoticeDetails/NoticeDetails.stories.jsx
index 6ecb144b4..bcdbbf013 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.stories.jsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.stories.jsx
@@ -2,56 +2,52 @@ import React from 'react';
 import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
-import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../app/theme';
 import NoticeDetails from './NoticeDetails';
 
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`
-
-const Wrapper = styled.div`
-  width: 384px;
-  height: 414px;
-`
-
-const notices = [
-  {
-    id: '123',
-    description: 'Description',
-    title: 'title',
-    contributor: { name: 'John Doe' },
-    criteria: [{ label: 'label', slug: 'slug' }],
-    isApproved: true,
-    isDismissed: false,
-    resource: {
-      author: 'Jack Daniels',
-      editor: 'LMEM',
-      label: 'label',
-      url: 'url',
-    },
-    alternatives: [{
-      label: 'some alternative',
-      url_to_redirect: 'url'
-    }]
-  }
-];
-
 storiesOf('organisms/NoticeDetails', module)
   .addDecorator(getStory => (
-    <div>
-      <Global />
-      <Router>
-        <ThemeProvider theme={theme}>
-          <Wrapper>
-            {getStory()}
-          </Wrapper>
-        </ThemeProvider>
-      </Router>
-    </div>
+    <Router>
+      {getStory()}
+    </Router>
   ))
   .add('Approval', () => (
-    <NoticeDetails type='Approval' contributor='Jalil' id='123' message='message' dismiss={action('dismiss')} />
+    <NoticeDetails
+      type="Approval"
+      contributor="Jalil"
+      id="123"
+      message="Un message qui décrit quelque chose et donc ça prend beaucoup de mots"
+      date="12/12/2042"
+      source="http://www.lmem.net"
+      likes={42}
+      dislikes={2}
+      dismiss={action('dismiss')}
+    />
+  ))
+  .add('Dismissed', () => (
+    <NoticeDetails
+      type="Approval"
+      dismissed
+      contributor="Jalil"
+      id="123"
+      message="Un message qui décrit quelque chose et donc ça prend beaucoup de mots"
+      date="12/12/2042"
+      source="http://www.lmem.net"
+      likes={42}
+      dislikes={2}
+      dismiss={action('dismiss')}
+    />
+  ))
+  .add('Disliked', () => (
+    <NoticeDetails
+      type="Approval"
+      disliked
+      contributor="Jalil"
+      id="123"
+      message="Un message qui décrit quelque chose et donc ça prend beaucoup de mots"
+      date="12/12/2042"
+      source="http://www.lmem.net"
+      likes={42}
+      dislikes={2}
+      dismiss={action('dismiss')}
+    />
   ));
diff --git a/src/components/screens/Account/About/About.stories.jsx b/src/components/screens/Account/About/About.stories.jsx
index 074f991cd..8efad6011 100644
--- a/src/components/screens/Account/About/About.stories.jsx
+++ b/src/components/screens/Account/About/About.stories.jsx
@@ -2,28 +2,12 @@ import React from 'react';
 import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
-import { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../../app/theme';
-import { NotificationContainer } from '../../../atoms';
 import About from './About';
-import 'typeface-lato';
-import 'typeface-sedgwick-ave';
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
 
 storiesOf('screens/NewAbout', module)
   .addDecorator(getStory => (
     <Router>
-      <ThemeProvider theme={theme}>
-        <NotificationContainer>
-          <Global />
-          {getStory()}
-        </NotificationContainer>
-      </ThemeProvider>
+      {getStory()}
     </Router>
   ))
   .add('normal', () => <About extensionVersion="1.2.3" close={action('close')} installationDate="01/01/2042" />);

From 07a5bf843856b7d773c37d2ec847f615cc5d2fd9 Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Mon, 25 Feb 2019 12:25:11 +0100
Subject: [PATCH 013/100] storyfies the world

---
 src/components/atoms/Error/index.js           |  3 --
 src/components/atoms/Help/index.js            |  2 --
 src/components/atoms/Subscriptions/index.js   |  2 --
 .../atoms/icons/illustrations/index.js        |  5 +--
 src/components/atoms/index.js                 | 13 --------
 .../NotificationHeader.js                     |  6 ++--
 .../NotificationHeader.stories.jsx            |  0
 .../Type/Background.js}                       |  0
 .../molecules/{NoticeType.js => Type/Type.js} |  8 ++---
 .../molecules/Type/Type.stories.jsx           | 14 ++++++++
 src/components/molecules/index.js             |  8 ++---
 .../{atoms => organisms}/Notice/Container.js  |  0
 .../{atoms => organisms}/Notice/Content.js    |  0
 .../{atoms => organisms}/Notice/Deleted.js    |  0
 .../Notice/NoNoticeImg.js                     |  0
 .../organisms/{ => Notice}/Notice.js          | 25 +++++++-------
 .../organisms/{ => Notice}/Notice.stories.jsx |  0
 .../Notice/Title.js}                          |  2 +-
 .../{atoms => organisms}/Notice/index.js      |  3 --
 src/components/organisms/Notification.js      |  2 +-
 src/components/organisms/index.js             |  2 +-
 .../screens/Account/{ => Filters}/Filters.js  |  4 +--
 .../Account/Filters/Filters.stories.jsx       | 32 ++++++++++++++++++
 .../screens/Account/{ => Menu}/Menu.js        |  4 +--
 .../screens/Account/Menu/Menu.stories.jsx     | 32 ++++++++++++++++++
 src/components/screens/Account/index.js       |  8 ++---
 .../{atoms => screens}/Error/Container.js     |  0
 .../{atoms => screens}/Error/Content.js       |  0
 .../{atoms => screens}/Error/ContentTitle.js  |  0
 src/components/screens/{ => Error}/Error.js   | 12 ++++---
 .../screens/Error/Error.stories.jsx           | 32 ++++++++++++++++++
 .../Error/Illustration.js}                    |  0
 .../{atoms => screens}/Help/Container.js      |  0
 .../{atoms => screens}/Help/ContentTitle.js   |  2 +-
 src/components/screens/{ => Help}/Help.js     |  9 ++---
 src/components/screens/Help/Help.stories.jsx  | 33 +++++++++++++++++++
 src/components/screens/Loading.js             | 13 --------
 .../Loading/Container.js}                     |  0
 .../Loading/Illustration.js}                  |  0
 src/components/screens/Loading/Loading.js     | 13 ++++++++
 .../screens/{ => Loading}/Loading.stories.jsx |  2 +-
 src/components/screens/Notice/index.js        |  2 +-
 .../Subscriptions/Container.js                |  0
 .../Subscriptions/Illustration.js}            |  0
 .../{ => Subscriptions}/Subscriptions.js      | 11 ++++---
 .../Subscriptions/Subscriptions.stories.jsx   | 32 ++++++++++++++++++
 .../Subscriptions/SubscriptionsData.js        |  0
 src/components/screens/index.js               |  6 ++--
 48 files changed, 247 insertions(+), 95 deletions(-)
 delete mode 100644 src/components/atoms/Error/index.js
 delete mode 100644 src/components/atoms/Help/index.js
 delete mode 100644 src/components/atoms/Subscriptions/index.js
 rename src/components/molecules/{ => NotificationHeader}/NotificationHeader.js (86%)
 rename src/components/molecules/{ => NotificationHeader}/NotificationHeader.stories.jsx (100%)
 rename src/components/{atoms/Notice/TypeBackground.js => molecules/Type/Background.js} (100%)
 rename src/components/molecules/{NoticeType.js => Type/Type.js} (77%)
 create mode 100644 src/components/molecules/Type/Type.stories.jsx
 rename src/components/{atoms => organisms}/Notice/Container.js (100%)
 rename src/components/{atoms => organisms}/Notice/Content.js (100%)
 rename src/components/{atoms => organisms}/Notice/Deleted.js (100%)
 rename src/components/{atoms => organisms}/Notice/NoNoticeImg.js (100%)
 rename src/components/organisms/{ => Notice}/Notice.js (73%)
 rename src/components/organisms/{ => Notice}/Notice.stories.jsx (100%)
 rename src/components/{molecules/NoticeTitle.js => organisms/Notice/Title.js} (91%)
 rename src/components/{atoms => organisms}/Notice/index.js (53%)
 rename src/components/screens/Account/{ => Filters}/Filters.js (64%)
 create mode 100644 src/components/screens/Account/Filters/Filters.stories.jsx
 rename src/components/screens/Account/{ => Menu}/Menu.js (85%)
 create mode 100644 src/components/screens/Account/Menu/Menu.stories.jsx
 rename src/components/{atoms => screens}/Error/Container.js (100%)
 rename src/components/{atoms => screens}/Error/Content.js (100%)
 rename src/components/{atoms => screens}/Error/ContentTitle.js (100%)
 rename src/components/screens/{ => Error}/Error.js (54%)
 create mode 100644 src/components/screens/Error/Error.stories.jsx
 rename src/components/{atoms/icons/illustrations/Error.js => screens/Error/Illustration.js} (100%)
 rename src/components/{atoms => screens}/Help/Container.js (100%)
 rename src/components/{atoms => screens}/Help/ContentTitle.js (65%)
 rename src/components/screens/{ => Help}/Help.js (82%)
 create mode 100644 src/components/screens/Help/Help.stories.jsx
 delete mode 100644 src/components/screens/Loading.js
 rename src/components/{atoms/LoadingContainer.js => screens/Loading/Container.js} (100%)
 rename src/components/{atoms/icons/illustrations/Loading.js => screens/Loading/Illustration.js} (100%)
 create mode 100644 src/components/screens/Loading/Loading.js
 rename src/components/screens/{ => Loading}/Loading.stories.jsx (95%)
 rename src/components/{atoms => screens}/Subscriptions/Container.js (100%)
 rename src/components/{atoms/icons/illustrations/Subscriptions.js => screens/Subscriptions/Illustration.js} (100%)
 rename src/components/screens/{ => Subscriptions}/Subscriptions.js (67%)
 create mode 100644 src/components/screens/Subscriptions/Subscriptions.stories.jsx
 rename src/components/{atoms => screens}/Subscriptions/SubscriptionsData.js (100%)

diff --git a/src/components/atoms/Error/index.js b/src/components/atoms/Error/index.js
deleted file mode 100644
index 59d18bc21..000000000
--- a/src/components/atoms/Error/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as Container } from './Container';
-export { default as ContentTitle } from './ContentTitle';
-export { default as Content } from './Content';
\ No newline at end of file
diff --git a/src/components/atoms/Help/index.js b/src/components/atoms/Help/index.js
deleted file mode 100644
index c789639f7..000000000
--- a/src/components/atoms/Help/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as Container } from './Container';
-export { default as ContentTitle } from './ContentTitle';
\ No newline at end of file
diff --git a/src/components/atoms/Subscriptions/index.js b/src/components/atoms/Subscriptions/index.js
deleted file mode 100644
index 69ad0cc9f..000000000
--- a/src/components/atoms/Subscriptions/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as Container } from './Container';
-export { default as SubscriptionsData } from './SubscriptionsData';
diff --git a/src/components/atoms/icons/illustrations/index.js b/src/components/atoms/icons/illustrations/index.js
index fd55bf9aa..d930d9387 100644
--- a/src/components/atoms/icons/illustrations/index.js
+++ b/src/components/atoms/icons/illustrations/index.js
@@ -1,4 +1 @@
-export { default as NoNotice } from './NoNotice';
-export { default as Error } from './Error';
-export { default as Loading } from './Loading';
-export { default as Subscriptions } from './Subscriptions';
\ No newline at end of file
+export { default as NoNotice } from './NoNotice';
\ No newline at end of file
diff --git a/src/components/atoms/index.js b/src/components/atoms/index.js
index 0ab30c361..0c27e44b4 100644
--- a/src/components/atoms/index.js
+++ b/src/components/atoms/index.js
@@ -1,13 +1,5 @@
 export { default as AddNoticeLink } from './Buttons/AddNoticeLink';
 export { default as BackButton } from './Buttons/BackButton/BackButton';
-export { default as NoticeContainer } from './Notice/Container';
-export { default as NoticeContent } from './Notice/Content';
-export { default as NoticeDeleted } from './Notice/Deleted';
-export { default as NoticeTypeBackground } from './Notice/TypeBackground';
-export { default as NoticeDetailsContainer } from '../organisms/NoticeDetails/DetailsContainer';
-export { default as NoticeDetailsContent } from '../organisms/NoticeDetails/DetailsContent';
-export { default as NoticeDetailsMeta } from '../organisms/NoticeDetails/DetailsMeta';
-export { default as NoticeDetailsDislike } from '../organisms/NoticeDetails/DetailsDislike';
 export { default as Button } from './Button';
 export { default as BorderButton } from './Buttons/BorderButton';
 export { default as CloseButton } from './Buttons/CloseButton/CloseButton';
@@ -16,20 +8,15 @@ export { default as DeleteButton } from './Buttons/DeleteButton/DeleteButton';
 export { default as OpenButton } from './Buttons/OpenButton/OpenButton';
 export { default as NotificationContainer } from './Notification/Container';
 export { default as NotificationContentTitle } from './Notification/ContentTitle';
-export { default as NotificationFooterContainer } from '../molecules/NotificationFooter/FooterContainer';
 export { default as NotificationHeaderContainer } from './Notification/HeaderContainer';
 export { default as NotificationMain } from './Notification/Main';
 export { default as GlobalStyle } from './GlobalStyle';
 export { default as Logo } from './Logo';
-export { default as Source } from '../organisms/NoticeDetails/Source';
 export { default as SourceURLContainer } from './SourceURLContainer';
 export { default as Time } from './Time';
 export { default as Title } from './Title';
 export { default as Truncated } from './Truncated';
-export { default as NavLink } from '../molecules/NotificationFooter/NavLink';
-export { default as NoNoticeImg } from './Notice/NoNoticeImg';
 export { default as CenterContainer } from './CenterContainer';
-export { default as LoadingContainer } from './LoadingContainer';
 export { default as List } from './List';
 export { default as Account } from './Account';
 export { default as ContentTitle } from './ContentTitle/ContentTitle';
diff --git a/src/components/molecules/NotificationHeader.js b/src/components/molecules/NotificationHeader/NotificationHeader.js
similarity index 86%
rename from src/components/molecules/NotificationHeader.js
rename to src/components/molecules/NotificationHeader/NotificationHeader.js
index 79c55ba07..89a93ef47 100644
--- a/src/components/molecules/NotificationHeader.js
+++ b/src/components/molecules/NotificationHeader/NotificationHeader.js
@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 import { withRouter } from 'react-router';
 import {
   BackButton, CloseButton, Logo, NotificationHeaderContainer, Title
-} from '../atoms';
-import { truncateButPreserveWords } from '../../app/utils/truncate';
-import removeHtml from '../../app/utils/removeHtml';
+} from '../../atoms';
+import { truncateButPreserveWords } from '../../../app/utils/truncate';
+import removeHtml from '../../../app/utils/removeHtml';
 
 const NotificationHeader = ({
   title, goBack, close, history
diff --git a/src/components/molecules/NotificationHeader.stories.jsx b/src/components/molecules/NotificationHeader/NotificationHeader.stories.jsx
similarity index 100%
rename from src/components/molecules/NotificationHeader.stories.jsx
rename to src/components/molecules/NotificationHeader/NotificationHeader.stories.jsx
diff --git a/src/components/atoms/Notice/TypeBackground.js b/src/components/molecules/Type/Background.js
similarity index 100%
rename from src/components/atoms/Notice/TypeBackground.js
rename to src/components/molecules/Type/Background.js
diff --git a/src/components/molecules/NoticeType.js b/src/components/molecules/Type/Type.js
similarity index 77%
rename from src/components/molecules/NoticeType.js
rename to src/components/molecules/Type/Type.js
index 00b80ebd3..861230e91 100644
--- a/src/components/molecules/NoticeType.js
+++ b/src/components/molecules/Type/Type.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { withTheme } from 'styled-components';
-import { NoticeTypeBackground } from '../atoms';
-import * as noticeTypeIcons from '../atoms/icons/types';
+import Background from './Background';
+import * as noticeTypeIcons from '../../atoms/icons/types';
 
 const getTypeOrFallback = referential => type => (
   type in referential
@@ -15,9 +15,9 @@ const NoticeType = ({ type, theme }) => {
   const style = getTypeOrFallback(theme.noticeTypes)(type);
 
   return (
-    <NoticeTypeBackground color={style && style.background}>
+    <Background color={style && style.background}>
       {NoticeTypeIcon && <NoticeTypeIcon />}
-    </NoticeTypeBackground>
+    </Background>
   );
 };
 
diff --git a/src/components/molecules/Type/Type.stories.jsx b/src/components/molecules/Type/Type.stories.jsx
new file mode 100644
index 000000000..8cc845fbc
--- /dev/null
+++ b/src/components/molecules/Type/Type.stories.jsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import Type from './Type';
+
+storiesOf('molecules/Type', module)
+  .addDecorator(getStory => (
+    <Router>
+      {getStory()}
+    </Router>
+  ))
+  .add('normal', () => (
+    <Type />
+  ));
diff --git a/src/components/molecules/index.js b/src/components/molecules/index.js
index c267c64e3..188d34947 100644
--- a/src/components/molecules/index.js
+++ b/src/components/molecules/index.js
@@ -1,7 +1,5 @@
 export { default as AddNotice } from './AddNotice';
-export { default as NoticeTitle } from './NoticeTitle';
-export { default as NoNotice } from './NoNotice';
-export { default as NoticeType } from './NoticeType';
 export { default as NotificationFooter } from './NotificationFooter';
-export { default as NotificationHeader } from './NotificationHeader';
-export { default as SourceURL } from './SourceURL';
\ No newline at end of file
+export { default as NotificationHeader } from './NotificationHeader/NotificationHeader';
+export { default as SourceURL } from './SourceURL';
+export { default as NoticeType } from './Type/Type';
\ No newline at end of file
diff --git a/src/components/atoms/Notice/Container.js b/src/components/organisms/Notice/Container.js
similarity index 100%
rename from src/components/atoms/Notice/Container.js
rename to src/components/organisms/Notice/Container.js
diff --git a/src/components/atoms/Notice/Content.js b/src/components/organisms/Notice/Content.js
similarity index 100%
rename from src/components/atoms/Notice/Content.js
rename to src/components/organisms/Notice/Content.js
diff --git a/src/components/atoms/Notice/Deleted.js b/src/components/organisms/Notice/Deleted.js
similarity index 100%
rename from src/components/atoms/Notice/Deleted.js
rename to src/components/organisms/Notice/Deleted.js
diff --git a/src/components/atoms/Notice/NoNoticeImg.js b/src/components/organisms/Notice/NoNoticeImg.js
similarity index 100%
rename from src/components/atoms/Notice/NoNoticeImg.js
rename to src/components/organisms/Notice/NoNoticeImg.js
diff --git a/src/components/organisms/Notice.js b/src/components/organisms/Notice/Notice.js
similarity index 73%
rename from src/components/organisms/Notice.js
rename to src/components/organisms/Notice/Notice.js
index 4ab62cf4c..fcf1df333 100644
--- a/src/components/organisms/Notice.js
+++ b/src/components/organisms/Notice/Notice.js
@@ -1,15 +1,16 @@
 import React, { Fragment, PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import {
-  NoticeContainer,
-  NoticeContent,
-  NoticeDeleted,
   Contributor,
   DeleteButton,
   OpenButton,
   Button,
-} from '../atoms';
-import { NoticeTitle, NoticeType } from '../molecules';
+} from '../../atoms';
+import Type from '../../molecules/Type/Type';
+import Container from './Container';
+import Content from './Content';
+import Deleted from './Deleted';
+import Title from './Title';
 
 export default class Notice extends PureComponent {
   static propTypes = {
@@ -33,21 +34,21 @@ export default class Notice extends PureComponent {
       id, type, message, contributor, dismissed, disliked, dismiss, undismiss
     } = this.props;
     return (
-      <NoticeContainer>
+      <Container>
         {!dismissed && !disliked
         && <DeleteButton onClick={() => dismiss(id)} />
         }
-        <NoticeContent to={!dismissed && `notices/details/${id}`}>
+        <Content to={!dismissed && `notices/details/${id}`}>
           {dismissed || disliked ? (
             <Fragment>
-              <NoticeDeleted>Cette notification ne s’affichera plus !</NoticeDeleted>
+              <Deleted>Cette notification ne s’affichera plus !</Deleted>
               <Button onClick={() => undismiss(id)}>Annuler</Button>
             </Fragment>
           ) : (
             <Fragment>
-              <NoticeType type={type} />
+              <Type type={type} />
               <div>
-                <NoticeTitle>{message}</NoticeTitle>
+                <Title>{message}</Title>
                 <Contributor>
                       Par :
                       &nbsp;
@@ -57,8 +58,8 @@ export default class Notice extends PureComponent {
               <OpenButton />
             </Fragment>
           )}
-        </NoticeContent>
-      </NoticeContainer>
+        </Content>
+      </Container>
     );
   }
 }
diff --git a/src/components/organisms/Notice.stories.jsx b/src/components/organisms/Notice/Notice.stories.jsx
similarity index 100%
rename from src/components/organisms/Notice.stories.jsx
rename to src/components/organisms/Notice/Notice.stories.jsx
diff --git a/src/components/molecules/NoticeTitle.js b/src/components/organisms/Notice/Title.js
similarity index 91%
rename from src/components/molecules/NoticeTitle.js
rename to src/components/organisms/Notice/Title.js
index 709a6594d..06487bce5 100644
--- a/src/components/molecules/NoticeTitle.js
+++ b/src/components/organisms/Notice/Title.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import Truncated from '../atoms/Truncated';
+import Truncated from '../../atoms/Truncated';
 
 export const TitleContainer = styled.p`
     display: inline;
diff --git a/src/components/atoms/Notice/index.js b/src/components/organisms/Notice/index.js
similarity index 53%
rename from src/components/atoms/Notice/index.js
rename to src/components/organisms/Notice/index.js
index 604e91c2b..8d8e788ae 100644
--- a/src/components/atoms/Notice/index.js
+++ b/src/components/organisms/Notice/index.js
@@ -1,7 +1,4 @@
 export { default as Container } from './Container';
 export { default as Content } from './Content';
 export { default as Deleted } from './Deleted';
-export { default as DetailsContainer } from './DetailsContainer';
-export { default as DetailsContent } from './DetailsContent';
-export { default as DetailsMeta } from './DetailsMeta';
 export { default as TypeBackground } from './TypeBackground';
diff --git a/src/components/organisms/Notification.js b/src/components/organisms/Notification.js
index 5d864a4b2..1e9d51e7a 100644
--- a/src/components/organisms/Notification.js
+++ b/src/components/organisms/Notification.js
@@ -2,7 +2,7 @@ import React, { Fragment, PureComponent} from 'react';
 import PropTypes from 'prop-types';
 import { NotificationMain } from '../atoms';
 import { NotificationHeader } from '../molecules';
-import Notice from './Notice';
+import Notice from './Notice/Notice';
 import NoticeDetails from './NoticeDetails/NoticeDetails';
 import isChildInstanceOf from '../../app/utils/isChildInstanceOf';
 
diff --git a/src/components/organisms/index.js b/src/components/organisms/index.js
index b985122d6..09a6ddcf0 100644
--- a/src/components/organisms/index.js
+++ b/src/components/organisms/index.js
@@ -1,4 +1,4 @@
-export { default as Notice } from './Notice';
+export { default as Notice } from './Notice/Notice';
 export { default as Notification } from './Notification';
 export { default as NotificationNavigation } from './NotificationNavigation';
 export { default as NoticeDetails } from './NoticeDetails/NoticeDetails';
\ No newline at end of file
diff --git a/src/components/screens/Account/Filters.js b/src/components/screens/Account/Filters/Filters.js
similarity index 64%
rename from src/components/screens/Account/Filters.js
rename to src/components/screens/Account/Filters/Filters.js
index a8ff8ac1b..973104cdc 100644
--- a/src/components/screens/Account/Filters.js
+++ b/src/components/screens/Account/Filters/Filters.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import { NotificationContentTitle } from '../../atoms';
-import { Notification } from '../../organisms';
+import { NotificationContentTitle } from '../../../atoms';
+import { Notification } from '../../../organisms';
 
 export default ({ close }) => (
   <Notification title="Mes Filtres" close={close}>
diff --git a/src/components/screens/Account/Filters/Filters.stories.jsx b/src/components/screens/Account/Filters/Filters.stories.jsx
new file mode 100644
index 000000000..b974bd24e
--- /dev/null
+++ b/src/components/screens/Account/Filters/Filters.stories.jsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
+import theme from '../../../../app/theme';
+import Filters from './Filters';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+const Wrapper = styled.div`
+  width: 384px;
+  height: 414px;
+`;
+
+storiesOf('screens/Filters', module)
+  .addDecorator(getStory => (
+    <div>
+      <Global />
+      <Router>
+        <ThemeProvider theme={theme}>
+          <Wrapper>
+            {getStory()}
+          </Wrapper>
+        </ThemeProvider>
+      </Router>
+    </div>
+  ))
+  .add('normal', () => <Filters />);
diff --git a/src/components/screens/Account/Menu.js b/src/components/screens/Account/Menu/Menu.js
similarity index 85%
rename from src/components/screens/Account/Menu.js
rename to src/components/screens/Account/Menu/Menu.js
index 0db8164f2..86fbd36ec 100644
--- a/src/components/screens/Account/Menu.js
+++ b/src/components/screens/Account/Menu/Menu.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { Notification } from '../../organisms';
-import { Account, OpenButton } from '../../atoms';
+import { Notification } from '../../../organisms';
+import { Account, OpenButton } from '../../../atoms';
 
 export default ({ match, close }) => (
   <Notification title="Account" close={close}>
diff --git a/src/components/screens/Account/Menu/Menu.stories.jsx b/src/components/screens/Account/Menu/Menu.stories.jsx
new file mode 100644
index 000000000..7cba7530a
--- /dev/null
+++ b/src/components/screens/Account/Menu/Menu.stories.jsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
+import theme from '../../../../app/theme';
+import Menu from './Menu';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+const Wrapper = styled.div`
+  width: 384px;
+  height: 414px;
+`;
+
+storiesOf('screens/Menu', module)
+  .addDecorator(getStory => (
+    <div>
+      <Global />
+      <Router>
+        <ThemeProvider theme={theme}>
+          <Wrapper>
+            {getStory()}
+          </Wrapper>
+        </ThemeProvider>
+      </Router>
+    </div>
+  ))
+  .add('normal', () => <Menu />);
diff --git a/src/components/screens/Account/index.js b/src/components/screens/Account/index.js
index deea4cc7a..97a32fdc5 100644
--- a/src/components/screens/Account/index.js
+++ b/src/components/screens/Account/index.js
@@ -1,10 +1,10 @@
 import { Route, Switch } from 'react-router-dom';
 import React from 'react';
-import Filters from './Filters';
-import Menu from './Menu';
+import Filters from './Filters/Filters';
+import Menu from './Menu/Menu';
 import About from './About/About';
-import Error from '../Error';
-import Loading from '../Loading';
+import Error from '../Error/Error';
+import Loading from '../Loading/Loading';
 
 export default ({ match }) => (
   <Switch>
diff --git a/src/components/atoms/Error/Container.js b/src/components/screens/Error/Container.js
similarity index 100%
rename from src/components/atoms/Error/Container.js
rename to src/components/screens/Error/Container.js
diff --git a/src/components/atoms/Error/Content.js b/src/components/screens/Error/Content.js
similarity index 100%
rename from src/components/atoms/Error/Content.js
rename to src/components/screens/Error/Content.js
diff --git a/src/components/atoms/Error/ContentTitle.js b/src/components/screens/Error/ContentTitle.js
similarity index 100%
rename from src/components/atoms/Error/ContentTitle.js
rename to src/components/screens/Error/ContentTitle.js
diff --git a/src/components/screens/Error.js b/src/components/screens/Error/Error.js
similarity index 54%
rename from src/components/screens/Error.js
rename to src/components/screens/Error/Error.js
index cd310bef5..7e7d3a0b9 100644
--- a/src/components/screens/Error.js
+++ b/src/components/screens/Error/Error.js
@@ -1,13 +1,15 @@
 import React from 'react';
-import { Container, ContentTitle, Content } from '../atoms/Error';
-import { BorderButton } from '../atoms';
-import { Error } from '../atoms/icons/illustrations';
-import { Notification } from '../organisms';
+import Container from './Container';
+import ContentTitle from './ContentTitle';
+import Content from './Content';
+import BorderButton from '../../atoms/Buttons/BorderButton/BorderButton';
+import Illustration from './Illustration';
+import Notification from '../../organisms/Notification';
 
 export default ({ location }) => (
   <Notification>
     <Container>
-      <Error />
+      <Illustration />
       <ContentTitle>
         Oops !
       </ContentTitle>
diff --git a/src/components/screens/Error/Error.stories.jsx b/src/components/screens/Error/Error.stories.jsx
new file mode 100644
index 000000000..45b673d0a
--- /dev/null
+++ b/src/components/screens/Error/Error.stories.jsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
+import theme from '../../../app/theme';
+import Error from './Error';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+const Wrapper = styled.div`
+  width: 384px;
+  height: 414px;
+`;
+
+storiesOf('screens/Error', module)
+  .addDecorator(getStory => (
+    <div>
+      <Global />
+      <Router>
+        <ThemeProvider theme={theme}>
+          <Wrapper>
+            {getStory()}
+          </Wrapper>
+        </ThemeProvider>
+      </Router>
+    </div>
+  ))
+  .add('normal', () => <Error />);
diff --git a/src/components/atoms/icons/illustrations/Error.js b/src/components/screens/Error/Illustration.js
similarity index 100%
rename from src/components/atoms/icons/illustrations/Error.js
rename to src/components/screens/Error/Illustration.js
diff --git a/src/components/atoms/Help/Container.js b/src/components/screens/Help/Container.js
similarity index 100%
rename from src/components/atoms/Help/Container.js
rename to src/components/screens/Help/Container.js
diff --git a/src/components/atoms/Help/ContentTitle.js b/src/components/screens/Help/ContentTitle.js
similarity index 65%
rename from src/components/atoms/Help/ContentTitle.js
rename to src/components/screens/Help/ContentTitle.js
index 41e4b7e00..6bd735699 100644
--- a/src/components/atoms/Help/ContentTitle.js
+++ b/src/components/screens/Help/ContentTitle.js
@@ -1,5 +1,5 @@
 import styled from 'styled-components';
-import ContentTitle from '../Notification/ContentTitle';
+import ContentTitle from '../../atoms/Notification/ContentTitle';
 
 export default styled(ContentTitle)`
     margin: 0 0 10px;
diff --git a/src/components/screens/Help.js b/src/components/screens/Help/Help.js
similarity index 82%
rename from src/components/screens/Help.js
rename to src/components/screens/Help/Help.js
index 730caece1..5440f08c1 100644
--- a/src/components/screens/Help.js
+++ b/src/components/screens/Help/Help.js
@@ -1,13 +1,14 @@
 import React from 'react';
-import { Container, ContentTitle } from '../atoms/Help';
+import Container from './Container';
+import ContentTitle from './ContentTitle';
 import {
   BorderButton,
   CenterContainer,
   List,
   ExternalLink
-} from '../atoms';
-import { Textarea, Form } from '../atoms/Forms';
-import Notification from '../organisms/Notification';
+} from '../../atoms';
+import { Textarea, Form } from '../../atoms/Forms';
+import Notification from '../../organisms/Notification';
 
 export default ({ close }) => (
   <Notification title="Aide" close={close}>
diff --git a/src/components/screens/Help/Help.stories.jsx b/src/components/screens/Help/Help.stories.jsx
new file mode 100644
index 000000000..aaf7f5769
--- /dev/null
+++ b/src/components/screens/Help/Help.stories.jsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
+import theme from '../../../app/theme';
+import Help from './Help';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+const Wrapper = styled.div`
+  width: 384px;
+  height: 414px;
+`;
+
+storiesOf('screens/Help', module)
+  .addDecorator(getStory => (
+    <div>
+      <Global />
+      <Router>
+        <ThemeProvider theme={theme}>
+          <Wrapper>
+            {getStory()}
+          </Wrapper>
+        </ThemeProvider>
+      </Router>
+    </div>
+  ))
+  .add('normal', () => <Help />);
diff --git a/src/components/screens/Loading.js b/src/components/screens/Loading.js
deleted file mode 100644
index e03a8a74b..000000000
--- a/src/components/screens/Loading.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-import { Loading } from '../atoms/icons/illustrations';
-import { LoadingContainer } from '../atoms';
-import { Notification } from '../organisms';
-
-export default ({ close }) => (
-  <Notification close={close}>
-    <LoadingContainer>
-      <Loading />
-      Chargement…
-    </LoadingContainer>
-  </Notification>
-);
diff --git a/src/components/atoms/LoadingContainer.js b/src/components/screens/Loading/Container.js
similarity index 100%
rename from src/components/atoms/LoadingContainer.js
rename to src/components/screens/Loading/Container.js
diff --git a/src/components/atoms/icons/illustrations/Loading.js b/src/components/screens/Loading/Illustration.js
similarity index 100%
rename from src/components/atoms/icons/illustrations/Loading.js
rename to src/components/screens/Loading/Illustration.js
diff --git a/src/components/screens/Loading/Loading.js b/src/components/screens/Loading/Loading.js
new file mode 100644
index 000000000..ce8bb4790
--- /dev/null
+++ b/src/components/screens/Loading/Loading.js
@@ -0,0 +1,13 @@
+import React from 'react';
+import Illustration from './Illustration';
+import Container from './Container';
+import Notification from '../../organisms/Notification';
+
+export default ({ close }) => (
+  <Notification close={close}>
+    <Container>
+      <Illustration />
+      Chargement…
+    </Container>
+  </Notification>
+);
diff --git a/src/components/screens/Loading.stories.jsx b/src/components/screens/Loading/Loading.stories.jsx
similarity index 95%
rename from src/components/screens/Loading.stories.jsx
rename to src/components/screens/Loading/Loading.stories.jsx
index 884192db1..b723b40e1 100644
--- a/src/components/screens/Loading.stories.jsx
+++ b/src/components/screens/Loading/Loading.stories.jsx
@@ -3,7 +3,7 @@ import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../app/theme';
+import theme from '../../../app/theme';
 import Loading from './Loading';
 
 const Global = createGlobalStyle`
diff --git a/src/components/screens/Notice/index.js b/src/components/screens/Notice/index.js
index a414bb2d4..5b5fd0abe 100644
--- a/src/components/screens/Notice/index.js
+++ b/src/components/screens/Notice/index.js
@@ -2,7 +2,7 @@ import { Route, Switch } from 'react-router-dom';
 import React from 'react';
 import List from './List';
 import Details from './Details';
-import Error from '../Error';
+import Error from '../Error/Error';
 
 export default ({ match }) => (
   <Switch>
diff --git a/src/components/atoms/Subscriptions/Container.js b/src/components/screens/Subscriptions/Container.js
similarity index 100%
rename from src/components/atoms/Subscriptions/Container.js
rename to src/components/screens/Subscriptions/Container.js
diff --git a/src/components/atoms/icons/illustrations/Subscriptions.js b/src/components/screens/Subscriptions/Illustration.js
similarity index 100%
rename from src/components/atoms/icons/illustrations/Subscriptions.js
rename to src/components/screens/Subscriptions/Illustration.js
diff --git a/src/components/screens/Subscriptions.js b/src/components/screens/Subscriptions/Subscriptions.js
similarity index 67%
rename from src/components/screens/Subscriptions.js
rename to src/components/screens/Subscriptions/Subscriptions.js
index 2b57bad81..580b7044f 100644
--- a/src/components/screens/Subscriptions.js
+++ b/src/components/screens/Subscriptions/Subscriptions.js
@@ -1,13 +1,14 @@
 import React from 'react';
-import { Notification } from '../organisms';
-import Subscriptions from '../atoms/icons/illustrations/Subscriptions';
-import { Container, SubscriptionsData } from '../atoms/Subscriptions';
-import { BorderButton } from '../atoms';
+import { Notification } from '../../organisms';
+import Illustration from './Illustration';
+import Container from './Container';
+import SubscriptionsData from './SubscriptionsData';
+import BorderButton from '../../atoms/Buttons/BorderButton/BorderButton';
 
 export default ({ close }) => (
   <Notification title="Abonnements" close={close}>
     <Container>
-      <Subscriptions />
+      <Illustration />
 
       <SubscriptionsData>
         <div>
diff --git a/src/components/screens/Subscriptions/Subscriptions.stories.jsx b/src/components/screens/Subscriptions/Subscriptions.stories.jsx
new file mode 100644
index 000000000..4b8e13f05
--- /dev/null
+++ b/src/components/screens/Subscriptions/Subscriptions.stories.jsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
+import theme from '../../../app/theme';
+import Subscriptions from './Subscriptions';
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+const Wrapper = styled.div`
+  width: 384px;
+  height: 414px;
+`;
+
+storiesOf('screens/Subscriptions', module)
+  .addDecorator(getStory => (
+    <div>
+      <Global />
+      <Router>
+        <ThemeProvider theme={theme}>
+          <Wrapper>
+            {getStory()}
+          </Wrapper>
+        </ThemeProvider>
+      </Router>
+    </div>
+  ))
+  .add('normal', () => <Subscriptions />);
diff --git a/src/components/atoms/Subscriptions/SubscriptionsData.js b/src/components/screens/Subscriptions/SubscriptionsData.js
similarity index 100%
rename from src/components/atoms/Subscriptions/SubscriptionsData.js
rename to src/components/screens/Subscriptions/SubscriptionsData.js
diff --git a/src/components/screens/index.js b/src/components/screens/index.js
index 13942d716..649e0e2d1 100644
--- a/src/components/screens/index.js
+++ b/src/components/screens/index.js
@@ -1,5 +1,5 @@
 export { default as Account } from './Account';
 export { default as Notice } from './Notice';
-export { default as Error } from './Error';
-export { default as Help } from './Help';
-export { default as Subscriptions } from './Subscriptions';
+export { default as Error } from './Error/Error';
+export { default as Help } from './Help/Help';
+export { default as Subscriptions } from './Subscriptions/Subscriptions';

From 65a46ee2daeb440ce886de86758430525eb2a9d1 Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Mon, 25 Feb 2019 16:56:19 +0100
Subject: [PATCH 014/100] the world needs more stories

---
 .../content/components/screens/Notice/List.js |  4 +--
 .../Buttons/BackButton/BackButton.stories.jsx |  6 ----
 .../CloseButton/CloseButton.stories.jsx       |  6 ----
 .../DeleteButton/DeleteButton.stories.jsx     |  6 ----
 .../atoms/Buttons/OpenButton/OpenButton.js    |  1 +
 .../ContentTitleTop.js}                       |  2 +-
 src/components/atoms/Notification/index.js    |  6 ----
 .../Container.js => NotificationContainer.js} |  0
 src/components/atoms/icons/Bubble.js          | 19 -----------
 .../atoms/icons/illustrations/index.js        |  1 -
 src/components/atoms/icons/index.js           |  6 +---
 src/components/atoms/index.js                 | 27 ++++++---------
 src/components/molecules/NoNotice.js          | 13 --------
 .../NoNotice/Illustration.js}                 |  0
 .../NoNotice/IllustrationContainer.js}        |  0
 src/components/molecules/NoNotice/NoNotice.js | 14 ++++++++
 .../NoNotice/Title.js}                        |  0
 .../NotificationFooter/FooterContainer.js     |  1 +
 .../NotificationHeader}/BackButton.js         |  4 +--
 .../NotificationHeader}/CloseButton.js        |  4 +--
 .../NotificationHeader/Container.js}          |  0
 .../NotificationHeader/LogoContainer.js}      |  2 +-
 .../NotificationHeader/LogoImg.js}            |  0
 .../NotificationHeader/NotificationHeader.js  | 17 ++++++----
 .../NotificationHeader.stories.jsx            |  6 ++++
 .../NotificationHeader}/Title.js              |  0
 .../molecules/Type/Type.stories.jsx           | 22 ++++++++++++-
 src/components/molecules/index.js             |  5 ++-
 src/components/organisms/Notice/Content.js    |  1 -
 .../Notice}/DeleteButton.js                   |  4 +--
 .../Notice/DeleteIcon.js}                     |  0
 src/components/organisms/Notice/Notice.js     |  2 +-
 .../organisms/NoticeDetails/NoticeDetails.js  | 10 +++---
 .../NoticeDetails/Source/AnchorIcon.js}       |  0
 .../NoticeDetails/Source/Container.js}        |  2 +-
 .../NoticeDetails/{ => Source}/Source.js      |  0
 .../NoticeDetails/Source}/SourceURL.js        |  7 ++--
 .../{atoms => organisms}/Notification/Main.js |  2 +-
 .../{ => Notification}/Notification.js        | 15 +++++----
 .../Notification/Notification.stories.jsx     | 33 +++++++++++++++++++
 src/components/organisms/index.js             |  2 +-
 .../screens/Account/Filters/Filters.js        |  4 +--
 .../Account/Menu}/Account.js                  |  0
 src/components/screens/Account/Menu/Menu.js   |  3 +-
 src/components/screens/Error/Error.js         |  2 +-
 src/components/screens/Help/ContentTitle.js   |  2 +-
 src/components/screens/Help/Help.js           |  2 +-
 src/components/screens/Loading/Loading.js     |  2 +-
 src/components/screens/Notice/List.js         |  4 +--
 49 files changed, 142 insertions(+), 127 deletions(-)
 delete mode 100644 src/components/atoms/Buttons/BackButton/BackButton.stories.jsx
 delete mode 100644 src/components/atoms/Buttons/CloseButton/CloseButton.stories.jsx
 delete mode 100644 src/components/atoms/Buttons/DeleteButton/DeleteButton.stories.jsx
 rename src/components/atoms/{Notification/ContentTitle.js => ContentTitle/ContentTitleTop.js} (64%)
 delete mode 100644 src/components/atoms/Notification/index.js
 rename src/components/atoms/{Notification/Container.js => NotificationContainer.js} (100%)
 delete mode 100644 src/components/atoms/icons/Bubble.js
 delete mode 100644 src/components/atoms/icons/illustrations/index.js
 delete mode 100644 src/components/molecules/NoNotice.js
 rename src/components/{atoms/icons/illustrations/NoNotice.js => molecules/NoNotice/Illustration.js} (100%)
 rename src/components/{atoms/Notification/NoNoticeImg.js => molecules/NoNotice/IllustrationContainer.js} (100%)
 create mode 100644 src/components/molecules/NoNotice/NoNotice.js
 rename src/components/{atoms/Notification/NoNoticeTitle.js => molecules/NoNotice/Title.js} (100%)
 rename src/components/{atoms/Buttons/BackButton => molecules/NotificationHeader}/BackButton.js (71%)
 rename src/components/{atoms/Buttons/CloseButton => molecules/NotificationHeader}/CloseButton.js (72%)
 rename src/components/{atoms/Notification/HeaderContainer.js => molecules/NotificationHeader/Container.js} (100%)
 rename src/components/{atoms/Logo.js => molecules/NotificationHeader/LogoContainer.js} (87%)
 rename src/components/{atoms/icons/Logo.js => molecules/NotificationHeader/LogoImg.js} (100%)
 rename src/components/{atoms => molecules/NotificationHeader}/Title.js (100%)
 rename src/components/{atoms/Buttons/DeleteButton => organisms/Notice}/DeleteButton.js (86%)
 rename src/components/{atoms/icons/Delete.js => organisms/Notice/DeleteIcon.js} (100%)
 rename src/components/{atoms/icons/Anchor.js => organisms/NoticeDetails/Source/AnchorIcon.js} (100%)
 rename src/components/{atoms/SourceURLContainer.js => organisms/NoticeDetails/Source/Container.js} (75%)
 rename src/components/organisms/NoticeDetails/{ => Source}/Source.js (100%)
 rename src/components/{molecules => organisms/NoticeDetails/Source}/SourceURL.js (76%)
 rename src/components/{atoms => organisms}/Notification/Main.js (91%)
 rename src/components/organisms/{ => Notification}/Notification.js (79%)
 create mode 100644 src/components/organisms/Notification/Notification.stories.jsx
 rename src/components/{atoms => screens/Account/Menu}/Account.js (100%)

diff --git a/src/app/content/components/screens/Notice/List.js b/src/app/content/components/screens/Notice/List.js
index c5dd7e3f3..5108b4e95 100644
--- a/src/app/content/components/screens/Notice/List.js
+++ b/src/app/content/components/screens/Notice/List.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { recommendation as NoticeType } from '../../../../propTypes';
-import { NotificationContentTitle } from '../../../../../components/atoms';
+import ContentTitleTop from '../../../../../components/atoms/ContentTitle/ContentTitleTop';
 import { AddNotice, NoNotice } from '../../../../../components/molecules';
 import { Notification, Notice } from '../../../../../components/organisms';
 import { findType } from '../../../../lmem';
@@ -11,7 +11,7 @@ const List = ({
 }) => {
   return (
     <Notification close={close}>
-      <NotificationContentTitle>Notifications pour cette page</NotificationContentTitle>
+      <ContentTitleTop>Notifications pour cette page</ContentTitleTop>
       {notices.slice(0, 2).map(({
         id, title, contributor: { name }, resource: { url }, criteria, dismissed, disliked
       }) => (
diff --git a/src/components/atoms/Buttons/BackButton/BackButton.stories.jsx b/src/components/atoms/Buttons/BackButton/BackButton.stories.jsx
deleted file mode 100644
index e849a14d2..000000000
--- a/src/components/atoms/Buttons/BackButton/BackButton.stories.jsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-import { storiesOf } from '@storybook/react';
-import BackButton from './BackButton';
-
-storiesOf('atoms/Buttons/BackButton', module)
-  .add('normal', () => <BackButton />);
diff --git a/src/components/atoms/Buttons/CloseButton/CloseButton.stories.jsx b/src/components/atoms/Buttons/CloseButton/CloseButton.stories.jsx
deleted file mode 100644
index 9b293e3d1..000000000
--- a/src/components/atoms/Buttons/CloseButton/CloseButton.stories.jsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-import { storiesOf } from '@storybook/react';
-import CloseButton from './CloseButton';
-
-storiesOf('atoms/Buttons/CloseButton', module)
-  .add('normal', () => <CloseButton />);
diff --git a/src/components/atoms/Buttons/DeleteButton/DeleteButton.stories.jsx b/src/components/atoms/Buttons/DeleteButton/DeleteButton.stories.jsx
deleted file mode 100644
index 7b7bd9a8b..000000000
--- a/src/components/atoms/Buttons/DeleteButton/DeleteButton.stories.jsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-import { storiesOf } from '@storybook/react';
-import DeleteButton from './DeleteButton';
-
-storiesOf('atoms/Buttons/DeleteButton', module)
-  .add('normal', () => <DeleteButton />);
diff --git a/src/components/atoms/Buttons/OpenButton/OpenButton.js b/src/components/atoms/Buttons/OpenButton/OpenButton.js
index 387e1633f..d2370a9b5 100644
--- a/src/components/atoms/Buttons/OpenButton/OpenButton.js
+++ b/src/components/atoms/Buttons/OpenButton/OpenButton.js
@@ -10,5 +10,6 @@ export default styled.div.attrs({ children: <OpenIcon /> })`
    width: auto;
    height: 13px;
    stroke: ${props => props.theme.activeColor};
+   transform: rotate(180deg);
 `;
 
diff --git a/src/components/atoms/Notification/ContentTitle.js b/src/components/atoms/ContentTitle/ContentTitleTop.js
similarity index 64%
rename from src/components/atoms/Notification/ContentTitle.js
rename to src/components/atoms/ContentTitle/ContentTitleTop.js
index cc0489eb2..27bebe020 100644
--- a/src/components/atoms/Notification/ContentTitle.js
+++ b/src/components/atoms/ContentTitle/ContentTitleTop.js
@@ -1,5 +1,5 @@
 import styled from 'styled-components';
-import ContentTitle from '../ContentTitle/ContentTitle';
+import ContentTitle from './ContentTitle';
 
 export default styled(ContentTitle)`
     margin: 12px 0 0;
diff --git a/src/components/atoms/Notification/index.js b/src/components/atoms/Notification/index.js
deleted file mode 100644
index 9f93089c7..000000000
--- a/src/components/atoms/Notification/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export { default as Container } from './Container';
-export { default as ContentTitle } from './ContentTitle';
-export { default as HeaderContainer } from './HeaderContainer';
-export { default as Main } from './Main';
-export { default as NoNoticeTitle } from './NoNoticeTitle';
-export { default as NoNoticeImg } from './NoNoticeImg';
diff --git a/src/components/atoms/Notification/Container.js b/src/components/atoms/NotificationContainer.js
similarity index 100%
rename from src/components/atoms/Notification/Container.js
rename to src/components/atoms/NotificationContainer.js
diff --git a/src/components/atoms/icons/Bubble.js b/src/components/atoms/icons/Bubble.js
deleted file mode 100644
index 062fab87d..000000000
--- a/src/components/atoms/icons/Bubble.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-
-export default () => (
-  <svg width="22" height="20">
-    <path
-      fill="none" 
-      fillRule="evenodd" 
-      stroke="#25265E" 
-      d="M11 1C5.718 1 1 4.458 1 9.188c0
-    1.677.616 3.324 1.706 4.602L1.045
-    19l5.788-2.455c1.421.36 2.779.525 
-    4.054.525C16.865 17.07 21 13.438 21 9.188 
-    21 4.432 16.25 1 11 1zm0 .818c5.054 0  9.167 
-    3.306 9.167 7.37 0 4.027-3.99 7.064-9.28 
-    7.064-1.568 0-2.834-.245-4.122-.569l-4.382  1.858 
-    1.255-3.934c-1.09-1.28-1.805-2.559-1.805-4  42 0-4.063 4.113-7.369 9.167-7.369z" 
-    />
-  </svg>
-);
\ No newline at end of file
diff --git a/src/components/atoms/icons/illustrations/index.js b/src/components/atoms/icons/illustrations/index.js
deleted file mode 100644
index d930d9387..000000000
--- a/src/components/atoms/icons/illustrations/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as NoNotice } from './NoNotice';
\ No newline at end of file
diff --git a/src/components/atoms/icons/index.js b/src/components/atoms/icons/index.js
index 6d3568c40..c171aa983 100644
--- a/src/components/atoms/icons/index.js
+++ b/src/components/atoms/icons/index.js
@@ -1,6 +1,2 @@
 export { default as Arrow } from './Arrow';
-export { default as Bubble } from './Bubble';
-export { default as Close } from './Close';
-export { default as Delete } from './Delete';
-export { default as Anchor } from './Anchor';
-export { default as Logo } from './Logo';
+export { default as Close } from './Close';
\ No newline at end of file
diff --git a/src/components/atoms/index.js b/src/components/atoms/index.js
index 0c27e44b4..c5c28c28e 100644
--- a/src/components/atoms/index.js
+++ b/src/components/atoms/index.js
@@ -1,23 +1,16 @@
-export { default as AddNoticeLink } from './Buttons/AddNoticeLink';
-export { default as BackButton } from './Buttons/BackButton/BackButton';
+export { default as GlobalStyle } from './GlobalStyle';
+export { default as NotificationContainer } from './NotificationContainer';
+export { default as Truncated } from './Truncated';
+
 export { default as Button } from './Button';
+export { default as AddNoticeLink } from './Buttons/AddNoticeLink';
 export { default as BorderButton } from './Buttons/BorderButton';
-export { default as CloseButton } from './Buttons/CloseButton/CloseButton';
-export { default as Contributor } from './Contributor';
-export { default as DeleteButton } from './Buttons/DeleteButton/DeleteButton';
 export { default as OpenButton } from './Buttons/OpenButton/OpenButton';
-export { default as NotificationContainer } from './Notification/Container';
-export { default as NotificationContentTitle } from './Notification/ContentTitle';
-export { default as NotificationHeaderContainer } from './Notification/HeaderContainer';
-export { default as NotificationMain } from './Notification/Main';
-export { default as GlobalStyle } from './GlobalStyle';
-export { default as Logo } from './Logo';
-export { default as SourceURLContainer } from './SourceURLContainer';
-export { default as Time } from './Time';
-export { default as Title } from './Title';
-export { default as Truncated } from './Truncated';
+
 export { default as CenterContainer } from './CenterContainer';
-export { default as List } from './List';
-export { default as Account } from './Account';
 export { default as ContentTitle } from './ContentTitle/ContentTitle';
+export { default as ContentTitleTop } from './ContentTitle/ContentTitleTop';
+export { default as Contributor } from './Contributor';
+export { default as Time } from './Time';
+export { default as List } from './List';
 export { default as ExternalLink } from './ExternalLink';
diff --git a/src/components/molecules/NoNotice.js b/src/components/molecules/NoNotice.js
deleted file mode 100644
index 0424d7c7d..000000000
--- a/src/components/molecules/NoNotice.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import React, { Fragment } from 'react';
-import { NoNoticeImg, NoNoticeTitle } from '../atoms/Notification';
-import { NoNotice as NoNoticeIcon } from '../atoms/icons/illustrations';
-
-export default () => (
-  <Fragment>
-    <NoNoticeImg>
-      <NoNoticeIcon />
-    </NoNoticeImg>
-
-    <NoNoticeTitle>Il n’y a plus de notifications ici</NoNoticeTitle>
-  </Fragment>
-);
diff --git a/src/components/atoms/icons/illustrations/NoNotice.js b/src/components/molecules/NoNotice/Illustration.js
similarity index 100%
rename from src/components/atoms/icons/illustrations/NoNotice.js
rename to src/components/molecules/NoNotice/Illustration.js
diff --git a/src/components/atoms/Notification/NoNoticeImg.js b/src/components/molecules/NoNotice/IllustrationContainer.js
similarity index 100%
rename from src/components/atoms/Notification/NoNoticeImg.js
rename to src/components/molecules/NoNotice/IllustrationContainer.js
diff --git a/src/components/molecules/NoNotice/NoNotice.js b/src/components/molecules/NoNotice/NoNotice.js
new file mode 100644
index 000000000..8e4120368
--- /dev/null
+++ b/src/components/molecules/NoNotice/NoNotice.js
@@ -0,0 +1,14 @@
+import React, { Fragment } from 'react';
+import IllustrationContainer from './IllustrationContainer';
+import Illustration from './Illustration';
+import Title from './Title';
+
+export default () => (
+  <Fragment>
+    <IllustrationContainer>
+      <Illustration />
+    </IllustrationContainer>
+
+    <Title>Il n’y a plus de notifications ici</Title>
+  </Fragment>
+);
diff --git a/src/components/atoms/Notification/NoNoticeTitle.js b/src/components/molecules/NoNotice/Title.js
similarity index 100%
rename from src/components/atoms/Notification/NoNoticeTitle.js
rename to src/components/molecules/NoNotice/Title.js
diff --git a/src/components/molecules/NotificationFooter/FooterContainer.js b/src/components/molecules/NotificationFooter/FooterContainer.js
index efff6e064..1e3e947bc 100644
--- a/src/components/molecules/NotificationFooter/FooterContainer.js
+++ b/src/components/molecules/NotificationFooter/FooterContainer.js
@@ -12,4 +12,5 @@ export default styled.nav`
     margin-top: auto;
     background-color: #fff;
     border-top: 1px solid ${props => props.theme.bottomBar};
+    border-radius: 0 0 7px 7px;
 `;
\ No newline at end of file
diff --git a/src/components/atoms/Buttons/BackButton/BackButton.js b/src/components/molecules/NotificationHeader/BackButton.js
similarity index 71%
rename from src/components/atoms/Buttons/BackButton/BackButton.js
rename to src/components/molecules/NotificationHeader/BackButton.js
index 42724c173..857f975f0 100644
--- a/src/components/atoms/Buttons/BackButton/BackButton.js
+++ b/src/components/molecules/NotificationHeader/BackButton.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
-import Button from '../../Button';
-import ArrowIcon from '../../icons/Arrow';
+import Button from '../../atoms/Button';
+import ArrowIcon from '../../atoms/icons/Arrow';
 
 export default styled(Button).attrs({ children: <ArrowIcon /> })`
     height: 30px;
diff --git a/src/components/atoms/Buttons/CloseButton/CloseButton.js b/src/components/molecules/NotificationHeader/CloseButton.js
similarity index 72%
rename from src/components/atoms/Buttons/CloseButton/CloseButton.js
rename to src/components/molecules/NotificationHeader/CloseButton.js
index 40667645e..7d85e27b5 100644
--- a/src/components/atoms/Buttons/CloseButton/CloseButton.js
+++ b/src/components/molecules/NotificationHeader/CloseButton.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
-import Button from '../../Button';
-import CloseIcon from '../../icons/Close';
+import Button from '../../atoms/Button';
+import CloseIcon from '../../atoms/icons/Close';
 
 export default styled(Button).attrs({ children: <CloseIcon /> })`
    margin-left: auto;
diff --git a/src/components/atoms/Notification/HeaderContainer.js b/src/components/molecules/NotificationHeader/Container.js
similarity index 100%
rename from src/components/atoms/Notification/HeaderContainer.js
rename to src/components/molecules/NotificationHeader/Container.js
diff --git a/src/components/atoms/Logo.js b/src/components/molecules/NotificationHeader/LogoContainer.js
similarity index 87%
rename from src/components/atoms/Logo.js
rename to src/components/molecules/NotificationHeader/LogoContainer.js
index 1ef0d3e48..78d4fadb3 100644
--- a/src/components/atoms/Logo.js
+++ b/src/components/molecules/NotificationHeader/LogoContainer.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import styled from 'styled-components';
-import Logo from './icons/Logo';
+import Logo from './LogoImg';
 
 export default styled.h1.attrs({ children: <Logo /> })`
     margin: 0 0 0 auto;
diff --git a/src/components/atoms/icons/Logo.js b/src/components/molecules/NotificationHeader/LogoImg.js
similarity index 100%
rename from src/components/atoms/icons/Logo.js
rename to src/components/molecules/NotificationHeader/LogoImg.js
diff --git a/src/components/molecules/NotificationHeader/NotificationHeader.js b/src/components/molecules/NotificationHeader/NotificationHeader.js
index 89a93ef47..8431e4d87 100644
--- a/src/components/molecules/NotificationHeader/NotificationHeader.js
+++ b/src/components/molecules/NotificationHeader/NotificationHeader.js
@@ -1,11 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { withRouter } from 'react-router';
-import {
-  BackButton, CloseButton, Logo, NotificationHeaderContainer, Title
-} from '../../atoms';
 import { truncateButPreserveWords } from '../../../app/utils/truncate';
 import removeHtml from '../../../app/utils/removeHtml';
+import Container from './Container';
+import LogoContainer from './LogoContainer';
+import LogoImg from './LogoImg';
+import BackButton from './BackButton';
+import CloseButton from './CloseButton';
+import Title from './Title';
 
 const NotificationHeader = ({
   title, goBack, close, history
@@ -13,17 +16,19 @@ const NotificationHeader = ({
   const handleGoBack = goBack || history.goBack;
 
   return (
-    <NotificationHeaderContainer>
+    <Container>
       {history.index > 0
         && <BackButton onClick={handleGoBack} />
       }
       {title ? (
         <Title title={title}>{truncateButPreserveWords(removeHtml(title), 34)}</Title>
       ) : (
-        <Logo />
+        <LogoContainer>
+          <LogoImg />
+        </LogoContainer>
       )}
       <CloseButton onClick={close} />
-    </NotificationHeaderContainer>
+    </Container>
   );
 };
 
diff --git a/src/components/molecules/NotificationHeader/NotificationHeader.stories.jsx b/src/components/molecules/NotificationHeader/NotificationHeader.stories.jsx
index 0072757c4..ebda71be3 100644
--- a/src/components/molecules/NotificationHeader/NotificationHeader.stories.jsx
+++ b/src/components/molecules/NotificationHeader/NotificationHeader.stories.jsx
@@ -11,5 +11,11 @@ storiesOf('molecules/NotificationHeader', module)
     </Router>
   ))
   .add('normal', () => (
+    <NotificationHeader close={action('close')} />
+  ))
+  .add('with title', () => (
     <NotificationHeader title="title" close={action('close')} onBack={action('onback')} />
+  ))
+  .add('with long title', () => (
+    <NotificationHeader title="Very long notification title, it should breaktitle" close={action('close')} onBack={action('onback')} />
   ));
diff --git a/src/components/atoms/Title.js b/src/components/molecules/NotificationHeader/Title.js
similarity index 100%
rename from src/components/atoms/Title.js
rename to src/components/molecules/NotificationHeader/Title.js
diff --git a/src/components/molecules/Type/Type.stories.jsx b/src/components/molecules/Type/Type.stories.jsx
index 8cc845fbc..e589cf4d1 100644
--- a/src/components/molecules/Type/Type.stories.jsx
+++ b/src/components/molecules/Type/Type.stories.jsx
@@ -9,6 +9,26 @@ storiesOf('molecules/Type', module)
       {getStory()}
     </Router>
   ))
-  .add('normal', () => (
+  .add('approval', () => (
+    <Type 
+      type="Approval"
+    />
+  ))
+  .add('disapproval', () => (
+    <Type 
+      type="Disapproval"
+    />
+  ))
+  .add('tip', () => (
+    <Type 
+      type="Tip"
+    />
+  ))
+  .add('other', () => (
+    <Type 
+      type="Other"
+    />
+  ))
+  .add('undefined / unknown ', () => (
     <Type />
   ));
diff --git a/src/components/molecules/index.js b/src/components/molecules/index.js
index 188d34947..b89c59973 100644
--- a/src/components/molecules/index.js
+++ b/src/components/molecules/index.js
@@ -1,5 +1,4 @@
 export { default as AddNotice } from './AddNotice';
+export { default as NoNotice } from './NoNotice/NoNotice';
 export { default as NotificationFooter } from './NotificationFooter';
-export { default as NotificationHeader } from './NotificationHeader/NotificationHeader';
-export { default as SourceURL } from './SourceURL';
-export { default as NoticeType } from './Type/Type';
\ No newline at end of file
+export { default as NotificationHeader } from './NotificationHeader/NotificationHeader';
\ No newline at end of file
diff --git a/src/components/organisms/Notice/Content.js b/src/components/organisms/Notice/Content.js
index fb66455c8..fefad1be5 100644
--- a/src/components/organisms/Notice/Content.js
+++ b/src/components/organisms/Notice/Content.js
@@ -36,7 +36,6 @@ export default styled(Content)`
 
     & [class^="OpenButton"] {
         height: auto;
-        transform: rotate(180deg)
     }
 
     & > button {
diff --git a/src/components/atoms/Buttons/DeleteButton/DeleteButton.js b/src/components/organisms/Notice/DeleteButton.js
similarity index 86%
rename from src/components/atoms/Buttons/DeleteButton/DeleteButton.js
rename to src/components/organisms/Notice/DeleteButton.js
index 8b5a68482..b5ca7618e 100644
--- a/src/components/atoms/Buttons/DeleteButton/DeleteButton.js
+++ b/src/components/organisms/Notice/DeleteButton.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
-import Button from '../../Button';
-import DeleteIcon from '../../icons/Delete';
+import Button from '../../atoms/Button';
+import DeleteIcon from './DeleteIcon';
 
 export default styled(Button).attrs({ children: <DeleteIcon /> })`
   box-sizing: border-box;
diff --git a/src/components/atoms/icons/Delete.js b/src/components/organisms/Notice/DeleteIcon.js
similarity index 100%
rename from src/components/atoms/icons/Delete.js
rename to src/components/organisms/Notice/DeleteIcon.js
diff --git a/src/components/organisms/Notice/Notice.js b/src/components/organisms/Notice/Notice.js
index fcf1df333..321962d2d 100644
--- a/src/components/organisms/Notice/Notice.js
+++ b/src/components/organisms/Notice/Notice.js
@@ -2,7 +2,6 @@ import React, { Fragment, PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import {
   Contributor,
-  DeleteButton,
   OpenButton,
   Button,
 } from '../../atoms';
@@ -10,6 +9,7 @@ import Type from '../../molecules/Type/Type';
 import Container from './Container';
 import Content from './Content';
 import Deleted from './Deleted';
+import DeleteButton from './DeleteButton';
 import Title from './Title';
 
 export default class Notice extends PureComponent {
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.js b/src/components/organisms/NoticeDetails/NoticeDetails.js
index 15057e674..df83d3a21 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.js
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.js
@@ -6,15 +6,17 @@ import {
   Button,
   BorderButton
 } from '../../atoms';
-import { Anchor } from '../../atoms/icons';
 import { Like, Dislike } from '../../atoms/icons/types';
-import { NoticeType, SourceURL } from '../../molecules';
+import Type from '../../molecules/Type/Type';
+import Source from './Source/Source';
+import Anchor from './Source/AnchorIcon';
+import SourceContainer from './Source/Container';
+import SourceURL from './Source/SourceURL';
 import DetailsContainer from './DetailsContainer';
 import DetailsContent from './DetailsContent';
 import DetailsMeta from './DetailsMeta';
 import DetailsDislike from './DetailsDislike';
 import MessageWrapper from './Message';
-import Source from './Source';
 import Feedbacks from './Feedbacks';
 import Date from './Date';
 
@@ -90,7 +92,7 @@ class NoticeDetails extends PureComponent {
               &nbsp;
               :
             </Contributor>
-            <NoticeType type={type} />
+            <Type type={type} />
           </DetailsMeta>
           <MessageWrapper>{message}</MessageWrapper>
           <Source>
diff --git a/src/components/atoms/icons/Anchor.js b/src/components/organisms/NoticeDetails/Source/AnchorIcon.js
similarity index 100%
rename from src/components/atoms/icons/Anchor.js
rename to src/components/organisms/NoticeDetails/Source/AnchorIcon.js
diff --git a/src/components/atoms/SourceURLContainer.js b/src/components/organisms/NoticeDetails/Source/Container.js
similarity index 75%
rename from src/components/atoms/SourceURLContainer.js
rename to src/components/organisms/NoticeDetails/Source/Container.js
index 4e5d6c445..997439cad 100644
--- a/src/components/atoms/SourceURLContainer.js
+++ b/src/components/organisms/NoticeDetails/Source/Container.js
@@ -1,5 +1,5 @@
 import styled from 'styled-components';
-import ExternalLink from './ExternalLink';
+import ExternalLink from '../../../atoms/ExternalLink';
 
 export default styled(ExternalLink)`
 
diff --git a/src/components/organisms/NoticeDetails/Source.js b/src/components/organisms/NoticeDetails/Source/Source.js
similarity index 100%
rename from src/components/organisms/NoticeDetails/Source.js
rename to src/components/organisms/NoticeDetails/Source/Source.js
diff --git a/src/components/molecules/SourceURL.js b/src/components/organisms/NoticeDetails/Source/SourceURL.js
similarity index 76%
rename from src/components/molecules/SourceURL.js
rename to src/components/organisms/NoticeDetails/Source/SourceURL.js
index 93806961a..7fd647761 100644
--- a/src/components/molecules/SourceURL.js
+++ b/src/components/organisms/NoticeDetails/Source/SourceURL.js
@@ -1,13 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { SourceURLContainer, Truncated} from '../atoms';
+import { Truncated} from '../../../atoms';
+import Container from './Container';
 
 export const SourceURL = ({ numberOfCharacters, children, ...props }) => (
-  <SourceURLContainer {...props} href={children}>
+  <Container {...props} href={children}>
     <Truncated numberOfCharacters={numberOfCharacters} preserveWords={false}>
       {children}
     </Truncated>
-  </SourceURLContainer>
+  </Container>
 );
 
 SourceURL.propTypes = {
diff --git a/src/components/atoms/Notification/Main.js b/src/components/organisms/Notification/Main.js
similarity index 91%
rename from src/components/atoms/Notification/Main.js
rename to src/components/organisms/Notification/Main.js
index 00370ae7d..0e76e8c8d 100644
--- a/src/components/atoms/Notification/Main.js
+++ b/src/components/organisms/Notification/Main.js
@@ -2,6 +2,6 @@ import styled from 'styled-components';
 
 export default styled.main` 
   position: relative;
-  height: 100%;
+  height: 342px;
   background-color: ${props => (props.notices ? props.theme.listBg : props.theme.accountListBg)};
 `;
\ No newline at end of file
diff --git a/src/components/organisms/Notification.js b/src/components/organisms/Notification/Notification.js
similarity index 79%
rename from src/components/organisms/Notification.js
rename to src/components/organisms/Notification/Notification.js
index 1e9d51e7a..aa7fb95c0 100644
--- a/src/components/organisms/Notification.js
+++ b/src/components/organisms/Notification/Notification.js
@@ -1,10 +1,10 @@
 import React, { Fragment, PureComponent} from 'react';
 import PropTypes from 'prop-types';
-import { NotificationMain } from '../atoms';
-import { NotificationHeader } from '../molecules';
-import Notice from './Notice/Notice';
-import NoticeDetails from './NoticeDetails/NoticeDetails';
-import isChildInstanceOf from '../../app/utils/isChildInstanceOf';
+import { NotificationHeader, NotificationFooter } from '../../molecules';
+import Notice from '../Notice/Notice';
+import NoticeDetails from '../NoticeDetails/NoticeDetails';
+import isChildInstanceOf from '../../../app/utils/isChildInstanceOf';
+import Main from './Main';
 
 export default class Notification extends PureComponent {
   static propTypes = {
@@ -60,9 +60,10 @@ export default class Notification extends PureComponent {
     return (
       <Fragment>
         <NotificationHeader title={title} close={close} onBack={onBack} />
-        <NotificationMain notices={this.hasNotices}>
+        <Main notices={this.hasNotices}>
           {this.renderChildren()}
-        </NotificationMain>
+        </Main>
+        <NotificationFooter />
       </Fragment>
     );
   }
diff --git a/src/components/organisms/Notification/Notification.stories.jsx b/src/components/organisms/Notification/Notification.stories.jsx
new file mode 100644
index 000000000..f222d4af3
--- /dev/null
+++ b/src/components/organisms/Notification/Notification.stories.jsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import Notification from './Notification';
+
+storiesOf('organisms/Notification', module)
+  .addDecorator(getStory => (
+    <Router>
+      {getStory()}
+    </Router>
+  ))
+  .add('normal', () => (
+    <Notification />
+  ))
+  .add('with title', () => (
+    <Notification
+      title="Notification title"
+    />
+  ))
+  .add('with long title', () => (
+    <Notification
+      title="Very long notification title, it should break"
+    />
+  ))
+  .add('with nav', () => (
+    <Notification
+      title="Notification title"
+      onBack={action('handleGoBack')}
+    >
+    Need help to add back button
+    </Notification>
+  ));
diff --git a/src/components/organisms/index.js b/src/components/organisms/index.js
index 09a6ddcf0..e55a06068 100644
--- a/src/components/organisms/index.js
+++ b/src/components/organisms/index.js
@@ -1,4 +1,4 @@
 export { default as Notice } from './Notice/Notice';
-export { default as Notification } from './Notification';
+export { default as Notification } from './Notification/Notification';
 export { default as NotificationNavigation } from './NotificationNavigation';
 export { default as NoticeDetails } from './NoticeDetails/NoticeDetails';
\ No newline at end of file
diff --git a/src/components/screens/Account/Filters/Filters.js b/src/components/screens/Account/Filters/Filters.js
index 973104cdc..cc4f9b7d0 100644
--- a/src/components/screens/Account/Filters/Filters.js
+++ b/src/components/screens/Account/Filters/Filters.js
@@ -1,9 +1,9 @@
 import React from 'react';
-import { NotificationContentTitle } from '../../../atoms';
+import { ContentTitleTop } from '../../../atoms';
 import { Notification } from '../../../organisms';
 
 export default ({ close }) => (
   <Notification title="Mes Filtres" close={close}>
-    <NotificationContentTitle>Mes filtres</NotificationContentTitle>
+    <ContentTitleTop>Mes filtres</ContentTitleTop>
   </Notification>
 );
diff --git a/src/components/atoms/Account.js b/src/components/screens/Account/Menu/Account.js
similarity index 100%
rename from src/components/atoms/Account.js
rename to src/components/screens/Account/Menu/Account.js
diff --git a/src/components/screens/Account/Menu/Menu.js b/src/components/screens/Account/Menu/Menu.js
index 86fbd36ec..68299d135 100644
--- a/src/components/screens/Account/Menu/Menu.js
+++ b/src/components/screens/Account/Menu/Menu.js
@@ -1,7 +1,8 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { Notification } from '../../../organisms';
-import { Account, OpenButton } from '../../../atoms';
+import { OpenButton } from '../../../atoms';
+import Account from './Account';
 
 export default ({ match, close }) => (
   <Notification title="Account" close={close}>
diff --git a/src/components/screens/Error/Error.js b/src/components/screens/Error/Error.js
index 7e7d3a0b9..191c8ef65 100644
--- a/src/components/screens/Error/Error.js
+++ b/src/components/screens/Error/Error.js
@@ -4,7 +4,7 @@ import ContentTitle from './ContentTitle';
 import Content from './Content';
 import BorderButton from '../../atoms/Buttons/BorderButton/BorderButton';
 import Illustration from './Illustration';
-import Notification from '../../organisms/Notification';
+import Notification from '../../organisms/Notification/Notification';
 
 export default ({ location }) => (
   <Notification>
diff --git a/src/components/screens/Help/ContentTitle.js b/src/components/screens/Help/ContentTitle.js
index 6bd735699..f2ece2a8a 100644
--- a/src/components/screens/Help/ContentTitle.js
+++ b/src/components/screens/Help/ContentTitle.js
@@ -1,5 +1,5 @@
 import styled from 'styled-components';
-import ContentTitle from '../../atoms/Notification/ContentTitle';
+import ContentTitle from '../../atoms/ContentTitle/ContentTitle';
 
 export default styled(ContentTitle)`
     margin: 0 0 10px;
diff --git a/src/components/screens/Help/Help.js b/src/components/screens/Help/Help.js
index 5440f08c1..6063fcf27 100644
--- a/src/components/screens/Help/Help.js
+++ b/src/components/screens/Help/Help.js
@@ -8,7 +8,7 @@ import {
   ExternalLink
 } from '../../atoms';
 import { Textarea, Form } from '../../atoms/Forms';
-import Notification from '../../organisms/Notification';
+import Notification from '../../organisms/Notification/Notification';
 
 export default ({ close }) => (
   <Notification title="Aide" close={close}>
diff --git a/src/components/screens/Loading/Loading.js b/src/components/screens/Loading/Loading.js
index ce8bb4790..1a771dd3c 100644
--- a/src/components/screens/Loading/Loading.js
+++ b/src/components/screens/Loading/Loading.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import Illustration from './Illustration';
 import Container from './Container';
-import Notification from '../../organisms/Notification';
+import Notification from '../../organisms/Notification/Notification';
 
 export default ({ close }) => (
   <Notification close={close}>
diff --git a/src/components/screens/Notice/List.js b/src/components/screens/Notice/List.js
index 56ac89ce8..9797b662c 100644
--- a/src/components/screens/Notice/List.js
+++ b/src/components/screens/Notice/List.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { NotificationContentTitle } from '../../atoms';
+import { ContentTitleTop } from '../../atoms';
 import { AddNotice} from '../../molecules';
 import { Notification, Notice} from '../../organisms';
 
@@ -9,7 +9,7 @@ const message = 'De nombreux clients mécontents de Pixmania et ses vendeurs s
 export default ({ match, close }) => {
   return (
     <Notification close={close}>
-      <NotificationContentTitle>Notifications pour cette page</NotificationContentTitle>
+      <ContentTitleTop>Notifications pour cette page</ContentTitleTop>
       <Notice
         id={1}
         match={match}

From 3335bcae22896cb7bd6f5eba4517a2c59574b248 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Mon, 25 Feb 2019 18:14:09 +0100
Subject: [PATCH 015/100] fix(notification): Footer displayed twice

---
 src/app/content/App.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/content/App.js b/src/app/content/App.js
index 1ec5b409e..14bfb3933 100644
--- a/src/app/content/App.js
+++ b/src/app/content/App.js
@@ -45,7 +45,6 @@ export default class App extends React.PureComponent {
                 )
                 : <Loading />
               }
-              <NotificationFooter />
             </NotificationContainer>
           </ConnectedRouter>
         </ThemeProvider>

From 90a36416ce905e30a2073e7c64ca7fda5a359066 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Mon, 25 Feb 2019 18:20:59 +0100
Subject: [PATCH 016/100] fix: bad imports

---
 .../components/NotificationFooter/NotificationFooter.js        | 3 ++-
 src/app/content/containers/screens/Notice/Loading.js           | 2 +-
 src/components/organisms/Notification/Notification.js          | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/content/components/NotificationFooter/NotificationFooter.js b/src/app/content/components/NotificationFooter/NotificationFooter.js
index 5c05cd382..39d069e8b 100644
--- a/src/app/content/components/NotificationFooter/NotificationFooter.js
+++ b/src/app/content/components/NotificationFooter/NotificationFooter.js
@@ -1,5 +1,6 @@
 import React from 'react';
-import { NavLink, NotificationFooterContainer} from '../../../../components/atoms';
+import NotificationFooterContainer from '../../../../components/molecules/NotificationFooter/FooterContainer';
+import NavLink from '../../../../components/molecules/NotificationFooter/NavLink';
 import AccountIcon from './AccountIcon';
 import BubbleIcon from './BubbleIcon';
 import HelpIcon from './HelpIcon';
diff --git a/src/app/content/containers/screens/Notice/Loading.js b/src/app/content/containers/screens/Notice/Loading.js
index 84d97fd04..b563f10f6 100644
--- a/src/app/content/containers/screens/Notice/Loading.js
+++ b/src/app/content/containers/screens/Notice/Loading.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import Loading from '../../../../../components/screens/Loading';
+import Loading from '../../../../../components/screens/Loading/Loading';
 import { close } from '../../../actions/ui';
 
 const mapDispatchToProps = {
diff --git a/src/components/organisms/Notification/Notification.js b/src/components/organisms/Notification/Notification.js
index aa7fb95c0..e50bf7a68 100644
--- a/src/components/organisms/Notification/Notification.js
+++ b/src/components/organisms/Notification/Notification.js
@@ -67,4 +67,4 @@ export default class Notification extends PureComponent {
       </Fragment>
     );
   }
-}
\ No newline at end of file
+}

From 7b8ecb7853e37eccf3a5be5991a2332561432ce2 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Mon, 25 Feb 2019 18:21:25 +0100
Subject: [PATCH 017/100] doc(storybook): fix Menu story

---
 src/components/screens/Account/Menu/Menu.js   |  6 ++--
 .../screens/Account/Menu/Menu.stories.jsx     | 33 ++++---------------
 2 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/src/components/screens/Account/Menu/Menu.js b/src/components/screens/Account/Menu/Menu.js
index 68299d135..aed527cbc 100644
--- a/src/components/screens/Account/Menu/Menu.js
+++ b/src/components/screens/Account/Menu/Menu.js
@@ -4,7 +4,7 @@ import { Notification } from '../../../organisms';
 import { OpenButton } from '../../../atoms';
 import Account from './Account';
 
-export default ({ match, close }) => (
+export const Menu = ({ match, close }) => (
   <Notification title="Account" close={close}>
     <Account>
       <Link to={`${match.url}/data`}>
@@ -25,4 +25,6 @@ export default ({ match, close }) => (
       </Link>
     </Account>
   </Notification>
-);
\ No newline at end of file
+);
+
+export default Menu;
diff --git a/src/components/screens/Account/Menu/Menu.stories.jsx b/src/components/screens/Account/Menu/Menu.stories.jsx
index 7cba7530a..d5461aba2 100644
--- a/src/components/screens/Account/Menu/Menu.stories.jsx
+++ b/src/components/screens/Account/Menu/Menu.stories.jsx
@@ -1,32 +1,11 @@
 import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
+import { MemoryRouter as Router, Route } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
-import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../../app/theme';
 import Menu from './Menu';
 
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
-
-const Wrapper = styled.div`
-  width: 384px;
-  height: 414px;
-`;
-
 storiesOf('screens/Menu', module)
-  .addDecorator(getStory => (
-    <div>
-      <Global />
-      <Router>
-        <ThemeProvider theme={theme}>
-          <Wrapper>
-            {getStory()}
-          </Wrapper>
-        </ThemeProvider>
-      </Router>
-    </div>
-  ))
-  .add('normal', () => <Menu />);
+  .add('Menu', () => (
+    <Router location="/" context={{}}>
+      <Route render={Menu} />
+    </Router>
+  ));

From 36800f24eba962e844e1c30ac12dd883f71a5940 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Mon, 25 Feb 2019 18:48:05 +0100
Subject: [PATCH 018/100] doc(storybook): add router history to some stories

---
 .../NotificationHeader.stories.jsx            | 20 +++++++----
 .../organisms/Notification/Notification.js    |  2 +-
 .../Notification/Notification.stories.jsx     | 35 ++++++++++---------
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/components/molecules/NotificationHeader/NotificationHeader.stories.jsx b/src/components/molecules/NotificationHeader/NotificationHeader.stories.jsx
index ebda71be3..5a4660ce9 100644
--- a/src/components/molecules/NotificationHeader/NotificationHeader.stories.jsx
+++ b/src/components/molecules/NotificationHeader/NotificationHeader.stories.jsx
@@ -5,17 +5,23 @@ import { action } from '@storybook/addon-actions';
 import NotificationHeader from './NotificationHeader';
 
 storiesOf('molecules/NotificationHeader', module)
-  .addDecorator(getStory => (
+  .add('normal', () => (
     <Router>
-      {getStory()}
+      <NotificationHeader close={action('close')} />
     </Router>
   ))
-  .add('normal', () => (
-    <NotificationHeader close={action('close')} />
-  ))
   .add('with title', () => (
-    <NotificationHeader title="title" close={action('close')} onBack={action('onback')} />
+    <Router>
+      <NotificationHeader title="title" close={action('close')} />
+    </Router>
   ))
   .add('with long title', () => (
-    <NotificationHeader title="Very long notification title, it should breaktitle" close={action('close')} onBack={action('onback')} />
+    <Router>
+      <NotificationHeader title="Very long notification title, it should breaktitle" close={action('close')} />
+    </Router>
+  ))
+  .add('with nav history', () => (
+    <Router initialIndex={2} initialEntries={['/path', '/pass']}>
+      <NotificationHeader title="title" close={action('close')} />
+    </Router>
   ));
diff --git a/src/components/organisms/Notification/Notification.js b/src/components/organisms/Notification/Notification.js
index e50bf7a68..625d7429b 100644
--- a/src/components/organisms/Notification/Notification.js
+++ b/src/components/organisms/Notification/Notification.js
@@ -59,7 +59,7 @@ export default class Notification extends PureComponent {
 
     return (
       <Fragment>
-        <NotificationHeader title={title} close={close} onBack={onBack} />
+        <NotificationHeader title={title} close={close} goBack={onBack} />
         <Main notices={this.hasNotices}>
           {this.renderChildren()}
         </Main>
diff --git a/src/components/organisms/Notification/Notification.stories.jsx b/src/components/organisms/Notification/Notification.stories.jsx
index f222d4af3..8abe68cf5 100644
--- a/src/components/organisms/Notification/Notification.stories.jsx
+++ b/src/components/organisms/Notification/Notification.stories.jsx
@@ -5,29 +5,30 @@ import { action } from '@storybook/addon-actions';
 import Notification from './Notification';
 
 storiesOf('organisms/Notification', module)
-  .addDecorator(getStory => (
+  .add('normal', () => (
     <Router>
-      {getStory()}
+      <Notification />
     </Router>
   ))
-  .add('normal', () => (
-    <Notification />
-  ))
   .add('with title', () => (
-    <Notification
-      title="Notification title"
-    />
+    <Router>
+      <Notification
+        title="Notification title"
+      />
+    </Router>
   ))
   .add('with long title', () => (
-    <Notification
-      title="Very long notification title, it should break"
-    />
+    <Router>
+      <Notification
+        title="Very long notification title, it should break"
+      />
+    </Router>
   ))
   .add('with nav', () => (
-    <Notification
-      title="Notification title"
-      onBack={action('handleGoBack')}
-    >
-    Need help to add back button
-    </Notification>
+    <Router initialIndex={2} initialEntries={['/path', '/pass']}>
+      <Notification
+        title="Very long notification title, it should break"
+        onBack={action('handleGoBack')}
+      />
+    </Router>
   ));

From b33c1e218c409b5ad807319bb2737b68a4f92a10 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Mon, 4 Mar 2019 12:45:11 +0100
Subject: [PATCH 019/100] fix(notice): handle HTML in message

---
 src/components/organisms/NoticeDetails/Message.js | 15 ++++++++++-----
 .../organisms/NoticeDetails/NoticeDetails.js      |  5 ++---
 .../NoticeDetails/NoticeDetails.stories.jsx       | 10 +++++++---
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/components/organisms/NoticeDetails/Message.js b/src/components/organisms/NoticeDetails/Message.js
index 576110dfd..a3e3bf2a4 100644
--- a/src/components/organisms/NoticeDetails/Message.js
+++ b/src/components/organisms/NoticeDetails/Message.js
@@ -1,10 +1,15 @@
+import React from 'react';
 import styled from 'styled-components';
 
-export const Message = styled.p`
-  margin: 6px 0 12px;
-  font-size: 15px;
-  line-height: 1.4;
-  color: ${props => props.theme.primaryColor};
+const MessageBlock = styled.div`
+  p { 
+    margin: 6px 0 12px;
+    font-size: 15px;
+    line-height: 1.4;
+    color: ${props => props.theme.primaryColor};
+  }
 `;
 
+const Message = ({ children }) => <MessageBlock dangerouslySetInnerHTML={{ __html: children }} />;
+
 export default Message;
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.js b/src/components/organisms/NoticeDetails/NoticeDetails.js
index df83d3a21..e8bfc2275 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.js
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.js
@@ -10,13 +10,12 @@ import { Like, Dislike } from '../../atoms/icons/types';
 import Type from '../../molecules/Type/Type';
 import Source from './Source/Source';
 import Anchor from './Source/AnchorIcon';
-import SourceContainer from './Source/Container';
 import SourceURL from './Source/SourceURL';
 import DetailsContainer from './DetailsContainer';
 import DetailsContent from './DetailsContent';
 import DetailsMeta from './DetailsMeta';
 import DetailsDislike from './DetailsDislike';
-import MessageWrapper from './Message';
+import Message from './Message';
 import Feedbacks from './Feedbacks';
 import Date from './Date';
 
@@ -94,7 +93,7 @@ class NoticeDetails extends PureComponent {
             </Contributor>
             <Type type={type} />
           </DetailsMeta>
-          <MessageWrapper>{message}</MessageWrapper>
+          <Message>{message}</Message>
           <Source>
             <Anchor />
               En savoir plus :
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.stories.jsx b/src/components/organisms/NoticeDetails/NoticeDetails.stories.jsx
index bcdbbf013..5fe42247a 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.stories.jsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.stories.jsx
@@ -4,6 +4,10 @@ import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import NoticeDetails from './NoticeDetails';
 
+const message = `<p> Un message qui décrit <a href="http://www.lmem.net">quelque chose</a> et donc ça prend beaucoup de mots. </p>
+<p>Il peut aussi y avoir plusieurs paragraphes, <a href="http://www.lmem.net">avec encore des liens</a></p>
+`;
+
 storiesOf('organisms/NoticeDetails', module)
   .addDecorator(getStory => (
     <Router>
@@ -15,7 +19,7 @@ storiesOf('organisms/NoticeDetails', module)
       type="Approval"
       contributor="Jalil"
       id="123"
-      message="Un message qui décrit quelque chose et donc ça prend beaucoup de mots"
+      message={message}
       date="12/12/2042"
       source="http://www.lmem.net"
       likes={42}
@@ -29,7 +33,7 @@ storiesOf('organisms/NoticeDetails', module)
       dismissed
       contributor="Jalil"
       id="123"
-      message="Un message qui décrit quelque chose et donc ça prend beaucoup de mots"
+      message={message}
       date="12/12/2042"
       source="http://www.lmem.net"
       likes={42}
@@ -43,7 +47,7 @@ storiesOf('organisms/NoticeDetails', module)
       disliked
       contributor="Jalil"
       id="123"
-      message="Un message qui décrit quelque chose et donc ça prend beaucoup de mots"
+      message={message}
       date="12/12/2042"
       source="http://www.lmem.net"
       likes={42}

From 31641de84f8400032b08d60845bb5a207780ef14 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Tue, 5 Mar 2019 18:59:14 +0100
Subject: [PATCH 020/100] refactor(content): big components refactoring and
 deprecated removal

---
 .babelrc                                      |   9 +-
 .eslintrc                                     |  23 ++-
 .storybook/config.js                          |   2 +-
 package.json                                  |   6 +-
 .../background/middlewares/browserAction.js   |  18 --
 .../App}/Account/About/About.stories.jsx      |   4 +-
 .../content/App/Account}/About/Container.js   |   0
 .../content/App/Account}/About/Content.js     |   0
 .../content/App/Account/About/Title.js}       |   4 +-
 .../About.js => App/Account/About/index.jsx}  |  14 +-
 .../content/App/Account/About/withConnect.js  |  15 ++
 .../content/App/Account/Filters/Filters.js    |   6 +
 .../App/Account/Filters/Filters.stories.jsx   |  12 ++
 .../content/App}/Account/Menu/Account.js      |   0
 .../App}/Account/Menu/Menu.stories.jsx        |   2 +-
 .../content/App/Account/Menu/index.jsx}       |   4 +-
 .../content/App}/Account/index.js             |   8 +-
 .../content/App}/Error/Container.js           |   0
 .../content/App}/Error/Content.js             |   0
 .../content/App}/Error/ContentTitle.js        |   0
 src/app/content/App/Error/Error.stories.jsx   |  11 ++
 .../content/App}/Error/Illustration.js        |   0
 .../content/App/Error/index.jsx}              |   6 +-
 .../content/App}/Help/Container.js            |   0
 .../content/App}/Help/ContentTitle.js         |   4 +-
 src/app/content/App/Help/Help.stories.jsx     |  12 ++
 .../content/App/Help/index.jsx}               |  14 +-
 .../content/App}/Loading/Container.js         |   0
 .../content/App}/Loading/Illustration.js      |   0
 .../content/App/Loading/Loading.stories.jsx   |  13 ++
 .../content/App/Loading/index.jsx}            |   7 +-
 src/app/content/App/Loading/withConnect.js    |   8 +
 .../Notice/Details/index.jsx}                 |   5 +-
 .../Notice/Details/withConnect.js}            |   4 +-
 .../Notice/List}/List.stories.jsx             |   2 +-
 .../App/Notice/List}/NoNotice/Illustration.js |   0
 .../List}/NoNotice/IllustrationContainer.js   |   0
 .../App/Notice/List}/NoNotice/Title.js        |   0
 .../App/Notice/List/NoNotice/index.js}        |   0
 .../List.js => App/Notice/List/index.jsx}     |  18 +-
 .../Notice/List/withConnect.js}               |   6 +-
 .../Notice/index.js => App/Notice/index.jsx}  |   2 +-
 .../content/App}/Subscriptions/Container.js   |   0
 .../App}/Subscriptions/Illustration.js        |   0
 .../Subscriptions/Subscriptions.stories.jsx   |  12 ++
 .../App}/Subscriptions/SubscriptionsData.js   |   0
 .../content/App/Subscriptions/index.jsx}      |   4 +-
 src/app/content/{App.js => App/index.jsx}     |  29 +--
 .../atoms => app/content}/GlobalStyle.js      |   0
 src/app/content/components/Contributor.js     |  23 ---
 src/app/content/components/Criteria.js        |  32 ----
 src/app/content/components/Editor.js          |  47 -----
 src/app/content/components/FeedbackButtons.js |  90 ---------
 src/app/content/components/Loader.js          |  42 -----
 src/app/content/components/Modal.js           |  36 ----
 .../NotificationFooter/NotificationFooter.js  |  27 ---
 .../components/NotificationFooter/index.js    |   3 -
 .../components/PreferenceAboutPanel.js        |  80 --------
 .../components/PreferenceCriteriaPanel.js     |  69 -------
 .../content/components/PreferenceScreen.js    | 122 ------------
 .../components/PreferenceSourcesPanel.js      |  68 -------
 src/app/content/components/RecoDescription.js |  38 ----
 src/app/content/components/RecoHeader.js      | 174 ------------------
 src/app/content/components/RecoMain.js        | 119 ------------
 src/app/content/components/Recommendations.js |  63 -------
 src/app/content/components/TypeIndicator.js   |  67 -------
 .../components/screens/About.stories.jsx      |  18 --
 src/app/content/containers/App.js             |  39 ----
 src/app/content/containers/Feedback.js        |  25 ---
 .../containers/NotificationContainer.js       |  10 -
 src/app/content/containers/Preferences.js     |  34 ----
 src/app/content/containers/Root.js            |  21 ---
 src/app/content/containers/screens/About.js   |  17 --
 .../containers/screens/Notice/Loading.js      |   9 -
 src/app/content/containers/screens/index.js   |   2 -
 src/app/options/OptionRoot.js                 |  49 -----
 src/app/options/OptionScreen.js               | 130 -------------
 src/app/options/index.js                      |   9 -
 src/app/popup/PopupRoot.js                    |  46 -----
 src/app/popup/PopupScreen.js                  |  73 --------
 src/app/popup/index.js                        |   9 -
 src/app/sandbox/Sandbox.js                    |  17 --
 src/app/sandbox/index.js                      |   8 -
 src/components/atoms/About/index.js           |   3 -
 .../Buttons/AddNoticeLink/AddNoticeLink.js    |   6 +-
 .../ContentTitle/ContentTitle.stories.jsx     |   2 +-
 .../{ContentTitle.js => index.js}             |   0
 src/components/atoms/Forms/Form.js            |   8 -
 .../atoms/Forms/Textarea/Textarea.js          |   3 +-
 src/components/atoms/Forms/index.js           |   2 +-
 src/components/atoms/index.js                 |   4 -
 src/components/molecules/AddNotice.js         |  13 +-
 .../NotificationFooter/AccountIcon.js         |  10 -
 .../NotificationFooter/BubbleIcon.js          |  44 -----
 .../molecules/NotificationFooter/HelpIcon.js  |  10 -
 src/components/molecules/index.js             |   3 -
 .../Notification/Container.js}                |  18 +-
 .../Notification}/ContentTitleTop.js          |   4 +-
 src/components/organisms/Notification/Main.js |   4 +-
 .../organisms/Notification/Notification.js    |  70 -------
 .../Notification/Notification.stories.jsx     |   2 +-
 .../NotificationFooter/AccountIcon.js         |   0
 .../NotificationFooter/BubbleIcon.js          |   0
 .../NotificationFooter/CheckListIcon.js       |   0
 .../NotificationFooter/FooterContainer.js     |   0
 .../NotificationFooter/HelpIcon.js            |   0
 .../NotificationFooter/NavLink.js             |   0
 .../NotificationFooter/NotificationFooter.js  |   0
 .../NotificationFooter.stories.jsx            |   0
 .../Notification}/NotificationFooter/index.js |   0
 .../NotificationHeader/BackButton.js          |   5 +-
 .../NotificationHeader/CloseButton.js         |   4 +-
 .../NotificationHeader/Container.js           |   0
 .../NotificationHeader/LogoContainer.js       |   0
 .../NotificationHeader/LogoImg.js             |   0
 .../NotificationHeader.stories.jsx            |   2 +-
 .../Notification}/NotificationHeader/Title.js |   0
 .../Notification/NotificationHeader/index.js} |   4 +-
 .../organisms/Notification/index.jsx          |  25 +++
 .../organisms/NotificationNavigation.js       |  25 ---
 src/components/organisms/index.js             |   5 +-
 src/components/screens/Account/About/About.js |  49 -----
 .../screens/Account/Filters/Filters.js        |   9 -
 .../Account/Filters/Filters.stories.jsx       |  32 ----
 .../screens/Error/Error.stories.jsx           |  32 ----
 src/components/screens/Help/Help.stories.jsx  |  33 ----
 .../screens/Loading/Loading.stories.jsx       |  33 ----
 src/components/screens/Notice/Details.js      |  25 ---
 src/components/screens/Notice/Empty.js        |  19 --
 src/components/screens/Notice/List.js         |  37 ----
 src/components/screens/Notice/index.js        |  13 --
 .../Subscriptions/Subscriptions.stories.jsx   |  32 ----
 src/components/screens/index.js               |   5 -
 views/options.pug                             |  18 --
 views/popup.pug                               |  17 --
 webpack/base.config.js                        |  10 +-
 webpack/sandbox.config.babel.js               |  52 ------
 yarn.lock                                     |  82 +++++++--
 138 files changed, 305 insertions(+), 2369 deletions(-)
 delete mode 100644 src/app/background/middlewares/browserAction.js
 rename src/{components/screens => app/content/App}/Account/About/About.stories.jsx (84%)
 rename src/{components/atoms => app/content/App/Account}/About/Container.js (100%)
 rename src/{components/atoms => app/content/App/Account}/About/Content.js (100%)
 rename src/{components/atoms/About/ContentTitle.js => app/content/App/Account/About/Title.js} (66%)
 rename src/app/content/{components/screens/About.js => App/Account/About/index.jsx} (87%)
 create mode 100644 src/app/content/App/Account/About/withConnect.js
 create mode 100644 src/app/content/App/Account/Filters/Filters.js
 create mode 100644 src/app/content/App/Account/Filters/Filters.stories.jsx
 rename src/{components/screens => app/content/App}/Account/Menu/Account.js (100%)
 rename src/{components/screens => app/content/App}/Account/Menu/Menu.stories.jsx (91%)
 rename src/{components/screens/Account/Menu/Menu.js => app/content/App/Account/Menu/index.jsx} (86%)
 rename src/{components/screens => app/content/App}/Account/index.js (75%)
 rename src/{components/screens => app/content/App}/Error/Container.js (100%)
 rename src/{components/screens => app/content/App}/Error/Content.js (100%)
 rename src/{components/screens => app/content/App}/Error/ContentTitle.js (100%)
 create mode 100644 src/app/content/App/Error/Error.stories.jsx
 rename src/{components/screens => app/content/App}/Error/Illustration.js (100%)
 rename src/{components/screens/Error/Error.js => app/content/App/Error/index.jsx} (74%)
 rename src/{components/screens => app/content/App}/Help/Container.js (100%)
 rename src/{components/screens => app/content/App}/Help/ContentTitle.js (64%)
 create mode 100644 src/app/content/App/Help/Help.stories.jsx
 rename src/{components/screens/Help/Help.js => app/content/App/Help/index.jsx} (86%)
 rename src/{components/screens => app/content/App}/Loading/Container.js (100%)
 rename src/{components/screens => app/content/App}/Loading/Illustration.js (100%)
 create mode 100644 src/app/content/App/Loading/Loading.stories.jsx
 rename src/{components/screens/Loading/Loading.js => app/content/App/Loading/index.jsx} (56%)
 create mode 100644 src/app/content/App/Loading/withConnect.js
 rename src/app/content/{components/screens/Notice/Details.js => App/Notice/Details/index.jsx} (89%)
 rename src/app/content/{containers/screens/Notice/Details.js => App/Notice/Details/withConnect.js} (77%)
 rename src/app/content/{components/screens/Notice => App/Notice/List}/List.stories.jsx (97%)
 rename src/{components/molecules => app/content/App/Notice/List}/NoNotice/Illustration.js (100%)
 rename src/{components/molecules => app/content/App/Notice/List}/NoNotice/IllustrationContainer.js (100%)
 rename src/{components/molecules => app/content/App/Notice/List}/NoNotice/Title.js (100%)
 rename src/{components/molecules/NoNotice/NoNotice.js => app/content/App/Notice/List/NoNotice/index.js} (100%)
 rename src/app/content/{components/screens/Notice/List.js => App/Notice/List/index.jsx} (67%)
 rename src/app/content/{containers/screens/Notice/List.js => App/Notice/List/withConnect.js} (75%)
 rename src/app/content/{containers/screens/Notice/index.js => App/Notice/index.jsx} (100%)
 rename src/{components/screens => app/content/App}/Subscriptions/Container.js (100%)
 rename src/{components/screens => app/content/App}/Subscriptions/Illustration.js (100%)
 create mode 100644 src/app/content/App/Subscriptions/Subscriptions.stories.jsx
 rename src/{components/screens => app/content/App}/Subscriptions/SubscriptionsData.js (100%)
 rename src/{components/screens/Subscriptions/Subscriptions.js => app/content/App/Subscriptions/index.jsx} (84%)
 rename src/app/content/{App.js => App/index.jsx} (69%)
 rename src/{components/atoms => app/content}/GlobalStyle.js (100%)
 delete mode 100644 src/app/content/components/Contributor.js
 delete mode 100644 src/app/content/components/Criteria.js
 delete mode 100644 src/app/content/components/Editor.js
 delete mode 100644 src/app/content/components/FeedbackButtons.js
 delete mode 100644 src/app/content/components/Loader.js
 delete mode 100644 src/app/content/components/Modal.js
 delete mode 100644 src/app/content/components/NotificationFooter/NotificationFooter.js
 delete mode 100644 src/app/content/components/NotificationFooter/index.js
 delete mode 100644 src/app/content/components/PreferenceAboutPanel.js
 delete mode 100644 src/app/content/components/PreferenceCriteriaPanel.js
 delete mode 100644 src/app/content/components/PreferenceScreen.js
 delete mode 100644 src/app/content/components/PreferenceSourcesPanel.js
 delete mode 100644 src/app/content/components/RecoDescription.js
 delete mode 100644 src/app/content/components/RecoHeader.js
 delete mode 100644 src/app/content/components/RecoMain.js
 delete mode 100644 src/app/content/components/Recommendations.js
 delete mode 100644 src/app/content/components/TypeIndicator.js
 delete mode 100644 src/app/content/components/screens/About.stories.jsx
 delete mode 100644 src/app/content/containers/App.js
 delete mode 100644 src/app/content/containers/Feedback.js
 delete mode 100644 src/app/content/containers/NotificationContainer.js
 delete mode 100644 src/app/content/containers/Preferences.js
 delete mode 100644 src/app/content/containers/Root.js
 delete mode 100644 src/app/content/containers/screens/About.js
 delete mode 100644 src/app/content/containers/screens/Notice/Loading.js
 delete mode 100644 src/app/content/containers/screens/index.js
 delete mode 100644 src/app/options/OptionRoot.js
 delete mode 100644 src/app/options/OptionScreen.js
 delete mode 100644 src/app/options/index.js
 delete mode 100644 src/app/popup/PopupRoot.js
 delete mode 100644 src/app/popup/PopupScreen.js
 delete mode 100644 src/app/popup/index.js
 delete mode 100644 src/app/sandbox/Sandbox.js
 delete mode 100644 src/app/sandbox/index.js
 delete mode 100644 src/components/atoms/About/index.js
 rename src/components/atoms/ContentTitle/{ContentTitle.js => index.js} (100%)
 delete mode 100644 src/components/atoms/Forms/Form.js
 delete mode 100644 src/components/molecules/NotificationFooter/AccountIcon.js
 delete mode 100644 src/components/molecules/NotificationFooter/BubbleIcon.js
 delete mode 100644 src/components/molecules/NotificationFooter/HelpIcon.js
 rename src/components/{atoms/NotificationContainer.js => organisms/Notification/Container.js} (63%)
 rename src/components/{atoms/ContentTitle => organisms/Notification}/ContentTitleTop.js (62%)
 delete mode 100644 src/components/organisms/Notification/Notification.js
 rename src/{app/content/components => components/organisms/Notification}/NotificationFooter/AccountIcon.js (100%)
 rename src/{app/content/components => components/organisms/Notification}/NotificationFooter/BubbleIcon.js (100%)
 rename src/components/{molecules => organisms/Notification}/NotificationFooter/CheckListIcon.js (100%)
 rename src/components/{molecules => organisms/Notification}/NotificationFooter/FooterContainer.js (100%)
 rename src/{app/content/components => components/organisms/Notification}/NotificationFooter/HelpIcon.js (100%)
 rename src/components/{molecules => organisms/Notification}/NotificationFooter/NavLink.js (100%)
 rename src/components/{molecules => organisms/Notification}/NotificationFooter/NotificationFooter.js (100%)
 rename src/components/{molecules => organisms/Notification}/NotificationFooter/NotificationFooter.stories.jsx (100%)
 rename src/components/{molecules => organisms/Notification}/NotificationFooter/index.js (100%)
 rename src/components/{molecules => organisms/Notification}/NotificationHeader/BackButton.js (69%)
 rename src/components/{molecules => organisms/Notification}/NotificationHeader/CloseButton.js (70%)
 rename src/components/{molecules => organisms/Notification}/NotificationHeader/Container.js (100%)
 rename src/components/{molecules => organisms/Notification}/NotificationHeader/LogoContainer.js (100%)
 rename src/components/{molecules => organisms/Notification}/NotificationHeader/LogoImg.js (100%)
 rename src/components/{molecules => organisms/Notification}/NotificationHeader/NotificationHeader.stories.jsx (93%)
 rename src/components/{molecules => organisms/Notification}/NotificationHeader/Title.js (100%)
 rename src/components/{molecules/NotificationHeader/NotificationHeader.js => organisms/Notification/NotificationHeader/index.js} (89%)
 create mode 100644 src/components/organisms/Notification/index.jsx
 delete mode 100644 src/components/organisms/NotificationNavigation.js
 delete mode 100644 src/components/screens/Account/About/About.js
 delete mode 100644 src/components/screens/Account/Filters/Filters.js
 delete mode 100644 src/components/screens/Account/Filters/Filters.stories.jsx
 delete mode 100644 src/components/screens/Error/Error.stories.jsx
 delete mode 100644 src/components/screens/Help/Help.stories.jsx
 delete mode 100644 src/components/screens/Loading/Loading.stories.jsx
 delete mode 100644 src/components/screens/Notice/Details.js
 delete mode 100644 src/components/screens/Notice/Empty.js
 delete mode 100644 src/components/screens/Notice/List.js
 delete mode 100644 src/components/screens/Notice/index.js
 delete mode 100644 src/components/screens/Subscriptions/Subscriptions.stories.jsx
 delete mode 100644 src/components/screens/index.js
 delete mode 100644 views/options.pug
 delete mode 100644 views/popup.pug
 delete mode 100644 webpack/sandbox.config.babel.js

diff --git a/.babelrc b/.babelrc
index 3331f7301..2bf815b98 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,4 +1,11 @@
 {
   "presets": [["@babel/preset-env", { "useBuiltIns": "entry" }], "@babel/preset-react"],
-  "plugins": ["add-module-exports", "babel-plugin-styled-components", "@babel/plugin-proposal-class-properties"]
+  "plugins": [
+    "add-module-exports",
+    "babel-plugin-styled-components",
+    ["babel-plugin-module-resolver", {
+      "root": ["./src"]
+    }],
+    "@babel/plugin-proposal-class-properties"
+  ]
 }
diff --git a/.eslintrc b/.eslintrc
index 1070a9bae..457a4e661 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,5 +1,9 @@
 {
-  "extends": "eslint-config-airbnb",
+  "extends": [
+    "eslint-config-airbnb",
+    "plugin:import/errors",
+    "plugin:import/warnings"
+  ],
   "env": {
     "mocha": true,
     "browser": true,
@@ -7,6 +11,15 @@
     "webextensions": true
   },
   "parser": "babel-eslint",
+  "plugins": [
+    "react",
+    "module-resolver"
+  ],
+  "settings": {
+    "import/resolver": {
+      "babel-module": {}
+    }
+  },
   "rules": {
     "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
     "react/jsx-uses-react": 2,
@@ -56,9 +69,7 @@
     "object-curly-spacing": 0,
     "no-underscore-dangle": 0,
     "no-else-return": 0,
-    "newline-per-chained-call": 0
-  },
-  "plugins": [
-    "react"
-  ]
+    "newline-per-chained-call": 0,
+    "module-resolver/use-alias": 0
+  }
 }
diff --git a/.storybook/config.js b/.storybook/config.js
index d698e1092..fe728ddca 100644
--- a/.storybook/config.js
+++ b/.storybook/config.js
@@ -4,7 +4,7 @@ import { createGlobalStyle, ThemeProvider } from 'styled-components';
 import theme from '../src/app/theme';
 import 'typeface-lato';
 import 'typeface-sedgwick-ave';
-import { NotificationContainer } from '../src/components/atoms';
+import NotificationContainer from 'components/organisms/Notification/Container';
 
 const Global = createGlobalStyle`
   body {
diff --git a/package.json b/package.json
index 9ad02bc0a..9d0966c23 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,6 @@
   "description": "LMEM Recommendations web extensions using React+Redux.",
   "scripts": {
     "start": "npm run build:dev",
-    "sandbox": "webpack-dev-server --hot --config webpack/sandbox.config.babel.js",
     "build:production": "gulp build:production",
     "build:staging": "gulp build:staging",
     "build:dev": "gulp build:dev",
@@ -68,6 +67,7 @@
     "babel-loader": "^8.0.4",
     "babel-plugin-add-module-exports": "^1.0.0",
     "babel-plugin-macros": "^2.4.2",
+    "babel-plugin-module-resolver": "^3.2.0",
     "babel-plugin-styled-components": "^1.8.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.19",
     "chai": "^3.5.0",
@@ -80,9 +80,11 @@
     "enzyme": "^3.7.0",
     "eslint": "^5.7.0",
     "eslint-config-airbnb": "^17.1.0",
+    "eslint-import-resolver-babel-module": "^5.0.1",
     "eslint-loader": "^2.1.1",
-    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-import": "^2.16.0",
     "eslint-plugin-jsx-a11y": "^6.1.2",
+    "eslint-plugin-module-resolver": "^0.8.0",
     "eslint-plugin-react": "^7.11.1",
     "expect": "^1.15.2",
     "file-loader": "^2.0.0",
diff --git a/src/app/background/middlewares/browserAction.js b/src/app/background/middlewares/browserAction.js
deleted file mode 100644
index c5bff91b0..000000000
--- a/src/app/background/middlewares/browserAction.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { OPEN_PREFERENCE_PANEL } from '../../constants/ActionTypes';
-
-export default function (store){
-    return next => (action) => {
-
-        if (action.type === OPEN_PREFERENCE_PANEL) {
-            if (chrome.runtime.openOptionsPage) {
-                // New way to open options pages, if supported (Chrome 42+).
-                chrome.runtime.openOptionsPage();
-            } else {
-                // Reasonable fallback.
-                chrome.tabs.create({url: 'options.html'});
-            }
-        }
-
-        return next(action);
-    };
-}
\ No newline at end of file
diff --git a/src/components/screens/Account/About/About.stories.jsx b/src/app/content/App/Account/About/About.stories.jsx
similarity index 84%
rename from src/components/screens/Account/About/About.stories.jsx
rename to src/app/content/App/Account/About/About.stories.jsx
index 8efad6011..b6e00fae6 100644
--- a/src/components/screens/Account/About/About.stories.jsx
+++ b/src/app/content/App/Account/About/About.stories.jsx
@@ -2,9 +2,9 @@ import React from 'react';
 import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
-import About from './About';
+import About from '.';
 
-storiesOf('screens/NewAbout', module)
+storiesOf('screens/About', module)
   .addDecorator(getStory => (
     <Router>
       {getStory()}
diff --git a/src/components/atoms/About/Container.js b/src/app/content/App/Account/About/Container.js
similarity index 100%
rename from src/components/atoms/About/Container.js
rename to src/app/content/App/Account/About/Container.js
diff --git a/src/components/atoms/About/Content.js b/src/app/content/App/Account/About/Content.js
similarity index 100%
rename from src/components/atoms/About/Content.js
rename to src/app/content/App/Account/About/Content.js
diff --git a/src/components/atoms/About/ContentTitle.js b/src/app/content/App/Account/About/Title.js
similarity index 66%
rename from src/components/atoms/About/ContentTitle.js
rename to src/app/content/App/Account/About/Title.js
index 0cb0bf844..5532d90fc 100644
--- a/src/components/atoms/About/ContentTitle.js
+++ b/src/app/content/App/Account/About/Title.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
-import ContentTitle from '../ContentTitle/ContentTitle';
+import ContentTitle from 'components/atoms/ContentTitle';
 
 export default styled(ContentTitle)`
     margin: 0 0 18px;
     text-align: left;
-`;
\ No newline at end of file
+`;
diff --git a/src/app/content/components/screens/About.js b/src/app/content/App/Account/About/index.jsx
similarity index 87%
rename from src/app/content/components/screens/About.js
rename to src/app/content/App/Account/About/index.jsx
index 339d20ba8..addc36fae 100644
--- a/src/app/content/components/screens/About.js
+++ b/src/app/content/App/Account/About/index.jsx
@@ -1,16 +1,18 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Container, Content, ContentTitle } from '../../../../components/atoms/About';
-import { ExternalLink, Time } from '../../../../components/atoms';
-import { Notification } from '../../../../components/organisms';
+import { ExternalLink, Time } from 'components/atoms';
+import { Notification } from 'components/organisms';
+import Title from './Title';
+import Content from './Content';
+import Container from './Container';
 
 const About = ({ close, installationDate, extensionVersion }) => (
   <Notification title="À propos" close={close}>
     <Container>
-      <ContentTitle>
+      <Title>
         Le Même En Mieux V
         {extensionVersion}
-      </ContentTitle>
+      </Title>
       <Content>
           Le Même en Mieux est un assistant d’achat indépendant des vendeurs et des marques.
       </Content>
@@ -25,7 +27,7 @@ const About = ({ close, installationDate, extensionVersion }) => (
       )}
 
       <Content>
-        Pour découvrir ou faire découvrir le Même en Mieux autour de vous, 
+        Pour découvrir ou faire découvrir le Même en Mieux autour de vous,
         {' '}
         <ExternalLink
           href="https://choisir.lmem.net/decouvrir-exemples/"
diff --git a/src/app/content/App/Account/About/withConnect.js b/src/app/content/App/Account/About/withConnect.js
new file mode 100644
index 000000000..3879efc03
--- /dev/null
+++ b/src/app/content/App/Account/About/withConnect.js
@@ -0,0 +1,15 @@
+import { connect } from 'react-redux';
+import { EXTENSION_VERSION } from 'app/constants/ui';
+import { close } from 'app/content/actions/ui';
+import { getInstallationDate } from 'app/content/selectors';
+
+const mapStateToProps = state => ({
+  extensionVersion: EXTENSION_VERSION,
+  installationDate: getInstallationDate(state)
+});
+
+const mapDispatchToProps = {
+  close,
+};
+
+export default connect(mapStateToProps, mapDispatchToProps);
diff --git a/src/app/content/App/Account/Filters/Filters.js b/src/app/content/App/Account/Filters/Filters.js
new file mode 100644
index 000000000..265b8221f
--- /dev/null
+++ b/src/app/content/App/Account/Filters/Filters.js
@@ -0,0 +1,6 @@
+import React from 'react';
+import Notification from 'components/organisms/Notification';
+
+export default ({ close }) => (
+  <Notification contentTitle="Mes filtres" title="Mes Filtres" close={close} />
+);
diff --git a/src/app/content/App/Account/Filters/Filters.stories.jsx b/src/app/content/App/Account/Filters/Filters.stories.jsx
new file mode 100644
index 000000000..a428db164
--- /dev/null
+++ b/src/app/content/App/Account/Filters/Filters.stories.jsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import Filters from './Filters';
+
+storiesOf('screens/Filters', module)
+  .addDecorator(getStory => (
+    <Router>
+      {getStory()}
+    </Router>
+  ))
+  .add('normal', () => <Filters />);
diff --git a/src/components/screens/Account/Menu/Account.js b/src/app/content/App/Account/Menu/Account.js
similarity index 100%
rename from src/components/screens/Account/Menu/Account.js
rename to src/app/content/App/Account/Menu/Account.js
diff --git a/src/components/screens/Account/Menu/Menu.stories.jsx b/src/app/content/App/Account/Menu/Menu.stories.jsx
similarity index 91%
rename from src/components/screens/Account/Menu/Menu.stories.jsx
rename to src/app/content/App/Account/Menu/Menu.stories.jsx
index d5461aba2..a09418368 100644
--- a/src/components/screens/Account/Menu/Menu.stories.jsx
+++ b/src/app/content/App/Account/Menu/Menu.stories.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { MemoryRouter as Router, Route } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
-import Menu from './Menu';
+import Menu from '.';
 
 storiesOf('screens/Menu', module)
   .add('Menu', () => (
diff --git a/src/components/screens/Account/Menu/Menu.js b/src/app/content/App/Account/Menu/index.jsx
similarity index 86%
rename from src/components/screens/Account/Menu/Menu.js
rename to src/app/content/App/Account/Menu/index.jsx
index aed527cbc..12deb561e 100644
--- a/src/components/screens/Account/Menu/Menu.js
+++ b/src/app/content/App/Account/Menu/index.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { Notification } from '../../../organisms';
-import { OpenButton } from '../../../atoms';
+import { Notification } from 'components/organisms';
+import { OpenButton } from 'components/atoms';
 import Account from './Account';
 
 export const Menu = ({ match, close }) => (
diff --git a/src/components/screens/Account/index.js b/src/app/content/App/Account/index.js
similarity index 75%
rename from src/components/screens/Account/index.js
rename to src/app/content/App/Account/index.js
index 97a32fdc5..48e12c6dd 100644
--- a/src/components/screens/Account/index.js
+++ b/src/app/content/App/Account/index.js
@@ -1,10 +1,10 @@
 import { Route, Switch } from 'react-router-dom';
 import React from 'react';
 import Filters from './Filters/Filters';
-import Menu from './Menu/Menu';
-import About from './About/About';
-import Error from '../Error/Error';
-import Loading from '../Loading/Loading';
+import Menu from './Menu';
+import About from './About';
+import Error from '../Error';
+import Loading from '../Loading';
 
 export default ({ match }) => (
   <Switch>
diff --git a/src/components/screens/Error/Container.js b/src/app/content/App/Error/Container.js
similarity index 100%
rename from src/components/screens/Error/Container.js
rename to src/app/content/App/Error/Container.js
diff --git a/src/components/screens/Error/Content.js b/src/app/content/App/Error/Content.js
similarity index 100%
rename from src/components/screens/Error/Content.js
rename to src/app/content/App/Error/Content.js
diff --git a/src/components/screens/Error/ContentTitle.js b/src/app/content/App/Error/ContentTitle.js
similarity index 100%
rename from src/components/screens/Error/ContentTitle.js
rename to src/app/content/App/Error/ContentTitle.js
diff --git a/src/app/content/App/Error/Error.stories.jsx b/src/app/content/App/Error/Error.stories.jsx
new file mode 100644
index 000000000..5b23530fc
--- /dev/null
+++ b/src/app/content/App/Error/Error.stories.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router';
+import { storiesOf } from '@storybook/react';
+import Error from '.';
+
+storiesOf('screens/Error', module)
+  .add('normal', () => (
+    <Router>
+      <Error />
+    </Router>
+  ));
diff --git a/src/components/screens/Error/Illustration.js b/src/app/content/App/Error/Illustration.js
similarity index 100%
rename from src/components/screens/Error/Illustration.js
rename to src/app/content/App/Error/Illustration.js
diff --git a/src/components/screens/Error/Error.js b/src/app/content/App/Error/index.jsx
similarity index 74%
rename from src/components/screens/Error/Error.js
rename to src/app/content/App/Error/index.jsx
index 191c8ef65..1e67f9d66 100644
--- a/src/components/screens/Error/Error.js
+++ b/src/app/content/App/Error/index.jsx
@@ -2,11 +2,11 @@ import React from 'react';
 import Container from './Container';
 import ContentTitle from './ContentTitle';
 import Content from './Content';
-import BorderButton from '../../atoms/Buttons/BorderButton/BorderButton';
+import BorderButton from '../../../../components/atoms/Buttons/BorderButton';
 import Illustration from './Illustration';
-import Notification from '../../organisms/Notification/Notification';
+import Notification from '../../../../components/organisms/Notification';
 
-export default ({ location }) => (
+export default () => (
   <Notification>
     <Container>
       <Illustration />
diff --git a/src/components/screens/Help/Container.js b/src/app/content/App/Help/Container.js
similarity index 100%
rename from src/components/screens/Help/Container.js
rename to src/app/content/App/Help/Container.js
diff --git a/src/components/screens/Help/ContentTitle.js b/src/app/content/App/Help/ContentTitle.js
similarity index 64%
rename from src/components/screens/Help/ContentTitle.js
rename to src/app/content/App/Help/ContentTitle.js
index f2ece2a8a..d853c7f23 100644
--- a/src/components/screens/Help/ContentTitle.js
+++ b/src/app/content/App/Help/ContentTitle.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
-import ContentTitle from '../../atoms/ContentTitle/ContentTitle';
+import ContentTitle from 'components/atoms/ContentTitle';
 
 export default styled(ContentTitle)`
     margin: 0 0 10px;
     text-align: left;
-`;
\ No newline at end of file
+`;
diff --git a/src/app/content/App/Help/Help.stories.jsx b/src/app/content/App/Help/Help.stories.jsx
new file mode 100644
index 000000000..308297732
--- /dev/null
+++ b/src/app/content/App/Help/Help.stories.jsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import Help from '.';
+
+storiesOf('screens/Help', module)
+  .addDecorator(getStory => (
+    <Router>
+      {getStory()}
+    </Router>
+  ))
+  .add('normal', () => <Help />);
diff --git a/src/components/screens/Help/Help.js b/src/app/content/App/Help/index.jsx
similarity index 86%
rename from src/components/screens/Help/Help.js
rename to src/app/content/App/Help/index.jsx
index 6063fcf27..2fef6fadc 100644
--- a/src/components/screens/Help/Help.js
+++ b/src/app/content/App/Help/index.jsx
@@ -1,14 +1,14 @@
 import React from 'react';
-import Container from './Container';
-import ContentTitle from './ContentTitle';
+import Notification from 'components/organisms/Notification';
 import {
   BorderButton,
   CenterContainer,
   List,
   ExternalLink
-} from '../../atoms';
-import { Textarea, Form } from '../../atoms/Forms';
-import Notification from '../../organisms/Notification/Notification';
+} from 'components/atoms';
+import { Textarea } from 'components/atoms/Forms';
+import Container from './Container';
+import ContentTitle from './ContentTitle';
 
 export default ({ close }) => (
   <Notification title="Aide" close={close}>
@@ -32,13 +32,13 @@ export default ({ close }) => (
 
       <ContentTitle>Contacter le support de Le Même En Mieux</ContentTitle>
 
-      <Form>
+      <form>
         <Textarea placeholder="Écrire votre message ici" required />
 
         <CenterContainer>
           <BorderButton>Envoyer</BorderButton>
         </CenterContainer>
-      </Form>
+      </form>
 
     </Container>
   </Notification>
diff --git a/src/components/screens/Loading/Container.js b/src/app/content/App/Loading/Container.js
similarity index 100%
rename from src/components/screens/Loading/Container.js
rename to src/app/content/App/Loading/Container.js
diff --git a/src/components/screens/Loading/Illustration.js b/src/app/content/App/Loading/Illustration.js
similarity index 100%
rename from src/components/screens/Loading/Illustration.js
rename to src/app/content/App/Loading/Illustration.js
diff --git a/src/app/content/App/Loading/Loading.stories.jsx b/src/app/content/App/Loading/Loading.stories.jsx
new file mode 100644
index 000000000..eae13eb6e
--- /dev/null
+++ b/src/app/content/App/Loading/Loading.stories.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import { Loading } from '.';
+
+storiesOf('screens/Loading', module)
+  .addDecorator(getStory => (
+    <Router>
+      {getStory()}
+    </Router>
+  ))
+  .add('normal', () => <Loading close={action('close')} />);
diff --git a/src/components/screens/Loading/Loading.js b/src/app/content/App/Loading/index.jsx
similarity index 56%
rename from src/components/screens/Loading/Loading.js
rename to src/app/content/App/Loading/index.jsx
index 1a771dd3c..472292480 100644
--- a/src/components/screens/Loading/Loading.js
+++ b/src/app/content/App/Loading/index.jsx
@@ -1,9 +1,10 @@
 import React from 'react';
+import Notification from 'components/organisms/Notification';
 import Illustration from './Illustration';
 import Container from './Container';
-import Notification from '../../organisms/Notification/Notification';
+import withConnect from './withConnect';
 
-export default ({ close }) => (
+export const Loading = ({ close }) => (
   <Notification close={close}>
     <Container>
       <Illustration />
@@ -11,3 +12,5 @@ export default ({ close }) => (
     </Container>
   </Notification>
 );
+
+export default withConnect(Loading);
diff --git a/src/app/content/App/Loading/withConnect.js b/src/app/content/App/Loading/withConnect.js
new file mode 100644
index 000000000..f902a2e57
--- /dev/null
+++ b/src/app/content/App/Loading/withConnect.js
@@ -0,0 +1,8 @@
+import { connect } from 'react-redux';
+import { close } from '../../actions/ui';
+
+const mapDispatchToProps = {
+  close,
+};
+
+export default connect(null, mapDispatchToProps);
diff --git a/src/app/content/components/screens/Notice/Details.js b/src/app/content/App/Notice/Details/index.jsx
similarity index 89%
rename from src/app/content/components/screens/Notice/Details.js
rename to src/app/content/App/Notice/Details/index.jsx
index 931c3e712..6520b983a 100644
--- a/src/app/content/components/screens/Notice/Details.js
+++ b/src/app/content/App/Notice/Details/index.jsx
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { NoticeDetails, Notification } from '../../../../../components/organisms';
 import { recommendation as NoticeType } from '../../../../propTypes';
 import { findType } from '../../../../lmem/typeOfCriteria';
+import withConnect from './withConnect';
 
 const Details = ({
   notice: {
@@ -13,7 +14,7 @@ const Details = ({
   close,
 }) => {
   return (
-    <Notification title={description} close={close}>
+    <Notification title={description} hasNotices close={close}>
       <NoticeDetails
         id={id}
         type={findType(criteria)}
@@ -44,4 +45,4 @@ Details.propTypes = {
   close: PropTypes.func.isRequired,
 };
 
-export default Details;
+export default withConnect(Details);
diff --git a/src/app/content/containers/screens/Notice/Details.js b/src/app/content/App/Notice/Details/withConnect.js
similarity index 77%
rename from src/app/content/containers/screens/Notice/Details.js
rename to src/app/content/App/Notice/Details/withConnect.js
index a9ed3551d..6c7326491 100644
--- a/src/app/content/containers/screens/Notice/Details.js
+++ b/src/app/content/App/Notice/Details/withConnect.js
@@ -1,6 +1,4 @@
 import { connect } from 'react-redux';
-
-import Details from '../../../components/screens/Notice/Details';
 import { getNoticeById } from '../../../selectors';
 import {
   likeNotice, unlikeNotice, dislikeNotice, undislikeNotice
@@ -19,4 +17,4 @@ const mapDispatchToProps = {
   close,
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(Details);
+export default connect(mapStateToProps, mapDispatchToProps);
diff --git a/src/app/content/components/screens/Notice/List.stories.jsx b/src/app/content/App/Notice/List/List.stories.jsx
similarity index 97%
rename from src/app/content/components/screens/Notice/List.stories.jsx
rename to src/app/content/App/Notice/List/List.stories.jsx
index ae579aa6e..d6d5bb297 100644
--- a/src/app/content/components/screens/Notice/List.stories.jsx
+++ b/src/app/content/App/Notice/List/List.stories.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
-import List from './List';
+import { List } from '.';
 
 const notices = [
   {
diff --git a/src/components/molecules/NoNotice/Illustration.js b/src/app/content/App/Notice/List/NoNotice/Illustration.js
similarity index 100%
rename from src/components/molecules/NoNotice/Illustration.js
rename to src/app/content/App/Notice/List/NoNotice/Illustration.js
diff --git a/src/components/molecules/NoNotice/IllustrationContainer.js b/src/app/content/App/Notice/List/NoNotice/IllustrationContainer.js
similarity index 100%
rename from src/components/molecules/NoNotice/IllustrationContainer.js
rename to src/app/content/App/Notice/List/NoNotice/IllustrationContainer.js
diff --git a/src/components/molecules/NoNotice/Title.js b/src/app/content/App/Notice/List/NoNotice/Title.js
similarity index 100%
rename from src/components/molecules/NoNotice/Title.js
rename to src/app/content/App/Notice/List/NoNotice/Title.js
diff --git a/src/components/molecules/NoNotice/NoNotice.js b/src/app/content/App/Notice/List/NoNotice/index.js
similarity index 100%
rename from src/components/molecules/NoNotice/NoNotice.js
rename to src/app/content/App/Notice/List/NoNotice/index.js
diff --git a/src/app/content/components/screens/Notice/List.js b/src/app/content/App/Notice/List/index.jsx
similarity index 67%
rename from src/app/content/components/screens/Notice/List.js
rename to src/app/content/App/Notice/List/index.jsx
index acb93483b..4665ce52b 100644
--- a/src/app/content/components/screens/Notice/List.js
+++ b/src/app/content/App/Notice/List/index.jsx
@@ -1,17 +1,17 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { recommendation as NoticeType } from '../../../../propTypes';
-import ContentTitleTop from '../../../../../components/atoms/ContentTitle/ContentTitleTop';
-import { AddNotice, NoNotice } from '../../../../../components/molecules';
-import { Notification, Notice } from '../../../../../components/organisms';
-import { findType } from '../../../../lmem';
+import { recommendation as NoticeType } from 'app/propTypes';
+import { Notification, Notice } from 'components/organisms';
+import { AddNotice } from 'components/molecules';
+import { findType } from 'app/lmem';
+import NoNotice from './NoNotice';
+import withConnect from './withConnect';
 
-const List = ({
+export const List = ({
   notices, dismiss, undismiss, close
 }) => {
   return (
-    <Notification close={close}>
-      <ContentTitleTop>Notifications pour cette page</ContentTitleTop>
+    <Notification title="Notifications pour cette page" hasNotices close={close}>
       {notices.slice(0, 2).map(({
         id, description, contributor: { name }, resource: { url }, criteria, dismissed, disliked
       }) => (
@@ -50,4 +50,4 @@ List.defaultProps = {
   notices: [],
 };
 
-export default List;
+export default withConnect(List);
diff --git a/src/app/content/containers/screens/Notice/List.js b/src/app/content/App/Notice/List/withConnect.js
similarity index 75%
rename from src/app/content/containers/screens/Notice/List.js
rename to src/app/content/App/Notice/List/withConnect.js
index 670d8b153..46575fbad 100644
--- a/src/app/content/containers/screens/Notice/List.js
+++ b/src/app/content/App/Notice/List/withConnect.js
@@ -1,9 +1,7 @@
 import { connect } from 'react-redux';
-
-import List from '../../../components/screens/Notice/List';
-import { getFilteredNotices } from '../../../selectors';
 import { dismissNotice, undismissNotice } from '../../../actions/recommendations';
 import { close } from '../../../actions/ui';
+import { getFilteredNotices } from '../../../selectors';
 
 const mapStateToProps = state => ({
   notices: getFilteredNotices(state),
@@ -15,4 +13,4 @@ const mapDispatchToProps = {
   close,
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(List);
+export default connect(mapStateToProps, mapDispatchToProps);
diff --git a/src/app/content/containers/screens/Notice/index.js b/src/app/content/App/Notice/index.jsx
similarity index 100%
rename from src/app/content/containers/screens/Notice/index.js
rename to src/app/content/App/Notice/index.jsx
index 7d1dbf215..8481ff788 100644
--- a/src/app/content/containers/screens/Notice/index.js
+++ b/src/app/content/App/Notice/index.jsx
@@ -1,5 +1,5 @@
-import { Route, Switch } from 'react-router-dom';
 import React from 'react';
+import { Route, Switch } from 'react-router-dom';
 import List from './List';
 import Details from './Details';
 
diff --git a/src/components/screens/Subscriptions/Container.js b/src/app/content/App/Subscriptions/Container.js
similarity index 100%
rename from src/components/screens/Subscriptions/Container.js
rename to src/app/content/App/Subscriptions/Container.js
diff --git a/src/components/screens/Subscriptions/Illustration.js b/src/app/content/App/Subscriptions/Illustration.js
similarity index 100%
rename from src/components/screens/Subscriptions/Illustration.js
rename to src/app/content/App/Subscriptions/Illustration.js
diff --git a/src/app/content/App/Subscriptions/Subscriptions.stories.jsx b/src/app/content/App/Subscriptions/Subscriptions.stories.jsx
new file mode 100644
index 000000000..c41e64805
--- /dev/null
+++ b/src/app/content/App/Subscriptions/Subscriptions.stories.jsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import Subscriptions from '.';
+
+storiesOf('screens/Subscriptions', module)
+  .addDecorator(getStory => (
+    <Router>
+      {getStory()}
+    </Router>
+  ))
+  .add('normal', () => <Subscriptions />);
diff --git a/src/components/screens/Subscriptions/SubscriptionsData.js b/src/app/content/App/Subscriptions/SubscriptionsData.js
similarity index 100%
rename from src/components/screens/Subscriptions/SubscriptionsData.js
rename to src/app/content/App/Subscriptions/SubscriptionsData.js
diff --git a/src/components/screens/Subscriptions/Subscriptions.js b/src/app/content/App/Subscriptions/index.jsx
similarity index 84%
rename from src/components/screens/Subscriptions/Subscriptions.js
rename to src/app/content/App/Subscriptions/index.jsx
index 580b7044f..4403f8ddd 100644
--- a/src/components/screens/Subscriptions/Subscriptions.js
+++ b/src/app/content/App/Subscriptions/index.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
-import { Notification } from '../../organisms';
+import { Notification } from 'components/organisms';
+import BorderButton from 'components/atoms/Buttons/BorderButton/BorderButton';
 import Illustration from './Illustration';
 import Container from './Container';
 import SubscriptionsData from './SubscriptionsData';
-import BorderButton from '../../atoms/Buttons/BorderButton/BorderButton';
 
 export default ({ close }) => (
   <Notification title="Abonnements" close={close}>
diff --git a/src/app/content/App.js b/src/app/content/App/index.jsx
similarity index 69%
rename from src/app/content/App.js
rename to src/app/content/App/index.jsx
index aef031aec..e69bb1b6e 100644
--- a/src/app/content/App.js
+++ b/src/app/content/App/index.jsx
@@ -3,13 +3,15 @@ import { Provider, connect } from 'react-redux';
 import { Redirect, Route, Switch } from 'react-router-dom';
 import { ConnectedRouter } from 'connected-react-router/immutable';
 import { ThemeProvider, StyleSheetManager } from 'styled-components';
-import { NotificationContainer, GlobalStyle } from '../../components/atoms';
-import theme from '../theme';
-import { Notice, About } from './containers/screens';
-import { Error } from '../../components/screens';
-import NotificationFooter from './components/NotificationFooter';
-import Loading from './containers/screens/Notice/Loading';
-import store, { history } from './store';
+import theme from '../../theme';
+import store, { history } from '../store';
+import GlobalStyle from '../GlobalStyle';
+import Account from './Account';
+import Error from './Error';
+import Loading from './Loading';
+import Notice from './Notice';
+import Subscriptions from './Subscriptions';
+import Help from './Help';
 
 const DELAY_BEFORE_SHOWING = process.env.NODE_ENV === 'production' ? 4000 : 10;
 
@@ -17,24 +19,25 @@ const mapStateToProps = state => ({
   open: state.getIn(['open', 'open'])
 });
 
-const Notification = connect(mapStateToProps)(
+const Content = connect(mapStateToProps)(
   ({ loaded, open }) => (open
     ? (
-      <NotificationContainer>
+      <React.Fragment>
         <GlobalStyle />
         {loaded
           ? (
             <Switch>
               <Redirect exact path="/" to="/notices" />
               <Route path="/notices" component={Notice} />
-              <Route path="/about" component={About} />
+              <Route path="/subscriptions" component={Subscriptions} />
+              <Route path="/help" component={Help} />
+              <Route path="/account" component={Account} />
               <Route component={Error} />
             </Switch>
           )
           : <Loading />
         }
-
-      </NotificationContainer>
+      </React.Fragment>
     )
     : null
   )
@@ -62,7 +65,7 @@ export default class App extends React.PureComponent {
         <Provider store={store}>
           <ThemeProvider theme={theme}>
             <ConnectedRouter history={history}>
-              <Notification loaded={loaded} />
+              <Content loaded={loaded} />
             </ConnectedRouter>
           </ThemeProvider>
         </Provider>
diff --git a/src/components/atoms/GlobalStyle.js b/src/app/content/GlobalStyle.js
similarity index 100%
rename from src/components/atoms/GlobalStyle.js
rename to src/app/content/GlobalStyle.js
diff --git a/src/app/content/components/Contributor.js b/src/app/content/components/Contributor.js
deleted file mode 100644
index 527a8824b..000000000
--- a/src/app/content/components/Contributor.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const Contributor = ({ contributor }) => {
-
-  return (
-    <adress className="reco-contributor">
-      <p>
-        Recommandation proposée par
-        <br />
-        {contributor.name}
-      </p>
-    </adress>
-  );
-};
-
-Contributor.propTypes = {
-  contributor: PropTypes.shape({
-    name: PropTypes.string.isRequired,
-  }).isRequired,
-};
-
-export default Contributor;
\ No newline at end of file
diff --git a/src/app/content/components/Criteria.js b/src/app/content/components/Criteria.js
deleted file mode 100644
index 0e13f4525..000000000
--- a/src/app/content/components/Criteria.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { filterTags } from '../../lmem/typeOfCriteria';
-
-export default function Criteria({ criteria }) {
-  const filteredCriteria = filterTags(criteria)
-    .map(criterion => (
-      <li key={criterion.slug}>
-        <b className={'tag tag-' + criterion.slug}> 
-          {' '}
-          {criterion.label}
-          {' '}
-        </b>
-      </li>
-    ));
-
-  return (
-    <ul className="summary-tags">
-      { filteredCriteria }
-    </ul>
-  );
-}
-
-Criteria.propTypes = {
-  criteria: PropTypes.arrayOf(
-    PropTypes.shape({
-      label: PropTypes.string.isRequired,
-      slug: PropTypes.string.isRequired,
-    })
-  ).isRequired,
-};
diff --git a/src/app/content/components/Editor.js b/src/app/content/components/Editor.js
deleted file mode 100644
index 11d0a0fe7..000000000
--- a/src/app/content/components/Editor.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const Editor = ({ editor, author, onCheckOutEditor }) => {
-
-  return (
-    <div className="reco-editor">
-
-      <h2>
-        <img
-          alt=""
-          src={'https://www.google.com/s2/favicons?domain=' + encodeURIComponent(editor.url)} />
-        {editor.label}
-      </h2>
-
-      {/* { author ? (<p className="reco-author">{author}</p>) : undefined } */}
-
-      { editor.url ? (
-        <p className="reco-link">
-          <a
-            onClick={() => onCheckOutEditor(editor)}
-            target="_blank"
-            rel="noopener noreferrer"
-            href={editor.url}>
-            {editor.url.replace(/(?:^https?:\/\/(?:www\.)?|\?.+$)/g, '')}
-          </a>
-        </p>
-      ) : undefined }
-
-    </div>
-  );
-};
-
-Editor.propTypes = {
-  author: PropTypes.string,
-  editor: PropTypes.shape({
-    label: PropTypes.string.isRequired,
-    url: PropTypes.string,
-  }).isRequired,
-  onCheckOutEditor: PropTypes.func.isRequired,
-};
-
-Editor.defaultProps = {
-  author: null,
-};
-
-export default Editor;
\ No newline at end of file
diff --git a/src/app/content/components/FeedbackButtons.js b/src/app/content/components/FeedbackButtons.js
deleted file mode 100644
index 129f1427c..000000000
--- a/src/app/content/components/FeedbackButtons.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-
-export default class FeedbackButtons extends Component {
-
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      isApproved: props.isApproved,
-    };
-
-    this.handleApproveClick = this.handleApproveClick.bind(this);
-  }
-
-  handleApproveClick() {
-    const { isApproved } = this.state;
-    const {
-      approveReco,
-      unapproveReco,
-      recoId,
-    } = this.props;
-
-    if (isApproved) unapproveReco(recoId);
-    else approveReco(recoId);
-
-    this.setState({ isApproved: !isApproved });
-  }
-
-  render() {
-    const { isApproved } = this.state;
-    const {
-      imagesUrl,
-      recoId,
-      dismissReco,
-      reportReco
-    } = this.props;
-
-    return (
-      <div>
-        <button
-          type="button"
-          className="button-hollow with-tooltip with-image"
-          onClick={ e => dismissReco(recoId) }>
-          <img alt="" src={ imagesUrl + 'trashbin.svg' } />
-          <span className="tooltip tooltip-left">
-            Ne plus afficher
-          </span>
-        </button>
-        <button
-          type="button"
-          className="button-hollow with-tooltip with-image"
-          onClick={ this.handleApproveClick }>
-          <img
-            alt=""
-            src={ imagesUrl + (isApproved ? 'love-pink.svg' : 'love.svg') }
-          />
-          <span className="tooltip tooltip-left">
-            { isApproved ? 'J’approuve cette recommandation' : 'Approuver cette recommandation' }
-          </span>
-        </button>
-
-        <div className="separation" role="presentation" />
-
-        {/* <button
-          className="button-hollow with-tooltip with-image"
-          onClick={ e => reportReco(recoId) }>
-          <img src={ imagesUrl + 'report.svg' } role="presentation" />
-          <span className="tooltip tooltip-left">
-            Signaler (erreur, propos haineux ou racistes...)
-          </span>
-        </button> */}
-      </div>
-    );
-  }
-}
-
-FeedbackButtons.propTypes = {
-  imagesUrl: PropTypes.string.isRequired,
-  recoId: PropTypes.number.isRequired,
-  isApproved: PropTypes.bool,
-  dismissReco: PropTypes.func.isRequired,
-  approveReco: PropTypes.func.isRequired,
-  unapproveReco: PropTypes.func.isRequired,
-  reportReco: PropTypes.func.isRequired,
-};
-
-FeedbackButtons.defaultProps = {
-  isApproved: false,
-};
diff --git a/src/app/content/components/Loader.js b/src/app/content/components/Loader.js
deleted file mode 100644
index 128663df2..000000000
--- a/src/app/content/components/Loader.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Created by insitu on 07/06/16.
- */
-
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-
-const Loader = ({ imagesUrl }) => (
-  <div id="loader">
-    <aside className="lmem-topbar fixed">
-
-      <div className="lmem-topbar-notification">
-
-        <div className="mainframe">
-          <section className="mainframe-inner">
-            <h2 className="alternatives-searching-title visually-hidden">
-          Recommandations en cours de chargement…
-            </h2>
-
-            <div className="alternatives-searching-wrapper">
-              <div className="alternatives-searching-progress" />
-
-              <p className="alternatives-searching-content">
-              Recommandations en cours de chargement…
-              </p>
-            </div>
-          </section>
-        </div>
-      </div>
-
-      <button type="button" className="lmem-topbar-logo with-tooltip">
-        <img src={imagesUrl + 'logo-lmem.svg'} alt="" />
-      </button>
-    </aside>
-  </div>
-);
-
-Loader.propTypes = {
-  imagesUrl: PropTypes.string.isRequired
-};
-
-export default Loader;
\ No newline at end of file
diff --git a/src/app/content/components/Modal.js b/src/app/content/components/Modal.js
deleted file mode 100644
index 4684ab57e..000000000
--- a/src/app/content/components/Modal.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import classnames from 'classnames';
-
-export default class Modal extends Component {
-
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      active: false,
-    };
-  }
-
-  componentDidMount() {
-    setTimeout(() => this.setState({ active: true }), 10);
-  }
-
-  render() {
-    const { children } = this.props;
-    const { active } = this.state;
-    const className = classnames('modal', { active });
-
-    return (
-      <div className={ className }>
-        <div>
-          { children }
-        </div>
-      </div>
-    );
-  }
-}
-
-Modal.propTypes = {
-  children: PropTypes.node.isRequired,
-};
diff --git a/src/app/content/components/NotificationFooter/NotificationFooter.js b/src/app/content/components/NotificationFooter/NotificationFooter.js
deleted file mode 100644
index 39d069e8b..000000000
--- a/src/app/content/components/NotificationFooter/NotificationFooter.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react';
-import NotificationFooterContainer from '../../../../components/molecules/NotificationFooter/FooterContainer';
-import NavLink from '../../../../components/molecules/NotificationFooter/NavLink';
-import AccountIcon from './AccountIcon';
-import BubbleIcon from './BubbleIcon';
-import HelpIcon from './HelpIcon';
-
-const NotificationFooter = () => (
-  <NotificationFooterContainer>
-    <NavLink to="/notices">
-      <BubbleIcon />
-    </NavLink>
-    <NavLink
-      as="a"
-      href="https://choisir.lmem.net/questions-frequentes-aide/"
-      target="_blank"
-      rel="noopener noreferrer"
-    >
-      <HelpIcon />
-    </NavLink>
-    <NavLink to="/about">
-      <AccountIcon />
-    </NavLink>
-  </NotificationFooterContainer>
-);
-
-export default NotificationFooter;
diff --git a/src/app/content/components/NotificationFooter/index.js b/src/app/content/components/NotificationFooter/index.js
deleted file mode 100644
index 063529202..000000000
--- a/src/app/content/components/NotificationFooter/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import NotificationFooter from './NotificationFooter';
-
-export default NotificationFooter;
diff --git a/src/app/content/components/PreferenceAboutPanel.js b/src/app/content/components/PreferenceAboutPanel.js
deleted file mode 100644
index b452c948f..000000000
--- a/src/app/content/components/PreferenceAboutPanel.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import React from 'react';
-import { Map } from 'immutable';
-import { EXTENSION_VERSION } from '../../constants/ui';
-
-function formatLocaleDate(strDate) {
-  const dateOfInstall = new Date(strDate);
-
-  if (Number.isNaN(dateOfInstall.getTime())) return undefined;
-
-  return dateOfInstall.toLocaleDateString(navigator.language,
-    {
-      weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' 
-    });
-}
-
-export default function PreferenceAboutPanel(props) {
-  const { onInstalledDetails } = props;
-  const ISODateOfInstall = Map.isMap(onInstalledDetails) && onInstalledDetails.get('datetime');
-  const localeDateOfInstall = ISODateOfInstall && formatLocaleDate(ISODateOfInstall);
-
-  return (
-    <div>
-      <section>
-        <h1>
-          Le Même en Mieux est un assistant d’achat indépendant des vendeurs et des marques.
-        </h1>
-        { localeDateOfInstall && (
-          <p>
-            Vous l’avez installé le
-            {' '}
-            <time dateTime={ISODateOfInstall}>{localeDateOfInstall}</time>
-.
-          </p>
-        )}
-
-        <p>
-          {'Pour découvrir ou faire découvrir le Même en Mieux autour de vous, '}
-          <a
-            href="https://choisir.lmem.net/decouvrir-exemples/"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            rendez-vous sur cette page d’exemples
-          </a>
-.
-        </p>
-
-      </section>
-      <aside>
-        <ul>
-          <li>
-            <a
-              target="_blank"
-              rel="noopener noreferrer"
-              href="https://choisir.lmem.net/questions-frequentes-aide/"
-            >
-              Aide
-            </a>
-          </li>
-          <li><a target="_blank" rel="noopener noreferrer" href="https://www.lmem.net/projet">À propos</a></li>
-          <li><a target="_blank" rel="noopener noreferrer" href="https://www.lmem.net/contact.html">Contact</a></li>
-          <li>
-            <a
-              target="_blank"
-              rel="noopener noreferrer"
-              href="https://choisir.lmem.net/charte-de-respect-de-la-vie-privee-5-regles-dor/">
-            Vie privée
-            </a>
-          </li>
-          <li><a target="_blank" rel="noopener noreferrer" href="https://www.lmem.net/cgu.html">CGU</a></li>
-          <li><a target="_blank" rel="noopener noreferrer" href="https://choisir.lmem.net/desinstaller-meme-mieux/">Désinstaller</a></li>
-          <li>
-v
-            {EXTENSION_VERSION}
-          </li>
-        </ul>
-      </aside>
-    </div>
-  );
-}
diff --git a/src/app/content/components/PreferenceCriteriaPanel.js b/src/app/content/components/PreferenceCriteriaPanel.js
deleted file mode 100644
index f91eddd1b..000000000
--- a/src/app/content/components/PreferenceCriteriaPanel.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { filterTags } from '../../lmem/typeOfCriteria';
-
-function PreferenceCriteriaPanel(props) {
-  const {
-    criteria, selectCriterion, unselectCriterion, imagesUrl 
-  } = props;
-
-  const lis = filterTags(criteria.toArray())
-    .sort((criterionA, criterionB) => {
-      const labelA = criterionA.get('label').toUpperCase();
-      const labelB = criterionB.get('label').toUpperCase();
-      return -labelA.localeCompare(labelB);
-    })
-    .map((criterion) => {
-      const slug = criterion.get('slug');
-      const label = criterion.get('label');
-      const isSelected = criterion.get('isSelected');
-
-      return (
-        <li key={ slug }>
-          <label htmlFor={ slug } className="criterion-label">
-            <input
-              id={ slug }
-              type="checkbox"
-              checked={ isSelected }
-              onChange={ () => (isSelected ? unselectCriterion(slug) : selectCriterion(slug)) } />
-            <img alt="" src={`${imagesUrl}${isSelected ? 'checked' : 'unchecked'}.svg`} />
-            { label }
-          </label>
-        </li>
-      );
-    });
-
-  return (
-    <div>
-      <ul>{ lis }</ul>
-      <div className="separation-bar" />
-      <aside>
-        <h1>Aide</h1>
-        <p>
-          Sélectionnez les critères de choix qui comptent pour vous.
-          Seules les recommandations répondant à ces critères vous seront affichées.
-        </p>
-        <p>
-          Par exemple, si le prix vous importe peu, dé-sélectionnez le critère 
-          {' '}
-          <em>prix</em>
-.
-          L’assistant ne vous proposera alors plus de recommandation portant uniquement sur ce critère.
-        </p>
-      </aside>
-    </div>
-  );
-}
-
-PreferenceCriteriaPanel.propTypes = {
-  criteria: PropTypes.arrayOf(PropTypes.shape({
-    slug: PropTypes.string.isRequired,
-    label: PropTypes.string.isRequired,
-  })).isRequired,
-  selectCriterion: PropTypes.func.isRequired,
-  unselectCriterion: PropTypes.func.isRequired,
-  imagesUrl: PropTypes.string.isRequired,
-};
-
-export default PreferenceCriteriaPanel;
diff --git a/src/app/content/components/PreferenceScreen.js b/src/app/content/components/PreferenceScreen.js
deleted file mode 100644
index bc0fce533..000000000
--- a/src/app/content/components/PreferenceScreen.js
+++ /dev/null
@@ -1,122 +0,0 @@
-import React from 'react';
-
-import { 
-  PREFERENCE_SCREEN_PANEL_ABOUT,
-  PREFERENCE_SCREEN_PANEL_CRITERIA,
-  PREFERENCE_SCREEN_PANEL_SOURCES,
-} from '../../constants/ui';
-
-import PreferenceAboutPanel from './PreferenceAboutPanel';
-import PreferenceCriteriaPanel from './PreferenceCriteriaPanel';
-import PreferenceSourcesPanel from './PreferenceSourcesPanel';
-
-function mainClassName(screenPanel) {
-  switch (screenPanel) {
-    case PREFERENCE_SCREEN_PANEL_ABOUT:
-      return 'preference-about';
-    case PREFERENCE_SCREEN_PANEL_CRITERIA:
-      return 'preference-criteria';
-    case PREFERENCE_SCREEN_PANEL_SOURCES:
-      return 'preference-sources';
-    default:
-      return '';
-  }
-}
-
-export default function (props) {
-  const {
-    preferenceScreenPanel, openPrefScreen, uninstall,
-    imagesUrl, onInstalledDetails, 
-    criteria, selectCriterion, unselectCriterion,
-    editors, excludeEditor, includeEditor
-  } = props;
-
-  let mainContent;
-
-  switch (preferenceScreenPanel){
-    case PREFERENCE_SCREEN_PANEL_ABOUT:
-      mainContent = (
-        <PreferenceAboutPanel
-          onInstalledDetails={onInstalledDetails}
-          uninstall={uninstall}
-        />
-      );
-      break;
-    case PREFERENCE_SCREEN_PANEL_CRITERIA:
-      mainContent = (
-        <PreferenceCriteriaPanel
-          criteria={criteria}
-          selectCriterion={selectCriterion}
-          unselectCriterion={unselectCriterion}
-          imagesUrl={imagesUrl}
-        />
-      );
-      break;
-    case PREFERENCE_SCREEN_PANEL_SOURCES:
-      mainContent = (
-        <PreferenceSourcesPanel
-          editors={editors}
-          excludeEditor={excludeEditor}
-          includeEditor={includeEditor}
-          imagesUrl={imagesUrl}
-        />
-      );
-      break;
-    default:
-      console.error('Unknown content value', preferenceScreenPanel);
-  }
-
-  const changePanel = (e) => {
-    const newContent = e.currentTarget.getAttribute('data-panel');
-    openPrefScreen(newContent);
-  };
-
-  return (
-    <section className="preference-panel">
-      <nav>
-        <ul>
-          <li className="preference-menu-about">
-            <button
-              type="button"
-              data-panel={PREFERENCE_SCREEN_PANEL_ABOUT}
-              onClick={changePanel}
-              className={'not-button with-image'
-              + (preferenceScreenPanel === PREFERENCE_SCREEN_PANEL_ABOUT ? ' active' : '')}>
-              <img alt="" className="lmem-controls-picto" src={imagesUrl + 'info.svg'} />
-              <span>Général</span>
-            </button>
-          </li>
-          <li className="preference-menu-criteria">
-            <button
-              type="button"
-              data-panel={PREFERENCE_SCREEN_PANEL_CRITERIA}
-              onClick={changePanel}
-              className={'not-button with-image'
-            + (preferenceScreenPanel === PREFERENCE_SCREEN_PANEL_CRITERIA ? ' active' : '')}>
-              <img alt="" className="lmem-controls-picto" src={imagesUrl + 'valid.svg'} />
-              <span>Critères de choix</span>
-            </button>
-          </li>
-          <li className="preference-menu-sources">
-
-
-            <button
-              type="button"
-              data-panel={PREFERENCE_SCREEN_PANEL_SOURCES}
-              onClick={changePanel}
-              className={'not-button with-image'
-            + (preferenceScreenPanel === PREFERENCE_SCREEN_PANEL_SOURCES ? ' active' : '')}>
-              <img alt="" className="lmem-controls-picto" src={imagesUrl + 'close.svg'} />
-              <span>Sources d’information</span>
-            </button>
-          </li>
-        </ul>
-      </nav>
-      <div className="separation-bar" />
-      <main className={mainClassName(preferenceScreenPanel)}>
-        {mainContent}
-      </main>
-    </section>
-  );
-  
-}
diff --git a/src/app/content/components/PreferenceSourcesPanel.js b/src/app/content/components/PreferenceSourcesPanel.js
deleted file mode 100644
index 21fd2162c..000000000
--- a/src/app/content/components/PreferenceSourcesPanel.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-function PreferenceSourcesPanel(props) {
-  const {
-    editors, includeEditor, excludeEditor, imagesUrl 
-  } = props;
-
-  const lis = editors.toArray()
-    .sort((editorA, editorB) => {
-      const labelA = editorA.get('label').toUpperCase();
-      const labelB = editorB.get('label').toUpperCase();
-      return labelA.localeCompare(labelB);
-    })
-    .map((editor) => {
-      const id = editor.get('id');
-      const label = editor.get('label');
-      const isExcluded = editor.get('isExcluded');
-
-      return (
-        <li key={ id }>
-          <label htmlFor={ id } className="editor-label">
-            <input
-              id={ id }
-              type="checkbox"
-              checked={ isExcluded }
-              onChange={ () => (isExcluded ? includeEditor(id) : excludeEditor(id)) } />
-            <img
-              alt=""
-              src={`${imagesUrl}${isExcluded ? 'crosschecked' : 'checked'}.svg`}
-            />
-            { label }
-          </label>
-        </li>
-      );
-    });
-
-  return (
-    <div>
-      <ul>{ lis }</ul>
-      <div className="separation-bar" />
-      <aside>
-        <h1>Aide</h1>
-        <p>
-          Recevez les recommandations basées sur les sources que vous avez sélectionnées ci-contre.
-        </p>
-
-        <h2>Ajouter une nouvelle source</h2>
-        <a href="https://www.lmem.net/contact.html" target="_blank" rel="noopener noreferrer">Contactez-nous</a>
-        { ' pour proposer un nouveau média ou un article d’aide au choix.' }
-      </aside>
-    </div>
-  );
-}
-
-PreferenceSourcesPanel.propTypes = {
-  editors: PropTypes.arrayOf(PropTypes.shape({
-    id: PropTypes.number.isRequired,
-    label: PropTypes.string.isRequired,
-    url: PropTypes.string,
-  })).isRequired,
-  includeEditor: PropTypes.func.isRequired,
-  excludeEditor: PropTypes.func.isRequired,
-  imagesUrl: PropTypes.string.isRequired,
-};
-
-export default PreferenceSourcesPanel;
-
diff --git a/src/app/content/components/RecoDescription.js b/src/app/content/components/RecoDescription.js
deleted file mode 100644
index 28aa94baa..000000000
--- a/src/app/content/components/RecoDescription.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { sanitize } from 'dompurify';
-
-// FIXME This might be a backend thing...
-function addHtmlLinks(html) {
-  return html.replace(
-    /(https?:\/\/)?([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?/gi,
-    (match, protocol) => `<a
-        target="_blank"
-        rel="noopener noreferrer"
-        href="${!protocol && 'https://'}${match}?utm_source=lmem_assistant">
-          ${match}
-      </a>`
-  );
-}
-
-function sanitizeHtml(rawHtml) {
-  return {
-    __html: addHtmlLinks(sanitize(rawHtml, {
-      ALLOWED_TAGS: ['p'],
-      ALLOWED_ATTR: [],
-    })),
-  };
-}
-
-const RecoDescription = ({ description }) => (
-  <div
-    className="reco-summary-description summary-description"
-    dangerouslySetInnerHTML={sanitizeHtml(description)} // eslint-disable-line
-  />
-);
-
-RecoDescription.propTypes = {
-  description: PropTypes.string.isRequired,
-};
-
-export default RecoDescription;
\ No newline at end of file
diff --git a/src/app/content/components/RecoHeader.js b/src/app/content/components/RecoHeader.js
deleted file mode 100644
index 853582da4..000000000
--- a/src/app/content/components/RecoHeader.js
+++ /dev/null
@@ -1,174 +0,0 @@
-import React, { Component } from 'react';
-import {
-  DEACTIVATE_EVERYWHERE,
-  SESSION_DEACTIVATE_DELAY
-} from '../../constants/websites';
-import {
-  PREFERENCE_SCREEN_PANEL_ABOUT,
-  HEADER_CONTENT
-} from '../../constants/ui';
-
-class RecoHeader extends Component {
-
-  constructor(props) {
-    super(props);
-
-    this.handleDeactivateButtonClick = this.handleDeactivateButtonClick.bind(this);
-    this.handleReduceButtonClick = this.handleReduceButtonClick.bind(this);
-    this.handleOpenPrefButtonClick = this.handleOpenPrefButtonClick.bind(this);
-  }
-
-  handleDeactivateButtonClick() {
-    const { onDeactivate } = this.props;
-    onDeactivate({
-      where: DEACTIVATE_EVERYWHERE,
-      duration: SESSION_DEACTIVATE_DELAY,
-    });
-  }
-
-  handleReduceButtonClick() {
-    const { reduced, onExtend, onReduce } = this.props;
-    if (reduced) onExtend();
-    else onReduce();
-  }
-
-  handleOpenPrefButtonClick() {
-    const { reduced, onExtend, openPrefScreen } = this.props;
-    if (reduced) onExtend();
-    openPrefScreen(PREFERENCE_SCREEN_PANEL_ABOUT);
-  }
-
-  render() {
-    const {
-      imagesUrl, reduced, preferenceScreenPanel,
-      closePrefScreen
-    } = this.props;
-
-    const reduceButtonText = reduced ? 'Agrandir' : 'Réduire';
-    const buttonButtonClassName = [
-      'lmem-controls-picto',
-      reduced ? 'lmem-controls-open' : 'lmem-controls-close'
-    ].join(' ');
-    const tooltipButtonClassName = [
-      'tooltip',
-      reduced ? 'tooltip-left' : 'tooltip-bottom-right'
-    ].join(' ');
-
-    const headerButtons = preferenceScreenPanel
-      ? (
-        <li>
-          <div className="button-directive">
-            <button
-              type="button"
-              className="button button-compact with-tooltip"
-              onClick={closePrefScreen}
-            >
-              <img
-                alt=""
-                src={ imagesUrl + 'close.svg' }
-                className="lmem-controls-picto" />
-              <span className={tooltipButtonClassName}>
-                <span>
-              Fermer l’écran des préférences
-                </span>
-              </span>
-            </button>
-          </div>
-        </li>
-      )
-      : [
-        (
-          <li key="preferences">
-            <div className="button-directive">
-              <button
-                type="button"
-                className="button button-compact with-tooltip"
-                onClick={ this.handleOpenPrefButtonClick }>
-                <img
-                  alt=""
-                  src={ imagesUrl + 'settings.svg' }
-                  className="lmem-controls-picto" />
-                <span className={tooltipButtonClassName}>
-                  <span>
-                  Préférences
-                  </span>
-                </span>
-              </button>
-            </div>
-          </li>
-        ),
-        (
-          <li key="reduce-extend-button">
-            <button
-              type="button"
-              className="reduce button-compact with-image with-tooltip"
-              onClick={ this.handleReduceButtonClick }>
-              <img
-                alt=""
-                src={ imagesUrl + 'arrow.svg' }
-                className={ buttonButtonClassName }
-              />
-              <span className="button-label">{reduceButtonText}</span>
-              <span className={tooltipButtonClassName}>
-                {reduceButtonText}
-              </span>
-            </button>
-          </li>
-        )
-      ];
-
-    const extendReduceButton = preferenceScreenPanel ? undefined
-      : (
-        <div className="button-wrapper">
-          <div className="button-directive">
-            <button
-              type="button"
-              className="button button-compact with-image with-tooltip"
-              onClick={ this.handleReduceButtonClick }>
-              <img
-                alt=""
-                src={ imagesUrl + 'arrow.svg' }
-                className={ buttonButtonClassName } />
-              <span className="button-label">{reduceButtonText}</span>
-              <span className={tooltipButtonClassName}>
-                <span>
-                  {reduceButtonText}
-                </span>
-              </span>
-            </button>
-          </div>
-        </div>
-      );
-
-    const headerContent = preferenceScreenPanel
-      ? HEADER_CONTENT[preferenceScreenPanel](imagesUrl)
-      : HEADER_CONTENT.default;
-
-    return (
-      <header>
-        <button
-          type="button"
-          className="with-tooltip logo"
-          onClick={ this.handleReduceButtonClick }>
-          <img width="45" src={ imagesUrl + 'logo-lmem.svg' } alt="comparatif" />
-          <span className="tooltip tooltip-right">
-            { reduceButtonText + ' le panneau comparatif' }
-          </span>
-        </button>
-
-        <div className="separation-bar" />
-
-        <h1 className="lmem-topbar-title">
-          {headerContent}
-        </h1>
-        
-        <ul className="lmem-controls-list">
-          {headerButtons}
-        </ul>
-      </header>
-    );
-  }
-
-}
-
-export default RecoHeader;
diff --git a/src/app/content/components/RecoMain.js b/src/app/content/components/RecoMain.js
deleted file mode 100644
index dacc787ff..000000000
--- a/src/app/content/components/RecoMain.js
+++ /dev/null
@@ -1,119 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
-
-import { findType } from '../../lmem/typeOfCriteria';
-
-import Editor from './Editor';
-import Contributor from './Contributor';
-import Criteria from './Criteria';
-import RecoDescription from './RecoDescription';
-import FeedbackButtons from '../containers/Feedback';
-import TypeIndicator from './TypeIndicator';
-import { recommendation as RecommendationPropType } from '../../propTypes';
-
-
-export default function RecoMain({
-  recommendations, imagesUrl,
-  onCheckOutResourceButton, onCheckOutResourceLink, onCheckOutAlternative, onCheckOutEditor,
-}) {
-  // For now, this component is only capable of handling a single recommendation.
-  // handling of several is TBD
-  const recommendation = recommendations[0];
-  const {visibility} = recommendation;
-
-  const mainClass = visibility === 'private' ? 'preview' : undefined;
-
-  const typeOfRecommendation = findType(recommendation.criteria);
-
-  return (
-    <main className={mainClass}>
-      <header className="sideframe lmem-header">
-        <Editor
-          editor={recommendation.resource.editor}
-          author={recommendation.resource.author}
-          onCheckOutEditor={onCheckOutEditor}
-        />
-        <Contributor contributor={recommendation.contributor} />
-      </header>
-
-      <div className="separation-bar" />
-
-      <div
-        className={classNames(
-          'recommendation',
-          'mainframe',
-          'highlight',
-          {'with-indicator': typeOfRecommendation}
-        )}>
-        {
-          typeOfRecommendation
-            ? <TypeIndicator recommendationType={ typeOfRecommendation } imagesUrl={ imagesUrl } />
-            : undefined
-        }
-
-        <div className="reco-summary">
-          <header className="summary-header reco-summary-header">
-            <h3 className="reco-summary-title">
-              <a target="_blank" rel="noopener noreferrer" href={recommendation.resource.url}>
-                {recommendation.title}
-              </a>
-            </h3>
-
-            <Criteria criteria={ recommendation.criteria } />
-          </header>
-          <div className="reco-summary-content">
-            <div className="reco-summary-link-referral">
-              <a 
-                onClick={e => onCheckOutResourceLink(recommendation.resource)}
-                target="_blank"
-                rel="noopener noreferrer"
-                href={recommendation.resource.url}>
-                {recommendation.resource.url.replace(/\?.+$/, '')}
-              </a>
-            </div>
-            <RecoDescription description={recommendation.description} />
-          </div>
-        </div>
-        <div className="summary-link-checkout-wrapper">
-          <a
-            onClick={e => onCheckOutResourceButton(recommendation.resource)}
-            href={recommendation.resource.url}
-            target="_blank"
-            rel="noopener noreferrer"
-            className="button summary-link-checkout with-image">
-            <img alt="" src={imagesUrl + 'read.svg'} />
-            <span className="button-label">
-              {recommendation.resource.label}
-            </span>
-          </a>
-          { recommendation.alternatives && recommendation.alternatives[0] ? (
-            <div>
-              <small>ou bien</small>
-              <a
-                onClick={e => onCheckOutAlternative(recommendation.alternatives[0])}
-                href={recommendation.alternatives[0].url_to_redirect}
-                target="_blank"
-                rel="noopener noreferrer"
-                className="reco-alternative button summary-link-checkout with-image">
-                <img alt="" src={imagesUrl + 'logo-bw.svg'} />
-                <span className="button-label">
-                  {recommendation.alternatives[0].label}
-                </span>
-              </a>
-            </div>
-          ) : undefined }
-        </div>
-      </div>
-
-      <footer className="reco-feedback">
-        <FeedbackButtons recoId={ recommendation.id } isApproved={ recommendation.isApproved } />
-      </footer>
-    </main>
-  );
-}
-
-RecoMain.propTypes = {
-  imagesUrl: PropTypes.string.isRequired,
-  recommendations: PropTypes.arrayOf(PropTypes.shape(RecommendationPropType)).isRequired,
-};
diff --git a/src/app/content/components/Recommendations.js b/src/app/content/components/Recommendations.js
deleted file mode 100644
index 12d665aaf..000000000
--- a/src/app/content/components/Recommendations.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import Loader from './Loader';
-import RecoHeader from './RecoHeader';
-import RecoMain from './RecoMain';
-import Preferences from '../containers/Preferences';
-import { recommendation as RecommendationPropType } from '../../propTypes';
-
-export default function Recommendations(props) {
-  const {
-    recommendations, imagesUrl, reduced, preferenceScreenPanel,
-    onExtend, onReduce, onDeactivate, closePrefScreen, openPrefScreen,
-    onCheckOutResourceButton, onCheckOutResourceLink, onCheckOutAlternative, onCheckOutEditor,
-  } = props;
-
-  const body = preferenceScreenPanel
-    ? <Preferences />
-    : (
-      recommendations.length > 0
-      && (
-        <RecoMain
-          imagesUrl={imagesUrl}
-          recommendations={recommendations}
-          onCheckOutResourceButton={onCheckOutResourceButton}
-          onCheckOutResourceLink={onCheckOutResourceLink}
-          onCheckOutAlternative={onCheckOutAlternative}
-          onCheckOutEditor={onCheckOutEditor}
-        />
-      )
-    );
-
-  return recommendations ? (
-    <section className="lmem-top-level">
-      <RecoHeader
-        imagesUrl={imagesUrl}
-        reduced={reduced}
-        preferenceScreenPanel={preferenceScreenPanel}
-        onExtend={onExtend}
-        onReduce={onReduce}
-        onDeactivate={onDeactivate}
-        closePrefScreen={closePrefScreen}
-        openPrefScreen={openPrefScreen}
-      />
-      { body }
-    </section>
-  ) : (<Loader imagesUrl={ imagesUrl } />);
-}
-
-Recommendations.propTypes = {
-  recommendations: PropTypes.arrayOf(PropTypes.shape(RecommendationPropType)),
-  imagesUrl: PropTypes.string.isRequired,
-  reduced: PropTypes.bool.isRequired,
-  onExtend: PropTypes.func.isRequired,
-  onReduce: PropTypes.func.isRequired,
-  onCheckOutResourceButton: PropTypes.func.isRequired,
-  onCheckOutResourceLink: PropTypes.func.isRequired,
-  onCheckOutAlternative: PropTypes.func.isRequired,
-  onCheckOutEditor: PropTypes.func.isRequired,
-};
-
-Recommendations.defaultProps = {
-  recommendations: [],
-};
diff --git a/src/app/content/components/TypeIndicator.js b/src/app/content/components/TypeIndicator.js
deleted file mode 100644
index bdef57469..000000000
--- a/src/app/content/components/TypeIndicator.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import {
-  CRITERIA_TYPE_GO,
-  CRITERIA_TYPE_NOGO,
-  CRITERIA_TYPE_WARNING,
-} from '../../lmem/typeOfCriteria';
-
-
-function imgFilename(recommendationType) {
-  switch (recommendationType) {
-    case CRITERIA_TYPE_GO:
-      return 'like.svg';
-    case CRITERIA_TYPE_NOGO:
-      return 'dislike.svg';
-    case CRITERIA_TYPE_WARNING:
-      return 'warning.svg';
-
-    default:
-      throw new ReferenceError('Recommendation type is undefined');
-  }
-}
-
-function imgAlt(recommendationType) {
-  switch (recommendationType) {
-    case CRITERIA_TYPE_GO:
-      return 'Vous êtes sur une page recommandée.';
-    case CRITERIA_TYPE_NOGO:
-      return 'Cette page ou ce produit vous est déconseillé.';
-    case CRITERIA_TYPE_WARNING:
-      return 'Attention : risque d’arnaque, biais, fausses informations...';
-
-    default:
-      throw new ReferenceError('Recommendation type is undefined');
-  }
-}
-
-function className(recommendationType) {
-  switch (recommendationType) {
-    case CRITERIA_TYPE_GO:
-      return 'reco-type-indicator-go';
-    case CRITERIA_TYPE_NOGO:
-      return 'reco-type-indicator-nogo';
-    case CRITERIA_TYPE_WARNING:
-      return 'reco-type-indicator-warning';
-
-    default:
-      throw new ReferenceError('Recommendation type is undefined');
-  }
-}
-
-
-export default function TypeIndicator({ recommendationType, imagesUrl }) {
-  return (
-    <div className={'reco-type-indicator ' + className(recommendationType)}>
-      <img
-        src={ imagesUrl + imgFilename(recommendationType) }
-        alt={ imgAlt(recommendationType) } />
-    </div>
-  );
-}
-
-TypeIndicator.propTypes = {
-  recommendationType: PropTypes.string.isRequired,
-  imagesUrl: PropTypes.string.isRequired,
-};
diff --git a/src/app/content/components/screens/About.stories.jsx b/src/app/content/components/screens/About.stories.jsx
deleted file mode 100644
index 98fc8ac0c..000000000
--- a/src/app/content/components/screens/About.stories.jsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import { action } from '@storybook/addon-actions';
-import About from './About';
-
-storiesOf('screens/About', module)
-  .addDecorator(getStory => (
-    <Router>
-      {getStory()}
-    </Router>
-  ))
-  .add('normal', () => (
-    <About extensionVersion="1.2.3" close={action('close')} installationDate="01/01/2042" />
-  ))
-  .add('missing installation date', () => (
-    <About extensionVersion="1.2.3" close={action('close')} />
-  ));
diff --git a/src/app/content/containers/App.js b/src/app/content/containers/App.js
deleted file mode 100644
index 463147c0f..000000000
--- a/src/app/content/containers/App.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { connect } from 'react-redux';
-import Recommendations from '../components/Recommendations';
-import { IMAGES_URL } from '../../constants/assetsUrls';
-import {
-  reduce,
-  extend,
-  deactivate,
-  closePrefScreen,
-  openPrefScreen,
-  checkOutResourceButton,
-  checkOutResourceLink,
-  checkOutAlternative,
-  checkOutEditor
-} from '../actions/ui';
-import { getNotices } from '../selectors';
-
-function mapStateToProps(state) {
-  return {
-    recommendations: getNotices(state),
-    imagesUrl: IMAGES_URL,
-    reduced: state.get('reduced'),
-    preferenceScreenPanel: state.get('preferenceScreenPanel')
-  };
-}
-function mapDispatchToProps(dispatch) {
-  return {
-    onReduce() { dispatch(reduce()); },
-    onExtend() { dispatch(extend()); },
-    onDeactivate(details) { dispatch(deactivate(details)); },
-    closePrefScreen() { dispatch(closePrefScreen()); },
-    openPrefScreen(panel) { dispatch(openPrefScreen(panel)); },
-    onCheckOutResourceButton(r) { dispatch(checkOutResourceButton(r)); },
-    onCheckOutResourceLink(r) { dispatch(checkOutResourceLink(r)); },
-    onCheckOutAlternative(a) { dispatch(checkOutAlternative(a)); },
-    onCheckOutEditor(e) { dispatch(checkOutEditor(e)); },
-  };
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(Recommendations);
diff --git a/src/app/content/containers/Feedback.js b/src/app/content/containers/Feedback.js
deleted file mode 100644
index add47b3ab..000000000
--- a/src/app/content/containers/Feedback.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { connect } from 'react-redux';
-
-import {
-  dismissNotice, likeNotice, dislikeNotice, reportNotice
-} from '../actions/recommendations';
-
-import { IMAGES_URL } from '../../constants/assetsUrls';
-import FeedbackButtons from '../components/FeedbackButtons';
-
-function mapStateToProps(state, ownProps) {
-  return Object.assign({}, ownProps, {
-    imagesUrl: IMAGES_URL,
-  });
-}
-
-function mapDispatchToProps(dispatch) {
-  return {
-    dismissReco(id) { dispatch(dismissNotice(id)); },
-    approveReco(id) { dispatch(likeNotice(id)); },
-    unapproveReco(id) { dispatch(dislikeNotice(id)); },
-    reportReco(id) { dispatch(reportNotice(id)); },
-  };
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(FeedbackButtons);
diff --git a/src/app/content/containers/NotificationContainer.js b/src/app/content/containers/NotificationContainer.js
deleted file mode 100644
index 2158ec104..000000000
--- a/src/app/content/containers/NotificationContainer.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { connect } from 'react-redux';
-
-import { isOpen } from '../selectors';
-import { NotificationContainer } from '../../../components/atoms';
-
-const mapStateToProps = state => ({
-  open: isOpen(state),
-});
-
-export default connect(mapStateToProps)(NotificationContainer);
diff --git a/src/app/content/containers/Preferences.js b/src/app/content/containers/Preferences.js
deleted file mode 100644
index da5f6733d..000000000
--- a/src/app/content/containers/Preferences.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { connect } from 'react-redux';
-import PreferenceScreen from '../components/PreferenceScreen';
-import { IMAGES_URL } from '../../constants/assetsUrls';
-import { closePrefScreen, openPrefScreen, uninstall } from '../actions/ui';
-import {
-  selectCriterion,
-  unselectCriterion,
-  excludeEditor,
-  includeEditor
-} from '../actions/filters';
-
-function mapStateToProps(state) {
-  return {
-    imagesUrl: IMAGES_URL,
-    preferenceScreenPanel: state.get('preferenceScreenPanel'),
-    onInstalledDetails: state.get('onInstalledDetails'),
-    criteria: state.get('criteria'),
-    editors: state.get('editors'),
-  };
-}
-
-function mapDispatchToProps(dispatch) {
-  return {
-    openPrefScreen(panel) { dispatch(openPrefScreen(panel)); },
-    closePrefScreen() { dispatch(closePrefScreen()); },
-    uninstall() { dispatch(uninstall()); },
-    selectCriterion(criterion) { dispatch(selectCriterion(criterion)); },
-    unselectCriterion(criterion) { dispatch(unselectCriterion(criterion)); },
-    excludeEditor(editor) { dispatch(excludeEditor(editor)); },
-    includeEditor(editor) { dispatch(includeEditor(editor)); }
-  };
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(PreferenceScreen);
diff --git a/src/app/content/containers/Root.js b/src/app/content/containers/Root.js
deleted file mode 100644
index 7e40066b9..000000000
--- a/src/app/content/containers/Root.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Provider } from 'react-redux';
-import { hot } from 'react-hot-loader';
-import { ThemeProvider } from 'styled-components';
-import App from './App';
-
-const Root = ({ store, theme }) => (
-  <Provider store={store}>
-    <ThemeProvider theme={theme}>
-      <App />
-    </ThemeProvider>
-  </Provider>
-);
-
-Root.propTypes = {
-  store: PropTypes.object.isRequired, // eslint-disable-line
-  theme: PropTypes.object.isRequired, // eslint-disable-line
-};
-
-export default hot(module)(Root);
diff --git a/src/app/content/containers/screens/About.js b/src/app/content/containers/screens/About.js
deleted file mode 100644
index 733f1c1de..000000000
--- a/src/app/content/containers/screens/About.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { connect } from 'react-redux';
-
-import About from '../../components/screens/About';
-import { close } from '../../actions/ui';
-import { EXTENSION_VERSION } from '../../../constants/ui';
-import { getInstallationDate } from '../../selectors';
-
-const mapStateToProps = state => ({
-  extensionVersion: EXTENSION_VERSION,
-  installationDate: getInstallationDate(state)
-});
-
-const mapDispatchToProps = {
-  close,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(About);
diff --git a/src/app/content/containers/screens/Notice/Loading.js b/src/app/content/containers/screens/Notice/Loading.js
deleted file mode 100644
index b563f10f6..000000000
--- a/src/app/content/containers/screens/Notice/Loading.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { connect } from 'react-redux';
-import Loading from '../../../../../components/screens/Loading/Loading';
-import { close } from '../../../actions/ui';
-
-const mapDispatchToProps = {
-  close,
-};
-
-export default connect(null, mapDispatchToProps)(Loading);
diff --git a/src/app/content/containers/screens/index.js b/src/app/content/containers/screens/index.js
deleted file mode 100644
index e488b73f7..000000000
--- a/src/app/content/containers/screens/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as About } from './About';
-export { default as Notice } from './Notice';
diff --git a/src/app/options/OptionRoot.js b/src/app/options/OptionRoot.js
deleted file mode 100644
index eb65a8759..000000000
--- a/src/app/options/OptionRoot.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Provider, connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
-import { ThemeProvider } from 'styled-components';
-
-import OptionScreen from './OptionScreen';
-import {
-  selectCriterion, unselectCriterion, excludeEditor, includeEditor
-} from '../content/actions/filters';
-import { uninstall } from '../content/actions/ui';
-
-import { IMAGES_URL } from '../constants/assetsUrls';
-
-function mapStateToProps(state) {
-  return {
-    imagesUrl: IMAGES_URL,
-    onInstalledDetails: state.get('prefs').get('onInstalledDetails'),
-    criteria: state.get('prefs').get('criteria'),
-    editors: state.get('prefs').get('editors'),
-  };
-}
-
-function mapDispatchToProps(dispatch) {
-  return {
-    uninstall() { dispatch(uninstall()); },
-    selectCriterion(criterion) { dispatch(selectCriterion(criterion)); },
-    unselectCriterion(criterion) { dispatch(unselectCriterion(criterion)); },
-    excludeEditor(editor) { dispatch(excludeEditor(editor)); },
-    includeEditor(editor) { dispatch(includeEditor(editor)); }
-  };
-}
-
-const Options = connect(mapStateToProps, mapDispatchToProps)(OptionScreen);
-
-const OptionRoot = ({ store, theme }) => (
-  <Provider store={store}>
-    <ThemeProvider theme={theme}>
-      <Options />
-    </ThemeProvider>
-  </Provider>
-);
-
-OptionRoot.propTypes = {
-  store: PropTypes.object.isRequired, // eslint-disable-line
-  theme: PropTypes.object.isRequired, // eslint-disable-line
-};
-
-export default hot(module)(OptionRoot);
diff --git a/src/app/options/OptionScreen.js b/src/app/options/OptionScreen.js
deleted file mode 100644
index d43947d7a..000000000
--- a/src/app/options/OptionScreen.js
+++ /dev/null
@@ -1,130 +0,0 @@
-import React, { Component } from 'react';
-
-import { 
-  PREFERENCE_SCREEN_PANEL_ABOUT,
-  PREFERENCE_SCREEN_PANEL_CRITERIA,
-  PREFERENCE_SCREEN_PANEL_SOURCES,
-} from '../constants/ui';
-
-import PreferenceAboutPanel from '../content/components/PreferenceAboutPanel';
-import PreferenceCriteriaPanel from '../content/components/PreferenceCriteriaPanel';
-import PreferenceSourcesPanel from '../content/components/PreferenceSourcesPanel';
-
-function mainClassName(screenPanel) {
-  switch (screenPanel) {
-    case PREFERENCE_SCREEN_PANEL_ABOUT:
-      return 'preference-about';
-    case PREFERENCE_SCREEN_PANEL_CRITERIA:
-      return 'preference-criteria';
-    case PREFERENCE_SCREEN_PANEL_SOURCES:
-      return 'preference-sources';
-    default:
-      return '';
-  }
-}
-
-export default class OptionScreen extends Component {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      screen: PREFERENCE_SCREEN_PANEL_ABOUT
-    };
-  }
-
-  render() {
-    const {
-      imagesUrl, onInstalledDetails, uninstall,
-      criteria, selectCriterion, unselectCriterion,
-      editors, excludeEditor, includeEditor
-    } = this.props;
-
-    const { screen } = this.state;
-
-    let mainContent;
-
-    switch (screen){
-      case PREFERENCE_SCREEN_PANEL_ABOUT:
-        mainContent = (
-          <PreferenceAboutPanel
-            onInstalledDetails={onInstalledDetails}
-            uninstall={uninstall}
-          />
-        );
-        break;
-      case PREFERENCE_SCREEN_PANEL_CRITERIA:
-        mainContent = (
-          <PreferenceCriteriaPanel
-            criteria={criteria}
-            selectCriterion={selectCriterion}
-            unselectCriterion={unselectCriterion}
-            imagesUrl={imagesUrl}
-          />
-        );
-        break;
-      case PREFERENCE_SCREEN_PANEL_SOURCES:
-        mainContent = (
-          <PreferenceSourcesPanel
-            editors={editors}
-            excludeEditor={excludeEditor}
-            includeEditor={includeEditor}
-            imagesUrl={imagesUrl}
-          />
-        );
-        break;
-      default:
-        console.error('Unknown content value', screen);
-    }
-
-    const changePanel = (e) => {
-      const newContent = e.currentTarget.getAttribute('data-panel');
-      this.setState(prevState => ({ ...prevState, screen: newContent }));
-    };
-
-    return (
-      <section className="preference-panel">
-        <nav>
-          <ul>
-            <li className="preference-menu-about">
-              <button
-                type="button"
-                data-panel={PREFERENCE_SCREEN_PANEL_ABOUT}
-                onClick={changePanel}
-                className={'not-button with-image'
-                + (screen === PREFERENCE_SCREEN_PANEL_ABOUT ? ' active' : '')}>
-                <img alt="" className="lmem-controls-picto" src={imagesUrl + 'info.svg'} />
-                <span>Général</span>
-              </button>
-            </li>
-            <li className="preference-menu-criteria">
-              <button
-                type="button"
-                data-panel={PREFERENCE_SCREEN_PANEL_CRITERIA}
-                onClick={changePanel}
-                className={'not-button with-image'
-              + (screen === PREFERENCE_SCREEN_PANEL_CRITERIA ? ' active' : '')}>
-                <img alt="" className="lmem-controls-picto" src={imagesUrl + 'valid.svg'} />
-                <span>Critères de choix</span>
-              </button>
-            </li>
-            <li className="preference-menu-sources">
-              <button
-                type="button"
-                data-panel={PREFERENCE_SCREEN_PANEL_SOURCES}
-                onClick={changePanel}
-                className={'not-button with-image'
-              + (screen === PREFERENCE_SCREEN_PANEL_SOURCES ? ' active' : '')}>
-                <img alt="" className="lmem-controls-picto" src={imagesUrl + 'close.svg'} />
-                <span>Sources d’information</span>
-              </button>
-            </li>
-          </ul>
-        </nav>
-        <div className="separation-bar" />
-        <main className={mainClassName(screen)}>
-          {mainContent}
-        </main>
-      </section>
-    );
-  }
-}
diff --git a/src/app/options/index.js b/src/app/options/index.js
deleted file mode 100644
index 2eef7edc2..000000000
--- a/src/app/options/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react';
-import { render } from 'react-dom';
-
-import OptionRoot from './OptionRoot';
-import theme from '../theme';
-
-const { store } = chrome.extension.getBackgroundPage();
-
-render(<OptionRoot store={store} theme={theme} />, document.getElementById('root'));
diff --git a/src/app/popup/PopupRoot.js b/src/app/popup/PopupRoot.js
deleted file mode 100644
index 44fd77779..000000000
--- a/src/app/popup/PopupRoot.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Provider, connect } from 'react-redux';
-import { hot } from 'react-hot-loader';
-import { ThemeProvider } from 'styled-components';
-
-import PopupScreen from './PopupScreen';
-import { openPrefScreen, popupClick } from '../content/actions/ui';
-
-import { IMAGES_URL } from '../constants/assetsUrls';
-import {
-  PREFERENCE_SCREEN_PANEL_ABOUT,
-  PREFERENCE_SCREEN_PANEL_SOURCES,
-} from '../constants/ui';
-
-function mapStateToProps(state) {
-  return {
-    imagesUrl: IMAGES_URL,
-  };
-}
-
-function mapDispatchToProps(dispatch) {
-  return {
-    openPrefScreenAbout() { dispatch(openPrefScreen(PREFERENCE_SCREEN_PANEL_ABOUT)); },
-    // FIXME there is no reducer on this action, 'panel' is not used
-    openPrefScreenSources() { dispatch(openPrefScreen(PREFERENCE_SCREEN_PANEL_SOURCES)); },
-    onClick(target) { dispatch(popupClick(target)); },
-  };
-}
-
-const Popup = connect(mapStateToProps, mapDispatchToProps)(PopupScreen);
-
-const PopupRoot = ({ store, theme }) => (
-  <Provider store={store}>
-    <ThemeProvider theme={theme}>
-      <Popup />
-    </ThemeProvider>
-  </Provider>
-);
-
-PopupRoot.propTypes = {
-  store: PropTypes.object.isRequired, // eslint-disable-line
-  theme: PropTypes.object.isRequired, // eslint-disable-line
-};
-
-export default hot(module)(PopupRoot);
diff --git a/src/app/popup/PopupScreen.js b/src/app/popup/PopupScreen.js
deleted file mode 100644
index 9bbe47e8c..000000000
--- a/src/app/popup/PopupScreen.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-
-export default function PopupScreen({ imagesUrl, openPrefScreenAbout, onClick }) {
-  function onClickHandler(e) {
-    onClick({
-      name: e.currentTarget.textContent,
-      href: e.currentTarget.href,
-    });
-  }
-
-  function onOpenPrefsHandler(e) {
-    onClick({
-      name: e.currentTarget.textContent,
-    });
-    openPrefScreenAbout();
-  }
-
-  return (
-    <div className="lmem-popup-content">
-      <section className="popup-highlight">
-        <p>
-          Si l’assistant ne s’affiche pas en bas de page, c’est qu’aucune de vos sources de recommandation
-          n’a posté de message sur cette page.
-        </p>
-        <footer className="lmem-popup-footer">
-          <a className="with-image" href="https://choisir.lmem.net/apparition-assistant/" target="_blank" rel="noopener noreferrer" onClick={onClickHandler}>
-            <img alt="" className="picto" src={imagesUrl + 'info.svg'} />
-            <span>Découvrir où et quand l’assistant s’affiche</span>
-          </a>
-          <a className="with-image" href="https://choisir.lmem.net/demander-un-conseil/" target="_blank" rel="noopener noreferrer" onClick={onClickHandler}>
-            <img alt="" className="picto" src={imagesUrl + 'discuss.svg'} />
-            <span>Demander de l’aide sur un forum</span>
-          </a>
-        </footer>
-      </section>
-      <nav className="lmem-popup-controls">
-        <ul>
-          <li>
-            <a
-              className="button-hollow with-image"
-              href="https://form.jotformeu.com/82702852284358"
-              target="_blank"
-              rel="noopener noreferrer"
-              onClick={onClickHandler}>
-              <img
-                alt=""
-                style={{
-                  transform: 'rotate(45deg) scale(.9)'
-                }}
-                className="picto"
-                src={imagesUrl + 'close.svg'} />
-              <span>Poster un nouveau message</span>
-            </a>
-          </li>
-          <li>
-            <a className="button-hollow with-image" onClick={onOpenPrefsHandler} href>
-              <img alt="" className="picto" src={imagesUrl + 'settings.svg'} />
-              <span>Préférences</span>
-            </a>
-          </li>
-          <li>
-            <a className="button-hollow with-image" onClick={onClickHandler} href="https://choisir.lmem.net/questions-frequentes-aide/" target="_blank" rel="noopener noreferrer">
-              <img alt="" className="picto" src={imagesUrl + 'help.svg'} />
-              <span>Questions fréquentes, aide</span>
-            </a>
-          </li>
-        </ul>
-      </nav>
-    </div>
-  );
-}
-
diff --git a/src/app/popup/index.js b/src/app/popup/index.js
deleted file mode 100644
index ecae2d2bb..000000000
--- a/src/app/popup/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react';
-import { render } from 'react-dom';
-
-import PopupRoot from './PopupRoot';
-import theme from '../theme';
-
-const { store } = chrome.extension.getBackgroundPage();
-
-render(<PopupRoot store={store} theme={theme} />, document.getElementById('root'));
diff --git a/src/app/sandbox/Sandbox.js b/src/app/sandbox/Sandbox.js
deleted file mode 100644
index 187ec51f0..000000000
--- a/src/app/sandbox/Sandbox.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import { ThemeProvider } from 'styled-components';
-import { hot, setConfig } from 'react-hot-loader';
-import 'typeface-lato';
-import 'typeface-sedgwick-ave';
-import theme from '../theme';
-import { NotificationNavigation } from '../../components/organisms';
-
-const Sandbox = () => (
-  <ThemeProvider theme={theme}>
-    <NotificationNavigation />
-  </ThemeProvider>
-);
-
-setConfig({ logLevel: 'debug' });
-
-export default hot(module)(Sandbox);
diff --git a/src/app/sandbox/index.js b/src/app/sandbox/index.js
deleted file mode 100644
index 2e5f13fec..000000000
--- a/src/app/sandbox/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from 'react';
-import { render } from 'react-dom';
-import Sandbox from './Sandbox';
-
-const root = document.createElement('div');
-document.body.appendChild(root);
-
-render(<Sandbox />, root);
diff --git a/src/components/atoms/About/index.js b/src/components/atoms/About/index.js
deleted file mode 100644
index 59d18bc21..000000000
--- a/src/components/atoms/About/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as Container } from './Container';
-export { default as ContentTitle } from './ContentTitle';
-export { default as Content } from './Content';
\ No newline at end of file
diff --git a/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.js b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.js
index 5dae90b0c..f11b8bcd5 100644
--- a/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.js
+++ b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.js
@@ -27,8 +27,10 @@ const Button = styled(BorderButton)`
     }
 `;
 
-export default () => (
-  <Button>
+export default ({
+  href, as, target, rel
+}) => (
+  <Button href={href} as={as} target={target} rel={rel}>
     <AddIcon />
     Créer votre notification
   </Button>
diff --git a/src/components/atoms/ContentTitle/ContentTitle.stories.jsx b/src/components/atoms/ContentTitle/ContentTitle.stories.jsx
index e7d646a51..3fbcc12c1 100644
--- a/src/components/atoms/ContentTitle/ContentTitle.stories.jsx
+++ b/src/components/atoms/ContentTitle/ContentTitle.stories.jsx
@@ -1,7 +1,7 @@
 import { storiesOf } from '@storybook/react';
 import { withKnobs, text } from '@storybook/addon-knobs';
 import React from 'react';
-import ContentTitle from './ContentTitle';
+import ContentTitle from '.';
 
 storiesOf('atoms/ContentTitle', module)
   .addDecorator(withKnobs)
diff --git a/src/components/atoms/ContentTitle/ContentTitle.js b/src/components/atoms/ContentTitle/index.js
similarity index 100%
rename from src/components/atoms/ContentTitle/ContentTitle.js
rename to src/components/atoms/ContentTitle/index.js
diff --git a/src/components/atoms/Forms/Form.js b/src/components/atoms/Forms/Form.js
deleted file mode 100644
index b510956b3..000000000
--- a/src/components/atoms/Forms/Form.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.form`
-    
-    & textarea {
-        font-style: italic;
-    }
-`;
\ No newline at end of file
diff --git a/src/components/atoms/Forms/Textarea/Textarea.js b/src/components/atoms/Forms/Textarea/Textarea.js
index 001f6b267..bc9f8e770 100644
--- a/src/components/atoms/Forms/Textarea/Textarea.js
+++ b/src/components/atoms/Forms/Textarea/Textarea.js
@@ -10,4 +10,5 @@ export default styled.textarea`
     border-radius: 6px;
     border: 1px solid ${props => props.theme.secondaryColor};
     resize: none;
-`;
\ No newline at end of file
+    font-style: italic;
+`;
diff --git a/src/components/atoms/Forms/index.js b/src/components/atoms/Forms/index.js
index 9b5eb9a18..d90dddf43 100644
--- a/src/components/atoms/Forms/index.js
+++ b/src/components/atoms/Forms/index.js
@@ -1,2 +1,2 @@
 export { default as Textarea } from './Textarea/Textarea';
-export { default as Form } from './Form';
\ No newline at end of file
+
diff --git a/src/components/atoms/index.js b/src/components/atoms/index.js
index c5c28c28e..e575d4bcb 100644
--- a/src/components/atoms/index.js
+++ b/src/components/atoms/index.js
@@ -1,5 +1,3 @@
-export { default as GlobalStyle } from './GlobalStyle';
-export { default as NotificationContainer } from './NotificationContainer';
 export { default as Truncated } from './Truncated';
 
 export { default as Button } from './Button';
@@ -8,8 +6,6 @@ export { default as BorderButton } from './Buttons/BorderButton';
 export { default as OpenButton } from './Buttons/OpenButton/OpenButton';
 
 export { default as CenterContainer } from './CenterContainer';
-export { default as ContentTitle } from './ContentTitle/ContentTitle';
-export { default as ContentTitleTop } from './ContentTitle/ContentTitleTop';
 export { default as Contributor } from './Contributor';
 export { default as Time } from './Time';
 export { default as List } from './List';
diff --git a/src/components/molecules/AddNotice.js b/src/components/molecules/AddNotice.js
index 2ab2ced0b..e4c5b25df 100644
--- a/src/components/molecules/AddNotice.js
+++ b/src/components/molecules/AddNotice.js
@@ -1,20 +1,11 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { AddNoticeLink, CenterContainer, } from '../atoms';
 
-
-const AddNotice = ({ onClick, ...props }) => (
+const AddNotice = ({ ...props }) => (
   <CenterContainer>
-    <AddNoticeLink onClick={onClick} />
+    <AddNoticeLink {...props} />
   </CenterContainer>
 );
 
-AddNotice.propTypes = {
-  onClick: PropTypes.func,
-};
-
-AddNotice.defaultProps = {
-  onClick: () => { },
-};
 
 export default AddNotice;
diff --git a/src/components/molecules/NotificationFooter/AccountIcon.js b/src/components/molecules/NotificationFooter/AccountIcon.js
deleted file mode 100644
index aa331e230..000000000
--- a/src/components/molecules/NotificationFooter/AccountIcon.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/* eslint-disable max-len */
-import React from 'react';
-
-export default () => (
-  <svg viewBox="0 0 24.715 28.008">
-    <path
-      d="M24.713 21.79v-.01-.1-.068c-.034-1.133-.125-4.141-2.931-5.1l-.063-.019-.032-.003a23.323 23.323 0 0 1-4.942-2.274c.045-.048.09-.1.134-.146 2.328-2.625 1.987-7.021 1.933-7.574-.158-3.3-1.739-4.875-3.038-5.618A6.908 6.908 0 0 0 12.426 0h-.1a6.9 6.9 0 0 0-3.339.852c-1.321.746-2.922 2.33-3.079 5.638-.053.553-.393 4.95 1.933 7.573.048.055.1.108.148.16a24.57 24.57 0 0 1-4.952 2.253 1.153 1.153 0 0 0-.084.024h-.014c-2.807.963-2.9 3.966-2.932 5.105v.104a.458.458 0 0 0 0 .056v.009a9.154 9.154 0 0 0 .325 2.8 1.193 1.193 0 0 0 .481.586 22.468 22.468 0 0 0 11.554 2.848 22.489 22.489 0 0 0 11.561-2.844 1.234 1.234 0 0 0 .479-.586 9.57 9.57 0 0 0 .306-2.788zM8.369 6.643c.168-3.623 2.547-4.163 3.95-4.163h.059c1.719.039 3.8.792 3.96 4.158a.56.56 0 0 0 .011.117c.031.348.291 3.856-1.323 5.674a3.324 3.324 0 0 1-2.639 1.086h-.053a3.348 3.348 0 0 1-2.647-1.087c-1.681-1.889-1.335-5.608-1.326-5.7v-.011a.487.487 0 0 0 .008-.074zm2.018 9.061a6.8 6.8 0 0 0 1.875.286h.193a6.736 6.736 0 0 0 1.907-.3 30.97 30.97 0 0 0 6.656 3.177c.954.351 1.175 1.34 1.221 2.818 0 .05 0 .1.006.165a11.68 11.68 0 0 1-.08 1.472 21.017 21.017 0 0 1-9.805 2.213 21.135 21.135 0 0 1-9.811-2.22 10.517 10.517 0 0 1-.078-1.5v-.042-.1c.047-1.478.268-2.468 1.221-2.818a32.175 32.175 0 0 0 6.695-3.151z" />
-  </svg>
-
-);
\ No newline at end of file
diff --git a/src/components/molecules/NotificationFooter/BubbleIcon.js b/src/components/molecules/NotificationFooter/BubbleIcon.js
deleted file mode 100644
index 80a621af2..000000000
--- a/src/components/molecules/NotificationFooter/BubbleIcon.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* eslint-disable max-len */
-import React from 'react';
-
-export default () => (
-  <svg viewBox="0 0 27.621 25.227">
-    <defs />
-    <g transform="translate(.48)">
-      <path
-        d="M23.571 0H13.358a3.6 3.6 0 0 0-3.619 3.573V7.7H3.128A3.607 3.607 0 0 0-.48 11.3v7.5a3.59 3.59 0 0 0 3.608 3.563h9.252l2.817 2.584a1.038 1.038 0 0 0 .7.279.993.993 0 0 0 .413-.085 1.031 1.031 0 0 0 .61-.941v-7.849a1.037 1.037 0 0 0-2.073 0v5.489l-1.373-1.265a1.037 1.037 0 0 0-.694-.285H3.128a1.515 1.515 0 0 1-1.535-1.49v-7.5a1.531 1.531 0 0 1 1.535-1.524h6.611v6.7a1.052 1.052 0 0 0 1.756.766l2.446-2.229.083-.076.093-.084.209-.19H23.571a3.583 3.583 0 0 0 3.57-3.588v-7.5A3.576 3.576 0 0 0 23.571 0zm1.5 3.573v7.5a1.507 1.507 0 0 1-1.5 1.514h-9.033a2.027 2.027 0 0 0-1.825.735c-.02.019-.044.038-.068.057s-.076.063-.111.1l-.721.652V3.573a1.525 1.525 0 0 1 1.546-1.5h10.212a1.482 1.482 0 0 1 1.497 1.5z"
-      />
-      <circle
-        cx=".657"
-        cy=".657"
-        r=".657"
-        className="a"
-        transform="rotate(-13.286 63.397 -13.8)"
-      />
-      <circle
-        cx=".657"
-        cy=".657"
-        r=".657"
-        transform="rotate(-45 21.26 -1.173)"
-      />
-      <circle
-        cx=".657"
-        cy=".657"
-        r=".657"
-        transform="rotate(-45 16.474 -14.677)"
-      />
-      <circle
-        cx=".657"
-        cy=".657"
-        r=".657"
-        transform="rotate(-13.286 38.285 -72.421)"
-      />
-      <circle
-        cx=".657"
-        cy=".657"
-        r=".657"
-        transform="rotate(-45 18.801 -20.296)"
-      />
-    </g>
-  </svg>
-);
\ No newline at end of file
diff --git a/src/components/molecules/NotificationFooter/HelpIcon.js b/src/components/molecules/NotificationFooter/HelpIcon.js
deleted file mode 100644
index 031a72386..000000000
--- a/src/components/molecules/NotificationFooter/HelpIcon.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/* eslint-disable max-len */
-import React from 'react';
-
-export default () => (
-  <svg viewBox="0 0 27.807 27.807">
-    <path 
-      d="M13.9 0a13.9 13.9 0 1 0 13.9 13.9A13.9 13.9 0 0 0 13.9 0zm0 25.634A11.731 11.731 0 1 1 25.634 13.9 11.724 11.724 0 0 1 13.9 25.634zm4.345-14.31a4.352 4.352 0 0 1-3.259 4.207V17.3a1.086 1.086 0 0 1-2.172 0v-2.718A1.086 1.086 0 0 1 13.9 13.5a2.172 2.172 0 1 0-2.172-2.172 1.086 1.086 0 0 1-2.172 0 4.345 4.345 0 1 1 8.689 0zm-2.987 9.233A1.358 1.358 0 1 1 13.9 19.2a1.358 1.358 0 0 1 1.361 1.356z" />
-  </svg>
-
-);
\ No newline at end of file
diff --git a/src/components/molecules/index.js b/src/components/molecules/index.js
index b89c59973..d7dc104df 100644
--- a/src/components/molecules/index.js
+++ b/src/components/molecules/index.js
@@ -1,4 +1 @@
 export { default as AddNotice } from './AddNotice';
-export { default as NoNotice } from './NoNotice/NoNotice';
-export { default as NotificationFooter } from './NotificationFooter';
-export { default as NotificationHeader } from './NotificationHeader/NotificationHeader';
\ No newline at end of file
diff --git a/src/components/atoms/NotificationContainer.js b/src/components/organisms/Notification/Container.js
similarity index 63%
rename from src/components/atoms/NotificationContainer.js
rename to src/components/organisms/Notification/Container.js
index 018b4e8a7..edb70f2f1 100644
--- a/src/components/atoms/NotificationContainer.js
+++ b/src/components/organisms/Notification/Container.js
@@ -15,20 +15,4 @@ export const Section = styled.section`
     box-shadow: 0 3px 6px 0 rgba(0,0,0,.58);
 `;
 
-export const Container = ({ open, ...props }) => {
-  if (!open) {
-    return null;
-  }
-
-  return (<Section {...props} />);
-};
-
-Container.propTypes = {
-  open: PropTypes.bool,
-};
-
-Container.defaultProps = {
-  open: true,
-};
-
-export default Container;
\ No newline at end of file
+export default Section;
diff --git a/src/components/atoms/ContentTitle/ContentTitleTop.js b/src/components/organisms/Notification/ContentTitleTop.js
similarity index 62%
rename from src/components/atoms/ContentTitle/ContentTitleTop.js
rename to src/components/organisms/Notification/ContentTitleTop.js
index 27bebe020..3f2c84bd1 100644
--- a/src/components/atoms/ContentTitle/ContentTitleTop.js
+++ b/src/components/organisms/Notification/ContentTitleTop.js
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
-import ContentTitle from './ContentTitle';
+import ContentTitle from 'components/atoms/ContentTitle';
 
 export default styled(ContentTitle)`
     margin: 12px 0 0;
-`;
\ No newline at end of file
+`;
diff --git a/src/components/organisms/Notification/Main.js b/src/components/organisms/Notification/Main.js
index 0e76e8c8d..d1d0a0c83 100644
--- a/src/components/organisms/Notification/Main.js
+++ b/src/components/organisms/Notification/Main.js
@@ -3,5 +3,5 @@ import styled from 'styled-components';
 export default styled.main` 
   position: relative;
   height: 342px;
-  background-color: ${props => (props.notices ? props.theme.listBg : props.theme.accountListBg)};
-`;
\ No newline at end of file
+  background-color: ${props => (props.hasNotices ? props.theme.listBg : props.theme.accountListBg)};
+`;
diff --git a/src/components/organisms/Notification/Notification.js b/src/components/organisms/Notification/Notification.js
deleted file mode 100644
index 625d7429b..000000000
--- a/src/components/organisms/Notification/Notification.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import React, { Fragment, PureComponent} from 'react';
-import PropTypes from 'prop-types';
-import { NotificationHeader, NotificationFooter } from '../../molecules';
-import Notice from '../Notice/Notice';
-import NoticeDetails from '../NoticeDetails/NoticeDetails';
-import isChildInstanceOf from '../../../app/utils/isChildInstanceOf';
-import Main from './Main';
-
-export default class Notification extends PureComponent {
-  static propTypes = {
-    title: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
-    close: PropTypes.func,
-    onBack: PropTypes.func,
-    children: PropTypes.node.isRequired,
-    details: PropTypes.bool,
-    closed: PropTypes.bool,
-  };
-
-  static defaultProps = {
-    title: null,
-    details: false,
-    close: null,
-    onBack: null,
-    closed: false,
-  };
-
-  renderChildren() {
-    const { children, details } = this.props;
-
-    return React.Children.map(children, (child) => {
-      if (isChildInstanceOf(child)(Notice)) {
-        return React.cloneElement(child, {
-          ...child.props,
-          details,
-        });
-      }
-
-      return child;
-    });
-  }
-
-  get hasNotices() {
-    const { children } = this.props;
-
-    return React
-      .Children
-      .toArray(children)
-      .some(child => isChildInstanceOf(child)(Notice) || isChildInstanceOf(child)(NoticeDetails));
-  }
-
-  render() {
-    const {
-      title, close, onBack, closed
-    } = this.props;
-
-    if (closed) {
-      return null;
-    }
-
-    return (
-      <Fragment>
-        <NotificationHeader title={title} close={close} goBack={onBack} />
-        <Main notices={this.hasNotices}>
-          {this.renderChildren()}
-        </Main>
-        <NotificationFooter />
-      </Fragment>
-    );
-  }
-}
diff --git a/src/components/organisms/Notification/Notification.stories.jsx b/src/components/organisms/Notification/Notification.stories.jsx
index 8abe68cf5..c5a687845 100644
--- a/src/components/organisms/Notification/Notification.stories.jsx
+++ b/src/components/organisms/Notification/Notification.stories.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
-import Notification from './Notification';
+import Notification from '.';
 
 storiesOf('organisms/Notification', module)
   .add('normal', () => (
diff --git a/src/app/content/components/NotificationFooter/AccountIcon.js b/src/components/organisms/Notification/NotificationFooter/AccountIcon.js
similarity index 100%
rename from src/app/content/components/NotificationFooter/AccountIcon.js
rename to src/components/organisms/Notification/NotificationFooter/AccountIcon.js
diff --git a/src/app/content/components/NotificationFooter/BubbleIcon.js b/src/components/organisms/Notification/NotificationFooter/BubbleIcon.js
similarity index 100%
rename from src/app/content/components/NotificationFooter/BubbleIcon.js
rename to src/components/organisms/Notification/NotificationFooter/BubbleIcon.js
diff --git a/src/components/molecules/NotificationFooter/CheckListIcon.js b/src/components/organisms/Notification/NotificationFooter/CheckListIcon.js
similarity index 100%
rename from src/components/molecules/NotificationFooter/CheckListIcon.js
rename to src/components/organisms/Notification/NotificationFooter/CheckListIcon.js
diff --git a/src/components/molecules/NotificationFooter/FooterContainer.js b/src/components/organisms/Notification/NotificationFooter/FooterContainer.js
similarity index 100%
rename from src/components/molecules/NotificationFooter/FooterContainer.js
rename to src/components/organisms/Notification/NotificationFooter/FooterContainer.js
diff --git a/src/app/content/components/NotificationFooter/HelpIcon.js b/src/components/organisms/Notification/NotificationFooter/HelpIcon.js
similarity index 100%
rename from src/app/content/components/NotificationFooter/HelpIcon.js
rename to src/components/organisms/Notification/NotificationFooter/HelpIcon.js
diff --git a/src/components/molecules/NotificationFooter/NavLink.js b/src/components/organisms/Notification/NotificationFooter/NavLink.js
similarity index 100%
rename from src/components/molecules/NotificationFooter/NavLink.js
rename to src/components/organisms/Notification/NotificationFooter/NavLink.js
diff --git a/src/components/molecules/NotificationFooter/NotificationFooter.js b/src/components/organisms/Notification/NotificationFooter/NotificationFooter.js
similarity index 100%
rename from src/components/molecules/NotificationFooter/NotificationFooter.js
rename to src/components/organisms/Notification/NotificationFooter/NotificationFooter.js
diff --git a/src/components/molecules/NotificationFooter/NotificationFooter.stories.jsx b/src/components/organisms/Notification/NotificationFooter/NotificationFooter.stories.jsx
similarity index 100%
rename from src/components/molecules/NotificationFooter/NotificationFooter.stories.jsx
rename to src/components/organisms/Notification/NotificationFooter/NotificationFooter.stories.jsx
diff --git a/src/components/molecules/NotificationFooter/index.js b/src/components/organisms/Notification/NotificationFooter/index.js
similarity index 100%
rename from src/components/molecules/NotificationFooter/index.js
rename to src/components/organisms/Notification/NotificationFooter/index.js
diff --git a/src/components/molecules/NotificationHeader/BackButton.js b/src/components/organisms/Notification/NotificationHeader/BackButton.js
similarity index 69%
rename from src/components/molecules/NotificationHeader/BackButton.js
rename to src/components/organisms/Notification/NotificationHeader/BackButton.js
index 857f975f0..80dcb3142 100644
--- a/src/components/molecules/NotificationHeader/BackButton.js
+++ b/src/components/organisms/Notification/NotificationHeader/BackButton.js
@@ -1,11 +1,10 @@
 import React from 'react';
 import styled from 'styled-components';
-import Button from '../../atoms/Button';
-import ArrowIcon from '../../atoms/icons/Arrow';
+import Button from 'components/atoms/Button';
+import ArrowIcon from 'components/atoms/icons/Arrow';
 
 export default styled(Button).attrs({ children: <ArrowIcon /> })`
     height: 30px;
     padding-right: 10px;
     stroke: ${props => props.theme.activeColor};
 `;
-
diff --git a/src/components/molecules/NotificationHeader/CloseButton.js b/src/components/organisms/Notification/NotificationHeader/CloseButton.js
similarity index 70%
rename from src/components/molecules/NotificationHeader/CloseButton.js
rename to src/components/organisms/Notification/NotificationHeader/CloseButton.js
index 7d85e27b5..469a8f6b2 100644
--- a/src/components/molecules/NotificationHeader/CloseButton.js
+++ b/src/components/organisms/Notification/NotificationHeader/CloseButton.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
-import Button from '../../atoms/Button';
-import CloseIcon from '../../atoms/icons/Close';
+import Button from 'components/atoms/Button';
+import CloseIcon from 'components/atoms/icons/Close';
 
 export default styled(Button).attrs({ children: <CloseIcon /> })`
    margin-left: auto;
diff --git a/src/components/molecules/NotificationHeader/Container.js b/src/components/organisms/Notification/NotificationHeader/Container.js
similarity index 100%
rename from src/components/molecules/NotificationHeader/Container.js
rename to src/components/organisms/Notification/NotificationHeader/Container.js
diff --git a/src/components/molecules/NotificationHeader/LogoContainer.js b/src/components/organisms/Notification/NotificationHeader/LogoContainer.js
similarity index 100%
rename from src/components/molecules/NotificationHeader/LogoContainer.js
rename to src/components/organisms/Notification/NotificationHeader/LogoContainer.js
diff --git a/src/components/molecules/NotificationHeader/LogoImg.js b/src/components/organisms/Notification/NotificationHeader/LogoImg.js
similarity index 100%
rename from src/components/molecules/NotificationHeader/LogoImg.js
rename to src/components/organisms/Notification/NotificationHeader/LogoImg.js
diff --git a/src/components/molecules/NotificationHeader/NotificationHeader.stories.jsx b/src/components/organisms/Notification/NotificationHeader/NotificationHeader.stories.jsx
similarity index 93%
rename from src/components/molecules/NotificationHeader/NotificationHeader.stories.jsx
rename to src/components/organisms/Notification/NotificationHeader/NotificationHeader.stories.jsx
index 5a4660ce9..16a580c41 100644
--- a/src/components/molecules/NotificationHeader/NotificationHeader.stories.jsx
+++ b/src/components/organisms/Notification/NotificationHeader/NotificationHeader.stories.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
-import NotificationHeader from './NotificationHeader';
+import NotificationHeader from '.';
 
 storiesOf('molecules/NotificationHeader', module)
   .add('normal', () => (
diff --git a/src/components/molecules/NotificationHeader/Title.js b/src/components/organisms/Notification/NotificationHeader/Title.js
similarity index 100%
rename from src/components/molecules/NotificationHeader/Title.js
rename to src/components/organisms/Notification/NotificationHeader/Title.js
diff --git a/src/components/molecules/NotificationHeader/NotificationHeader.js b/src/components/organisms/Notification/NotificationHeader/index.js
similarity index 89%
rename from src/components/molecules/NotificationHeader/NotificationHeader.js
rename to src/components/organisms/Notification/NotificationHeader/index.js
index 8431e4d87..218056334 100644
--- a/src/components/molecules/NotificationHeader/NotificationHeader.js
+++ b/src/components/organisms/Notification/NotificationHeader/index.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { withRouter } from 'react-router';
-import { truncateButPreserveWords } from '../../../app/utils/truncate';
-import removeHtml from '../../../app/utils/removeHtml';
+import { truncateButPreserveWords } from 'app/utils/truncate';
+import removeHtml from 'app/utils/removeHtml';
 import Container from './Container';
 import LogoContainer from './LogoContainer';
 import LogoImg from './LogoImg';
diff --git a/src/components/organisms/Notification/index.jsx b/src/components/organisms/Notification/index.jsx
new file mode 100644
index 000000000..f56e8f4a1
--- /dev/null
+++ b/src/components/organisms/Notification/index.jsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import ContentTitleTop from './ContentTitleTop';
+import NotificationContainer from './Container';
+import NotificationHeader from './NotificationHeader';
+import NotificationFooter from './NotificationFooter';
+import Main from './Main';
+
+export const Notification = ({
+  title, contentTitle, close, onBack, closed, hasNotices, children
+}) => (
+  closed
+    ? null
+    : (
+      <NotificationContainer>
+        <NotificationHeader title={title} close={close} goBack={onBack} />
+        <Main hasNotices={hasNotices}>
+          <ContentTitleTop>{contentTitle}</ContentTitleTop>
+          {children}
+        </Main>
+        <NotificationFooter />
+      </NotificationContainer>
+    )
+);
+
+export default Notification;
diff --git a/src/components/organisms/NotificationNavigation.js b/src/components/organisms/NotificationNavigation.js
deleted file mode 100644
index 2524325b7..000000000
--- a/src/components/organisms/NotificationNavigation.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-import {
-  MemoryRouter as Router, Redirect, Route, Switch
-} from 'react-router-dom';
-import { NotificationContainer } from '../atoms';
-import { NotificationFooter } from '../molecules';
-import {
-  Account, Notice, Help, Subscriptions, Error
-} from '../screens';
-
-export default () => (
-  <Router>
-    <NotificationContainer>
-      <Switch>
-        <Redirect exact path="/" to="/notices" />
-        <Route path="/notices" component={Notice} />
-        <Route path="/subscriptions" component={Subscriptions} />
-        <Route path="/help" component={Help} />
-        <Route path="/account" component={Account} />
-        <Route component={Error} />
-      </Switch>
-      <NotificationFooter />
-    </NotificationContainer>
-  </Router>
-);
\ No newline at end of file
diff --git a/src/components/organisms/index.js b/src/components/organisms/index.js
index e55a06068..5b533cbb8 100644
--- a/src/components/organisms/index.js
+++ b/src/components/organisms/index.js
@@ -1,4 +1,3 @@
 export { default as Notice } from './Notice/Notice';
-export { default as Notification } from './Notification/Notification';
-export { default as NotificationNavigation } from './NotificationNavigation';
-export { default as NoticeDetails } from './NoticeDetails/NoticeDetails';
\ No newline at end of file
+export { default as Notification } from './Notification';
+export { default as NoticeDetails } from './NoticeDetails/NoticeDetails';
diff --git a/src/components/screens/Account/About/About.js b/src/components/screens/Account/About/About.js
deleted file mode 100644
index 5f354f5b7..000000000
--- a/src/components/screens/Account/About/About.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Container, Content, ContentTitle } from '../../../atoms/About';
-import { ExternalLink, Time } from '../../../atoms';
-import { Notification } from '../../../organisms';
-
-const About = ({ close, installationDate, extensionVersion }) => (
-  <Notification title="À propos" close={close}>
-    <Container>
-      <ContentTitle>
-Le Même En Mieux V
-        {extensionVersion}
-      </ContentTitle>
-      <Content>
-        Bulles vous permet de lire et poster des messages directement sur toutes les pages du web.
-        Chacun reçoit ainsi les messages de ses amis, média et experts préférés au moment où il en besoin.
-      </Content>
-
-      <Content>
-        Vous avez installé le compagnon Bulles le 
-        {' '}
-        <Time>{installationDate}</Time>
-.
-      </Content>
-
-      <nav>
-        <ExternalLink href="https://www.lmem.net/contact.html">Contact</ExternalLink>
-        &nbsp;
-        -
-        &nbsp;
-        <ExternalLink href="https://choisir.lmem.net/desinstaller-meme-mieux/">Désinstaller</ExternalLink>
-      </nav>
-    </Container>
-  </Notification>
-);
-
-About.propTypes = {
-  close: PropTypes.func,
-  installationDate: PropTypes.string,
-  extensionVersion: PropTypes.string,
-};
-
-About.defaultProps = {
-  close: () => {},
-  installationDate: (new Date()).toString(),
-  extensionVersion: '0.0.0'
-};
-
-export default About;
diff --git a/src/components/screens/Account/Filters/Filters.js b/src/components/screens/Account/Filters/Filters.js
deleted file mode 100644
index cc4f9b7d0..000000000
--- a/src/components/screens/Account/Filters/Filters.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react';
-import { ContentTitleTop } from '../../../atoms';
-import { Notification } from '../../../organisms';
-
-export default ({ close }) => (
-  <Notification title="Mes Filtres" close={close}>
-    <ContentTitleTop>Mes filtres</ContentTitleTop>
-  </Notification>
-);
diff --git a/src/components/screens/Account/Filters/Filters.stories.jsx b/src/components/screens/Account/Filters/Filters.stories.jsx
deleted file mode 100644
index b974bd24e..000000000
--- a/src/components/screens/Account/Filters/Filters.stories.jsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../../app/theme';
-import Filters from './Filters';
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
-
-const Wrapper = styled.div`
-  width: 384px;
-  height: 414px;
-`;
-
-storiesOf('screens/Filters', module)
-  .addDecorator(getStory => (
-    <div>
-      <Global />
-      <Router>
-        <ThemeProvider theme={theme}>
-          <Wrapper>
-            {getStory()}
-          </Wrapper>
-        </ThemeProvider>
-      </Router>
-    </div>
-  ))
-  .add('normal', () => <Filters />);
diff --git a/src/components/screens/Error/Error.stories.jsx b/src/components/screens/Error/Error.stories.jsx
deleted file mode 100644
index 45b673d0a..000000000
--- a/src/components/screens/Error/Error.stories.jsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../app/theme';
-import Error from './Error';
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
-
-const Wrapper = styled.div`
-  width: 384px;
-  height: 414px;
-`;
-
-storiesOf('screens/Error', module)
-  .addDecorator(getStory => (
-    <div>
-      <Global />
-      <Router>
-        <ThemeProvider theme={theme}>
-          <Wrapper>
-            {getStory()}
-          </Wrapper>
-        </ThemeProvider>
-      </Router>
-    </div>
-  ))
-  .add('normal', () => <Error />);
diff --git a/src/components/screens/Help/Help.stories.jsx b/src/components/screens/Help/Help.stories.jsx
deleted file mode 100644
index aaf7f5769..000000000
--- a/src/components/screens/Help/Help.stories.jsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import { action } from '@storybook/addon-actions';
-import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../app/theme';
-import Help from './Help';
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
-
-const Wrapper = styled.div`
-  width: 384px;
-  height: 414px;
-`;
-
-storiesOf('screens/Help', module)
-  .addDecorator(getStory => (
-    <div>
-      <Global />
-      <Router>
-        <ThemeProvider theme={theme}>
-          <Wrapper>
-            {getStory()}
-          </Wrapper>
-        </ThemeProvider>
-      </Router>
-    </div>
-  ))
-  .add('normal', () => <Help />);
diff --git a/src/components/screens/Loading/Loading.stories.jsx b/src/components/screens/Loading/Loading.stories.jsx
deleted file mode 100644
index b723b40e1..000000000
--- a/src/components/screens/Loading/Loading.stories.jsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import { action } from '@storybook/addon-actions';
-import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../app/theme';
-import Loading from './Loading';
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
-
-const Wrapper = styled.div`
-  width: 384px;
-  height: 414px;
-`;
-
-storiesOf('screens/Loading', module)
-  .addDecorator(getStory => (
-    <div>
-      <Global />
-      <Router>
-        <ThemeProvider theme={theme}>
-          <Wrapper>
-            {getStory()}
-          </Wrapper>
-        </ThemeProvider>
-      </Router>
-    </div>
-  ))
-  .add('normal', () => <Loading close={action('close')} />);
diff --git a/src/components/screens/Notice/Details.js b/src/components/screens/Notice/Details.js
deleted file mode 100644
index de9d01d1a..000000000
--- a/src/components/screens/Notice/Details.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-import {NoticeDetails, Notification} from '../../organisms';
-
-const message = 'L’économie est (vraiment) un sport de combat : “La boule puante de MM. Cahuc et Zylberberg '
-    + 'contre le “négationnisme” des économistes critiques le confirme : le combat idéologique '
-    + 'tombe parfois dans le caniveau. Depuis vingt ans pourtant, s’est construit en France une '
-    + 'contre-expertise économique crédible qui veut fournir aux dominés des outils pour penser '
-    + '(et résister à) la pseudo”';
-
-
-export default ({ close }) => (
-  <Notification title="Détail de la notice" close={close}>
-    <NoticeDetails
-      id={1}
-      type="Tip"
-      date="03 déc. 2018"
-      message={message}
-      contributor="Le Même en Mieux"
-      source="https://forum.quechoisir.org/pixmania-avis-1285"
-      likes={21}
-      dislikes={3}
-      details
-    />
-  </Notification>
-);
diff --git a/src/components/screens/Notice/Empty.js b/src/components/screens/Notice/Empty.js
deleted file mode 100644
index 268cc8645..000000000
--- a/src/components/screens/Notice/Empty.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import { NoNotice } from '../../atoms/icons/illustrations';
-import { NoNoticeTitle, NoNoticeImg } from '../../atoms/Notification';
-import { AddNotice } from '../../molecules';
-import { Notification } from '../../organisms';
-
-export default ({ close }) => {
-  return (
-    <Notification close={close}>
-      <NoNoticeImg>
-        <NoNotice />
-      </NoNoticeImg>
-
-      <NoNoticeTitle>Il n’y a plus de notifications ici</NoNoticeTitle>
-
-      <AddNotice />
-    </Notification>
-  );
-};
diff --git a/src/components/screens/Notice/List.js b/src/components/screens/Notice/List.js
deleted file mode 100644
index 9797b662c..000000000
--- a/src/components/screens/Notice/List.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react';
-import { ContentTitleTop } from '../../atoms';
-import { AddNotice} from '../../molecules';
-import { Notification, Notice} from '../../organisms';
-
-const message = 'De nombreux clients mécontents de Pixmania et ses vendeurs s’expriment sur les '
-    + 'réseaux sociaux depuis 2016. Les plaintes continuent en 2017 et 2018 si l’on se réfère au forum Que Choisir.';
-
-export default ({ match, close }) => {
-  return (
-    <Notification close={close}>
-      <ContentTitleTop>Notifications pour cette page</ContentTitleTop>
-      <Notice
-        id={1}
-        match={match}
-        type="Tip"
-        message={message}
-        contributor="Le Même en Mieux"
-        source="https://forum.quechoisir.org/pixmania-avis-1285"
-        likes={21}
-        dislikes={3}
-      />
-      <Notice
-        id={2}
-        match={match}
-        type="Rant"
-        message={message}
-        contributor="Le Même en Mieux"
-        source="https://forum.quechoisir.org/pixmania-avis-1285"
-        likes={21}
-        dislikes={3}
-        deleted
-      />
-      <AddNotice />
-    </Notification>
-  );
-};
diff --git a/src/components/screens/Notice/index.js b/src/components/screens/Notice/index.js
deleted file mode 100644
index 5b5fd0abe..000000000
--- a/src/components/screens/Notice/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Route, Switch } from 'react-router-dom';
-import React from 'react';
-import List from './List';
-import Details from './Details';
-import Error from '../Error/Error';
-
-export default ({ match }) => (
-  <Switch>
-    <Route path={match.url} exact component={List} />
-    <Route path={`${match.url}/details`} component={Details} />
-    <Route component={Error} />
-  </Switch>
-);
diff --git a/src/components/screens/Subscriptions/Subscriptions.stories.jsx b/src/components/screens/Subscriptions/Subscriptions.stories.jsx
deleted file mode 100644
index 4b8e13f05..000000000
--- a/src/components/screens/Subscriptions/Subscriptions.stories.jsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
-import theme from '../../../app/theme';
-import Subscriptions from './Subscriptions';
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
-
-const Wrapper = styled.div`
-  width: 384px;
-  height: 414px;
-`;
-
-storiesOf('screens/Subscriptions', module)
-  .addDecorator(getStory => (
-    <div>
-      <Global />
-      <Router>
-        <ThemeProvider theme={theme}>
-          <Wrapper>
-            {getStory()}
-          </Wrapper>
-        </ThemeProvider>
-      </Router>
-    </div>
-  ))
-  .add('normal', () => <Subscriptions />);
diff --git a/src/components/screens/index.js b/src/components/screens/index.js
deleted file mode 100644
index 649e0e2d1..000000000
--- a/src/components/screens/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export { default as Account } from './Account';
-export { default as Notice } from './Notice';
-export { default as Error } from './Error/Error';
-export { default as Help } from './Help/Help';
-export { default as Subscriptions } from './Subscriptions/Subscriptions';
diff --git a/views/options.pug b/views/options.pug
deleted file mode 100644
index 8afaae11d..000000000
--- a/views/options.pug
+++ /dev/null
@@ -1,18 +0,0 @@
-doctype html
-
-html
-  head
-    meta(charset="utf-8")
-    style
-      | :root {
-      |   width: 900px;
-      |   height: 300px;
-      | }
-      | #root {
-      |   margin: 15px 15px 15px 0;
-      | }
-
-    title LMEM Options
-  body
-    #root
-    script(src=webpackConfig.output.publicPath + '/js/options.bundle.js')
diff --git a/views/popup.pug b/views/popup.pug
deleted file mode 100644
index ebd78e22d..000000000
--- a/views/popup.pug
+++ /dev/null
@@ -1,17 +0,0 @@
-doctype html
-
-html
-  head
-    meta(charset="utf-8")
-    title LMEM Popup
-    style
-      | :root {
-      |   width: 520px;
-      |   height: initial;
-      | }
-      | body {
-      |   margin: 0;
-      | }
-  body
-    #root
-    script(src=webpackConfig.output.publicPath + '/js/popup.bundle.js')
diff --git a/webpack/base.config.js b/webpack/base.config.js
index df1b88549..64ca2c8ff 100644
--- a/webpack/base.config.js
+++ b/webpack/base.config.js
@@ -10,9 +10,7 @@ const baseConfig = ({
   entry: Object.assign(
     {
       background: ['@babel/polyfill', path.join(srcPath, './background/')],
-      content: ['@babel/polyfill', path.join(srcPath, './content/')],
-      options: [path.join(srcPath, './options/')],
-      popup: [path.join(srcPath, './popup/')],
+      content: ['@babel/polyfill', path.join(srcPath, './content/')]
     },
     input
   ),
@@ -25,8 +23,6 @@ const baseConfig = ({
   ),
   plugins: [
     new HtmlWebpackPlugin({ template: './views/background.pug', filename: 'background.html', inject: false }),
-    new HtmlWebpackPlugin({ template: './views/options.pug', filename: 'options.html', inject: false }),
-    new HtmlWebpackPlugin({ template: './views/popup.pug', filename: 'popup.html', inject: false }),
     ...plugins
   ],
   resolve: {
@@ -34,12 +30,12 @@ const baseConfig = ({
       app: srcPath,
       extension: path.join(srcPath, './background')
     },
-    extensions: ['.js']
+    extensions: ['.js', '.jsx']
   },
   module: {
     rules: [
       {
-        test: /\.js$/,
+        test: /\.jsx?$/,
         include: [
           path.resolve(__dirname, '../src/')
         ],
diff --git a/webpack/sandbox.config.babel.js b/webpack/sandbox.config.babel.js
deleted file mode 100644
index c6c3b22c9..000000000
--- a/webpack/sandbox.config.babel.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import path from 'path';
-import webpack from 'webpack';
-import HtmlWebpackPlugin from 'html-webpack-plugin';
-
-export default {
-  mode: 'development',
-  devtool: 'none',
-  entry: {
-    app: './src/app/sandbox/index.js'
-  },
-  plugins: [
-    new HtmlWebpackPlugin({ title: 'LMEM - Sandbox' }),
-    new webpack.NamedModulesPlugin(),
-  ],
-  module: {
-    rules: [
-      {
-        test: /\.jsx?/,
-        use: [
-          'babel-loader',
-          'eslint-loader',
-          'stylelint-custom-processor-loader',
-        ],
-        exclude: /node_modules/,
-      },
-      {
-        test: /\.css$/,
-        use: [
-          { loader: "style-loader" },
-          { loader: "css-loader" }
-        ]
-      },
-      {
-        test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
-        use: [{
-          loader: 'file-loader',
-          options: {
-            name: '[name].[ext]',
-            outputPath: 'fonts/'
-          }
-        }]
-      }
-    ],
-  },
-  resolve: {
-    extensions: ['.js'],
-    alias: {
-      react: path.resolve(path.join(__dirname, '../node_modules/react')),
-      'babel-core': path.resolve(path.join(__dirname, '../node_modules/@babel/core')),
-    },
-  },
-};
diff --git a/yarn.lock b/yarn.lock
index b16ce2c4f..8d15f3785 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2680,6 +2680,17 @@ babel-plugin-minify-type-constructors@^0.4.3:
   dependencies:
     babel-helper-is-void-0 "^0.4.3"
 
+babel-plugin-module-resolver@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz#ddfa5e301e3b9aa12d852a9979f18b37881ff5a7"
+  integrity sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==
+  dependencies:
+    find-babel-config "^1.1.0"
+    glob "^7.1.2"
+    pkg-up "^2.0.0"
+    reselect "^3.0.1"
+    resolve "^1.4.0"
+
 babel-plugin-named-asset-import@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.2.3.tgz#b40ed50a848e7bb0a2a7e34d990d1f9d46fe9b38"
@@ -4963,9 +4974,18 @@ eslint-config-airbnb@^17.1.0:
     object.assign "^4.1.0"
     object.entries "^1.0.4"
 
-eslint-import-resolver-node@^0.3.1:
+eslint-import-resolver-babel-module@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-babel-module/-/eslint-import-resolver-babel-module-5.0.1.tgz#02e36fbefa7aaf8ff0d298ed2651ea48ad26dd1e"
+  integrity sha512-q1IDVrpXAKz90t4x/S9RUeQgSK5wfH1AF/tR3iUAmLeCiAEVep/tNtX9EhQjut8DLgloUfUHoJWd8QCAJXhv+A==
+  dependencies:
+    pkg-up "^2.0.0"
+    resolve "^1.10.0"
+
+eslint-import-resolver-node@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
+  integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==
   dependencies:
     debug "^2.6.9"
     resolve "^1.5.0"
@@ -4980,27 +5000,29 @@ eslint-loader@^2.1.1:
     object-hash "^1.1.4"
     rimraf "^2.6.1"
 
-eslint-module-utils@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz#b270362cd88b1a48ad308976ce7fa54e98411746"
+eslint-module-utils@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz#546178dab5e046c8b562bbb50705e2456d7bda49"
+  integrity sha512-lmDJgeOOjk8hObTysjqH7wyMi+nsHwwvfBykwfhjR1LNdd7C2uFJBvx4OpWYpXOw4df1yE1cDEVd1yLHitk34w==
   dependencies:
     debug "^2.6.8"
-    pkg-dir "^1.0.0"
+    pkg-dir "^2.0.0"
 
-eslint-plugin-import@^2.14.0:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz#6b17626d2e3e6ad52cfce8807a845d15e22111a8"
+eslint-plugin-import@^2.16.0:
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.16.0.tgz#97ac3e75d0791c4fac0e15ef388510217be7f66f"
+  integrity sha512-z6oqWlf1x5GkHIFgrSvtmudnqM6Q60KM4KvpWi5ubonMjycLjndvd5+8VAZIsTlHC03djdgJuyKG6XO577px6A==
   dependencies:
     contains-path "^0.1.0"
-    debug "^2.6.8"
+    debug "^2.6.9"
     doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.1"
-    eslint-module-utils "^2.2.0"
-    has "^1.0.1"
-    lodash "^4.17.4"
-    minimatch "^3.0.3"
+    eslint-import-resolver-node "^0.3.2"
+    eslint-module-utils "^2.3.0"
+    has "^1.0.3"
+    lodash "^4.17.11"
+    minimatch "^3.0.4"
     read-pkg-up "^2.0.0"
-    resolve "^1.6.0"
+    resolve "^1.9.0"
 
 eslint-plugin-jsx-a11y@^6.1.2:
   version "6.1.2"
@@ -5015,6 +5037,13 @@ eslint-plugin-jsx-a11y@^6.1.2:
     has "^1.0.3"
     jsx-ast-utils "^2.0.1"
 
+eslint-plugin-module-resolver@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-module-resolver/-/eslint-plugin-module-resolver-0.8.0.tgz#5d8802d2787d512f88eb335f04b8e3add99d9f5f"
+  integrity sha512-5zGjva7/n9kDq8CENVIQAkPr4hHOl+T2049UvKjK3TlFUb3ukzll8CWQowJcE08twG+dfOnQblG6Ok4sScWwzg==
+  dependencies:
+    find-babel-config "^1.1.0"
+
 eslint-plugin-react@^7.11.1:
   version "7.11.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.11.1.tgz#c01a7af6f17519457d6116aa94fc6d2ccad5443c"
@@ -5521,6 +5550,14 @@ finalhandler@1.1.1:
     statuses "~1.4.0"
     unpipe "~1.0.0"
 
+find-babel-config@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.1.0.tgz#acc01043a6749fec34429be6b64f542ebb5d6355"
+  integrity sha1-rMAQQ6Z0n+w0Qpvmtk9ULrtdY1U=
+  dependencies:
+    json5 "^0.5.1"
+    path-exists "^3.0.0"
+
 find-cache-dir@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
@@ -7435,7 +7472,7 @@ json3@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
 
-json5@^0.5.0:
+json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
 
@@ -8322,7 +8359,7 @@ 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@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@3.0.4, minimatch@^3.0.2, 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:
@@ -9713,7 +9750,7 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-pkg-up@2.0.0:
+pkg-up@2.0.0, pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
   dependencies:
@@ -11200,6 +11237,11 @@ requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
 
+reselect@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
+  integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
+
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -11233,14 +11275,14 @@ 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.6, resolve@^1.1.7:
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.4.0, resolve@^1.9.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
   integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.3.2, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1:
+resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
   dependencies:

From 0ad6f864b69807c4f8ca36556629d7e6c330f25d Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Tue, 5 Mar 2019 19:19:39 +0100
Subject: [PATCH 021/100] fix(details): remove double spacings

---
 .eslintrc                                               | 3 ++-
 src/components/organisms/NoticeDetails/NoticeDetails.js | 9 ++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 457a4e661..205093b4f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -70,6 +70,7 @@
     "no-underscore-dangle": 0,
     "no-else-return": 0,
     "newline-per-chained-call": 0,
-    "module-resolver/use-alias": 0
+    "module-resolver/use-alias": 0,
+    "react/jsx-one-expression-per-line": 0
   }
 }
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.js b/src/components/organisms/NoticeDetails/NoticeDetails.js
index 17689aacc..0d6baa2c2 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.js
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.js
@@ -82,14 +82,10 @@ class NoticeDetails extends PureComponent {
         <DetailsContent>
           <DetailsMeta>
             <Date>
-              Le
-              &nbsp;
-              {date}
+              Le {date}
             </Date>
             <Contributor>
-              {contributor}
-              &nbsp;
-              :
+              {contributor} :
             </Contributor>
             <Type type={type} />
           </DetailsMeta>
@@ -97,7 +93,6 @@ class NoticeDetails extends PureComponent {
           <Source>
             <Anchor />
               En savoir plus :
-              &nbsp;
             <SourceURL>{source}</SourceURL>
           </Source>
 

From 6b2894e9c010e634797a70f817b1ef8e24893fcd Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Tue, 5 Mar 2019 19:44:19 +0100
Subject: [PATCH 022/100] =?UTF-8?q?feat(details):=20change=20title=20to=20?=
 =?UTF-8?q?'D=C3=A9tail=20de=20la=20bulle'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/content/App/Notice/Details/index.jsx | 44 ++++++++++----------
 src/app/content/App/Notice/List/index.jsx    |  2 +-
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/app/content/App/Notice/Details/index.jsx b/src/app/content/App/Notice/Details/index.jsx
index 6520b983a..124d335ac 100644
--- a/src/app/content/App/Notice/Details/index.jsx
+++ b/src/app/content/App/Notice/Details/index.jsx
@@ -12,29 +12,27 @@ const Details = ({
   like, unlike,
   dislike, undislike,
   close,
-}) => {
-  return (
-    <Notification title={description} hasNotices close={close}>
-      <NoticeDetails
-        id={id}
-        type={findType(criteria)}
-        date="03 déc. 2018"
-        message={description}
-        contributor={name}
-        source={url}
-        likes={21}
-        dislikes={3}
-        like={like}
-        unlike={unlike}
-        dislike={dislike}
-        undislike={undislike}
-        liked={liked}
-        disliked={disliked}
-        details
-      />
-    </Notification>
-  );
-};
+}) => (
+  <Notification title="Détail de la bulle" hasNotices close={close}>
+    <NoticeDetails
+      id={id}
+      type={findType(criteria)}
+      date="03 déc. 2018"
+      message={description}
+      contributor={name}
+      source={url}
+      likes={21}
+      dislikes={3}
+      like={like}
+      unlike={unlike}
+      dislike={dislike}
+      undislike={undislike}
+      liked={liked}
+      disliked={disliked}
+      details
+    />
+  </Notification>
+);
 
 Details.propTypes = {
   notice: PropTypes.shape(NoticeType).isRequired,
diff --git a/src/app/content/App/Notice/List/index.jsx b/src/app/content/App/Notice/List/index.jsx
index 4665ce52b..b77382878 100644
--- a/src/app/content/App/Notice/List/index.jsx
+++ b/src/app/content/App/Notice/List/index.jsx
@@ -11,7 +11,7 @@ export const List = ({
   notices, dismiss, undismiss, close
 }) => {
   return (
-    <Notification title="Notifications pour cette page" hasNotices close={close}>
+    <Notification title="Bulles pour cette page" hasNotices close={close}>
       {notices.slice(0, 2).map(({
         id, description, contributor: { name }, resource: { url }, criteria, dismissed, disliked
       }) => (

From 6be0adc00db4efdbdacb1d2501a96b1ff2c1fcf0 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Wed, 6 Mar 2019 21:41:39 +0100
Subject: [PATCH 023/100] chore: replace Gulp by full Webpack setup

---
 .eslintignore                                 |    4 +-
 .gitignore                                    |    3 +-
 gulp/tasks/build.js                           |   52 -
 gulp/tasks/copy.js                            |   35 -
 gulp/tasks/zip.js                             |   31 -
 gulpfile.babel.js                             |   22 -
 gulpfile.js                                   |    2 -
 manifest/base.js                              |    2 +-
 manifest/chromium.js                          |   61 +-
 manifest/dev.js                               |   37 +-
 manifest/firefox.js                           |   23 +-
 manifest/index.js                             |    8 +
 manifest/staging.js                           |   65 +-
 package.json                                  |   27 +-
 src/app/background/index.js                   |    3 +-
 .../background/services/fetchContentScript.js |    4 +-
 src/app/constants/origins.js                  |    1 -
 src/assets/fonts/.gitkeep                     |    0
 src/assets/fonts/blockbe_regular-webfont.woff |  Bin 54528 -> 0 bytes
 .../fonts/blockbe_regular-webfont.woff2       |  Bin 44844 -> 0 bytes
 src/assets/img/arrow.svg                      |   16 -
 src/assets/img/ball.svg                       |    6 -
 src/assets/img/checked.svg                    |    7 -
 src/assets/img/close.svg                      |    6 -
 src/assets/img/contributors/01net.png         |  Bin 277 -> 0 bytes
 src/assets/img/contributors/60millions.png    |  Bin 601 -> 0 bytes
 src/assets/img/contributors/7zip.png          |  Bin 215 -> 0 bytes
 src/assets/img/contributors/accorhotels.png   |  Bin 856 -> 0 bytes
 src/assets/img/contributors/backmarket.png    |  Bin 3111 -> 0 bytes
 src/assets/img/contributors/benjamin.jpg      |  Bin 15178 -> 0 bytes
 src/assets/img/contributors/globalement.png   |  Bin 951 -> 0 bytes
 src/assets/img/contributors/guest2guest.png   |  Bin 2749 -> 0 bytes
 src/assets/img/contributors/lemonde.png       |  Bin 549 -> 0 bytes
 src/assets/img/contributors/logo-inc.jpg      |  Bin 1653 -> 0 bytes
 .../img/contributors/logo-quechoisir.png      |  Bin 1976 -> 0 bytes
 src/assets/img/contributors/maarten.jpg       |  Bin 72088 -> 0 bytes
 src/assets/img/contributors/quechoisir.png    |  Bin 702 -> 0 bytes
 src/assets/img/create.svg                     |    8 -
 src/assets/img/crosschecked.svg               |    7 -
 src/assets/img/discuss.svg                    |    7 -
 src/assets/img/dislike.svg                    |    8 -
 src/assets/img/help.svg                       |   16 -
 src/assets/img/info.svg                       |   16 -
 src/assets/img/like.svg                       |    8 -
 src/assets/img/location.svg                   |   14 -
 src/assets/img/logo-bw.svg                    |    6 -
 src/assets/img/logo-facebook.svg              |    3 -
 src/assets/img/logo-lmem-new.svg              |    8 -
 src/assets/img/logo-lmem.svg                  |   25 -
 src/assets/img/logo-twitter.svg               |    3 -
 src/assets/img/love-pink.svg                  |    6 -
 src/assets/img/love.svg                       |    6 -
 src/assets/img/message.svg                    |   17 -
 src/assets/img/notice.svg                     |    6 -
 src/assets/img/power-cross.svg                |    9 -
 src/assets/img/power-timer.svg                |   13 -
 src/assets/img/power.svg                      |    6 -
 src/assets/img/privacy.svg                    |    6 -
 src/assets/img/reaction.svg                   |   12 -
 src/assets/img/read.svg                       |    6 -
 src/assets/img/report.svg                     |    9 -
 src/assets/img/search.svg                     |    6 -
 src/assets/img/settings.svg                   |   16 -
 src/assets/img/trashbin.svg                   |    9 -
 src/assets/img/unchecked.svg                  |    6 -
 src/assets/img/valid.svg                      |    6 -
 src/assets/img/warning.svg                    |    6 -
 webpack.config.js                             |   26 +
 webpack/base.config.js                        |  111 --
 webpack/chromium.config.js                    |   25 -
 webpack/config.entry.js                       |   11 +
 webpack/config.outputPath.js                  |    7 +
 webpack/config.plugins.js                     |   79 ++
 webpack/config.rules.js                       |   52 +
 webpack/config.stats.js                       |  127 ++
 webpack/dev.config.js                         |   25 -
 webpack/firefox.config.js                     |   30 -
 webpack/staging.config.js                     |   26 -
 yarn.lock                                     | 1062 ++++-------------
 79 files changed, 668 insertions(+), 1602 deletions(-)
 delete mode 100644 gulp/tasks/build.js
 delete mode 100644 gulp/tasks/copy.js
 delete mode 100644 gulp/tasks/zip.js
 delete mode 100644 gulpfile.babel.js
 delete mode 100644 gulpfile.js
 create mode 100644 manifest/index.js
 delete mode 100644 src/assets/fonts/.gitkeep
 delete mode 100755 src/assets/fonts/blockbe_regular-webfont.woff
 delete mode 100755 src/assets/fonts/blockbe_regular-webfont.woff2
 delete mode 100644 src/assets/img/arrow.svg
 delete mode 100644 src/assets/img/ball.svg
 delete mode 100644 src/assets/img/checked.svg
 delete mode 100644 src/assets/img/close.svg
 delete mode 100644 src/assets/img/contributors/01net.png
 delete mode 100644 src/assets/img/contributors/60millions.png
 delete mode 100644 src/assets/img/contributors/7zip.png
 delete mode 100644 src/assets/img/contributors/accorhotels.png
 delete mode 100644 src/assets/img/contributors/backmarket.png
 delete mode 100644 src/assets/img/contributors/benjamin.jpg
 delete mode 100644 src/assets/img/contributors/globalement.png
 delete mode 100644 src/assets/img/contributors/guest2guest.png
 delete mode 100644 src/assets/img/contributors/lemonde.png
 delete mode 100644 src/assets/img/contributors/logo-inc.jpg
 delete mode 100644 src/assets/img/contributors/logo-quechoisir.png
 delete mode 100644 src/assets/img/contributors/maarten.jpg
 delete mode 100644 src/assets/img/contributors/quechoisir.png
 delete mode 100644 src/assets/img/create.svg
 delete mode 100644 src/assets/img/crosschecked.svg
 delete mode 100644 src/assets/img/discuss.svg
 delete mode 100644 src/assets/img/dislike.svg
 delete mode 100644 src/assets/img/help.svg
 delete mode 100644 src/assets/img/info.svg
 delete mode 100644 src/assets/img/like.svg
 delete mode 100644 src/assets/img/location.svg
 delete mode 100644 src/assets/img/logo-bw.svg
 delete mode 100644 src/assets/img/logo-facebook.svg
 delete mode 100644 src/assets/img/logo-lmem-new.svg
 delete mode 100644 src/assets/img/logo-lmem.svg
 delete mode 100644 src/assets/img/logo-twitter.svg
 delete mode 100644 src/assets/img/love-pink.svg
 delete mode 100644 src/assets/img/love.svg
 delete mode 100644 src/assets/img/message.svg
 delete mode 100644 src/assets/img/notice.svg
 delete mode 100644 src/assets/img/power-cross.svg
 delete mode 100644 src/assets/img/power-timer.svg
 delete mode 100644 src/assets/img/power.svg
 delete mode 100644 src/assets/img/privacy.svg
 delete mode 100644 src/assets/img/reaction.svg
 delete mode 100644 src/assets/img/read.svg
 delete mode 100644 src/assets/img/report.svg
 delete mode 100644 src/assets/img/search.svg
 delete mode 100644 src/assets/img/settings.svg
 delete mode 100644 src/assets/img/trashbin.svg
 delete mode 100644 src/assets/img/unchecked.svg
 delete mode 100644 src/assets/img/valid.svg
 delete mode 100644 src/assets/img/warning.svg
 create mode 100644 webpack.config.js
 delete mode 100644 webpack/base.config.js
 delete mode 100644 webpack/chromium.config.js
 create mode 100644 webpack/config.entry.js
 create mode 100644 webpack/config.outputPath.js
 create mode 100644 webpack/config.plugins.js
 create mode 100644 webpack/config.rules.js
 create mode 100644 webpack/config.stats.js
 delete mode 100644 webpack/dev.config.js
 delete mode 100644 webpack/firefox.config.js
 delete mode 100644 webpack/staging.config.js

diff --git a/.eslintignore b/.eslintignore
index 503eae4f7..eb884692f 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -3,8 +3,6 @@ node_modules
 build
 dev
 
-gulp
-gulpfile.babel.js
 webpack
 webpack/replace
 
@@ -14,4 +12,4 @@ test/app
 
 src/app/content/containers/PopUp
 
-src/lib/heap.js
\ No newline at end of file
+src/lib/heap.js
diff --git a/.gitignore b/.gitignore
index 8e6b9c28b..ef4ac1cb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.awcache/
 node_modules
 npm-debug.log
 .DS_Store
@@ -11,4 +12,4 @@ plugins/
 platforms/
 .floo
 .flooignore
-.ftppass
\ No newline at end of file
+.ftppass
diff --git a/gulp/tasks/build.js b/gulp/tasks/build.js
deleted file mode 100644
index 670d93710..000000000
--- a/gulp/tasks/build.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import gulp from 'gulp';
-import gutil from 'gulp-util';
-import webpack from 'webpack';
-import path from 'path';
-
-import devConfig from '../../webpack/dev.config';
-import stagingConfig from '../../webpack/staging.config';
-import extConfig from '../../webpack/chromium.config';
-import firefoxConfig from '../../webpack/firefox.config';
-
-function compiler(config) {
-  return webpack(config);
-}
-
-function staticCompiler(config) {
-  if (!staticCompiler.instance) {
-    staticCompiler.instance = compiler(config);
-  }
-  return staticCompiler.instance;
-}
-
-function build(compiler, callback) {
-  compiler.run((err, stats) => {
-    if (err) throw new gutil.PluginError('webpack:build', err);
-    gutil.log('[webpack:build]', stats.toString({
-      chunks: false,
-      colors: true,
-    }));
-    callback();
-  });
-}
-
-gulp.task('webpack:watch', () => {
-  const globs = [
-    path.join(__dirname, '../../src/') + '**/*',
-    path.join(__dirname, '../../test/') + '**/*'
-  ];
-  return gulp.watch(globs, ['webpack:build:dev']);
-});
-gulp.task('webpack:build:dev', (callback) => {
-  // Instance webpack compiler once over multiple times (watch)
-  build(staticCompiler(devConfig), callback);
-});
-gulp.task('webpack:build:staging', (callback) => {
-  build(compiler(stagingConfig), callback);
-});
-gulp.task('webpack:build:chromium', (callback) => {
-  build(compiler(extConfig), callback);
-});
-gulp.task('webpack:build:firefox', (callback) => {
-  build(compiler(firefoxConfig), callback);
-});
diff --git a/gulp/tasks/copy.js b/gulp/tasks/copy.js
deleted file mode 100644
index 699b065e0..000000000
--- a/gulp/tasks/copy.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import gulp from 'gulp';
-import file from 'gulp-file';
-
-import devManifest from '../../manifest/dev';
-import prodManifest from '../../manifest/chromium';
-import stagingManifest from '../../manifest/staging';
-import firefoxManifest from '../../manifest/firefox';
-
-const copy = (dest, manifestStr, tests) => () => {
-  if (manifestStr) {
-    file('manifest.json', manifestStr, { src: true })
-      .pipe(gulp.dest(dest));
-  }
-  gulp.src('./src/assets/**/*').pipe(gulp.dest(dest));
-  gulp.src('./src/app/lmem/draft-preview/grabDraftRecommendations.js')
-    .pipe(gulp.dest(dest+'/js'));
-
-  if(tests){
-    gulp.src('./test/**/*').pipe(gulp.dest(dest+'/test'));
-  }
-};
-
-
-gulp.task('copy:build:dev',
-  copy('./build/dev', JSON.stringify(devManifest, null, 2), true));
-gulp.task('copy:build:staging',
-  copy('./build/staging', JSON.stringify(stagingManifest, null, 2), true));
-gulp.task('copy:build:chromium',
-  copy('./build/chromium', JSON.stringify(prodManifest, null, 2)));
-gulp.task('copy:build:firefox',
-  copy('./build/firefox', JSON.stringify(firefoxManifest, null, 2)));
-
-gulp.task('copy:watch', () => {
-  gulp.watch(`./src/manifest`, ['copy:build:dev']);
-});
\ No newline at end of file
diff --git a/gulp/tasks/zip.js b/gulp/tasks/zip.js
deleted file mode 100644
index 79cb443f4..000000000
--- a/gulp/tasks/zip.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import gulp from 'gulp';
-import path from 'path';
-import zip from 'gulp-zip';
-
-import { output as chromiumOutput } from '../../webpack/chromium.config';
-import { output as firefoxOutput } from '../../webpack/firefox.config';
-import { output as stagingOutput } from '../../webpack/staging.config';
-
-const { path: chromiumPath } = chromiumOutput;
-const { path: firefoxPath } = firefoxOutput;
-const { path: stagingPath } = stagingOutput;
-
-const version = process.env.npm_package_version;
-
-gulp.task('zip:build:firefox',
-  ['webpack:build:firefox', 'copy:build:firefox'], () =>
-    gulp.src(firefoxPath + '/**/*')
-      .pipe(zip(`lmem-v${version}-firefox.zip`))
-      .pipe(gulp.dest(path.join(firefoxPath, '../'))));
-
-gulp.task('zip:build:chromium',
-  ['webpack:build:chromium', 'copy:build:chromium'], () =>
-    gulp.src(chromiumPath + '/**/*')
-      .pipe(zip(`lmem-v${version}-chromium.zip`))
-      .pipe(gulp.dest(path.join(chromiumPath, '../'))));
-
-gulp.task('zip:build:staging',
-  ['webpack:build:staging', 'copy:build:staging'], () =>
-    gulp.src(stagingPath + '/**/*')
-      .pipe(zip(`lmem-v${version}-staging.zip`))
-      .pipe(gulp.dest(path.join(stagingPath, '../'))));
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
deleted file mode 100644
index d5b529364..000000000
--- a/gulpfile.babel.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import gulp from 'gulp';
-import requireDir from 'require-dir';
-requireDir('./gulp/tasks');
-
-gulp.task('default',['build:dev']);
-gulp.task('build:dev',
-  ['webpack:build:dev', 'copy:build:dev',
-    'copy:watch', 'webpack:watch']);
-
-gulp.task('build:chromium-staging',
-  ['webpack:build:staging', 'copy:build:staging', 'zip:build:staging']);
-
-gulp.task('build:chromium-production',
-  ['webpack:build:chromium', 'copy:build:chromium', 'zip:build:chromium']);
-
-gulp.task('build:firefox-production',
-  ['webpack:build:firefox', 'copy:build:firefox', 'zip:build:firefox']);
-
-gulp.task('build:production', ['build:firefox-production', 'build:chromium-production']);
-gulp.task('build:staging', ['build:chromium-staging']);
-
-gulp.task('test-chrome', ['chrome:test']);
diff --git a/gulpfile.js b/gulpfile.js
deleted file mode 100644
index 5ac8d8e00..000000000
--- a/gulpfile.js
+++ /dev/null
@@ -1,2 +0,0 @@
-require('@babel/register');
-require('./gulpfile.babel.js');
\ No newline at end of file
diff --git a/manifest/base.js b/manifest/base.js
index b96618f90..601ea1849 100644
--- a/manifest/base.js
+++ b/manifest/base.js
@@ -7,7 +7,7 @@
 
 const version = process.env.npm_package_version;
 
-export default Object.freeze({
+module.exports = Object.freeze({
   'name': 'Le Même en Mieux',
   'shortname': 'LMEM',
   'description': 'Qualité, prix, éthique : s’il existe un meilleur choix, vous le saurez. ' +
diff --git a/manifest/chromium.js b/manifest/chromium.js
index c660e9b66..6b5a1e183 100644
--- a/manifest/chromium.js
+++ b/manifest/chromium.js
@@ -1,33 +1,30 @@
-import base from './base.js';
-import csp from 'content-security-policy-builder';
+const csp = require('content-security-policy-builder');
+const base = require('./base');
 
-export default Object.assign(
-  {},
-  base,
-  {
-    'content_security_policy': csp({
-      'directives': {
-        'default-src': [
-          'https://recommendations.lmem.net',
-        ],
-        'script-src': [
-          '\'self\'',
-          'https://heapanalytics.com',
-          'https://cdn.heapanalytics.com'
-        ],
-        'object-src': [
-          '\'self\''
-        ],
-        'img-src': [
-          '\'self\'',
-          'https://heapanalytics.com',
-          'https://cdn.heapanalytics.com',
-          'data:'
-        ],
-        'style-src': [
-          '\'unsafe-inline\''
-        ]
-      }
-    })
-  }
-);
+module.exports = {
+  ...base,
+  'content_security_policy': csp({
+    'directives': {
+      'default-src': [
+        'https://recommendations.lmem.net',
+      ],
+      'script-src': [
+        '\'self\'',
+        'https://heapanalytics.com',
+        'https://cdn.heapanalytics.com'
+      ],
+      'object-src': [
+        '\'self\''
+      ],
+      'img-src': [
+        '\'self\'',
+        'https://heapanalytics.com',
+        'https://cdn.heapanalytics.com',
+        'data:'
+      ],
+      'style-src': [
+        '\'unsafe-inline\''
+      ]
+    }
+  })
+};
diff --git a/manifest/dev.js b/manifest/dev.js
index 27ee33278..b728b79fb 100644
--- a/manifest/dev.js
+++ b/manifest/dev.js
@@ -1,21 +1,18 @@
-import base from './base.js';
-import csp from 'content-security-policy-builder';
+const csp = require('content-security-policy-builder');
+const base = require('./base');
 
-export default Object.assign(
-  {},
-  base,
-  {
-    'name': 'LMEM - DEV',
-    'content_security_policy': csp({
-      'directives': {
-        'script-src': [
-          '\'self\'',
-          '\'unsafe-eval\'',
-        ],
-        'object-src': [
-          '\'self\'',
-        ]
-      }
-    })
-  }
-);
+module.exports = {
+  ...base,
+  name: 'LMEM - DEV',
+  'content_security_policy': csp({
+    'directives': {
+      'script-src': [
+        '\'self\'',
+        '\'unsafe-eval\'',
+      ],
+      'object-src': [
+        '\'self\'',
+      ]
+    }
+  })
+};
diff --git a/manifest/firefox.js b/manifest/firefox.js
index 1a296d468..69dcd14fd 100644
--- a/manifest/firefox.js
+++ b/manifest/firefox.js
@@ -1,14 +1,11 @@
-import base from './base.js';
+const base = require('./base');
 
-export default Object.assign(
-  {},
-  base,
-  {
-    'permissions': [
-      'storage',
-      'tabs',
-      'http://*/*',
-      'https://*/*'
-    ],
-  }
-);
+module.exports = {
+  ...base,
+  'permissions': [
+    'storage',
+    'tabs',
+    'http://*/*',
+    'https://*/*'
+  ],
+};
diff --git a/manifest/index.js b/manifest/index.js
new file mode 100644
index 000000000..f8ad3049d
--- /dev/null
+++ b/manifest/index.js
@@ -0,0 +1,8 @@
+const dev = require('./dev');
+const staging = require('./staging');
+const chromium = require('./chromium');
+const firefox = require('./firefox');
+
+module.exports = {
+  dev, staging, chromium, firefox
+};
diff --git a/manifest/staging.js b/manifest/staging.js
index a8ac16590..144b76598 100644
--- a/manifest/staging.js
+++ b/manifest/staging.js
@@ -1,35 +1,32 @@
-import base from './base.js';
-import csp from 'content-security-policy-builder';
+const csp = require('content-security-policy-builder');
+const base = require('./base');
 
-export default Object.assign(
-  {},
-  base,
-  {
-    'name': 'LMEM - STAGING',
-    'content_security_policy': csp({
-      'directives': {
-        'default-src': [
-          'https://staging-recommendations.lmem.net',
-        ],
-        'script-src': [
-          '\'self\'',
-          '\'unsafe-eval\'',
-          'https://heapanalytics.com',
-          'https://cdn.heapanalytics.com'
-        ],
-        'object-src': [
-          '\'self\''
-        ],
-        'img-src': [
-          '\'self\'',
-          'https://heapanalytics.com',
-          'https://cdn.heapanalytics.com',
-          'data:'
-        ],
-        'style-src': [
-          '\'unsafe-inline\''
-        ]
-      }
-    })
-  }
-);
+module.exports = {
+  ...base,
+  'name': 'LMEM - STAGING',
+  'content_security_policy': csp({
+    'directives': {
+      'default-src': [
+        'https://staging-recommendations.lmem.net',
+      ],
+      'script-src': [
+        '\'self\'',
+        '\'unsafe-eval\'',
+        'https://heapanalytics.com',
+        'https://cdn.heapanalytics.com'
+      ],
+      'object-src': [
+        '\'self\''
+      ],
+      'img-src': [
+        '\'self\'',
+        'https://heapanalytics.com',
+        'https://cdn.heapanalytics.com',
+        'data:'
+      ],
+      'style-src': [
+        '\'unsafe-inline\''
+      ]
+    }
+  })
+};
diff --git a/package.json b/package.json
index 9d0966c23..71bdc5040 100644
--- a/package.json
+++ b/package.json
@@ -3,12 +3,14 @@
   "version": "1.1.1",
   "description": "LMEM Recommendations web extensions using React+Redux.",
   "scripts": {
-    "start": "npm run build:dev",
-    "build:production": "gulp build:production",
-    "build:staging": "gulp build:staging",
-    "build:dev": "gulp build:dev",
+    "start": "webpack --watch --progress --hot --env.hmr --mode=development --env.build=dev",
+    "build:staging": "webpack --mode=production --env.build=staging",
+    "build:firefox": "webpack --mode=production --env.build=firefox",
+    "build:chromium": "webpack --mode=production --env.build=chromium",
+    "build:production": "yarn build:chromium && yarn build:firefox",
+    "build": "yarn build:staging && yarn build:production",
     "clean": "rm -rf build",
-    "test": "LMEM_BACKEND_ORIGIN='' LMEM_SCRIPTS_ORIGIN='.' NODE_ENV=test mocha --compilers js:@babel/register test/app --recursive",
+    "test": "LMEM_BACKEND_ORIGIN='' NODE_ENV=test mocha --compilers js:@babel/register test/app --recursive",
     "lint": "git ls-files -om --exclude-standard | grep \\.js$ | xargs eslint --fix",
     "lint-git-hook": "git diff-index --name-only --cached HEAD | grep \\.js$ | xargs eslint --fix",
     "lint:css": "stylelint './src/**/*.js'",
@@ -63,6 +65,7 @@
     "@storybook/addon-knobs": "^4.1.12",
     "@storybook/addons": "^4.1.11",
     "@storybook/react": "^4.1.11",
+    "awesome-typescript-loader": "^5.2.1",
     "babel-eslint": "^10.0.1",
     "babel-loader": "^8.0.4",
     "babel-plugin-add-module-exports": "^1.0.0",
@@ -75,6 +78,8 @@
     "chai-immutable": "^1.6.0",
     "chromedriver": "^2.21.2",
     "co-mocha": "^1.2.2",
+    "copy-webpack-plugin": "^5.0.0",
+    "create-file-webpack": "^1.0.2",
     "css-loader": "^2.0.1",
     "del": "^2.2.0",
     "enzyme": "^3.7.0",
@@ -88,12 +93,6 @@
     "eslint-plugin-react": "^7.11.1",
     "expect": "^1.15.2",
     "file-loader": "^2.0.0",
-    "gulp": "3.9.0",
-    "gulp-file": "^0.4.0",
-    "gulp-mocha": "^6.0.0",
-    "gulp-rename": "^1.4.0",
-    "gulp-util": "^3.0.7",
-    "gulp-zip": "^4.2.0",
     "html-webpack-plugin": "^3.2.0",
     "jsdom": "^8.1.0",
     "mocha": "^5.2.0",
@@ -113,6 +112,7 @@
     "semantic-release-chrome": "^1.1.0",
     "sinon": "^6.3.5",
     "sinon-chai": "^3.2.0",
+    "source-map-loader": "^0.2.4",
     "style-loader": "^0.23.1",
     "stylelint": "^9.7.1",
     "stylelint-config-recommended": "^2.1.0",
@@ -120,10 +120,13 @@
     "stylelint-custom-processor-loader": "^0.5.0",
     "stylelint-processor-styled-components": "^1.5.0",
     "svg-url-loader": "^2.0.2",
+    "typescript": "^3.3.3333",
     "webpack": "^4.23.1",
+    "webpack-cleanup-plugin": "^0.5.1",
     "webpack-cli": "^3.1.2",
     "webpack-dev-server": "^3.1.10",
-    "webpack-hot-middleware": "^2.10.0"
+    "webpack-hot-middleware": "^2.10.0",
+    "zip-webpack-plugin": "^3.0.0"
   },
   "dependencies": {
     "@babel/polyfill": "^7.2.5",
diff --git a/src/app/background/index.js b/src/app/background/index.js
index a5b32a1f9..5068fd28a 100644
--- a/src/app/background/index.js
+++ b/src/app/background/index.js
@@ -15,14 +15,13 @@ import {
 } from './actions/kraftBackend';
 import updateDraftRecommendations from './actions/updateDraftRecommendations';
 
-import {LMEM_BACKEND_ORIGIN, LMEM_SCRIPTS_ORIGIN} from '../constants/origins';
+import {LMEM_BACKEND_ORIGIN } from '../constants/origins';
 import fetchContentScript from './services/fetchContentScript';
 
 if(process.env.NODE_ENV !== 'production'){
   console.info('NODE_ENV', process.env.NODE_ENV);
 }
 console.info(`LMEM_BACKEND_ORIGIN "${LMEM_BACKEND_ORIGIN}"`);
-console.info(`LMEM_SCRIPTS_ORIGIN "${LMEM_SCRIPTS_ORIGIN}"`);
 
 const heapAppId = process.env.HEAP_APPID;
 if (typeof heapAppId === 'string') {
diff --git a/src/app/background/services/fetchContentScript.js b/src/app/background/services/fetchContentScript.js
index 6796f1c2a..856fac88b 100644
--- a/src/app/background/services/fetchContentScript.js
+++ b/src/app/background/services/fetchContentScript.js
@@ -1,4 +1,2 @@
-import {LMEM_SCRIPTS_ORIGIN} from '../../constants/origins';
-
-export default (input, init) => fetch(`${LMEM_SCRIPTS_ORIGIN}${input}`, init)
+export default (input, init) => fetch(`.${input}`, init)
   .then(resp => resp.text());
diff --git a/src/app/constants/origins.js b/src/app/constants/origins.js
index 1414b69e0..d1156933a 100644
--- a/src/app/constants/origins.js
+++ b/src/app/constants/origins.js
@@ -7,4 +7,3 @@ function originFromEnv(key) {
 }
 
 export const LMEM_BACKEND_ORIGIN = originFromEnv('LMEM_BACKEND_ORIGIN');
-export const LMEM_SCRIPTS_ORIGIN = originFromEnv('LMEM_SCRIPTS_ORIGIN');
\ No newline at end of file
diff --git a/src/assets/fonts/.gitkeep b/src/assets/fonts/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/assets/fonts/blockbe_regular-webfont.woff b/src/assets/fonts/blockbe_regular-webfont.woff
deleted file mode 100755
index b4afe0e179eafe436329e6200188a1f9bdeb52c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 54528
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
NE201aTlRY*007uG4^RLA

diff --git a/src/assets/fonts/blockbe_regular-webfont.woff2 b/src/assets/fonts/blockbe_regular-webfont.woff2
deleted file mode 100755
index 1274710377a5b60ba3bbc0a976cf047c93c5c058..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 44844
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

diff --git a/src/assets/img/arrow.svg b/src/assets/img/arrow.svg
deleted file mode 100644
index 8f746e292..000000000
--- a/src/assets/img/arrow.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="100%" width="100%" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 30 30">
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g transform="translate(-240,-1022.375)">
-  <path fill-rule="nonzero" fill="#586e75" d="m253.5,1028.4,0,12.25-5.375-5.375-2.125,2.125,6.875,6.875,0.625,0.625,1.5,1.5,1.5-1.5,7.5-7.5-2.125-2.125-5.375,5.375,0-12.25-3,0z"/>
- </g>
-</svg>
diff --git a/src/assets/img/ball.svg b/src/assets/img/ball.svg
deleted file mode 100644
index fc5c82bb1..000000000
--- a/src/assets/img/ball.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000001 75.000001">
- <g transform="translate(0 -977.36)">
-  <path fill="#586e75" d="m37.5 992.36c-12.427 0-22.5 10.073-22.5 22.5 0 12.426 10.073 22.5 22.5 22.5s22.5-10.074 22.5-22.5c0-12.427-10.073-22.5-22.5-22.5zm5 10c4.1422 0 7.5 3.3577 7.5 7.5 0 4.142-3.3578 7.5-7.5 7.5s-7.5-3.358-7.5-7.5c0-4.1423 3.3578-7.5 7.5-7.5z"/>
- </g>
-</svg>
diff --git a/src/assets/img/checked.svg b/src/assets/img/checked.svg
deleted file mode 100644
index 2ed6b8fc5..000000000
--- a/src/assets/img/checked.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000002 75.000001">
- <g transform="translate(-47.667 44.45)">
-  <path style="color-rendering:auto;text-decoration-color:#000000;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;block-progression:tb;text-decoration-line:none;image-rendering:auto;white-space:normal;text-indent:0;text-transform:none;text-decoration-style:solid" fill="#586e75" d="m64.668-29.45a2.0002 2.0002 0 0 0 -2 2v41a2.0002 2.0002 0 0 0 2 2h41a2.0002 2.0002 0 0 0 2 -2v-11.459h-4v9.459h-37v-37h9.459v-4h-11.459z"/>
-  <path style="color-rendering:auto;text-decoration-color:#000000;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;block-progression:tb;text-decoration-line:none;image-rendering:auto;white-space:normal;text-indent:0;text-transform:none;text-decoration-style:solid" fill="#859900" d="m102.23-24.669-15.562 15.562-9.5625-9.5606-5.4375 5.4375 15 15 21-21.002-5.4375-5.4375z"/>
- </g>
-</svg>
diff --git a/src/assets/img/close.svg b/src/assets/img/close.svg
deleted file mode 100644
index 9130abd24..000000000
--- a/src/assets/img/close.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000001 75.000001">
- <g transform="translate(0 -977.36)">
-  <path d="m23.157 992.36-8.157 8.16 14.343 14.34-14.343 14.34 8.157 8.16 14.343-14.34 14.343 14.34 8.157-8.16-14.343-14.34l14.343-14.3-8.157-8.14-14.343 14.34-14.343-14.34z" fill="#586e75"/>
- </g>
-</svg>
diff --git a/src/assets/img/contributors/01net.png b/src/assets/img/contributors/01net.png
deleted file mode 100644
index 0040264588d73ba9d98472fd8a3a6b28d80c9017..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 277
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;V>-&(X*D6|XOs&36n*L+s
zmfsgHe@xE$zG&H};)<7|;=c|ae(U1(_x*>z4<3DK?)d-z|8o`wW5=++K<%6b9+AZi
z4BWyX%*Zfnjs#GUy~NYkmHh#$B%cV6(DMn#K%r7k7sn8Z%cW-{`3@`axCROv8Q!@5
zJ3g0#RV(z>?+r_p`5);noO1Pu?OO-Y>0Gi(`B@d&?OuLN=EY2Frf1kcsCTqH#rvG;
zca10a9g$DZ;w28|$hqo$aVb3zC#qWXlyO>Sg3D>)PZzIk=`GVpydA_j&ns)aoZWQZ
Vc!umdazF<#c)I$ztaD0e0sur!Xh{G7

diff --git a/src/assets/img/contributors/60millions.png b/src/assets/img/contributors/60millions.png
deleted file mode 100644
index 343b010a9bc4a60922f4aba737996aa3a47632f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 601
zcmV-f0;c_mP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XT
z000XT0n*)m`~Uy|2XskIMF-#o7Y-@}y(V-|0005_Nkl<ZD9>a3e}{o2z{J2no(4`A
z2Jux4Qo9*AU7#YYN(`bi8KibI@TFmB;B;Y-+P&v2TUhx8*J|fI7u6XU7#PG?-Fxqp
z-g?osTy56=D7Xg3|92P|L}%_fFYcPYNni29o6iEDzWzKr{i&+OeiQ$MyHEZ|iHTmj
z|7mLa{w%-y2pd*!Kd7(5+MFOcGvj2q<>kANM0Xs%boM55q1UnAluzn%0?YO*JbMLq
z606dlvuwti(kqUNZ@QJA;`>=eN$}#0rwj}Xs$$RdG&lp?EiXNmdj5)mfq{Vq;<9^>
zU*CKDT3hbZr=RavY;nA_kP{-#!|_v8m`jk4`}249*YDsq{JzJ)z@Q@jrag2`SDy2y
zZwyT{@BjVx7aCezDhz*~GB7aw{sY(Wb+wYLu)Y!#zhqQIur~t(!{1-ec-a{k7#Lps
zaA4pGz4!2%j@%ohV13^i>Z-QuqQtqEp`BA27#JAz<sMkcFJoX}SbNrK$@;CU_q;Jv
zdB)ER4^{?-_g~ocv%?<0VP#-oh_JaCWq#DolwsLX>#WJ@3=9l<3U6xtcWNvD)KrFP
zfH-l&N+|)Z&l3Ef<)s+(G#D5d7!F_HJ$Rm1U;Y_CFN38a11k%X1_*flj)9w#fr}F%
n^6fjr*Y6CXLdY>q)6@z8#=p5BPcjyY00000NkvXXu0mjflhPKR

diff --git a/src/assets/img/contributors/7zip.png b/src/assets/img/contributors/7zip.png
deleted file mode 100644
index 2f1087b15a7272db8b7d8eb90c7e41584569b36c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VTavfC3&Vd9T(EcfWS|IVfk$L9
z0|U1(2s1Lwnj--eWH0gbb!C6REXHXr|7%X@f1pr`r;B5V#p$<`5Aq#Q;BapJ^1puO
zTrtnhiW=_KMoQ}^Trphdr}{2OR_BNGX4_>a=5Pm2oNDN@&Cn={sn+<g<eAdmJNJ&~
z2&`QvD&hZ=_1Zg`S9vb~uDPj2iyEwojJ|q%|Gld_<t9YvNS&>!(E!@V;OXk;vd$@?
F2>^+CNa+9o

diff --git a/src/assets/img/contributors/accorhotels.png b/src/assets/img/contributors/accorhotels.png
deleted file mode 100644
index b6816e6de6106d50839325ec60525ab087f49ca0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 856
zcmV-e1E>6nP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~|^A0RYZ@^JV}50_90W
zK~z}7?Uy@f6hRore>3~IXOi=BIn+xuBtl|@2%4y%h*~J7h-hJLA=ss`5NxfiVq+m<
zAy!rvQP9G75n`iOK8Og)DN&<_Bi?&wEcRZTJ7YqkX>MR)VRrZX&Hwv<-^>cFwPp>6
zWQ|7?pb5|fkN{daXyvR4fT(RmE`$OkLK^=Czy!$6JVKa3?AUIg8n_Bn&DLsznE<LV
z$Il0c@FhkGY(9zIu@58ISqfGkP^-eKsU(zB)Iu73e|(JGrwMnZ(!>mJ!EEctY#YFA
z?Z*gpV+1=ff*TRis!?cVs#E}q^B<VKw+of~T9R8eu&j*{?8J`mC)j%$Uwm%`WHE?Z
zZ!Pqg&|2&A2eQfA{CG0ztxi$8*TuRI`x2u>hA(4;x*9?(rcfn~<tossfRGmRuP>2$
zeinq;FepeDN-IDieQ}}(?_jqNqn%s@xSS>cC-a4Da)SKVrywMuzA^0foi4Pu3|)xS
zi}TFCy0{2LSsiy?`eMY6OkuY4R+P}nAwN4wdin~PkGDW&D=83Ggz(n0_`6Pc0c!I(
z_v{SmcUPATVR!5!)HjC8&r$gKl5BDUl}Wmf*io#=plj-I55kTjq>a@+R1Z)K;i-&9
zrd(tg!A%5uPT^0CV73h)t(L!c!i4}%_8YTzhj7v#{{m4qt-^{9(K2`e--g2;^Ld+E
z^_@R%M!J~6@OKdE8}n8}UEoq)4L_|r#)%!7!k;)=@<G8<2|`*mmw}Lm+X)+XI2oXr
zdQ0ZR&GKZGSICkt+!fjJ14MRT!EEiTY;5I#%i4^}qnMgz{>?a<_czc^`j1Am+V>FN
zc8);TaZeR3dpFd|L1jLZo4L=gch@M)PBxTV2G(Om2C?J&@h3*G)@@&LOBPN(rPJ@P
zlb?BrlTNzrHn1M)iy`f(+yBGe7~vkwP&dL1)ER5Jt8S>kQt4Ow%+TOKLZze@mdw96
iq=@FPSrcHb0e%A{Bv!#u2U$)40000<MNUMnLSTYB(S?Bk

diff --git a/src/assets/img/contributors/backmarket.png b/src/assets/img/contributors/backmarket.png
deleted file mode 100644
index f89fdf454f88e5b42afb173dbe7bf318510541f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3111
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
B!|wn9

diff --git a/src/assets/img/contributors/benjamin.jpg b/src/assets/img/contributors/benjamin.jpg
deleted file mode 100644
index 81d4bc1951ba30d157388abf85d6b741508869b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15178
zcmb7rb8scmyX}c>+qOBetrOdJGO=yjwvCA<ww+9z2_`n?Wq$X*d*8qB>#oz)wa?zw
z)m3Zl^?l#!ziWSg0gz=Rq$L0#ARqv#uLJOR6CnEU?tcRm6b$rVfP;a7f<b^oKtO<l
zgF`?<K|(-4L4t!r!azbn{|g967+4r+*nc<w7Wucpzgb@=^w+Ha{N?}a=kFi@1sV_t
z2m}K`0f3@_fT4i={Rtoh0KQfQ`+D5}8&J@YFyIgXFj&xk<M<$7<Nxn402~4g5&#MX
z0{wRb01x&xj0}bh0Dwrm3=wUAOs%EaUfFV-szWZ($A2HWvr?FIVav>!I<{cr$())o
z_k=%2h>elUn)w#P-|rWn_CXj?8twZ#_Qm=#VS+_l2x?B6Y*+6h>+|?)TAu9-Fd=FS
z8G2E1Q)l7!kZ1<}6SE5^g!W7)!n!?)_Wg&cvJnhg2+u<by#6Ad_OR@I+g<a!)Dmtr
zOUK}-=?bt*|4zjv7Q)3_Qn!|WyANhE_ehFJ6Yz5dq5#7*QI`NZ%iafAtsf3+Lz`^n
z<koZ2$OflPl(Fo$7KK3`&x3{NAV><QKcLl1M^e!XAiHPA9$b)QKw}2&g<cpkhhld*
z-A#L}84uV>rsXlKnuv@mBT#KMt7)TgnUm(os;N)OEHprYwRHN0hRq9mDAO?-XqWJZ
z%z+D|&<}HBF-mt5(VK1+J>l?48)#cqsr`fa;2A3$Kc|r?W-f7JT22R!jK|`_db+LM
zh~rPJDX6Zs(ivMXw_Jzq;JF=@PWlvGM72@2JzKWKKn!SOi_8m8?jGyn52e8qU3Y7O
zTUJpPZ-4nFQl=q2`9IKaYcAnRuQ&_7z*)&^*h3rusI5OQn1Rtc=(x-vG%XPU{~!8y
zUjcO;oNDcUB(XyK$Qj$*cv^GW5KBhX@s-kZbLzo*Oi*z9Hg}K#YZ&Ti$Yj>cj#Pun
z=pij>xpTK}+wzWSI?=2r9t-@sRDnBTa<`ty03fR`Tw`!V)O-%*>KMf&*Y<HO>TX5Q
zF)G`4H9H>@n`DN<YwoS60`}C$gXj!A$GlNs0TMG2EN4TQRwss9-naXU3-<$|S5&dI
zDN*C{qtn<<>hro)@v35;`_Dcc;hx6+$;j0Op{E^ZwCjT-W=XbFEuzr&yx@)}myF_$
z0sNRD+>BP%3GYsqjh5DhV?S}*tp4W3qJC7fa7(%R%c#U?S2hd(?EOP7iW%P6h<PvC
zEfcigl@`f0w@)h`CCCrH-RAcdQwe8|RrV%v*42%Qbx#VOe_Wl<OE8|q%^t93cOnKm
z%_fiR)@}U!c(K@ClL)s>$Flfu$ucK#a*R^|cg^F1Y*VL^D{>%0>YuBglk)iTEF5Ih
z6#Kn8Naue6-SKyIADiZ;osYUa`X^tQV@CdmNl?HSFF=C*2bTXZ2LcL!f<{F{N5Q}(
z!D3+*LB=K~rC?*`<od!P^cQ|XAV429t<?yfNA$pP6IH0uANw*gEiGFcrV7?Gw2i!5
z5nTQPp!0mg*UU;nW#!SJ`lQuX?U+o4C1CyLZTM99us=#Ae)*Vj8Lp{GDmM+A8H}`b
z?ek!<!BiN`mwGm>GY+i^4?H~5HGG1q1lcHhw#iPJ#aFF3nUjKSQDzbmNW1Exb@D~V
z;A(ht%kobbyHAi1w8}IB$F!}o+(T(?-^M)6YME>PMAidEe%!dM$Bvh_9B_!hjAqu-
z!Xq*1oid7+*patKy|<pOw(qd2>SUmhF92(#S1mO+um@^68>SaW6j0XUjoSOT(%g{;
zl*x35t5J(US-(H5yT$89a!A3NJG)Op?jn<7;=5BA>F_QRi^Uv)Ng;Y&Kwxg~{|2Nm
zcd2a9RwK8zx>nmy%&?tiGvSc8svE^vg{;ii>|>MQPIq}n!M55-x-RD_+Ft^!6GZpL
z$5k7zJYZ1HeFpn6H>cafO6LUIQ>3azWExu=kCHA}E~H;Pb$neNP=nDL8DdtDjCgdD
zjMB29#pH{FX}KJXjn>t|bIo_uV<KWypmPK!&zz7;lu_q3U2(Y$tNAXn3GCsfZweED
zjK(rkaf2mVqOZpJlk$0_966W!KNo#Gm~>|?>StA&hPcG%@MxP1=q4^{T~DzfQG`x~
zs?pl#B;tPrRWl?Ic1z4nX4Uo7-wrHd1319q*0J@8+e^;h#}5)_m^ZQINJmI0aflRo
z!{7k)y%p2LW-Tmr=B9~kGCgwa2@scmP=Og#SH0Mpx>sTs6tG^$xe}|LcD9$xdUf@3
zb)Jho$w%Mhhxbzv6WOALIW~Rdk&Au;F-Mr=kgCciLD*|z`_a5#7}bdcxInr?pt~f2
zmv;A#`A|E=f-aKhKu;ZUlQX%-4~PV(4<?KKTqwL4P)sc|PGu7jDesH86jfGBOrEwC
zr>)bm^k{LEX3Lzm7fjgmd%by!YHX;;jGKl}GOUZae3Y)d!DUx-K4kV0i-&66oQ}O!
z&-X(~{OnuiSv;Xurez+dpHvS1o%JI`8y7n2)eEoEYH`M-7|lX|0lTjra|ITMM&3c3
z{rg9ar7rK^kwQ-I@4t@}c{Vm&-IQEjYLY56>5=4Gqm~>dQYfqJr6N`8P|pyLMjibc
zY{P@Z2922p90s%RO8Ci>(V<`wwey9ANQV$bNYJYOz~1z2J9fF5l}p9hHZxR2e2ahs
zrG&*c+^>0QyU{YAJ15M3CqrntHm=?^7S~4z`8A!-9_St9Azp5#l;K+DFy;Fa-^b6w
z{Uozamt@JM>FQETXdq&BAO+F*g4xZkHR5!9Ys}LYO>O%Y$YGCA8z%^pdn@vN*XPso
zxbyaRo!<_AjS}g_LJERFw)(?}gmhWv4Uc13x5ntEW}j~6Xxg{GfMzZ3)=s#{cX98j
zyT{9ytIuA4T8ob^!H3J&K8vW?55dRL*Sje{?K{DtFCyYY0f2ykf<t_%4oJBF5Yg9m
z4+f3`fl9&xiAE}{%xZ*;PIe9Dgh9-vGO))iBC2Za9GF<xIR76``jQQTAS`<QDI>X2
zL3r65>XLTdWzle?3n7fXDJ=_ZOM*p_p*(@+E^fkCo(y0>L;xcJudNdM8u(en_}H(k
z{^M=6J;!mMAz*}329ZNBsY{!J5#;EDabmH;SzF^J<}Hvz(_`ZCtik<gyQ{KnO5MJj
zx+0TWWl<VuY&#LhS6stwbb$?}=>uLif`X@0uPB|G%SyR{N9r$tCZTg9K130bm>^{t
z0jV|M?d?g^RnDhqJE3|}JkW@#BAKmC$#DwgM+&!BW^oCPV@G|{ehjrJ5l=RCwUoPY
zQ7zIOy-Wnhll}MumV=CK9d2c@pG|1kl7S>swnHexdVMHeNH#qv>9(RPPM*?S1%(|v
zLqw=*JhS-yOl8K@G*2WD`);>F4MQQlNM2ZT7!8jl29DMmjj&y_SUfsiHrLD$*^+^g
zrZIXu`e?D((f;>>*}Rbhf3G?on;ykgQ%zu!8x{Zq6A69h)mcyN*V3GX9*{D^xJ9E`
ztBCuJ_#E_?ca08#>7qrGnMq_PuvJhhp<MwLCBKPd#a+$R-VST(t*qb9q$>$?mqzV!
z{DpQTjd#e5kkVw4VHvHwGO>~Qi2PAkIfxI*g(^(sv3oYZn}#w?9!4&7IBl!y4?&a^
zE~$f(rab`|l`GH&IiDf>9j!ciNpkmt3fRCLo5C87M_q<_rbTwGww(C*r;5V!zD_~C
z^=BQyUYoIpvWw)hN#6m}?Y!(@>q}FFuK&E_cL+6A^Xh6GS5BhW+@N7SERvn1YC%}?
z$e*KJiXAjL>=PQ+7sINcoSNCc4@zBs!uQiw<;?H|u|I9A&Nn6neWVJ-XZ%qge;~I1
z;YthNwJrswiDX=w5M1?6zfY+9CvYPO9jUu@owK#>H;F8Izh11$tkS9*hp|&6r>cgq
z>?-HZWHfgcZkY4$KX`vC<2rMjk_tLbqa(2F&swi6DzsR^DC_7FcIhA!W00ozI6J59
zg^$F+OwGSn!KorYGD7b&W!V&Yp1}sB_p}R0x(kl08Lrg?uxf8|Z4UnIWcJ0@H}D+?
zCYf4~oG{ug>j@=Pm^QAOp@IA<u~#*$CNy1ohLv#^U*0JSY;=>#PX4y6Y-`Aom5RPf
zAPX{VAg@FjISKbO8;GXg+|sJf#-vhLf1DGmS<nECD?dKpmLG@gFT&>JEyoPDTcHJG
zO?$FbSanN{^3dILLqXu;qguj3cRo@}(H&(ZFo^|Mj9&u%>5<iy|3;w^V~i0_mu+69
zO$SFWK^F`3!+fTk$h+t+<B3y0JJTGMHU9prdi*WT^hN)hOqpiWk+F+?C5`=Gfa$Z=
zhh91~cUu^9DZ$c$dz0fIpbZv^xR>`cZ4v$8L}+d7s#k?giMv_!W+Jj&+$)E(Z>kww
z-XCLMj9HPea2k1g<)Yq+J(++rN-c4Uk*Yd@)9#6?+m0$5$U#B&<85hN5}vy8qVh0_
zmd*|OnUCc=ayUAq7_Y55n5tLA_`xu>lOPOHv^B(Y%&L<mUg0K~X$5PONeQLOW?s4Q
zg--Uq?T^2JCRWlM-~~F;yyJtiX=r{A1{ShBUd<tQXdLK7IS%H$$#WlLN(*86M}D8H
zyQu5A7J+KEDO^~g&qbc<lced#;s-538o`^npS8c%`{Fn1*K~Bh`M#r13O>_W75B+5
z_g$hdy5#srm;V9;0t({)p-WT<5|%HvghW<G#~@=Barz?5z{17>W~0RUz5fs;=s%)N
zV!n(rEurF1?t{%p>p>0)otfN&($j+i`%Jco7&kp_+7_0>|Fn%I!}~%HP*an!Ia#_1
zZCz3+<Gr`6!qmH`;s_B3QP8|u&YS8C5w^DCcfi_UbmdE;XB#c$8XeWrFCqEF@{TgW
zJ)w^$AZ~JS&0KL65~c@`-erC9FJKt2EVARUxC+IOt?A7@eJD+sPyRITM1MR<I8Na^
zT;+0d6)bW-?T-eD?c|5_!fO88;%euGs;Ri&DX-q(r+#V)?FfqpE?i!gE?Q1~&#Hq@
z4kQL5NU&c^<L1`6YFTt%=b~w{I4@{5l0X>|$|_f~j!DVK?7D6M<>jNkTetubM02L1
z+=M8gU5@zVt+vmkB7QL_RP^s9bjU4ZU%{Paztd9h%txxSRnjzQ+c=rSR<Ys@{vJ=Q
zDKl+^>!9VDq!|w6l1<voE-X1_@B?zDoUX^NigAc>iLJ9@NxkPc`&ZRXh!hrh*Sp=H
zVI_I!1szEm5UG5Thajh(qRc9vacN{?OYdeaV`Xzo<7I0yiOF}Bz=?QOchimwwPi&Y
zuwrGY#Q~t(Y<xqWPvzOp;~Iv%dv>=Qd8~^^(?FHKQiJWVhSG0?L?tZ5$BJJ0g$%5?
z#o4p$8da2ZB?cXXFoVvJZPwCx{PhXKR>RB0?8<MVs|1B|pWDkwY7=<ADfhN612ZeY
zB$1twtB;fvdmCr#f+VhJPZjm1Z}D`O67Mu7jMoJPE?d9c9k&g~0{UxZvbl#+C59#T
zLCdNbFM-VA(V=CsTSX;4)5BGmSt5&+=Q_o4b<8856y=r)3-D=`o@6~fv{~h&$R=uB
zE_Iiy>o+u%He(&zvQpA#MA7~U%>e9C{=a}Vi7rWZn%`Te&B~oK(dE~bmANM&XO1Hb
zjOkrxVRV|FDprMyoT7Vbs)su}BFoXQ<ji`?>=9uymTXq>(L|>uWyqX+zS7#MYMCa;
zpJpnGWZ65&#U^pGrD*)ryefzpz!nKC_v>OtrEvarWfh}N3HcPlimI?*(E&iJ>d8P>
zwolm774V>6WR>4d25Tys^&)R8t$E9Pjd0@?nYjJ}%+Rsh`f2Fry&X%^xVkpC4Uxc{
zOFc}(cz~FR@=Pa9W*7{dzy9O`-O%b<duav<ON^8kI^Wo<aJ@R>x2wvMJ5-e2w4%Z&
zTlU+PP@XfJ(AvFIm4vOpZHwmrAQA#01I9*ovOB$^Q8a%oztUoIr~0PSO|Qh#uqLSO
z<dwU0CBp0Gi)c}l%9nGOEw#3H`SU=m`cH)Y1w^f?&5e^eP_Fx%AppRW2d*>bcE0s0
zqu81JDfYarIBJ`)@Kl!R<zF-*k$0bv%BFKllo}nyWDaF<5mY+{rPmOSOhLG5io$G;
z|IVbXvVNK3`52}HJ|3N{D<5!JE0A3ZXYwp3yjgG+sw|G*-Kk-9%d*MTOey3Yr#iT5
z<(06zr&!K@9SZ^rYjWh}uW+WgL}p%AmZIj+WHLurup7UIU+!Gx@2+w5$RGN9cFSMT
zFv_Cg@r%9`ztT>Sud>uvuK87Vg83pakbhzi@TK<9ScD--S(S~@odU_&L=qe4F+^32
zlM4r~p^!0&IXInDnikl(Ox%K!ZpfKcUDApd_xArgD}@vUg)vY`OlZeUkZL@`!UHpM
z7QdYID_TPtw}=r8h?OSXx;pQ8ZAct}<_+RD@kaXA-o~msOj%l)ODi3RgHJBaSY6?6
zZy+=3jb}nJqeEYr$4jj@tjED0lU!M$BMDa(<Qjn3&?`kZbr2P#NugI7C*CYFl-0gF
zc0bse$u0iu^@pMU)>pB65|z>*V*xl8HWT%6D45eT`mx9$VtptIQXSc+H_9+euOtl;
z&Lnk&0^aT=cJgz{wx+)We^eoRpO=1;f8vy)A&pIkPLe?AJyzSnp?ausL^5MmV|{9f
zF((nIq->PBzm0vpv6rl$e9Uz7lZVUf4mW0|N%9wLW`sRK3)8sd7}$2})t-Ry5Pd#R
zt)@enV|gaziM?iC?3r0<a!<rL&2^sP>o0ZORLiB<B0E^gw6!3g?iP-6>XnL{PHApG
z(H@50xHqG6Brr7zk@2DH*5Lsnu!r5}5Un;BQE{e2wx=I8k{NRf$@Aat$9VAY{AQ0A
zrh$n-Xj+O#SM7{3ed2f3oeeKryU9tS;M*=R9aRQcI=lL`V)Ed>0EG0;G3{0EBJGQ=
zsw6E^2Xm{iG+f;<)juSmvGMd~;Y?Gz-vX-BT<|1_)8#L~TsQ^sj8mY1Y2Wnr+8X@M
zje(8HJursyv!kdmV4@{Ds`h?Ojw$zdku;z2--p7aX){J94S#g_G_%iGv--3Z38rM?
zmnF5YZSMZ*`_`C_pHEycX?a+>;x@9OE#FDqwsqOpS4K6)wt;=NH-$kaOhHnr#eu0>
zt;#Wys-VFesrNW&+84~n&x$KWi9X3`GWck|T;il*Fr$SHw=+ERev@U^$z;D!BI@M=
zss={x{Cnvfc~|LW<~DU_+nv2&Ui}z{L5{^+9>~BJL6Y=`Bl?dh@`*BD0KI%8=;Cpb
z8h;#$$l|z*i_Pt5SouBEli`wvx#u5W2K+{I!4RVq=onMZ%kRrS5y0%j6Hg`JU&5`<
z%PZZ}tUbt+M3(Bik_rrdOxk}p@O!SECQfI`%W27hk+v)92AM5XorKo6C&p4j==5RM
zmd4p{T);{g$PTPBW-8luG&A+XQ3A5(&gvLT>j!xh!fmVT%{)iduBeq$^=_RXIzFJ%
zNdym+=PPu?W${o}M{+HC=ZB}U(Vw(0Yke?S<rYfs?WwVl^P#J?9_YCr+Ky_3T{uZ*
zFWt~IWrZbKdz!|bD=FQot#B?ID)vp{c-99uWNxfViA-A{NSvd~v?X^HoG!MLa&dJI
z>*?wFWEN`aja&T;()rd!DDf8{xjG4I8W)F1=BS}<B{gnFd~QRF6tTJM<FE6^^YOgz
zvnlY2eDF?@sXDCu%mN~goLLOp7#(UyjSpg9v%2wIo=;aA))Xb~u_Eo}bM~8I$jk<n
zgLv1(d((Sg+p};VI9AF*=etSdM-~c&z~M~PcV%k^yoKJWUFuZ7Zk^e!TC<LsH%<im
zj^ac2^oz8B@B-PSPwyskh=SjnvVbA1WbciA!kuhzEzC88N#}DYf^|b~nVN><hSo^a
z$6oXIiTB!=o%f~7_DNLTf;rkij_MGbGy;Qs2a9T&o%V2zyRXJyfH}|3b6xp3pMbS>
zl|j6!DhGF7ouri=k%!fSEWKTcwM}0Dyr}f1%o<xx$kHtE;;hs}i^%2H+Qif*!Id+J
zb7K@`_0fjDWD??229WLYYLe_-yPEm?L$~S!&G&iw_uZd4Gc}HfxnZd#tq_tSb|AD0
zceHg(X^TMd7MO#s+QPWTMdOI(Mv9FAGA6?d-*a#OCQMaRvT}^iQs7{;K~}c)uG8Fw
zr%@?egdJ&ZSE}Ishz^Fl%y&}dQm(^}M_xrM)U&2@eUF1a5VKQ)fF(tG0<|UddHt>U
z%}APa=PE6e<ipIpDHD5dXTZlAzv+_a?kxNwGwifuUvkv5dF>QUVOaVG=n#p#q>_$7
z=@8zgw*dx*8+^;X+6@l=W`7i;J7F+-xnRksjJp>skBw0zP5P!jbUY%5JFP6n^F>cx
z|GpG?VW{&dK?n6~2EWh~Uat+L9+`a5#)@*J3uWcRsW@$#K7~xBxnOjxXA+})ul%fs
z$?MUk|3dtoaaKLs#e3!-3kA|B>-U8&t)jAM^;i+~8zG0rO<DaZdg!TcCIbZ01)Tep
zrNw?BjSxJ?WbL)~1HP+@>|k$WCuvc3Pos2QDrr5C@Nj4M+s>f{((8TI_H6GN^1pxv
z)g|2^xHAa9;+STN2~2CB8P65&Da4_DUnsu&Vf@%EwPP6m?=tCFyg$A+(m43kRQUXj
zp?=e}s)9-Y!T2}8h^(^YZnYk>9Iy28u09>j9XlwXhsAs6(|AX7`b|SM$Bc(S+M{w(
zQP=7j1xshbRw5gWGL?^o?=ob<`b}@$eoF<YB#0Hr+FH8gMup0$u73dd<`p;*YTYfL
z29(8SfvGs7)mBr0C$2O`M?P}PpHcro%;D*ySC~1`$Z;&ppB(ll)NMPtQWn80f~zS<
zQYkldlGST9H_OUHZ-a-g&Er1ykC=Aa{!c_7(fD)IzHNiQfOH&ljk;dvGffY8)Oi6b
zl;uuGH;LSR*VuUd@2G&06NO5INogY^m(_FwIm<lJey+ur@~eko(@Y!k<s}#P2*fQ@
zGvTt&@8AdPyJS-xy?}`9x1Jj!OSTQ1(_G|Idc|hl3(a`9(NVO+^#_zJ%qwwPJbtG6
zFdXNaCx)!7H=LAWWB4onI-XWndP44b*PpQ`_O|}sCQOrOMhD7+VMTg%Jop;sZkbG&
zne3A|C{Hgtlm69D++*MJ+gn^CK_nhw2oISs4pFLjI*B-@9QN;r{dCr!rn-&j6?s^C
zekmVKlZD#BM&IRARy(_6+CPNRddtcxQ<|iX@+UcJv*9bxM{wM<TEB|bh5UE}b*Ml(
z%s1tu6V9_pUag2cO4Ifv{ANcL!<k6}M-bu5D@%i0>y%-};Xh!Cu2&R(0*+xwq89<x
zHPr?+xEUugYU^L6KmHm27cfGp$sMkQwIXWCU+>?H&LQ|a#knyu;utBv$5`r&#!%`Z
zq1F&bF>4ni6G3hoq$=Wj+2)U)u=hHcVPD3K-Zq*kJU6bjx7vu3Nm?9h;M)StNtn+p
zOLOpkmOd^~=+iI<g~IpLp5dS>Cn4Tm7Lr;M+?~M>2|PhB&t?j9vAv3Jf#L?jK6los
zep6>oMX`-%+yS;Ub@|JNwqm20pkUI8tat$n@v<mw=cI-HVN*LnvAT41&_f9C*hYg5
z`Vp1EL20>BH7AZW#=xlrB9VvZ9RA#h;wkH<HQYSc3Lx#WgtR`galEuS?AYXwV0Y1u
z*3)j5jM)nu0+z>&(@LPS1;h7cig0h|vaMeJ@`}o7ipg`lBg)E(o@ny8Df=m*ZoInB
zIH%8cvcG`E$*29gnOH3F%c?E5nMeK~+>g|Q3WG*U!r*@-(y)5#qpUOa4$AeUUh5Yg
z9eg9O!@3M9;oC87zW4e~0aceP_7p9)o)z=gBfO>MC6%*OTD;7P(Ap6{uo3e*(ySGR
z!gGsYtCeXIfnAq<<>^D{ooP<#M{}_H?<kVcO0~|SI*aPN`rk67JkR>XiSR{%i8i`3
zK0DAfwwv!;!H);e0yS0dcpRJt5Mr4@5hC8=qE>VbH{Y{VUFOwvP?qKjiY^fdyJETu
z74pzOwr9)7t6p@rSb&L#Jf^J+YSL&@6FKrE1iA=BGDnhw@6)N>eCcXtOZTMQ!O$zk
z8z5IUtMyB{dUkEkQ*R{eTVYnsG4*_D==ow4!@S+%RYmd>R%qEA;hbg;$;6@=<``PG
zDox{5jy&r4Ep@#wsmCA?u`edCOf5u({@su=RY{Zfht@*iL<VsfzbW@vwu(7sSDXlV
zX~+DrH@xyP()jnxD?$&L;h6F9K8OVp|B<*4Oog{<lFCx1J!X|EVZ>k~qh_=($~O3O
zqjIu2>l>qacrRWy#=~F>@aMwD)AB4XMO`OdH|9|rRr%z;dAvq+X(K;rX@xw0q8tU~
zATvUJJBc}WS!wCC2G1B`B_?lk?Es$@gRf}n1tKQ>YIAgDt$CPAfx!;as*gCLNn(~<
zZXg2bWbMFRyYk{w8*#ye<!w(?Xs$=<OG?ck_3L|%NxneaQQV@k=|}aH3w~EMt5<}W
zOhsy8bRK<{>sRf%;d-}h6odW2jVE=72T-B0ToN7B_WsLt*O|%pvb3+*@bmUB;AF6V
z0%Fxzs_oO?u6K>`P7o<ypcirtRAwwS>-WUTc4!h!WqAZaeIvjS$tnb-Q~idKRbbxC
zSsKw2Im~=J+nI02V{crPayJI6QNY7UDS1?G>jLpP(!)@4>eK%(z@v8D8VC+VW@jod
zAYGg4{+1bOG)1#Bi}&JcG#A9xr>ieqL9n@f^l0cUixsdl@^L!-F8W~iJ9?>^-0By&
zM;u9-yaYuAW8taPP$_*`9Khbgp``Dz@xY+s7l&qU<xz*8juXQnfBRsnsP|L%4v`!k
zOrbg;RRh0wt;Blw9tc56py&6_den&PCERolX#B{xXXUZxyKR~n{0n%gwdJ62u1NdP
zv2_9(#zf~?<d;Dq0&xEVQXIPpH80XFi}C4KBkn^-Ipa1$KSnRPwRy`?<c)5N>-*4J
zMN{$}EDRZcyzSGJlvZ!W-O*qX^{qxJkVzn9y5@afZr=<IOQT&chq;Z$ee!bo(0s|d
zdci}Ln;%QTZ3$C^rdmxHC@*4CCSc|br{iLnHP97ntUXaS{`6ox(aF)7B*-D1GC>vk
zydm?OG&28@JVr!sIdw;-D#JsEXCyA@C+NrCi05fSa`6*2T!z+#zrZy~A$(;5>0J}t
z&aMHSHMN6N0Q2eKn%z^J0YYWIN1DDh83nzKS5G|ae6sWRERMcOT5^W@&LoAMT-?Sw
ztyqj`!q915zVGHNhzsqjT$+~Y-V(Y3`R#jATGAVBU`=fx*5YL5sNfO{J?$j3nIM(T
zRz5$QbP3$9%!T0jc|1MEivhgT2I7>|cWH4o0~C`_e5o9^fIth^+xtNp3GB+LsuE43
zNSyWT1c3et&a5S^LtT}70@AoakpSorDpDN8iy<?aWF3ZuH0^2Dpr%I_!NL=56QagX
zbS-tAGzNw&0sKfm&_A!6Y0d2hB)=U_JN)}p{nO!Rw5DHnUpmdc=|&S!cx8zwGFZ5M
z81Lfi0ub?=0*~TErG65m7n#W|vUT{gmlKlRa2mWcC?IuX{(!7rGf5+@E~!aNt7F?v
z<f#)Z`D*IiAnnWHyX$-$Ks}FOy>UB)AziJ)eO`pWJG?KAz8egGrT^5(|EwM$;2_{%
zeVhN-K|oMQ04&1FMoxi+$cc^D1M@e;%>Pxe{OUFfk{JGsMKRBjwFMvYXsl$8q=XUP
z1nZ|g=mk~qb{&*|o-4s7YeIBE2`W@7^k#g<*0iRtcA`mw11;$xcgvV^OtY3sEe=QC
zMv_=>EK81mk7!v-5(v<Aydrn{sz1?}Rjceop_#^*pqgz3X*0wV7)eho9YQ6uMqC+=
zCxeiPCvjtIFy}2%pWcMcxC8qa&J3GmEqt&7G@9=$yP_a7!UQPA@+J_&3}KA@V$p^M
zspS~yCk4t>BH!vyz@_Q`0s{4wcm{PS=*1e*;6%yEtcpV-tEdvG5apbMKs`9+aRCa4
z(f%%R(418S-&QBFVL`~_SnOMrW_OGhb{yo5CAgB3N5r5PK|?c<?Ny4H-E&uN<TNXd
z^CHA=Rs_|xgQ%lV7agUCNl|A~G<9ZE18DjrVBnR}mteQljF-XEtCxQv%S#jZ1rqIy
zFfT!arH%u_hJWSqT|e@H8c6Amvx*%%2mlKH0;CA9c34hbQz`q}SIF`nVabA<jBEl9
zf9JeRhU<nI)o&kh3$+^?CDa93jIUDfK$vy}Mi>$nVkN)|gC_~UOp&ZAgoW6Sg3rH)
z&sUl%qfB!D1<*|{CKX_yABB*zvr()?`j+Ld_{X#|oNkct3l&O;<GzUjVg$wH$O=~S
z{SOJ(>_or{XY;>hQ1udO41vi?_{ZtY4K{--4R&EF^8b(wUEid*KgY!Xyo)j_p8x*L
zq5{EDE=!`Kl0+VnLd!(czSq0LI9(Bb8e>=}G-X|hO$F=iu@D4J+vAX^cDg2lRK#<1
zCvFQ18cZHRAj~xl7CgKqt;|A>^^^IGcgRpVMf8^)`)56x^!7f&{lJNXh|hI^5ZTV&
z%C%-TJXNdmuBQ7wCXyz?Ux2O6(&FQ+&W?CzakDvRLbtfn8UhIj=PyBv7B^0z6f-F4
zNKvt%v49ZbrW0<I+(X5&PO#b}9%rBsZIohxeVvs~-f^+(BrE0iueH6x$twKEpC}RD
zoY)NG<sT%!a^qTyUaP?%K0q3ZZg*5lO+=S`K+oa#&oSszw05F*8LDP}zPwpX9xDv+
zj(kY9B|f=7<ygjn?*dI9VoOidF%qUoenIf^mr)n42-S)EFg7F?ko^dPJpAmbo3d<^
zph@?-uxe0RNk`EIs9QBbnX*t~6$ax$+b_{c3dDf$RXu&{gEz#;iQr4X>eChZ<_BKA
z2s25iI0>k@8U-yS1?A0f7?j%w9ote!6Ud4CmB2tje2WbVdJX}OzoPw)AaAemU8%P}
zpyOn%%2o{)H_a3n8c|%>a6JWDnCO_LLo<~&?(RS@f#JV{3@>jZ18XD~p22Kz-bmMC
zm{QeM!<}aW4g;m})0HFKy)Ux7>YQgA_u`o85FVv~2#0FS*lB|LLH^xLQ}FV8@G2PN
z00P-T;LGjoKn>Vvam3KYo>*(YnpzE}?9Gpm>2#x?#Pnfu{KB9C=Te7}@Ofv8iTokN
zl(un}5d<{qY%3w?InWtFq%wxKwa5ALxTr8##X?8kCZ6hb20};&WY&-%7b^8ak0a*e
zyHx6lvGW|JIlRWFyrZZa4~6(IDqa$9DLb{`qv~`gq*${=8O~z^$yecNAhhJHskQPx
z5?EI7b+~rZ1h(}#2@46LmO*2YxL_hup*=v^Q;6$@%;?SlvLZCI$WY=JcIX!HAe;!W
zO38!<JshZ1zX;5<XJXDvKBpSp1X7}SNZWN%=|U$IES{1UY60kK!@XQmVtW*{g19)Y
zX-??H`B-!6+7DKAfxX})#<7EOQ*Y=|N4Ou3E*<=H6VN|}^i$&|rf_}**A4iXUmS=&
zi^_eQLES>+expQUk2cPU9*0psUO9y%LCn18ctCj-3V9_fCb`!1zaA67guDWq8_jx#
zS!S9<YN$Ct6Y$3oeCtktRI=0!L5#{oNCNb2R&%puVxGsjNX#(ApWlS3hHJG5+|Ecc
z`OnAv-Wq6G830BbhXU}rME(MbIVm2LrgPpddwPC0d!V{`M84p>_O+uR^8MhC#i}up
zM-D9e>7a1UQ8Tkm*f6IrQ9C+GGzN!!hwEuNP_sVCSG_ZIII@7fdW1XLO<(j+p2b#;
z6!-WT3zLC5f|csXdf<qv;RnBq?T1PcPqn<U!jyu(mbwkowjESRn6+D?s1pz>&i}rF
zZsG#W$0-mSPBN;Oej34SF%+MSo*>#d`9m@@00wdd8A$}R(sH3ZVNj1Nd+G|rvVCu$
zDU>ZoA<k@3*39+DNE6TFiG@y*Ka4BP?cDTf*iFbSaC;Jk4B03zhg%B!UtmE_&rHDm
z4W2A;RV-+=?~)Qv3r(D6x5iN-E~b4VyJ=^0(hi-yB?q38vk}oK!ONV(h-gnQ<A2*n
ziZ*H<wou-`8mLoHXE_B2;CxIu*@Ldydddr)h}y4e)QRjg^or7cMyeOy1I5f}H&5vj
zr>hjMNQLyRk#h>(3Zu$J+?t^>*+&kw3r1;4IX|P~%Iztk!<xVuDY+CHl#&C+P4CAU
zjgWV|+-J@oFS8GBJDUY4ed^2nqhF0~J`nW2dNiYd0hG?yul`?^_W$@W0sp*W$eS#b
zUl&;AEQmN_Kqk#kni&^FP<)TfH86IXd&L#xz%$V%<xS368U14plmfv3K1E&qu@rHb
z74ra(^SjjMq0l?8EwlIisu0cxPYjrKhAQi#gJc1f=#K&?9dGn%HbxdhL0<T}ZV|Ni
ze@#znl>f*EP{=PU=zp2jKmaHt|6~KQ)0Y$EI&ffqkC^%9e+(hW5-Ll4KsX3ft#tn}
z%A((F5Li&{A405>p~hO{KQ?1#%THF&Bp2VH(`M!aV3f<xa3s48P=7DhBT$~O3hs;N
zQWCd;+c<fq)<gZq>+w5^mW>|8K<e!$EZKRb+O=$ukrWNV#OVF8kGwJ#yb4`RNJSb5
zwcGk3rvDCBy(cQ?9D^LZ${AzNy~xBi>K}-DA((J=H5db^zrF?}2D+zIOm#>9pfM|D
z@HxWc<bF^-hr4{bYLP9{`u;p21;~sAK|t#BB_o5lJV{Oe$%TBPugY5m0&M(ED<!{9
zP`)O7>Z&K`e+$EoUxOOO&9Yb0%WVR(UG}`=pG?=yjl2BA`@Yk8KdhAjon=q{k9p6Y
zQXMjA_d~~Dz#u~zk3U{of6$%q=;6?<+=Gc(kTPrH)%F#XH3-603o0ak>QNHNBlk;i
zbowlA0NqD?!}zZOm-Y~(@*1{Gb6a61%+S0(2?qX){9Ee`IE_3nJ{LSHo#rL4d?&|3
z0kcd03XpekB9@ufB1XJNEVp={5e0SNAmj?_Y!Z6h^KFFjEZ+)p?;7q5%^Y|6tz>45
zXM77DU!o;bqBrVbcn(0p=)Pi9Z=!bA%Hh`mn(CcQV#O9CXf?H9_#g9{)i8o-J$H{Z
zi|RXA0iImJbC#E($tFUF%OwyH=Kw!~*Q+dw)O;0=(OjSYCN3tA0p8cAAfL_KxZ?zj
zRva+FA`4nYz{j+#IJIxlk-2{8>3vlCeqn6ms)~ylWY3<;RD)uoS*>d<=)n3AU{%pF
zRXn8-OC_&It*P9lNv_=OXHh$cdl2&WR9*43sNiS~YSY!viO{)^2@ZO0v6N<u6#BSh
zP?|CfoB_2blZNV{@Lm>EHaIX8IiDN(C=`mt$DcJU&^8>LlVhB6u>vOkD0Npg77eS?
z5oI<Fe*Wuabab$3&=CwG;~gHDBjXE2wDbD09;8i)<2EHHWcdScK|QP+O9kSc7Mt?P
zjqy~Z2njM3bQ%PFN%t;~Mi{o^hS8Y&3VQgSxR25FeU2g-PqLk^Jl=Q@xgjb`2*=8q
z;{nV8Cl-~NjbhXj^s4lJ=y9V=tD0_}^TE?8B~t1eK7?02Y>KfC`QKZfV5;vpUOvkk
zhUC^cCAgmd0{$0=U||2``+u7c{tJiKUqJlw8|?i@zyFWl09kvpGOS02o*Oe*8InGA
zYfkWmjaz{@fO!A}<6w3PZZo!p`H_s)*r~#JR=5G0!1*sAaUjWjIJVUK;ExlmnQUZ3
zu3l6_xrpUt4^z(1DZ1U!DWe2RB1uP)i&w#=KN5}Y7H@aI;WGJsUYzKHBpX$C7`8Tx
z?_82%V4>rhi7P)$uFz4+@HSR2_bT#Cc_qt48e9&_Uoe?g_-Y8Iis|QFHDq9om8OQ>
z$az;-3s4dV(e#$k$xVDeC8CT@Gs>@cM`z{a`=6psSMLZyYYd|{e<TD+Cq3h7hi4Iv
z>3ow^nrfy7-9~8x{n*uChL{_uAV!yYNRtcBR7jC*@QN^eoCHEyYAW%NcxgjP4NLK}
zAidjWMs<)$P4DtyoMZ(H!1F!z)cwiB2`}}fxN3h6gG%BHFj}{pIE(ib_UiO_48_A<
zj<<<WTM}u8=WBipMs{cXdP^7SO;hi_hUqlMd6WC<OJvW*Gk2MZnfpevjo>t5TjX)9
zF3mlq)y9S|%lyHZWgqw6V!l`>4`@9JN$2+81$H|pz@8DVevcv_qv&#bVQJr?2<+6?
z_dE2^tbjrmg2WrWZ1pJ_$v58KLAF>=Jm=C>Hy=}4#(<zN0c1IS7tS2!J&Nuu*3z@d
z;+*tOrn-kV$Sur|-BQL3f|aM-EXoP?5}Jp&*ngu8NM>}LzBeykA@8s?Vy@{Ex}NaA
zO}t+@Oiv1j&=v$o$g+XIf5V@QEdn-u>u}NYo|MrHy^71BBBL|%`)+cRDT;a&n4sa$
z>U)D7Z&liJw3Cjd6_a`xyY0*OxgT;OS<>_gi$JZhuhPy5jI|t)Xh`C1@DY@fN_d|N
zm3f@9yiOiVV1Yr2gn4VJ(IDu$8$#b~>LNxrUJ^QzQ&ZOvh-zY!`W2@eJ27H92g~H&
z(Hf>_2<^`QoMO3vCZYDzlS&%aFF`pHp+tnO5=`KIxKr0ff_YZc7Hd8?VnCTEFp7e7
zWj!Bn3-&r>ALNT+g?0U1;4;l5Q5@3->XoOs?^_jH<8Q)?wy)j^v!*}5R~Nr<M2Y+b
zAF!`ZIK)4%<3AvMeJ=6e``JHhBk?u!f4g@6CBevC$j^-(U>b498)X58SqaKCts!RM
z)YP|@@_)XwzU>K9!F2A?%M|*jez!2i2sG>$lp@Za2@n|+GKa`5915dA#Y740h$=)D
zi{cl2PF3y^6(Ck}5ejI+Zxiyl#OAbu`H4Ra+slfggoDhC^(;(t7B^MlOi7k(jGF@U
z02jV1IS~yGk^%0EkN;Bx)b>Gddb@i<2^36LSqD9mx<E{XH;j*!a***L*<*In1{cm#
zuOXcq27ocFC52$rV@5cceS8WTBPK)&Ko*Jo`IQsLvi5xFEmsCgXl&(gkmgk2(gO?S
z?6BUX5iV0ZDf+kY8-%#RlmhnzHlr%XJpYhC)(XW+-1lB3tVqc5LOurQbm%h=g^eTU
zc9*EvR-eqkK9;2jOL~#j6`8Q|<@`j)4y(gL4`nu1DF_G(hO6_&n4hf;KR_NYmo`zU
zrxA!o?2-+j#b+dxFz#XP|1MUnOXz!RW*S-lgy8U-ynsz0A`y(vF-l#wTUh8P8!U@i
zW0Bn4IX9P4Ci|&+mOm(cT)Ovs94RyyOg~aczGm(p@F5yY`5(S9%T{vvVg!Lq^(;gr
z=_bA^kd@unuugjooZk~dnVPOLoehNIq+iN+S^a+aKt)1q*qw}FJQ9E-ME%OxpagH5
z=CPv!C9g)=bhN=X;ej+7wX>DD05A*p2XhyPfR@XP-^-FtA+X^FXiTU8wiqASGGri!
zt3JOgC6cw6NPI&SoRXGIeX{TRl=C~Rv%IMBTG)0Ppl}rtQdU_;*anA*n=Z(c@EC}g
zgYZob&n4LH4kj5*SrR{)eG+g9vPO29UQIWJGBmaKq`v(vreNCTxfa-%2{G8x92TV3
zuBaOsUaA|5X(KaqhbT870+P%*1cl-3nuVOIs-)oeDk9r5XsOb}u`B_LARw$44TQkO
z0<YaKge*4XMNaTRULvBBx;%IpuzDyhmq5b1fM-5N)VnDzKX^~zi`yn0GI0nkJGhdr
z#um%1dw-h2e=Se}h8pUjm*Z#zB@FOdgYcF$MUA`?3v!14@LLm=FJX&Wr)LJt;6X#v
zh+!fVnk|*Btk92ZQr8Y{zG5!0MQfxNeRbh@tHNG6sg*rzN~)^MhDI(b#%{dr6v6KR
z=3%=L#J_yagqZF3sY%0&K1lcR2CbkIGV12t-!l4wA!MMDHKqXtiJKTkr14Vj(=oR2
z#Y%~bk~c2Sq5aZ@RskDzjWd4%8#l#+^<(utQYvsLou1ui2zySN@Z%G5VhFhrAziqv
zH!Z)2v&WmU_s<ph_jQ{mr_f2YBz3G1=C7<R{EL><0@z`^YkxyK;SBHzOBO=MJju9O
zzB6)Yc&pPbg3=#LnitZWV$%%4=yJ(Z6Tit1(tBxb6T-tP##)LXY~PZgpyT2@sCR*r
zBawOvW~jfbko3^VURH2_a!7${+@H@L4X+?a{E|4-X~m(v7P@A;5fw3qp-)Ck$5Rf3
zr`RU?U7qUhyozj9Ej=zaC%hhN-md~>W}0CbgT{e`>IJZT=6I@^-Gv~KlySYb8Tx}v
zVnz@Mouj<s@LPs_-v$<Ojz7(@E_eVUfXE_d-gJj!2imdm@-8IKi`S7C^v_HQx1fdu
zIW7c{9P_*mcae&scHHN8pVn$s$Q(-XA#pufW>1-yF2!Jh(fff9mry8TCg=;9IF{Zo
z9~4Z)ah(1@Nf}LVPrY{zT@`Xiju)_&ovs7Jsebw(C})g6cymSV9&p_xoo6wX2v+X5
zQ`w$kKnuxCIcAA#&P7}@6x{L=#FVH|W5z|B#=8XBY1au!#Gyue#6F%^3Q>uWnau4W
zxl);>OIR@HHB}(!H>)1XCC`g3Hx(D9!M38Aup@*lvu@3GFpaDM+TGdVb`~i9YFj~R
z1RS8XqxO}c46-^d>KfFo`4oEqpkOLsaR+?B=bNi9z5uay*+_(CEsmW&M)lCe%jLq&
zozJgRJn)?Ii9*rc3<OdUUS_KX8^r1(Jn*SYPhserfSX(*p+)f0Z`0U={@{2*YWPHy
z4?m7T&{v`;PN=>elwLx%MJOeGJ9L{`c~c@E3l|K9D?KjCKt=^8T(~sVUrQ=cf~`Vj
zM1U>s07$`rRvFWo<3wN&x45!IT`(WFN>ixM9r9O9)WFOmFcbHc0?HQXz<_YW7zA))
z-(cPd@Q@!mg+hO}<sRTfvMY2H`m&D58R{PXpewgKiBAAispQgZqQcJD2cyXF9;&AB
z&1mpzfNCl7BoJ^BpD;(QeYsIcuS3)&Jnw2PP-GlL=p|7o7FuScDt12@GWn6#46X$^
z@5J3d+Wm0d`u1i%(ANeCVF&8%j*x-Jpl1`o=tTP!fq?~qurH;|OO=~L{}2a*Eim@5
z{*(^Wg@rw3ZHB@UX@{53c(B@|jF5Va!;qTOtXuW}Caen54i<!3i>iqG;~FK)Vo7;G
z4CGNHR?;G4Q{wX2OPRqeg!AL`#T<&2kHto9sWvScj7)pM5tHKvwDFcIh}PPByPov{
zPyQk<PIfjKbWljOi147n!R`k)0)Imsc%AZfc4lFd^z^E?!{yZcqTH{HD`Qgx!W;Ny
zY107uw<>MbQw9^(a`+OlYxq;l=LVSl))8LD5@Di9JY?X~lbwxI-b%r!4@{lLLyQK<
z9oOvYuj%DLp`cfXe5$VO-OwJx`n*p;%_~_wc=gHA<##(&r8y$=rTJAj8NGs+6@Amv
z`S`%<gGUE=bxDVheFvU0RJi(#$UV05bToP%QxX;copnD|!sP~@S!$>(3Oqh`HQF^x
z9D;O5EKRjkG09=aHR&?__iW%doq!Bm#F5({E=daURCfnxX5zhz=P2ajEo^ykFH^|t
zQI|ye%_`!JPywgAH8i9UH*X5xwd7JchY3;We&HV*vM}TeHnGHOE)I=|F7`4F@ubTy
zN?D}G8u9a{AcwT*4N0sBk)VuN*|}W`1h}mml*(MazV$~a6GR@4Wn$xgGjqEhRs2{%
zFtT#^@>Wh+4)&}GCf4^&V&ei~9tFA6P(kgtS+8&T`ZtK->bH^+8X+lvUyXT49bRu%
zd!A$@z$w3!$2hVB1-GyP&~7)0iNKz$H?QZxg3`8^t3Q?ezRYfKM92PHJ{FIeA53?G
lf%iy%0iNfl`J1mv`HIb-7EIfJ0WR^oJa6lxi~fJt{|}|+QZfJl

diff --git a/src/assets/img/contributors/globalement.png b/src/assets/img/contributors/globalement.png
deleted file mode 100644
index 371fb856cb6e7cb552b936a79e5e5e781df37c80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 951
zcmV;o14#UdP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~|^AAPS;451Rl014Kzg
zK~y-)os?Z{6jc<*fA`MJezdy^+t$*Cc4H|YO4C?)(2$rAc>vKwQhbDj5FY$^C@GdF
zO(a3o7=q%HN@7DKejq}MXoFgHwT4)*O^srLEiDBtq*In|nQdlg?)71(c5JDQ{*#;B
zdy?}%=YP(*2j)jjNlD4Uuwi9m6AQtd$9@Rd>Nw8vwhuB5Ldg2<t74IapR+&i=)BPO
z;;UJ$HA09vj^YmQUf_K__Dkluv-S_A$s_=K?(^^wSeD6{ee=EE{$HPN-tp|@LWG|J
zCq{ZY8-B}|w0@UOpn<pn4^}7|7inbRVOb`Z28PpXH*C2QCXk`~CO~(5*<~st(t7e*
zl(MKs2v}F4FoeK%XW|zM9?R>}!$)2}5Z7A&Z8t)MT`!%pH};P@-w#Ymrj&sv43;G{
zJ+@?hrKT*Z{~<>yMP0h4@~+C-)3XU{fz9o^9u_&@dUWu%fs}%%DY;b;?780u0p{Eu
z5Rb>!DBnNW{o_w=SaK8ac}_>3x$GGD8m46=EwEj|8y5|ZT{bxKdohQsD~L+)Jdd5*
zo@|;uHs!#jTPnIT=Lrk})8ZyvNSc~&5A4G8HHLtbfUhCzf@Oex^~zho5U_cg&;w%K
zqrNL30y7z|UQ{G$Km77cLo{5lCH><90p!O2-1qkG?Qe!94*}~2oya%g`rLLs#@%AZ
zHTR^bC@Y@o@)XOf78AcaMd{))9%|m!15AbqyMf2kORHX~jwux2YAAS$YYwyzNDf^z
zxSlU|#SoAgmB^qpJ8Q)<;FE9-J>aVs9;wfd_IDKoSR;<4H*0b}E0DrMYdAF`d1{4^
z0GiW^qXUw7Y3WwrF!0#y!EPyNzDPAR-s>T$j43uPaZyS$kuM;CNe^5FmV}RnBm(vI
z^BY!3pbr?Fy&P@;JA^1dqptR?x?$UWnXzch5a27#O~)k>HTiJZAZbZlM92Oo*6ag1
zf$I6T%?ThSmp+gI>USSM->P+C3s5V-oN%TlToQdhe|GHX*>_&^fHT3T@D^HY6+!3E
z0qcP!!K~H+dx3mVxBm<Yv<0%JfOmrc{~H!i1+)Nv02_hizd48n2wMVq;Wc9b9YKIO
Z_zMbsI4PB<nZf`7002ovPDHLkV1i#osO10v

diff --git a/src/assets/img/contributors/guest2guest.png b/src/assets/img/contributors/guest2guest.png
deleted file mode 100644
index b7dd51a631383c2b2a741da25083059d0257c067..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2749
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
CFr3%`

diff --git a/src/assets/img/contributors/lemonde.png b/src/assets/img/contributors/lemonde.png
deleted file mode 100644
index 51570242f2b9d59ddd8598f3877864135ec5307d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 549
zcmV+=0^0qFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~|^9GZxkxcyRy#0kTO%
zK~z}7?U%vH>o5#}_5b_>luQsjLC6F}6BN^9PdWD#Iza}=DaYawJV6m1pok7oOeZj%
z!1_<lOVYG25BmPXdokz`1xcT6S+YL>K;Vtz6W%;#fEnN+01*Kq{s@E&rLJr7-iuO7
zs;Uy_oP-c0gdjyx2mlBo3Ns5ci&Cn!MMQDViE~a6QO5iaq_3!|O1$@Nz%jAb_P)LM
zQWV9VK7=4d)J`JL^WOt7b8p7ZxjP_htq{>eeb+t$mSs6@1+>;umSwxFT5B=J^c(_!
z7-L5Dh$uwV`xm!u62MTR!$*OJ`Y7G)c;^4F97AIatX8Y{)B!|<+wJz=LX>6MT#El;
zfImsFmjQHxHcj(VfUhaR(=>(a^$NS)4y?652aqI5d!*LuH8AtbbKvVyG1+dny=rzk
zo#1#pLen&mrYW4y=gC2oQjlfY=<0nAXI$4c91e%kQo39&VZYzQVzGFdC&NU&TrRNL
zY@T08k|Ysk79tX@b=z>PwZhD8yNzA4+l+{)?e)=5w3%=*`2`RIcO}nrsq6aA2_lZ_
nqYV*Fx)FWMFQXaYzX$jR|DG+;gW9+x00000NkvXXu0mjfLsIRO

diff --git a/src/assets/img/contributors/logo-inc.jpg b/src/assets/img/contributors/logo-inc.jpg
deleted file mode 100644
index 772ccc35a169a2bac84fbd18489aabd7bdfbff72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1653
zcmbW!do+}390%}sZr&MYlFO)sd6`^888aEzSt*RleRQEyDC5#rBjdKYrIe{8q-f<%
z+SF=Dh+-t0Xc1~Egc`zPYC?^foodf^&i=K#-{(BfKhO91o%1=5^qF)RSnlFTcLZQC
z0D#FBAe8{t4xXFsz1=*mAm%=k(8K$gP^6jZddPr%B;+6yqPsXjF7BJ1pvVm*Lt}`=
z_CF935d+ym78H5u3%~(D%gKRqC^QIy7z|n-tBS)aC}3A9t0<~!suQ#{)ipGrHKzKI
zjxkX~!@$DOc)b~!OeW}C+EPh2rsibQmmx3=27^_=uEgP1lC(9nN&h+0`+yP}umx-o
zFdYD{1Vbpnq^$r!hD5=>2KXy5I0A{11JM|H1zDkHIRJ+t5O5>{g+d}_?Ks&zfK);$
zYn$22sd)H<IxJOE()mI(abs08-m`mljd?)$F^s(0ij}L>b@lWO42{T?4Hi^OD~C;+
z9i5!%E?(XYpY1z#?h4$uKZqF|5_%+p9T^oJ6PtYeM9Rrisho_=tP9x}FXiMG6_=Ej
zm0zv6c8gnGbG!CVU409$^+DUi_TL`$^giwDA9(hh|9WI}?9E%j_{6(8;rkDwkMj$Q
zpT4+Y0OA`<c7B8X!=)s1!I4M=68z$V!J}jwp@c+fo5?BLdw~8d6&+F%T6N?3!m4Hr
z(cE(u9}wOxueOH#T6gXX?W^qH!H)ee+2645E<S)oz+|6?Py%Q`!fElIt5TpPkj+%9
zG0oGwbP8_rIF(q1%t4Rep<bJd=K5xCPxi4`>>cZK&Ht$D!40yTwLLOe++S2Xz+T<a
zsVB<l@JXRGyuUs~J(FCg*aYsnxhyX%q~gKyyLr{lhwKJZKN{M+`W(wFvz=@&KVE7~
zju~${=xg0vd+Y5$wz$hT^mEybP=RTjZs}(!(9C~$$3ap`ot|(L)8_c)B||UX<!-AK
z6<@5qvVN}0Z(khFPte~KtCXcvY@%*`C@O+*QewSjAz`#Sivh$F7N(uKkCNr5z=Erb
zMc2%;c8^TyWxf=O7ItK_w57oDH19MDUtyQ_sO_Slk|x2Yr)xy#bjeMf-qa4x4YO~|
zc*W%&Jv(tu;2lvmgd4jzm9&VEQ0DV@R167iZftTZ@NF(0_fhw=pj$N)veJ0i1wm;D
zJzU4Vhh(6?%C4rvA>6JTk@<)UeM<PbfACicBi|<A2U=dtt^580eM6`1Z>7NF=ZxHL
z(x=Y5`(4&|ku1w<_{8ZLqSwsM?0I;vgUY-vXNi8z=dfEsW8Zy1*!i+Y($yjb^habb
z<N0x2sX;GEr7L68LXNh5*z>6F7vEa$Q#DIF_dOjf(dgnxJ;~sE-?sX54u5j0TX1OG
zy~hkq6mR_Ep`jy+;>hwjhXb=q9Y2*zj;~$Y@;)Y4t;BpjiXaYe*vc_;6i)Q+uCNZ+
z@Abh}3S0<&6<RdU8|DTDmogIKm*Fg0<S*8nEHwx<Tk`k%)X}emh2=m&MjjlOrV=gM
zlSYI!&NX2juRa)@Npu?v^WrU7*=(hyUdr#PtMuGBsMy2Q#B=i7rND^@trh88UQb4X
zRHl~*o6we|>^GkNYLLR~)cFINcDFhw1sI`Pu3^fPtsf&}xf8+%hHRt4OwgFsMpJ)5
zL~{1-UFd9$$2SBVhPf@Fx6_6%C+VH7OtgQl6-}F>#G<CJZyr15O%HhTij5@P?~AT9
zDR6TBvG6Qm#t3pB@?)2Pt7b=rx8Xm@fvZ<9_7SxBOQ#tekt4C*PesBPiQ90os%p3U
z3r{rObx)amQ{cD6+SEVmSFq(2F~`1L8QQCOlZ@)}-NLmR;@v4YldO#mu$1Tqo|_ei
zW%r1^u0|hq3$7|$E$nt(78sw>=xI=#LP;~|p$-%kC4$37m2c0Lg(|16Gd2;Vvl@H#
z-xru3j#sU&8=#C<xGFfPUOAAVb!I6m-bR9-Ah#EC2JswphC!CU#|j`GUmE7G@jFKI
MvVKqEOX>4J0qM5b0{{R3

diff --git a/src/assets/img/contributors/logo-quechoisir.png b/src/assets/img/contributors/logo-quechoisir.png
deleted file mode 100644
index 06b929649038256460be1a48318f73b83a244d40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1976
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
KMNUMnLSTZT^JbI)

diff --git a/src/assets/img/contributors/maarten.jpg b/src/assets/img/contributors/maarten.jpg
deleted file mode 100644
index 6d111a9a78bbe8d1c452e5b196d1f0945ff86df9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72088
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
D!|?0{

diff --git a/src/assets/img/contributors/quechoisir.png b/src/assets/img/contributors/quechoisir.png
deleted file mode 100644
index c381cbe5c22fdb2001b0cd916a18ef8a1448848a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 702
zcmV;v0zv(WP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~$#45FnI!bp8MU0!v9m
zK~y-)&67P$6JZ#~e@71l%10@MY9W#amzq{m2ZIpO$WRmp!pEY6iC+l}O43~i*-08h
zF!6&#Oq_(U5M`+80CuZbBQa4MOfi-Zdz3r8XyF`4FP<%pi3`tim*@XHzxV&V&mA20
z5V9|x-chYkVQ}_oK~N_j1OV}Gp|!<HquoLxDG^zU=QNf&cd0)2lT1orbEY&$Hvn%B
zcjIq!kyccy%%#jPE;BkYr|S&?1xH|qOiDnk(J*^6e7RF$02ck}Y|!r|I2EF2Xq@0w
zh(W)X))wdf$(B7FfgLudj}Z0Ph;>*|qT<008|@YVea!4Ln-^;|M9Ut^n_>XexCu3G
z$^q&QBTI48vdVz}G>vu({&p8>S=GT=Ky9C@-(y2SIoM$$DKR;-$d$e}uJ)fLEvrn<
zERsk{dhzF5RW#j|@y0gDNJV@dD?ivFz~kxH^bC*hyH!+N&ByS!xpaN&RS9o9tVBIF
zqV8H&$IOL+0BKoebYhPAg=NyRYH*khHEtp!73KXN#eB&`QX)7N`oBL#(=_eZZif2{
zPndo8lC|v(0Di1)Q`S(K(^y|=qu1TVQ2S+yO(KFI2syxD_#uxX&kT)Qu{GAiD^#4Y
zQs-;JRAwCNTI)qdeAn{>efI`P?MQh?*@~_4?ZqdoXB^b|n)G~4xrOk}=Q>dQmwQ<c
zuONR+QSGUx+EZV!*08GnQy22W0FGaBbM$;OCDt;7-s|Zqyp&-00dwy|Y$)FgI<c9p
kbf4^G#COB6l*1pt0j^Hpkw%L2c>n+a07*qoM6N<$f?ww}&Hw-a

diff --git a/src/assets/img/create.svg b/src/assets/img/create.svg
deleted file mode 100644
index 1c3b64eb2..000000000
--- a/src/assets/img/create.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="80" height="80" version="1.1" viewBox="0 0 75 75" xmlns="http://www.w3.org/2000/svg">
- <g transform="translate(-47.667 -2057.1)" fill="#586e75">
-  <path d="m78.959 2097.1 0.77944 0.6241 0.45834 2.5688 2.5235 0.6616 1.4631 2.1597 0.03754-0.01 23.447-23.447-5.6348-5.6347-10.484 10.484zm-1.656 2.2102c-1.0262 2.0903-3.0559 6.5201-2.2477 7.3283 0.74608 0.746 4.5758-0.9301 6.8104-2.0017l-1.23-1.8152-2.5235-0.6617-0.45834-2.5687z"/>
-  <rect x="62.667" y="2109.5" width="45" height="7.5815" color="#000000" color-rendering="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
-  <path d="m62.667 2079.4-3e-5 4.1512h7.2994l-2e-5 7.2994h4.1513l-3e-5 -7.2994h7.2994l-3e-5 -4.1512h-7.2994l-2e-5 -7.2994h-4.1512l1e-5 7.2994z"/>
- </g>
-</svg>
diff --git a/src/assets/img/crosschecked.svg b/src/assets/img/crosschecked.svg
deleted file mode 100644
index 5ab8787ad..000000000
--- a/src/assets/img/crosschecked.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000002 75.000001">
- <g transform="translate(52.333 44.45)">
-  <path style="color-rendering:auto;text-decoration-color:#000000;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;block-progression:tb;text-decoration-line:none;image-rendering:auto;white-space:normal;text-indent:0;text-transform:none;text-decoration-style:solid" fill="#586e75" d="m-35.332-29.45a2.0002 2.0002 0 0 0 -2 2v41a2.0002 2.0002 0 0 0 2 2h41a2.0002 2.0002 0 0 0 2 -2v-11.459h-4v9.459h-37v-37h9.459v-4h-11.459z"/>
-  <path style="color-rendering:auto;text-decoration-color:#000000;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;block-progression:tb;text-decoration-line:none;image-rendering:auto;white-space:normal;text-indent:0;text-transform:none;text-decoration-style:solid" fill="#dc322f" d="m-20.894-25.45-5.4375 5.4394 9.5625 9.5606-9.5625 9.5625 5.4375 5.4375 9.5625-9.5606l9.563 9.5606 5.4375-5.4375-9.5625-9.5625 9.5625-9.561-5.4375-5.439-9.5625 9.5625-9.5625-9.5625z"/>
- </g>
-</svg>
diff --git a/src/assets/img/discuss.svg b/src/assets/img/discuss.svg
deleted file mode 100644
index 7354b923d..000000000
--- a/src/assets/img/discuss.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="80" height="80" version="1.1" viewBox="0 0 75 75" xmlns="http://www.w3.org/2000/svg">
- <g transform="translate(-47.667 -1954.3)" fill="#586e75">
-  <path transform="matrix(.9375 0 0 .9375 47.667 1854.9)" d="m32 124.97a16 16 0 0 0-16 16 16 16 0 0 0 8.2461 13.975c0.27256 2.3033-0.81626 4.9519-5.1406 7.4531 6.6262-2.0087 11.233-3.7828 14.432-5.5156a18.75 18.75 0 0 1-0.82031-1.1016c-0.32462-0.46575-0.63497-0.94391-0.91992-1.4395-0.43558-0.75748-0.81917-1.5462-1.1484-2.3535a11.11 11.11 0 0 1-9.7578-11.018 11.11 11.11 0 0 1 11.109-11.109 11.11 11.11 0 0 1 3.9863 0.75196 18.75 18.75 0 0 1 4.8652-2.9609 16 16 0 0 0-8.8516-2.6816z" fill-rule="evenodd"/>
-  <path transform="matrix(.9375 0 0 .9375 47.667 1854.9)" d="m48 128.97a16 16 0 0 0-16 16 16 16 0 0 0 3.0254 9.3379c0.01708 0.028 0.02116 0.0536 0.04102 0.082 2.2012 3.1491 5.2537 7.4079 22.482 12.631-3.6812-2.1292-4.5711-4.6274-4.1289-7.0176a16 16 0 0 0 10.58-15.033 16 16 0 0 0-16-16zm0 4.8906a11.11 11.11 0 0 1 11.109 11.109 11.11 11.11 0 0 1-11.109 11.109 11.11 11.11 0 0 1-11.109-11.109 11.11 11.11 0 0 1 11.109-11.109z" color="#000000" color-rendering="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
- </g>
-</svg>
diff --git a/src/assets/img/dislike.svg b/src/assets/img/dislike.svg
deleted file mode 100644
index b4ad80eea..000000000
--- a/src/assets/img/dislike.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000002 75.000001">
- <g transform="matrix(1 0 0 -1 -47.667 1630.4)">
-  <g fill="#586e75" transform="matrix(-.39234 0 0 .39234 113.66 1567.9)">
-   <path fill="#586e75" d="m116.04 49.25c-1.77 0.48-2.65 1.88-2.88 2.92-0.28 1.25-0.38 3.09-0.38 3.09s-8.53-0.42-10.66 0.55c-1.61 0.73-2.03 1.8-2.05 3.85 0 0.1 0.02 0.22 0.03 0.33-1.33 0.15-2.35 0.2-3.22 0.06-1.14-0.31-1.8-1.07-2.16-1.61-0.51-0.76-0.97-1.79-0.97-1.79h-0.01c-2.65-5.42-6.28-8.7-8.55-11.81-2.27-3.13-8.55-11.71-9.25-15.96-1.26-7.64-2.67-15.95-8.5-19.99-4.74-3.28-10.95-2.04-12.23-1.87-3 0.4-8.2 2.71-9.57 10.03-2.93 15.5 2.13 25.1 1.5 26.24-0.14 0.26-1.58-0.05-3.27-0.49-2.09-0.54-11.31-1.44-13.85-1.24-4.15 0.33-10.63 3.92-11.68 11.28-0.69 4.81 0.7 8.14 2.11 9.91 0.75 0.94 0.85 1.82 0.19 2.57-1.43 1.62-3.66 4.9-3.4 9.46 0.24 4.34 3 7.35 4.79 8.86 0.89 0.75 1.17 1.72 0.71 2.75-0.9 2.05-2.1 5.83-1.11 10.13 0.93 4.1 4.21 6.32 6.18 7.32 0.92 0.46 1.35 1.27 1.15 2.26-0.32 1.64-0.57 4.3 0.37 6.89 1.9 5.27 7.84 8 13.8 8.31 6.38 0.33 11.43-1.1 22-2.98 6.18-1.1 13.89-4.53 20.19-11.31l0.02 0.03c3.09-2.98 3.45-4.3 7.85-6.15 1.7-0.71 3.51-1 5.11-1.1-0.09 0.61-0.14 0.94-0.14 0.94s-0.5 2.76 2.06 3.47c3.68 1.01 9.64 1.76 9.64 1.76s0.09 3.05 0.64 3.62c0.97 1.03 5.16 1.23 6.82 1.38 3.02 0.27 10.57 0.4 10.57 0.4l0.12-62.5c-0.01 0.03-9.01-0.41-11.97 0.39zm-91.3 4.89c0.58-3.96 2.21-6.61 7.31-6.61 2.79 0 15.08 2.38 17.83 3.03 2.32 0.56 4.89 2.88 4.64 5.78-0.23 2.57-1.73 5.19-5.27 5.71-3.53 0.53-15.38-0.86-18.59-1.18-2.95-0.3-6.53-2.34-5.92-6.73zm-1.15 20.07c0.08-4 2.42-7.63 7.54-7.58 1.85 0.02 16.47 0.64 18.86 0.64s5.21 2.27 5.31 5.17c0.09 2.58-1.1 5.36-4.54 6.3-3.44 0.95-17.26 1.35-20.48 1.42-2.97 0.07-6.79-1.52-6.69-5.95zm3.73 19.36c-0.31-3.75 1.54-7.36 6.32-7.8s16.03-1.25 17.84-1.38c3.42-0.24 4.85 2.15 5.31 4.53 0.45 2.38-0.65 5.44-3.78 6.65-3.12 1.21-15.33 3.41-18.13 3.55-2.77 0.13-7.25-1.4-7.56-5.55zm29.57 18.13c-2.78 1.33-11.37 3.39-13.91 3.71-2.55 0.32-7.61-0.81-8.19-4.59-0.54-3.41 0.9-6.85 5.24-7.58 4.35-0.73 12.47-2.02 14.13-2.27 3.11-0.46 4.58 1.63 5.17 3.78 0.59 2.14 0.35 5.63-2.44 6.95zm13.55-2.16c-2.28 0.9-6.03 1.18-6.41-0.7-0.3-1.5 1.4-5.25 1.06-7.48s-2.58-5-4.31-5.79c0.98-0.93 3.15-5.65 2.76-8.6s-3.65-7.11-3.65-7.11c1.9-1.58 1.63-5.92 2.82-4.78 1.18 1.14 8.78 6.73 10.13 4.51s-2.12-3.8-4.41-8.34c-2.29-4.53-3.13-12.61-3.13-12.61-12.39-16.24-13.21-25.68-13.3-32.27-0.07-5.7 1.19-11.08 8.48-11.17 7.21-0.09 6.91 7.55 9.3 19.29 1.63 8 10.97 14.73 16.59 23.77 0.42 0.66 0.8 1.33 1.17 2l0.02-0.15c1.19 1.85 2.46 3.68 4.3 5.32 1.39 0.99 3.25 1.4 4.83 1.55 0.27 0.03 0.57 0.06 0.83 0.07 1.06 0.04 2.08 0.04 2.94 0.02 0.04 2.87-0.03 6.79-0.35 13.11-0.25 5.14-0.61 9.45-0.97 12.8-1.47 0.04-3.28 0.17-5.36 0.49-0.08 0.01-0.15 0.03-0.22 0.05-4.67 0.81-8.88 4.67-10.62 6.47l-0.16 0.05v-0.01c-3.59 4.72-7.98 7.81-12.34 9.51zm42.31-29.53c-0.43 12.48-1.41 20.01-1.41 20.01s-4.17-0.82-5.53-1.34c-0.95-0.36-0.75-1.75-0.75-1.75s0.44-7.06 0.89-16.97c0.39-8.3 0.46-17.17 0.48-17.47 0.03-0.82 0.23-1.24 0.92-1.52 0.94-0.36 6.03-0.25 6.03-0.25s-0.19 6.88-0.63 19.29z"/>
-  </g>
- </g>
-</svg>
diff --git a/src/assets/img/help.svg b/src/assets/img/help.svg
deleted file mode 100644
index b27f9f3ff..000000000
--- a/src/assets/img/help.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="100%" width="100%" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 30 30">
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g transform="translate(-80,-782.375)">
-  <path fill="#586e75" d="m95,788.38c-4.9706,0-9,4.0294-9,9s4.0294,9,9,9,9-4.0294,9-9-4.0294-9-9-9zm0.28125,2.5c0.72,0.00001,1.3132,0.0773,1.7812,0.28125,0.46799,0.19201,0.84899,0.45001,1.125,0.75,0.27599,0.30001,0.45449,0.64001,0.5625,1,0.10799,0.36001,0.15624,0.69526,0.15625,1.0312-0.000007,0.40801-0.06276,0.76976-0.21875,1.0938-0.14401,0.32401-0.33451,0.63026-0.5625,0.90625-0.22801,0.27601-0.48601,0.52926-0.75,0.78125-0.264,0.24001-0.49076,0.51726-0.71875,0.78125-0.228,0.25201-0.43776,0.52451-0.59375,0.8125-0.144,0.28801-0.21875,0.60875-0.21875,0.96875v0.21875c-0.000004,0.072,0.01925,0.1155,0.03125,0.1875h-1.875c-0.024-0.12-0.0505-0.243-0.0625-0.375-0.012-0.144-0.000002-0.255,0-0.375-0.000002-0.39599,0.0555-0.75049,0.1875-1.0625,0.132-0.31199,0.296-0.61099,0.5-0.875,0.204-0.26399,0.42825-0.52199,0.65625-0.75,0.24-0.22799,0.45225-0.42824,0.65625-0.65625,0.204-0.22799,0.368-0.47874,0.5-0.71875,0.132-0.23999,0.21874-0.49324,0.21875-0.78125-0.000005-0.39599-0.1615-0.71674-0.4375-0.96875-0.264-0.26399-0.6475-0.40624-1.1875-0.40625-0.42,0.00001-0.83475,0.0483-1.2188,0.15625-0.384,0.096-0.7675,0.27201-1.1875,0.5l-0.624-1.68c0.444-0.25199,0.936-0.44974,1.5-0.59375,0.576-0.15599,1.1812-0.21874,1.7812-0.21875zm-0.281,10.12c0.408,0,0.724,0.13025,1,0.40625,0.276,0.264,0.4375,0.61125,0.4375,1.0312-0.000005,0.42-0.1615,0.76725-0.4375,1.0312-0.276,0.264-0.592,0.40625-1,0.40625-0.396,0-0.74325-0.14225-1.0312-0.40625-0.276-0.264-0.40625-0.61125-0.40625-1.0312-0.000002-0.42,0.13025-0.76725,0.40625-1.0312,0.288-0.28,0.635-0.41,1.031-0.41z" fill-rule="nonzero"/>
- </g>
-</svg>
diff --git a/src/assets/img/info.svg b/src/assets/img/info.svg
deleted file mode 100644
index 520051abc..000000000
--- a/src/assets/img/info.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="100%" width="100%" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 30 30">
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g transform="translate(-200,-702.375)">
-  <path transform="translate(80,782.375)" fill="#586e75" d="m135-74c-4.9706,0-9,4.0294-9,9s4.0294,9,9,9,9-4.0294,9-9-4.0294-9-9-9zm0.84375,2.5c0.17908,0.000013,0.37387-0.0067,0.53125,0.03125,0.1628,0.038,0.28685,0.10068,0.40625,0.1875,0.12481,0.08684,0.24195,0.20809,0.3125,0.34375,0.076,0.13026,0.0937,0.28425,0.0937,0.46875-0.00001,0.22794-0.0327,0.4201-0.125,0.59375-0.0868,0.16824-0.22305,0.32355-0.375,0.4375-0.14653,0.10855-0.31007,0.19574-0.5,0.25-0.18994,0.05428-0.39296,0.06251-0.59375,0.0625-0.18452,0.00001-0.34263,0.0067-0.5-0.03125-0.15738-0.0434-0.28686-0.13191-0.40625-0.21875-0.11397-0.08682-0.2107-0.18224-0.28125-0.3125-0.0651-0.13023-0.0937-0.29508-0.0937-0.46875,0-0.2442,0.0436-0.42551,0.125-0.59375,0.0868-0.17365,0.20265-0.32895,0.34375-0.4375,0.14109-0.11395,0.27881-0.20115,0.46875-0.25,0.18994-0.05426,0.38753-0.06249,0.59375-0.0625zm-3.0312,3.875,3.9375,0-1.1562,5.4375c-0.0651,0.30391-0.11284,0.57784-0.15625,0.84375-0.0434,0.26049-0.0625,0.51665-0.0625,0.75,0,0.24421,0.0586,0.43226,0.15625,0.5625,0.10311,0.13024,0.25298,0.1875,0.4375,0.1875,0.17365,0.000001,0.32222-0.02863,0.46875-0.09375,0.14652-0.06512,0.31006-0.15643,0.5-0.28125l0.40625,0.5625c-0.13025,0.1411-0.26927,0.26515-0.4375,0.40625-0.16824,0.13567-0.38211,0.26646-0.59375,0.375-0.21165,0.10854-0.43244,0.18488-0.6875,0.25-0.24964,0.06512-0.53985,0.125-0.84375,0.125-0.64037,0-1.1269-0.17027-1.4688-0.46875-0.34189-0.3039-0.5-0.71274-0.5-1.25,0-0.23878,0.0191-0.51271,0.0625-0.84375s0.0952-0.73295,0.1875-1.1562l0.65625-3.0938c0.0163-0.07054,0.0516-0.14277,0.0625-0.21875,0.0163-0.07597,0.0204-0.15362,0.0312-0.21875,0.0109-0.07054,0.0258-0.1074,0.0312-0.15625,0.005-0.04883,0-0.10328,0-0.125,0-0.15194-0.0299-0.28274-0.0625-0.375-0.0326-0.09225-0.0857-0.13865-0.15625-0.1875-0.0705-0.04883-0.13604-0.07746-0.25-0.09375-0.10854-0.01627-0.24887-0.03124-0.40625-0.03125h-0.3125l0.15625-0.90625z" fill-rule="nonzero"/>
- </g>
-</svg>
diff --git a/src/assets/img/like.svg b/src/assets/img/like.svg
deleted file mode 100644
index c622b2ca4..000000000
--- a/src/assets/img/like.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000002 75.000001">
- <g transform="translate(-47.667 -1555.6)">
-  <g fill="#586e75" transform="matrix(-.39234 0 0 .39234 113.66 1567.9)">
-   <path fill="#586e75" d="m116.04 49.25c-1.77 0.48-2.65 1.88-2.88 2.92-0.28 1.25-0.38 3.09-0.38 3.09s-8.53-0.42-10.66 0.55c-1.61 0.73-2.03 1.8-2.05 3.85 0 0.1 0.02 0.22 0.03 0.33-1.33 0.15-2.35 0.2-3.22 0.06-1.14-0.31-1.8-1.07-2.16-1.61-0.51-0.76-0.97-1.79-0.97-1.79h-0.01c-2.65-5.42-6.28-8.7-8.55-11.81-2.27-3.13-8.55-11.71-9.25-15.96-1.26-7.64-2.67-15.95-8.5-19.99-4.74-3.28-10.95-2.04-12.23-1.87-3 0.4-8.2 2.71-9.57 10.03-2.93 15.5 2.13 25.1 1.5 26.24-0.14 0.26-1.58-0.05-3.27-0.49-2.09-0.54-11.31-1.44-13.85-1.24-4.15 0.33-10.63 3.92-11.68 11.28-0.69 4.81 0.7 8.14 2.11 9.91 0.75 0.94 0.85 1.82 0.19 2.57-1.43 1.62-3.66 4.9-3.4 9.46 0.24 4.34 3 7.35 4.79 8.86 0.89 0.75 1.17 1.72 0.71 2.75-0.9 2.05-2.1 5.83-1.11 10.13 0.93 4.1 4.21 6.32 6.18 7.32 0.92 0.46 1.35 1.27 1.15 2.26-0.32 1.64-0.57 4.3 0.37 6.89 1.9 5.27 7.84 8 13.8 8.31 6.38 0.33 11.43-1.1 22-2.98 6.18-1.1 13.89-4.53 20.19-11.31l0.02 0.03c3.09-2.98 3.45-4.3 7.85-6.15 1.7-0.71 3.51-1 5.11-1.1-0.09 0.61-0.14 0.94-0.14 0.94s-0.5 2.76 2.06 3.47c3.68 1.01 9.64 1.76 9.64 1.76s0.09 3.05 0.64 3.62c0.97 1.03 5.16 1.23 6.82 1.38 3.02 0.27 10.57 0.4 10.57 0.4l0.12-62.5c-0.01 0.03-9.01-0.41-11.97 0.39zm-91.3 4.89c0.58-3.96 2.21-6.61 7.31-6.61 2.79 0 15.08 2.38 17.83 3.03 2.32 0.56 4.89 2.88 4.64 5.78-0.23 2.57-1.73 5.19-5.27 5.71-3.53 0.53-15.38-0.86-18.59-1.18-2.95-0.3-6.53-2.34-5.92-6.73zm-1.15 20.07c0.08-4 2.42-7.63 7.54-7.58 1.85 0.02 16.47 0.64 18.86 0.64s5.21 2.27 5.31 5.17c0.09 2.58-1.1 5.36-4.54 6.3-3.44 0.95-17.26 1.35-20.48 1.42-2.97 0.07-6.79-1.52-6.69-5.95zm3.73 19.36c-0.31-3.75 1.54-7.36 6.32-7.8s16.03-1.25 17.84-1.38c3.42-0.24 4.85 2.15 5.31 4.53 0.45 2.38-0.65 5.44-3.78 6.65-3.12 1.21-15.33 3.41-18.13 3.55-2.77 0.13-7.25-1.4-7.56-5.55zm29.57 18.13c-2.78 1.33-11.37 3.39-13.91 3.71-2.55 0.32-7.61-0.81-8.19-4.59-0.54-3.41 0.9-6.85 5.24-7.58 4.35-0.73 12.47-2.02 14.13-2.27 3.11-0.46 4.58 1.63 5.17 3.78 0.59 2.14 0.35 5.63-2.44 6.95zm13.55-2.16c-2.28 0.9-6.03 1.18-6.41-0.7-0.3-1.5 1.4-5.25 1.06-7.48s-2.58-5-4.31-5.79c0.98-0.93 3.15-5.65 2.76-8.6s-3.65-7.11-3.65-7.11c1.9-1.58 1.63-5.92 2.82-4.78 1.18 1.14 8.78 6.73 10.13 4.51s-2.12-3.8-4.41-8.34c-2.29-4.53-3.13-12.61-3.13-12.61-12.39-16.24-13.21-25.68-13.3-32.27-0.07-5.7 1.19-11.08 8.48-11.17 7.21-0.09 6.91 7.55 9.3 19.29 1.63 8 10.97 14.73 16.59 23.77 0.42 0.66 0.8 1.33 1.17 2l0.02-0.15c1.19 1.85 2.46 3.68 4.3 5.32 1.39 0.99 3.25 1.4 4.83 1.55 0.27 0.03 0.57 0.06 0.83 0.07 1.06 0.04 2.08 0.04 2.94 0.02 0.04 2.87-0.03 6.79-0.35 13.11-0.25 5.14-0.61 9.45-0.97 12.8-1.47 0.04-3.28 0.17-5.36 0.49-0.08 0.01-0.15 0.03-0.22 0.05-4.67 0.81-8.88 4.67-10.62 6.47l-0.16 0.05v-0.01c-3.59 4.72-7.98 7.81-12.34 9.51zm42.31-29.53c-0.43 12.48-1.41 20.01-1.41 20.01s-4.17-0.82-5.53-1.34c-0.95-0.36-0.75-1.75-0.75-1.75s0.44-7.06 0.89-16.97c0.39-8.3 0.46-17.17 0.48-17.47 0.03-0.82 0.23-1.24 0.92-1.52 0.94-0.36 6.03-0.25 6.03-0.25s-0.19 6.88-0.63 19.29z"/>
-  </g>
- </g>
-</svg>
diff --git a/src/assets/img/location.svg b/src/assets/img/location.svg
deleted file mode 100644
index 0f075ae3f..000000000
--- a/src/assets/img/location.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="100%" viewBox="0 0 30 30" width="100%" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <metadata id="metadata4">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <path id="path3039" d="m15,6c-3.3671,0-6.0968,2.7297-6.0968,6.0966,0,0.07218,0.0022,0.14562,0.0054,0.21978,0.02286,0.64044,0.14364,1.2555,0.34902,1.831,1.3004,4.275,5.7424,9.852,5.7424,9.852s4.4411-5.5768,5.742-9.8521c0.20574-0.57546,0.32634-1.1911,0.34902-1.8315,0.0036-0.07416,0.0056-0.14742,0.0056-0.21978,0-3.3663-2.73-6.096-6.097-6.096zm0,9.0826c-1.649,0-2.986-1.337-2.986-2.986,0-1.6488,1.337-2.9858,2.986-2.9858,1.6492,0,2.986,1.337,2.986,2.9858,0,1.649-1.3369,2.986-2.986,2.986z" fill="#586e75"/>
-</svg>
diff --git a/src/assets/img/logo-bw.svg b/src/assets/img/logo-bw.svg
deleted file mode 100644
index 483e07a96..000000000
--- a/src/assets/img/logo-bw.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000002 75.000001">
- <g transform="translate(-47.667 -1155.6)">
-  <path d="m37.225 21.701c-5.394 0.187-9.539 3.301-10.211 3.926-0.978 0.908-0.601 1.601 1.83 1.426 2.392-0.171 6.086 1.404 6.777 2.127-2.932 3.533-4.899 7.808-6.092 10.976-3.759 0.35-7.608-2.93-11.338-1.515-2.067 0.747-4.17 4.145-2.699 6.275 1.699 2.578 5.78 1.365 7.672-0.227-0.996 1.698-1.989 3.735-1.303 5.758 0.743 2.081 3.334 3.864 5.284 2.215 3.226-2.667-0.54-9.522 2.66-12.123 0.463 0.04 2.657 0.217 8.326 0.318 0.47 0.009 0.968-0.005 1.478-0.031-1.232 2.085-3.486 5.671-2.939 6.502 0.633 0.977 9.583-3.941 10.521-7.232 0.058-0.204 0.081-0.382 0.075-0.539 0.662-0.171 1.326-0.339 1.968-0.534 0.1 1.37 0.354 3.589 1.059 4.379 0.853 0.96 2.928-4.023 3.412-6.037 1.686-0.763 3.041-1.581 3.785-2.383 2.672-2.875 6.027-9.383-6.537-11.912-2.497-0.502-4.749-0.382-6.779 0.174-2.421-1.217-4.786-1.618-6.949-1.543z" transform="translate(47.667 1155.6)" fill="#586e75"/>
- </g>
-</svg>
diff --git a/src/assets/img/logo-facebook.svg b/src/assets/img/logo-facebook.svg
deleted file mode 100644
index 5a54b10e3..000000000
--- a/src/assets/img/logo-facebook.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="30" viewBox="0 0 30 30.000103" width="30" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><g id="g10" transform="matrix(1.7045 0 0 -1.7045 -210.6 235.48)"><g id="g12" transform="scale(.1)"><path id="path46" fill="#3d539f" d="m1401.8 1381.5h-156.57c-5.3665 0-9.7142-4.3476-9.7142-9.7134v-156.57c0-5.3645 4.3477-9.7134 9.7142-9.7134h84.293v68.155h-22.936v26.562h22.936v19.588c0 22.732 13.884 35.11 34.164 35.11 9.7136 0 18.062-0.7234 20.496-1.0465v-23.756l-14.066-0.01c-11.028 0-13.164-5.2405-13.164-12.931v-16.958h26.302l-3.4251-26.562h-22.877v-68.155h44.849c5.3646 0 9.7136 4.3489 9.7136 9.7134v156.57c0 5.3658-4.349 9.7134-9.7136 9.7134"/></g></g></svg>
diff --git a/src/assets/img/logo-lmem-new.svg b/src/assets/img/logo-lmem-new.svg
deleted file mode 100644
index 7cbd71f77..000000000
--- a/src/assets/img/logo-lmem-new.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg id="Calque_1" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="-50 234.6 359.99997 359.99999" height="360" width="360" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata id="metadata47"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><style id="style3" type="text/css">
-	.st0{fill:#F96D6D;}
-	.st1{fill:#FFFFFF;}
-	.st2{fill:#6B83B3;}
-	.st3{fill:#A9D7F6;}
-</style><g id="g5" transform="translate(585 4.7)"><path id="path7" fill="#f96d6d" class="st0" d="m347 295.3c-21.1-21-51.3-27.3-77.9-19l-95.7 21.7c-4.4 0.7-10.5 4.5-11.2 8.8-0.4 2.2-0.7 6.2 6.8 10.4l29.5 11.3c12.3 5.8 10.9 16.1 8.6 24.2-9 22.9-17.5 48.6-24.2 70.3-2.4 7.6-10.7 7.3-15.1 6.5l-2.9-0.7-31.7-7.3c-11.6-3.1-21.1-2.3-13.4 13.8l3.5 9.5c1.5 6.3 0.8 12-3.6 16.8 0 0-6.5 5.2-14.9 13.1-19.9 18.9-31.5 55.2 9.7 34.1l70.1-40.3c7-3.8 23.5-11.5 23.5-11.5 3.7-17.1 19.7-23.9 34.9-26.4-14.9 5.8-28.7 15.1-30.5 29.8l-4.4 42.3c-0.3 8 6.2 9.6 10.2 5l58.2-67.2c2.2-2.2 3.7-3.6 3.7 0l1 31.8c0.3 0.5 1 0.7 2 0.7 2.4-0.1 4.5-1.7 5.4-3.8l28.7-46.7c13-6.2 23.5-12.5 29.4-18.4 30.4-30 30.4-78.8 0.3-108.8z"/><g id="g9"><path id="path11" fill="#fff" class="st1" d="m317.8 322.8c4.4 15.5-4.8 31.6-20.4 36-15.6 4.3-31.8-4.7-36.1-20.3s4.8-31.6 20.4-36c15.6-4.3 31.7 4.8 36.1 20.3z"/><g id="g13"><path id="path15" fill="#6b83b3" class="st2" d="m308.1 331.7c-0.7 10-9.4 17.5-19.4 16.8s-17.5-9.3-16.9-19.2c0.7-10 9.4-17.5 19.4-16.8s17.6 9.3 16.9 19.2z"/><path id="path17" fill="#6b83b3" class="st2" d="m299.4 335.3c-2.3 5.4-8.6 7.9-14 5.5s-7.9-8.5-5.6-13.9 8.6-7.9 14-5.5c5.4 2.3 7.9 8.6 5.6 13.9z"/><path id="path19" fill="#fff" class="st1" d="m303.8 322.7c-1.7 3.9-6.1 5.6-10 4-3.9-1.7-5.6-6.1-4-10 1.7-3.9 6.1-5.6 10-4 3.9 1.7 5.7 6.1 4 10z"/></g></g><g id="g21"><path id="path23" fill="#fff" class="st1" d="m344.3 301.7c1.9-4.3 7.8 0.1 13.3 9.8s8.4 21 6.6 25.2c-1.9 4.3-7.8-0.1-13.3-9.8s-8.5-20.9-6.6-25.2z"/><g id="g25"><path id="path27" fill="#6b83b3" class="st2" d="m350.3 307.7c2.3-0.5 6.4 4.5 9.3 11.1s3.3 12.4 1.1 12.8c-2.3 0.5-6.4-4.5-9.3-11.1-2.9-6.5-3.4-12.3-1.1-12.8z"/><path id="path29" fill="#6b83b3" class="st2" d="m353.6 313.1c1.8 1 4.2 4.9 5.3 8.6s0.6 6-1.2 4.9-4.2-4.9-5.3-8.6-0.6-5.9 1.2-4.9z"/><path id="path31" fill="#fff" class="st1" d="m349.7 311.4c1.3 0.7 3 3.5 3.8 6.2s0.4 4.3-0.9 3.5c-1.3-0.7-3-3.5-3.8-6.2s-0.4-4.3 0.9-3.5z"/></g></g><g fill="#a9d7f6"><path id="path33" class="st3" d="m71.6 417.9c7.7 2.8 20.8 18.4 28.2 27.8 0.8 0.2 1.3 0.3 1.3 0.3s-7-37.7-15.3-46.1-21.9-8.6-30.3-0.3c-6.1 5.9-7.8 14.6-5.2 22.2 5.7-4.9 13.8-6.7 21.3-3.9z"/><path id="path35" class="st3" d="m187.8 519.4c-1.9-5.2 0.2-18.6 1.8-26.7-4 5.2-15.1 20.4-15.6 27.1-0.6 8.1 5.5 15.2 13.7 15.8 5.6 0.4 10.6-2.3 13.5-6.6-5.8-0.3-11.2-3.9-13.4-9.6z"/><path id="path37" class="st3" d="m39.8 508.7c2.6-12.4 22.8-35.6 36.6-50.1v-0.7s-53.2 24.2-62.6 39.5-4.6 35.3 10.8 44.7c9.1 5.6 19.9 6.1 29.2 2.4-11-7.9-17-21.7-14-35.8z"/></g><path id="path39" fill="#6b83b3" class="st2" d="m356.3 371.3-5.4 2.6c-0.3 0.1-1.3 0-1.6 0l-8.8-1.4c-2.3-0.4-3.7-1.3-3.8-3.8v-0.7c0-2.1 1.9-3.2 3.8-2.7l9.1 1h0.5l6.2-2.2c2.1-0.5 3.8 0.4 3.8 2.5v0.9c0 2.1-1.6 2.9-3.8 3.8z"/><path id="path41" fill="#6b83b3" class="st2" d="m221.7 372.1 5.3 19.6c1.1 1.9 16.8 13.2 16.8 13.2 2.2 1.5 0.4 4.9-2.1 3.9l-21.6-10.3c-0.8-0.3-1.3-1.1-1.4-1.9l-1.4-23.6c-0.1-2.6 3.5-3.3 4.4-0.9z"/></g><g id="g4218" transform="translate(585.3 80.622)"><circle id="path4175" cy="333.98" cx="-455.3" r="160" fill="#a9d7f6"/><g id="g4180" transform="translate(-702.03 -40)"><path id="path4182" d="m347 295.3c-21.1-21-51.3-27.3-77.9-19l-95.7 21.7c-4.4 0.7-10.5 4.5-11.2 8.8-0.4 2.2-0.7 6.2 6.8 10.4l29.5 11.3c12.3 5.8 10.9 16.1 8.6 24.2-9 22.9-17.5 48.6-24.2 70.3-2.4 7.6-10.7 7.3-15.1 6.5l-2.9-0.7-31.7-7.3c-11.6-3.1-21.1-2.3-13.4 13.8l3.5 9.5c1.5 6.3 0.8 12-3.6 16.8 0 0-6.5 5.2-14.9 13.1-19.9 18.9-31.5 55.2 9.7 34.1l70.1-40.3c7-3.8 23.5-11.5 23.5-11.5 3.7-17.1 19.7-23.9 34.9-26.4-14.9 5.8-28.7 15.1-30.5 29.8l-4.4 42.3c-0.3 8 6.2 9.6 10.2 5l58.2-67.2c2.2-2.2 3.7-3.6 3.7 0l1 31.8c0.3 0.5 1 0.7 2 0.7 2.4-0.1 4.5-1.7 5.4-3.8l28.7-46.7c13-6.2 23.5-12.5 29.4-18.4 30.4-30 30.4-78.8 0.3-108.8z" class="st0" fill="#f96d6d"/><g id="g4184"><path id="path4186" d="m317.8 322.8c4.4 15.5-4.8 31.6-20.4 36-15.6 4.3-31.8-4.7-36.1-20.3s4.8-31.6 20.4-36c15.6-4.3 31.7 4.8 36.1 20.3z" class="st1" fill="#fff"/><g id="g4188"><path id="path4190" d="m308.1 331.7c-0.7 10-9.4 17.5-19.4 16.8s-17.5-9.3-16.9-19.2c0.7-10 9.4-17.5 19.4-16.8s17.6 9.3 16.9 19.2z" class="st2" fill="#6b83b3"/><path id="path4192" d="m299.4 335.3c-2.3 5.4-8.6 7.9-14 5.5s-7.9-8.5-5.6-13.9 8.6-7.9 14-5.5c5.4 2.3 7.9 8.6 5.6 13.9z" class="st2" fill="#6b83b3"/><path id="path4194" d="m303.8 322.7c-1.7 3.9-6.1 5.6-10 4-3.9-1.7-5.6-6.1-4-10 1.7-3.9 6.1-5.6 10-4 3.9 1.7 5.7 6.1 4 10z" class="st1" fill="#fff"/></g></g><g id="g4196"><path id="path4198" d="m344.3 301.7c1.9-4.3 7.8 0.1 13.3 9.8s8.4 21 6.6 25.2c-1.9 4.3-7.8-0.1-13.3-9.8s-8.5-20.9-6.6-25.2z" class="st1" fill="#fff"/><g id="g4200"><path id="path4202" d="m350.3 307.7c2.3-0.5 6.4 4.5 9.3 11.1s3.3 12.4 1.1 12.8c-2.3 0.5-6.4-4.5-9.3-11.1-2.9-6.5-3.4-12.3-1.1-12.8z" class="st2" fill="#6b83b3"/><path id="path4204" d="m353.6 313.1c1.8 1 4.2 4.9 5.3 8.6s0.6 6-1.2 4.9-4.2-4.9-5.3-8.6-0.6-5.9 1.2-4.9z" class="st2" fill="#6b83b3"/><path id="path4206" d="m349.7 311.4c1.3 0.7 3 3.5 3.8 6.2s0.4 4.3-0.9 3.5c-1.3-0.7-3-3.5-3.8-6.2s-0.4-4.3 0.9-3.5z" class="st1" fill="#fff"/></g></g><path id="path4214" d="m356.3 371.3-5.4 2.6c-0.3 0.1-1.3 0-1.6 0l-8.8-1.4c-2.3-0.4-3.7-1.3-3.8-3.8v-0.7c0-2.1 1.9-3.2 3.8-2.7l9.1 1h0.5l6.2-2.2c2.1-0.5 3.8 0.4 3.8 2.5v0.9c0 2.1-1.6 2.9-3.8 3.8z" class="st2" fill="#6b83b3"/><path id="path4216" d="m221.7 372.1 5.3 19.6c1.1 1.9 16.8 13.2 16.8 13.2 2.2 1.5 0.4 4.9-2.1 3.9l-21.6-10.3c-0.8-0.3-1.3-1.1-1.4-1.9l-1.4-23.6c-0.1-2.6 3.5-3.3 4.4-0.9z" class="st2" fill="#6b83b3"/></g></g></svg>
diff --git a/src/assets/img/logo-lmem.svg b/src/assets/img/logo-lmem.svg
deleted file mode 100644
index df7c9f728..000000000
--- a/src/assets/img/logo-lmem.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 60 60">
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g fill-rule="nonzero" transform="translate(5,-1003.3622)">
-  <path fill="#4c99d2" d="m17.934,1050.1c-0.36346,1.6001-1.9505,2.602-3.5433,2.2361-1.5928-0.3675-2.5873-1.9623-2.2225-3.5651,0.36404-1.6018,4.3031-5.5768,4.3031-5.5768s1.8268,5.3023,1.4627,6.9058"/>
-  <path fill="#4c99d2" d="m4.6835,1050.2c-1.3261,0.9576-3.175,0.6546-4.1272-0.6818-0.95394-1.3334-0.65057-3.1922,0.67668-4.151,1.3255-0.9589,6.8933-1.3202,6.8933-1.3202s-2.1162,5.1928-3.4428,6.153"/>
-  <path fill="#4c99d2" d="m4.8756,1038.5c-1.5744-0.4294-2.5055-2.0643-2.0795-3.6516,0.42414-1.5862,2.0501-2.5228,3.6267-2.0941,1.576,0.4303,5.3716,4.5457,5.3716,4.5457s-5.3406,1.6284-6.9188,1.2"/>
-  <path fill="#f68714" d="m42.167,1027.1s0.07019,3.1516,0.81691,3.9894c0.7463,0.8396,2.8116-4.6597,2.5316-4.9652-0.27997-0.3048-3.3485,0.9758-3.3485,0.9758"/>
-  <path fill="#f68714" d="m39.262,1016.9c-6.3785-3.778-12.396,0.6852-13.103,1.3422-0.70689,0.6565-0.4335,1.1583,1.3231,1.0315,1.7557-0.1255,4.4918,1.0526,4.9294,1.563,0.44088,0.5113,6.8501-3.9367,6.8501-3.9367"/>
-  <path fill="#f14621" d="m27.878,1029c1.8497-5.0186,6.5-14.433,15.582-12.605,9.0804,1.8278,6.6568,6.5313,4.7258,8.6093-1.9306,2.078-9.4199,4.3286-13.992,4.2456-4.571-0.082-6.3165-0.2499-6.3165-0.2499"/>
-  <path fill="#FFF" d="m45.994,1020.7c-0.0624,1.5779-1.3842,2.8081-2.954,2.7449-1.5698-0.061-2.7906-1.3916-2.7286-2.9692,0.06117-1.5787,1.3834-2.8088,2.9532-2.7457,1.5694,0.062,2.7906,1.3913,2.7295,2.97"/>
-  <path fill="#152733" d="m45.419,1020c-0.03242,0.8098-0.70977,1.4407-1.5123,1.4085-0.80336-0.032-1.4298-0.7136-1.3998-1.5221,0.03367-0.8098,0.71018-1.4395,1.514-1.4073,0.80377,0.032,1.4302,0.7135,1.3982,1.5209"/>
-  <path fill="#f14621" d="m28.898,1028.6c-3.5521,1.4102-0.11043,7.0861-2.6453,9.1815-1.4093,1.1918-3.2816-0.097-3.8181-1.601-0.49589-1.4623,0.22167-2.9336,0.94129-4.1602-1.3674,1.1502-4.3165,2.0261-5.5443,0.1628-1.0634-1.5395,0.4573-3.9944,1.9516-4.5346,3.0685-1.1634,6.2475,2.0722,9.3173,0.8271,0.07964-0.081,0.11987-0.1234,0.20074-0.1234"/>
-  <path fill="#f68714" d="m35.685,1028.5c-0.63136,1.1934-3.0094,4.7233-2.5472,5.4262,0.4573,0.7057,6.9253-2.8478,7.6038-5.2263,0.67487-2.3787-5.0566-0.1999-5.0566-0.1999"/>
- </g>
-</svg>
diff --git a/src/assets/img/logo-twitter.svg b/src/assets/img/logo-twitter.svg
deleted file mode 100644
index 17272a75f..000000000
--- a/src/assets/img/logo-twitter.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="9.3133mm" viewBox="0 0 33 32.999906" width="9.3133mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><g id="g10" transform="matrix(1.25 0 0 -1.25 9 21.939)"><rect id="rect3361" transform="scale(1,-1)" height="26.4" width="26.4" y="-17.552" x="-7.2" fill="#55acee"/><g id="g12" transform="matrix(.0064377 0 0 .0064377 -2.7996 -2.8)"><path id="path14" fill="#fff" d="m2733.9 1958.8c-100.59-44.61-208.69-74.76-322.15-88.32 115.81 69.42 204.74 179.34 246.62 310.32-108.37-64.28-228.41-110.96-356.17-136.12-102.32 109.01-248.09 177.13-409.41 177.13-309.77 0-560.91-251.13-560.91-560.88 0-43.96 4.97-86.77 14.53-127.82-466.16 23.39-879.44 246.69-1156.1 586.03-48.281-82.84-75.933-179.18-75.933-281.98 0-194.59 99.019-366.27 249.52-466.85-91.941 2.91-178.43 28.14-254.05 70.15-0.042-2.34-0.05-4.68-0.05-7.05 0-271.76 193.34-498.46 449.93-549.98-47.066-12.816-96.621-19.668-147.77-19.668-36.145 0-71.281 3.508-105.53 10.059 71.375-222.84 278.51-385 523.95-389.53-192.07-150.47-433.92-240.14-696.7-240.14-45.273 0-89.921 2.65-133.8 7.83 248.22-159.14 543.05-251.99 859.8-251.99 1031.7 0 1595.8 854.67 1595.8 1595.9 0 24.32-0.54 48.51-1.62 72.56 109.58 79.08 204.68 177.87 279.88 290.35"/></g></g></svg>
diff --git a/src/assets/img/love-pink.svg b/src/assets/img/love-pink.svg
deleted file mode 100644
index a8bb9eb9b..000000000
--- a/src/assets/img/love-pink.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000002 75.000001">
- <g fill="#d33682" transform="translate(-47.667 -1355.6)">
-  <path opacity=".894" style="color-rendering:auto;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;image-rendering:auto" d="m75.417 1372.4c-7.0407 0-12.749 5.7058-12.749 12.746 0.00008 12.932 22.5 28.596 22.5 28.596s22.5-15.664 22.5-28.596c0.00005-7.0407-5.7087-12.746-12.749-12.746-7.3529 0-9.7506 6.5461-9.7506 6.5461s-2.2734-6.5461-9.7506-6.5461z" fill="#d33682"/>
- </g>
-</svg>
diff --git a/src/assets/img/love.svg b/src/assets/img/love.svg
deleted file mode 100644
index 0ed839a66..000000000
--- a/src/assets/img/love.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000002 75.000001">
- <g transform="translate(-47.667 -1355.6)">
-  <path opacity=".894" style="color-rendering:auto;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;image-rendering:auto" d="m75.417 1372.4c-7.0407 0-12.749 5.7058-12.749 12.746 0.00008 12.932 22.5 28.596 22.5 28.596s22.5-15.664 22.5-28.596c0.00005-7.0407-5.7087-12.746-12.749-12.746-7.3529 0-9.7506 6.5461-9.7506 6.5461s-2.2734-6.5461-9.7506-6.5461z" fill="#586e75"/>
- </g>
-</svg>
diff --git a/src/assets/img/message.svg b/src/assets/img/message.svg
deleted file mode 100644
index ebc3b32d3..000000000
--- a/src/assets/img/message.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg6472" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="100%" width="100%" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 30 30">
- <metadata id="metadata6474">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g id="g7322" fill="#586e75" transform="translate(0,-2.5)">
-  <path id="path7319" d="m6,11,8.125,6.6875c0.49301,0.40663,1.257,0.40663,1.75,0l8.125-6.688h-18z"/>
-  <path id="rect7254" d="M6,13.344,6,21.656,11.031,17.5,6,13.344zm18,0l-5.031,4.156,5.031,4.156v-8.312zm-11.531,5.344-6.469,5.312h18l-6.4688-5.3125-1.4375,1.1875c-0.60394,0.49812-1.5836,0.49812-2.1875,0l-1.4375-1.1875z"/>
- </g>
-</svg>
diff --git a/src/assets/img/notice.svg b/src/assets/img/notice.svg
deleted file mode 100644
index 14006b979..000000000
--- a/src/assets/img/notice.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000002 75.000001">
- <g transform="translate(-47.667 -55.553)">
-  <path style="color-rendering:auto;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;image-rendering:auto" d="m82.167 70.553v15.258l-10.789-10.789-4.2422 4.2441 10.789 10.787h-15.258v6h15.258l-10.789 10.789 4.2422 4.2422 10.789-10.789v15.258h6v-15.258l10.789 10.789 4.2422-4.2422-10.789-10.789h15.258v-6h-15.258l10.789-10.787-4.2422-4.2441-10.789 10.789v-15.258h-6z" fill="#586e75"/>
- </g>
-</svg>
diff --git a/src/assets/img/power-cross.svg b/src/assets/img/power-cross.svg
deleted file mode 100644
index e83b64b40..000000000
--- a/src/assets/img/power-cross.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000004 75.000004">
- <g transform="translate(0 -977.36)">
-  <g fill="#586e75" transform="translate(353.02 422.5)">
-   <path d="m-334.18 567.36-6.3438 6.3457 11.154 11.154-11.154 11.156 6.3438 6.3438 11.156-11.154 4.6113 4.6113a17.5 17.5 0 0 1 6.1602 -6.5293l-4.4277-4.4277 11.156-11.154-6.3457-6.3457-11.154 11.156-11.156-11.156z"/>
-   <path d="m-305.19 590.93v13.888h4.1665v-13.888h-4.1665zm-4.0845 3.1087a12.499 12.499 0 0 0 -5.8245 14.062 12.499 12.499 0 0 0 12.074 9.2635 12.499 12.499 0 0 0 12.073 -9.2635 12.499 12.499 0 0 0 -5.8234 -14.062l-2.4332 4.2179a7.6386 7.6386 0 0 1 3.8221 6.6081 7.6386 7.6386 0 0 1 -7.6386 7.6385 7.6386 7.6386 0 0 1 -7.6391 -7.6385 7.6386 7.6386 0 0 1 3.824 -6.6081l-2.4346-4.2174z"/>
-  </g>
- </g>
-</svg>
diff --git a/src/assets/img/power-timer.svg b/src/assets/img/power-timer.svg
deleted file mode 100644
index eb177e23c..000000000
--- a/src/assets/img/power-timer.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000004 75.000004">
- <g transform="translate(0 -977.36)">
-  <g fill="#586e75" transform="translate(253.02 422.5)">
-   <g transform="matrix(.88890 0 0 .88890 -917.85 150.14)">
-    <path d="m-213.66 569.03-1.5312 4.1855a15.556 15.556 0 0 1 10.166 13.566 17.5 17.5 0 0 1 2.002 -0.13672 17.5 17.5 0 0 1 2.4531 0.19531 20 20 0 0 0 -13.09 -17.811zm-25.641 11.914a20 20 0 0 0 -1.1445 5.0938 20 20 0 0 0 18.152 21.691 20 20 0 0 0 2.1758 0.0664 17.5 17.5 0 0 1 -0.40625 -3.6504 17.5 17.5 0 0 1 0.0391 -0.79297 15.556 15.556 0 0 1 -1.416 -0.0488 15.556 15.556 0 0 1 -14.119 -16.871 15.556 15.556 0 0 1 0.90234 -3.957l-4.1836-1.5312z" transform="matrix(1.125 0 0 1.125 1032.6 -168.91)"/>
-    <rect transform="matrix(-.63850 .76962 -.76962 -.63850 0 0)" height="25" width="4" y="-920.62" x="-123.96"/>
-    <circle cy="472.36" cx="784.48" r="3"/>
-   </g>
-   <path d="m-205.19 590.93v13.888h4.1665v-13.888h-4.1665zm-4.0845 3.1087a12.499 12.499 0 0 0 -5.8245 14.062 12.499 12.499 0 0 0 12.074 9.2635 12.499 12.499 0 0 0 12.073 -9.2635 12.499 12.499 0 0 0 -5.8234 -14.062l-2.4332 4.2179a7.6386 7.6386 0 0 1 3.8221 6.6081 7.6386 7.6386 0 0 1 -7.6386 7.6385 7.6386 7.6386 0 0 1 -7.6391 -7.6385 7.6386 7.6386 0 0 1 3.824 -6.6081l-2.4346-4.2174z"/>
-  </g>
- </g>
-</svg>
diff --git a/src/assets/img/power.svg b/src/assets/img/power.svg
deleted file mode 100644
index 4e07f73ba..000000000
--- a/src/assets/img/power.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000004 75.000004">
- <g transform="translate(0 -977.36)">
-  <path d="m33.603 991.07v24.999h7.4998v-24.999h-7.4998zm-7.3523 5.5957a22.499 22.499 0 0 0 -10.484 25.312 22.499 22.499 0 0 0 21.734 16.674 22.499 22.499 0 0 0 21.732 -16.674 22.499 22.499 0 0 0 -10.482 -25.312l-4.3799 7.5923a13.75 13.75 0 0 1 6.8798 11.895 13.75 13.75 0 0 1 -13.75 13.75 13.75 13.75 0 0 1 -13.751 -13.75 13.75 13.75 0 0 1 6.8833 -11.895l-4.3824-7.5915z" fill="#586e75"/>
- </g>
-</svg>
diff --git a/src/assets/img/privacy.svg b/src/assets/img/privacy.svg
deleted file mode 100644
index 8df7d1727..000000000
--- a/src/assets/img/privacy.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000002 75.000001">
- <g transform="translate(-47.667 -955.55)">
-  <path fill="#586e75" d="m64.216 974.3c-1.5859 1.0596-1.6328 3.6572-1.4551 5.459 0.3588 2.9003 1.7952 5.534 3.6817 7.7227 1.1901 2.1596-0.011 4.9615 1.4375 7.0391 1.3968 1.1072 3.3003 1.3038 5.0117 1.6035 2.7633 0.1502 5.6718 0.16686 8.1386 1.6113 1.6084 0.81219 2.9743 2.7848 5.0059 2.0879 1.6716-0.73133 2.9203-2.2474 4.7305-2.7559 2.7141-1.1053 5.7027-0.6104 8.5058-1.2422v15.967h3v-17.182c0.7674-0.83819 1.0628-2.131 0.9922-3.3281 0.001-1.7719 0.084-3.6795 1.5215-4.9453 2.157-2.8327 3.5138-6.6475 2.5352-10.184-0.1235-1.3468-1.3273-2.6146-2.2657-1.0332-2.5742 2.1779-6.143 2.0946-9.3144 2.0098-2.7982 0.104-5.0148 1.9804-7.0664 3.6719-1.3191 0.93866-2.8688 2.4154-4.6094 1.5879-2.9842-1.5136-5.1137-4.6171-8.5859-5.1524-2.2515-0.2768-4.5676 0.1634-6.7911-0.457-1.6112-0.3484-3.0602-1.2236-4.2226-2.377l-0.25-0.1035zm5.7148 7.8985c2.0885 0.83676 4.3471 0.92353 6.5625 1.0762 2.7189 0.32158 5.1754 2.8124 5.2246 5.584-0.7029 2.5289-4.1615 1.7638-6.0488 1.1738-3.1717-0.97506-4.283-4.4049-6.168-6.7852-0.3482-0.37393-0.069-1.0035 0.4297-1.0488zm30.475 0c1.5522 1.036-1.2444 2.7215-1.5273 3.9746-1.1752 2.1656-3.1477 3.9537-5.6777 4.2402-1.7657 0.57962-5.1872 0.12387-4.5157-2.4336 0.6497-2.8271 3.4318-4.9418 6.3379-4.8164 1.8474-0.002 3.6503-0.34474 5.3828-0.96485z"/>
- </g>
-</svg>
diff --git a/src/assets/img/reaction.svg b/src/assets/img/reaction.svg
deleted file mode 100644
index cec471399..000000000
--- a/src/assets/img/reaction.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="80" width="80" version="1.1" viewBox="0 0 75.000002 75.000001">
- <g transform="translate(-47.667 -1854.9)">
-  <g fill="#586e75" transform="translate(199.37 2199.4)">
-   <path style="color-rendering:auto;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;image-rendering:auto" d="m-172.67-2117.3a24 24 0 0 0 -24 24 24 24 0 0 0 24 24 24 24 0 0 0 24 -24 24 24 0 0 0 -0.38476 -4.1465 15 15 0 0 1 -5.9219 1.2364 15 15 0 0 1 -0.4414 -0.021 17.5 17.5 0 0 1 0.24804 2.9316 17.5 17.5 0 0 1 -17.5 17.5 17.5 17.5 0 0 1 -17.5 -17.5 17.5 17.5 0 0 1 17.5 -17.5 17.5 17.5 0 0 1 2.7168 0.2344 15 15 0 0 1 -0.0234 -0.6445 15 15 0 0 1 1.1582 -5.7676 24 24 0 0 0 -3.8516 -0.3223z" transform="matrix(.93750 0 0 .93750 47.667 1655.6)"/>
-   <path style="color-rendering:auto;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;image-rendering:auto" d="m-122.24-300.38c1.2693 3.3828 4.4641 5.6203 8.0317 5.625 3.5705-0.001 6.7694-2.2394 8.0398-5.625z"/>
-   <path d="m-106.99-325.81-0.00003 4.1512 7.2994 0.00002-0.00002 7.2994 4.1513 0.00003-0.000026-7.2994 7.2994 0.00002-0.000027-4.1512h-7.2994l-0.000027-7.2994-4.1512 0.00002 0.00001 7.2994z"/>
-   <circle style="color-rendering:auto;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;image-rendering:auto" cx="-120.77" cy="-308.35" r="3.2812"/>
-   <circle style="color-rendering:auto;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;image-rendering:auto" cy="-308.35" cx="-107.65" r="3.2812"/>
-  </g>
- </g>
-</svg>
diff --git a/src/assets/img/read.svg b/src/assets/img/read.svg
deleted file mode 100644
index 70c343765..000000000
--- a/src/assets/img/read.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000002 75.000001">
- <g transform="translate(-47.667 -1255.6)">
-  <path style="color-rendering:auto;text-decoration-color:#000000;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;block-progression:tb;text-decoration-line:none;text-decoration-style:solid;image-rendering:auto;white-space:normal;text-indent:0;text-transform:none" d="m102.43 1273.3v0.012h5.2372v34.315h-7.8128c-5.3049 0.014-9.605 0.2702-12.975 3.556l-1.71 1.6679-1.7119-1.6679c-3.3714-3.2869-7.6708-3.547-12.973-3.556h-7.8166v-34.315h5.2392v-0.012h2.4511c4.9028 0 10.279 0.3833 14.812 3.7283 4.5327-3.3435 9.9086-3.7237 14.808-3.7283zm-3.6649 4.9117h1.0874c-5.3022 0.01-9.6025 0.2695-12.973 3.556l-1.71 1.6679-1.7119-1.6679c-3.3716-3.2871-7.6706-3.5514-12.97-3.556h-2.9183v24.511h0.33702v-0.012h2.453c4.9007 0 10.276 0.3848 14.81 3.7302 4.5334-3.3438 9.9088-3.7214 14.806-3.7302-0.40334 0-0.80671 0.01-1.21 0.018v-24.513zm-15.939 7.0432v2.9413h-11.519v-2.9413zm0 5.7337v2.9412h-11.519v-2.9412zm0 5.7336v2.9412h-11.519v-2.9412z" fill="#586e75"/>
- </g>
-</svg>
diff --git a/src/assets/img/report.svg b/src/assets/img/report.svg
deleted file mode 100644
index da8074a33..000000000
--- a/src/assets/img/report.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000002 75.000001">
- <g transform="translate(-47.667 -1455.6)">
-  <g transform="matrix(1.2655 0 0 1.2655 277.34 -458.2)" fill="#586e75">
-   <path style="color-rendering:auto;text-decoration-color:#000000;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;block-progression:tb;text-decoration-line:none;text-decoration-style:solid;image-rendering:auto;white-space:normal;text-indent:0;text-transform:none" d="m-168.77 1524v35.558h3v-35.558h-3z" fill-rule="evenodd"/>
-   <path style="color-rendering:auto;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;image-rendering:auto" d="m-163.67 1525.9v15.855c15.804-7.0718 19.372 9.5883 28.745 0v-15.855c-8.4745 9.4138-17.99-5.8104-28.745 0z"/>
-  </g>
- </g>
-</svg>
diff --git a/src/assets/img/search.svg b/src/assets/img/search.svg
deleted file mode 100644
index 99d3136a2..000000000
--- a/src/assets/img/search.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000002 75.000001">
- <g transform="translate(-47.667 -855.55)">
-  <path d="m79.168 870.55a16.5 16.5 0 0 0 -16.5 16.5 16.5 16.5 0 0 0 16.5 16.5 16.5 16.5 0 0 0 9.752 -3.2129l15.213 15.213 3.5352-3.5352-15.213-15.213a16.5 16.5 0 0 0 3.2129 -9.752 16.5 16.5 0 0 0 -16.5 -16.5zm0 4a12.5 12.5 0 0 1 12.5 12.5 12.5 12.5 0 0 1 -12.5 12.5 12.5 12.5 0 0 1 -12.5 -12.5 12.5 12.5 0 0 1 12.5 -12.5z" fill="#586e75"/>
- </g>
-</svg>
diff --git a/src/assets/img/settings.svg b/src/assets/img/settings.svg
deleted file mode 100644
index cf1491959..000000000
--- a/src/assets/img/settings.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 30 30">
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g transform="translate(-40,-862.375)">
-  <path fill-rule="nonzero" fill="#586e75" d="m55,868.38c-0.39984,0-0.80145,0.0115-1.1875,0.0625l-0.4375,2.8438c-0.54489,0.14485-1.055,0.34832-1.5312,0.625l-2.3125-1.6875c-0.62827,0.4811-1.1741,1.06-1.6562,1.6875l1.6875,2.3125c-0.26707,0.46301-0.51321,0.97235-0.65625,1.5l-2.8125,0.4375c-0.053,0.4-0.094,0.82-0.094,1.23,0,0.3989,0.0123,0.77105,0.0625,1.1562l2.8438,0.4375c0.14171,0.53898,0.35425,1.0589,0.625,1.5312l-1.6562,2.3125c0.48217,0.6275,1.028,1.2064,1.6562,1.6875l2.3125-1.6875c0.47629,0.27668,0.98636,0.48015,1.5312,0.625l0.4375,2.8125c0.38605,0.05,0.78765,0.125,1.1875,0.125,0.39984,0,0.80145-0.0738,1.1875-0.125l0.4375-2.8125c0.54489-0.14485,1.055-0.34832,1.5312-0.625l2.3125,1.6875c0.62827-0.4811,1.1741-1.06,1.6562-1.6875l-1.657-2.32c0.27075-0.47234,0.48329-0.99227,0.625-1.5312l2.8438-0.4375c0.05-0.38,0.062-0.76,0.062-1.15,0-0.4087-0.04097-0.82435-0.09375-1.2188l-2.8125-0.4375c-0.14304-0.52765-0.38918-1.037-0.65625-1.5l1.6875-2.3125c-0.48217-0.6275-1.028-1.2064-1.6562-1.6875l-2.3125,1.6875c-0.47629-0.27668-0.98636-0.48015-1.5312-0.625l-0.439-2.84c-0.387-0.05-0.788-0.06-1.188-0.06zm0,5.8438c1.7397,0,3.1562,1.4165,3.1562,3.1562s-1.4165,3.125-3.1562,3.125-3.1562-1.3853-3.1562-3.125,1.4165-3.1562,3.1562-3.1562z"/>
- </g>
-</svg>
diff --git a/src/assets/img/trashbin.svg b/src/assets/img/trashbin.svg
deleted file mode 100644
index 641fecbcb..000000000
--- a/src/assets/img/trashbin.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="80" width="80" version="1.1" viewBox="0 0 75.000002 75.000001">
- <g transform="translate(-47.667 -1755.6)">
-  <g transform="matrix(1.2226 0 0 1.2226 -16.238 -401.68)" stroke-width=".81794" fill="#586e75">
-   <path d="m78.442 1776.8v3.1025h-11.01v3.1024h31.023v-3.1024h-11.008v-3.1025z"/>
-   <path d="m24.069 138.55 0.05011 30h27.02l0.04816-30zm5.4176 4.2852h2.5703v21.428h-2.5703zm6.8555 0h2.5723v21.428h-2.5723zm6.8574 0h2.5723v21.428h-2.5723z" transform="matrix(.93750 0 0 .93750 47.667 1655.6)"/>
-  </g>
- </g>
-</svg>
diff --git a/src/assets/img/unchecked.svg b/src/assets/img/unchecked.svg
deleted file mode 100644
index 181b30d55..000000000
--- a/src/assets/img/unchecked.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000002 75.000001">
- <g transform="translate(-47.667 44.45)">
-  <path style="color-rendering:auto;text-decoration-color:#000000;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;block-progression:tb;text-decoration-line:none;image-rendering:auto;white-space:normal;text-indent:0;text-transform:none;text-decoration-style:solid" fill="#586e75" d="m64.668-29.45c-1.1045 0.00011-1.9999 0.89548-2 2v41c0.00011 1.1045 0.89548 1.9999 2 2h41c1.1045-0.00011 1.9999-0.89548 2-2v-11.459h-4v9.459h-37v-37h9.459v-4z"/>
- </g>
-</svg>
diff --git a/src/assets/img/valid.svg b/src/assets/img/valid.svg
deleted file mode 100644
index ad954e964..000000000
--- a/src/assets/img/valid.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 74.998815 74.998814">
- <g transform="matrix(.99998 0 0 .99998 -946.96 -454.86)">
-  <path fill="#586e75" d="m968.77 483.34-6.7973 6.7972 18.75 18.749 26.25-26.25-6.7973-6.7973-19.453 19.453z"/>
- </g>
-</svg>
diff --git a/src/assets/img/warning.svg b/src/assets/img/warning.svg
deleted file mode 100644
index c5ca51651..000000000
--- a/src/assets/img/warning.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="75" width="75" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 75.000002 75.000001">
- <g transform="translate(-47.667 -1055.6)">
-  <path style="color-rendering:auto;text-decoration-color:#000000;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;block-progression:tb;text-decoration-line:none;text-decoration-style:solid;image-rendering:auto;white-space:normal;text-indent:0;text-transform:none" d="m85.285 1073.3c-0.9351-0.044-1.8151 0.437-2.2833 1.2461l-20 34.574c-0.9626 1.6649 0.2402 3.7454 2.1661 3.7461h40c1.9259-0.0007 3.1286-2.0812 2.166-3.7461l-20-34.574c-0.426-0.7361-1.198-1.2058-2.0488-1.2461zm-2.6739 9.6309h5.1543v5.5918c0 2.2108-0.08 4.2344-0.2402 6.0722-0.1599 1.8379-0.3599 3.6902-0.5996 5.5547h-3.4356c-0.2664-1.8645-0.4787-3.7168-0.6386-5.5547-0.1598-1.8645-0.2403-3.8881-0.2403-6.0722v-5.5918zm2.5567 20.016c0.9057 0 1.6647 0.3054 2.2773 0.918 0.6126 0.586 0.9199 1.3451 0.9199 2.2773 0 0.9323-0.3073 1.6914-0.9199 2.2774-0.6126 0.5859-1.3716 0.8789-2.2773 0.8789-0.879 0-1.6382-0.293-2.2774-0.8789-0.6127-0.586-0.918-1.3451-0.918-2.2774 0-0.9322 0.3053-1.6913 0.918-2.2773 0.6392-0.6126 1.3984-0.918 2.2774-0.918z" fill="#586e75"/>
- </g>
-</svg>
diff --git a/webpack.config.js b/webpack.config.js
new file mode 100644
index 000000000..9c03d3d3b
--- /dev/null
+++ b/webpack.config.js
@@ -0,0 +1,26 @@
+const path = require("path");
+const entry = require('./webpack/config.entry');
+const rules = require("./webpack/config.rules");
+const plugins = require("./webpack/config.plugins.js");
+const stats = require("./webpack/config.stats");
+
+module.exports = function webpack(env = {}, argv = {}) {
+  const srcPath = path.resolve(__dirname, 'src');
+  return {
+    resolve: {
+      extensions: ['.ts', '.tsx', '.js', '.jsx'],
+      modules: [srcPath, 'node_modules']
+    },
+    entry: entry(env, srcPath),
+    output: {
+      filename: 'js/[name].bundle.js',
+      chunkFilename: 'js/[id].chunk.js',
+      path: path.join(__dirname, 'build', env.build),
+      publicPath: '.',
+    },
+    module: { rules: rules(argv.mode) },
+    plugins: plugins(env, argv, path.join(__dirname, 'build')),
+    devtool: env.hmr ? 'eval-source-map' : 'source-map',
+    stats
+  };
+};
diff --git a/webpack/base.config.js b/webpack/base.config.js
deleted file mode 100644
index 64ca2c8ff..000000000
--- a/webpack/base.config.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import path from 'path';
-import HtmlWebpackPlugin from 'html-webpack-plugin';
-
-const srcPath = path.join(__dirname, '../src/app');
-
-const baseConfig = ({
-    mode, input, output = {}, plugins = [], rules = [], ...rest
-}) => ({
-  mode,
-  entry: Object.assign(
-    {
-      background: ['@babel/polyfill', path.join(srcPath, './background/')],
-      content: ['@babel/polyfill', path.join(srcPath, './content/')]
-    },
-    input
-  ),
-  output: Object.assign(
-    {
-      filename: 'js/[name].bundle.js',
-      chunkFilename: 'js/[id].chunk.js'
-    },
-    output
-  ),
-  plugins: [
-    new HtmlWebpackPlugin({ template: './views/background.pug', filename: 'background.html', inject: false }),
-    ...plugins
-  ],
-  resolve: {
-    alias: {
-      app: srcPath,
-      extension: path.join(srcPath, './background')
-    },
-    extensions: ['.js', '.jsx']
-  },
-  module: {
-    rules: [
-      {
-        test: /\.jsx?$/,
-        include: [
-          path.resolve(__dirname, '../src/')
-        ],
-        use: [
-          { loader: 'babel-loader' },
-          { loader: 'stylelint-custom-processor-loader' },
-        ],
-      },
-      {
-        test: /\.css$/,
-        use: [
-          { loader: "style-loader" },
-          { loader: "css-loader" }
-        ]
-      },
-      {
-          test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
-          use: [{
-              loader: 'file-loader',
-              options: {
-                  name: '[name].[ext]',
-                  outputPath: 'fonts/'
-              }
-          }]
-      },
-      {
-        test: /\.scss?$/,
-          include: [
-            path.resolve(__dirname, '../src/app/'),
-          ],
-          oneOf: [
-              {
-                  resourceQuery: /external/, // foo.css?inline
-                  use: [
-                      "css-loader", // translates CSS into CommonJS
-                      "sass-loader" // compiles Sass to CSS, using Node Sass by default
-                  ]
-              },
-              {
-                  resourceQuery: /inline/, // foo.css?external
-                  use: [
-                      "style-loader", // creates style nodes from JS strings
-                      "css-loader", // translates CSS into CommonJS
-                      "sass-loader" // compiles Sass to CSS, using Node Sass by default
-                  ]
-              }
-          ]
-      },
-      {
-        test: /\.svg/,
-        include: [
-          path.resolve(__dirname, '../src/')
-        ],
-        use: [
-          { loader: 'svg-url-loader' },
-        ]
-      },
-      {
-          test: /\.(jade|pug)$/,
-          use: {
-              loader: 'pug-loader',
-              options: {
-                  pretty: mode === 'development',
-              }
-          },
-          include: [ path.resolve(__dirname, '../views/') ],
-      }
-    ].concat(rules),
-  },
-  ...rest,
-});
-
-export default baseConfig;
diff --git a/webpack/chromium.config.js b/webpack/chromium.config.js
deleted file mode 100644
index 2b4b51b39..000000000
--- a/webpack/chromium.config.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import path from 'path';
-import webpack from 'webpack';
-import baseConfig from './base.config';
-
-
-export default baseConfig({
-  mode: 'production',
-  output: {
-    path: path.join(__dirname, '../build/chromium'),
-    publicPath: '.',
-  },
-  plugins: [
-    new webpack.DefinePlugin({
-      'process.env': {
-        NODE_ENV: '"production"',
-        LMEM_BACKEND_ORIGIN: '"https://recommendations.lmem.net"',
-        LMEM_SCRIPTS_ORIGIN: '\'.\'',
-        UNINSTALL_ORIGIN: '\'https://www.lmem.net/desinstallation\'',
-        REFRESH_MC_INTERVAL: '10*60*1000',
-        ONBOARDING_ORIGIN: '"https://bienvenue.lmem.net?extensionInstalled"',
-        HEAP_APPID: '"3705584166"', // production
-      }
-    }),
-  ],
-});
diff --git a/webpack/config.entry.js b/webpack/config.entry.js
new file mode 100644
index 000000000..07136b51d
--- /dev/null
+++ b/webpack/config.entry.js
@@ -0,0 +1,11 @@
+const path = require('path');
+
+module.exports = (env, srcPath) => ({
+  background: ['@babel/polyfill', path.join(srcPath, './app/background/')],
+  content: ['@babel/polyfill', path.join(srcPath, './app/content/')],
+  ...(
+    env.build === 'dev' || env.build === 'staging'
+      ? {test: [path.join(__dirname, '../test/integration/')]}
+      : {}
+  )
+});
diff --git a/webpack/config.outputPath.js b/webpack/config.outputPath.js
new file mode 100644
index 000000000..35657dc9c
--- /dev/null
+++ b/webpack/config.outputPath.js
@@ -0,0 +1,7 @@
+const path = require('path');
+
+module.exports = (env, outputBase) => {
+  switch (env.build) {
+    case 'dev': path.resolve(outputBase, 'dev')
+  }
+};
diff --git a/webpack/config.plugins.js b/webpack/config.plugins.js
new file mode 100644
index 000000000..86b60e061
--- /dev/null
+++ b/webpack/config.plugins.js
@@ -0,0 +1,79 @@
+const path = require('path');
+const webpack = require("webpack");
+const WebpackCleanupPlugin = require("webpack-cleanup-plugin");
+const HtmlWebpackPlugin = require("html-webpack-plugin");
+const CreateFilePlugin = require("create-file-webpack");
+const ZipPlugin = require("zip-webpack-plugin");
+const CopyWebpackPlugin = require("copy-webpack-plugin");
+
+const manifests = require("../manifest");
+const { version } = require('../package.json');
+
+const ENV = {
+  dev: {
+    LMEM_BACKEND_ORIGIN: '"https://recommendations.lmem.net"',
+  },
+  staging: {
+    LMEM_BACKEND_ORIGIN: '"https://staging-recommendations.lmem.net"',
+    UNINSTALL_ORIGIN: '\'https://www.lmem.net/desinstallation\'',
+    HEAP_APPID: '"234457910"', // testing
+    REFRESH_MC_INTERVAL: '5*60*1000',
+  },
+  chromium: {
+    LMEM_BACKEND_ORIGIN: '"https://recommendations.lmem.net"',
+    UNINSTALL_ORIGIN: '\'https://www.lmem.net/desinstallation\'',
+    REFRESH_MC_INTERVAL: '10*60*1000',
+    ONBOARDING_ORIGIN: '"https://bienvenue.lmem.net?extensionInstalled"',
+    HEAP_APPID: '"3705584166"', // production
+  },
+  firefox: {
+    LMEM_BACKEND_ORIGIN: '"https://recommendations.lmem.net"',
+    ONBOARDING_ORIGIN: '"https://bienvenue.lmem.net?extensionInstalled"',
+    REFRESH_MC_INTERVAL: '10*60*1000',
+  }
+};
+
+module.exports = (env = {}, argv = {}, outputPath) => {
+  const buildPath = path.join(outputPath, env.build);
+
+  const copyConfig = [
+    { from: 'src/assets', to: buildPath},
+    { from: 'src/app/lmem/draft-preview/grabDraftRecommendations.js', to: path.join(buildPath, 'js')}
+  ];
+  if (argv.mode !== 'production') {
+    copyConfig.push(
+      { from: 'test/infrastructure', to: path.join(outputPath, env.build, 'test', 'infrastructure')},
+      { from: 'test/integration', to: path.join(outputPath, env.build, 'test', 'integration') }
+    );
+  }
+
+  const plugins = [
+    new HtmlWebpackPlugin({
+      template: './views/background.pug',
+      filename: 'background.html',
+      inject: false
+    }),
+    new webpack.DefinePlugin({
+      'process.env': ENV[env.build]
+    }),
+    new CreateFilePlugin({
+      path: path.join(outputPath, env.build),
+      fileName: 'manifest.json',
+      content: JSON.stringify(manifests[env.build])
+    }),
+    new CopyWebpackPlugin(copyConfig)
+  ];
+
+  if (!env.hmr) {
+    plugins.push(
+      new WebpackCleanupPlugin({ quiet: true }),
+      new ZipPlugin({
+        path: '..',
+        filename: `lmem-v${version}-${env.build}.zip`,
+     //   pathPrefix: env.build,
+      })
+    )
+  }
+
+  return plugins;
+};
diff --git a/webpack/config.rules.js b/webpack/config.rules.js
new file mode 100644
index 000000000..abda009ec
--- /dev/null
+++ b/webpack/config.rules.js
@@ -0,0 +1,52 @@
+const path = require("path");
+
+module.exports = (env, mode) => {
+  const rules = [
+    {
+      test: /\.tsx?$/,
+      loader: require.resolve("awesome-typescript-loader")
+    },
+    {
+      test: /\.jsx?$/,
+      loader: require.resolve("babel-loader"),
+      include: [
+        path.resolve(__dirname, "..", "src"),
+        path.resolve(__dirname, "..", ".storybook")
+      ]
+    },
+    {
+      test: /\.css$/,
+      use: [{ loader: "style-loader" }, { loader: "css-loader" }]
+    },
+    {
+      test: /\.(woff2?|ttf|eot|svg)$/,
+      loader: "url-loader"
+    },
+    {
+      test: /\.svg/,
+      include: [
+        path.resolve(__dirname, '../src/')
+      ],
+      loader: 'svg-url-loader',
+    },
+    {
+      test: /\.(jade|pug)$/,
+      use: {
+        loader: 'pug-loader',
+        options: {
+          pretty: mode === 'development',
+        }
+      },
+      include: [ path.resolve(__dirname, '../views/') ],
+    }
+  ];
+
+  if (env.build === 'firefox') {
+    rules.push({
+      test: /lib\/heap/,
+      use: [{ loader: 'null-loader'}],
+    })
+  }
+
+  return rules;
+};
diff --git a/webpack/config.stats.js b/webpack/config.stats.js
new file mode 100644
index 000000000..87bba8d50
--- /dev/null
+++ b/webpack/config.stats.js
@@ -0,0 +1,127 @@
+module.exports = {
+  // fallback value for stats options when an option is not defined (has precedence over local webpack defaults)
+  all: false,
+
+  // Add asset Information
+  assets: true,
+
+  // Sort assets by a field
+  // You can reverse the sort with `!field`.
+  // Some possible values: 'id' (default), 'name', 'size', 'chunks', 'failed', 'issuer'
+  // For a complete list of fields see the bottom of the page
+  // assetsSort: "field",
+
+  // Add build date and time information
+  builtAt: false,
+
+  // Add information about cached (not built) modules
+  cached: false,
+
+  // Show cached assets (setting this to `false` only shows emitted files)
+  cachedAssets: false,
+
+  // Add children information
+  children: false,
+
+  // Add chunk information (setting this to `false` allows for a less verbose output)
+  chunks: false,
+
+  // Add namedChunkGroups information
+  chunkGroups: false,
+
+  // Add built modules information to chunk information
+  chunkModules: false,
+
+  // Add the origins of chunks and chunk merging info
+  chunkOrigins: false,
+
+  // Sort the chunks by a field
+  // You can reverse the sort with `!field`. Default is `id`.
+  // Some other possible values: 'name', 'size', 'chunks', 'failed', 'issuer'
+  // For a complete list of fields see the bottom of the page
+  // chunksSort: "field",
+
+  // Context directory for request shortening
+  // context: "../src/",
+
+  // `webpack --colors` equivalent
+  colors: true,
+
+  // Display the distance from the entry point for each module
+  depth: false,
+
+  // Display the entry points with the corresponding bundles
+  entrypoints: false,
+
+  // Add --env information
+  env: true,
+
+  // Add errors
+  errors: true,
+
+  // Add details to errors (like resolving log)
+  errorDetails: true,
+
+  // Exclude assets from being displayed in stats
+  // This can be done with a String, a RegExp, a Function getting the assets name
+  // and returning a boolean or an Array of the above.
+  // excludeAssets: "filter" | /filter/ | (assetName) => true | false | ["filter"] | [/filter/] | [(assetName) => true|false],
+
+  // Exclude modules from being displayed in stats
+  // This can be done with a String, a RegExp, a Function getting the modules source
+  // and returning a boolean or an Array of the above.
+  // excludeModules: "filter" | /filter/ | (moduleSource) => true | false | ["filter"] | [/filter/] | [(moduleSource) => true|false],
+
+  // See excludeModules
+  // exclude: "filter" | /filter/ | (moduleSource) => true | false | ["filter"] | [/filter/] | [(moduleSource) => true|false],
+
+  // Add the hash of the compilation
+  hash: false,
+
+  // Set the maximum number of modules to be shown
+  maxModules: 15,
+
+  // Add built modules information
+  modules: false,
+
+  // Sort the modules by a field
+  // You can reverse the sort with `!field`. Default is `id`.
+  // Some other possible values: 'name', 'size', 'chunks', 'failed', 'issuer'
+  // For a complete list of fields see the bottom of the page
+  // modulesSort: "field",
+
+  // Show dependencies and origin of warnings/errors (since webpack 2.5.0)
+  moduleTrace: true,
+
+  // Show performance hint when file size exceeds `performance.maxAssetSize`
+  performance: true,
+
+  // Show the exports of the modules
+  providedExports: true,
+
+  // Add public path information
+  publicPath: false,
+
+  // Add information about the reasons why modules are included
+  reasons: true,
+
+  // Add the source code of modules
+  source: false,
+
+  // Add timing information
+  timings: true,
+
+  // Show which exports of a module are used
+  usedExports: false,
+
+  // Add webpack version information
+  version: false,
+
+  // Add warnings
+  warnings: true
+
+  // Filter warnings to be shown (since webpack 2.4.0),
+  // can be a String, Regexp, a function getting the warning and returning a boolean
+  // or an Array of a combination of the above. First match wins.
+  // warningsFilter: "filter" | /filter/ | ["filter", /filter/] | (warning) => true|false
+};
diff --git a/webpack/dev.config.js b/webpack/dev.config.js
deleted file mode 100644
index 0bf29211e..000000000
--- a/webpack/dev.config.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import path from 'path';
-import webpack from 'webpack';
-import baseConfig from './base.config';
-
-export default baseConfig({
-  mode: 'development',
-  devtool: 'cheap-module-source-map',
-  input: {
-    test: [path.join(__dirname, '../test/integration/')],
-  },
-  output: {
-    path: path.join(__dirname, '../build/dev'),
-    publicPath: '.'
-  },
-  plugins: [
-    new webpack.DefinePlugin({
-      'process.env': {
-        NODE_ENV: '"development"',
-        LMEM_BACKEND_ORIGIN: '"https://recommendations.lmem.net"',
-        LMEM_SCRIPTS_ORIGIN: '\'.\'', // Use local build
-        // REFRESH_MC_INTERVAL: '1*60*1000', // Uncomment to enable auto-refresh
-      }
-    })
-  ],
-});
diff --git a/webpack/firefox.config.js b/webpack/firefox.config.js
deleted file mode 100644
index b4b8c9c44..000000000
--- a/webpack/firefox.config.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import path from 'path';
-import webpack from 'webpack';
-import baseConfig from './base.config';
-
-export default baseConfig({
-  mode: 'production',
-  output: {
-    path: path.join(__dirname, '../build/firefox'),
-    publicPath: '.', // No remote URL with Firefox
-  },
-  rules: [
-    {
-      test: /lib\/heap/,
-      use: [{ loader: 'null-loader'}],
-    }
-  ],
-  plugins: [
-    new webpack.DefinePlugin({
-      'process.env': {
-        NODE_ENV: '"production"',
-        LMEM_BACKEND_ORIGIN: '"https://recommendations.lmem.net"',
-        LMEM_SCRIPTS_ORIGIN: '\'.\'', // Use local build
-        ONBOARDING_ORIGIN: '"https://bienvenue.lmem.net?extensionInstalled"',
-        REFRESH_MC_INTERVAL: '10*60*1000',
-        // No analytics with Firefox
-        // HEAP_APPID: '"3705584166"',
-      }
-    })
-  ],
-});
diff --git a/webpack/staging.config.js b/webpack/staging.config.js
deleted file mode 100644
index 5f06c8164..000000000
--- a/webpack/staging.config.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import path from 'path';
-import webpack from 'webpack';
-import baseConfig from './base.config';
-
-export default baseConfig({
-  mode: 'development',
-  input: {
-    test: [path.join(__dirname, '../test/integration/')],
-  },
-  output: {
-    path: path.join(__dirname, '../build/staging'),
-    publicPath: '.',
-  },
-  plugins: [
-    new webpack.DefinePlugin({
-      'process.env': {
-        NODE_ENV: '"staging"',
-        LMEM_BACKEND_ORIGIN: '"https://staging-recommendations.lmem.net"',
-        LMEM_SCRIPTS_ORIGIN: '\'.\'',
-        UNINSTALL_ORIGIN: '\'https://www.lmem.net/desinstallation\'',
-        HEAP_APPID: '"234457910"', // testing
-        REFRESH_MC_INTERVAL: '5*60*1000',
-      }
-    })
-  ],
-});
diff --git a/yarn.lock b/yarn.lock
index 8d15f3785..d1e0457ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2128,22 +2128,10 @@ ansi-align@^3.0.0:
   dependencies:
     string-width "^3.0.0"
 
-ansi-colors@^1.0.1:
-  version "1.1.0"
-  resolved "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
-  dependencies:
-    ansi-wrap "^0.1.0"
-
 ansi-colors@^3.0.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95"
 
-ansi-cyan@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
-  dependencies:
-    ansi-wrap "0.1.0"
-
 ansi-escapes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
@@ -2152,23 +2140,10 @@ ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
 
-ansi-gray@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
-  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
-  dependencies:
-    ansi-wrap "0.1.0"
-
 ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
 
-ansi-red@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
-  dependencies:
-    ansi-wrap "0.1.0"
-
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -2193,10 +2168,6 @@ ansi-styles@^3.2.1:
   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.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
@@ -2252,7 +2223,7 @@ archiver@^2.1.1:
     tar-stream "^1.5.0"
     zip-stream "^1.2.0"
 
-archy@^1.0.0, archy@~1.0.0:
+archy@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
 
@@ -2280,13 +2251,6 @@ aria-query@^3.0.0:
     ast-types-flow "0.0.7"
     commander "^2.11.0"
 
-arr-diff@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
-  dependencies:
-    arr-flatten "^1.0.1"
-    array-slice "^0.2.3"
-
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
@@ -2302,24 +2266,10 @@ 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"
 
-arr-union@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d"
-
 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"
-  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
-
-array-each@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
-  integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8=
-
 array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
@@ -2363,22 +2313,13 @@ array-reduce@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
 
-array-slice@^0.2.3:
-  version "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"
-  integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
-
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
   dependencies:
     array-uniq "^1.0.1"
 
-array-uniq@^1.0.0, array-uniq@^1.0.1, array-uniq@^1.0.2:
+array-uniq@^1.0.0, array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
 
@@ -2494,6 +2435,13 @@ async@^2.0.0, async@^2.1.4:
   dependencies:
     lodash "^4.17.10"
 
+async@^2.5.0:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
+  integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
+  dependencies:
+    lodash "^4.17.11"
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -2524,6 +2472,20 @@ autoprefixer@^9.3.1:
     postcss "^7.0.14"
     postcss-value-parser "^3.3.1"
 
+awesome-typescript-loader@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-5.2.1.tgz#a41daf7847515f4925cdbaa3075d61f289e913fc"
+  integrity sha512-slv66OAJB8orL+UUaTI3pKlLorwIvS4ARZzYR9iJJyGsEgOqueMfOMdKySWzZ73vIkEe3fcwFgsKMg4d8zyb1g==
+  dependencies:
+    chalk "^2.4.1"
+    enhanced-resolve "^4.0.0"
+    loader-utils "^1.1.0"
+    lodash "^4.17.5"
+    micromatch "^3.1.9"
+    mkdirp "^0.5.1"
+    source-map-support "^0.5.3"
+    webpack-log "^1.2.0"
+
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -2877,11 +2839,6 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-beeper@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
-  integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=
-
 before-after-hook@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.1.0.tgz#83165e15a59460d13702cb8febd6a1807896db5a"
@@ -2917,7 +2874,7 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.3.5:
+bluebird@^3.3.5, bluebird@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
 
@@ -3228,6 +3185,26 @@ cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
     unique-filename "^1.1.0"
     y18n "^4.0.0"
 
+cacache@^11.3.1:
+  version "11.3.2"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
+  integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
+  dependencies:
+    bluebird "^3.5.3"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.3"
+    graceful-fs "^4.1.15"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.2"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -3385,7 +3362,7 @@ chalk@2.4.1, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -3467,7 +3444,7 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chownr@^1.0.1:
+chownr@^1.0.1, chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
 
@@ -3605,10 +3582,6 @@ cliui@^4.0.0:
     strip-ansi "^4.0.0"
     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-deep@^0.2.4:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.2.4.tgz#4e73dd09e9fb971cc38670c5dced9c1896481cc6"
@@ -3626,37 +3599,15 @@ clone-regexp@^1.0.0:
     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"
-  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
-
-clone-stats@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
-
-clone@2.1.1, clone@^2.1.1:
+clone@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
 
-clone@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
-  integrity sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=
-
-clone@^1.0.0, clone@^1.0.2:
+clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
-cloneable-readable@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.2.tgz#d591dee4a8f8bc15da43ce97dceeba13d43e2a65"
-  dependencies:
-    inherits "^2.0.1"
-    process-nextick-args "^2.0.0"
-    readable-stream "^2.3.5"
-
 cmd-shim@^2.0.2, cmd-shim@~2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
@@ -3708,11 +3659,6 @@ color-name@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689"
 
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
 colors@0.5.x:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
@@ -3978,6 +3924,22 @@ copy-to-clipboard@^3.0.8:
   dependencies:
     toggle-selection "^1.0.3"
 
+copy-webpack-plugin@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.0.tgz#db3269ab83e8a2c3316c1bc9cba54019bbcf5c17"
+  integrity sha512-iiDj+8nnZeW/i8vYJ3+ABSZkOefJnDYIGLojiZKKFDvf1wcEInABXH1+hN7axQMn04qvJxKjgVOee0e14XPtCg==
+  dependencies:
+    cacache "^11.3.1"
+    find-cache-dir "^2.0.0"
+    globby "^7.1.1"
+    is-glob "^4.0.0"
+    loader-utils "^1.1.0"
+    minimatch "^3.0.4"
+    normalize-path "^3.0.0"
+    p-limit "^2.1.0"
+    serialize-javascript "^1.4.0"
+    webpack-log "^2.0.0"
+
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
@@ -4055,6 +4017,14 @@ create-error-class@^3.0.0:
   dependencies:
     capture-stack-trace "^1.0.0"
 
+create-file-webpack@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/create-file-webpack/-/create-file-webpack-1.0.2.tgz#c206474fe15a6aab12e2a278a7798d244befff0b"
+  integrity sha512-+J6kQTE+Wcobc6gHP8E2zmoeIC+J+p6IXqjFrzoxCl1VYlimWoincPUABAhODuXAJGrZcNZ/Up0PTqq1ISiwvA==
+  dependencies:
+    path "^0.12.7"
+    write "^1.0.3"
+
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
   resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
@@ -4276,14 +4246,17 @@ cyclist@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
 
+d@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
+  dependencies:
+    es5-ext "^0.10.9"
+
 damerau-levenshtein@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
 
-dargs@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/dargs/-/dargs-5.1.0.tgz#ec7ea50c78564cd36c9d5ec18f66329fade27829"
-
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -4298,11 +4271,6 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-dateformat@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
-  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
-
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
@@ -4397,7 +4365,7 @@ default-gateway@^2.6.0:
     execa "^0.10.0"
     ip-regex "^2.1.0"
 
-defaults@^1.0.0, defaults@^1.0.3:
+defaults@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
   dependencies:
@@ -4470,11 +4438,6 @@ depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
 
-deprecated@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
-  integrity sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=
-
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
@@ -4486,11 +4449,6 @@ destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
 
-detect-file@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
-
 detect-indent@^5.0.0, detect-indent@~5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
@@ -4692,13 +4650,6 @@ dotenv@^6.0.0, dotenv@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
 
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
-  dependencies:
-    readable-stream "~1.1.9"
-
 duplexer2@~0.1.0:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
@@ -4793,14 +4744,7 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-end-of-stream@~0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf"
-  integrity sha1-jhdyBsPICDfYVjLouTWd/osvbq8=
-  dependencies:
-    once "~1.3.0"
-
-enhanced-resolve@^4.1.0:
+enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
   dependencies:
@@ -4917,10 +4861,28 @@ es-to-primitive@^1.2.0:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
+es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
+  version "0.10.48"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.48.tgz#9a0b31eeded39e64453bcedf6f9d50bbbfb43850"
+  integrity sha512-CdRvPlX/24Mj5L4NVxTs4804sxiS2CjVprgCmrgoDkdmjdY4D+ySHa7K3jJf8R40dFg0tIm3z/dk326LrnuSGw==
+  dependencies:
+    es6-iterator "~2.0.3"
+    es6-symbol "~3.1.1"
+    next-tick "1"
+
 es5-shim@^4.5.10:
   version "4.5.12"
   resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.12.tgz#508c13dda1c87dd3df1b50e69e7b96b82149b649"
 
+es6-iterator@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
 es6-promise@^3.2.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613"
@@ -4939,6 +4901,14 @@ es6-shim@^0.35.3:
   version "0.35.4"
   resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.4.tgz#8d5a4109756383d3f0323421089c423acf8378f1"
 
+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"
+  integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
 escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -5316,12 +5286,6 @@ express@^4.16.2, express@^4.16.3:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-extend-shallow@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
-  dependencies:
-    kind-of "^1.1.0"
-
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -5385,16 +5349,6 @@ extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
-fancy-log@^1.1.0:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
-  integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    parse-node-version "^1.0.0"
-    time-stamp "^1.0.0"
-
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
@@ -5582,11 +5536,6 @@ find-cache-dir@^2.0.0:
     make-dir "^1.0.0"
     pkg-dir "^3.0.0"
 
-find-index@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
-  integrity sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=
-
 find-npm-prefix@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz#8d8ce2c78b3b4b9e66c8acc6a37c231eb841cfdf"
@@ -5617,37 +5566,6 @@ find-versions@^2.0.0:
     array-uniq "^1.0.0"
     semver-regex "^1.0.0"
 
-findup-sync@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
-  integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
-  dependencies:
-    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.1"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-1.1.1.tgz#95d88ff329123dd1a6950fdfcd321f746271e01f"
-  integrity sha512-jQp949ZmEbiYHk3gkbdtpJ0G1+kgtLQBNdP5edFP7Fh+WAYceLQz6yO1SBj72Xkg8GVyTB3bBzAYrHJVh5Xd5g==
-  dependencies:
-    expand-tilde "^2.0.2"
-    is-plain-object "^2.0.3"
-    object.defaults "^1.1.0"
-    object.pick "^1.2.0"
-    parse-filepath "^1.0.1"
-
-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"
-  integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=
-
-flagged-respawn@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
-  integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
-
 flat-cache@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
@@ -5690,13 +5608,6 @@ for-own@^0.1.3, for-own@^0.1.4:
   dependencies:
     for-in "^1.0.1"
 
-for-own@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
-  dependencies:
-    for-in "^1.0.1"
-
 foreach@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
@@ -5863,13 +5774,6 @@ gauge@~2.7.1, gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-gaze@^0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f"
-  integrity sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=
-  dependencies:
-    globule "~0.1.0"
-
 gaze@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105"
@@ -5969,37 +5873,11 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-stream@^3.1.5:
-  version "3.1.18"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b"
-  integrity sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=
-  dependencies:
-    glob "^4.3.1"
-    glob2base "^0.0.12"
-    minimatch "^2.0.1"
-    ordered-read-streams "^0.1.0"
-    through2 "^0.6.1"
-    unique-stream "^1.0.0"
-
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob-watcher@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b"
-  integrity sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=
-  dependencies:
-    gaze "^0.5.1"
-
-glob2base@^0.0.12:
-  version "0.0.12"
-  resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
-  integrity sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=
-  dependencies:
-    find-index "^0.1.1"
-
 glob@7.1.2, glob@^7.0.0, glob@^7.1.2, glob@~7.1.1:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -6011,17 +5889,7 @@ glob@7.1.2, glob@^7.0.0, glob@^7.1.2, glob@~7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^4.3.1:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
-  integrity sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^2.0.1"
-    once "^1.3.0"
-
-glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@~7.1.2:
+glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.3, glob@~7.1.2:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   dependencies:
@@ -6032,15 +5900,6 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@~7.1.2:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@~3.1.21:
-  version "3.1.21"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
-  integrity sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=
-  dependencies:
-    graceful-fs "~1.2.0"
-    inherits "1"
-    minimatch "~0.2.11"
-
 global-dirs@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
@@ -6113,6 +5972,18 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globby@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
+  integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
+  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"
@@ -6125,22 +5996,6 @@ globule@^1.0.0:
     lodash "~4.17.4"
     minimatch "~3.0.2"
 
-globule@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
-  integrity sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=
-  dependencies:
-    glob "~3.1.21"
-    lodash "~1.0.1"
-    minimatch "~0.2.11"
-
-glogg@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f"
-  integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==
-  dependencies:
-    sparkles "^1.0.0"
-
 gonzales-pe@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.3.tgz#41091703625433285e0aee3aa47829fc1fbeb6f2"
@@ -6163,112 +6018,18 @@ got@^6.3.0, got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
-graceful-fs@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
-  integrity sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=
-  dependencies:
-    natives "^1.1.0"
-
 graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@~4.1.11:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
-graceful-fs@^4.1.9:
+graceful-fs@^4.1.15, graceful-fs@^4.1.9:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
 
-graceful-fs@~1.2.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
-  integrity sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=
-
 growl@1.10.5:
   version "1.10.5"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
 
-gulp-file@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/gulp-file/-/gulp-file-0.4.0.tgz#451356a2ac5089c6db91a0444252a0543657006b"
-  dependencies:
-    through2 "^0.4.1"
-    vinyl "^2.1.0"
-
-gulp-mocha@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-mocha/-/gulp-mocha-6.0.0.tgz#80f32bc705ce30747f355ddb8ccd96a1c73bef13"
-  dependencies:
-    dargs "^5.1.0"
-    execa "^0.10.0"
-    mocha "^5.2.0"
-    npm-run-path "^2.0.2"
-    plugin-error "^1.0.1"
-    supports-color "^5.4.0"
-    through2 "^2.0.3"
-
-gulp-rename@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.4.0.tgz#de1c718e7c4095ae861f7296ef4f3248648240bd"
-
-gulp-util@^3.0.0, gulp-util@^3.0.7:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
-  dependencies:
-    array-differ "^1.0.0"
-    array-uniq "^1.0.2"
-    beeper "^1.0.0"
-    chalk "^1.0.0"
-    dateformat "^2.0.0"
-    fancy-log "^1.1.0"
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    lodash._reescape "^3.0.0"
-    lodash._reevaluate "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.template "^3.0.0"
-    minimist "^1.1.0"
-    multipipe "^0.1.2"
-    object-assign "^3.0.0"
-    replace-ext "0.0.1"
-    through2 "^2.0.0"
-    vinyl "^0.5.0"
-
-gulp-zip@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/gulp-zip/-/gulp-zip-4.2.0.tgz#e25e738c41ad0795ad853d1d8aeb1744d2a4ca82"
-  dependencies:
-    get-stream "^3.0.0"
-    plugin-error "^0.1.2"
-    through2 "^2.0.1"
-    vinyl "^2.1.0"
-    yazl "^2.1.0"
-
-gulp@3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.0.tgz#cf1fba4cb558bb8c6ae6c9613f583ae2620d214a"
-  integrity sha1-zx+6TLVYu4xq5slhP1g64mINIUo=
-  dependencies:
-    archy "^1.0.0"
-    chalk "^1.0.0"
-    deprecated "^0.0.1"
-    gulp-util "^3.0.0"
-    interpret "^0.6.2"
-    liftoff "^2.1.0"
-    minimist "^1.1.0"
-    orchestrator "^0.3.0"
-    pretty-hrtime "^1.0.0"
-    semver "^4.1.0"
-    tildify "^1.0.0"
-    v8flags "^2.0.2"
-    vinyl-fs "^0.3.0"
-
-gulplog@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
-  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
-  dependencies:
-    glogg "^1.0.0"
-
 gzip-size@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.0.0.tgz#a55ecd99222f4c48fd8c01c625ce3b349d0a0e80"
@@ -6323,13 +6084,6 @@ has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
 
-has-gulplog@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
-  integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=
-  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"
@@ -6781,11 +6535,6 @@ inflight@^1.0.4, inflight@~1.0.6:
     once "^1.3.0"
     wrappy "1"
 
-inherits@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
-  integrity sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=
-
 inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
@@ -6854,11 +6603,6 @@ internal-ip@^3.0.1:
     default-gateway "^2.6.0"
     ipaddr.js "^1.5.2"
 
-interpret@^0.6.2:
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-0.6.6.tgz#fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"
-  integrity sha1-/s16GOfOXKar+5U+H4YhOknxYls=
-
 interpret@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
@@ -6904,14 +6648,6 @@ ipaddr.js@^1.5.2:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
 
-is-absolute@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
-  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
-  dependencies:
-    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"
@@ -7230,13 +6966,6 @@ is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
 
-is-relative@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
-  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
-  dependencies:
-    is-unc-path "^1.0.0"
-
 is-resolvable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
@@ -7291,13 +7020,6 @@ 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@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
-  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
-  dependencies:
-    unc-path-regex "^0.1.2"
-
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
@@ -7540,10 +7262,6 @@ killable@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
 
-kind-of@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
-
 kind-of@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5"
@@ -7676,20 +7394,6 @@ libnpx@^10.2.0:
     y18n "^4.0.0"
     yargs "^11.0.0"
 
-liftoff@^2.1.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec"
-  integrity sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=
-  dependencies:
-    extend "^3.0.0"
-    findup-sync "^2.0.0"
-    fined "^1.0.1"
-    flagged-respawn "^1.0.0"
-    is-plain-object "^2.0.4"
-    object.map "^1.0.0"
-    rechoir "^0.6.2"
-    resolve "^1.1.7"
-
 linked-list@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/linked-list/-/linked-list-0.1.0.tgz#798b0ff97d1b92a4fd08480f55aea4e9d49d37bf"
@@ -7785,16 +7489,6 @@ lodash-es@^4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7"
 
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
-
-lodash._basetostring@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
-  integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=
-
 lodash._baseuniq@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -7802,41 +7496,11 @@ lodash._baseuniq@~4.6.0:
     lodash._createset "~4.0.0"
     lodash._root "~3.0.0"
 
-lodash._basevalues@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
-  integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
-
 lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
 
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
-
-lodash._reescape@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
-  integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=
-
-lodash._reevaluate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
-  integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=
-
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
-
-lodash._root@^3.0.0, lodash._root@~3.0.0:
+lodash._root@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
   integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
@@ -7857,13 +7521,6 @@ lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
 
-lodash.escape@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
-  integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=
-  dependencies:
-    lodash._root "^3.0.0"
-
 lodash.escape@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
@@ -7880,16 +7537,6 @@ lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
 
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
-
 lodash.isequal@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
@@ -7903,56 +7550,19 @@ lodash.isstring@^4.0.1:
   resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
   integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
 
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
-
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
 
-lodash.restparam@^3.0.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
 lodash.some@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
 
-lodash.template@^3.0.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
-  integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash._basetostring "^3.0.0"
-    lodash._basevalues "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-    lodash.keys "^3.0.0"
-    lodash.restparam "^3.0.0"
-    lodash.templatesettings "^3.0.0"
-
-lodash.templatesettings@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
-  integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-
 lodash.toarray@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
 
-lodash.union@~4.6.0:
+lodash.union@4.6.0, lodash.union@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
 
@@ -7976,12 +7586,7 @@ lodash@^4.17.10, lodash@^4.8.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
-lodash@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
-  integrity sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=
-
-log-symbols@^2.0.0:
+log-symbols@^2.0.0, log-symbols@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
   dependencies:
@@ -7991,6 +7596,14 @@ loglevel@^1.4.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
 
+loglevelnext@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.5.tgz#36fc4f5996d6640f539ff203ba819641680d75a2"
+  integrity sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==
+  dependencies:
+    es6-symbol "^3.1.1"
+    object.assign "^4.1.0"
+
 lolex@^2.3.2, lolex@^2.7.5:
   version "2.7.5"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.7.5.tgz#113001d56bfc7e02d56e36291cc5c413d1aa0733"
@@ -8030,11 +7643,6 @@ lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
 
-lru-cache@2:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
-  integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=
-
 lru-cache@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
@@ -8049,6 +7657,13 @@ lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -8091,20 +7706,13 @@ make-fetch-happen@^3.0.0:
     socks-proxy-agent "^3.0.1"
     ssri "^5.2.4"
 
-make-iterator@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
-  integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
-  dependencies:
-    kind-of "^6.0.2"
-
 map-age-cleaner@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
   dependencies:
     p-defer "^1.0.0"
 
-map-cache@^0.2.0, map-cache@^0.2.2:
+map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
 
@@ -8290,7 +7898,7 @@ micromatch@^2.3.11:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   dependencies:
@@ -8359,27 +7967,19 @@ 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@3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
+  integrity sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=
+  dependencies:
+    brace-expansion "^1.0.0"
+
 minimatch@3.0.4, minimatch@^3.0.2, 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"
 
-minimatch@^2.0.1:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
-  integrity sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=
-  dependencies:
-    brace-expansion "^1.0.0"
-
-minimatch@~0.2.11:
-  version "0.2.14"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
-  integrity sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=
-  dependencies:
-    lru-cache "2"
-    sigmund "~1.0.0"
-
 minimist-options@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
@@ -8396,7 +7996,7 @@ minimist@1.1.x:
   version "1.1.3"
   resolved "http://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
 
-minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
+minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
@@ -8531,13 +8131,6 @@ multicast-dns@^6.0.1:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
 
-multipipe@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
-  integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=
-  dependencies:
-    duplexer2 "0.0.2"
-
 mute-stream@0.0.7, mute-stream@~0.0.4:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
@@ -8566,11 +8159,6 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-natives@^1.1.0:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz#a603b4a498ab77173612b9ea1acdec4d980f00bb"
-  integrity sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==
-
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -8605,6 +8193,11 @@ nerf-dart@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/nerf-dart/-/nerf-dart-1.0.0.tgz#e6dab7febf5ad816ea81cf5c629c5a0ebde72c1a"
 
+next-tick@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
+
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -8819,6 +8412,11 @@ normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
@@ -8939,7 +8537,7 @@ npm-registry-fetch@^3.0.0:
     make-fetch-happen "^4.0.1"
     npm-package-arg "^6.1.0"
 
-npm-run-path@^2.0.0, npm-run-path@^2.0.2:
+npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
   dependencies:
@@ -9117,11 +8715,6 @@ oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
 
-object-assign@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
-  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
-
 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"
@@ -9162,10 +8755,6 @@ object-keys@^1.0.8, object-keys@^1.0.9:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
 
-object-keys@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
-
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
@@ -9181,16 +8770,6 @@ object.assign@^4.1.0:
     has-symbols "^1.0.0"
     object-keys "^1.0.11"
 
-object.defaults@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
-  integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=
-  dependencies:
-    array-each "^1.0.1"
-    array-slice "^1.0.0"
-    for-own "^1.0.0"
-    isobject "^3.0.0"
-
 object.entries@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
@@ -9216,14 +8795,6 @@ object.getownpropertydescriptors@^2.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.5.1"
 
-object.map@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
-  integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=
-  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"
@@ -9232,7 +8803,7 @@ object.omit@^2.0.0:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
-object.pick@^1.2.0, object.pick@^1.3.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:
@@ -9268,13 +8839,6 @@ once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0, once@~1.4.0:
   dependencies:
     wrappy "1"
 
-once@~1.3.0:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
-  integrity sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=
-  dependencies:
-    wrappy "1"
-
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
@@ -9313,20 +8877,6 @@ options@>=0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
 
-orchestrator@^0.3.0:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e"
-  integrity sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=
-  dependencies:
-    end-of-stream "~0.1.5"
-    sequencify "~0.0.7"
-    stream-consume "~0.1.0"
-
-ordered-read-streams@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126"
-  integrity sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=
-
 original@>=0.0.5, original@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
@@ -9418,6 +8968,13 @@ p-limit@^2.0.0:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
+  integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -9530,15 +9087,6 @@ parse-entities@^1.0.2, parse-entities@^1.1.0:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-parse-filepath@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
-  integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=
-  dependencies:
-    is-absolute "^1.0.0"
-    map-cache "^0.2.0"
-    path-root "^0.1.1"
-
 parse-github-url@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/parse-github-url/-/parse-github-url-1.0.2.tgz#242d3b65cbcdda14bb50439e3242acf6971db395"
@@ -9566,11 +9114,6 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse-node-version@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
-  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
-
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
@@ -9640,18 +9183,6 @@ path-parse@^1.0.5, path-parse@^1.0.6:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
-path-root-regex@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
-
-path-root@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
-  dependencies:
-    path-root-regex "^0.1.0"
-
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -9682,6 +9213,14 @@ path-type@^3.0.0:
   dependencies:
     pify "^3.0.0"
 
+path@^0.12.7:
+  version "0.12.7"
+  resolved "https://registry.yarnpkg.com/path/-/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"
+  integrity sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=
+  dependencies:
+    process "^0.11.1"
+    util "^0.10.3"
+
 pbkdf2@^3.0.3:
   version "3.0.17"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
@@ -9756,25 +9295,6 @@ pkg-up@2.0.0, pkg-up@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
-plugin-error@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
-  dependencies:
-    ansi-cyan "^0.1.1"
-    ansi-red "^0.1.1"
-    arr-diff "^1.0.1"
-    arr-union "^2.0.1"
-    extend-shallow "^1.1.2"
-
-plugin-error@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
-  dependencies:
-    ansi-colors "^1.0.1"
-    arr-diff "^4.0.0"
-    arr-union "^3.1.0"
-    extend-shallow "^3.0.2"
-
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
@@ -10011,7 +9531,7 @@ pretty-error@^2.0.2, pretty-error@^2.1.1:
     renderkid "^2.0.1"
     utila "~0.4"
 
-pretty-hrtime@^1.0.0, pretty-hrtime@^1.0.3:
+pretty-hrtime@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
 
@@ -10019,11 +9539,11 @@ private@^0.1.6, private@~0.1.5:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
 
-process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
+process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
 
-process@^0.11.10:
+process@^0.11.1, process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
@@ -10743,7 +10263,7 @@ read@1, read@~1.0.1, read@~1.0.7:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.17:
+readable-stream@1.0:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   dependencies:
@@ -10760,7 +10280,7 @@ readable-stream@^3.0.6:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@~1.1.10, readable-stream@~1.1.9:
+readable-stream@~1.1.10:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
@@ -10812,6 +10332,11 @@ rechoir@^0.6.2:
   dependencies:
     resolve "^1.1.6"
 
+recursive-readdir-sync@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/recursive-readdir-sync/-/recursive-readdir-sync-1.0.6.tgz#1dbf6d32f3c5bb8d3cde97a6c588d547a9e13d56"
+  integrity sha1-Hb9tMvPFu4083pemxYjVR6nhPVY=
+
 recursive-readdir@2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f"
@@ -11149,12 +10674,7 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
-
-replace-ext@1.0.0, 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"
 
@@ -11248,7 +10768,7 @@ resolve-cwd@^2.0.0:
   dependencies:
     resolve-from "^3.0.0"
 
-resolve-dir@^1.0.0, resolve-dir@^1.0.1:
+resolve-dir@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
   dependencies:
@@ -11535,11 +11055,6 @@ semver-regex@^1.0.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
 
-semver@^4.1.0:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
-  integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
-
 semver@^5.4.1, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
@@ -11566,11 +11081,6 @@ send@0.16.2:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
-sequencify@~0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
-  integrity sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=
-
 serialize-javascript@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
@@ -11696,11 +11206,6 @@ shortid@^2.2.6:
   dependencies:
     nanoid "^1.0.7"
 
-sigmund@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
-
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -11869,6 +11374,14 @@ source-list-map@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
 
+source-map-loader@^0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271"
+  integrity sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==
+  dependencies:
+    async "^2.5.0"
+    loader-utils "^1.1.0"
+
 source-map-resolve@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
@@ -11879,16 +11392,16 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.9:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
+source-map-support@^0.5.3, source-map-support@~0.5.9:
+  version "0.5.10"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-support@~0.5.9:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
+source-map-support@^0.5.9:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -11933,11 +11446,6 @@ space-separated-tokens@^1.0.0:
   dependencies:
     trim "0.0.1"
 
-sparkles@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
-  integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
-
 spawn-error-forwarder@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/spawn-error-forwarder/-/spawn-error-forwarder-1.0.0.tgz#1afd94738e999b0346d7b9fc373be55e07577029"
@@ -12052,7 +11560,7 @@ ssri@^5.2.4:
   dependencies:
     safe-buffer "^5.1.1"
 
-ssri@^6.0.0:
+ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
   dependencies:
@@ -12105,11 +11613,6 @@ stream-combiner2@~1.1.1:
     duplexer2 "~0.1.0"
     readable-stream "^2.0.2"
 
-stream-consume@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.1.tgz#d3bdb598c2bd0ae82b8cac7ac50b1107a7996c48"
-  integrity sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==
-
 stream-each@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
@@ -12252,14 +11755,6 @@ strip-ansi@^5.0.0:
   dependencies:
     ansi-regex "^4.0.0"
 
-strip-bom@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794"
-  integrity sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=
-  dependencies:
-    first-chunk-stream "^1.0.0"
-    is-utf8 "^0.2.0"
-
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -12552,21 +12047,6 @@ text-table@0.2.0, text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
-through2@^0.4.1:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b"
-  dependencies:
-    readable-stream "~1.0.17"
-    xtend "~2.1.1"
-
-through2@^0.6.1:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
-  integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=
-  dependencies:
-    readable-stream ">=1.0.33-1 <1.1.0-0"
-    xtend ">=4.0.0 <4.1.0-0"
-
 through2@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
@@ -12575,7 +12055,7 @@ through2@^2.0.0:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through2@^2.0.1, through2@^2.0.2, through2@^2.0.3, through2@~2.0.0:
+through2@^2.0.2, through2@~2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
   dependencies:
@@ -12590,18 +12070,6 @@ thunky@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
 
-tildify@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"
-  integrity sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=
-  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"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
-
 timed-out@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
@@ -12808,6 +12276,11 @@ typeface-sedgwick-ave@^0.0.54:
   version "0.0.54"
   resolved "https://registry.yarnpkg.com/typeface-sedgwick-ave/-/typeface-sedgwick-ave-0.0.54.tgz#8d851f9ead51b4f2bab7c92c933268df9047490b"
 
+typescript@^3.3.3333:
+  version "3.3.3333"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3333.tgz#171b2c5af66c59e9431199117a3bcadc66fdcfd6"
+  integrity sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==
+
 ua-parser-js@^0.7.18:
   version "0.7.19"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b"
@@ -12868,11 +12341,6 @@ umask@^1.1.0, umask@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
 
-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"
-  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
-
 underscore@~1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
@@ -12940,7 +12408,7 @@ uniq@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
 
-unique-filename@^1.1.0, unique-filename@~1.1.0:
+unique-filename@^1.1.0, unique-filename@^1.1.1, unique-filename@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
   dependencies:
@@ -12952,11 +12420,6 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b"
-  integrity sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=
-
 unique-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
@@ -13098,11 +12561,6 @@ use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
 
-user-home@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
-  integrity sha1-K1viOjK2Onyd640PKNSFcko98ZA=
-
 util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -13143,7 +12601,7 @@ uuid@3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
 
-uuid@^3.0.0, uuid@^3.0.1, uuid@^3.3.2:
+uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
 
@@ -13151,13 +12609,6 @@ v8-compile-cache@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
 
-v8flags@^2.0.2:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
-  integrity sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=
-  dependencies:
-    user-home "^1.1.1"
-
 v8flags@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.1.tgz#42259a1461c08397e37fe1d4f1cfb59cad85a053"
@@ -13234,48 +12685,6 @@ vfile@^3.0.0, vfile@^3.0.1:
     unist-util-stringify-position "^1.0.0"
     vfile-message "^1.0.0"
 
-vinyl-fs@^0.3.0:
-  version "0.3.14"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"
-  integrity sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=
-  dependencies:
-    defaults "^1.0.0"
-    glob-stream "^3.1.5"
-    glob-watcher "^0.0.6"
-    graceful-fs "^3.0.0"
-    mkdirp "^0.5.0"
-    strip-bom "^1.0.0"
-    through2 "^0.6.1"
-    vinyl "^0.4.0"
-
-vinyl@^0.4.0:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
-  integrity sha1-LzVsh6VQolVGHza76ypbqL94SEc=
-  dependencies:
-    clone "^0.2.0"
-    clone-stats "^0.0.1"
-
-vinyl@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
-  integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
-  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:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
@@ -13326,6 +12735,15 @@ webidl-conversions@^3.0.0, webidl-conversions@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
 
+webpack-cleanup-plugin@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/webpack-cleanup-plugin/-/webpack-cleanup-plugin-0.5.1.tgz#df2d706bd75364c06e65b051186316d674eb96af"
+  integrity sha1-3y1wa9dTZMBuZbBRGGMW1nTrlq8=
+  dependencies:
+    lodash.union "4.6.0"
+    minimatch "3.0.3"
+    recursive-readdir-sync "1.0.6"
+
 webpack-cli@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.1.2.tgz#17d7e01b77f89f884a2bbf9db545f0f6a648e746"
@@ -13401,6 +12819,16 @@ webpack-hot-middleware@^2.10.0, webpack-hot-middleware@^2.24.3:
     querystring "^0.2.0"
     strip-ansi "^3.0.0"
 
+webpack-log@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-1.2.0.tgz#a4b34cda6b22b518dbb0ab32e567962d5c72a43d"
+  integrity sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==
+  dependencies:
+    chalk "^2.1.0"
+    log-symbols "^2.1.0"
+    loglevelnext "^1.0.1"
+    uuid "^3.1.0"
+
 webpack-log@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
@@ -13560,6 +12988,13 @@ write@^0.2.1:
   dependencies:
     mkdirp "^0.5.1"
 
+write@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
+  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
+  dependencies:
+    mkdirp "^0.5.1"
+
 ws@5.1.1:
   version "5.1.1"
   resolved "http://registry.npmjs.org/ws/-/ws-5.1.1.tgz#1d43704689711ac1942fd2f283e38f825c4b8b95"
@@ -13600,16 +13035,10 @@ xregexp@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
 
-"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
+xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
-xtend@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"
-  dependencies:
-    object-keys "~0.4.0"
-
 y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
@@ -13752,9 +13181,10 @@ yauzl@2.4.1:
   dependencies:
     fd-slicer "~1.0.1"
 
-yazl@^2.1.0:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.4.3.tgz#ec26e5cc87d5601b9df8432dbdd3cd2e5173a071"
+yazl@^2.4.3:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.5.1.tgz#a3d65d3dd659a5b0937850e8609f22fffa2b5c35"
+  integrity sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==
   dependencies:
     buffer-crc32 "~0.2.3"
 
@@ -13766,3 +13196,11 @@ zip-stream@^1.2.0:
     compress-commons "^1.2.0"
     lodash "^4.8.0"
     readable-stream "^2.0.0"
+
+zip-webpack-plugin@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/zip-webpack-plugin/-/zip-webpack-plugin-3.0.0.tgz#63b3c173f1a87a006915cd7328a3c40b44dc8e32"
+  integrity sha512-5kNvPv+TUP3JqKWQUXj0vTgXHIRQpYw5YyBUVXQ0pumTAK+a4OZ+eXDHnh44nyr9B1XJQZq9WtSSm5j6NQhjWQ==
+  dependencies:
+    webpack-sources "^1.1.0"
+    yazl "^2.4.3"

From fd63c6973b21bbc466d7c80805f8640d16e7cf79 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Thu, 7 Mar 2019 00:33:17 +0100
Subject: [PATCH 024/100] chore(typing): adding Typescript

This commit:
 - Add full Typescript setup and typings
 - Make it work for both app build and Storybook (tests still to be adapted)
 - Removes Immutable
 - Replaces redux-persist-immutable by redux-persist
---
 .eslintignore                                 |   2 +-
 .prettierrc                                   |   3 +
 .storybook/config.js                          |  33 --
 .storybook/config.tsx                         |  31 ++
 .storybook/webpack.config.js                  |  14 +
 manifest/base.js                              |  29 +-
 manifest/firefox.js                           |   8 +-
 package.json                                  |  42 +-
 src/app/actions/BaseAction.ts                 |  13 +
 src/app/actions/browser/browserAction.ts      |  16 +
 src/app/actions/browser/tabs.ts               |  31 ++
 src/app/actions/filters.ts                    |  21 +
 src/app/actions/index.ts                      |  54 ++
 src/app/actions/install.ts                    |  40 ++
 src/app/actions/kraftBackend.ts               |  59 +++
 src/app/actions/recommendations.ts            |  72 +++
 src/app/actions/tabs.ts                       | 118 +++++
 src/app/actions/ui.ts                         |  21 +
 src/app/actions/updateDraftRecommendations.ts |  11 +
 .../{eventsMapper.js => eventsMapper.ts}      |  12 +-
 .../{trackEvents.js => trackEvents.ts}        |  23 +-
 src/app/background/actions/broadcast.js       |   3 -
 src/app/background/actions/browser/action.js  |   8 -
 src/app/background/actions/browser/tabs.js    |  12 -
 src/app/background/actions/install.js         |  27 -
 src/app/background/actions/kraftBackend.js    | 105 ----
 src/app/background/actions/tabs.js            |  51 --
 .../actions/updateDraftRecommendations.js     |   4 -
 src/app/background/index.js                   |  88 ----
 src/app/background/index.ts                   |  66 +++
 src/app/background/middlewares/analytics.js   |  19 -
 src/app/background/middlewares/analytics.ts   |  20 +
 src/app/background/middlewares/index.js       |  23 +-
 .../background/middlewares/offersMatching.js  |  14 -
 .../background/middlewares/openOptionsPage.js |  18 -
 .../background/middlewares/sendFeedback.js    |  72 ---
 .../background/middlewares/sendFeedback.ts    |  53 ++
 src/app/background/reducers/index.js          |  10 -
 src/app/background/reducers/index.ts          |  16 +
 src/app/background/reducers/prefs.js          | 131 -----
 src/app/background/reducers/prefs.ts          |  76 +++
 src/app/background/reducers/resources.js      |  42 --
 src/app/background/reducers/resources.ts      |  49 ++
 src/app/background/reducers/tabs.js           |  26 -
 src/app/background/reducers/tabs.ts           |  29 ++
 src/app/background/sagas/matchingContexts.js  |  22 +-
 src/app/background/sagas/tab.js               | 104 ----
 src/app/background/sagas/tab.ts               | 151 ++++++
 src/app/background/selectors/index.js         |  11 -
 src/app/background/selectors/index.ts         |  12 +
 src/app/background/selectors/prefs.js         |  53 --
 src/app/background/selectors/prefs.ts         |  51 ++
 src/app/background/selectors/resources.js     |   3 -
 src/app/background/selectors/resources.ts     |   7 +
 .../services/createBrowserActionChannel.js    |  18 -
 .../services/createBrowserActionChannel.ts    |  21 +
 .../background/services/executeTabScript.js   |  10 -
 .../background/services/executeTabScript.ts   |  22 +
 .../background/services/fetchContentScript.js |   2 -
 .../background/services/fetchContentScript.ts |   6 +
 src/app/background/services/getCurrentTabs.js |   7 -
 src/app/background/services/index.js          |   4 -
 src/app/background/services/sendToTab.js      |   3 -
 src/app/background/services/sendToTab.ts      |  14 +
 src/app/background/store/configureStore.js    |  65 ---
 src/app/background/store/getDefaultState.js   |   5 -
 src/app/background/store/getStateFromBg.js    |  15 -
 src/app/background/store/getStateToBg.js      |  12 -
 src/app/background/store/getStoredState.js    |  20 -
 src/app/background/store/index.ts             |  62 +++
 src/app/background/store/listenTabs.js        |  25 -
 src/app/background/store/listenTabs.ts        |  34 ++
 src/app/background/store/makeInitialState.js  |  26 -
 src/app/background/store/migrations.js        |  84 ---
 src/app/background/store/migrations.ts        | 156 ++++++
 .../background/store/reduxPersistTransform.js |  25 -
 src/app/constants/{origins.js => origins.ts}  |   2 +-
 src/app/constants/ui.js                       |  30 --
 .../App/Account/About/About.stories.jsx       |  13 -
 .../App/Account/About/About.stories.tsx       |  15 +
 src/app/content/App/Account/About/index.jsx   |  86 ----
 src/app/content/App/Account/About/index.tsx   |  62 +++
 .../content/App/Account/About/withConnect.js  |  15 -
 .../content/App/Account/About/withConnect.ts  |  19 +
 .../content/App/Account/Filters/Filters.js    |   6 -
 .../App/Account/Filters/Filters.stories.jsx   |  12 -
 .../App/Account/Filters/Filters.stories.tsx   |   8 +
 .../content/App/Account/Filters/Filters.tsx   |   9 +
 .../content/App/Account/Menu/Menu.stories.jsx |  11 -
 .../content/App/Account/Menu/Menu.stories.tsx |  10 +
 .../App/Account/Menu/{index.jsx => index.tsx} |  16 +-
 src/app/content/App/Account/index.js          |  17 -
 src/app/content/App/Account/index.tsx         |  18 +
 src/app/content/App/Error/Error.stories.jsx   |  11 -
 src/app/content/App/Error/Error.stories.tsx   |  10 +
 src/app/content/App/Help/Help.stories.jsx     |  12 -
 src/app/content/App/Help/Help.stories.tsx     |   8 +
 .../content/App/Help/{index.jsx => index.tsx} |  28 +-
 .../content/App/Loading/Loading.stories.jsx   |  13 -
 .../content/App/Loading/Loading.stories.tsx   |   9 +
 src/app/content/App/Loading/index.jsx         |  16 -
 src/app/content/App/Loading/index.tsx         |  19 +
 src/app/content/App/Loading/withConnect.js    |  11 +-
 src/app/content/App/Notice/Details/index.jsx  |  48 --
 src/app/content/App/Notice/Details/index.tsx  |  36 ++
 src/app/content/App/Notice/Details/types.ts   |  14 +
 .../content/App/Notice/Details/withConnect.js |  20 -
 .../content/App/Notice/Details/withConnect.ts |  28 +
 .../content/App/Notice/List/List.stories.jsx  |  39 --
 .../content/App/Notice/List/List.stories.tsx  |  54 ++
 src/app/content/App/Notice/List/index.jsx     |  53 --
 src/app/content/App/Notice/List/index.tsx     |  53 ++
 .../content/App/Notice/List/withConnect.js    |  16 -
 .../content/App/Notice/List/withConnect.ts    |  20 +
 src/app/content/App/Notice/index.jsx          |  11 -
 src/app/content/App/Notice/index.tsx          |  11 +
 .../Subscriptions/Subscriptions.stories.jsx   |  12 -
 .../Subscriptions/Subscriptions.stories.tsx   |   8 +
 .../Subscriptions/{index.jsx => index.tsx}    |  17 +-
 src/app/content/App/index.jsx                 |  75 ---
 src/app/content/App/index.tsx                 |  83 +++
 src/app/content/actions/filters.js            |  24 -
 src/app/content/actions/recommendations.js    |  21 -
 src/app/content/actions/ui.js                 |  35 --
 src/app/content/createBackgroundAction.js     |   8 -
 src/app/content/extensionIframe.js            |  26 -
 src/app/content/extensionIframe.ts            |  33 ++
 src/app/content/index.js                      |   7 -
 src/app/content/index.ts                      |   7 +
 .../middlewares/backgroundPublisher.js        |  25 -
 .../middlewares/backgroundPublisher.ts        |  26 +
 src/app/content/middlewares/index.js          |   9 +-
 src/app/content/reducers/criteria.js          |  26 -
 src/app/content/reducers/editors.js           |  28 -
 src/app/content/reducers/index.js             |  21 -
 src/app/content/reducers/index.ts             |  15 +
 .../content/reducers/installationDetails.ts   |  23 +
 .../content/reducers/onInstalledDetails.js    |  15 -
 src/app/content/reducers/open.js              |  31 --
 src/app/content/reducers/open.ts              |  25 +
 .../content/reducers/preferenceScreenPanel.js |   1 -
 src/app/content/reducers/recommendations.js   |  42 --
 src/app/content/reducers/recommendations.ts   |  65 +++
 src/app/content/reducers/reduced.js           |  21 -
 src/app/content/sagas/background.js           |  21 -
 src/app/content/sagas/background.ts           |  19 +
 src/app/content/sagas/browserAction.js        |   8 +-
 src/app/content/sagas/ui.js                   |  59 ---
 src/app/content/sagas/ui.tsx                  |  68 +++
 src/app/content/selectors/index.js            |  15 -
 src/app/content/selectors/index.ts            |  33 ++
 src/app/content/selectors/notices.js          |   4 -
 src/app/content/setup.js                      |  47 --
 src/app/content/store.js                      |  39 --
 src/app/content/store.ts                      |  39 ++
 src/app/lmem/Notice.js                        |   5 -
 src/app/lmem/criterion.ts                     |  17 +
 src/app/lmem/draft-preview/main.js            |  45 --
 src/app/lmem/draft-preview/main.ts            |  62 +++
 src/app/lmem/editors.ts                       |  15 +
 src/app/lmem/fetchMatchingNotices.ts          |   7 +
 ...indMatchingOffersAccordingToPreferences.js |  41 --
 src/app/lmem/getMatchingRecommendations.js    |   6 -
 src/app/lmem/index.js                         |   6 -
 src/app/lmem/installation.ts                  |   4 +
 src/app/lmem/matchingContext.ts               |  46 ++
 src/app/lmem/notice.ts                        | 147 ++++++
 src/app/lmem/noticeType.ts                    |  30 ++
 src/app/lmem/recommendationFilter.js          |   3 -
 src/app/lmem/recommendationIsValid.js         |  91 ----
 src/app/lmem/typeOfCriteria.js                |  32 --
 src/app/propTypes.js                          |  33 --
 src/app/theme.js                              |  68 ---
 src/app/theme.ts                              | 139 +++++
 src/app/utils/createAction.js                 |  25 -
 src/app/utils/createAction.ts                 |   2 +
 src/app/utils/createSingleMessageChannel.js   |  30 --
 src/app/utils/createSingleMessageChannel.ts   |  47 ++
 src/app/utils/customFromJS.js                 |   8 -
 src/app/utils/formatLocaleDate.js             |  15 -
 src/app/utils/formatLocaleDate.ts             |  12 +
 src/app/utils/identity.js                     |   1 -
 src/app/utils/identity.ts                     |   1 +
 src/app/utils/isAction.js                     |   3 -
 src/app/utils/isChildInstanceOf.js            |   1 -
 src/app/utils/removeHtml.js                   |   1 -
 src/app/utils/stripHtml.ts                    |   5 +
 src/app/utils/updateItem.js                   |  10 -
 ...ssageSaga.js => watchSingleMessageSaga.ts} |   0
 .../Buttons/AddNoticeLink/AddNoticeLink.js    |  48 +-
 .../AddNoticeLink/AddNoticeLink.stories.jsx   |   6 -
 .../AddNoticeLink/AddNoticeLink.stories.tsx   |   7 +
 .../BorderButton/BorderButton.stories.jsx     |  10 -
 .../BorderButton/BorderButton.stories.tsx     |  12 +
 .../Buttons/OpenButton/OpenButton.stories.jsx |   6 -
 .../Buttons/OpenButton/OpenButton.stories.tsx |   7 +
 .../ContentTitle/ContentTitle.stories.jsx     |   8 -
 .../ContentTitle/ContentTitle.stories.tsx     |   8 +
 .../atoms/Forms/Textarea/Textarea.stories.jsx |   6 -
 .../atoms/Forms/Textarea/Textarea.stories.tsx |   5 +
 src/components/atoms/Time.js                  |  15 -
 src/components/atoms/Time.tsx                 |  17 +
 src/components/atoms/Truncated.js             |  21 -
 src/components/atoms/Truncated.tsx            |  22 +
 .../types/{Alternative.js => Alternative.tsx} |  18 +-
 .../icons/types/{Dislike.js => Dislike.tsx}   |  13 +-
 .../atoms/icons/types/{Like.js => Like.tsx}   |  13 +-
 .../atoms/icons/types/{Other.js => Other.tsx} |  10 +-
 .../atoms/icons/types/{Tip.js => Tip.tsx}     |  21 +-
 src/components/atoms/icons/types/index.js     |   7 -
 src/components/atoms/icons/types/index.ts     |  22 +
 src/components/molecules/Type/Background.js   |  27 -
 src/components/molecules/Type/Background.ts   |  22 +
 src/components/molecules/Type/Type.js         |  33 --
 .../molecules/Type/Type.stories.jsx           |  34 --
 .../molecules/Type/Type.stories.tsx           |  13 +
 src/components/molecules/Type/Type.tsx        |  26 +
 src/components/organisms/Notice/Container.js  |  17 -
 src/components/organisms/Notice/Container.ts  |  20 +
 src/components/organisms/Notice/Content.js    |  52 --
 src/components/organisms/Notice/Content.tsx   |  57 +++
 src/components/organisms/Notice/Notice.js     |  71 ---
 .../organisms/Notice/Notice.stories.jsx       | 109 ----
 .../organisms/Notice/Notice.stories.tsx       | 103 ++++
 src/components/organisms/Notice/Notice.tsx    |  65 +++
 src/components/organisms/Notice/Title.js      |  24 -
 src/components/organisms/Notice/Title.tsx     |  22 +
 src/components/organisms/Notice/index.js      |   7 +-
 .../organisms/NoticeDetails/Message.js        |  15 -
 .../organisms/NoticeDetails/Message.tsx       |  20 +
 .../organisms/NoticeDetails/NoticeDetails.js  | 128 -----
 .../NoticeDetails/NoticeDetails.stories.jsx   |  57 ---
 .../NoticeDetails/NoticeDetails.stories.tsx   |  57 +++
 .../organisms/NoticeDetails/NoticeDetails.tsx | 112 ++++
 .../organisms/NoticeDetails/Source/Source.js  |  11 -
 .../organisms/NoticeDetails/Source/Source.ts  |  11 +
 .../NoticeDetails/Source/SourceURL.js         |  15 -
 .../NoticeDetails/Source/SourceURL.tsx        |  13 +
 .../organisms/Notification/Container.js       |   2 -
 src/components/organisms/Notification/Main.js |   7 -
 src/components/organisms/Notification/Main.ts |  12 +
 .../Notification/Notification.stories.jsx     |  34 --
 .../Notification/Notification.stories.tsx     |  30 ++
 .../NotificationFooter.stories.jsx            |  15 -
 .../NotificationFooter.stories.tsx            |  21 +
 .../NotificationHeader.stories.jsx            |  27 -
 .../NotificationHeader.stories.tsx            |  30 ++
 .../Notification/NotificationHeader/Title.js  |  11 -
 .../Notification/NotificationHeader/Title.ts  |  11 +
 .../Notification/NotificationHeader/index.js  |  49 --
 .../Notification/NotificationHeader/index.tsx |  44 ++
 .../organisms/Notification/index.jsx          |  25 -
 .../organisms/Notification/index.tsx          |  38 ++
 src/components/organisms/index.js             |   3 -
 src/lib/heap.js                               |  11 -
 src/lib/heap.ts                               |  15 +
 src/types/TabInfo.ts                          |  36 ++
 src/types/index.d.ts                          |  11 +
 src/types/styled-components.ts                |  14 +
 ...indMatchingOffersAccordingToPreferences.js | 216 ++++----
 test/app/reducers.js                          | 267 ++++++----
 tsconfig.json                                 |  73 +++
 tslint.json                                   |  15 +
 views/background.pug                          |   2 +-
 webpack/config.plugins.js                     |  53 +-
 webpack/config.rules.js                       |   2 +-
 yarn.lock                                     | 482 +++++++++++++++---
 267 files changed, 4675 insertions(+), 3917 deletions(-)
 create mode 100644 .prettierrc
 delete mode 100644 .storybook/config.js
 create mode 100644 .storybook/config.tsx
 create mode 100644 .storybook/webpack.config.js
 create mode 100644 src/app/actions/BaseAction.ts
 create mode 100644 src/app/actions/browser/browserAction.ts
 create mode 100644 src/app/actions/browser/tabs.ts
 create mode 100644 src/app/actions/filters.ts
 create mode 100644 src/app/actions/index.ts
 create mode 100644 src/app/actions/install.ts
 create mode 100644 src/app/actions/kraftBackend.ts
 create mode 100644 src/app/actions/recommendations.ts
 create mode 100644 src/app/actions/tabs.ts
 create mode 100644 src/app/actions/ui.ts
 create mode 100644 src/app/actions/updateDraftRecommendations.ts
 rename src/app/analytics/{eventsMapper.js => eventsMapper.ts} (56%)
 rename src/app/analytics/{trackEvents.js => trackEvents.ts} (74%)
 delete mode 100644 src/app/background/actions/broadcast.js
 delete mode 100644 src/app/background/actions/browser/action.js
 delete mode 100644 src/app/background/actions/browser/tabs.js
 delete mode 100644 src/app/background/actions/install.js
 delete mode 100644 src/app/background/actions/kraftBackend.js
 delete mode 100644 src/app/background/actions/tabs.js
 delete mode 100644 src/app/background/actions/updateDraftRecommendations.js
 delete mode 100644 src/app/background/index.js
 create mode 100644 src/app/background/index.ts
 delete mode 100644 src/app/background/middlewares/analytics.js
 create mode 100644 src/app/background/middlewares/analytics.ts
 delete mode 100644 src/app/background/middlewares/offersMatching.js
 delete mode 100644 src/app/background/middlewares/openOptionsPage.js
 delete mode 100644 src/app/background/middlewares/sendFeedback.js
 create mode 100644 src/app/background/middlewares/sendFeedback.ts
 delete mode 100644 src/app/background/reducers/index.js
 create mode 100644 src/app/background/reducers/index.ts
 delete mode 100644 src/app/background/reducers/prefs.js
 create mode 100644 src/app/background/reducers/prefs.ts
 delete mode 100644 src/app/background/reducers/resources.js
 create mode 100644 src/app/background/reducers/resources.ts
 delete mode 100644 src/app/background/reducers/tabs.js
 create mode 100644 src/app/background/reducers/tabs.ts
 delete mode 100644 src/app/background/sagas/tab.js
 create mode 100644 src/app/background/sagas/tab.ts
 delete mode 100644 src/app/background/selectors/index.js
 create mode 100644 src/app/background/selectors/index.ts
 delete mode 100644 src/app/background/selectors/prefs.js
 create mode 100644 src/app/background/selectors/prefs.ts
 delete mode 100644 src/app/background/selectors/resources.js
 create mode 100644 src/app/background/selectors/resources.ts
 delete mode 100644 src/app/background/services/createBrowserActionChannel.js
 create mode 100644 src/app/background/services/createBrowserActionChannel.ts
 delete mode 100644 src/app/background/services/executeTabScript.js
 create mode 100644 src/app/background/services/executeTabScript.ts
 delete mode 100644 src/app/background/services/fetchContentScript.js
 create mode 100644 src/app/background/services/fetchContentScript.ts
 delete mode 100644 src/app/background/services/getCurrentTabs.js
 delete mode 100644 src/app/background/services/index.js
 delete mode 100644 src/app/background/services/sendToTab.js
 create mode 100644 src/app/background/services/sendToTab.ts
 delete mode 100755 src/app/background/store/configureStore.js
 delete mode 100644 src/app/background/store/getDefaultState.js
 delete mode 100644 src/app/background/store/getStateFromBg.js
 delete mode 100644 src/app/background/store/getStateToBg.js
 delete mode 100644 src/app/background/store/getStoredState.js
 create mode 100755 src/app/background/store/index.ts
 delete mode 100644 src/app/background/store/listenTabs.js
 create mode 100644 src/app/background/store/listenTabs.ts
 delete mode 100644 src/app/background/store/makeInitialState.js
 delete mode 100644 src/app/background/store/migrations.js
 create mode 100644 src/app/background/store/migrations.ts
 delete mode 100644 src/app/background/store/reduxPersistTransform.js
 rename src/app/constants/{origins.js => origins.ts} (85%)
 delete mode 100644 src/app/constants/ui.js
 delete mode 100644 src/app/content/App/Account/About/About.stories.jsx
 create mode 100644 src/app/content/App/Account/About/About.stories.tsx
 delete mode 100644 src/app/content/App/Account/About/index.jsx
 create mode 100644 src/app/content/App/Account/About/index.tsx
 delete mode 100644 src/app/content/App/Account/About/withConnect.js
 create mode 100644 src/app/content/App/Account/About/withConnect.ts
 delete mode 100644 src/app/content/App/Account/Filters/Filters.js
 delete mode 100644 src/app/content/App/Account/Filters/Filters.stories.jsx
 create mode 100644 src/app/content/App/Account/Filters/Filters.stories.tsx
 create mode 100644 src/app/content/App/Account/Filters/Filters.tsx
 delete mode 100644 src/app/content/App/Account/Menu/Menu.stories.jsx
 create mode 100644 src/app/content/App/Account/Menu/Menu.stories.tsx
 rename src/app/content/App/Account/Menu/{index.jsx => index.tsx} (58%)
 delete mode 100644 src/app/content/App/Account/index.js
 create mode 100644 src/app/content/App/Account/index.tsx
 delete mode 100644 src/app/content/App/Error/Error.stories.jsx
 create mode 100644 src/app/content/App/Error/Error.stories.tsx
 delete mode 100644 src/app/content/App/Help/Help.stories.jsx
 create mode 100644 src/app/content/App/Help/Help.stories.tsx
 rename src/app/content/App/Help/{index.jsx => index.tsx} (57%)
 delete mode 100644 src/app/content/App/Loading/Loading.stories.jsx
 create mode 100644 src/app/content/App/Loading/Loading.stories.tsx
 delete mode 100644 src/app/content/App/Loading/index.jsx
 create mode 100644 src/app/content/App/Loading/index.tsx
 delete mode 100644 src/app/content/App/Notice/Details/index.jsx
 create mode 100644 src/app/content/App/Notice/Details/index.tsx
 create mode 100644 src/app/content/App/Notice/Details/types.ts
 delete mode 100644 src/app/content/App/Notice/Details/withConnect.js
 create mode 100644 src/app/content/App/Notice/Details/withConnect.ts
 delete mode 100644 src/app/content/App/Notice/List/List.stories.jsx
 create mode 100644 src/app/content/App/Notice/List/List.stories.tsx
 delete mode 100644 src/app/content/App/Notice/List/index.jsx
 create mode 100644 src/app/content/App/Notice/List/index.tsx
 delete mode 100644 src/app/content/App/Notice/List/withConnect.js
 create mode 100644 src/app/content/App/Notice/List/withConnect.ts
 delete mode 100644 src/app/content/App/Notice/index.jsx
 create mode 100644 src/app/content/App/Notice/index.tsx
 delete mode 100644 src/app/content/App/Subscriptions/Subscriptions.stories.jsx
 create mode 100644 src/app/content/App/Subscriptions/Subscriptions.stories.tsx
 rename src/app/content/App/Subscriptions/{index.jsx => index.tsx} (58%)
 delete mode 100644 src/app/content/App/index.jsx
 create mode 100644 src/app/content/App/index.tsx
 delete mode 100644 src/app/content/actions/filters.js
 delete mode 100644 src/app/content/actions/recommendations.js
 delete mode 100644 src/app/content/actions/ui.js
 delete mode 100644 src/app/content/createBackgroundAction.js
 delete mode 100644 src/app/content/extensionIframe.js
 create mode 100644 src/app/content/extensionIframe.ts
 delete mode 100644 src/app/content/index.js
 create mode 100644 src/app/content/index.ts
 delete mode 100644 src/app/content/middlewares/backgroundPublisher.js
 create mode 100644 src/app/content/middlewares/backgroundPublisher.ts
 delete mode 100644 src/app/content/reducers/criteria.js
 delete mode 100644 src/app/content/reducers/editors.js
 delete mode 100644 src/app/content/reducers/index.js
 create mode 100644 src/app/content/reducers/index.ts
 create mode 100644 src/app/content/reducers/installationDetails.ts
 delete mode 100644 src/app/content/reducers/onInstalledDetails.js
 delete mode 100644 src/app/content/reducers/open.js
 create mode 100644 src/app/content/reducers/open.ts
 delete mode 100644 src/app/content/reducers/preferenceScreenPanel.js
 delete mode 100644 src/app/content/reducers/recommendations.js
 create mode 100644 src/app/content/reducers/recommendations.ts
 delete mode 100644 src/app/content/reducers/reduced.js
 delete mode 100644 src/app/content/sagas/background.js
 create mode 100644 src/app/content/sagas/background.ts
 delete mode 100644 src/app/content/sagas/ui.js
 create mode 100644 src/app/content/sagas/ui.tsx
 delete mode 100644 src/app/content/selectors/index.js
 create mode 100644 src/app/content/selectors/index.ts
 delete mode 100644 src/app/content/selectors/notices.js
 delete mode 100644 src/app/content/setup.js
 delete mode 100644 src/app/content/store.js
 create mode 100644 src/app/content/store.ts
 delete mode 100644 src/app/lmem/Notice.js
 create mode 100644 src/app/lmem/criterion.ts
 delete mode 100644 src/app/lmem/draft-preview/main.js
 create mode 100644 src/app/lmem/draft-preview/main.ts
 create mode 100644 src/app/lmem/editors.ts
 create mode 100644 src/app/lmem/fetchMatchingNotices.ts
 delete mode 100644 src/app/lmem/findMatchingOffersAccordingToPreferences.js
 delete mode 100644 src/app/lmem/getMatchingRecommendations.js
 delete mode 100644 src/app/lmem/index.js
 create mode 100644 src/app/lmem/installation.ts
 create mode 100644 src/app/lmem/matchingContext.ts
 create mode 100644 src/app/lmem/notice.ts
 create mode 100644 src/app/lmem/noticeType.ts
 delete mode 100644 src/app/lmem/recommendationFilter.js
 delete mode 100644 src/app/lmem/recommendationIsValid.js
 delete mode 100644 src/app/lmem/typeOfCriteria.js
 delete mode 100644 src/app/propTypes.js
 delete mode 100644 src/app/theme.js
 create mode 100644 src/app/theme.ts
 delete mode 100644 src/app/utils/createAction.js
 create mode 100644 src/app/utils/createAction.ts
 delete mode 100644 src/app/utils/createSingleMessageChannel.js
 create mode 100644 src/app/utils/createSingleMessageChannel.ts
 delete mode 100644 src/app/utils/customFromJS.js
 delete mode 100644 src/app/utils/formatLocaleDate.js
 create mode 100644 src/app/utils/formatLocaleDate.ts
 delete mode 100644 src/app/utils/identity.js
 create mode 100644 src/app/utils/identity.ts
 delete mode 100644 src/app/utils/isAction.js
 delete mode 100644 src/app/utils/isChildInstanceOf.js
 delete mode 100644 src/app/utils/removeHtml.js
 create mode 100644 src/app/utils/stripHtml.ts
 delete mode 100644 src/app/utils/updateItem.js
 rename src/app/utils/{watchSingleMessageSaga.js => watchSingleMessageSaga.ts} (100%)
 delete mode 100644 src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.jsx
 create mode 100644 src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.tsx
 delete mode 100644 src/components/atoms/Buttons/BorderButton/BorderButton.stories.jsx
 create mode 100644 src/components/atoms/Buttons/BorderButton/BorderButton.stories.tsx
 delete mode 100644 src/components/atoms/Buttons/OpenButton/OpenButton.stories.jsx
 create mode 100644 src/components/atoms/Buttons/OpenButton/OpenButton.stories.tsx
 delete mode 100644 src/components/atoms/ContentTitle/ContentTitle.stories.jsx
 create mode 100644 src/components/atoms/ContentTitle/ContentTitle.stories.tsx
 delete mode 100644 src/components/atoms/Forms/Textarea/Textarea.stories.jsx
 create mode 100644 src/components/atoms/Forms/Textarea/Textarea.stories.tsx
 delete mode 100644 src/components/atoms/Time.js
 create mode 100644 src/components/atoms/Time.tsx
 delete mode 100644 src/components/atoms/Truncated.js
 create mode 100644 src/components/atoms/Truncated.tsx
 rename src/components/atoms/icons/types/{Alternative.js => Alternative.tsx} (61%)
 rename src/components/atoms/icons/types/{Dislike.js => Dislike.tsx} (84%)
 rename src/components/atoms/icons/types/{Like.js => Like.tsx} (84%)
 rename src/components/atoms/icons/types/{Other.js => Other.tsx} (67%)
 rename src/components/atoms/icons/types/{Tip.js => Tip.tsx} (60%)
 delete mode 100644 src/components/atoms/icons/types/index.js
 create mode 100644 src/components/atoms/icons/types/index.ts
 delete mode 100644 src/components/molecules/Type/Background.js
 create mode 100644 src/components/molecules/Type/Background.ts
 delete mode 100644 src/components/molecules/Type/Type.js
 delete mode 100644 src/components/molecules/Type/Type.stories.jsx
 create mode 100644 src/components/molecules/Type/Type.stories.tsx
 create mode 100644 src/components/molecules/Type/Type.tsx
 delete mode 100644 src/components/organisms/Notice/Container.js
 create mode 100644 src/components/organisms/Notice/Container.ts
 delete mode 100644 src/components/organisms/Notice/Content.js
 create mode 100644 src/components/organisms/Notice/Content.tsx
 delete mode 100644 src/components/organisms/Notice/Notice.js
 delete mode 100644 src/components/organisms/Notice/Notice.stories.jsx
 create mode 100644 src/components/organisms/Notice/Notice.stories.tsx
 create mode 100644 src/components/organisms/Notice/Notice.tsx
 delete mode 100644 src/components/organisms/Notice/Title.js
 create mode 100644 src/components/organisms/Notice/Title.tsx
 delete mode 100644 src/components/organisms/NoticeDetails/Message.js
 create mode 100644 src/components/organisms/NoticeDetails/Message.tsx
 delete mode 100644 src/components/organisms/NoticeDetails/NoticeDetails.js
 delete mode 100644 src/components/organisms/NoticeDetails/NoticeDetails.stories.jsx
 create mode 100644 src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
 create mode 100644 src/components/organisms/NoticeDetails/NoticeDetails.tsx
 delete mode 100644 src/components/organisms/NoticeDetails/Source/Source.js
 create mode 100644 src/components/organisms/NoticeDetails/Source/Source.ts
 delete mode 100644 src/components/organisms/NoticeDetails/Source/SourceURL.js
 create mode 100644 src/components/organisms/NoticeDetails/Source/SourceURL.tsx
 delete mode 100644 src/components/organisms/Notification/Main.js
 create mode 100644 src/components/organisms/Notification/Main.ts
 delete mode 100644 src/components/organisms/Notification/Notification.stories.jsx
 create mode 100644 src/components/organisms/Notification/Notification.stories.tsx
 delete mode 100644 src/components/organisms/Notification/NotificationFooter/NotificationFooter.stories.jsx
 create mode 100644 src/components/organisms/Notification/NotificationFooter/NotificationFooter.stories.tsx
 delete mode 100644 src/components/organisms/Notification/NotificationHeader/NotificationHeader.stories.jsx
 create mode 100644 src/components/organisms/Notification/NotificationHeader/NotificationHeader.stories.tsx
 delete mode 100644 src/components/organisms/Notification/NotificationHeader/Title.js
 create mode 100644 src/components/organisms/Notification/NotificationHeader/Title.ts
 delete mode 100644 src/components/organisms/Notification/NotificationHeader/index.js
 create mode 100644 src/components/organisms/Notification/NotificationHeader/index.tsx
 delete mode 100644 src/components/organisms/Notification/index.jsx
 create mode 100644 src/components/organisms/Notification/index.tsx
 delete mode 100644 src/components/organisms/index.js
 delete mode 100644 src/lib/heap.js
 create mode 100644 src/lib/heap.ts
 create mode 100644 src/types/TabInfo.ts
 create mode 100644 src/types/index.d.ts
 create mode 100644 src/types/styled-components.ts
 create mode 100644 tsconfig.json
 create mode 100644 tslint.json

diff --git a/.eslintignore b/.eslintignore
index eb884692f..651f049c2 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -12,4 +12,4 @@ test/app
 
 src/app/content/containers/PopUp
 
-src/lib/heap.js
+src/lib/heap.ts
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 000000000..544138be4
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,3 @@
+{
+  "singleQuote": true
+}
diff --git a/.storybook/config.js b/.storybook/config.js
deleted file mode 100644
index fe728ddca..000000000
--- a/.storybook/config.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { configure, addDecorator } from '@storybook/react';
-import React from 'react';
-import { createGlobalStyle, ThemeProvider } from 'styled-components';
-import theme from '../src/app/theme';
-import 'typeface-lato';
-import 'typeface-sedgwick-ave';
-import NotificationContainer from 'components/organisms/Notification/Container';
-
-const Global = createGlobalStyle`
-  body {
-    background-color: grey;
-  }
-`;
-
-addDecorator(getStory => (
-  <div>
-    <Global />
-    <ThemeProvider theme={theme}>
-      <NotificationContainer>
-        {getStory()}
-      </NotificationContainer>
-    </ThemeProvider>
-  </div>
-));
-
-// automatically import all files ending in *.stories.js
-const req = require.context('../src', true, /stories.jsx?$/);
-
-function loadStories() {
-  req.keys().forEach(filename => req(filename));
-}
-
-configure(loadStories, module);
diff --git a/.storybook/config.tsx b/.storybook/config.tsx
new file mode 100644
index 000000000..abbfe5e5a
--- /dev/null
+++ b/.storybook/config.tsx
@@ -0,0 +1,31 @@
+import { configure, addDecorator } from "@storybook/react";
+import React from "react";
+import { createGlobalStyle, ThemeProvider } from "styled-components";
+import theme from "../src/app/theme";
+import "typeface-lato";
+import "typeface-sedgwick-ave";
+import NotificationContainer from "components/organisms/Notification/Container";
+
+const Global = createGlobalStyle`
+  body {
+    background-color: grey;
+  }
+`;
+
+addDecorator(getStory => (
+  <div>
+    <Global />
+    <ThemeProvider theme={theme}>
+      <NotificationContainer>{getStory()}</NotificationContainer>
+    </ThemeProvider>
+  </div>
+));
+
+// automatically import all files ending in *.stories.js
+const req = require.context("../src", true, /stories.tsx?$/);
+
+function loadStories() {
+  req.keys().forEach((filename: string) => req(filename));
+}
+
+configure(loadStories, module);
diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
new file mode 100644
index 000000000..e61807b63
--- /dev/null
+++ b/.storybook/webpack.config.js
@@ -0,0 +1,14 @@
+const path = require("path");
+const rules = require("../webpack/config.rules");
+
+const env = { build: 'dev'};
+
+module.exports = storybookBaseConfig => {
+  storybookBaseConfig.module.rules = rules(env, 'development');
+  storybookBaseConfig.resolve.extensions.push(".ts", ".tsx");
+  storybookBaseConfig.resolve.modules.push(
+    path.resolve(__dirname, "..", "src")
+  );
+  storybookBaseConfig.stats = require("../webpack/config.stats");
+  return storybookBaseConfig;
+};
diff --git a/manifest/base.js b/manifest/base.js
index 601ea1849..21bbade9f 100644
--- a/manifest/base.js
+++ b/manifest/base.js
@@ -8,29 +8,29 @@
 const version = process.env.npm_package_version;
 
 module.exports = Object.freeze({
-  'name': 'Le Même en Mieux',
-  'shortname': 'LMEM',
-  'description': 'Qualité, prix, éthique : s’il existe un meilleur choix, vous le saurez. ' +
-    'Gratuit et sans pub, respecte votre vie privée.',
+  name: 'Le Même en Mieux',
+  description:
+    'Qualité, prix, éthique : s’il existe un meilleur choix, vous le saurez. '
+    + 'Gratuit et sans pub, respecte votre vie privée.',
   version,
-  'manifest_version': 2,
-  'icons': {
+  manifest_version: 2,
+  icons: {
     '16': 'img/logo/16x16.png',
     '48': 'img/logo/48x48.png',
     '128': 'img/logo/128x128.png'
   },
-  'background': {
-    'page': 'background.html'
+  background: {
+    page: 'background.html'
   },
-  'browser_action': {
-    'default_icon': {
+  browser_action: {
+    default_icon: {
       '16': 'img/logo/16x16.png',
       '48': 'img/logo/48x48.png',
       '128': 'img/logo/128x128.png'
     },
-    'default_title': 'Le Même en Mieux',
+    default_title: 'Le Même en Mieux'
   },
-  'permissions': [
+  permissions: [
     'geolocation',
     'storage',
     'tabs',
@@ -38,8 +38,5 @@ module.exports = Object.freeze({
     'http://*/*',
     'https://*/*'
   ],
-  'web_accessible_resources': [
-    'img/*',
-    'fonts/*'
-  ]
+  web_accessible_resources: ['img/*', 'fonts/*']
 });
diff --git a/manifest/firefox.js b/manifest/firefox.js
index 69dcd14fd..bc2704823 100644
--- a/manifest/firefox.js
+++ b/manifest/firefox.js
@@ -2,10 +2,6 @@ const base = require('./base');
 
 module.exports = {
   ...base,
-  'permissions': [
-    'storage',
-    'tabs',
-    'http://*/*',
-    'https://*/*'
-  ],
+  shortname: 'LMEM',
+  permissions: ['storage', 'tabs', 'http://*/*', 'https://*/*']
 };
diff --git a/package.json b/package.json
index 71bdc5040..2229dd214 100644
--- a/package.json
+++ b/package.json
@@ -10,9 +10,10 @@
     "build:production": "yarn build:chromium && yarn build:firefox",
     "build": "yarn build:staging && yarn build:production",
     "clean": "rm -rf build",
-    "test": "LMEM_BACKEND_ORIGIN='' NODE_ENV=test mocha --compilers js:@babel/register test/app --recursive",
-    "lint": "git ls-files -om --exclude-standard | grep \\.js$ | xargs eslint --fix",
-    "lint-git-hook": "git diff-index --name-only --cached HEAD | grep \\.js$ | xargs eslint --fix",
+    "test": "LMEM_BACKEND_ORIGIN='' NODE_ENV=test ts-mocha --paths test/app/*.ts test/app/**/*.ts",
+    "lint": "yarn lint:ts && yarn lint:css",
+    "lint-git-hook": "git diff-index --name-only --cached HEAD | grep \\.ts$ | xargs tslint --fix",
+    "lint:ts": "tslint './src/**/*.ts'",
     "lint:css": "stylelint './src/**/*.js'",
     "analyse": "babel-node ./node_modules/webpack/bin/webpack --optimize-minimize --mode production --config webpack/chromium.config.js --profile --json > stats.json",
     "storybook": "start-storybook -p 6007 -c .storybook",
@@ -65,6 +66,13 @@
     "@storybook/addon-knobs": "^4.1.12",
     "@storybook/addons": "^4.1.11",
     "@storybook/react": "^4.1.11",
+    "@types/chrome": "^0.0.81",
+    "@types/redux-immutable-state-invariant": "^2.1.0",
+    "@types/redux-logger": "^3.0.7",
+    "@types/remote-redux-devtools": "^0.5.3",
+    "@types/storybook__addon-actions": "^3.4.2",
+    "@types/storybook__addon-knobs": "^4.0.1",
+    "@types/storybook__react": "^4.0.1",
     "awesome-typescript-loader": "^5.2.1",
     "babel-eslint": "^10.0.1",
     "babel-loader": "^8.0.4",
@@ -75,7 +83,6 @@
     "babel-plugin-transform-react-remove-prop-types": "^0.4.19",
     "chai": "^3.5.0",
     "chai-as-promised": "^5.3.0",
-    "chai-immutable": "^1.6.0",
     "chromedriver": "^2.21.2",
     "co-mocha": "^1.2.2",
     "copy-webpack-plugin": "^5.0.0",
@@ -100,6 +107,7 @@
     "npm": "6.4.1",
     "null-loader": "^0.1.1",
     "pre-commit": "^1.1.3",
+    "prettier": "^1.16.4",
     "pug": "^2.0.3",
     "pug-loader": "^2.4.0",
     "raw-loader": "^0.5.1",
@@ -120,7 +128,12 @@
     "stylelint-custom-processor-loader": "^0.5.0",
     "stylelint-processor-styled-components": "^1.5.0",
     "svg-url-loader": "^2.0.2",
+    "tslint": "^5.13.1",
+    "tslint-config-prettier": "^1.18.0",
+    "tslint-config-standard": "^8.0.1",
+    "tslint-react": "^3.6.0",
     "typescript": "^3.3.3333",
+    "typescript-styled-plugin": "^0.14.0",
     "webpack": "^4.23.1",
     "webpack-cleanup-plugin": "^0.5.1",
     "webpack-cli": "^3.1.2",
@@ -130,6 +143,17 @@
   },
   "dependencies": {
     "@babel/polyfill": "^7.2.5",
+    "@types/flat": "^0.0.28",
+    "@types/history": "^4.7.2",
+    "@types/isomorphic-fetch": "^0.0.35",
+    "@types/lodash-es": "^4.17.3",
+    "@types/ramda": "^0.26.3",
+    "@types/react": "^16.8.7",
+    "@types/react-dom": "^16.8.2",
+    "@types/react-redux": "^7.0.3",
+    "@types/react-router": "^4.4.4",
+    "@types/react-router-dom": "^4.3.1",
+    "@types/styled-components": "^4.1.12",
     "chrome-storage-local": "^0.1.5",
     "classnames": "^2.2.5",
     "connected-react-router": "^6.3.1",
@@ -139,10 +163,8 @@
     "es6-promise": "^3.2.1",
     "flat": "^4.1.0",
     "history": "^4.7.2",
-    "immutable": "^3.8.1",
     "isomorphic-fetch": "^2.2.1",
-    "lodash-es": "^4.17.11",
-    "prop-types": "^15.6.2",
+    "ramda": "^0.26.1",
     "react": "^16.6.0",
     "react-dom": "^16.6.0",
     "react-hot-loader": "^4.3.11",
@@ -150,10 +172,8 @@
     "react-router": "^4.3.1",
     "react-router-dom": "^4.3.1",
     "redux": "^4.0.1",
-    "redux-immutable": "^3.0.10",
-    "redux-persist": "^3.2.2",
-    "redux-persist-immutable": "^4.2.0",
-    "redux-saga": "^0.16.2",
+    "redux-persist": "^5.10.0",
+    "redux-saga": "^1.0.2",
     "redux-thunk": "^2.0.1",
     "regenerator-runtime": "^0.13.1",
     "remote-redux-devtools": "^0.5.13",
diff --git a/src/app/actions/BaseAction.ts b/src/app/actions/BaseAction.ts
new file mode 100644
index 000000000..31ef018af
--- /dev/null
+++ b/src/app/actions/BaseAction.ts
@@ -0,0 +1,13 @@
+import { Action } from 'redux';
+import { ActionMeta } from './index';
+
+export interface BaseAction extends Action {
+  payload?: {};
+  meta?: ActionMeta;
+}
+
+export type TabAction = BaseAction & {
+  meta: ActionMeta & {
+    tab: number;
+  };
+};
diff --git a/src/app/actions/browser/browserAction.ts b/src/app/actions/browser/browserAction.ts
new file mode 100644
index 000000000..f0008d632
--- /dev/null
+++ b/src/app/actions/browser/browserAction.ts
@@ -0,0 +1,16 @@
+import { TabAction } from '../BaseAction';
+
+export interface BrowserActionClickedAction extends TabAction {
+  type: 'BROWSER/BROWSER_ACTION_CLICKED';
+  payload: {
+    tab: number;
+  };
+}
+
+export const browserActionClicked = (
+  tab: number
+): BrowserActionClickedAction => ({
+  type: 'BROWSER/BROWSER_ACTION_CLICKED',
+  payload: { tab },
+  meta: { tab, sendToTab: true }
+});
diff --git a/src/app/actions/browser/tabs.ts b/src/app/actions/browser/tabs.ts
new file mode 100644
index 000000000..63667fd3f
--- /dev/null
+++ b/src/app/actions/browser/tabs.ts
@@ -0,0 +1,31 @@
+import { TabAction } from '../BaseAction';
+
+export interface TabCreatedAction extends TabAction {
+  type: 'BROWSER/TAB_CREATED';
+  payload: { tab: number; url: string };
+}
+export const tabCreated = (tab: number, url: string): TabCreatedAction => ({
+  type: 'BROWSER/TAB_CREATED',
+  payload: { tab, url },
+  meta: { tab }
+});
+
+export interface TabUpdatedAction extends TabAction {
+  type: 'BROWSER/TAB_UPDATED';
+  payload: { tab: number; url: string };
+}
+export const tabUpdated = (tab: number, url: string): TabUpdatedAction => ({
+  type: 'BROWSER/TAB_UPDATED',
+  payload: { tab, url },
+  meta: { tab }
+});
+
+export interface TabRemovedAction extends TabAction {
+  type: 'BROWSER/TAB_REMOVED';
+  payload: { tab: number };
+}
+export const tabRemoved = (tab: number): TabRemovedAction => ({
+  type: 'BROWSER/TAB_REMOVED',
+  payload: { tab },
+  meta: { tab }
+});
diff --git a/src/app/actions/filters.ts b/src/app/actions/filters.ts
new file mode 100644
index 000000000..ae2076a8e
--- /dev/null
+++ b/src/app/actions/filters.ts
@@ -0,0 +1,21 @@
+import { InstallationDetails } from '../lmem/installation';
+import { BaseAction } from './BaseAction';
+
+export interface InstalledDetailsAction extends BaseAction {
+  type: 'INSTALLED_DETAILS';
+  payload: {
+    installationDetails: InstallationDetails;
+  };
+}
+
+export const updateInstalledDetails = (
+  installationDetails: InstallationDetails
+): InstalledDetailsAction => ({
+  type: 'INSTALLED_DETAILS',
+  payload: {
+    installationDetails
+  },
+  meta: {
+    sendToTab: true
+  }
+});
diff --git a/src/app/actions/index.ts b/src/app/actions/index.ts
new file mode 100644
index 000000000..d15f8395c
--- /dev/null
+++ b/src/app/actions/index.ts
@@ -0,0 +1,54 @@
+import { LocationChangeAction } from 'connected-react-router';
+import { BrowserActionClickedAction } from './browser/browserAction';
+import {
+  TabCreatedAction,
+  TabRemovedAction,
+  TabUpdatedAction
+} from './browser/tabs';
+import { InstalledAction } from './install';
+import {
+  RefreshMatchingContextsAction,
+  ReceivedMatchingContextsAction
+} from './kraftBackend';
+import {
+  InitAction,
+  MatchContextAction,
+  MatchContextFailureAction,
+  NoticeIgnoredAction,
+  NoticeDisplayedAction,
+  ContextTriggeredAction,
+  ContextTriggerFailureAction
+} from './tabs';
+import { InstalledDetailsAction } from './filters';
+import { CloseAction, ClosedAction, OpenAction, OpenedAction } from './ui';
+import { FeedbackOnNoticeAction, NoticesFoundAction } from './recommendations';
+
+export interface ActionMeta {
+  tab?: number;
+  sendToBackground?: boolean;
+  sendToTab?: boolean;
+}
+
+export type AppAction =
+  | InitAction
+  | BrowserActionClickedAction
+  | TabCreatedAction
+  | TabUpdatedAction
+  | TabRemovedAction
+  | InstalledAction
+  | RefreshMatchingContextsAction
+  | ReceivedMatchingContextsAction
+  | MatchContextAction
+  | MatchContextFailureAction
+  | ContextTriggeredAction
+  | ContextTriggerFailureAction
+  | NoticeDisplayedAction
+  | NoticeIgnoredAction
+  | InstalledDetailsAction
+  | OpenAction
+  | OpenedAction
+  | CloseAction
+  | ClosedAction
+  | NoticesFoundAction
+  | FeedbackOnNoticeAction
+  | (LocationChangeAction & { meta?: ActionMeta });
diff --git a/src/app/actions/install.ts b/src/app/actions/install.ts
new file mode 100644
index 000000000..361befa5f
--- /dev/null
+++ b/src/app/actions/install.ts
@@ -0,0 +1,40 @@
+import { Dispatch } from 'redux';
+import { InstallationDetails } from '../lmem/installation';
+import { BaseAction } from './BaseAction';
+
+export interface InstalledAction extends BaseAction {
+  type: 'INSTALLED';
+  payload: {
+    details: InstallationDetails;
+  };
+}
+
+export const installed = (
+  installationDetails: InstallationDetails
+): InstalledAction => ({
+  type: 'INSTALLED',
+  payload: { details: installationDetails }
+});
+
+// Promise constructed when the module is first imported (very early)
+// in order to not miss the "install" event.
+const onInstalledPromise = new Promise<InstallationDetails>(resolve => {
+  chrome.runtime.onInstalled.addListener(details => {
+    if (details.reason !== 'install') return;
+
+    resolve({
+      ...details,
+      datetime: new Date(),
+      version: chrome.runtime.getManifest().version
+    });
+  });
+});
+
+export default function(onboardingUrl: string) {
+  return (dispatch: Dispatch) =>
+    onInstalledPromise.then((installationDetails: InstallationDetails) =>
+      onboardingUrl
+        ? chrome.tabs.create({ url: onboardingUrl })
+        : dispatch(installed(installationDetails))
+    );
+}
diff --git a/src/app/actions/kraftBackend.ts b/src/app/actions/kraftBackend.ts
new file mode 100644
index 000000000..06aeb94d1
--- /dev/null
+++ b/src/app/actions/kraftBackend.ts
@@ -0,0 +1,59 @@
+import fetch from 'isomorphic-fetch';
+import { LMEM_BACKEND_ORIGIN } from 'app/constants/origins';
+import { MatchingContext } from 'app/lmem/matchingContext';
+import { Dispatch } from 'redux';
+import { BaseAction } from './BaseAction';
+
+function fetchJson(url: string) {
+  return fetch(url).then(response => {
+    if (response.status >= 400) {
+      throw new Error('Bad response from server');
+    }
+    return response.json();
+  });
+}
+
+export function makeUrlFromFilters() {
+  return LMEM_BACKEND_ORIGIN + '/api/v2/matchingcontexts';
+}
+
+export function fetchMatchingContexts(): Promise<MatchingContext[]> {
+  return fetchJson(makeUrlFromFilters());
+}
+
+export interface ReceivedMatchingContextsAction extends BaseAction {
+  type: 'api/UPDATE_MATCHING_CONTEXTS';
+  payload: { matchingContexts: MatchingContext[] };
+}
+export const receivedMatchingContexts = (
+  matchingContexts: MatchingContext[]
+): ReceivedMatchingContextsAction => ({
+  type: 'api/UPDATE_MATCHING_CONTEXTS',
+  payload: { matchingContexts }
+});
+
+export function dispatchInitialStateFromBackend() {
+  return (dispatch: Dispatch) => {
+    fetchMatchingContexts().then((matchingContexts: MatchingContext[]) =>
+      dispatch(receivedMatchingContexts(matchingContexts))
+    );
+  };
+}
+
+export interface RefreshMatchingContextsAction extends BaseAction {
+  type: 'REFRESH_MATCHING_CONTEXTS';
+}
+export const refreshMatchingContexts = (): RefreshMatchingContextsAction => ({
+  type: 'REFRESH_MATCHING_CONTEXTS'
+});
+
+export function refreshMatchingContextsEvery(milliseconds: number) {
+  function recurse(dispatch: Dispatch) {
+    setTimeout(() => {
+      dispatch(refreshMatchingContexts());
+      recurse(dispatch);
+    }, milliseconds);
+  }
+
+  return recurse;
+}
diff --git a/src/app/actions/recommendations.ts b/src/app/actions/recommendations.ts
new file mode 100644
index 000000000..1b192dd73
--- /dev/null
+++ b/src/app/actions/recommendations.ts
@@ -0,0 +1,72 @@
+import { EnhancedNotice } from 'app/lmem/notice';
+import { BaseAction, TabAction } from './BaseAction';
+
+export interface NoticesFoundAction extends TabAction {
+  type: 'NOTICES_FOUND';
+  payload: {
+    notices: EnhancedNotice[];
+  };
+}
+
+export const noticesFound = (
+  notices: EnhancedNotice[],
+  tab: number
+): NoticesFoundAction => ({
+  type: 'NOTICES_FOUND',
+  payload: {
+    notices
+  },
+  meta: {
+    tab,
+    sendToTab: true
+  }
+});
+
+export type feedbackType =
+  | 'dismiss'
+  | 'undismiss'
+  | 'like'
+  | 'unlike'
+  | 'dislike'
+  | 'undislike';
+
+export interface FeedbackOnNoticeAction extends BaseAction {
+  type: 'FEEDBACK_ON_NOTICE';
+  payload: { id: number; feedback: feedbackType };
+}
+
+export const dismissNotice = (id: number): FeedbackOnNoticeAction => ({
+  type: 'FEEDBACK_ON_NOTICE',
+  payload: { id, feedback: 'dismiss' },
+  meta: { sendToBackground: true }
+});
+
+export const undismissNotice = (id: number): FeedbackOnNoticeAction => ({
+  type: 'FEEDBACK_ON_NOTICE',
+  payload: { id, feedback: 'undismiss' },
+  meta: { sendToBackground: true }
+});
+
+export const likeNotice = (id: number): FeedbackOnNoticeAction => ({
+  type: 'FEEDBACK_ON_NOTICE',
+  payload: { id, feedback: 'like' },
+  meta: { sendToBackground: true }
+});
+
+export const unlikeNotice = (id: number): FeedbackOnNoticeAction => ({
+  type: 'FEEDBACK_ON_NOTICE',
+  payload: { id, feedback: 'unlike' },
+  meta: { sendToBackground: true }
+});
+
+export const dislikeNotice = (id: number): FeedbackOnNoticeAction => ({
+  type: 'FEEDBACK_ON_NOTICE',
+  payload: { id, feedback: 'dislike' },
+  meta: { sendToBackground: true }
+});
+
+export const undislikeNotice = (id: number): FeedbackOnNoticeAction => ({
+  type: 'FEEDBACK_ON_NOTICE',
+  payload: { id, feedback: 'undislike' },
+  meta: { sendToBackground: true }
+});
diff --git a/src/app/actions/tabs.ts b/src/app/actions/tabs.ts
new file mode 100644
index 000000000..2dcce685a
--- /dev/null
+++ b/src/app/actions/tabs.ts
@@ -0,0 +1,118 @@
+import { Criteria } from 'app/lmem/criterion';
+import {
+  ignoringReason,
+  EnhancedNotice,
+  IgnoringReason,
+  Notice
+} from 'app/lmem/notice';
+import { InstallationDetails } from 'app/lmem/installation';
+import { Editor } from 'app/lmem/editors';
+import { MatchingContext } from 'app/lmem/matchingContext';
+import { BaseAction, TabAction } from './BaseAction';
+
+export interface InitAction extends TabAction {
+  type: 'INIT';
+  payload: {
+    tab: number;
+    installationDetails: InstallationDetails;
+  };
+}
+
+export const init = (
+  tab: number,
+  installationDetails: InstallationDetails
+): InitAction => ({
+  type: 'INIT',
+  payload: {
+    tab,
+    installationDetails
+  },
+  meta: { tab, sendToTab: true }
+});
+
+export interface MatchContextAction extends TabAction {
+  type: 'LMEM/MATCH_CONTEXT';
+  payload: { url: string; tab: number };
+}
+export const matchContext = (url: string, tab: number): MatchContextAction => ({
+  type: 'LMEM/MATCH_CONTEXT',
+  payload: { url, tab },
+  meta: { tab }
+});
+
+export interface MatchContextFailureAction extends TabAction {
+  type: 'LMEM/MATCH_CONTEXT_FAILURE';
+  payload: { error: Error; url: string; tab: number };
+}
+export const matchContextFailure = (
+  error: Error,
+  url: string,
+  tab: number
+): MatchContextFailureAction => ({
+  type: 'LMEM/MATCH_CONTEXT_FAILURE',
+  payload: { error, url, tab },
+  meta: { tab }
+});
+
+export interface ContextTriggeredAction extends TabAction {
+  type: 'LMEM/CONTEXT_TRIGGERED';
+  payload: {
+    url: string;
+    tab: number;
+    triggeredContexts: MatchingContext[];
+  };
+}
+export const contextTriggered = (
+  tab: number,
+  url: string,
+  triggeredContexts: MatchingContext[]
+): ContextTriggeredAction => ({
+  type: 'LMEM/CONTEXT_TRIGGERED',
+  payload: { tab, url, triggeredContexts },
+  meta: { tab }
+});
+
+export interface ContextTriggerFailureAction extends TabAction {
+  type: 'LMEM/CONTEXT_TRIGGER_FAILURE';
+  payload: {
+    tab: number;
+    url: string;
+    error: Error;
+  };
+}
+export const contextTriggerFailure = (
+  tab: number,
+  url: string,
+  error: Error
+): ContextTriggerFailureAction => ({
+  type: 'LMEM/CONTEXT_TRIGGER_FAILURE',
+  payload: { tab, url, error },
+  meta: { tab }
+});
+
+export interface NoticeDisplayedAction extends BaseAction {
+  type: 'NOTICE_DISPLAYED';
+  payload: {
+    notice: Notice;
+    url: string;
+  };
+}
+export const noticeDisplayed = (
+  notice: Notice,
+  url: string
+): NoticeDisplayedAction => ({
+  type: 'NOTICE_DISPLAYED',
+  payload: { notice, url }
+});
+
+export interface NoticeIgnoredAction extends BaseAction {
+  type: 'NOTICE_IGNORED';
+  payload: { notice: Notice; reason: IgnoringReason; url: string };
+}
+export const noticeIgnored = (
+  notice: EnhancedNotice,
+  url: string
+): NoticeIgnoredAction => ({
+  type: 'NOTICE_IGNORED',
+  payload: { notice, reason: ignoringReason(notice), url }
+});
diff --git a/src/app/actions/ui.ts b/src/app/actions/ui.ts
new file mode 100644
index 000000000..d567d89b5
--- /dev/null
+++ b/src/app/actions/ui.ts
@@ -0,0 +1,21 @@
+import { BaseAction } from './BaseAction';
+
+export interface OpenAction extends BaseAction {
+  type: 'OPEN';
+}
+export const open = (): OpenAction => ({ type: 'OPEN' });
+
+export interface OpenedAction extends BaseAction {
+  type: 'OPENED';
+}
+export const opened = (): OpenedAction => ({ type: 'OPENED' });
+
+export interface CloseAction extends BaseAction {
+  type: 'CLOSE';
+}
+export const close = (): CloseAction => ({ type: 'CLOSE' });
+
+export interface ClosedAction extends BaseAction {
+  type: 'CLOSED';
+}
+export const closed = (): ClosedAction => ({ type: 'CLOSED' });
diff --git a/src/app/actions/updateDraftRecommendations.ts b/src/app/actions/updateDraftRecommendations.ts
new file mode 100644
index 000000000..afa196bc0
--- /dev/null
+++ b/src/app/actions/updateDraftRecommendations.ts
@@ -0,0 +1,11 @@
+import { BaseAction } from './BaseAction';
+
+interface UpdateDraftRecommendationsAction extends BaseAction {
+  type: 'UPDATE_DRAFT_RECOMMENDATIONS';
+  payload: { draftRecommendations: {} };
+}
+export const updateDraftRecommendations = (draftRecommendations: {}): UpdateDraftRecommendationsAction => ({
+  type: 'UPDATE_DRAFT_RECOMMENDATIONS',
+  payload: { draftRecommendations }
+});
+export default updateDraftRecommendations;
diff --git a/src/app/analytics/eventsMapper.js b/src/app/analytics/eventsMapper.ts
similarity index 56%
rename from src/app/analytics/eventsMapper.js
rename to src/app/analytics/eventsMapper.ts
index 9f20e3bf0..bf321ad72 100644
--- a/src/app/analytics/eventsMapper.js
+++ b/src/app/analytics/eventsMapper.ts
@@ -1,8 +1,14 @@
+import { Action } from 'redux';
 import flatten from 'flat';
 
-export default function mapEventFromAction(action) {
+interface FlattenAction {
+  type: string;
+  [key: string]: any;
+}
+
+export default function mapEventFromAction(action: Action) {
   // Flatten object properties in order to track them in HEAP analytics
-  const event = flatten(action, { maxDepth: 2 });
+  const event = flatten<Action, FlattenAction>(action, { maxDepth: 2 });
 
   // Drop useless properties in order to reduce objects size
   // Note: HEAP client sdk already drops object-like properties
@@ -10,4 +16,4 @@ export default function mapEventFromAction(action) {
   delete event['recommendation.description'];
 
   return event;
-}
\ No newline at end of file
+}
diff --git a/src/app/analytics/trackEvents.js b/src/app/analytics/trackEvents.ts
similarity index 74%
rename from src/app/analytics/trackEvents.js
rename to src/app/analytics/trackEvents.ts
index 63c69e129..8e5a17082 100644
--- a/src/app/analytics/trackEvents.js
+++ b/src/app/analytics/trackEvents.ts
@@ -1,4 +1,5 @@
 import mapEventFromAction from './eventsMapper';
+import { Action } from 'redux';
 
 // Arbitrary set max payload size
 // const MAX_PAYLOAD_SIZE = 7800;
@@ -11,10 +12,10 @@ import mapEventFromAction from './eventsMapper';
  *
  * One solution could be to track specific events (with the trackSpecificEvents reducer).
  *
- * Another one could be to add try / catch block and just track the event in case the payload 
+ * Another one could be to add try / catch block and just track the event in case the payload
  * doesn't fit (still better than nothing).
  *
- * I tried to implement the try / catch in the reducer but it seems the API call itself is 
+ * I tried to implement the try / catch in the reducer but it seems the API call itself is
  * asynchronous and doesn't enter the catch block.
  *
  * The solution I found for the moment is to check for the payload size before doing the API
@@ -28,11 +29,15 @@ import mapEventFromAction from './eventsMapper';
  * - Removed payload size check (it’s has become very very rare)
  */
 
-export default function (action) {
-  if (window.heap) {
-    window.heap.track(action.type, mapEventFromAction(action));
+export function trackEvents(action: Action): void {
+  const { heap } = window as CustomWindow;
+  if (heap) {
+    heap.track(action.type, mapEventFromAction(action));
+  } else {
+    console.info(
+      `Heap analytics disabled: ignore tracking of "${action.type}"`
+    );
   }
-  else {
-    console.info(`Heap analytics disabled: ignore tracking of "${action.type}"`);
-  }
-}
\ No newline at end of file
+}
+
+export default trackEvents;
diff --git a/src/app/background/actions/broadcast.js b/src/app/background/actions/broadcast.js
deleted file mode 100644
index c199cf666..000000000
--- a/src/app/background/actions/broadcast.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import createAction from '../../../lib/createAction';
-
-export default createAction('dispatch');
diff --git a/src/app/background/actions/browser/action.js b/src/app/background/actions/browser/action.js
deleted file mode 100644
index 6bf9b89cf..000000000
--- a/src/app/background/actions/browser/action.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import createAction from '../../../utils/createAction';
-import { BROWSER_ACTION_CLICKED } from '../../../constants/browser/action';
-
-export const browserActionClicked = createAction(
-  BROWSER_ACTION_CLICKED,
-  tab => tab,
-  tab => ({ tab })
-);
diff --git a/src/app/background/actions/browser/tabs.js b/src/app/background/actions/browser/tabs.js
deleted file mode 100644
index 0107e1cea..000000000
--- a/src/app/background/actions/browser/tabs.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import {
-  TAB_CREATED,
-  TAB_UPDATED,
-  TAB_REMOVED,
-  TAB_CONNECTED,
-} from '../../../constants/browser/tabs';
-import createAction from '../../../utils/createAction';
-
-export const tabCreated = createAction(TAB_CREATED);
-export const tabUpdated = createAction(TAB_UPDATED);
-export const tabRemoved = createAction(TAB_REMOVED);
-export const tabConnected = createAction(TAB_CONNECTED);
diff --git a/src/app/background/actions/install.js b/src/app/background/actions/install.js
deleted file mode 100644
index dd9d66fa5..000000000
--- a/src/app/background/actions/install.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { INSTALLED } from '../../constants/ActionTypes';
-import createAction from '../../utils/createAction';
-
-export const installed = createAction(INSTALLED, onInstalledDetails => ({ onInstalledDetails }));
-
-// Promise constructed when the module is first imported (very early)
-// in order to not miss the "install" event.
-const onInstalledPromise = new Promise((resolve) => {
-  chrome.runtime.onInstalled.addListener((details) => {
-    if (details.reason !== 'install') return;
-
-    resolve(Object.assign({}, details, {
-      datetime: new Date(),
-      version: chrome.runtime.getManifest().version,
-    }));
-  });
-});
-
-export default function ({ onboardingUrl }) {
-  return (dispatch) => {
-    if (onboardingUrl) {
-      onInstalledPromise.then(() => chrome.tabs.create({ url: onboardingUrl }));
-    }
-
-    onInstalledPromise.then(onInstalledDetails => dispatch(installed(onInstalledDetails)));
-  };
-}
\ No newline at end of file
diff --git a/src/app/background/actions/kraftBackend.js b/src/app/background/actions/kraftBackend.js
deleted file mode 100644
index 59f6abfff..000000000
--- a/src/app/background/actions/kraftBackend.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import { Map as ImmutableMap, Set as ImmutableSet } from 'immutable';
-
-import fetch from 'isomorphic-fetch';
-import {
-  RECEIVED_MATCHING_CONTEXTS,
-  RECEIVED_CRITERIA,
-  RECEIVED_EDITORS,
-  REFRESH_MATCHING_CONTEXTS,
-} from '../../constants/ActionTypes';
-
-import { LMEM_BACKEND_ORIGIN } from '../../constants/origins';
-import createAction from '../../utils/createAction';
-
-function fetchJson(url) {
-  return fetch(url)
-    .then((response) => {
-      if (response.status >= 400) {
-        throw new Error('Bad response from server');
-      }
-      return response.json();
-    });
-}
-
-export function makeUrlFromFilters(criteria = [], excludedEditors = []) {
-  let url = LMEM_BACKEND_ORIGIN + '/api/v2/matchingcontexts';
-  const hasFilters = !(criteria.length === 0 && excludedEditors.length === 0);
-
-  if (hasFilters) {
-    let filters = '';
-
-    if (criteria.length !== 0 && excludedEditors.length === 0) {
-      filters = 'criteria=' + criteria.join(',');
-    } else if (excludedEditors.length !== 0 && criteria.length === 0) {
-      filters = 'excluded_editors=' + excludedEditors.join(',');
-    } else {
-      filters = ['criteria=' + criteria.join(','), 'excluded_editors=' + excludedEditors.join(',')].join('&');
-    }
-
-    console.log('filters', filters);
-
-    url += '?' + filters;
-  }
-
-  return url;
-}
-
-export function fetchMatchingContexts(criteria, excludedEditors) {
-  return fetchJson(makeUrlFromFilters(criteria, excludedEditors)).then(json => new ImmutableSet(json));
-}
-
-function fetchAllCriteria() {
-  return fetchJson(LMEM_BACKEND_ORIGIN + '/api/v2/criteria')
-    .then((criteria) => {
-    // transform list of objects into ImmutableMap of ImmutableMaps
-      return criteria.reduce((acc, criterion) => {
-        return acc.set(criterion.slug, new ImmutableMap(criterion));
-      }, new ImmutableMap());
-    });
-}
-
-function fetchAllEditors() {
-  return fetchJson(LMEM_BACKEND_ORIGIN + '/api/v2/editors')
-    .then((editors) => {
-    // transform list of objects into ImmutableMap of ImmutableMaps
-      return editors.reduce((acc, editor) => {
-        return acc.set(editor.id.toString(), new ImmutableMap(editor));
-      }, new ImmutableMap());
-    });
-}
-
-export const receivedMatchingContexts = createAction(
-  RECEIVED_MATCHING_CONTEXTS,
-  (matchingContexts = []) => ({ matchingContexts })
-);
-
-export const receivedCriteria = createAction(
-  RECEIVED_CRITERIA,
-  criteria => ({ criteria })
-);
-
-export const receivedEditors = createAction(
-  RECEIVED_EDITORS,
-  editors => ({ editors })
-);
-
-export function dispatchInitialStateFromBackend() {
-  return (dispatch) => {
-    fetchMatchingContexts().then(matchingContexts => dispatch(receivedMatchingContexts(matchingContexts)));
-    fetchAllCriteria().then(criteria => dispatch(receivedCriteria(criteria)));
-    fetchAllEditors().then(editors => dispatch(receivedEditors(editors)));
-  };
-}
-
-export const refreshMatchingContexts = createAction(REFRESH_MATCHING_CONTEXTS);
-
-export function refreshMatchingContextsEvery(milliseconds) {
-  function recurse(dispatch) {
-    setTimeout(() => {
-      dispatch(refreshMatchingContexts());
-      recurse(dispatch);
-    }, milliseconds);
-  }
-
-  return recurse;
-}
diff --git a/src/app/background/actions/tabs.js b/src/app/background/actions/tabs.js
deleted file mode 100644
index 3734dd778..000000000
--- a/src/app/background/actions/tabs.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import {
-  INIT,
-  CONTEXT_TRIGGERED,
-  RECO_DISPLAYED,
-  NOTICE_IGNORED,
-  MATCH_CONTEXT,
-  MATCH_CONTEXT_FAILURE,
-  CONTEXT_TRIGGER_FAILURE
-} from '../../constants/ActionTypes';
-import Notice from '../../lmem/Notice';
-import createAction from '../../utils/createAction';
-
-export const init = createAction(
-  INIT,
-  ({ onInstalledDetails, criteria, editors }) => ({ onInstalledDetails, criteria, editors }),
-  tab => ({ tab })
-);
-
-export const matchContext = createAction(
-  MATCH_CONTEXT,
-  context => context,
-  tab => ({ tab }),
-);
-
-export const matchContextFailure = createAction(
-  MATCH_CONTEXT_FAILURE,
-  error => ({ error })
-);
-
-export const contextTriggered = createAction(
-  CONTEXT_TRIGGERED,
-  (triggeredContexts = []) => ({ triggeredContexts }),
-  ({ trigger, tab }) => ({ trigger, tab })
-);
-
-export const contextTriggerFailure = createAction(
-  CONTEXT_TRIGGER_FAILURE,
-  error => ({ error })
-);
-
-export const noticeDisplayed = createAction(
-  RECO_DISPLAYED,
-  notice => ({ notice }),
-  trigger => ({ trigger })
-);
-
-export const noticeIgnored = createAction(
-  NOTICE_IGNORED,
-  notice => ({ notice, reason: Notice.ignoringReason(notice) }),
-  trigger => ({ trigger })
-);
diff --git a/src/app/background/actions/updateDraftRecommendations.js b/src/app/background/actions/updateDraftRecommendations.js
deleted file mode 100644
index 23971c123..000000000
--- a/src/app/background/actions/updateDraftRecommendations.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { UPDATE_DRAFT_RECOMMENDATIONS } from '../../constants/ActionTypes';
-import createAction from '../../utils/createAction';
-
-export default createAction(UPDATE_DRAFT_RECOMMENDATIONS)(draftRecommendations => ({ draftRecommendations }));
diff --git a/src/app/background/index.js b/src/app/background/index.js
deleted file mode 100644
index 5068fd28a..000000000
--- a/src/app/background/index.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/* eslint global-require: "off" */
-
-// Early imports with high priority stuff involved, such as event listeners creation
-import onInstalled from './actions/install';
-import loadHeap from '../../lib/heap';
-
-import configureStore from './store/configureStore';
-import { getOnInstalledDetails } from './selectors/prefs';
-
-import prepareDraftPreview from '../lmem/draft-preview/main';
-
-import {
-  dispatchInitialStateFromBackend,
-  refreshMatchingContextsEvery,
-} from './actions/kraftBackend';
-import updateDraftRecommendations from './actions/updateDraftRecommendations';
-
-import {LMEM_BACKEND_ORIGIN } from '../constants/origins';
-import fetchContentScript from './services/fetchContentScript';
-
-if(process.env.NODE_ENV !== 'production'){
-  console.info('NODE_ENV', process.env.NODE_ENV);
-}
-console.info(`LMEM_BACKEND_ORIGIN "${LMEM_BACKEND_ORIGIN}"`);
-
-const heapAppId = process.env.HEAP_APPID;
-if (typeof heapAppId === 'string') {
-  console.info(`Heap loading with appId "${heapAppId}"`);
-  loadHeap(heapAppId).then((heap) => {
-    const uninstallOrigin = process.env.UNINSTALL_ORIGIN;
-    if (typeof uninstallOrigin === 'string') {
-      chrome.runtime.setUninstallURL(uninstallOrigin + '?u=' + encodeURIComponent(heap.userId));
-    }
-  });
-}
-else {
-  console.warn('Heap analytics disabled: assuming "process.env.HEAP_APPID" is deliberately not defined.');
-}
-
-// Load content code when the extension is loaded
-const draftRecoContentCodeP = fetchContentScript('/js/grabDraftRecommendations.js');
-
-configureStore((store) => {
-  window.store = store;
-  // Expose the store to extension's windows
-  window.getStore = () => {
-    let unsubscribeList = [];
-    return {
-      store: Object.assign({
-        subscribe(...args) {
-          const unsubscribe = store.subscribe(...args);
-          unsubscribeList.push(unsubscribe);
-          return unsubscribe;
-        },
-        store
-      }),
-      unsubscribe: () => {
-        unsubscribeList.forEach((unsubscriber) => { unsubscriber(); });
-      }
-    };
-  };
-
-  draftRecoContentCodeP
-    .then(contentCode => prepareDraftPreview(
-      chrome.tabs,
-      contentCode,
-      (draftOffers => store.dispatch(updateDraftRecommendations(draftOffers)))
-    ));
-
-  if (getOnInstalledDetails(store.getState()).isEmpty()) {
-    const onboardingUrl = process.env.ONBOARDING_ORIGIN;
-    store.dispatch(onInstalled({ onboardingUrl }));
-  }
-
-  store.dispatch(dispatchInitialStateFromBackend()); // store initialization from the kraft server
-
-  const refreshInterval = Number(process.env.REFRESH_MC_INTERVAL);
-  if (refreshInterval > 0) {
-    console.info(`Matching contexts will be refreshed every ${refreshInterval / 1000 / 60} minutes.`);
-    store.dispatch(refreshMatchingContextsEvery(refreshInterval));
-  }
-  else console.warn(
-    'Matching contexts auto-refresh disabled:',
-    'assuming "process.env.REFRESH_MC_INTERVAL" is deliberately not defined.'
-  );
-
-}, true);
-
diff --git a/src/app/background/index.ts b/src/app/background/index.ts
new file mode 100644
index 000000000..7ad97671e
--- /dev/null
+++ b/src/app/background/index.ts
@@ -0,0 +1,66 @@
+// Early imports with high priority stuff involved, such as event listeners creation
+import loadHeap from '../../lib/heap';
+import prepareDraftPreview from '../lmem/draft-preview/main';
+import { LMEM_BACKEND_ORIGIN } from '../constants/origins';
+import {
+  dispatchInitialStateFromBackend,
+  refreshMatchingContextsEvery
+} from 'app/actions/kraftBackend';
+import onInstalled from 'app/actions/install';
+import updateDraftRecommendations from 'app/actions/updateDraftRecommendations';
+import { getInstallationDetails } from './selectors/prefs';
+import { store } from './store';
+import fetchContentScript from './services/fetchContentScript';
+import { BackgroundState } from './reducers';
+
+if (process.env.NODE_ENV !== 'production') {
+  console.info('NODE_ENV', process.env.NODE_ENV);
+}
+console.info(`LMEM_BACKEND_ORIGIN "${LMEM_BACKEND_ORIGIN}"`);
+
+const heapAppId = process.env.HEAP_APPID;
+if (typeof heapAppId === 'string') {
+  console.info(`Heap loading with appId "${heapAppId}"`);
+  loadHeap(heapAppId).then(heap => {
+    const uninstallOrigin = process.env.UNINSTALL_ORIGIN;
+    if (typeof uninstallOrigin === 'string') {
+      chrome.runtime.setUninstallURL(
+        uninstallOrigin + '?u=' + encodeURIComponent(heap.userId)
+      );
+    }
+  });
+} else {
+  console.warn(
+    'Heap analytics disabled: assuming "process.env.HEAP_APPID" is deliberately not defined.'
+  );
+}
+
+// Load content code when the extension is loaded
+fetchContentScript('/js/grabDraftRecommendations.js').then(contentCode =>
+  prepareDraftPreview(chrome.tabs, contentCode, (draftOffers: {}) =>
+    store.dispatch(updateDraftRecommendations(draftOffers))
+  )
+);
+
+const state: BackgroundState = store.getState();
+if (!getInstallationDetails(state).datetime) {
+  onInstalled(process.env.ONBOARDING_ORIGIN)(store.dispatch);
+}
+
+dispatchInitialStateFromBackend()(store.dispatch);
+// store initialization from the kraft server
+
+const refreshInterval = Number(process.env.REFRESH_MC_INTERVAL);
+if (refreshInterval > 0) {
+  console.info(
+    `Matching contexts will be refreshed every ${refreshInterval /
+      1000 /
+      60} minutes.`
+  );
+  refreshMatchingContextsEvery(refreshInterval)(store.dispatch);
+} else {
+  console.warn(
+    'Matching contexts auto-refresh disabled:',
+    'assuming "process.env.REFRESH_MC_INTERVAL" is deliberately not defined.'
+  );
+}
diff --git a/src/app/background/middlewares/analytics.js b/src/app/background/middlewares/analytics.js
deleted file mode 100644
index f6463ef8b..000000000
--- a/src/app/background/middlewares/analytics.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { POPUP_CLICK } from '../../constants/ActionTypes';
-
-export default function ({ getCurrentTabs, track }) {
-  return store => next => (action) => {
-    const { type } = action;
-
-    if (!type.startsWith('api/') && !type.startsWith('notify/') && !type.startsWith('persist/')) {
-      if (type === POPUP_CLICK) {
-        getCurrentTabs()
-          .then(tabs => (tabs.length > 0 ? tabs[0].url : undefined))
-          .then(currTabUrl => Object.assign(action, {currentHref: currTabUrl}))
-          .then(event => track(event));
-      }
-      else track(action);
-    }
-
-    return next(action);
-  };
-}
\ No newline at end of file
diff --git a/src/app/background/middlewares/analytics.ts b/src/app/background/middlewares/analytics.ts
new file mode 100644
index 000000000..ab76ec10d
--- /dev/null
+++ b/src/app/background/middlewares/analytics.ts
@@ -0,0 +1,20 @@
+import { AppAction } from '../../actions';
+import { Dispatch } from 'redux';
+
+type Track = (action: AppAction) => void;
+
+export const analytics = (track: Track) => () => (next: Dispatch) => (
+  action: AppAction
+) => {
+  if (
+    !action.type.startsWith('api/') &&
+    !action.type.startsWith('notify/') &&
+    !action.type.startsWith('persist/')
+  ) {
+    track(action);
+  }
+
+  return next(action);
+};
+
+export default analytics;
diff --git a/src/app/background/middlewares/index.js b/src/app/background/middlewares/index.js
index 4674c46bc..74c6369ad 100644
--- a/src/app/background/middlewares/index.js
+++ b/src/app/background/middlewares/index.js
@@ -1,20 +1,9 @@
-import thunk from 'redux-thunk';
-import openOptionsPage from './openOptionsPage';
-import sendFeedback from './sendFeedback';
-import analytics from './analytics';
-import sagaMiddleware from './saga';
-import track from '../../analytics/trackEvents';
-import getCurrentTabs from '../services/getCurrentTabs';
+import thunk from "redux-thunk";
+import sendFeedback from "./sendFeedback";
+import analytics from "./analytics";
+import sagaMiddleware from "./saga";
+import track from "../../analytics/trackEvents";
 
 export { sagaMiddleware };
 
-export default [
-  thunk,
-  analytics({
-    getCurrentTabs,
-    track,
-  }),
-  openOptionsPage,
-  sendFeedback,
-  sagaMiddleware,
-];
+export default [thunk, analytics(track), sendFeedback, sagaMiddleware];
diff --git a/src/app/background/middlewares/offersMatching.js b/src/app/background/middlewares/offersMatching.js
deleted file mode 100644
index 34ff75a43..000000000
--- a/src/app/background/middlewares/offersMatching.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export default function createOffersMatching({ getState }) {
-  return next => (action) => {
-    const { console } = window;
-    const prevState = getState();
-    const returnValue = next(action);
-    const nextState = getState();
-    const actionType = String(action.type);
-    const message = `action ${actionType}`;
-    console.log('%c prev state', 'color: #9E9E9E', prevState);
-    console.log('%c action', 'color: #03A9F4', action);
-    console.log('%c next state', 'color: #4CAF50', nextState);
-    return returnValue;
-  };
-}
\ No newline at end of file
diff --git a/src/app/background/middlewares/openOptionsPage.js b/src/app/background/middlewares/openOptionsPage.js
deleted file mode 100644
index 8174be177..000000000
--- a/src/app/background/middlewares/openOptionsPage.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { OPEN_PREFERENCE_PANEL } from '../../constants/ActionTypes';
-
-export default function (store){
-  return next => (action) => {
-
-    if (action.type === OPEN_PREFERENCE_PANEL) {
-      if (chrome.runtime.openOptionsPage) {
-        // New way to open options pages, if supported (Chrome 42+).
-        chrome.runtime.openOptionsPage();
-      } else {
-        // Reasonable fallback.
-        chrome.tabs.create({url: 'options.html'});
-      }
-    }
-
-    return next(action);
-  };
-}
\ No newline at end of file
diff --git a/src/app/background/middlewares/sendFeedback.js b/src/app/background/middlewares/sendFeedback.js
deleted file mode 100644
index e2007cb1d..000000000
--- a/src/app/background/middlewares/sendFeedback.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import {
-  DISMISS_NOTICE,
-  UNDISMISS_NOTICE,
-  LIKE_NOTICE,
-  UNLIKE_NOTICE,
-  DISLIKE_NOTICE,
-  UNDISLIKE_NOTICE,
-  REPORT_NOTICE
-} from '../../constants/ActionTypes';
-
-import { LMEM_BACKEND_ORIGIN } from '../../constants/origins';
-
-const actionTypeToFeedbackType = {
-  [DISMISS_NOTICE]: 'dismiss',
-  [UNDISMISS_NOTICE]: 'undismiss',
-  [LIKE_NOTICE]: 'like',
-  [UNLIKE_NOTICE]: 'unlike',
-  [DISLIKE_NOTICE]: 'dislike',
-  [UNDISLIKE_NOTICE]: 'undislike',
-  [REPORT_NOTICE]: 'report',
-};
-
-export function makeRecoFeedback(type, url) {
-  const datetime = new Date().toISOString();
-
-  const feedback = actionTypeToFeedbackType[type];
-
-  if (!feedback) {
-    throw new ReferenceError(`Wrong feedback type: ${type}`);
-  }
-
-  return {
-    feedback,
-    contexts: {
-      datetime,
-      url,
-    }
-  };
-}
-
-/* eslint-disable indent, implicit-arrow-linebreak, no-multi-spaces */
-const isUserToNoticeAction = ({ type }) =>
-   type === DISMISS_NOTICE || type === UNDISMISS_NOTICE
-|| type === LIKE_NOTICE    || type === UNLIKE_NOTICE
-|| type === DISLIKE_NOTICE || type === UNDISLIKE_NOTICE
-|| type === REPORT_NOTICE;
-
-export default function (store){
-  return next => (action) => {
-    const { type, payload } = action;
-
-    if (isUserToNoticeAction(action)) {
-      const { id } = payload;
-      const reqUrl = LMEM_BACKEND_ORIGIN + '/api/v2/recommendations/' + id + '/feedbacks';
-      new Promise((res) => {
-        chrome.tabs.query({
-          active: true,
-          currentWindow: true,
-        }, ([selectedTab]) => res(selectedTab.url));
-      })
-        .then((tabUrl) => {
-        const body = JSON.stringify(makeRecoFeedback(type, tabUrl));
-
-        fetch(reqUrl, { method: 'POST', body })
-          .then(response => console.log('RESPONSE', response))
-          .catch(error => console.error(`Error in ${reqUrl}`, error));
-      });
-    }
-
-    return next(action);
-  };
-}
diff --git a/src/app/background/middlewares/sendFeedback.ts b/src/app/background/middlewares/sendFeedback.ts
new file mode 100644
index 000000000..a887ab6ce
--- /dev/null
+++ b/src/app/background/middlewares/sendFeedback.ts
@@ -0,0 +1,53 @@
+import { LMEM_BACKEND_ORIGIN } from '../../constants/origins';
+import { AppAction } from '../../actions';
+import { Dispatch } from 'redux';
+import {
+  FeedbackOnNoticeAction,
+  feedbackType
+} from '../../actions/recommendations';
+
+export function makeRecoFeedback(feedback: feedbackType, url: string) {
+  const datetime = new Date().toISOString();
+
+  return {
+    feedback,
+    contexts: {
+      datetime,
+      url
+    }
+  };
+}
+
+/* eslint-disable indent, implicit-arrow-linebreak, no-multi-spaces */
+const isUserToNoticeAction = (
+  action: AppAction
+): action is FeedbackOnNoticeAction => action.type === 'FEEDBACK_ON_NOTICE';
+
+export default function() {
+  return (next: Dispatch) => (action: AppAction) => {
+    if (isUserToNoticeAction(action)) {
+      const { id } = action.payload;
+      const reqUrl =
+        LMEM_BACKEND_ORIGIN + '/api/v2/recommendations/' + id + '/feedbacks';
+      new Promise<string>(resolve => {
+        chrome.tabs.query(
+          {
+            active: true,
+            currentWindow: true
+          },
+          ([selectedTab]) => resolve(selectedTab.url)
+        );
+      }).then((tabUrl: string) => {
+        const body = JSON.stringify(
+          makeRecoFeedback(action.payload.feedback, tabUrl)
+        );
+
+        fetch(reqUrl, { method: 'POST', body })
+          .then(response => console.log('RESPONSE', response))
+          .catch(error => console.error(`Error in ${reqUrl}`, error));
+      });
+    }
+
+    return next(action);
+  };
+}
diff --git a/src/app/background/reducers/index.js b/src/app/background/reducers/index.js
deleted file mode 100644
index 62c517491..000000000
--- a/src/app/background/reducers/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { combineReducers } from 'redux-immutable';
-import prefs from './prefs';
-import resources from './resources';
-import tabs from './tabs';
-
-export default combineReducers({
-  prefs,
-  resources,
-  tabs,
-});
\ No newline at end of file
diff --git a/src/app/background/reducers/index.ts b/src/app/background/reducers/index.ts
new file mode 100644
index 000000000..bb38fbad3
--- /dev/null
+++ b/src/app/background/reducers/index.ts
@@ -0,0 +1,16 @@
+import { combineReducers } from 'redux';
+import prefs, { PrefsState } from './prefs';
+import resources, { ResourcesState } from './resources';
+import tabs, { TabsState } from './tabs';
+
+export interface BackgroundState {
+  prefs: PrefsState;
+  resources: ResourcesState;
+  tabs: TabsState;
+}
+
+export default combineReducers({
+  prefs,
+  resources,
+  tabs
+});
diff --git a/src/app/background/reducers/prefs.js b/src/app/background/reducers/prefs.js
deleted file mode 100644
index 8395e965e..000000000
--- a/src/app/background/reducers/prefs.js
+++ /dev/null
@@ -1,131 +0,0 @@
-import { Map as ImmutableMap, Set as ImmutableSet } from 'immutable';
-import fromJS from '../../utils/customFromJS';
-
-import {
-  INSTALLED,
-  RECEIVED_CRITERIA,
-  SELECT_CRITERION,
-  UNSELECT_CRITERION,
-  RECEIVED_EDITORS,
-  EXCLUDE_EDITOR,
-  INCLUDE_EDITOR,
-  DISMISS_NOTICE, UNDISMISS_NOTICE,
-  LIKE_NOTICE, UNLIKE_NOTICE,
-  DISLIKE_NOTICE, UNDISLIKE_NOTICE,
-  REPORT_NOTICE,
-  DEACTIVATE
-} from '../../constants/ActionTypes';
-
-
-const initialPrefs = fromJS({
-  websites: new ImmutableSet(),
-  criteria: new ImmutableMap(),
-  editors: new ImmutableMap(),
-  dismissedNotices: new ImmutableSet(),
-  likedNotices: new ImmutableSet(),
-  dislikedNotices: new ImmutableSet(),
-  reportedNotices: new ImmutableSet(),
-  onInstalledDetails: new ImmutableMap()
-});
-
-const addToSet = element => immutableSet => immutableSet.add(element);
-const deleteFromSet = element => immutableSet => immutableSet.delete(element);
-
-export default function (state = initialPrefs, action) {
-  const { type, payload } = action;
-
-  switch (type) {
-    case INSTALLED: {
-      const { onInstalledDetails } = payload;
-      return state.set('onInstalledDetails', ImmutableMap(onInstalledDetails)); // eslint-disable-line
-    }
-
-    case RECEIVED_CRITERIA: {
-      const { criteria } = payload;
-      let newCriteria;
-
-      newCriteria = criteria.reduce((acc, curr) => {
-        const slug = curr.get('slug');
-
-        return !state.get('criteria').has(slug)
-          ? acc.set(slug, curr.set('isSelected', true)) // new criteria from server are set to selected by default
-          : acc.set(slug, state.get('criteria').get(slug));
-
-      }, state.get('criteria'));
-
-      return state.set('criteria', newCriteria);
-    }
-
-    case SELECT_CRITERION: {
-      const { slug } = payload;
-      const criteria = state.get('criteria');
-
-      return state.set('criteria', criteria.setIn([slug, 'isSelected'], true));
-    }
-
-    case UNSELECT_CRITERION: {
-      const { slug } = action;
-      const criteria = state.get('criteria');
-
-      return state.set('criteria', criteria.setIn([slug, 'isSelected'], false));
-    }
-
-    case RECEIVED_EDITORS: {
-      const { editors } = payload;
-      let newEditors;
-
-      newEditors = editors.reduce((acc, curr) => {
-        const id = curr.get('id').toString();
-
-        return !state.get('editors').has(id)
-          ? acc.set(id, curr.set('isExcluded', false)) // new editors from server are set to not excluded by default
-          : acc.set(id, state.get('editors').get(id));
-
-      }, state.get('editors'));
-
-      return state.set('editors', newEditors);
-    }
-
-    case EXCLUDE_EDITOR: {
-      const { id } = payload;
-      const editors = state.get('editors');
-
-      return state.set('editors', editors.setIn([id.toString(), 'isExcluded'], true));
-    }
-
-    case INCLUDE_EDITOR: {
-      const { id } = payload;
-      const editors = state.get('editors');
-
-      return state.set('editors', editors.setIn([id.toString(), 'isExcluded'], false));
-    }
-
-    case REPORT_NOTICE: return state.update('reportedNotices', addToSet(payload.id));
-
-    case DISMISS_NOTICE:
-      return state.update('dismissedNotices', addToSet(payload.id));
-    case UNDISMISS_NOTICE:
-      return state.update('dismissedNotices', deleteFromSet(payload.id));
-
-    case LIKE_NOTICE:
-      return state.update('likedNotices', addToSet(payload.id));
-    case UNLIKE_NOTICE:
-      return state.update('likedNotices', deleteFromSet(payload.id));
-
-    case DISLIKE_NOTICE:
-      return state.update('dislikedNotices', addToSet(payload.id));
-    case UNDISLIKE_NOTICE:
-      return state.update('dislikedNotices', deleteFromSet(payload.id));
-
-
-    case DEACTIVATE: {
-      const { duration } = payload;
-
-      return state.setIn(['websites', 'deactivated', 'everywhereUntil'], Date.now() + duration);
-    }
-
-    default:
-      return state;
-  }
-}
-
diff --git a/src/app/background/reducers/prefs.ts b/src/app/background/reducers/prefs.ts
new file mode 100644
index 000000000..ce326f0b6
--- /dev/null
+++ b/src/app/background/reducers/prefs.ts
@@ -0,0 +1,76 @@
+import * as R from 'ramda';
+import { version } from '../../../../package.json';
+import { InstallationDetails } from '../../lmem/installation';
+import { AppAction } from 'app/actions';
+
+export interface PrefsState {
+  installationDetails: InstallationDetails;
+  dismissedNotices: number[];
+  likedNotices: number[];
+  dislikedNotices: number[];
+}
+
+const initialPrefs: PrefsState = {
+  installationDetails: { version },
+  dismissedNotices: [],
+  likedNotices: [],
+  dislikedNotices: []
+};
+
+export function prefs(state: PrefsState = initialPrefs, action: AppAction) {
+  switch (action.type) {
+    case 'INSTALLED': {
+      return { ...state, installationDetails: action.payload.details };
+    }
+    case 'FEEDBACK_ON_NOTICE':
+      switch (action.payload.feedback) {
+        case 'dismiss':
+          return {
+            ...state,
+            dismissedNotices: R.concat(state.dismissedNotices, [
+              action.payload.id
+            ])
+          };
+        case 'undismiss':
+          return {
+            ...state,
+            dismissedNotices: R.without(
+              [action.payload.id],
+              state.dismissedNotices
+            )
+          };
+
+        case 'like':
+          return {
+            ...state,
+            likedNotices: R.concat(state.likedNotices, [action.payload.id])
+          };
+        case 'unlike':
+          return {
+            ...state,
+            likedNotices: R.without([action.payload.id], state.likedNotices)
+          };
+
+        case 'dislike':
+          return {
+            ...state,
+            dislikedNotices: R.concat(state.dislikedNotices, [
+              action.payload.id
+            ])
+          };
+        case 'undislike':
+          return {
+            ...state,
+            dislikedNotices: R.without(
+              [action.payload.id],
+              state.dislikedNotices
+            )
+          };
+      }
+      break;
+    default:
+      return state;
+  }
+}
+
+export default prefs;
diff --git a/src/app/background/reducers/resources.js b/src/app/background/reducers/resources.js
deleted file mode 100644
index 91dd0a324..000000000
--- a/src/app/background/reducers/resources.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Map as ImmutableMap, Set as ImmutableSet } from 'immutable';
-import fromJS from '../../utils/customFromJS';
-
-import {
-  RECEIVED_MATCHING_CONTEXTS,
-  UPDATE_DRAFT_RECOMMENDATIONS,
-  UNINSTALL
-} from '../../constants/ActionTypes';
-
-const initialResources = fromJS({
-  matchingContexts: new ImmutableSet(),
-  draftRecommendations: new ImmutableSet(),
-});
-
-export default function (state = initialResources, action) {
-  const { type, payload } = action;
-
-  switch (type) {
-    case RECEIVED_MATCHING_CONTEXTS:
-      const { matchingContexts } = payload;
-      return state.set('matchingContexts', matchingContexts);
-
-    case UPDATE_DRAFT_RECOMMENDATIONS: {
-      const { draftRecommendations } = payload;
-
-      return state.set('draftRecommendations', draftRecommendations);
-    }
-
-    case UNINSTALL: {
-      console.warn('Extension uninstallation is disabled when environment is development.');
-      if (process.env.NODE_ENV !== 'development') {
-        // Delay uninstallation to make sure tracking is done
-        setTimeout(() => chrome.management.uninstallSelf(), 1000);
-      }
-      return state;
-    }
-
-    default:
-      return state;
-  }
-}
-
diff --git a/src/app/background/reducers/resources.ts b/src/app/background/reducers/resources.ts
new file mode 100644
index 000000000..c5674c98f
--- /dev/null
+++ b/src/app/background/reducers/resources.ts
@@ -0,0 +1,49 @@
+import { MatchingContext } from 'app/lmem/matchingContext';
+import { AppAction } from 'app/actions';
+
+export interface ResourcesState {
+  matchingContexts: MatchingContext[];
+  draftRecommendations: MatchingContext[];
+}
+
+const initialResources: ResourcesState = {
+  matchingContexts: [],
+  draftRecommendations: []
+};
+
+export default function(
+  state: ResourcesState = initialResources,
+  action: AppAction
+) {
+  // @ts-ignore
+  // @ts-ignore
+  // @ts-ignore
+  switch (action.type) {
+    case 'api/UPDATE_MATCHING_CONTEXTS':
+      return { ...state, matchingContexts: action.payload.matchingContexts };
+
+    // @ts-ignore
+    case 'UPDATE_DRAFT_RECOMMENDATIONS': {
+      return {
+        ...state,
+        // @ts-ignore
+        draftRecommendations: action.payload.draftRecommendations
+      };
+    }
+
+    // @ts-ignore
+    case 'UNINSTALL': {
+      console.warn(
+        'Extension uninstallation is disabled when environment is development.'
+      );
+      if (process.env.NODE_ENV !== 'development') {
+        // Delay uninstallation to make sure tracking is done
+        setTimeout(() => chrome.management.uninstallSelf(), 1000);
+      }
+      return state;
+    }
+
+    default:
+      return state;
+  }
+}
diff --git a/src/app/background/reducers/tabs.js b/src/app/background/reducers/tabs.js
deleted file mode 100644
index 2928ba6ee..000000000
--- a/src/app/background/reducers/tabs.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Map as ImmutableMap } from 'immutable';
-import {
-  TAB_CREATED,
-  TAB_UPDATED,
-  TAB_REMOVED
-} from '../../constants/browser/tabs';
-
-export const initialState = new ImmutableMap();
-
-export default function (state = initialState, action) {
-  const { type, payload, meta } = action;
-
-  switch (type) {
-    case TAB_CREATED:
-      return state.set(payload, meta);
-
-    case TAB_UPDATED:
-      return state.set(payload, meta);
-
-    case TAB_REMOVED:
-      return state.remove(payload);
-
-    default:
-      return state;
-  }
-}
diff --git a/src/app/background/reducers/tabs.ts b/src/app/background/reducers/tabs.ts
new file mode 100644
index 000000000..7533b0320
--- /dev/null
+++ b/src/app/background/reducers/tabs.ts
@@ -0,0 +1,29 @@
+import {
+  TAB_CREATED,
+  TAB_UPDATED,
+  TAB_REMOVED
+} from '../../constants/browser/tabs';
+import { AppAction } from 'app/actions';
+import * as R from 'ramda';
+
+export interface TabsState {
+  [tab: string]: string;
+}
+
+export const initialState: TabsState = {};
+
+export default function(state = initialState, action: AppAction) {
+  switch (action.type) {
+    case TAB_CREATED:
+      return { ...state, [action.payload.tab]: action.payload.url };
+
+    case TAB_UPDATED:
+      return { ...state, [action.payload.tab]: action.payload.url };
+
+    case TAB_REMOVED:
+      return R.dissoc<TabsState>(action.payload.tab.toString(), state);
+
+    default:
+      return state;
+  }
+}
diff --git a/src/app/background/sagas/matchingContexts.js b/src/app/background/sagas/matchingContexts.js
index 1886ccc17..045be4ac0 100644
--- a/src/app/background/sagas/matchingContexts.js
+++ b/src/app/background/sagas/matchingContexts.js
@@ -1,25 +1,20 @@
-import {
-  put, takeLatest, select, call
-} from 'redux-saga/effects';
-import { getSelectedCriteria, getExcludedEditors } from '../selectors/prefs';
+import { put, takeLatest, call } from "redux-saga/effects";
 import {
   REFRESH_MATCHING_CONTEXTS,
   EXCLUDE_EDITOR,
   INCLUDE_EDITOR,
   SELECT_CRITERION,
   UNSELECT_CRITERION
-} from '../../constants/ActionTypes';
+} from "../../constants/ActionTypes";
 
 import {
   fetchMatchingContexts,
   receivedMatchingContexts,
-  refreshMatchingContexts,
-} from '../actions/kraftBackend';
+  refreshMatchingContexts
+} from "app/actions/kraftBackend";
 
 export function* refreshMatchingContextsSaga() {
-  const selectedCriteria = yield select(getSelectedCriteria);
-  const excludedEditors = yield select(getExcludedEditors);
-  const matchingContexts = yield call(fetchMatchingContexts, selectedCriteria, excludedEditors);
+  const matchingContexts = yield call(fetchMatchingContexts);
 
   yield put(receivedMatchingContexts(matchingContexts));
 }
@@ -31,12 +26,7 @@ export function* scheduleRefreshAfterwardSaga() {
 export default function* tabRootSaga() {
   yield takeLatest(REFRESH_MATCHING_CONTEXTS, refreshMatchingContextsSaga);
   yield takeLatest(
-    [
-      EXCLUDE_EDITOR,
-      INCLUDE_EDITOR,
-      SELECT_CRITERION,
-      UNSELECT_CRITERION
-    ],
+    [EXCLUDE_EDITOR, INCLUDE_EDITOR, SELECT_CRITERION, UNSELECT_CRITERION],
     scheduleRefreshAfterwardSaga
   );
 }
diff --git a/src/app/background/sagas/tab.js b/src/app/background/sagas/tab.js
deleted file mode 100644
index 482546110..000000000
--- a/src/app/background/sagas/tab.js
+++ /dev/null
@@ -1,104 +0,0 @@
-import { compose } from 'redux';
-import {
-  put, takeLatest, select, call, fork, all, take
-} from 'redux-saga/effects';
-import { findTriggeredContexts } from '../selectors';
-import { getInitialContent, getNoticesToDisplay, getIgnoredNotices } from '../selectors/prefs';
-import { TAB_CREATED, TAB_UPDATED } from '../../constants/browser/tabs';
-import { CONTEXT_TRIGGERED, MATCH_CONTEXT } from '../../constants/ActionTypes';
-import {
-  init, contextTriggered, matchContext, matchContextFailure, noticeIgnored, noticeDisplayed, contextTriggerFailure
-} from '../actions/tabs';
-import { noticesFound } from '../../content/actions/recommendations';
-import fetchMatchingRecommendations from '../../lmem/getMatchingRecommendations';
-import {
-  fetchContentScript, executeTabScript, sendToTab, createBrowserActionChannel
-} from '../services';
-import watchSingleMessageSaga from '../../utils/watchSingleMessageSaga';
-
-export const tabSaga = executeContentScript => function* ({ payload: tab, meta: { url } }) {
-  yield call(executeContentScript, tab, url);
-  yield put(matchContext(url, tab));
-};
-
-export function* matchContextSaga({ payload: trigger, meta: { tab } }) {
-  try {
-    const triggeredContexts = yield select(state => findTriggeredContexts(state)(trigger));
-
-    if (triggeredContexts.length >= 1) {
-      yield put(contextTriggered(triggeredContexts, { trigger, tab }));
-    } else {
-      throw new Error('No contexts triggered');
-    }
-  } catch (e) {
-    yield put(matchContextFailure(e, { trigger, tab }));
-  }
-}
-
-const uniq = urls => [...new Set(urls)];
-const map = fn => array => array.map(fn);
-
-export const contextTriggeredSaga = function* ({
-  payload: { triggeredContexts },
-  meta: { tab, url: trigger }
-}) {
-  try {
-    const initialContent = yield select(getInitialContent);
-    yield put(init(initialContent, tab));
-
-    const toFetch = compose(
-      uniq,
-      map(tc => tc.recommendation_url)
-    )(triggeredContexts);
-
-    const notices = yield call(fetchMatchingRecommendations, toFetch);
-
-    const noticesToShow = yield select(getNoticesToDisplay(notices));
-    yield all(noticesToShow.map(notice => put(noticeDisplayed(notice, trigger))));
-
-    const ignoredNotices = yield select(getIgnoredNotices(notices));
-    yield all(ignoredNotices.map(notice => put(noticeIgnored(notice, trigger))));
-
-    if (noticesToShow.length > 0) {
-      yield put(noticesFound(noticesToShow, tab));
-    } else {
-      // Will throw here when we will be able to not trigger context on dismissed/disliked notices
-      // throw new Error('Context was triggered but they were no recommendations left to display.');
-    }
-  } catch (e) {
-    yield put(contextTriggerFailure(e, { tab, trigger }));
-  }
-};
-
-export function* publishToTabSaga(action) {
-  const { meta: { tab } } = action;
-  const response = yield call(sendToTab, tab, action);
-
-  console.log(`Tab "${tab}" respond`, response);
-}
-
-export function* watchBrowserActionSaga() {
-  const channel = yield call(createBrowserActionChannel);
-
-  while (true) {
-    try {
-      const action = yield take(channel);
-      console.log(action);
-      yield put(action);
-    } catch (e) {
-      console.error(e);
-    }
-  }
-}
-
-export default function* tabRootSaga() {
-  yield fork(watchSingleMessageSaga);
-  yield fork(watchBrowserActionSaga);
-  const contentCode = yield call(fetchContentScript, '/js/content.bundle.js');
-  const executeTabContentScript = yield call(executeTabScript, contentCode);
-
-  yield takeLatest([TAB_CREATED, TAB_UPDATED], tabSaga(executeTabContentScript));
-  yield takeLatest(MATCH_CONTEXT, matchContextSaga);
-  yield takeLatest(CONTEXT_TRIGGERED, contextTriggeredSaga);
-  yield takeLatest(({ meta }) => meta && meta.tab, publishToTabSaga);
-}
diff --git a/src/app/background/sagas/tab.ts b/src/app/background/sagas/tab.ts
new file mode 100644
index 000000000..0278ccbbe
--- /dev/null
+++ b/src/app/background/sagas/tab.ts
@@ -0,0 +1,151 @@
+import {
+  put,
+  takeLatest,
+  select,
+  call,
+  fork,
+  all,
+  take
+} from 'redux-saga/effects';
+import { findTriggeredContexts } from '../selectors';
+import {
+  getInitialContent,
+  getNoticesToDisplay,
+  getIgnoredNotices
+} from '../selectors/prefs';
+import { TAB_CREATED, TAB_UPDATED } from '../../constants/browser/tabs';
+import { CONTEXT_TRIGGERED, MATCH_CONTEXT } from '../../constants/ActionTypes';
+import {
+  init,
+  contextTriggered,
+  matchContext,
+  matchContextFailure,
+  noticeIgnored,
+  noticeDisplayed,
+  contextTriggerFailure,
+  MatchContextAction,
+  ContextTriggeredAction
+} from 'app/actions/tabs';
+import { noticesFound } from 'app/actions/recommendations';
+import watchSingleMessageSaga from '../../utils/watchSingleMessageSaga';
+import { TabAction } from '../../actions/BaseAction';
+import fetchContentScript from '../services/fetchContentScript';
+import executeTabScript, {
+  ExecuteContentScript
+} from '../services/executeTabScript';
+import createBrowserActionChannel from '../services/createBrowserActionChannel';
+import { TabCreatedAction, TabUpdatedAction } from '../../actions/browser/tabs';
+import * as R from 'ramda';
+import { MatchingContext } from '../../lmem/matchingContext';
+import { EnhancedNotice } from '../../lmem/notice';
+import sendToTab from '../services/sendToTab';
+import { AppAction } from '../../actions';
+import { fetchMatchingNotices } from '../../lmem/fetchMatchingNotices';
+
+export const tabSaga = (executeContentScript: ExecuteContentScript) =>
+  function*({ payload: { tab, url } }: TabCreatedAction | TabUpdatedAction) {
+    yield call(executeContentScript, tab, url);
+    yield put(matchContext(url, tab));
+  };
+
+export function* matchContextSaga({
+  payload: { url },
+  meta: { tab }
+}: MatchContextAction) {
+  try {
+    const triggeredContexts = yield select(state =>
+      findTriggeredContexts(state)(url)
+    );
+
+    if (triggeredContexts.length >= 1) {
+      yield put(contextTriggered(tab, url, triggeredContexts));
+    } else {
+      throw new Error('No contexts triggered');
+    }
+  } catch (e) {
+    yield put(matchContextFailure(e, url, tab));
+  }
+}
+
+export const contextTriggeredSaga = function*({
+  payload: { tab, url: trigger, triggeredContexts }
+}: ContextTriggeredAction) {
+  try {
+    const initialContent = yield select(getInitialContent);
+    yield put(init(tab, initialContent.installationDetails));
+
+    const toFetch = R.compose<MatchingContext[], string[], string[]>(
+      R.uniq,
+      R.map(tc => tc.recommendation_url)
+    )(triggeredContexts);
+
+    const notices = yield call(fetchMatchingNotices, toFetch);
+
+    const noticesToShow: EnhancedNotice[] = yield select(
+      getNoticesToDisplay(notices)
+    );
+    yield all(
+      noticesToShow.map(notice => put(noticeDisplayed(notice, trigger)))
+    );
+
+    const ignoredNotices: EnhancedNotice[] = yield select(
+      getIgnoredNotices(notices)
+    );
+    yield all(
+      ignoredNotices.map(notice => put(noticeIgnored(notice, trigger)))
+    );
+
+    if (noticesToShow.length > 0) {
+      yield put(noticesFound(noticesToShow, tab));
+    } else {
+      // Will throw here when we will be able to not trigger context on dismissed/disliked notices
+      // throw new Error('Context was triggered but they were no recommendations left to display.');
+    }
+  } catch (e) {
+    yield put(contextTriggerFailure(tab, trigger, e));
+  }
+};
+
+export function* publishToTabSaga(action: TabAction) {
+  const {
+    meta: { tab }
+  } = action;
+  const response = yield call(sendToTab, tab, action);
+
+  console.log(`Tab "${tab}" respond`, response);
+}
+
+export function* watchBrowserActionSaga() {
+  const channel = yield call(createBrowserActionChannel);
+
+  while (true) {
+    try {
+      const action = yield take(channel);
+      console.log(action);
+      yield put(action);
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+
+export default function* tabRootSaga() {
+  yield fork(watchSingleMessageSaga);
+  yield fork(watchBrowserActionSaga);
+  const contentCode: string = yield call(
+    fetchContentScript,
+    '/js/content.bundle.js'
+  );
+  const executeTabContentScript = yield call(executeTabScript, contentCode);
+
+  yield takeLatest(
+    [TAB_CREATED, TAB_UPDATED],
+    tabSaga(executeTabContentScript)
+  );
+  yield takeLatest(MATCH_CONTEXT, matchContextSaga);
+  yield takeLatest(CONTEXT_TRIGGERED, contextTriggeredSaga);
+  yield takeLatest(
+    (action: AppAction) => Boolean(action.meta && action.meta.sendToTab),
+    publishToTabSaga
+  );
+}
diff --git a/src/app/background/selectors/index.js b/src/app/background/selectors/index.js
deleted file mode 100644
index 5c46a6a84..000000000
--- a/src/app/background/selectors/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import findMatchingOffersAccordingToPreferences from '../../lmem/findMatchingOffersAccordingToPreferences';
-import { getWebsites } from './prefs';
-import { getDrafRecommendations, getMatchingContexts } from './resources';
-
-// eslint-disable-next-line import/prefer-default-export
-export const findTriggeredContexts = state => url => findMatchingOffersAccordingToPreferences(
-  url,
-  getMatchingContexts(state),
-  getDrafRecommendations(state),
-  getWebsites(state),
-);
diff --git a/src/app/background/selectors/index.ts b/src/app/background/selectors/index.ts
new file mode 100644
index 000000000..9f2018d68
--- /dev/null
+++ b/src/app/background/selectors/index.ts
@@ -0,0 +1,12 @@
+import { findMatchingOffersAccordingToPreferences } from '../../lmem/matchingContext';
+import { getDrafRecommendations, getMatchingContexts } from './resources';
+import { BackgroundState } from '../reducers';
+
+export const findTriggeredContexts = (state: BackgroundState) => (
+  url: string
+) =>
+  findMatchingOffersAccordingToPreferences(
+    url,
+    getMatchingContexts(state),
+    getDrafRecommendations(state)
+  );
diff --git a/src/app/background/selectors/prefs.js b/src/app/background/selectors/prefs.js
deleted file mode 100644
index 0ec43cce2..000000000
--- a/src/app/background/selectors/prefs.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import { recommendationIsValid, recommendationFilter } from '../../lmem';
-import Notice from '../../lmem/Notice';
-
-export const getPrefs = state => state.get('prefs');
-
-export const getWebsites = state => getPrefs(state).get('websites');
-export const getOnInstalledDetails = state => getPrefs(state).get('onInstalledDetails');
-export const getCriteria = state => getPrefs(state).get('criteria');
-export const getEditors = state => getPrefs(state).get('editors');
-export const getDismissed = state => getPrefs(state).get('dismissedNotices');
-export const getLiked = state => getPrefs(state).get('likedNotices');
-export const getDisliked = state => getPrefs(state).get('dislikedNotices');
-
-export const getCriterionBySlug = slug => state => getCriteria(state).get(slug);
-export const getSelectedCriteria = state => Array.from(getCriteria(state).keys())
-  .filter(slug => getCriterionBySlug(slug)(state).get('isSelected'));
-
-export const getEditorById = id => state => getEditors(state).get(id);
-export const getExcludedEditors = state => Array.from(getEditors(state).keys())
-  .filter(id => getEditorById(id)(state).get('isExcluded'));
-
-export const getInitialContent = state => ({
-  onInstalledDetails: getOnInstalledDetails(state),
-  criteria: getCriteria(state),
-  editors: getEditors(state)
-});
-
-export const getNoticeEnhancer = (state) => {
-  const dismissed = getDismissed(state);
-  const liked = getLiked(state);
-  const disliked = getDisliked(state);
-
-  return notice => ({
-    ...notice,
-    dismissed: dismissed.has(notice.id),
-    liked: liked.has(notice.id),
-    disliked: disliked.has(notice.id),
-    valid: recommendationIsValid(notice),
-  });
-};
-
-export const getNoticesToDisplay = notices => state => notices
-  .map(getNoticeEnhancer(state))
-  .filter(recommendationFilter);
-
-
-export const getDismissedNotices = notices => state => notices
-  .map(getNoticeEnhancer(state))
-  .filter(notice => notice.dismissed);
-
-export const getIgnoredNotices = notices => state => notices
-  .map(getNoticeEnhancer(state))
-  .filter(Notice.isIgnored);
diff --git a/src/app/background/selectors/prefs.ts b/src/app/background/selectors/prefs.ts
new file mode 100644
index 000000000..3f5b1d347
--- /dev/null
+++ b/src/app/background/selectors/prefs.ts
@@ -0,0 +1,51 @@
+import {
+  Notice,
+  EnhancedNotice,
+  isIgnored,
+  warnIfNoticeInvalid,
+  shouldNoticeBeShown
+} from '../../lmem/notice';
+import { BackgroundState } from '../reducers';
+
+export const getPrefs = (state: BackgroundState) => state.prefs;
+
+export const getInstallationDetails = (state: BackgroundState) =>
+  getPrefs(state).installationDetails;
+export const getDismissed = (state: BackgroundState) =>
+  getPrefs(state).dismissedNotices;
+export const getLiked = (state: BackgroundState) =>
+  getPrefs(state).likedNotices;
+export const getDisliked = (state: BackgroundState) =>
+  getPrefs(state).dislikedNotices;
+
+export const getInitialContent = (state: BackgroundState) => ({
+  installationDetails: getInstallationDetails(state)
+});
+
+export const getNoticeEnhancer = (state: BackgroundState) => {
+  const dismissed = getDismissed(state);
+  const liked = getLiked(state);
+  const disliked = getDisliked(state);
+
+  return (notice: Notice) => ({
+    ...notice,
+    dismissed: dismissed.includes(notice.id),
+    liked: liked.includes(notice.id),
+    disliked: disliked.includes(notice.id),
+    valid: warnIfNoticeInvalid(notice)
+  });
+};
+
+export const getNoticesToDisplay = (notices: EnhancedNotice[]) => (
+  state: BackgroundState
+): EnhancedNotice[] =>
+  notices.map(getNoticeEnhancer(state)).filter(shouldNoticeBeShown);
+
+export const getDismissedNotices = (notices: EnhancedNotice[]) => (
+  state: BackgroundState
+): EnhancedNotice[] =>
+  notices.map(getNoticeEnhancer(state)).filter(notice => notice.dismissed);
+
+export const getIgnoredNotices = (notices: EnhancedNotice[]) => (
+  state: BackgroundState
+): EnhancedNotice[] => notices.map(getNoticeEnhancer(state)).filter(isIgnored);
diff --git a/src/app/background/selectors/resources.js b/src/app/background/selectors/resources.js
deleted file mode 100644
index 324f5a658..000000000
--- a/src/app/background/selectors/resources.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const getMatchingContexts = state => state.get('resources').get('matchingContexts').toJS();
-
-export const getDrafRecommendations = state => state.get('resources').get('draftRecommendations').toJS();
diff --git a/src/app/background/selectors/resources.ts b/src/app/background/selectors/resources.ts
new file mode 100644
index 000000000..48428eb2b
--- /dev/null
+++ b/src/app/background/selectors/resources.ts
@@ -0,0 +1,7 @@
+import { BackgroundState } from '../reducers';
+
+export const getMatchingContexts = (state: BackgroundState) =>
+  state.resources.matchingContexts;
+
+export const getDrafRecommendations = (state: BackgroundState) =>
+  state.resources.draftRecommendations;
diff --git a/src/app/background/services/createBrowserActionChannel.js b/src/app/background/services/createBrowserActionChannel.js
deleted file mode 100644
index 558725089..000000000
--- a/src/app/background/services/createBrowserActionChannel.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { eventChannel } from 'redux-saga';
-import { browserActionClicked } from '../actions/browser/action';
-
-export default () => {
-  return eventChannel((emit) => {
-    const handleClick = (tab) => {
-      console.log('CACCA');
-      emit(browserActionClicked(tab, tab.id));
-    }
-
-    chrome.browserAction.onClicked.addListener(handleClick);
-
-    // unsubscribe
-    return () => {
-      chrome.browserAction.onClicked.removeListener(handleClick);
-    };
-  });
-};
\ No newline at end of file
diff --git a/src/app/background/services/createBrowserActionChannel.ts b/src/app/background/services/createBrowserActionChannel.ts
new file mode 100644
index 000000000..10a6d4cbb
--- /dev/null
+++ b/src/app/background/services/createBrowserActionChannel.ts
@@ -0,0 +1,21 @@
+import { eventChannel } from 'redux-saga';
+import { browserActionClicked } from 'app/actions/browser/browserAction';
+
+export const createBrowserActionChannel = () => {
+  return eventChannel(emit => {
+    const handleClick = (tab: chrome.tabs.Tab) => {
+      if (tab.id) {
+        emit(browserActionClicked(tab.id));
+      }
+    };
+
+    chrome.browserAction.onClicked.addListener(handleClick);
+
+    // unsubscribe
+    return () => {
+      chrome.browserAction.onClicked.removeListener(handleClick);
+    };
+  });
+};
+
+export default createBrowserActionChannel;
diff --git a/src/app/background/services/executeTabScript.js b/src/app/background/services/executeTabScript.js
deleted file mode 100644
index 62d86bd0a..000000000
--- a/src/app/background/services/executeTabScript.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export default code => (tab, url) => new Promise((resolve) => {
-  if (url.startsWith('http')) {
-    chrome.tabs.executeScript(tab, {
-      code,
-      runAt: 'document_end'
-    }, (result) => {
-      resolve(result);
-    });
-  }
-});
diff --git a/src/app/background/services/executeTabScript.ts b/src/app/background/services/executeTabScript.ts
new file mode 100644
index 000000000..94bce3336
--- /dev/null
+++ b/src/app/background/services/executeTabScript.ts
@@ -0,0 +1,22 @@
+export type ExecuteContentScript = (tab: number, url: string) => Promise<any[]>;
+
+export const executeTabScript = (code: string): ExecuteContentScript => (
+  tab: number,
+  url: string
+): Promise<any[]> =>
+  new Promise(resolve => {
+    if (url.startsWith('http')) {
+      chrome.tabs.executeScript(
+        tab,
+        {
+          code,
+          runAt: 'document_end'
+        },
+        result => {
+          resolve(result);
+        }
+      );
+    }
+  });
+
+export default executeTabScript;
diff --git a/src/app/background/services/fetchContentScript.js b/src/app/background/services/fetchContentScript.js
deleted file mode 100644
index 856fac88b..000000000
--- a/src/app/background/services/fetchContentScript.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export default (input, init) => fetch(`.${input}`, init)
-  .then(resp => resp.text());
diff --git a/src/app/background/services/fetchContentScript.ts b/src/app/background/services/fetchContentScript.ts
new file mode 100644
index 000000000..63fdf2c77
--- /dev/null
+++ b/src/app/background/services/fetchContentScript.ts
@@ -0,0 +1,6 @@
+const getText = (response: Response): Promise<string> => response.text();
+
+export const fetchContentScript = (input: string): Promise<string> =>
+  fetch(`.${input}`).then(getText);
+
+export default fetchContentScript;
diff --git a/src/app/background/services/getCurrentTabs.js b/src/app/background/services/getCurrentTabs.js
deleted file mode 100644
index 66825ff85..000000000
--- a/src/app/background/services/getCurrentTabs.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export default () => new Promise(resolve => chrome.tabs.query(
-  {
-    active: true,
-    currentWindow: true,
-  },
-  tabs => resolve(tabs),
-));
\ No newline at end of file
diff --git a/src/app/background/services/index.js b/src/app/background/services/index.js
deleted file mode 100644
index ef61c07d9..000000000
--- a/src/app/background/services/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as createBrowserActionChannel } from './createBrowserActionChannel';
-export { default as executeTabScript } from './executeTabScript';
-export { default as fetchContentScript } from './fetchContentScript';
-export { default as sendToTab } from './sendToTab';
diff --git a/src/app/background/services/sendToTab.js b/src/app/background/services/sendToTab.js
deleted file mode 100644
index 4fbe15d86..000000000
--- a/src/app/background/services/sendToTab.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default (tab, action, options = {}) => new Promise((resolve) => {
-  chrome.tabs.sendMessage(tab, action, options, response => resolve(response));
-});
\ No newline at end of file
diff --git a/src/app/background/services/sendToTab.ts b/src/app/background/services/sendToTab.ts
new file mode 100644
index 000000000..8f56abf04
--- /dev/null
+++ b/src/app/background/services/sendToTab.ts
@@ -0,0 +1,14 @@
+import { Action } from 'redux';
+
+export const sendToTab = (
+  tab: number,
+  action: Action,
+  options = {}
+): Promise<Action> =>
+  new Promise(resolve => {
+    chrome.tabs.sendMessage(tab, action, options, response =>
+      resolve(response)
+    );
+  });
+
+export default sendToTab;
diff --git a/src/app/background/store/configureStore.js b/src/app/background/store/configureStore.js
deleted file mode 100755
index 1424ec213..000000000
--- a/src/app/background/store/configureStore.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/* eslint global-require: "off" */
-import { createStore, applyMiddleware } from 'redux';
-import { composeWithDevTools } from 'remote-redux-devtools';
-import rootReducer from '../reducers';
-import middlewares, { sagaMiddleware } from '../middlewares';
-import rootSaga from '../sagas';
-import fromJS from '../../utils/customFromJS';
-import listenTabs from './listenTabs';
-
-import makeInitialState from './makeInitialState';
-
-import migrate from './migrations';
-
-export default function configureStore(callback, isBg) {
-  let getState;
-  // @todo I don't get this condition
-  if (isBg === undefined) {
-    /* If you don't want to persist states, use './getDefaultState' */
-    getState = require('./getStoredState').default;
-  } else {
-    getState = isBg ? require('./getStateToBg').default : require('./getStateFromBg').default;
-  }
-
-  getState((loadedState) => {
-    const composeEnhancers = composeWithDevTools({
-      // options
-    });
-
-    const enhancer = process.env.NODE_ENV !== 'production'
-      ? composeEnhancers(applyMiddleware(...middlewares.concat([
-        require('redux-immutable-state-invariant').default(), // eslint-disable-line
-        require('redux-logger').createLogger({ // eslint-disable-line
-          level: 'info',
-          collapsed: true,
-          stateTransformer: state => state.toJS()
-        }),
-      ])))
-      : applyMiddleware(...middlewares);
-
-
-    const initialPrefState = makeInitialState().delete('resources'); // Map
-    const initialResourcesState = makeInitialState().delete('prefs'); // Map
-
-    // migrate loadedState to the current state structure
-    const migratedState = migrate(fromJS(loadedState), initialPrefState);
-
-    const state = initialResourcesState.merge(migratedState);
-    const store = createStore(rootReducer, state, enhancer);
-
-    listenTabs(chrome.tabs, store);
-
-    sagaMiddleware.run(rootSaga);
-
-    // FIXME
-    // if (process.env.NODE_ENV !== 'production') {
-    //   if (module.hot) {
-    //     module.hot.accept('../reducers', () =>
-    //       store.replaceReducer(require('../reducers'))
-    //     );
-    //   }
-    // }
-
-    return store;
-  }, callback);
-}
diff --git a/src/app/background/store/getDefaultState.js b/src/app/background/store/getDefaultState.js
deleted file mode 100644
index 5f76d7e2f..000000000
--- a/src/app/background/store/getDefaultState.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default function (configure, callback) {
-  const initialState = {}; // Add here you initalStore value
-  const store = configure(initialState);
-  callback(store);
-}
diff --git a/src/app/background/store/getStateFromBg.js b/src/app/background/store/getStateFromBg.js
deleted file mode 100644
index e2ae35954..000000000
--- a/src/app/background/store/getStateFromBg.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { connect } from 'crossmessaging';
-
-export default function (configure, callback) {
-  let store;
-  const connection = connect(true);
-
-  connection.postMessage({ name: 'init' });
-
-  connection.onMessage.addListener((message) => {
-    if (message.name === 'init') {
-      store = configure(message.state);
-      callback(store);
-    }
-  });
-}
diff --git a/src/app/background/store/getStateToBg.js b/src/app/background/store/getStateToBg.js
deleted file mode 100644
index 6481034cd..000000000
--- a/src/app/background/store/getStateToBg.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { onConnect } from 'crossmessaging';
-import getState from './getStoredState'; /* If you don't want to persist states, use './getDefaultState' */// eslint-disable-line max-len
-
-export default function (configure, callback) {
-  getState(configure, (store) => {
-    onConnect(
-      () => ({ name: 'init', state: { counter: store.getState().counter } }),
-      {}
-    );
-    callback(store);
-  });
-}
diff --git a/src/app/background/store/getStoredState.js b/src/app/background/store/getStoredState.js
deleted file mode 100644
index 4b099ba3d..000000000
--- a/src/app/background/store/getStoredState.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { getStoredState, persistStore } from 'redux-persist-immutable';
-import storage from 'chrome-storage-local';
-import reduxPersistTransform from './reduxPersistTransform';
-
-export default function (configure, callback) {
-  const persistConfig = Object.assign(
-    {
-      transforms: [reduxPersistTransform],
-      whitelist: ['prefs'],
-      debounce: 0
-    },
-    chrome !== 'undefined' && chrome.storage && chrome.storage.local
-      ? { storage }
-      : {}
-  );
-  getStoredState(persistConfig, (err, initialState) => {
-    const store = configure(initialState);
-    persistStore(store, persistConfig, () => { callback(store); });
-  });
-}
diff --git a/src/app/background/store/index.ts b/src/app/background/store/index.ts
new file mode 100755
index 000000000..2c2df5b4a
--- /dev/null
+++ b/src/app/background/store/index.ts
@@ -0,0 +1,62 @@
+import { createStore, applyMiddleware } from 'redux';
+import { persistStore, persistReducer } from 'redux-persist';
+import storage from 'redux-persist/lib/storage'; // defaults to localStorage
+import autoMergeLevel2 from 'redux-persist/es/stateReconciler/autoMergeLevel2';
+import { composeWithDevTools } from 'remote-redux-devtools';
+import rootReducer, { BackgroundState } from '../reducers';
+import middlewares, { sagaMiddleware } from '../middlewares';
+import rootSaga from '../sagas';
+import listenTabs from './listenTabs';
+import migrate from './migrations';
+import { AppAction } from '../../actions';
+
+const persistedReducers = persistReducer(
+  {
+    key: 'root',
+    whitelist: ['prefs'],
+    storage,
+    version: 3,
+    migrate,
+    stateReconciler: autoMergeLevel2
+  },
+  rootReducer
+);
+
+const composeEnhancers = composeWithDevTools({
+  /* redux-remote-devtools options */
+});
+
+const enhancer =
+  process.env.NODE_ENV !== 'production'
+    ? composeEnhancers(
+        applyMiddleware(
+          ...middlewares.concat([
+            require('redux-immutable-state-invariant').default(),
+            require('redux-logger').createLogger({
+              level: 'info',
+              collapsed: true
+            })
+          ])
+        )
+      )
+    : applyMiddleware(...middlewares);
+
+export const store = createStore<BackgroundState, AppAction, null, null>(
+  // @ts-ignore
+  persistedReducers,
+  enhancer
+);
+persistStore(store);
+
+listenTabs(store);
+
+sagaMiddleware.run(rootSaga);
+
+// FIXME
+// if (process.env.NODE_ENV !== 'production') {
+//   if (module.hot) {
+//     module.hot.accept('../reducers', () =>
+//       store.replaceReducer(require('../reducers'))
+//     );
+//   }
+//
diff --git a/src/app/background/store/listenTabs.js b/src/app/background/store/listenTabs.js
deleted file mode 100644
index 023789f15..000000000
--- a/src/app/background/store/listenTabs.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { tabCreated, tabRemoved, tabUpdated } from '../actions/browser/tabs';
-
-export const onTabCreated = store => ({ id, url }) => {
-  if (!url) return;
-
-  store.dispatch(tabCreated(id, { url }));
-};
-
-export const onTabUpdated = store => (id, { status, url: newUrl }, { url }) => {
-  if (status === 'loading') {
-    const matchingUrl = newUrl || url; // handle reloading
-
-    store.dispatch(tabUpdated(id, { url: matchingUrl }));
-  }
-};
-
-export const onTabRemoved = store => (id) => {
-  store.dispatch(tabRemoved(id));
-};
-
-export default (tabs, store) => {
-  tabs.onCreated.addListener(onTabCreated(store));
-  tabs.onUpdated.addListener(onTabUpdated(store));
-  tabs.onRemoved.addListener(onTabRemoved(store));
-};
diff --git a/src/app/background/store/listenTabs.ts b/src/app/background/store/listenTabs.ts
new file mode 100644
index 000000000..424f04100
--- /dev/null
+++ b/src/app/background/store/listenTabs.ts
@@ -0,0 +1,34 @@
+import { tabCreated, tabRemoved, tabUpdated } from 'app/actions/browser/tabs';
+import { Store } from 'redux';
+
+export const onTabCreated = (store: Store) => ({
+  id,
+  url
+}: chrome.tabs.Tab) => {
+  if (!url || !id) return;
+
+  store.dispatch(tabCreated(id, url));
+};
+
+export const onTabUpdated = (store: Store) => (
+  tab: number,
+  changeInfo: chrome.tabs.TabChangeInfo,
+  tabInfo: chrome.tabs.Tab
+) => {
+  if (changeInfo.status === 'loading') {
+    const matchingUrl = changeInfo.url || tabInfo.url; // handle reloading
+    if (!matchingUrl) return;
+
+    store.dispatch(tabUpdated(tab, matchingUrl));
+  }
+};
+
+export const onTabRemoved = (store: Store) => (tab: number) => {
+  store.dispatch(tabRemoved(tab));
+};
+
+export default (store: Store) => {
+  chrome.tabs.onCreated.addListener(onTabCreated(store));
+  chrome.tabs.onUpdated.addListener(onTabUpdated(store));
+  chrome.tabs.onRemoved.addListener(onTabRemoved(store));
+};
diff --git a/src/app/background/store/makeInitialState.js b/src/app/background/store/makeInitialState.js
deleted file mode 100644
index 29df5826f..000000000
--- a/src/app/background/store/makeInitialState.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Map as ImmutableMap, Set as ImmutableSet } from 'immutable';
-import fromJS from '../../utils/customFromJS';
-
-/**
- * When the redux store starts empty on first use (no store in local/chrome storage)
- * this function creates the initial state
- * Among other things, this is also intended to document the state structure
- */
-export default function (){
-  return fromJS({
-    prefs: {
-      websites: new ImmutableMap(),
-      criteria: new ImmutableMap(),
-      editors: new ImmutableMap(),
-      dismissedNotices: new ImmutableSet(),
-      likedNotices: new ImmutableSet(),
-      dislikedNotices: new ImmutableSet(),
-      reportedNotices: new ImmutableSet(),
-      onInstalledDetails: new ImmutableMap()
-    },
-    resources: {
-      matchingContexts: new ImmutableSet(),
-      draftRecommendations: new ImmutableSet()
-    }
-  });
-}
diff --git a/src/app/background/store/migrations.js b/src/app/background/store/migrations.js
deleted file mode 100644
index efaf1b42d..000000000
--- a/src/app/background/store/migrations.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import { OrderedMap } from 'immutable';
-
-let migrations = new OrderedMap();
-
-// 26-01-2017
-migrations = migrations.set('2017-01-26', (previousState, defaultState) => {
-
-  let newState = previousState;
-
-  // prefs.websites <= websites
-  if (!previousState.hasIn(['prefs', 'websites'])) newState = newState.setIn(
-    ['prefs', 'websites'],
-    previousState.get('websites') || defaultState.getIn(['prefs', 'websites'])
-  );
-
-  // prefs.criteria <= criteria
-  if (!previousState.hasIn(['prefs', 'criteria'])) newState = newState.setIn(
-    ['prefs', 'criteria'],
-    previousState.get('criteria') || defaultState.getIn(['prefs', 'criteria'])
-  );
-
-  // prefs.editors <= editors
-  if (!previousState.hasIn(['prefs', 'editors'])) newState = newState.setIn(
-    ['prefs', 'editors'],
-    previousState.get('editors') || defaultState.getIn(['prefs', 'editors'])
-  );
-
-  // prefs.dismissedRecos <= dismissedRecos
-  if (!previousState.hasIn(['prefs', 'dismissedRecos'])) newState = newState.setIn(
-    ['prefs', 'dismissedRecos'],
-    previousState.get('dismissedRecos') || defaultState.getIn(['prefs', 'dismissedRecos'])
-  );
-
-  // prefs.approvedRecos <= approvedRecos
-  if (!previousState.hasIn(['prefs', 'approvedRecos'])) newState = newState.setIn(
-    ['prefs', 'approvedRecos'],
-    previousState.get('approvedRecos') || defaultState.getIn(['prefs', 'approvedRecos'])
-  );
-
-  // prefs.onInstalledDetails <= onInstalledDetails
-  if (!previousState.hasIn(['prefs', 'onInstalledDetails'])) newState = newState.setIn(
-    ['prefs', 'onInstalledDetails'],
-    previousState.get('onInstalledDetails') || defaultState.getIn(['prefs', 'onInstalledDetails'])
-  );
-
-  return newState;
-});
-
-
-// 26-01-2017
-migrations = migrations.set('2019-02-11', (previousState, defaultState) => {
-  let newState = previousState;
-
-  // prefs.dismissedNotices <= prefs.dismissedRecos
-  if (!previousState.hasIn(['prefs', 'dismissedNotices'])) newState = newState.setIn(
-    ['prefs', 'dismissedNotices'],
-    previousState.getIn(['prefs', 'dismissedRecos']) || defaultState.getIn(['prefs', 'dismissedNotices'])
-  );
-
-  // prefs.likedNotices <= prefs.approvedRecos
-  if (!previousState.hasIn(['prefs', 'likedNotices'])) newState = newState.setIn(
-    ['prefs', 'likedNotices'],
-    previousState.getIn(['prefs', 'approvedRecos']) || defaultState.getIn(['prefs', 'likedNotices'])
-  );
-
-  // prefs.likedNotices <= prefs.approvedRecos
-  if (!previousState.hasIn(['prefs', 'dislikedNotices'])) newState = newState.setIn(
-    ['prefs', 'dislikedNotices'],
-    defaultState.getIn(['prefs', 'dislikedNotices'])
-  );
-
-  return newState;
-});
-
-// ADD NEW MIGRATIONS HEREUNDER
-// ...
-
-export default (previousState, defaultState) => {
-  if (previousState === undefined) return defaultState;
-
-  return migrations.reduce((migratedState, migrate, date) => {
-    return migrate(migratedState, defaultState);
-  }, previousState);
-};
diff --git a/src/app/background/store/migrations.ts b/src/app/background/store/migrations.ts
new file mode 100644
index 000000000..5debf85c2
--- /dev/null
+++ b/src/app/background/store/migrations.ts
@@ -0,0 +1,156 @@
+import { createMigrate } from 'redux-persist';
+import { MigrationManifest, PersistedState } from 'redux-persist/es/types';
+import * as R from 'ramda';
+import { Criteria } from '../../lmem/criterion';
+import { Editor } from '../../lmem/editors';
+import { InstallationDetails } from '../../lmem/installation';
+import { State } from '../../content/store';
+
+interface StateV0V1orV2 extends PersistedState {
+  prefs?: {
+    websites: any;
+    criteria: Criteria;
+    editors: { [id: number]: Editor };
+    dismissedRecos: number[];
+    approvedRecos: number[];
+    onInstalledDetails: InstallationDetails;
+  };
+  websites?: any;
+  criteria?: Criteria;
+  editors?: { [id: number]: Editor };
+  dismissedRecos?: number[];
+  approvedRecos?: number[];
+  dismissedNotices?: number[];
+  likedNotices?: number[];
+  dislikedNotices?: number[];
+  onInstalledDetails?: InstallationDetails;
+}
+
+interface StateV1Prefs {
+  websites: any;
+  criteria: Criteria;
+  editors: { [id: number]: Editor };
+  dismissedRecos?: number[];
+  approvedRecos?: number[];
+  dismissedNotices?: number[];
+  likedNotices?: number[];
+  dislikedNotices?: number[];
+  onInstalledDetails: InstallationDetails;
+}
+interface StateV1orV2 extends PersistedState {
+  prefs: StateV1Prefs;
+}
+
+interface StateV2Prefs {
+  websites: any;
+  criteria: Criteria;
+  editors: { [id: number]: Editor };
+  dismissedNotices: number[];
+  likedNotices: number[];
+  dislikedNotices: number[];
+  onInstalledDetails: InstallationDetails;
+}
+interface StateV2 extends PersistedState {
+  prefs: StateV2Prefs;
+}
+
+const migrations: MigrationManifest = {
+  // 26-01-2017
+  1: (persistedState: PersistedState): StateV1orV2 => {
+    const previousState: StateV0V1orV2 = persistedState as StateV0V1orV2;
+
+    return R.compose(
+      R.compose(
+        R.assocPath(
+          ['prefs', 'websites'],
+          previousState && previousState.prefs
+            ? previousState.prefs.websites
+            : previousState.websites || []
+        ),
+        R.assocPath(
+          ['prefs', 'criteria'],
+          previousState && previousState.prefs
+            ? previousState.prefs.criteria
+            : previousState.criteria || []
+        ),
+        R.assocPath(
+          ['prefs', 'editors'],
+          previousState && previousState.prefs
+            ? previousState.prefs.editors
+            : previousState.editors || []
+        ),
+        R.assocPath(
+          ['prefs', 'dismissedRecos'],
+          previousState && previousState.prefs
+            ? previousState.prefs.dismissedRecos
+            : previousState.dismissedRecos || []
+        ),
+        R.assocPath(
+          ['prefs', 'approvedRecos'],
+          previousState && previousState.prefs
+            ? previousState.prefs.approvedRecos
+            : previousState.approvedRecos || []
+        ),
+        R.assocPath(
+          ['prefs', 'onInstalledDetails'],
+          previousState && previousState.prefs
+            ? previousState.prefs.onInstalledDetails
+            : previousState.onInstalledDetails || []
+        )
+      ),
+      R.compose(
+        R.dissoc('websites'),
+        R.dissoc('criteria'),
+        R.dissoc('editors'),
+        R.dissoc('dismissedRecos'),
+        R.dissoc('approvedRecos'),
+        R.dissoc('onInstalledDetails')
+      )
+    )(previousState) as StateV1orV2;
+  },
+  // V2 - March 2019 - 2019-02-11
+  2: (persistedState: PersistedState): StateV2 => {
+    const previousState = persistedState as StateV1orV2;
+
+    return R.compose(
+      R.assocPath(
+        ['prefs', 'dismissedNotices'],
+        previousState.prefs.dismissedRecos ||
+          previousState.prefs.dismissedNotices ||
+          []
+      ),
+      R.assocPath(
+        ['prefs', 'likedNotices'],
+        previousState.prefs.approvedRecos ||
+          previousState.prefs.likedNotices ||
+          []
+      ),
+      R.assocPath(
+        ['prefs', 'dismissedNotices'],
+        previousState.prefs.dismissedNotices || []
+      ),
+      R.dissocPath(['prefs', 'dismissedRecos']),
+      R.dissocPath(['prefs', 'approvedRecos'])
+    )(previousState) as StateV2;
+  },
+  // March 2019 - Typescript migration
+  3: (persistedState: PersistedState): State => {
+    const previousState = persistedState as StateV2;
+
+    return R.compose(
+      R.assocPath(
+        ['prefs', 'installationDetails'],
+        previousState.prefs.onInstalledDetails
+      ),
+      R.dissocPath(['prefs', 'websites'])
+    )(previousState) as State;
+  }
+
+  // ADD NEW MIGRATIONS HEREUNDER
+};
+
+export const migrate = createMigrate(migrations, {
+  debug: process.env.NODE_ENV !== 'production'
+});
+
+export default migrate;
diff --git a/src/app/background/store/reduxPersistTransform.js b/src/app/background/store/reduxPersistTransform.js
deleted file mode 100644
index 37705bde9..000000000
--- a/src/app/background/store/reduxPersistTransform.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { createTransform } from 'redux-persist-immutable';
-import { Map as ImmutableMap, Set as ImmutableSet } from 'immutable';
-
-export function serialize(stateObj){
-  return JSON.stringify(stateObj, (key, value) => {
-    if (Object.prototype.toString.call(value) === '[object Set]') {
-      return [...value];
-    }
-    return value;
-  });
-} 
-
-export function deserialize(string){
-  return JSON.parse(string, (key, value) => {
-    let output;
-
-    if (value instanceof Array) output = new ImmutableSet(value);
-    else if (value instanceof Object) output = new ImmutableMap(value);
-    else output = value;
-
-    return output;
-  });
-} 
-
-export default createTransform(serialize, deserialize);
\ No newline at end of file
diff --git a/src/app/constants/origins.js b/src/app/constants/origins.ts
similarity index 85%
rename from src/app/constants/origins.js
rename to src/app/constants/origins.ts
index d1156933a..04f1cfeab 100644
--- a/src/app/constants/origins.js
+++ b/src/app/constants/origins.ts
@@ -1,4 +1,4 @@
-function originFromEnv(key) {
+function originFromEnv(key: string) {
   const origin = process.env[key];
   if (typeof origin !== 'string') {
     throw new TypeError(`Missing LMEM env '${key}': ${origin}`);
diff --git a/src/app/constants/ui.js b/src/app/constants/ui.js
deleted file mode 100644
index b5fb73506..000000000
--- a/src/app/constants/ui.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-
-export const PREFERENCE_SCREEN_PANEL_ABOUT = 'PREFERENCE_SCREEN_PANEL_ABOUT';
-export const PREFERENCE_SCREEN_PANEL_CRITERIA = 'PREFERENCE_SCREEN_PANEL_CRITERIA';
-export const PREFERENCE_SCREEN_PANEL_SOURCES = 'PREFERENCE_SCREEN_PANEL_SOURCES';
-
-export const EXTENSION_VERSION = chrome.runtime.getManifest().version;
-
-function headerContent(imagesUrl, currPanel) {
-  return (
-    <strong className="lmem-topbar-preferences">
-      <img
-        alt=""
-        src={ imagesUrl + 'settings.svg' }
-        className="lmem-controls-picto" />
-      <span>Préférences</span>
-      <span>{currPanel}</span>
-    </strong>
-  );
-}
-
-export const HEADER_CONTENT = {
-  [PREFERENCE_SCREEN_PANEL_ABOUT]: imagesUrl => headerContent(imagesUrl, 'Général'),
-
-  [PREFERENCE_SCREEN_PANEL_CRITERIA]: imagesUrl => headerContent(imagesUrl, 'Critères de choix'),
-
-  [PREFERENCE_SCREEN_PANEL_SOURCES]: imagesUrl => headerContent(imagesUrl, 'Sources de recommandation'),
-
-  default: (<strong>Le Même en Mieux</strong>)
-};
\ No newline at end of file
diff --git a/src/app/content/App/Account/About/About.stories.jsx b/src/app/content/App/Account/About/About.stories.jsx
deleted file mode 100644
index b6e00fae6..000000000
--- a/src/app/content/App/Account/About/About.stories.jsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import { action } from '@storybook/addon-actions';
-import About from '.';
-
-storiesOf('screens/About', module)
-  .addDecorator(getStory => (
-    <Router>
-      {getStory()}
-    </Router>
-  ))
-  .add('normal', () => <About extensionVersion="1.2.3" close={action('close')} installationDate="01/01/2042" />);
diff --git a/src/app/content/App/Account/About/About.stories.tsx b/src/app/content/App/Account/About/About.stories.tsx
new file mode 100644
index 000000000..02f86bb3b
--- /dev/null
+++ b/src/app/content/App/Account/About/About.stories.tsx
@@ -0,0 +1,15 @@
+import React from "react";
+import { MemoryRouter as Router } from "react-router-dom";
+import { storiesOf } from "@storybook/react";
+import { action } from "@storybook/addon-actions";
+import { About } from ".";
+
+storiesOf("screens/About", module)
+  .addDecorator(getStory => <Router>{getStory()}</Router>)
+  .add("normal", () => (
+    <About
+      extensionVersion="1.2.3"
+      close={action("close")}
+      installationDate={new Date()}
+    />
+  ));
diff --git a/src/app/content/App/Account/About/index.jsx b/src/app/content/App/Account/About/index.jsx
deleted file mode 100644
index addc36fae..000000000
--- a/src/app/content/App/Account/About/index.jsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { ExternalLink, Time } from 'components/atoms';
-import { Notification } from 'components/organisms';
-import Title from './Title';
-import Content from './Content';
-import Container from './Container';
-
-const About = ({ close, installationDate, extensionVersion }) => (
-  <Notification title="À propos" close={close}>
-    <Container>
-      <Title>
-        Le Même En Mieux V
-        {extensionVersion}
-      </Title>
-      <Content>
-          Le Même en Mieux est un assistant d’achat indépendant des vendeurs et des marques.
-      </Content>
-
-      {installationDate && (
-        <Content>
-          Vous l’avez installé le
-          {' '}
-          <Time>{installationDate}</Time>
-.
-        </Content>
-      )}
-
-      <Content>
-        Pour découvrir ou faire découvrir le Même en Mieux autour de vous,
-        {' '}
-        <ExternalLink
-          href="https://choisir.lmem.net/decouvrir-exemples/"
-        >
-          rendez-vous sur cette page d’exemples
-        </ExternalLink>
-        .
-      </Content>
-
-      <nav>
-        <ExternalLink
-          href="https://choisir.lmem.net/questions-frequentes-aide/"
-        >
-          Aide
-        </ExternalLink>
-        {' '}
-        -
-        {' '}
-        <ExternalLink href="https://www.lmem.net/projet">À propos</ExternalLink>
-        {' '}
-        -
-        {' '}
-        <ExternalLink href="https://www.lmem.net/contact.html">Contact</ExternalLink>
-        {' '}
-        -
-        {' '}
-        <ExternalLink
-          href="https://choisir.lmem.net/charte-de-respect-de-la-vie-privee-5-regles-dor/"
-        >
-          Vie privée
-        </ExternalLink>
-        {' '}
-        -
-        {' '}
-        <ExternalLink href="https://www.lmem.net/cgu.html">CGU</ExternalLink>
-        {' '}
-          -
-        {' '}
-        <ExternalLink href="https://choisir.lmem.net/desinstaller-meme-mieux/">Désinstaller</ExternalLink>
-      </nav>
-    </Container>
-  </Notification>
-);
-
-About.propTypes = {
-  close: PropTypes.func,
-  installationDate: PropTypes.string,
-  extensionVersion: PropTypes.string.isRequired,
-};
-
-About.defaultProps = {
-  close: () => {},
-  installationDate: null,
-};
-
-export default About;
diff --git a/src/app/content/App/Account/About/index.tsx b/src/app/content/App/Account/About/index.tsx
new file mode 100644
index 000000000..c60a3ecce
--- /dev/null
+++ b/src/app/content/App/Account/About/index.tsx
@@ -0,0 +1,62 @@
+import React from "react";
+import { ExternalLink, Time } from "components/atoms";
+import { Notification } from "components/organisms/Notification";
+import Title from "./Title";
+import Content from "./Content";
+import Container from "./Container";
+import withConnect from "./withConnect";
+
+interface Props {
+  installationDate?: Date;
+  extensionVersion: string;
+  close?: () => void;
+}
+export const About = ({ close, installationDate, extensionVersion }: Props) => (
+  <Notification title="À propos" close={close}>
+    <Container>
+      <Title>Le Même En Mieux V{extensionVersion}</Title>
+      <Content>
+        Le Même en Mieux est un assistant d’achat indépendant des vendeurs et
+        des marques.
+      </Content>
+
+      {installationDate && (
+        <Content>
+          Vous l’avez installé le
+          <Time>{installationDate}</Time>.
+        </Content>
+      )}
+
+      <Content>
+        Pour découvrir ou faire découvrir le Même en Mieux autour de vous,{" "}
+        <ExternalLink href="https://choisir.lmem.net/decouvrir-exemples/">
+          rendez-vous sur cette page d’exemples
+        </ExternalLink>
+        .
+      </Content>
+
+      <nav>
+        <ExternalLink href="https://choisir.lmem.net/questions-frequentes-aide/">
+          Aide
+        </ExternalLink>{" "}
+        -{" "}
+        <ExternalLink href="https://www.lmem.net/projet">À propos</ExternalLink>{" "}
+        -{" "}
+        <ExternalLink href="https://www.lmem.net/contact.html">
+          Contact
+        </ExternalLink>{" "}
+        -{" "}
+        <ExternalLink href="https://choisir.lmem.net/charte-de-respect-de-la-vie-privee-5-regles-dor/">
+          Vie privée
+        </ExternalLink>{" "}
+        - <ExternalLink href="https://www.lmem.net/cgu.html">CGU</ExternalLink>{" "}
+        -{" "}
+        <ExternalLink href="https://choisir.lmem.net/desinstaller-meme-mieux/">
+          Désinstaller
+        </ExternalLink>
+      </nav>
+    </Container>
+  </Notification>
+);
+
+export default withConnect(About);
diff --git a/src/app/content/App/Account/About/withConnect.js b/src/app/content/App/Account/About/withConnect.js
deleted file mode 100644
index 3879efc03..000000000
--- a/src/app/content/App/Account/About/withConnect.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { connect } from 'react-redux';
-import { EXTENSION_VERSION } from 'app/constants/ui';
-import { close } from 'app/content/actions/ui';
-import { getInstallationDate } from 'app/content/selectors';
-
-const mapStateToProps = state => ({
-  extensionVersion: EXTENSION_VERSION,
-  installationDate: getInstallationDate(state)
-});
-
-const mapDispatchToProps = {
-  close,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps);
diff --git a/src/app/content/App/Account/About/withConnect.ts b/src/app/content/App/Account/About/withConnect.ts
new file mode 100644
index 000000000..4467d50c6
--- /dev/null
+++ b/src/app/content/App/Account/About/withConnect.ts
@@ -0,0 +1,19 @@
+import { connect } from 'react-redux';
+import { version } from 'app/../../package.json';
+import { close } from 'app/actions/ui';
+import { getExtensionInstallationDate } from 'app/content/selectors';
+import { State } from '../../../store';
+
+const mapStateToProps = (state: State) => ({
+  extensionVersion: version,
+  installationDate: getExtensionInstallationDate(state)
+});
+
+const mapDispatchToProps = {
+  close
+};
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+);
diff --git a/src/app/content/App/Account/Filters/Filters.js b/src/app/content/App/Account/Filters/Filters.js
deleted file mode 100644
index 265b8221f..000000000
--- a/src/app/content/App/Account/Filters/Filters.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-import Notification from 'components/organisms/Notification';
-
-export default ({ close }) => (
-  <Notification contentTitle="Mes filtres" title="Mes Filtres" close={close} />
-);
diff --git a/src/app/content/App/Account/Filters/Filters.stories.jsx b/src/app/content/App/Account/Filters/Filters.stories.jsx
deleted file mode 100644
index a428db164..000000000
--- a/src/app/content/App/Account/Filters/Filters.stories.jsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import Filters from './Filters';
-
-storiesOf('screens/Filters', module)
-  .addDecorator(getStory => (
-    <Router>
-      {getStory()}
-    </Router>
-  ))
-  .add('normal', () => <Filters />);
diff --git a/src/app/content/App/Account/Filters/Filters.stories.tsx b/src/app/content/App/Account/Filters/Filters.stories.tsx
new file mode 100644
index 000000000..f47758c83
--- /dev/null
+++ b/src/app/content/App/Account/Filters/Filters.stories.tsx
@@ -0,0 +1,8 @@
+import React from "react";
+import { MemoryRouter as Router } from "react-router-dom";
+import { storiesOf } from "@storybook/react";
+import Filters from "./Filters";
+
+storiesOf("screens/Filters", module)
+  .addDecorator(getStory => <Router>{getStory()}</Router>)
+  .add("normal", () => <Filters />);
diff --git a/src/app/content/App/Account/Filters/Filters.tsx b/src/app/content/App/Account/Filters/Filters.tsx
new file mode 100644
index 000000000..2f1d2569d
--- /dev/null
+++ b/src/app/content/App/Account/Filters/Filters.tsx
@@ -0,0 +1,9 @@
+import React from "react";
+import Notification from "components/organisms/Notification";
+
+interface Props {
+  close?: () => void;
+}
+export default ({ close }: Props) => (
+  <Notification contentTitle="Mes filtres" title="Mes Filtres" close={close} />
+);
diff --git a/src/app/content/App/Account/Menu/Menu.stories.jsx b/src/app/content/App/Account/Menu/Menu.stories.jsx
deleted file mode 100644
index a09418368..000000000
--- a/src/app/content/App/Account/Menu/Menu.stories.jsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router, Route } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import Menu from '.';
-
-storiesOf('screens/Menu', module)
-  .add('Menu', () => (
-    <Router location="/" context={{}}>
-      <Route render={Menu} />
-    </Router>
-  ));
diff --git a/src/app/content/App/Account/Menu/Menu.stories.tsx b/src/app/content/App/Account/Menu/Menu.stories.tsx
new file mode 100644
index 000000000..6a98ef6a1
--- /dev/null
+++ b/src/app/content/App/Account/Menu/Menu.stories.tsx
@@ -0,0 +1,10 @@
+import React from "react";
+import { MemoryRouter as Router, Route } from "react-router-dom";
+import { storiesOf } from "@storybook/react";
+import Menu from ".";
+
+storiesOf("screens/Menu", module).add("Menu", () => (
+  <Router>
+    <Route component={Menu} />
+  </Router>
+));
diff --git a/src/app/content/App/Account/Menu/index.jsx b/src/app/content/App/Account/Menu/index.tsx
similarity index 58%
rename from src/app/content/App/Account/Menu/index.jsx
rename to src/app/content/App/Account/Menu/index.tsx
index 12deb561e..fe431929c 100644
--- a/src/app/content/App/Account/Menu/index.jsx
+++ b/src/app/content/App/Account/Menu/index.tsx
@@ -1,10 +1,14 @@
-import React from 'react';
-import { Link } from 'react-router-dom';
-import { Notification } from 'components/organisms';
-import { OpenButton } from 'components/atoms';
-import Account from './Account';
+import React from "react";
+import { Link, RouteComponentProps } from "react-router-dom";
+import Notification from "components/organisms/Notification";
+import { OpenButton } from "components/atoms";
+import Account from "./Account";
 
-export const Menu = ({ match, close }) => (
+interface OwnProps {
+  close?: () => void;
+}
+type Props = OwnProps & RouteComponentProps;
+export const Menu = ({ match, close }: Props) => (
   <Notification title="Account" close={close}>
     <Account>
       <Link to={`${match.url}/data`}>
diff --git a/src/app/content/App/Account/index.js b/src/app/content/App/Account/index.js
deleted file mode 100644
index 48e12c6dd..000000000
--- a/src/app/content/App/Account/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Route, Switch } from 'react-router-dom';
-import React from 'react';
-import Filters from './Filters/Filters';
-import Menu from './Menu';
-import About from './About';
-import Error from '../Error';
-import Loading from '../Loading';
-
-export default ({ match }) => (
-  <Switch>
-    <Route path={match.url} exact component={Menu} />
-    <Route path={`${match.url}/about`} component={About} />
-    <Route path={`${match.url}/privacy`} component={Loading} />
-    <Route path={`${match.url}/filters`} component={Filters} />
-    <Route component={Error} />
-  </Switch>
-);
diff --git a/src/app/content/App/Account/index.tsx b/src/app/content/App/Account/index.tsx
new file mode 100644
index 000000000..56940484c
--- /dev/null
+++ b/src/app/content/App/Account/index.tsx
@@ -0,0 +1,18 @@
+import { RouteComponentProps } from "react-router";
+import { Route, Switch } from "react-router-dom";
+import React from "react";
+import Filters from "./Filters/Filters";
+import Menu from "./Menu";
+import About from "./About";
+import Error from "../Error";
+import Loading from "../Loading";
+
+export default ({ match }: RouteComponentProps) => (
+  <Switch>
+    <Route path={match.url} exact component={Menu} />
+    <Route path={`${match.url}/about`} component={About} />
+    <Route path={`${match.url}/privacy`} component={Loading} />
+    <Route path={`${match.url}/filters`} component={Filters} />
+    <Route component={Error} />
+  </Switch>
+);
diff --git a/src/app/content/App/Error/Error.stories.jsx b/src/app/content/App/Error/Error.stories.jsx
deleted file mode 100644
index 5b23530fc..000000000
--- a/src/app/content/App/Error/Error.stories.jsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router';
-import { storiesOf } from '@storybook/react';
-import Error from '.';
-
-storiesOf('screens/Error', module)
-  .add('normal', () => (
-    <Router>
-      <Error />
-    </Router>
-  ));
diff --git a/src/app/content/App/Error/Error.stories.tsx b/src/app/content/App/Error/Error.stories.tsx
new file mode 100644
index 000000000..042faaaee
--- /dev/null
+++ b/src/app/content/App/Error/Error.stories.tsx
@@ -0,0 +1,10 @@
+import React from "react";
+import { MemoryRouter as Router } from "react-router";
+import { storiesOf } from "@storybook/react";
+import Error from ".";
+
+storiesOf("screens/Error", module).add("normal", () => (
+  <Router>
+    <Error />
+  </Router>
+));
diff --git a/src/app/content/App/Help/Help.stories.jsx b/src/app/content/App/Help/Help.stories.jsx
deleted file mode 100644
index 308297732..000000000
--- a/src/app/content/App/Help/Help.stories.jsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import Help from '.';
-
-storiesOf('screens/Help', module)
-  .addDecorator(getStory => (
-    <Router>
-      {getStory()}
-    </Router>
-  ))
-  .add('normal', () => <Help />);
diff --git a/src/app/content/App/Help/Help.stories.tsx b/src/app/content/App/Help/Help.stories.tsx
new file mode 100644
index 000000000..dbcb43278
--- /dev/null
+++ b/src/app/content/App/Help/Help.stories.tsx
@@ -0,0 +1,8 @@
+import React from "react";
+import { MemoryRouter as Router } from "react-router-dom";
+import { storiesOf } from "@storybook/react";
+import Help from ".";
+
+storiesOf("screens/Help", module)
+  .addDecorator(getStory => <Router>{getStory()}</Router>)
+  .add("normal", () => <Help />);
diff --git a/src/app/content/App/Help/index.jsx b/src/app/content/App/Help/index.tsx
similarity index 57%
rename from src/app/content/App/Help/index.jsx
rename to src/app/content/App/Help/index.tsx
index 2fef6fadc..fa05c82ab 100644
--- a/src/app/content/App/Help/index.jsx
+++ b/src/app/content/App/Help/index.tsx
@@ -1,26 +1,33 @@
-import React from 'react';
-import Notification from 'components/organisms/Notification';
+import React from "react";
+import Notification from "components/organisms/Notification";
 import {
   BorderButton,
   CenterContainer,
   List,
   ExternalLink
-} from 'components/atoms';
-import { Textarea } from 'components/atoms/Forms';
-import Container from './Container';
-import ContentTitle from './ContentTitle';
+} from "components/atoms";
+import { Textarea } from "components/atoms/Forms";
+import Container from "./Container";
+import ContentTitle from "./ContentTitle";
 
-export default ({ close }) => (
+interface Props {
+  close?: () => void;
+}
+export const Help = ({ close }: Props) => (
   <Notification title="Aide" close={close}>
     <Container>
       <ContentTitle>Questions fréquentes</ContentTitle>
 
       <List>
         <li>
-          <ExternalLink>Sur quelles pages apparaissent les notices ?</ExternalLink>
+          <ExternalLink>
+            Sur quelles pages apparaissent les notices ?
+          </ExternalLink>
         </li>
         <li>
-          <ExternalLink>J’ai beau testé, les notices n’apparaissent pas</ExternalLink>
+          <ExternalLink>
+            J’ai beau testé, les notices n’apparaissent pas
+          </ExternalLink>
         </li>
         <li>
           <ExternalLink>Quelles sont les données utilisées ?</ExternalLink>
@@ -39,7 +46,8 @@ export default ({ close }) => (
           <BorderButton>Envoyer</BorderButton>
         </CenterContainer>
       </form>
-
     </Container>
   </Notification>
 );
+
+export default Help;
diff --git a/src/app/content/App/Loading/Loading.stories.jsx b/src/app/content/App/Loading/Loading.stories.jsx
deleted file mode 100644
index eae13eb6e..000000000
--- a/src/app/content/App/Loading/Loading.stories.jsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import { action } from '@storybook/addon-actions';
-import { Loading } from '.';
-
-storiesOf('screens/Loading', module)
-  .addDecorator(getStory => (
-    <Router>
-      {getStory()}
-    </Router>
-  ))
-  .add('normal', () => <Loading close={action('close')} />);
diff --git a/src/app/content/App/Loading/Loading.stories.tsx b/src/app/content/App/Loading/Loading.stories.tsx
new file mode 100644
index 000000000..d6f5448b2
--- /dev/null
+++ b/src/app/content/App/Loading/Loading.stories.tsx
@@ -0,0 +1,9 @@
+import React from "react";
+import { MemoryRouter as Router } from "react-router-dom";
+import { storiesOf } from "@storybook/react";
+import { action } from "@storybook/addon-actions";
+import { Loading } from ".";
+
+storiesOf("screens/Loading", module)
+  .addDecorator(getStory => <Router>{getStory()}</Router>)
+  .add("normal", () => <Loading close={action("close")} />);
diff --git a/src/app/content/App/Loading/index.jsx b/src/app/content/App/Loading/index.jsx
deleted file mode 100644
index 472292480..000000000
--- a/src/app/content/App/Loading/index.jsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-import Notification from 'components/organisms/Notification';
-import Illustration from './Illustration';
-import Container from './Container';
-import withConnect from './withConnect';
-
-export const Loading = ({ close }) => (
-  <Notification close={close}>
-    <Container>
-      <Illustration />
-      Chargement…
-    </Container>
-  </Notification>
-);
-
-export default withConnect(Loading);
diff --git a/src/app/content/App/Loading/index.tsx b/src/app/content/App/Loading/index.tsx
new file mode 100644
index 000000000..d587a37dd
--- /dev/null
+++ b/src/app/content/App/Loading/index.tsx
@@ -0,0 +1,19 @@
+import React from "react";
+import Notification from "components/organisms/Notification";
+import Illustration from "./Illustration";
+import Container from "./Container";
+import withConnect from "./withConnect";
+
+interface Props {
+  close: () => void;
+}
+export const Loading = ({ close }: Props) => (
+  <Notification close={close}>
+    <Container>
+      <Illustration />
+      Chargement…
+    </Container>
+  </Notification>
+);
+
+export default withConnect(Loading);
diff --git a/src/app/content/App/Loading/withConnect.js b/src/app/content/App/Loading/withConnect.js
index f902a2e57..1a14ea4e9 100644
--- a/src/app/content/App/Loading/withConnect.js
+++ b/src/app/content/App/Loading/withConnect.js
@@ -1,8 +1,11 @@
-import { connect } from 'react-redux';
-import { close } from '../../actions/ui';
+import { connect } from "react-redux";
+import { close } from "app/actions/ui";
 
 const mapDispatchToProps = {
-  close,
+  close
 };
 
-export default connect(null, mapDispatchToProps);
+export default connect(
+  null,
+  mapDispatchToProps
+);
diff --git a/src/app/content/App/Notice/Details/index.jsx b/src/app/content/App/Notice/Details/index.jsx
deleted file mode 100644
index 6520b983a..000000000
--- a/src/app/content/App/Notice/Details/index.jsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { NoticeDetails, Notification } from '../../../../../components/organisms';
-import { recommendation as NoticeType } from '../../../../propTypes';
-import { findType } from '../../../../lmem/typeOfCriteria';
-import withConnect from './withConnect';
-
-const Details = ({
-  notice: {
-    id, resource: { url }, contributor: { name }, criteria, description, liked, disliked
-  },
-  like, unlike,
-  dislike, undislike,
-  close,
-}) => {
-  return (
-    <Notification title={description} hasNotices close={close}>
-      <NoticeDetails
-        id={id}
-        type={findType(criteria)}
-        date="03 déc. 2018"
-        message={description}
-        contributor={name}
-        source={url}
-        likes={21}
-        dislikes={3}
-        like={like}
-        unlike={unlike}
-        dislike={dislike}
-        undislike={undislike}
-        liked={liked}
-        disliked={disliked}
-        details
-      />
-    </Notification>
-  );
-};
-
-Details.propTypes = {
-  notice: PropTypes.shape(NoticeType).isRequired,
-  like: PropTypes.func.isRequired,
-  unlike: PropTypes.func.isRequired,
-  dislike: PropTypes.func.isRequired,
-  undislike: PropTypes.func.isRequired,
-  close: PropTypes.func.isRequired,
-};
-
-export default withConnect(Details);
diff --git a/src/app/content/App/Notice/Details/index.tsx b/src/app/content/App/Notice/Details/index.tsx
new file mode 100644
index 000000000..4f8a085ce
--- /dev/null
+++ b/src/app/content/App/Notice/Details/index.tsx
@@ -0,0 +1,36 @@
+import React from "react";
+import Notification from "../../../../../components/organisms/Notification";
+import NoticeDetails from "../../../../../components/organisms/NoticeDetails/NoticeDetails";
+import withConnect from "./withConnect";
+import { DetailsProps } from "./types";
+import { findType } from "app/lmem/noticeType";
+
+export const Details = ({
+  notice,
+  like,
+  unlike,
+  dislike,
+  undislike,
+  close
+}: DetailsProps) =>
+  notice ? (
+    <Notification title={notice.description} hasNotices close={close}>
+      <NoticeDetails
+        id={notice.id}
+        type={findType(notice.criteria)}
+        date="03 déc. 2018"
+        message={notice.description}
+        contributor={notice.contributor.name}
+        source={notice.resource.url}
+        like={like}
+        unlike={unlike}
+        dislike={dislike}
+        undislike={undislike}
+        liked={notice.liked}
+        disliked={notice.disliked}
+        dismissed={notice.dismissed}
+      />
+    </Notification>
+  ) : null;
+
+export default withConnect(Details);
diff --git a/src/app/content/App/Notice/Details/types.ts b/src/app/content/App/Notice/Details/types.ts
new file mode 100644
index 000000000..2ff7d2c7f
--- /dev/null
+++ b/src/app/content/App/Notice/Details/types.ts
@@ -0,0 +1,14 @@
+import { RouteComponentProps } from 'react-router';
+import { EnhancedNotice } from 'app/lmem/notice';
+import { FeedbackOnNoticeAction } from 'app/actions/recommendations';
+
+interface OwnProps {
+  notice?: EnhancedNotice;
+  like: (id: number) => FeedbackOnNoticeAction;
+  unlike: (id: number) => FeedbackOnNoticeAction;
+  dislike: (id: number) => FeedbackOnNoticeAction;
+  undislike: (id: number) => FeedbackOnNoticeAction;
+  close?: () => void;
+}
+
+export type DetailsProps = OwnProps & RouteComponentProps;
diff --git a/src/app/content/App/Notice/Details/withConnect.js b/src/app/content/App/Notice/Details/withConnect.js
deleted file mode 100644
index 6c7326491..000000000
--- a/src/app/content/App/Notice/Details/withConnect.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { connect } from 'react-redux';
-import { getNoticeById } from '../../../selectors';
-import {
-  likeNotice, unlikeNotice, dislikeNotice, undislikeNotice
-} from '../../../actions/recommendations';
-import { close } from '../../../actions/ui';
-
-const mapStateToProps = (state, props) => ({
-  notice: getNoticeById(state, props),
-});
-
-const mapDispatchToProps = {
-  like: likeNotice,
-  unlike: unlikeNotice,
-  dislike: dislikeNotice,
-  undislike: undislikeNotice,
-  close,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps);
diff --git a/src/app/content/App/Notice/Details/withConnect.ts b/src/app/content/App/Notice/Details/withConnect.ts
new file mode 100644
index 000000000..748850fb5
--- /dev/null
+++ b/src/app/content/App/Notice/Details/withConnect.ts
@@ -0,0 +1,28 @@
+import { connect } from 'react-redux';
+import { getNoticeById } from '../../../selectors';
+import {
+  likeNotice,
+  unlikeNotice,
+  dislikeNotice,
+  undislikeNotice
+} from 'app/actions/recommendations';
+import { close } from 'app/actions/ui';
+import { State } from '../../../store';
+import { DetailsProps } from './types';
+
+const mapStateToProps = (state: State, props: DetailsProps) => ({
+  notice: getNoticeById(state, props)
+});
+
+const mapDispatchToProps = {
+  like: likeNotice,
+  unlike: unlikeNotice,
+  dislike: dislikeNotice,
+  undislike: undislikeNotice,
+  close
+};
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+);
diff --git a/src/app/content/App/Notice/List/List.stories.jsx b/src/app/content/App/Notice/List/List.stories.jsx
deleted file mode 100644
index d6d5bb297..000000000
--- a/src/app/content/App/Notice/List/List.stories.jsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import { action } from '@storybook/addon-actions';
-import { List } from '.';
-
-const notices = [
-  {
-    id: '123',
-    description: '<p>Description with a <a href="http://some.url">link</a></p>',
-    contributor: { name: 'John Doe' },
-    criteria: [{ label: 'label', slug: 'slug' }],
-    isApproved: true,
-    isDismissed: false,
-    resource: {
-      author: 'Jack Daniels',
-      editor: 'LMEM',
-      label: 'label',
-      url: 'url',
-    },
-    alternatives: [{
-      label: 'some alternative',
-      url_to_redirect: 'url'
-    }]
-  }
-];
-
-storiesOf('screens/Notice/List', module)
-  .addDecorator(getStory => (
-    <Router>
-      {getStory()}
-    </Router>
-  ))
-  .add('with 1 notification', () => (
-    <List close={action('close')} dismiss={action('dismiss')} undismiss={action('undismiss')} notices={notices} />
-  ))
-  .add('empty list', () => (
-    <List close={action('close')} dismiss={action('dismiss')} undismiss={action('undismiss')} notices={[]} />
-  ));
diff --git a/src/app/content/App/Notice/List/List.stories.tsx b/src/app/content/App/Notice/List/List.stories.tsx
new file mode 100644
index 000000000..98eb33d91
--- /dev/null
+++ b/src/app/content/App/Notice/List/List.stories.tsx
@@ -0,0 +1,54 @@
+import React from "react";
+import { MemoryRouter as Router } from "react-router-dom";
+import { storiesOf } from "@storybook/react";
+import { action } from "@storybook/addon-actions";
+import { List } from ".";
+import { EnhancedNotice } from "../../../../lmem/notice";
+
+const notices: EnhancedNotice[] = [
+  {
+    id: 123,
+    title: "title is going to be removed",
+    description: '<p>Description with a <a href="http://some.url">link</a></p>',
+    contributor: { name: "John Doe", image: "image", organization: "org" },
+    criteria: [{ label: "label", slug: "slug" }],
+    resource: {
+      author: "Jack Daniels",
+      editor: { id: 42, label: "LMEM", url: "url" },
+      label: "label",
+      url: "url"
+    },
+    alternatives: [
+      {
+        label: "some alternative",
+        url_to_redirect: "url"
+      }
+    ],
+    dismissed: false,
+    disliked: false,
+    liked: false,
+    dislikes: 0,
+    likes: 0,
+    valid: true,
+    visibility: "public"
+  }
+];
+
+storiesOf("screens/Notice/List", module)
+  .addDecorator(getStory => <Router>{getStory()}</Router>)
+  .add("with 1 notification", () => (
+    <List
+      close={action("close")}
+      dismiss={action("dismiss")}
+      undismiss={action("undismiss")}
+      notices={notices}
+    />
+  ))
+  .add("empty list", () => (
+    <List
+      close={action("close")}
+      dismiss={action("dismiss")}
+      undismiss={action("undismiss")}
+      notices={[]}
+    />
+  ));
diff --git a/src/app/content/App/Notice/List/index.jsx b/src/app/content/App/Notice/List/index.jsx
deleted file mode 100644
index 4665ce52b..000000000
--- a/src/app/content/App/Notice/List/index.jsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { recommendation as NoticeType } from 'app/propTypes';
-import { Notification, Notice } from 'components/organisms';
-import { AddNotice } from 'components/molecules';
-import { findType } from 'app/lmem';
-import NoNotice from './NoNotice';
-import withConnect from './withConnect';
-
-export const List = ({
-  notices, dismiss, undismiss, close
-}) => {
-  return (
-    <Notification title="Notifications pour cette page" hasNotices close={close}>
-      {notices.slice(0, 2).map(({
-        id, description, contributor: { name }, resource: { url }, criteria, dismissed, disliked
-      }) => (
-        <Notice
-          key={id}
-          id={id}
-          type={findType(criteria)}
-          message={description}
-          contributor={name}
-          source={url}
-          dismiss={dismiss}
-          undismiss={undismiss}
-          dismissed={dismissed}
-          disliked={disliked}
-        />
-      ))}
-      {notices.length === 0 && <NoNotice />}
-      <AddNotice
-        as="a"
-        href="https://form.jotformeu.com/82702852284358"
-        target="_blank"
-        rel="noopener noreferrer"
-      />
-    </Notification>
-  );
-};
-
-List.propTypes = {
-  notices: PropTypes.arrayOf(PropTypes.shape(NoticeType)),
-  dismiss: PropTypes.func.isRequired,
-  undismiss: PropTypes.func.isRequired,
-  close: PropTypes.func.isRequired,
-};
-
-List.defaultProps = {
-  notices: [],
-};
-
-export default withConnect(List);
diff --git a/src/app/content/App/Notice/List/index.tsx b/src/app/content/App/Notice/List/index.tsx
new file mode 100644
index 000000000..e84c7ed0f
--- /dev/null
+++ b/src/app/content/App/Notice/List/index.tsx
@@ -0,0 +1,53 @@
+import React from "react";
+import Notification from "components/organisms/Notification";
+import NoticeItem from "components/organisms/Notice/Notice";
+import { AddNotice } from "components/molecules";
+import { findType } from "app/lmem/noticeType";
+import NoNotice from "./NoNotice";
+import withConnect from "./withConnect";
+import { EnhancedNotice } from "../../../../lmem/notice";
+
+export interface Props {
+  notices: EnhancedNotice[];
+  dismiss: (id: number) => void;
+  undismiss: (id: number) => void;
+  close?: () => void;
+}
+export const List = ({ notices, dismiss, undismiss, close }: Props) => (
+  <Notification title="Notifications pour cette page" hasNotices close={close}>
+    {notices
+      .slice(0, 2)
+      .map(
+        ({
+          id,
+          description,
+          contributor: { name },
+          resource: { url },
+          criteria,
+          dismissed,
+          disliked
+        }) => (
+          <NoticeItem
+            key={id}
+            id={id}
+            type={findType(criteria)}
+            message={description}
+            contributor={name}
+            dismiss={dismiss}
+            undismiss={undismiss}
+            dismissed={dismissed}
+            disliked={disliked}
+          />
+        )
+      )}
+    {notices.length === 0 && <NoNotice />}
+    <AddNotice
+      as="a"
+      href="https://form.jotformeu.com/82702852284358"
+      target="_blank"
+      rel="noopener noreferrer"
+    />
+  </Notification>
+);
+
+export default withConnect(List);
diff --git a/src/app/content/App/Notice/List/withConnect.js b/src/app/content/App/Notice/List/withConnect.js
deleted file mode 100644
index 46575fbad..000000000
--- a/src/app/content/App/Notice/List/withConnect.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { connect } from 'react-redux';
-import { dismissNotice, undismissNotice } from '../../../actions/recommendations';
-import { close } from '../../../actions/ui';
-import { getFilteredNotices } from '../../../selectors';
-
-const mapStateToProps = state => ({
-  notices: getFilteredNotices(state),
-});
-
-const mapDispatchToProps = {
-  dismiss: dismissNotice,
-  undismiss: undismissNotice,
-  close,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps);
diff --git a/src/app/content/App/Notice/List/withConnect.ts b/src/app/content/App/Notice/List/withConnect.ts
new file mode 100644
index 000000000..b78762967
--- /dev/null
+++ b/src/app/content/App/Notice/List/withConnect.ts
@@ -0,0 +1,20 @@
+import { connect } from 'react-redux';
+import { dismissNotice, undismissNotice } from 'app/actions/recommendations';
+import { close } from 'app/actions/ui';
+import { getFilteredNotices } from '../../../selectors';
+import { State } from '../../../store';
+
+const mapStateToProps = (state: State) => ({
+  notices: getFilteredNotices(state)
+});
+
+const mapDispatchToProps = {
+  dismiss: dismissNotice,
+  undismiss: undismissNotice,
+  close
+};
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+);
diff --git a/src/app/content/App/Notice/index.jsx b/src/app/content/App/Notice/index.jsx
deleted file mode 100644
index 8481ff788..000000000
--- a/src/app/content/App/Notice/index.jsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-import { Route, Switch } from 'react-router-dom';
-import List from './List';
-import Details from './Details';
-
-export default ({ match }) => (
-  <Switch>
-    <Route path={match.url} exact component={List} />
-    <Route path={`${match.url}/details/:id`} component={Details} />
-  </Switch>
-);
diff --git a/src/app/content/App/Notice/index.tsx b/src/app/content/App/Notice/index.tsx
new file mode 100644
index 000000000..1b9838f16
--- /dev/null
+++ b/src/app/content/App/Notice/index.tsx
@@ -0,0 +1,11 @@
+import React from "react";
+import { Route, RouteComponentProps, Switch } from "react-router-dom";
+import List from "./List";
+import Details from "./Details";
+
+export default ({ match }: RouteComponentProps) => (
+  <Switch>
+    <Route path={match.url} exact component={List} />
+    <Route path={`${match.url}/details/:id`} component={Details} />
+  </Switch>
+);
diff --git a/src/app/content/App/Subscriptions/Subscriptions.stories.jsx b/src/app/content/App/Subscriptions/Subscriptions.stories.jsx
deleted file mode 100644
index c41e64805..000000000
--- a/src/app/content/App/Subscriptions/Subscriptions.stories.jsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import Subscriptions from '.';
-
-storiesOf('screens/Subscriptions', module)
-  .addDecorator(getStory => (
-    <Router>
-      {getStory()}
-    </Router>
-  ))
-  .add('normal', () => <Subscriptions />);
diff --git a/src/app/content/App/Subscriptions/Subscriptions.stories.tsx b/src/app/content/App/Subscriptions/Subscriptions.stories.tsx
new file mode 100644
index 000000000..19cb0a846
--- /dev/null
+++ b/src/app/content/App/Subscriptions/Subscriptions.stories.tsx
@@ -0,0 +1,8 @@
+import React from "react";
+import { MemoryRouter as Router } from "react-router-dom";
+import { storiesOf } from "@storybook/react";
+import Subscriptions from ".";
+
+storiesOf("screens/Subscriptions", module)
+  .addDecorator(getStory => <Router>{getStory()}</Router>)
+  .add("normal", () => <Subscriptions />);
diff --git a/src/app/content/App/Subscriptions/index.jsx b/src/app/content/App/Subscriptions/index.tsx
similarity index 58%
rename from src/app/content/App/Subscriptions/index.jsx
rename to src/app/content/App/Subscriptions/index.tsx
index 4403f8ddd..421d5952c 100644
--- a/src/app/content/App/Subscriptions/index.jsx
+++ b/src/app/content/App/Subscriptions/index.tsx
@@ -1,11 +1,14 @@
-import React from 'react';
-import { Notification } from 'components/organisms';
-import BorderButton from 'components/atoms/Buttons/BorderButton/BorderButton';
-import Illustration from './Illustration';
-import Container from './Container';
-import SubscriptionsData from './SubscriptionsData';
+import React from "react";
+import Notification from "components/organisms/Notification";
+import BorderButton from "components/atoms/Buttons/BorderButton/BorderButton";
+import Illustration from "./Illustration";
+import Container from "./Container";
+import SubscriptionsData from "./SubscriptionsData";
 
-export default ({ close }) => (
+interface Props {
+  close?: () => void;
+}
+export default ({ close }: Props) => (
   <Notification title="Abonnements" close={close}>
     <Container>
       <Illustration />
diff --git a/src/app/content/App/index.jsx b/src/app/content/App/index.jsx
deleted file mode 100644
index e69bb1b6e..000000000
--- a/src/app/content/App/index.jsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import React from 'react';
-import { Provider, connect } from 'react-redux';
-import { Redirect, Route, Switch } from 'react-router-dom';
-import { ConnectedRouter } from 'connected-react-router/immutable';
-import { ThemeProvider, StyleSheetManager } from 'styled-components';
-import theme from '../../theme';
-import store, { history } from '../store';
-import GlobalStyle from '../GlobalStyle';
-import Account from './Account';
-import Error from './Error';
-import Loading from './Loading';
-import Notice from './Notice';
-import Subscriptions from './Subscriptions';
-import Help from './Help';
-
-const DELAY_BEFORE_SHOWING = process.env.NODE_ENV === 'production' ? 4000 : 10;
-
-const mapStateToProps = state => ({
-  open: state.getIn(['open', 'open'])
-});
-
-const Content = connect(mapStateToProps)(
-  ({ loaded, open }) => (open
-    ? (
-      <React.Fragment>
-        <GlobalStyle />
-        {loaded
-          ? (
-            <Switch>
-              <Redirect exact path="/" to="/notices" />
-              <Route path="/notices" component={Notice} />
-              <Route path="/subscriptions" component={Subscriptions} />
-              <Route path="/help" component={Help} />
-              <Route path="/account" component={Account} />
-              <Route component={Error} />
-            </Switch>
-          )
-          : <Loading />
-        }
-      </React.Fragment>
-    )
-    : null
-  )
-);
-
-export default class App extends React.PureComponent {
-  state = {
-    loaded: false
-  };
-
-  componentDidMount() {
-    setTimeout(this.setLoaded, DELAY_BEFORE_SHOWING);
-  }
-
-  setLoaded = () => {
-    this.setState({ loaded: true });
-  };
-
-  render() {
-    const { contentDocument } = this.props;
-    const { loaded } = this.state;
-
-    return (
-      <StyleSheetManager target={contentDocument.head}>
-        <Provider store={store}>
-          <ThemeProvider theme={theme}>
-            <ConnectedRouter history={history}>
-              <Content loaded={loaded} />
-            </ConnectedRouter>
-          </ThemeProvider>
-        </Provider>
-      </StyleSheetManager>
-    );
-  }
-}
diff --git a/src/app/content/App/index.tsx b/src/app/content/App/index.tsx
new file mode 100644
index 000000000..a060ccc8a
--- /dev/null
+++ b/src/app/content/App/index.tsx
@@ -0,0 +1,83 @@
+import React from "react";
+import { Provider, connect } from "react-redux";
+import { Redirect, Route, Switch } from "react-router-dom";
+import { ConnectedRouter } from "connected-react-router/immutable";
+import { ThemeProvider, StyleSheetManager } from "styled-components";
+import theme from "../../theme";
+import store, { history, State } from "../store";
+import GlobalStyle from "../GlobalStyle";
+import Account from "./Account";
+import Error from "./Error";
+import Loading from "./Loading";
+import Notice from "./Notice";
+import Subscriptions from "./Subscriptions";
+import Help from "./Help";
+import { isOpen } from "../selectors";
+
+const DELAY_BEFORE_SHOWING = process.env.NODE_ENV === "production" ? 4000 : 10;
+
+const mapStateToProps = (state: State) => ({
+  open: isOpen(state)
+});
+
+interface ContentProps {
+  loaded: boolean;
+  open: boolean;
+}
+const Content = connect(mapStateToProps)(({ loaded, open }: ContentProps) =>
+  open ? (
+    <React.Fragment>
+      <GlobalStyle />
+      {loaded ? (
+        <Switch>
+          <Redirect exact path="/" to="/notices" />
+          <Route path="/notices" component={Notice} />
+          <Route path="/subscriptions" component={Subscriptions} />
+          <Route path="/help" component={Help} />
+          <Route path="/account" component={Account} />
+          <Route component={Error} />
+        </Switch>
+      ) : (
+        <Loading />
+      )}
+    </React.Fragment>
+  ) : null
+);
+
+interface AppProps {
+  contentDocument: Document;
+}
+interface AppState {
+  loaded: boolean;
+}
+
+export default class App extends React.PureComponent<AppProps, AppState> {
+  state = {
+    loaded: false
+  };
+
+  componentDidMount() {
+    setTimeout(this.setLoaded, DELAY_BEFORE_SHOWING);
+  }
+
+  setLoaded = () => {
+    this.setState({ loaded: true });
+  };
+
+  render() {
+    const { contentDocument } = this.props;
+    const { loaded } = this.state;
+
+    return (
+      <StyleSheetManager target={contentDocument.head}>
+        <Provider store={store}>
+          <ThemeProvider theme={theme}>
+            <ConnectedRouter history={history}>
+              <Content loaded={loaded} />
+            </ConnectedRouter>
+          </ThemeProvider>
+        </Provider>
+      </StyleSheetManager>
+    );
+  }
+}
diff --git a/src/app/content/actions/filters.js b/src/app/content/actions/filters.js
deleted file mode 100644
index 57aac1846..000000000
--- a/src/app/content/actions/filters.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import {
-  DEACTIVATED_WEBSITES,
-  INSTALLED_DETAILS,
-  CRITERIA,
-  SELECT_CRITERION,
-  UNSELECT_CRITERION,
-  EDITORS,
-  EXCLUDE_EDITOR,
-  INCLUDE_EDITOR
-} from '../../constants/ActionTypes';
-import createAction from '../../utils/createAction';
-import createBackgroundAction from '../createBackgroundAction';
-
-export const updateDeactivatedWebsites = createAction(
-  DEACTIVATED_WEBSITES,
-  deactivatedWebsites => ({ deactivatedWebsites })
-);
-export const updateInstalledDetails = createAction(INSTALLED_DETAILS, onInstalledDetails => ({ onInstalledDetails }));
-export const updateCriteria = createAction(CRITERIA, criteria => ({ criteria }));
-export const selectCriterion = createBackgroundAction(SELECT_CRITERION, slug => ({ slug }));
-export const unselectCriterion = createBackgroundAction(UNSELECT_CRITERION, slug => ({ slug }));
-export const updateEditors = createAction(EDITORS, (editors = []) => ({ editors }));
-export const excludeEditor = createBackgroundAction(EXCLUDE_EDITOR, id => ({ id }));
-export const includeEditor = createBackgroundAction(INCLUDE_EDITOR, id => ({ id }));
diff --git a/src/app/content/actions/recommendations.js b/src/app/content/actions/recommendations.js
deleted file mode 100644
index aa2c0441b..000000000
--- a/src/app/content/actions/recommendations.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
-  NOTICES_FOUND, DISMISS_NOTICE, UNDISMISS_NOTICE, LIKE_NOTICE, UNLIKE_NOTICE,
-  DISLIKE_NOTICE, UNDISLIKE_NOTICE, REPORT_NOTICE,
-} from '../../constants/ActionTypes';
-import createAction from '../../utils/createAction';
-import createBackgroundAction from '../createBackgroundAction';
-
-const withId = id => ({ id });
-
-export const noticesFound = createAction(
-  NOTICES_FOUND,
-  (notices = []) => ({ notices }),
-  tab => ({ tab })
-);
-export const dismissNotice = createBackgroundAction(DISMISS_NOTICE, withId);
-export const undismissNotice = createBackgroundAction(UNDISMISS_NOTICE, withId);
-export const likeNotice = createBackgroundAction(LIKE_NOTICE, withId);
-export const unlikeNotice = createBackgroundAction(UNLIKE_NOTICE, withId);
-export const dislikeNotice = createBackgroundAction(DISLIKE_NOTICE, withId);
-export const undislikeNotice = createBackgroundAction(UNDISLIKE_NOTICE, withId);
-export const reportNotice = createBackgroundAction(REPORT_NOTICE, withId);
diff --git a/src/app/content/actions/ui.js b/src/app/content/actions/ui.js
deleted file mode 100644
index 428d22598..000000000
--- a/src/app/content/actions/ui.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import {
-  REDUCE_RECOMMENDATION_IFRAME,
-  EXTEND_RECOMMENDATION_IFRAME,
-  DEACTIVATE,
-  UNINSTALL,
-  OPEN,
-  OPENED,
-  CLOSE,
-  CLOSED,
-  OPEN_PREFERENCE_PANEL,
-  CLOSE_PREFERENCE_PANEL,
-  CHECKOUT_RECO_RESOURCE_BUTTON,
-  CHECKOUT_RECO_RESOURCE_LINK,
-  CHECKOUT_RECO_ALTERNATIVE,
-  CHECKOUT_RECO_EDITOR,
-  POPUP_CLICK
-} from '../../constants/ActionTypes';
-import createBackgroundAction from '../createBackgroundAction';
-import createAction from '../../utils/createAction';
-
-export const reduce = createBackgroundAction(REDUCE_RECOMMENDATION_IFRAME);
-export const extend = createBackgroundAction(EXTEND_RECOMMENDATION_IFRAME);
-export const deactivate = createBackgroundAction(DEACTIVATE, ({ where, duration }) => ({ where, duration }));
-export const open = createAction(OPEN);
-export const opened = createAction(OPENED);
-export const close = createAction(CLOSE);
-export const closed = createAction(CLOSED);
-export const closePrefScreen = createBackgroundAction(CLOSE_PREFERENCE_PANEL);
-export const openPrefScreen = createBackgroundAction(OPEN_PREFERENCE_PANEL, panel => ({ panel }));
-export const checkOutResourceButton = createBackgroundAction(CHECKOUT_RECO_RESOURCE_BUTTON, resource => ({ resource }));
-export const checkOutResourceLink = createBackgroundAction(CHECKOUT_RECO_RESOURCE_LINK, resource => ({ resource }));
-export const checkOutAlternative = createBackgroundAction(CHECKOUT_RECO_ALTERNATIVE, alternative => ({ alternative }));
-export const checkOutEditor = createBackgroundAction(CHECKOUT_RECO_EDITOR, editor => ({ editor }));
-export const uninstall = createBackgroundAction(UNINSTALL, () => ({ datetime: new Date() }));
-export const popupClick = createBackgroundAction(POPUP_CLICK, target => ({ target }));
diff --git a/src/app/content/createBackgroundAction.js b/src/app/content/createBackgroundAction.js
deleted file mode 100644
index 523620799..000000000
--- a/src/app/content/createBackgroundAction.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import createAction from '../utils/createAction';
-import identity from '../utils/identity';
-
-export default (
-  type,
-  payloadCreator = identity,
-  metaCreator = (meta) => (meta ? { ...meta, background: true } : { background: true })
-) => createAction(type, payloadCreator, metaCreator);
diff --git a/src/app/content/extensionIframe.js b/src/app/content/extensionIframe.js
deleted file mode 100644
index f4537769c..000000000
--- a/src/app/content/extensionIframe.js
+++ /dev/null
@@ -1,26 +0,0 @@
-export const create = ({ style = {} }) => {
-  const iframe = document.createElement('iframe');
-  iframe.id = 'lmemFrame';
-  iframe.width = '390px';
-  iframe.height = '423px';
-  iframe.srcdoc = '<!doctype html><html><head><meta charset="utf-8"></head><body /></html>';
-
-  Object.keys(style).forEach(
-    key => iframe.style.setProperty(key, style[key], 'important')
-  );
-
-  return iframe;
-};
-
-
-export const append = iframe => new Promise((resolve) => {
-  iframe.onload = () => { resolve(iframe.contentDocument); };
-  document.body.appendChild(iframe);
-});
-
-
-
-export const remove = () => {
-  const el = document.getElementById('lmemFrame');
-  el.remove();
-};
diff --git a/src/app/content/extensionIframe.ts b/src/app/content/extensionIframe.ts
new file mode 100644
index 000000000..f4fcb636b
--- /dev/null
+++ b/src/app/content/extensionIframe.ts
@@ -0,0 +1,33 @@
+import { Promise } from 'es6-promise';
+
+export const create = (style: {
+  [key: string]: string | number;
+}): HTMLIFrameElement => {
+  const iframe = document.createElement('iframe');
+  iframe.id = 'lmemFrame';
+  iframe.width = '390px';
+  iframe.height = '423px';
+  iframe.srcdoc =
+    '<!doctype html><html lang="fr"><head><title>lmem</title><meta charset="utf-8"></head><body /></html>';
+
+  Object.keys(style).forEach(key =>
+    iframe.style.setProperty(key, String(style[key]), 'important')
+  );
+
+  return iframe;
+};
+
+export const append = (iframe: HTMLIFrameElement): Promise<Document | null> =>
+  new Promise(resolve => {
+    iframe.onload = () => {
+      resolve(iframe.contentDocument);
+    };
+    document.body.appendChild(iframe);
+  });
+
+export const remove = (): void => {
+  const iframe = document.getElementById('lmemFrame');
+  if (iframe) {
+    iframe.remove();
+  }
+};
diff --git a/src/app/content/index.js b/src/app/content/index.js
deleted file mode 100644
index 13d1c6a75..000000000
--- a/src/app/content/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* eslint-disable global-require */
-if (!window.__LMEM__CONTENT_SCRIPT_INJECTED__) {
-  require('typeface-lato');
-  require('typeface-sedgwick-ave');
-  require('./store');
-  window.__LMEM__CONTENT_SCRIPT_INJECTED__ = true;
-}
diff --git a/src/app/content/index.ts b/src/app/content/index.ts
new file mode 100644
index 000000000..1286fff65
--- /dev/null
+++ b/src/app/content/index.ts
@@ -0,0 +1,7 @@
+/* eslint-disable global-require */
+if (!(window as CustomWindow).__LMEM__CONTENT_SCRIPT_INJECTED__) {
+  require('typeface-lato');
+  require('typeface-sedgwick-ave');
+  require('./store');
+  (window as CustomWindow).__LMEM__CONTENT_SCRIPT_INJECTED__ = true;
+}
diff --git a/src/app/content/middlewares/backgroundPublisher.js b/src/app/content/middlewares/backgroundPublisher.js
deleted file mode 100644
index 9ca9bd4fe..000000000
--- a/src/app/content/middlewares/backgroundPublisher.js
+++ /dev/null
@@ -1,25 +0,0 @@
-export const transformBackgroundAction = (action) => {
-  const { type, payload, meta } = action;
-  const { background, ...metaRest } = meta;
-
-  return {
-    type,
-    payload,
-    meta: { ...metaRest, fromTab: true }
-  };
-};
-
-export const sendToBackground = action => new Promise((resolve) => {
-  chrome.runtime.sendMessage(action, response => resolve(response));
-});
-
-export default store => next => (action) => {
-  const { meta } = action;
-
-  if (meta && meta.background) {
-    sendToBackground(transformBackgroundAction(action))
-      .then(response => console.log('Background respond', response));
-  }
-
-  return next(action);
-};
diff --git a/src/app/content/middlewares/backgroundPublisher.ts b/src/app/content/middlewares/backgroundPublisher.ts
new file mode 100644
index 000000000..f8f376513
--- /dev/null
+++ b/src/app/content/middlewares/backgroundPublisher.ts
@@ -0,0 +1,26 @@
+import { AppAction } from 'app/actions';
+import { Dispatch } from 'redux';
+
+export const transformBackgroundAction = <A extends AppAction>(
+  action: A
+): A => ({
+  ...action,
+  meta: { ...action.meta, fromTab: true }
+});
+
+export const sendToBackground = (action: AppAction): Promise<string> =>
+  new Promise(resolve => {
+    chrome.runtime.sendMessage(action, response => resolve(response));
+  });
+
+export const backgroundPublisher = () => (next: Dispatch<AppAction>) => (
+  action: AppAction
+) => {
+  if (action.meta && action.meta.sendToBackground) {
+    sendToBackground(transformBackgroundAction(action)).then(response =>
+      console.log('Background respond', response)
+    );
+  }
+
+  return next(action);
+};
diff --git a/src/app/content/middlewares/index.js b/src/app/content/middlewares/index.js
index 2021afb0a..c64196908 100644
--- a/src/app/content/middlewares/index.js
+++ b/src/app/content/middlewares/index.js
@@ -1,9 +1,6 @@
-import backgroundPublisher from './backgroundPublisher';
-import sagaMiddleware from './saga';
+import { backgroundPublisher } from "./backgroundPublisher";
+import sagaMiddleware from "./saga";
 
 export { sagaMiddleware };
 
-export default [
-  backgroundPublisher,
-  sagaMiddleware
-];
+export default [backgroundPublisher, sagaMiddleware];
diff --git a/src/app/content/reducers/criteria.js b/src/app/content/reducers/criteria.js
deleted file mode 100644
index 877d00e28..000000000
--- a/src/app/content/reducers/criteria.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import {Map as ImmutableMap} from 'immutable';
-import { CRITERIA, SELECT_CRITERION, UNSELECT_CRITERION } from '../../constants/ActionTypes';
-
-export default (state = new ImmutableMap(), action) => {
-  const { type, payload } = action;
-
-  switch (type) {
-    case CRITERIA: {
-      const { criteria } = payload;
-      return state.set('criteria', criteria);
-    }
-
-    case SELECT_CRITERION: {
-      const { slug } = payload;
-      return state.setIn([slug, 'isSelected'], true);
-    }
-
-    case UNSELECT_CRITERION: {
-      const { slug } = payload;
-      return state.setIn([slug, 'isSelected'], false);
-    }
-
-    default:
-      return state;
-  }
-};
diff --git a/src/app/content/reducers/editors.js b/src/app/content/reducers/editors.js
deleted file mode 100644
index 8aab1cccf..000000000
--- a/src/app/content/reducers/editors.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Map as ImmutableMap } from 'immutable';
-import { EDITORS, EXCLUDE_EDITOR, INCLUDE_EDITOR } from '../../constants/ActionTypes';
-
-export default (state = new ImmutableMap(), action) => {
-  const { type, payload } = action;
-
-  switch (type) {
-    case EDITORS: {
-      const { editors } = payload;
-      return new ImmutableMap(editors);
-    }
-
-    case EXCLUDE_EDITOR: {
-      const { id } = payload;
-
-      return state.setIn([id.toString(), 'isExcluded'], true);
-    }
-
-    case INCLUDE_EDITOR: {
-      const { id } = payload;
-
-      return state.setIn([id.toString(), 'isExcluded'], false);
-    }
-
-    default:
-      return state;
-  }
-};
diff --git a/src/app/content/reducers/index.js b/src/app/content/reducers/index.js
deleted file mode 100644
index f907214b8..000000000
--- a/src/app/content/reducers/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { connectRouter } from 'connected-react-router/immutable'
-import { combineReducers } from 'redux-immutable';
-
-import criteria from './criteria';
-import editors from './editors';
-import onInstalledDetails from './onInstalledDetails';
-import open from './open';
-import preferenceScreenPanel from './preferenceScreenPanel';
-import recommendations from './recommendations';
-import reduced from './reduced';
-
-export default history => combineReducers({
-  criteria,
-  editors,
-  onInstalledDetails,
-  open,
-  preferenceScreenPanel,
-  recommendations,
-  reduced,
-  router: connectRouter(history)
-});
diff --git a/src/app/content/reducers/index.ts b/src/app/content/reducers/index.ts
new file mode 100644
index 000000000..ab8d3217d
--- /dev/null
+++ b/src/app/content/reducers/index.ts
@@ -0,0 +1,15 @@
+import { connectRouter } from 'connected-react-router';
+import { combineReducers } from 'redux';
+import { MemoryHistory } from 'history';
+
+import installationDetails from './installationDetails';
+import open from './open';
+import recommendations from './recommendations';
+
+export default (history: MemoryHistory) =>
+  combineReducers({
+    installationDetails,
+    open,
+    recommendations,
+    router: connectRouter(history)
+  });
diff --git a/src/app/content/reducers/installationDetails.ts b/src/app/content/reducers/installationDetails.ts
new file mode 100644
index 000000000..20667124b
--- /dev/null
+++ b/src/app/content/reducers/installationDetails.ts
@@ -0,0 +1,23 @@
+import { INSTALLED_DETAILS } from '../../constants/ActionTypes';
+import { InstallationDetails } from 'app/lmem/installation';
+import { version } from '../../../../package.json';
+import { AppAction } from '../../actions';
+
+export type InstallationDetailsState = InstallationDetails;
+
+const initialState: InstallationDetailsState = {
+  version
+};
+
+export default (
+  state: InstallationDetailsState = initialState,
+  action: AppAction
+): InstallationDetailsState => {
+  switch (action.type) {
+    case INSTALLED_DETAILS:
+      return action.payload.installationDetails;
+
+    default:
+      return state;
+  }
+};
diff --git a/src/app/content/reducers/onInstalledDetails.js b/src/app/content/reducers/onInstalledDetails.js
deleted file mode 100644
index c72186edc..000000000
--- a/src/app/content/reducers/onInstalledDetails.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Map as ImmutableMap } from 'immutable';
-import { INSTALLED_DETAILS } from '../../constants/ActionTypes';
-
-export default (state = new ImmutableMap(), action) => {
-  const { type, payload } = action;
-
-  switch (type) {
-    case INSTALLED_DETAILS:
-      const { onInstalledDetails } = payload;
-      return new ImmutableMap(onInstalledDetails);
-
-    default:
-      return state;
-  }
-};
\ No newline at end of file
diff --git a/src/app/content/reducers/open.js b/src/app/content/reducers/open.js
deleted file mode 100644
index 8decd8216..000000000
--- a/src/app/content/reducers/open.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import {Map as ImmutableMap} from 'immutable';
-import {
-  CLOSED, DEACTIVATE, OPENED, REPORT_NOTICE, UNINSTALL
-} from '../../constants/ActionTypes';
-
-const initialState = new ImmutableMap({
-  open: false,
-  mounted: false,
-});
-
-export default (state = initialState, action) => {
-  if (typeof state === 'boolean') {
-    state = new ImmutableMap({ open: state, mounted: state });
-  }
-
-  const { type } = action;
-
-  switch (type) {
-    case DEACTIVATE:
-    case REPORT_NOTICE:
-    case UNINSTALL:
-    case CLOSED:
-      return state.set('open', false);
-
-    case OPENED:
-      return state.set('open', true).set('mounted', true);
-
-    default:
-      return state;
-  }
-};
diff --git a/src/app/content/reducers/open.ts b/src/app/content/reducers/open.ts
new file mode 100644
index 000000000..d6b85bc50
--- /dev/null
+++ b/src/app/content/reducers/open.ts
@@ -0,0 +1,25 @@
+import { CLOSED, OPENED } from '../../constants/ActionTypes';
+import { AppAction } from 'app/actions';
+
+const initialState = {
+  open: false,
+  mounted: false
+};
+
+export interface OpenState {
+  open: boolean;
+  mounted: boolean;
+}
+
+export default (state: OpenState = initialState, action: AppAction) => {
+  switch (action.type) {
+    case CLOSED:
+      return { ...state, open: false };
+
+    case OPENED:
+      return { ...state, open: true, mounted: true };
+
+    default:
+      return state;
+  }
+};
diff --git a/src/app/content/reducers/preferenceScreenPanel.js b/src/app/content/reducers/preferenceScreenPanel.js
deleted file mode 100644
index 2ae76db99..000000000
--- a/src/app/content/reducers/preferenceScreenPanel.js
+++ /dev/null
@@ -1 +0,0 @@
-export default (state = null) => state;
\ No newline at end of file
diff --git a/src/app/content/reducers/recommendations.js b/src/app/content/reducers/recommendations.js
deleted file mode 100644
index c7f1da684..000000000
--- a/src/app/content/reducers/recommendations.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { LOCATION_CHANGE } from 'connected-react-router';
-import {
-  NOTICES_FOUND, DISMISS_NOTICE, UNDISMISS_NOTICE, LIKE_NOTICE, UNLIKE_NOTICE, DISLIKE_NOTICE, UNDISLIKE_NOTICE
-} from '../../constants/ActionTypes';
-import updateItem from '../../utils/updateItem';
-
-export default (state = [], action) => {
-  const { type, payload } = action;
-
-  switch (type) {
-    case NOTICES_FOUND:
-      return payload.notices;
-
-    case DISMISS_NOTICE:
-      return updateItem(state, { id: payload.id, dismissed: true, justDismissed: true });
-
-    case UNDISMISS_NOTICE:
-      return updateItem(state, { id: payload.id, dismissed: false, justDismissed: false });
-
-    case LIKE_NOTICE:
-      return updateItem(state, { id: payload.id, liked: true, justLiked: true });
-
-    case UNLIKE_NOTICE:
-      return updateItem(state, { id: payload.id, liked: false, justDismissed: false });
-
-    case DISLIKE_NOTICE:
-      return updateItem(state, { id: payload.id, disliked: true, justDisliked: true });
-
-    case UNDISLIKE_NOTICE:
-      return updateItem(state, { id: payload.id, disliked: false, justDisliked: false });
-
-    case LOCATION_CHANGE:
-      return state.map(
-        notice => ({
-          ...notice, justDismissed: false, justLiked: false, justDisliked: false
-        })
-      );
-
-    default:
-      return state;
-  }
-};
diff --git a/src/app/content/reducers/recommendations.ts b/src/app/content/reducers/recommendations.ts
new file mode 100644
index 000000000..966ae3c09
--- /dev/null
+++ b/src/app/content/reducers/recommendations.ts
@@ -0,0 +1,65 @@
+import { LOCATION_CHANGE } from 'connected-react-router';
+import {
+  dislikeNotice,
+  dismissNotice,
+  likeNotice,
+  undislikeNotice,
+  undismissNotice,
+  unlikeNotice,
+  EnhancedNotice
+} from '../../lmem/notice';
+import { AppAction } from 'app/actions';
+
+export type NoticesState = EnhancedNotice[];
+
+export default (state: NoticesState = [], action: AppAction): NoticesState => {
+  switch (action.type) {
+    case 'NOTICES_FOUND':
+      return action.payload.notices;
+
+    case 'FEEDBACK_ON_NOTICE':
+      switch (action.payload.feedback) {
+        case 'dismiss':
+          return state.map(notice =>
+            notice.id === action.payload.id ? dismissNotice(notice) : notice
+          );
+
+        case 'undismiss':
+          return state.map(notice =>
+            notice.id === action.payload.id ? undismissNotice(notice) : notice
+          );
+
+        case 'like':
+          return state.map(notice =>
+            notice.id === action.payload.id ? likeNotice(notice) : notice
+          );
+
+        case 'unlike':
+          return state.map(notice =>
+            notice.id === action.payload.id ? unlikeNotice(notice) : notice
+          );
+
+        case 'dislike':
+          return state.map(notice =>
+            notice.id === action.payload.id ? dislikeNotice(notice) : notice
+          );
+
+        case 'undislike':
+          return state.map(notice =>
+            notice.id === action.payload.id ? undislikeNotice(notice) : notice
+          );
+      }
+      return state;
+
+    case LOCATION_CHANGE:
+      return state.map(notice => ({
+        ...notice,
+        justDisliked: false,
+        justLiked: false,
+        justDismissed: false
+      }));
+
+    default:
+      return state;
+  }
+};
diff --git a/src/app/content/reducers/reduced.js b/src/app/content/reducers/reduced.js
deleted file mode 100644
index b6681b080..000000000
--- a/src/app/content/reducers/reduced.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
-  EXTEND_RECOMMENDATION_IFRAME,
-  NOTICES_FOUND,
-  REDUCE_RECOMMENDATION_IFRAME
-} from '../../constants/ActionTypes';
-
-export default (state = true, action) => {
-  const { type } = action;
-
-  switch (type) {
-    case REDUCE_RECOMMENDATION_IFRAME:
-      return true;
-
-    case NOTICES_FOUND:
-    case EXTEND_RECOMMENDATION_IFRAME:
-      return false;
-
-    default:
-      return state;
-  }
-};
diff --git a/src/app/content/sagas/background.js b/src/app/content/sagas/background.js
deleted file mode 100644
index 0a64d3790..000000000
--- a/src/app/content/sagas/background.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { put, takeLatest, fork } from 'redux-saga/effects';
-import fromJS from '../../utils/customFromJS';
-import watchSingleMessageSaga from '../../utils/watchSingleMessageSaga';
-import { INIT } from '../../constants/ActionTypes';
-import { updateCriteria, updateEditors, updateInstalledDetails } from '../actions/filters';
-
-export function* initSaga({ payload: { onInstalledDetails, criteria, editors } }) {
-  try {
-    yield put(updateInstalledDetails(fromJS(onInstalledDetails)));
-    yield put(updateCriteria(fromJS(criteria)));
-    yield put(updateEditors(fromJS(editors)));
-  } catch (e) {
-    console.error(e);
-  }
-}
-
-export default function* backgroundRootSaga() {
-  yield fork(watchSingleMessageSaga);
-
-  yield takeLatest(INIT, initSaga);
-}
diff --git a/src/app/content/sagas/background.ts b/src/app/content/sagas/background.ts
new file mode 100644
index 000000000..221e8c746
--- /dev/null
+++ b/src/app/content/sagas/background.ts
@@ -0,0 +1,19 @@
+import { put, takeLatest, fork } from 'redux-saga/effects';
+import watchSingleMessageSaga from '../../utils/watchSingleMessageSaga';
+import { INIT } from '../../constants/ActionTypes';
+import { updateInstalledDetails } from 'app/actions/filters';
+import { InitAction } from 'app/actions/tabs';
+
+export function* initSaga({ payload: { installationDetails } }: InitAction) {
+  try {
+    yield put(updateInstalledDetails(installationDetails));
+  } catch (e) {
+    console.error(e);
+  }
+}
+
+export default function* backgroundRootSaga() {
+  yield fork(watchSingleMessageSaga);
+
+  yield takeLatest(INIT, initSaga);
+}
diff --git a/src/app/content/sagas/browserAction.js b/src/app/content/sagas/browserAction.js
index 60a05f288..afae5101c 100644
--- a/src/app/content/sagas/browserAction.js
+++ b/src/app/content/sagas/browserAction.js
@@ -1,7 +1,7 @@
-import { put, takeLatest, select } from 'redux-saga/effects';
-import { BROWSER_ACTION_CLICKED } from '../../constants/browser/action';
-import { open, close } from '../actions/ui';
-import { isOpen as isNotificationOpen } from '../selectors';
+import { put, takeLatest, select } from "redux-saga/effects";
+import { BROWSER_ACTION_CLICKED } from "../../constants/browser/action";
+import { open, close } from "app/actions/ui";
+import { isOpen as isNotificationOpen } from "../selectors";
 
 export function* browserActionClickedSaga() {
   const isOpen = yield select(isNotificationOpen);
diff --git a/src/app/content/sagas/ui.js b/src/app/content/sagas/ui.js
deleted file mode 100644
index 0566e343f..000000000
--- a/src/app/content/sagas/ui.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import React from 'react';
-import {
-  put, takeLatest, select, call
-} from 'redux-saga/effects';
-import { render } from 'react-dom';
-import { push } from 'connected-react-router';
-import { open, opened, closed } from '../actions/ui';
-import { isOpen as isNotificationOpen, isMounted as isNotificationMounted} from '../selectors';
-import { CLOSE, OPEN, NOTICES_FOUND } from '../../constants/ActionTypes';
-import { append, create } from '../extensionIframe';
-import theme from '../../theme';
-import App from '../App';
-
-const iframe = create({
-  style: theme.iframe.style,
-});
-
-const getLocation = state => state.getIn(['router', 'location', 'pathname']);
-
-export function* openSaga() {
-  const isOpen = yield select(isNotificationOpen);
-  const isMounted = yield select(isNotificationMounted);
-
-  if (!isOpen) {
-    const location = yield select(getLocation);
-    if (location) {
-      yield put(push('/'));
-    }
-
-    if (isMounted) {
-      document.querySelector('#lmemFrame').style.setProperty('display', '', 'important');
-    } else {
-      const contentDocument = yield call(append, iframe);
-      const root = document.createElement('div');
-      contentDocument.body.appendChild(root);
-      yield call(render, <App contentDocument={contentDocument} />, root);
-    }
-
-    yield put(opened());
-  }
-}
-
-export function* closeSaga() {
-  const isOpen = yield select(isNotificationOpen);
-  if (isOpen) {
-    document.querySelector('#lmemFrame').style.setProperty('display', 'none', 'important');
-    yield put(closed());
-  }
-}
-
-export function* recommendationFoundSaga() {
-  yield put(open());
-}
-
-export default function* backgroundRootSaga() {
-  yield takeLatest(OPEN, openSaga);
-  yield takeLatest(CLOSE, closeSaga);
-  yield takeLatest(NOTICES_FOUND, recommendationFoundSaga);
-}
diff --git a/src/app/content/sagas/ui.tsx b/src/app/content/sagas/ui.tsx
new file mode 100644
index 000000000..5b62c31e6
--- /dev/null
+++ b/src/app/content/sagas/ui.tsx
@@ -0,0 +1,68 @@
+import React from "react";
+import { put, takeLatest, select, call } from "redux-saga/effects";
+import { render } from "react-dom";
+import { push } from "connected-react-router";
+import { open, opened, closed } from "app/actions/ui";
+import {
+  isOpen as isNotificationOpen,
+  isMounted as isNotificationMounted
+} from "../selectors";
+import { CLOSE, OPEN, NOTICES_FOUND } from "../../constants/ActionTypes";
+import { append, create } from "../extensionIframe";
+import theme from "../../theme";
+import App from "../App";
+import { State } from "../store";
+
+const iframe = create(theme.iframe.style);
+
+const getLocation = (state: State) => state.router.location.pathname;
+
+const setFrameImportant = () => {
+  const frame = document.querySelector("#lmemFrame");
+  if (frame) {
+    (frame as HTMLIFrameElement).style.setProperty("display", "", "important");
+  }
+};
+
+export function* openSaga() {
+  const isOpen = yield select(isNotificationOpen);
+  const isMounted = yield select(isNotificationMounted);
+
+  if (!isOpen) {
+    const location = yield select(getLocation);
+    if (location) {
+      yield put(push("/"));
+    }
+
+    if (isMounted) {
+      setFrameImportant();
+    } else {
+      const contentDocument = yield call(append, iframe);
+      const root = document.createElement("div");
+      contentDocument.body.appendChild(root);
+      const show = () =>
+        render(<App contentDocument={contentDocument} />, root);
+      yield call(show);
+    }
+
+    yield put(opened());
+  }
+}
+
+export function* closeSaga() {
+  const isOpen = yield select(isNotificationOpen);
+  if (isOpen) {
+    setFrameImportant();
+    yield put(closed());
+  }
+}
+
+export function* recommendationFoundSaga() {
+  yield put(open());
+}
+
+export default function* backgroundRootSaga() {
+  yield takeLatest(OPEN, openSaga);
+  yield takeLatest(CLOSE, closeSaga);
+  yield takeLatest(NOTICES_FOUND, recommendationFoundSaga);
+}
diff --git a/src/app/content/selectors/index.js b/src/app/content/selectors/index.js
deleted file mode 100644
index e940f7267..000000000
--- a/src/app/content/selectors/index.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { getById } from './notices';
-import recommendationFilter from '../../lmem/recommendationFilter';
-
-export const getNotices = state => state.get('recommendations');
-
-export const getNoticeById = (state, { match: { params } }) => getById(getNotices(state), params);
-
-export const isOpen = state => state.getIn(['open', 'open']);
-export const isMounted = state => state.getIn(['open', 'mounted']);
-
-export const getFilteredNotices = state => getNotices(state).filter(recommendationFilter);
-
-export const getOnInstalledDetails = state => state.get('onInstalledDetails');
-
-export const getInstallationDate = state => getOnInstalledDetails(state).get('datetime');
diff --git a/src/app/content/selectors/index.ts b/src/app/content/selectors/index.ts
new file mode 100644
index 000000000..da94ca2ec
--- /dev/null
+++ b/src/app/content/selectors/index.ts
@@ -0,0 +1,33 @@
+import { createSelector } from 'reselect';
+import { RouteComponentProps } from 'react-router';
+import { getNotice, shouldNoticeBeShown } from 'app/lmem/notice';
+import { InstallationDetails } from 'app/lmem/installation';
+import { State } from '../store';
+
+export const getNotices = (state: State) => state.recommendations;
+
+export const getNoticeById = (
+  state: State,
+  {
+    match: {
+      params: { id }
+    }
+  }: RouteComponentProps<{ id?: string }>
+) => getNotice(Number(id), getNotices(state));
+
+export const isOpen = (state: State): boolean => state.open.open;
+export const isMounted = (state: State): boolean => state.open.mounted;
+
+export const getFilteredNotices = createSelector(
+  getNotices,
+  notices => notices.filter(shouldNoticeBeShown)
+);
+
+export const getOnInstalledDetails = (state: State): InstallationDetails =>
+  state.installationDetails;
+
+export const getExtensionInstallationDate = createSelector(
+  getOnInstalledDetails,
+  (details: InstallationDetails) =>
+    details.datetime ? new Date(details.datetime) : undefined
+);
diff --git a/src/app/content/selectors/notices.js b/src/app/content/selectors/notices.js
deleted file mode 100644
index b417b5814..000000000
--- a/src/app/content/selectors/notices.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export const getById = (
-  state,
-  { id },
-) => state.find(notice => notice.id === Number(id));
diff --git a/src/app/content/setup.js b/src/app/content/setup.js
deleted file mode 100644
index 96a009e06..000000000
--- a/src/app/content/setup.js
+++ /dev/null
@@ -1,47 +0,0 @@
-export const AFTER_DOMCOMPLETE_DELAY = 2000;
-export const AFTER_LOADEND_DELAY = 1000;
-export const LOADING_SCREEN_DELAY = 4000;
-
-export const DOMCompleteP = Promise.resolve(); // because the content script is loaded at "document_end"
-
-export const DOMCompletePlusDelayP = DOMCompleteP.then(() => {
-  return new Promise((resolve) => {
-    const {navigationStart, domContentLoadedEventStart} = performance.timing;
-
-    const diff = domContentLoadedEventStart - navigationStart;
-
-    if(diff >= AFTER_DOMCOMPLETE_DELAY) resolve();
-    else setTimeout(resolve, AFTER_DOMCOMPLETE_DELAY - diff);
-  });
-});
-
-export const LoadEndP = new Promise((resolve) => {
-  document.addEventListener('load', resolve);
-});
-
-export const LoadEndPlusDelayP = LoadEndP.then(() => {
-  return new Promise((resolve) => {
-    const {navigationStart, loadEventStart} = performance.timing;
-
-    const diff = loadEventStart - navigationStart;
-
-    if(diff >= AFTER_LOADEND_DELAY) resolve();
-    else setTimeout(resolve, AFTER_LOADEND_DELAY - diff);
-  });
-});
-
-// Wait for some time before showing the extension to the user in loading mode
-export const CanShowIframeLoadingP = process.env.NODE_ENV === 'development'
-  ? Promise.resolve()
-  : Promise.race([DOMCompletePlusDelayP, LoadEndPlusDelayP]);
-
-// User research showed that the LMEM loading screen is important so people don't
-// think the LMEM iframe is an ad.
-// Wait for some time loading before showing a recommendation.
-export const CanShowRecommendationIfAvailableP = process.env.NODE_ENV === 'development'
-  ? Promise.resolve() // otherwise the delay is annoying when developing
-  : CanShowIframeLoadingP.then(() => {
-    return new Promise((resolve) => {
-      setTimeout(resolve, LOADING_SCREEN_DELAY);
-    });
-  });
\ No newline at end of file
diff --git a/src/app/content/store.js b/src/app/content/store.js
deleted file mode 100644
index acc56f72f..000000000
--- a/src/app/content/store.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { applyMiddleware, createStore, } from 'redux';
-import { routerMiddleware } from 'connected-react-router/immutable';
-import { createMemoryHistory } from 'history';
-import { Record, Map as ImmutableMap } from 'immutable';
-import rootReducer from './reducers';
-import middlewares, { sagaMiddleware } from './middlewares';
-import rootSaga from './sagas';
-
-export const history = createMemoryHistory();
-
-const enhancer = process.env.NODE_ENV !== 'production'
-  ? applyMiddleware(routerMiddleware(history), ...middlewares.concat([
-        require('redux-immutable-state-invariant').default(), // eslint-disable-line
-        require('redux-logger').createLogger({ // eslint-disable-line
-      level: 'info',
-      collapsed: true,
-      stateTransformer: state => state.toJS()
-    }),
-  ]))
-  : applyMiddleware(routerMiddleware(history), ...middlewares);
-
-const store = createStore(
-  rootReducer(history),
-  new Record({
-    open: false,
-    reduced: true,
-    preferenceScreenPanel: null, // preference screen close
-    recommendations: [],
-    onInstalledDetails: new ImmutableMap(),
-    criteria: new ImmutableMap(),
-    editors: new ImmutableMap(),
-    router: new ImmutableMap()
-  })(),
-  enhancer
-);
-
-sagaMiddleware.run(rootSaga);
-
-export default store;
diff --git a/src/app/content/store.ts b/src/app/content/store.ts
new file mode 100644
index 000000000..697640707
--- /dev/null
+++ b/src/app/content/store.ts
@@ -0,0 +1,39 @@
+import { applyMiddleware, createStore } from 'redux';
+import { routerMiddleware, RouterState } from 'connected-react-router';
+import { createMemoryHistory } from 'history';
+import rootReducer from './reducers';
+import middlewares, { sagaMiddleware } from './middlewares';
+import rootSaga from './sagas';
+import { InstallationDetailsState } from './reducers/installationDetails';
+import { OpenState } from './reducers/open';
+import { NoticesState } from './reducers/recommendations';
+import { PersistedState } from 'redux-persist/es/types';
+export const history = createMemoryHistory();
+
+export interface State extends PersistedState {
+  installationDetails: InstallationDetailsState;
+  open: OpenState;
+  recommendations: NoticesState;
+  router: RouterState;
+}
+
+const enhancer =
+  process.env.NODE_ENV !== 'production'
+    ? applyMiddleware(
+        routerMiddleware(history),
+        ...middlewares.concat([
+          require('redux-immutable-state-invariant').default(), // eslint-disable-line
+          require('redux-logger').createLogger({
+            // eslint-disable-line
+            level: 'info',
+            collapsed: true
+          })
+        ])
+      )
+    : applyMiddleware(routerMiddleware(history), ...middlewares);
+
+const store = createStore(rootReducer(history), enhancer);
+
+sagaMiddleware.run(rootSaga);
+
+export default store;
diff --git a/src/app/lmem/Notice.js b/src/app/lmem/Notice.js
deleted file mode 100644
index e3aa7f6d6..000000000
--- a/src/app/lmem/Notice.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/* eslint-disable no-nested-ternary */
-export default {
-  isIgnored: notice => notice.dismissed || notice.disliked,
-  ignoringReason: notice => (notice.dismissed ? 'dismiss' : notice.disliked ? 'dislike' : 'other')
-};
diff --git a/src/app/lmem/criterion.ts b/src/app/lmem/criterion.ts
new file mode 100644
index 000000000..f66fe6723
--- /dev/null
+++ b/src/app/lmem/criterion.ts
@@ -0,0 +1,17 @@
+export interface Criterion {
+  label: string;
+  slug: string;
+  isSelected?: boolean;
+}
+
+export type Criteria = { [key: string]: Criterion };
+
+export const selectCriterion = (criterion: Criterion): Criterion => ({
+  ...criterion,
+  isSelected: true
+});
+
+export const unselectCriterion = (criterion: Criterion): Criterion => ({
+  ...criterion,
+  isSelected: false
+});
diff --git a/src/app/lmem/draft-preview/main.js b/src/app/lmem/draft-preview/main.js
deleted file mode 100644
index 5e0ccf72f..000000000
--- a/src/app/lmem/draft-preview/main.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import { debounce } from 'lodash-es';
-
-import {LMEM_BACKEND_ORIGIN} from '../../constants/origins';
-
-function isRecommendationBackendURL(url) {
-  const { origin, pathname, search } = new URL(url);
-
-  return origin === LMEM_BACKEND_ORIGIN
-    && pathname.includes('/admin')
-    && search.includes('action=list') 
-    && search.includes('entity=Recommendation');
-}
-
-export default function (tabs, contentCode, updateDraftRecommendations) {
-
-  // The onCreated and onUpdated events lead to too many calls by default
-  // Let's debounce 2secs
-  const grabDraftRecommendations = debounce(function (tabId) {
-    tabs.executeScript(tabId, {
-      code: contentCode,
-      runAt: 'document_end'
-    }, () => {
-      console.log('Finished loading drafts content script');
-      const tabPort = tabs.connect(tabId);
-
-      tabPort.onMessage.addListener((msg) => {
-        console.log('message from draft grabing content script', msg);
-
-        updateDraftRecommendations(msg);
-      });
-    });
-  }, 2 * 1000, {leading: true, trailing: false});
-
-  tabs.onCreated.addListener(({ id, url }) => {
-    if (url && isRecommendationBackendURL(url)) {
-      grabDraftRecommendations(id);
-    }
-  });
-
-  tabs.onUpdated.addListener((id, { status, url: newUrl }, { url }) => {
-    if (status === 'loading' && isRecommendationBackendURL(newUrl || url)) {
-      grabDraftRecommendations(id);
-    }
-  });
-}
\ No newline at end of file
diff --git a/src/app/lmem/draft-preview/main.ts b/src/app/lmem/draft-preview/main.ts
new file mode 100644
index 000000000..e1534cb83
--- /dev/null
+++ b/src/app/lmem/draft-preview/main.ts
@@ -0,0 +1,62 @@
+import { debounce } from 'lodash-es';
+import { LMEM_BACKEND_ORIGIN } from '../../constants/origins';
+import TabChangeInfo = chrome.tabs.TabChangeInfo;
+import Tab = chrome.tabs.Tab;
+
+function isRecommendationBackendURL(url: string) {
+  const { origin, pathname, search } = new URL(url);
+
+  return (
+    origin === LMEM_BACKEND_ORIGIN &&
+    pathname.includes('/admin') &&
+    search.includes('action=list') &&
+    search.includes('entity=Recommendation')
+  );
+}
+
+export default function(
+  tabs: any,
+  contentCode: string,
+  updateDraftRecommendations: (msg: any) => void
+) {
+  // The onCreated and onUpdated events lead to too many calls by default
+  // Let's debounce 2secs
+  const grabDraftRecommendations = debounce(
+    function(tabId: number) {
+      tabs.executeScript(
+        tabId,
+        {
+          code: contentCode,
+          runAt: 'document_end'
+        },
+        () => {
+          console.log('Finished loading drafts content script');
+          const tabPort = tabs.connect(tabId);
+
+          tabPort.onMessage.addListener((msg: any) => {
+            console.log('message from draft grabing content script', msg);
+
+            updateDraftRecommendations(msg);
+          });
+        }
+      );
+    },
+    2 * 1000,
+    { leading: true, trailing: false }
+  );
+
+  tabs.onCreated.addListener(({ id, url }: Tab) => {
+    if (url && id && isRecommendationBackendURL(url)) {
+      grabDraftRecommendations(id);
+    }
+  });
+
+  tabs.onUpdated.addListener(
+    (id: number, { status, url: newUrl }: TabChangeInfo, { url }: Tab) => {
+      const u = newUrl || url;
+      if (status === 'loading' && u && isRecommendationBackendURL(u)) {
+        grabDraftRecommendations(id);
+      }
+    }
+  );
+}
diff --git a/src/app/lmem/editors.ts b/src/app/lmem/editors.ts
new file mode 100644
index 000000000..490b0fcbb
--- /dev/null
+++ b/src/app/lmem/editors.ts
@@ -0,0 +1,15 @@
+export interface Editor {
+  id: number;
+  isExcluded?: boolean;
+  label: string;
+  url: string;
+}
+
+export const excludeEditor = (editor: Editor): Editor => ({
+  ...editor,
+  isExcluded: true
+});
+export const includeEditor = (editor: Editor): Editor => ({
+  ...editor,
+  isExcluded: false
+});
diff --git a/src/app/lmem/fetchMatchingNotices.ts b/src/app/lmem/fetchMatchingNotices.ts
new file mode 100644
index 000000000..5d1bb2123
--- /dev/null
+++ b/src/app/lmem/fetchMatchingNotices.ts
@@ -0,0 +1,7 @@
+import { Notice } from './notice';
+
+const fetchNotice = (url: string): Promise<Notice> =>
+  fetch(url).then((response: Response) => response.json());
+
+export const fetchMatchingNotices = (urls: string[]) =>
+  Promise.all(urls.map(fetchNotice));
diff --git a/src/app/lmem/findMatchingOffersAccordingToPreferences.js b/src/app/lmem/findMatchingOffersAccordingToPreferences.js
deleted file mode 100644
index 54606c0f1..000000000
--- a/src/app/lmem/findMatchingOffersAccordingToPreferences.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Map as ImmutableMap, Set as ImmutableSet } from 'immutable';
-
-let whatwgURL;
-
-// whatwgURL is only needed to run tests in Node.
-// This line prevents Uglify from tripping over some ES6 in 'whatwg-url'
-if (process.env.NODE_ENV === 'test') {
-  whatwgURL = require('whatwg-url'); // eslint-disable-line
-}
-
-function findMatchingMatchingContexts(url, matchingContexts) {
-  return matchingContexts.filter(({ url_regex: urlRegex, exclude_url_regex: excludeUrlRegex }) => {
-    try {
-      return new RegExp(urlRegex, 'i').test(url)
-        && !(excludeUrlRegex && new RegExp(excludeUrlRegex, 'i').test(url));
-    }
-    catch (err) {
-      if (process.env.NODE_ENV !== 'test') console.error('MatchingContext ignored:', err);
-      return false;
-    }
-  });
-}
-
-const _URL = typeof URL === 'function' ? URL : whatwgURL.URL;
-
-export default function (url, matchingContexts, draftMatchingContexts, prefs = new ImmutableMap()) {
-  const deactivated = prefs.get('deactivated') || new ImmutableMap();
-
-  if (deactivated.has('everywhereUntil') && Date.now() < deactivated.get('everywhereUntil')) return [];
-
-  const deactivatedWebsites = deactivated.get('deactivatedWebsites') || new ImmutableSet();
-
-  if (deactivatedWebsites.has((new _URL(url)).hostname)) return [];
-
-  const matchingDraftMatchingContexts = findMatchingMatchingContexts(url, draftMatchingContexts);
-
-  // prioritize previews over public offers
-  return matchingDraftMatchingContexts.length >= 1
-    ? matchingDraftMatchingContexts
-    : findMatchingMatchingContexts(url, matchingContexts);
-}
diff --git a/src/app/lmem/getMatchingRecommendations.js b/src/app/lmem/getMatchingRecommendations.js
deleted file mode 100644
index 2d2ebba7f..000000000
--- a/src/app/lmem/getMatchingRecommendations.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default function (recoURLs) {
-  return Promise.all(
-    recoURLs.map(u => fetch(u).then(resp => resp.json()))
-  )
-    .then((...recoss) => [].concat(...recoss));
-}
\ No newline at end of file
diff --git a/src/app/lmem/index.js b/src/app/lmem/index.js
deleted file mode 100644
index 3cc79ceab..000000000
--- a/src/app/lmem/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export { default as findMatchingOffersAccordingToPreferences } from './findMatchingOffersAccordingToPreferences';
-export { default as getMatchingRecommendations } from './getMatchingRecommendations';
-export { default as recommendationFilter } from './recommendationFilter';
-export { default as recommendationIsValid } from './recommendationIsValid';
-export { findType } from './typeOfCriteria';
-export { filterTags } from './typeOfCriteria';
diff --git a/src/app/lmem/installation.ts b/src/app/lmem/installation.ts
new file mode 100644
index 000000000..21fc582f9
--- /dev/null
+++ b/src/app/lmem/installation.ts
@@ -0,0 +1,4 @@
+export type InstallationDetails = {
+  datetime?: Date;
+  version: string;
+};
diff --git a/src/app/lmem/matchingContext.ts b/src/app/lmem/matchingContext.ts
new file mode 100644
index 000000000..d3d2f781b
--- /dev/null
+++ b/src/app/lmem/matchingContext.ts
@@ -0,0 +1,46 @@
+export interface MatchingContext {
+  recommendation_url: string;
+  url_regex: string;
+  exclude_url_regex?: string;
+}
+
+export const urlMatchesContext = (
+  url: string,
+  { url_regex, exclude_url_regex }: MatchingContext
+): boolean => {
+  try {
+    return (
+      new RegExp(url_regex, 'i').test(url) &&
+      !(exclude_url_regex && new RegExp(exclude_url_regex, 'i').test(url))
+    );
+  } catch (err) {
+    if (process.env.NODE_ENV !== 'test') {
+      console.error('MatchingContext ignored:', err);
+    }
+    return false;
+  }
+};
+
+export const findMatchingMatchingContexts = (
+  url: string,
+  allMatchingContexts: MatchingContext[]
+): MatchingContext[] =>
+  allMatchingContexts.filter((context: MatchingContext) =>
+    urlMatchesContext(url, context)
+  );
+
+export function findMatchingOffersAccordingToPreferences(
+  url: string,
+  matchingContexts: MatchingContext[],
+  draftMatchingContexts: MatchingContext[]
+) {
+  const matchingDraftMatchingContexts = findMatchingMatchingContexts(
+    url,
+    draftMatchingContexts
+  );
+
+  // prioritize previews over public offers
+  return matchingDraftMatchingContexts.length >= 1
+    ? matchingDraftMatchingContexts
+    : findMatchingMatchingContexts(url, matchingContexts);
+}
diff --git a/src/app/lmem/notice.ts b/src/app/lmem/notice.ts
new file mode 100644
index 000000000..4cca7fb38
--- /dev/null
+++ b/src/app/lmem/notice.ts
@@ -0,0 +1,147 @@
+import { find } from 'ramda';
+import { Criterion } from './criterion';
+import { Editor } from './editors';
+
+export interface Alternative {
+  label: string;
+  url_to_redirect: string;
+}
+
+export interface Contributor {
+  image: string;
+  name: string;
+  organization: string;
+}
+
+export interface Resource {
+  author?: string;
+  editor: Editor;
+  label: string;
+  url: string;
+}
+
+export interface Notice {
+  id: number;
+  title: string;
+  description: string;
+  contributor: Contributor;
+  resource: Resource;
+  alternatives: Alternative[];
+  criteria: Criterion[];
+  filters?: Criterion[];
+  likes: number;
+  dislikes: number;
+  valid: boolean;
+  visibility: 'public';
+}
+
+export interface EnhancedNotice extends Notice {
+  liked: boolean;
+  justLiked?: boolean;
+  disliked: boolean;
+  justDisliked?: boolean;
+  dismissed: boolean;
+  justDismissed?: boolean;
+}
+
+/* eslint-disable no-nested-ternary */
+export type IgnoringReason = 'dislike' | 'dismiss' | 'other';
+export const isIgnored = (notice: EnhancedNotice): boolean =>
+  notice.dismissed || notice.disliked;
+export const ignoringReason = (notice: EnhancedNotice): IgnoringReason =>
+  notice.dismissed ? 'dismiss' : notice.disliked ? 'dislike' : 'other';
+
+export const dismissNotice = (notice: EnhancedNotice): EnhancedNotice => ({
+  ...notice,
+  dismissed: true,
+  justDismissed: true
+});
+export const undismissNotice = (notice: EnhancedNotice): EnhancedNotice => ({
+  ...notice,
+  dismissed: false,
+  justDismissed: false
+});
+export const likeNotice = (notice: EnhancedNotice): EnhancedNotice => ({
+  ...notice,
+  liked: true,
+  justLiked: true
+});
+export const unlikeNotice = (notice: EnhancedNotice): EnhancedNotice => ({
+  ...notice,
+  liked: false,
+  justLiked: false
+});
+export const dislikeNotice = (notice: EnhancedNotice): EnhancedNotice => ({
+  ...notice,
+  disliked: true,
+  justDisliked: true
+});
+export const undislikeNotice = (notice: EnhancedNotice): EnhancedNotice => ({
+  ...notice,
+  disliked: false,
+  justDisliked: false
+});
+
+export const getNotice = <N extends Notice>(
+  id: number,
+  notices: N[]
+): N | undefined => find((notice: N): boolean => notice.id === id, notices);
+
+export const isNoticeValid = (notice: Notice): boolean => {
+  if (Object(notice) !== notice) return false;
+
+  const {
+    contributor,
+    title,
+    description,
+    resource,
+    criteria,
+    alternatives
+  } = notice;
+
+  return (
+    typeof title === 'string' &&
+    typeof description === 'string' &&
+    Object(resource) === resource &&
+    typeof resource.label === 'string' &&
+    typeof resource.url === 'string' &&
+    (!resource.author || typeof resource.author === 'string') &&
+    Object(resource.editor) === resource.editor &&
+    typeof resource.editor.label === 'string' &&
+    typeof resource.editor.url === 'string' &&
+    Object(contributor) === contributor &&
+    typeof contributor.name === 'string' &&
+    (!criteria ||
+      (Array.isArray(criteria) &&
+        criteria.every(
+          criterion =>
+            Object(criterion) === criterion &&
+            typeof criterion.label === 'string' &&
+            typeof criterion.slug === 'string'
+        ))) &&
+    (!alternatives ||
+      (Array.isArray(alternatives) &&
+        alternatives.every(
+          alternative =>
+            Object(alternative) === alternative &&
+            typeof alternative.label === 'string' &&
+            typeof alternative.url_to_redirect === 'string'
+        )))
+  );
+};
+
+export const warnIfNoticeInvalid = (notice: Notice): boolean => {
+  const valid = isNoticeValid(notice);
+
+  if (!valid) {
+    console.warn('Invalid notice not displayed:', notice);
+  }
+
+  return valid;
+};
+
+export const shouldNoticeBeShown = (notice: EnhancedNotice): boolean =>
+  (notice.valid &&
+    (!notice.dismissed || notice.justDismissed) &&
+    (!notice.disliked || notice.justDisliked)) ||
+  false;
diff --git a/src/app/lmem/noticeType.ts b/src/app/lmem/noticeType.ts
new file mode 100644
index 000000000..2c98a9371
--- /dev/null
+++ b/src/app/lmem/noticeType.ts
@@ -0,0 +1,30 @@
+import { Criterion } from './criterion';
+
+export type NoticeType =
+  | 'Approval'
+  | 'Disapproval'
+  | 'Tip'
+  | 'Alternative'
+  | 'Other';
+
+export function findType(criteria: Criterion[]): NoticeType {
+  return criteria.reduce((acc: NoticeType, { slug }: Criterion): NoticeType => {
+    switch (slug) {
+      case 'go':
+        return 'Approval';
+      case 'no-go':
+        return 'Disapproval';
+      case 'alert':
+        return 'Tip';
+      default:
+        return acc;
+    }
+  }, 'Other');
+}
+
+type Referential<T> = { [key in NoticeType]: T };
+
+export const getTypeOrFallback = <T extends any>(
+  referential: Referential<T>
+) => (type?: NoticeType): T =>
+  type && type in referential ? referential[type] : referential.Other;
diff --git a/src/app/lmem/recommendationFilter.js b/src/app/lmem/recommendationFilter.js
deleted file mode 100644
index 971a41581..000000000
--- a/src/app/lmem/recommendationFilter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default notice => notice.valid
-  && (!notice.dismissed || notice.justDismissed)
-  && (!notice.disliked || notice.justDisliked);
diff --git a/src/app/lmem/recommendationIsValid.js b/src/app/lmem/recommendationIsValid.js
deleted file mode 100644
index c2e6ab211..000000000
--- a/src/app/lmem/recommendationIsValid.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * It happened in the past that invalid recommendation object result in broken UI
- * https://github.com/insitu-project/proto-ext/issues/85
- * This was due to the server sending back objects with missing fields
- * This function validates the object at runtime to decide what to do before the
- * object gets sent to the UI.
- */
-
-/*
-
-const reco = {
-  title: 'Il y a mieux que le Samsung Galaxy S6',
-  description: 'Que vous ayez un usage basique, avancé, professionnel [...]',
-  contributor: {
-    name: 'Maarten Samson',
-  },
-  // criteria: [
-  //   {
-  //     slug: 'health',
-  //     label: 'Santé',
-  //   },
-  // ],
-  resource: {
-    // author: 'Boby',
-    url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-    label: 'Lire le comparatif',
-    editor: {
-      id: 6
-      label: 'Le Gorafi',
-      url: 'http://legorafi.fr',
-    },
-  },
-  // alternatives: [
-  //   {
-  //     url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-  //     label: 'Voir l’alternative',
-  //   },
-  // ],
-};
-
-*/
-
-export const isValid = (notice) => {
-  if(Object(notice) !== notice) return false;
-
-  const {
-    contributor, title, description, resource, criteria, alternatives
-  } = notice;
-
-  return (
-
-    typeof title === 'string'
-    && typeof description === 'string'
-
-    && Object(resource) === resource
-    && typeof resource.label === 'string'
-    && typeof resource.url === 'string'
-
-    && (!resource.author || typeof resource.author === 'string')
-
-    && Object(resource.editor) === resource.editor
-    && typeof resource.editor.label === 'string'
-    && typeof resource.editor.url === 'string'
-
-    && Object(contributor) === contributor
-    && typeof contributor.name === 'string'
-
-    && (!criteria || (Array.isArray(criteria) && criteria.every(criterion => (
-      Object(criterion) === criterion
-        && typeof criterion.label === 'string'
-        && typeof criterion.slug === 'string'
-    ))))
-
-    && (!alternatives || (Array.isArray(alternatives) && alternatives.every(alternative => (
-      Object(alternative) === alternative
-        && typeof alternative.label === 'string'
-        && typeof alternative.url_to_redirect === 'string'
-    ))))
-
-  );
-};
-
-export default (notice) => {
-  const valid = isValid(notice);
-
-  if (!valid) {
-    console.warn('Invalid notice not displayed:', notice);
-  }
-
-  return valid;
-};
diff --git a/src/app/lmem/typeOfCriteria.js b/src/app/lmem/typeOfCriteria.js
deleted file mode 100644
index f3a3a8e26..000000000
--- a/src/app/lmem/typeOfCriteria.js
+++ /dev/null
@@ -1,32 +0,0 @@
-export const CRITERIA_TYPE_GO = 'CRITERIA_TYPE_GO';
-export const CRITERIA_TYPE_NOGO = 'CRITERIA_TYPE_NOGO';
-export const CRITERIA_TYPE_WARNING = 'CRITERIA_TYPE_WARNING';
-
-export function findType(criteria) {
-  return criteria.reduce((acc, { slug }) => {
-    switch (slug) {
-      case 'go': return 'Approval';
-      case 'no-go': return 'Disapproval';
-      case 'alert': return 'Tip';
-      default: return acc;
-    }
-  }, 'Other');
-}
-
-export function filterTags(criteria) {
-  return criteria.filter((criterion) => {
-    const slug = criterion.slug || criterion.get('slug');
-    switch (slug) {
-      case 'ethics':
-      case 'price':
-      case 'quality':
-      case 'local':
-      case 'ecology':
-      case 'health':
-        return true;
-
-      default:
-        return false;
-    }
-  });
-}
diff --git a/src/app/propTypes.js b/src/app/propTypes.js
deleted file mode 100644
index ecf10d5c7..000000000
--- a/src/app/propTypes.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import PropTypes from 'prop-types';
-
-export const criteria = {
-  label: PropTypes.string.isRequired,
-  slug: PropTypes.string.isRequired,
-};
-
-export const resource = {
-  author: PropTypes.string,
-  editor: PropTypes.object.isRequired,
-  label: PropTypes.string.isRequired,
-  url: PropTypes.string.isRequired,
-};
-
-export const alternative = {
-  label: PropTypes.string.isRequired,
-  url_to_redirect: PropTypes.string.isRequired,
-};
-
-export const recommendation = {
-  id: PropTypes.number.isRequired,
-  description: PropTypes.string.isRequired,
-  contributor: PropTypes.object.isRequired,
-  criteria: PropTypes.arrayOf(PropTypes.shape(criteria)),
-  liked: PropTypes.bool,
-  justLiked: PropTypes.bool,
-  disliked: PropTypes.bool,
-  justDisliked: PropTypes.bool,
-  dismissed: PropTypes.bool,
-  justDismissed: PropTypes.bool,
-  resource: PropTypes.shape(resource),
-  alternatives: PropTypes.arrayOf(PropTypes.shape(alternative)),
-};
diff --git a/src/app/theme.js b/src/app/theme.js
deleted file mode 100644
index e4d943adf..000000000
--- a/src/app/theme.js
+++ /dev/null
@@ -1,68 +0,0 @@
-export default {
-  main: 'purple',
-  // colors
-  primaryColor: '#404348',
-  activeColor: '#0C52B4',
-  otherText: '#787993',
-  secondaryColor: '#5F656C',
-  deletedText: '#484046',
-  listBg: '#EFEDED',
-  navInactive: '#a6b1c0',
-  navActive: '#4378A5',
-  link: '#1974C3',
-  accountListBg: '#fff',
-
-  // color list:
-  typeBg: '#EBEBEB',
-  bottomBar: '#DDDDDD',
-  topBarNavInactiveDeleteBg: '#A6B1C0',
-  formBorder: '#707070',
-  text: '#404348',
-  error: '#F01953',
-  formError: '#DB0D0D',
-  button: '#1ECCB5',
-
-  // new types:
-  approval: '#34C16C',
-  disapproval: '#F70B7B',
-  tip: '#E3C51F',
-  alternative: '#49B6D6',
-  other: '#EB950C',
-
-  // notice type colors
-  noticeTypes: {
-    Disapproval: {
-      background: '#F70B7B',
-    },
-    Alternative: {
-      background: '#49B6D6',
-    },
-    Approval: {
-      background: '#34C16C',
-    },
-    Tip: {
-      background: '#E3C51F',
-    },
-    Other: {
-      background: '#EB950C',
-    }
-  },
-  // iframe
-  iframe: {
-    style: {
-      'max-width': 'initial',
-      'min-width': 'initial',
-      'min-height': 'initial',
-      'max-height': 'initial',
-      position: 'fixed',
-      top: 0,
-      right: 0,
-      'z-index': 2147483647, // Max z-index value (signed 32bits integer)
-      border: 'none',
-      transition: 'height .1s',
-      width: '390px',
-      height: '423px',
-      left: 'auto'
-    },
-  }
-};
diff --git a/src/app/theme.ts b/src/app/theme.ts
new file mode 100644
index 000000000..a369d8614
--- /dev/null
+++ b/src/app/theme.ts
@@ -0,0 +1,139 @@
+export interface Theme {
+  main: string;
+  // colors
+  primaryColor: string;
+  activeColor: string;
+  otherText: string;
+  secondaryColor: string;
+  deletedText: string;
+  listBg: string;
+  navInactive: string;
+  navActive: string;
+  link: string;
+  accountListBg: string;
+
+  // color list:
+  typeBg: string;
+  bottomBar: string;
+  topBarNavInactiveDeleteBg: string;
+  formBorder: string;
+  text: string;
+  error: string;
+  formError: string;
+  button: string;
+
+  // new types:
+  approval: string;
+  disapproval: string;
+  tip: string;
+  alternative: string;
+  other: string;
+
+  // notice type colors
+  noticeTypes: {
+    Disapproval: {
+      background: string;
+    };
+    Alternative: {
+      background: string;
+    };
+    Approval: {
+      background: string;
+    };
+    Tip: {
+      background: string;
+    };
+    Other: {
+      background: string;
+    };
+  };
+  // iframe
+  iframe: {
+    style: {
+      'max-width': string;
+      'min-width': string;
+      'min-height': string;
+      'max-height': string;
+      position: string;
+      top: number;
+      right: number;
+      'z-index': number; // Max z-index value (signed 32bits integer)
+      border: string;
+      transition: string;
+      width: string;
+      height: string;
+      left: string;
+    };
+  };
+}
+
+export const theme = {
+  main: 'purple',
+  // colors
+  primaryColor: '#404348',
+  activeColor: '#0C52B4',
+  otherText: '#787993',
+  secondaryColor: '#5F656C',
+  deletedText: '#484046',
+  listBg: '#EFEDED',
+  navInactive: '#a6b1c0',
+  navActive: '#4378A5',
+  link: '#1974C3',
+  accountListBg: '#fff',
+
+  // color list:
+  typeBg: '#EBEBEB',
+  bottomBar: '#DDDDDD',
+  topBarNavInactiveDeleteBg: '#A6B1C0',
+  formBorder: '#707070',
+  text: '#404348',
+  error: '#F01953',
+  formError: '#DB0D0D',
+  button: '#1ECCB5',
+
+  // new types:
+  approval: '#34C16C',
+  disapproval: '#F70B7B',
+  tip: '#E3C51F',
+  alternative: '#49B6D6',
+  other: '#EB950C',
+
+  // notice type colors
+  noticeTypes: {
+    Disapproval: {
+      background: '#F70B7B'
+    },
+    Alternative: {
+      background: '#49B6D6'
+    },
+    Approval: {
+      background: '#34C16C'
+    },
+    Tip: {
+      background: '#E3C51F'
+    },
+    Other: {
+      background: '#EB950C'
+    }
+  },
+  // iframe
+  iframe: {
+    style: {
+      'max-width': 'initial',
+      'min-width': 'initial',
+      'min-height': 'initial',
+      'max-height': 'initial',
+      position: 'fixed',
+      top: 0,
+      right: 0,
+      'z-index': 2147483647, // Max z-index value (signed 32bits integer)
+      border: 'none',
+      transition: 'height .1s',
+      width: '390px',
+      height: '423px',
+      left: 'auto'
+    }
+  }
+};
+
+export default theme;
diff --git a/src/app/utils/createAction.js b/src/app/utils/createAction.js
deleted file mode 100644
index fda5e041e..000000000
--- a/src/app/utils/createAction.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import identity from './identity';
-
-// must be manually kept in sync with createAction method
-export const authorizedKeys = ['payload', 'meta', 'error', 'type'];
-
-export default (type, payloadCreator = identity, metaCreator = identity) => (payload, meta) => {
-  const action = { type };
-
-  if (payload !== undefined) {
-    action.payload = payloadCreator(payload);
-  }
-
-  if (metaCreator) {
-    const actionMeta = metaCreator(meta);
-    if (actionMeta !== undefined) {
-      action.meta = actionMeta;
-    }
-  }
-
-  if (payload instanceof Error) {
-    action.error = true;
-  }
-
-  return action;
-};
diff --git a/src/app/utils/createAction.ts b/src/app/utils/createAction.ts
new file mode 100644
index 000000000..c70c7b117
--- /dev/null
+++ b/src/app/utils/createAction.ts
@@ -0,0 +1,2 @@
+// must be manually kept in sync with createAction method
+export const authorizedKeys = ['payload', 'meta', 'error', 'type'];
diff --git a/src/app/utils/createSingleMessageChannel.js b/src/app/utils/createSingleMessageChannel.js
deleted file mode 100644
index d24c3b380..000000000
--- a/src/app/utils/createSingleMessageChannel.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { eventChannel } from 'redux-saga';
-import isAction from './isAction';
-import createAction from './createAction';
-
-export default () => {
-  return eventChannel((emit) => {
-    const handleMessage = (request, sender, sendResponse) => {
-      const from = sender.tab ? `tab "${sender.tab.id}": 
-${sender.tab.url}` : 'background';
-
-      if (isAction(request)) {
-        console.info(`Received valid action "${request.type}" from ${from}`);
-        emit(request);
-        sendResponse(createAction(`${request.type}_SUCCESS`)());
-      } else {
-        const error = new Error(`Received invalid action from ${from}`);
-        emit(error);
-        sendResponse(createAction(`${request.type}_FAILURE`)(error));
-        console.info('Invalid action', request);
-      }
-
-
-    };
-
-    chrome.runtime.onMessage.addListener(handleMessage);
-
-    // unsubscribe
-    return () => {};
-  });
-};
\ No newline at end of file
diff --git a/src/app/utils/createSingleMessageChannel.ts b/src/app/utils/createSingleMessageChannel.ts
new file mode 100644
index 000000000..ff24466af
--- /dev/null
+++ b/src/app/utils/createSingleMessageChannel.ts
@@ -0,0 +1,47 @@
+import { eventChannel } from 'redux-saga';
+import { Action } from 'redux';
+
+interface MessageSender {
+  id?: string;
+  tab?: chrome.tabs.Tab;
+  url?: string;
+  nativeApplication?: string;
+  tlsChannelId?: string;
+}
+
+type SendResponse = ({}) => void;
+
+const isAction = (x: any): x is Action => typeof x === 'object' && 'type' in x;
+
+export default () => {
+  return eventChannel(emit => {
+    const handleMessage = (
+      action: {},
+      sender: MessageSender,
+      sendResponse: SendResponse
+    ) => {
+      const senderType = sender.tab
+        ? `tab "${sender.tab.id}": ${sender.tab.url}`
+        : 'background';
+
+      if (isAction(action)) {
+        console.info(
+          `Received valid action "${action.type}" from ${senderType}`
+        );
+        emit(action);
+        sendResponse({ ...action, type: `${action.type}_RECEIVED` });
+      } else {
+        const error = new Error(`Received invalid action from ${senderType}`);
+        emit(error);
+        sendResponse({ ...action, type: `RECEIVE_MESSAGE_FAILURE`, error });
+        console.info('Invalid action', action);
+      }
+    };
+
+    chrome.runtime.onMessage.addListener(handleMessage);
+
+    return () => {
+      chrome.runtime.onMessage.removeListener(handleMessage);
+    };
+  });
+};
diff --git a/src/app/utils/customFromJS.js b/src/app/utils/customFromJS.js
deleted file mode 100644
index a0fc15267..000000000
--- a/src/app/utils/customFromJS.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { fromJS as _fromJS, Iterable } from 'immutable';
-
-export default function (v){
-  return _fromJS(v, (key, value) => {
-    const isIndexed = Iterable.isIndexed(value);
-    return isIndexed ? value.toSet() : value.toMap();
-  });
-}
\ No newline at end of file
diff --git a/src/app/utils/formatLocaleDate.js b/src/app/utils/formatLocaleDate.js
deleted file mode 100644
index 5e675cd04..000000000
--- a/src/app/utils/formatLocaleDate.js
+++ /dev/null
@@ -1,15 +0,0 @@
-export default (strDate) => {
-  const dateObject = new Date(strDate);
-
-  if (Number.isNaN(dateObject.getTime())) return undefined;
-
-  return dateObject.toLocaleDateString(
-    navigator.language,
-    {
-      weekday: 'long',
-      year: 'numeric',
-      month: 'long', 
-      day: 'numeric'
-    }
-  );
-};
\ No newline at end of file
diff --git a/src/app/utils/formatLocaleDate.ts b/src/app/utils/formatLocaleDate.ts
new file mode 100644
index 000000000..bcdeba386
--- /dev/null
+++ b/src/app/utils/formatLocaleDate.ts
@@ -0,0 +1,12 @@
+export const formatLocaleDate = (date: Date) => {
+  if (Number.isNaN(date.getTime())) return undefined;
+
+  return date.toLocaleDateString(navigator.language, {
+    weekday: 'long',
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric'
+  });
+};
+
+export default formatLocaleDate;
diff --git a/src/app/utils/identity.js b/src/app/utils/identity.js
deleted file mode 100644
index ee569a151..000000000
--- a/src/app/utils/identity.js
+++ /dev/null
@@ -1 +0,0 @@
-export default me => me;
\ No newline at end of file
diff --git a/src/app/utils/identity.ts b/src/app/utils/identity.ts
new file mode 100644
index 000000000..2db0f6923
--- /dev/null
+++ b/src/app/utils/identity.ts
@@ -0,0 +1 @@
+export default (me: any) => me;
diff --git a/src/app/utils/isAction.js b/src/app/utils/isAction.js
deleted file mode 100644
index 96996215b..000000000
--- a/src/app/utils/isAction.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { authorizedKeys } from './createAction';
-
-export default action => Object.keys(action).filter(key => !authorizedKeys.includes(key)).length === 0;
diff --git a/src/app/utils/isChildInstanceOf.js b/src/app/utils/isChildInstanceOf.js
deleted file mode 100644
index 1a83848f1..000000000
--- a/src/app/utils/isChildInstanceOf.js
+++ /dev/null
@@ -1 +0,0 @@
-export default child => component => child && child.type === component;
diff --git a/src/app/utils/removeHtml.js b/src/app/utils/removeHtml.js
deleted file mode 100644
index 12b27f381..000000000
--- a/src/app/utils/removeHtml.js
+++ /dev/null
@@ -1 +0,0 @@
-export default text => text.replace(/<(?:.|\n)*?>/gm, '');
\ No newline at end of file
diff --git a/src/app/utils/stripHtml.ts b/src/app/utils/stripHtml.ts
new file mode 100644
index 000000000..a5539a3d2
--- /dev/null
+++ b/src/app/utils/stripHtml.ts
@@ -0,0 +1,5 @@
+export const stripHtml = (html: string): string => {
+  const tmp = document.createElement('div');
+  tmp.innerHTML = html;
+  return tmp.textContent || tmp.innerText || '';
+};
diff --git a/src/app/utils/updateItem.js b/src/app/utils/updateItem.js
deleted file mode 100644
index 4a6a82838..000000000
--- a/src/app/utils/updateItem.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export default (state, item) => state.map((currentItem) => {
-  if (currentItem.id === item.id) {
-    return {
-      ...currentItem,
-      ...item
-    };
-  }
-
-  return currentItem;
-});
diff --git a/src/app/utils/watchSingleMessageSaga.js b/src/app/utils/watchSingleMessageSaga.ts
similarity index 100%
rename from src/app/utils/watchSingleMessageSaga.js
rename to src/app/utils/watchSingleMessageSaga.ts
diff --git a/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.js b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.js
index f11b8bcd5..806f7d76a 100644
--- a/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.js
+++ b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.js
@@ -1,36 +1,34 @@
-import React from 'react';
-import styled from 'styled-components';
-import BorderButton from '../BorderButton';
-import AddIcon from './AddIcon';
+import React from "react";
+import styled from "styled-components";
+import BorderButton from "../BorderButton";
+import AddIcon from "./AddIcon";
 
 const Button = styled(BorderButton)`
-    display: flex;
-    align-items: center;
-    margin-top: 25px;
-    color: ${props => props.theme.secondaryColor};
-    border-color: #fff;
+  display: flex;
+  align-items: center;
+  margin-top: 25px;
+  color: ${props => props.theme.secondaryColor};
+  border-color: #fff;
 
-    & > svg {
-      width: 12px;
-      height: 12px;
-      margin-right: 5px;
-      fill: ${props => props.theme.secondaryColor};
-    }
+  & > svg {
+    width: 12px;
+    height: 12px;
+    margin-right: 5px;
+    fill: ${props => props.theme.secondaryColor};
+  }
 
-    &:hover {
-      background-color: ${props => props.theme.secondaryColor};
-      border-color: ${props => props.theme.secondaryColor};
+  &:hover {
+    background-color: ${props => props.theme.secondaryColor};
+    border-color: ${props => props.theme.secondaryColor};
 
-      & > svg {
-        fill: #fff;
-      }
+    & > svg {
+      fill: #fff;
     }
+  }
 `;
 
-export default ({
-  href, as, target, rel
-}) => (
-  <Button href={href} as={as} target={target} rel={rel}>
+export default ({ ...props }) => (
+  <Button {...props}>
     <AddIcon />
     Créer votre notification
   </Button>
diff --git a/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.jsx b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.jsx
deleted file mode 100644
index 0937282ad..000000000
--- a/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.jsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-import { storiesOf } from '@storybook/react';
-import AddNoticeLink from './AddNoticeLink';
-
-storiesOf('atoms/Buttons/AddNoticeLink', module)
-  .add('normal', () => <AddNoticeLink />);
diff --git a/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.tsx b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.tsx
new file mode 100644
index 000000000..045e5fda1
--- /dev/null
+++ b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.tsx
@@ -0,0 +1,7 @@
+import React from "react";
+import { storiesOf } from "@storybook/react";
+import AddNoticeLink from "./AddNoticeLink";
+
+storiesOf("atoms/Buttons/AddNoticeLink", module).add("normal", () => (
+  <AddNoticeLink />
+));
diff --git a/src/components/atoms/Buttons/BorderButton/BorderButton.stories.jsx b/src/components/atoms/Buttons/BorderButton/BorderButton.stories.jsx
deleted file mode 100644
index 22a53009c..000000000
--- a/src/components/atoms/Buttons/BorderButton/BorderButton.stories.jsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from 'react';
-import { storiesOf } from '@storybook/react';
-import { withKnobs, text } from '@storybook/addon-knobs';
-import BorderButton from './BorderButton';
-
-storiesOf('atoms/Buttons/BorderButton', module)
-  .addDecorator(withKnobs)
-  .add('normal', () => (
-    <BorderButton dangerouslySetInnerHTML={{__html: text('content', 'Ajouter')}} />
-  ));
diff --git a/src/components/atoms/Buttons/BorderButton/BorderButton.stories.tsx b/src/components/atoms/Buttons/BorderButton/BorderButton.stories.tsx
new file mode 100644
index 000000000..8d0c4d476
--- /dev/null
+++ b/src/components/atoms/Buttons/BorderButton/BorderButton.stories.tsx
@@ -0,0 +1,12 @@
+import React from "react";
+import { storiesOf } from "@storybook/react";
+import { withKnobs, text } from "@storybook/addon-knobs";
+import BorderButton from "./BorderButton";
+
+storiesOf("atoms/Buttons/BorderButton", module)
+  .addDecorator(withKnobs)
+  .add("normal", () => (
+    <BorderButton
+      dangerouslySetInnerHTML={{ __html: text("content", "Ajouter") }}
+    />
+  ));
diff --git a/src/components/atoms/Buttons/OpenButton/OpenButton.stories.jsx b/src/components/atoms/Buttons/OpenButton/OpenButton.stories.jsx
deleted file mode 100644
index a0904cef6..000000000
--- a/src/components/atoms/Buttons/OpenButton/OpenButton.stories.jsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-import { storiesOf } from '@storybook/react';
-import OpenButton from './OpenButton';
-
-storiesOf('atoms/Buttons/OpenButton', module)
-  .add('normal', () => <OpenButton />);
diff --git a/src/components/atoms/Buttons/OpenButton/OpenButton.stories.tsx b/src/components/atoms/Buttons/OpenButton/OpenButton.stories.tsx
new file mode 100644
index 000000000..1476f192a
--- /dev/null
+++ b/src/components/atoms/Buttons/OpenButton/OpenButton.stories.tsx
@@ -0,0 +1,7 @@
+import React from "react";
+import { storiesOf } from "@storybook/react";
+import OpenButton from "./OpenButton";
+
+storiesOf("atoms/Buttons/OpenButton", module).add("normal", () => (
+  <OpenButton />
+));
diff --git a/src/components/atoms/ContentTitle/ContentTitle.stories.jsx b/src/components/atoms/ContentTitle/ContentTitle.stories.jsx
deleted file mode 100644
index 3fbcc12c1..000000000
--- a/src/components/atoms/ContentTitle/ContentTitle.stories.jsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { storiesOf } from '@storybook/react';
-import { withKnobs, text } from '@storybook/addon-knobs';
-import React from 'react';
-import ContentTitle from '.';
-
-storiesOf('atoms/ContentTitle', module)
-  .addDecorator(withKnobs)
-  .add('normal', () => <ContentTitle>{text('title', 'Title')}</ContentTitle>);
diff --git a/src/components/atoms/ContentTitle/ContentTitle.stories.tsx b/src/components/atoms/ContentTitle/ContentTitle.stories.tsx
new file mode 100644
index 000000000..16a8f2c1b
--- /dev/null
+++ b/src/components/atoms/ContentTitle/ContentTitle.stories.tsx
@@ -0,0 +1,8 @@
+import { storiesOf } from "@storybook/react";
+import { withKnobs, text } from "@storybook/addon-knobs";
+import React from "react";
+import ContentTitle from ".";
+
+storiesOf("atoms/ContentTitle", module)
+  .addDecorator(withKnobs)
+  .add("normal", () => <ContentTitle>{text("title", "Title")}</ContentTitle>);
diff --git a/src/components/atoms/Forms/Textarea/Textarea.stories.jsx b/src/components/atoms/Forms/Textarea/Textarea.stories.jsx
deleted file mode 100644
index 152bafc32..000000000
--- a/src/components/atoms/Forms/Textarea/Textarea.stories.jsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-import { storiesOf } from '@storybook/react';
-import Textarea from './Textarea';
-
-storiesOf('atoms/Forms/Textarea', module)
-  .add('normal', () => <Textarea />);
diff --git a/src/components/atoms/Forms/Textarea/Textarea.stories.tsx b/src/components/atoms/Forms/Textarea/Textarea.stories.tsx
new file mode 100644
index 000000000..8d1551bde
--- /dev/null
+++ b/src/components/atoms/Forms/Textarea/Textarea.stories.tsx
@@ -0,0 +1,5 @@
+import React from "react";
+import { storiesOf } from "@storybook/react";
+import Textarea from "./Textarea";
+
+storiesOf("atoms/Forms/Textarea", module).add("normal", () => <Textarea />);
diff --git a/src/components/atoms/Time.js b/src/components/atoms/Time.js
deleted file mode 100644
index b7d42d421..000000000
--- a/src/components/atoms/Time.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import formatLocaleDate from '../../app/utils/formatLocaleDate';
-
-const Time = ({ children, ...props }) => (<time dateTime={children} {...props}>{formatLocaleDate(children)}</time>);
-
-Time.propTypes = {
-  children: PropTypes.string,
-};
-
-Time.defaultProps = {
-  children: null,
-};
-
-export default Time;
\ No newline at end of file
diff --git a/src/components/atoms/Time.tsx b/src/components/atoms/Time.tsx
new file mode 100644
index 000000000..e80ff4300
--- /dev/null
+++ b/src/components/atoms/Time.tsx
@@ -0,0 +1,17 @@
+import React from "react";
+import formatLocaleDate from "../../app/utils/formatLocaleDate";
+
+interface Props {
+  children: Date;
+}
+const Time = ({ children, ...props }: Props) => (
+  <time dateTime={children.toISOString()} {...props}>
+    {formatLocaleDate(children)}
+  </time>
+);
+
+Time.defaultProps = {
+  children: null
+};
+
+export default Time;
diff --git a/src/components/atoms/Truncated.js b/src/components/atoms/Truncated.js
deleted file mode 100644
index 75d3c649f..000000000
--- a/src/components/atoms/Truncated.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import React, { Fragment } from 'react';
-import PropTypes from 'prop-types';
-import truncate from '../../app/utils/truncate';
-
-const Truncated = ({ numberOfCharacters, preserveWords, children }) => (
-  <Fragment>{numberOfCharacters ? truncate(children, numberOfCharacters, preserveWords) : children}</Fragment>
-);
-
-Truncated.propTypes = {
-  numberOfCharacters: PropTypes.number,
-  children: PropTypes.string,
-  preserveWords: PropTypes.bool,
-};
-
-Truncated.defaultProps = {
-  numberOfCharacters: null,
-  children: '',
-  preserveWords: true,
-};
-
-export default Truncated;
diff --git a/src/components/atoms/Truncated.tsx b/src/components/atoms/Truncated.tsx
new file mode 100644
index 000000000..89615f49b
--- /dev/null
+++ b/src/components/atoms/Truncated.tsx
@@ -0,0 +1,22 @@
+import React, { Fragment } from "react";
+import truncate from "../../app/utils/truncate";
+
+interface Props {
+  children: string;
+  numberOfCharacters: number;
+  preserveWords: boolean;
+}
+const Truncated = ({ numberOfCharacters, preserveWords, children }: Props) => (
+  <Fragment>
+    {numberOfCharacters
+      ? truncate(children, numberOfCharacters, preserveWords)
+      : children}
+  </Fragment>
+);
+
+Truncated.defaultProps = {
+  children: "",
+  preserveWords: true
+};
+
+export default Truncated;
diff --git a/src/components/atoms/icons/types/Alternative.js b/src/components/atoms/icons/types/Alternative.tsx
similarity index 61%
rename from src/components/atoms/icons/types/Alternative.js
rename to src/components/atoms/icons/types/Alternative.tsx
index 6be043a0d..bb141339f 100644
--- a/src/components/atoms/icons/types/Alternative.js
+++ b/src/components/atoms/icons/types/Alternative.tsx
@@ -1,13 +1,13 @@
-/* eslint-disable max-len */
-import React from 'react';
+import React from "react";
 
-export default ({ color }) => (
+export default () => (
   <svg width="27.432" height="20.971" viewBox="0 0 27 21">
-    <path 
+    <path
       d="M27.309 5.88L21.676.247a.655.655 0 0 0-.736-.122.737.737 0 0 0-.427.613v3.579a8.672 8.672 0 0 0-6.8
-       3.329A8.672 8.672 0 0 0 6.978 4.32V.678a.608.608 0 0 0-.43-.613.644.644 0 0 0-.732.122L.18 5.82a.751.751 
-       0 0 0 0 .98l5.636 5.632a.647.647 0 0 0 .732.122.739.739 0 0 0 .43-.612V8.763a4.731 4.731 0 0 1 4.645 
-       4.395c0 .106.007.207.007.317v7.5h4.165v-7.5-.15a4.731 4.731 0 0 1 4.649-4.562v3.181a.612.612 0 0 0 
-       .43.612.647.647 0 0 0 .732-.122l5.636-5.632a.7.7 0 0 0 .182-.491.518.518 0 0 0-.115-.431z" />
+       3.329A8.672 8.672 0 0 0 6.978 4.32V.678a.608.608 0 0 0-.43-.613.644.644 0 0 0-.732.122L.18 5.82a.751.751
+       0 0 0 0 .98l5.636 5.632a.647.647 0 0 0 .732.122.739.739 0 0 0 .43-.612V8.763a4.731 4.731 0 0 1 4.645
+       4.395c0 .106.007.207.007.317v7.5h4.165v-7.5-.15a4.731 4.731 0 0 1 4.649-4.562v3.181a.612.612 0 0 0
+       .43.612.647.647 0 0 0 .732-.122l5.636-5.632a.7.7 0 0 0 .182-.491.518.518 0 0 0-.115-.431z"
+    />
   </svg>
-);
\ No newline at end of file
+);
diff --git a/src/components/atoms/icons/types/Dislike.js b/src/components/atoms/icons/types/Dislike.tsx
similarity index 84%
rename from src/components/atoms/icons/types/Dislike.js
rename to src/components/atoms/icons/types/Dislike.tsx
index 5ee2415da..41cc7fab6 100644
--- a/src/components/atoms/icons/types/Dislike.js
+++ b/src/components/atoms/icons/types/Dislike.tsx
@@ -1,8 +1,13 @@
-import React from 'react';
-import { withTheme } from 'styled-components';
+import React from "react";
+import { withTheme } from "styled-components";
+import { Theme } from "app/theme";
 
-const Dislike = ({ active, theme }) => {
-  const stroke = !active ? theme.secondaryColor : '#fff';
+interface Props {
+  active?: boolean;
+  theme: Theme;
+}
+const Dislike = ({ active, theme }: Props) => {
+  const stroke = !active ? theme.secondaryColor : "#fff";
   const fill = active ? theme.secondaryColor : undefined;
 
   return (
diff --git a/src/components/atoms/icons/types/Like.js b/src/components/atoms/icons/types/Like.tsx
similarity index 84%
rename from src/components/atoms/icons/types/Like.js
rename to src/components/atoms/icons/types/Like.tsx
index c4dbec7a2..f33486c60 100644
--- a/src/components/atoms/icons/types/Like.js
+++ b/src/components/atoms/icons/types/Like.tsx
@@ -1,8 +1,13 @@
-import React from 'react';
-import { withTheme } from 'styled-components';
+import React from "react";
+import { withTheme } from "styled-components";
+import { Theme } from "app/theme";
 
-const Like = ({ active, theme }) => {
-  const stroke = !active ? theme.secondaryColor : '#fff';
+interface Props {
+  active?: boolean;
+  theme: Theme;
+}
+const Like = ({ active, theme }: Props) => {
+  const stroke = !active ? theme.secondaryColor : "#fff";
   const fill = active ? theme.secondaryColor : undefined;
 
   return (
diff --git a/src/components/atoms/icons/types/Other.js b/src/components/atoms/icons/types/Other.tsx
similarity index 67%
rename from src/components/atoms/icons/types/Other.js
rename to src/components/atoms/icons/types/Other.tsx
index 0497104a1..6b8a08409 100644
--- a/src/components/atoms/icons/types/Other.js
+++ b/src/components/atoms/icons/types/Other.tsx
@@ -1,7 +1,6 @@
-/* eslint-disable max-len */
-import React from 'react';
+import React from "react";
 
-export default ({ color }) => (
+export default () => (
   <svg width="28.809" height="28.809" viewBox="0 0 28.809 28.809">
     <path
       fill="none"
@@ -9,6 +8,7 @@ export default ({ color }) => (
       strokeWidth="2px"
       strokeDasharray="8 2"
       d="M22.883,3.926A13.4,13.4,0,0,0,3.926,22.883,13.4,13.4,0,0,0,22.883,3.926Z"
-      transform="translate(1 1)" />
+      transform="translate(1 1)"
+    />
   </svg>
-);
\ No newline at end of file
+);
diff --git a/src/components/atoms/icons/types/Tip.js b/src/components/atoms/icons/types/Tip.tsx
similarity index 60%
rename from src/components/atoms/icons/types/Tip.js
rename to src/components/atoms/icons/types/Tip.tsx
index 92d0e95a0..9290d4278 100644
--- a/src/components/atoms/icons/types/Tip.js
+++ b/src/components/atoms/icons/types/Tip.tsx
@@ -1,14 +1,15 @@
-/* eslint-disable max-len */
-import React from 'react';
+import React from "react";
 
-export default ({ color }) => (
+export default () => (
   <svg width="11.453" height="24.922" viewBox=" 0 0 11.453 24.922">
-    <path d="M11.11 22.124c-1.187 2.419-4.362 2.8-5.218 2.8a4.5 4.5 0 0 1-3.068-.962 3.118 3.118 0 0 
+    <path
+      d="M11.11 22.124c-1.187 2.419-4.362 2.8-5.218 2.8a4.5 4.5 0 0 1-3.068-.962 3.118 3.118 0 0
     1-1.095-2.445 8.6 8.6 0 0 1 .082-1.178q.084-.6.265-1.358l1.358-4.806q.182-.689.306-1.308a5.741 5.741
-     0 0 0 .124-1.126 1.717 1.717 0 0 0-.38-1.285c-1.016-.933-3.217.017-3.483.116 1.231-2.8 4.5-2.8 
-     5.225-2.8a4.394 4.394 0 0 1 3.022.947A3.144 3.144 0 0 1 9.31 11.18a9.865 9.865 0 0 1-.345 2.552l-1.352 
-     4.787a12.764 12.764 0 0 0-.3 1.319 6.749 6.749 0 0 0-.132 1.119 1.923 1.923 0 0 0 .425 1.3c.947 1.164 
-     3.315-.042 3.5-.131zm.343-19.1a2.8 2.8 0 0 1-.946 2.132 3.219 3.219 0 0 1-2.277.881 3.256 3.256 0 0 
-     1-2.289-.881 2.8 2.8 0 0 1-.955-2.132A2.823 2.823 0 0 1 5.941.885a3.378 3.378 0 0 1 4.566 0 2.827 2.827 0 0 1 .946 2.139zm0 0" />
+     0 0 0 .124-1.126 1.717 1.717 0 0 0-.38-1.285c-1.016-.933-3.217.017-3.483.116 1.231-2.8 4.5-2.8
+     5.225-2.8a4.394 4.394 0 0 1 3.022.947A3.144 3.144 0 0 1 9.31 11.18a9.865 9.865 0 0 1-.345 2.552l-1.352
+     4.787a12.764 12.764 0 0 0-.3 1.319 6.749 6.749 0 0 0-.132 1.119 1.923 1.923 0 0 0 .425 1.3c.947 1.164
+     3.315-.042 3.5-.131zm.343-19.1a2.8 2.8 0 0 1-.946 2.132 3.219 3.219 0 0 1-2.277.881 3.256 3.256 0 0
+     1-2.289-.881 2.8 2.8 0 0 1-.955-2.132A2.823 2.823 0 0 1 5.941.885a3.378 3.378 0 0 1 4.566 0 2.827 2.827 0 0 1 .946 2.139zm0 0"
+    />
   </svg>
-);
\ No newline at end of file
+);
diff --git a/src/components/atoms/icons/types/index.js b/src/components/atoms/icons/types/index.js
deleted file mode 100644
index c5383b1c9..000000000
--- a/src/components/atoms/icons/types/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export { default as Like } from './Like';
-export { default as Approval } from './Like';
-export { default as Dislike } from './Dislike';
-export { default as Disapproval } from './Dislike';
-export { default as Tip } from './Tip';
-export { default as Alternative } from './Alternative';
-export { default as Other } from './Other';
diff --git a/src/components/atoms/icons/types/index.ts b/src/components/atoms/icons/types/index.ts
new file mode 100644
index 000000000..e822ccb5b
--- /dev/null
+++ b/src/components/atoms/icons/types/index.ts
@@ -0,0 +1,22 @@
+import { ComponentType } from 'react';
+import { NoticeType } from 'app/lmem/noticeType';
+// import Like from "./Like";
+import Approval from './Like';
+// import Dislike from "./Dislike";
+import Disapproval from './Dislike';
+import Tip from './Tip';
+import Alternative from './Alternative';
+import Other from './Other';
+
+interface Props {
+  active?: boolean;
+}
+export const TypesIcons: { [key in NoticeType]: ComponentType<Props> } = {
+  Approval,
+  Disapproval,
+  Tip,
+  Alternative,
+  Other
+};
+
+export default TypesIcons;
diff --git a/src/components/molecules/Type/Background.js b/src/components/molecules/Type/Background.js
deleted file mode 100644
index 70bdad35a..000000000
--- a/src/components/molecules/Type/Background.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import styled from 'styled-components';
-import PropTypes from 'prop-types';
-
-const TypeBackground = styled.div`
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 38px;
-    height: 38px;
-    margin-right: 10px;
-    border-radius: 50%;
-    background-color: ${props => props.color};
-
-    & > svg {
-      fill: #fff;
-    }
-`;
-
-TypeBackground.propTypes = {
-  color: PropTypes.string,
-};
-
-TypeBackground.defaultProps = {
-  color: '#F1F1F4'
-};
-
-export default TypeBackground;
diff --git a/src/components/molecules/Type/Background.ts b/src/components/molecules/Type/Background.ts
new file mode 100644
index 000000000..faa7e7e69
--- /dev/null
+++ b/src/components/molecules/Type/Background.ts
@@ -0,0 +1,22 @@
+import styled from 'styled-components';
+
+const TypeBackground = styled.div`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 38px;
+  height: 38px;
+  margin-right: 10px;
+  border-radius: 50%;
+  background-color: ${props => props.color};
+
+  & > svg {
+    fill: #fff;
+  }
+`;
+
+TypeBackground.defaultProps = {
+  color: '#F1F1F4'
+};
+
+export default TypeBackground;
diff --git a/src/components/molecules/Type/Type.js b/src/components/molecules/Type/Type.js
deleted file mode 100644
index 861230e91..000000000
--- a/src/components/molecules/Type/Type.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { withTheme } from 'styled-components';
-import Background from './Background';
-import * as noticeTypeIcons from '../../atoms/icons/types';
-
-const getTypeOrFallback = referential => type => (
-  type in referential
-    ? referential[type]
-    : referential.Other
-);
-
-const NoticeType = ({ type, theme }) => {
-  const NoticeTypeIcon = getTypeOrFallback(noticeTypeIcons)(type);
-  const style = getTypeOrFallback(theme.noticeTypes)(type);
-
-  return (
-    <Background color={style && style.background}>
-      {NoticeTypeIcon && <NoticeTypeIcon />}
-    </Background>
-  );
-};
-
-NoticeType.propTypes = {
-  type: PropTypes.string,
-  theme: PropTypes.objectOf(PropTypes.any).isRequired,
-};
-
-NoticeType.defaultProps = {
-  type: 'Other',
-};
-
-export default withTheme(NoticeType);
diff --git a/src/components/molecules/Type/Type.stories.jsx b/src/components/molecules/Type/Type.stories.jsx
deleted file mode 100644
index e589cf4d1..000000000
--- a/src/components/molecules/Type/Type.stories.jsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import Type from './Type';
-
-storiesOf('molecules/Type', module)
-  .addDecorator(getStory => (
-    <Router>
-      {getStory()}
-    </Router>
-  ))
-  .add('approval', () => (
-    <Type 
-      type="Approval"
-    />
-  ))
-  .add('disapproval', () => (
-    <Type 
-      type="Disapproval"
-    />
-  ))
-  .add('tip', () => (
-    <Type 
-      type="Tip"
-    />
-  ))
-  .add('other', () => (
-    <Type 
-      type="Other"
-    />
-  ))
-  .add('undefined / unknown ', () => (
-    <Type />
-  ));
diff --git a/src/components/molecules/Type/Type.stories.tsx b/src/components/molecules/Type/Type.stories.tsx
new file mode 100644
index 000000000..6977a8688
--- /dev/null
+++ b/src/components/molecules/Type/Type.stories.tsx
@@ -0,0 +1,13 @@
+import React from "react";
+import { MemoryRouter as Router } from "react-router-dom";
+import { storiesOf } from "@storybook/react";
+import Type from "./Type";
+
+storiesOf("molecules/Type", module)
+  .addDecorator(getStory => <Router>{getStory()}</Router>)
+  .add("approval", () => <Type type="Approval" />)
+  .add("disapproval", () => <Type type="Disapproval" />)
+  .add("alternative", () => <Type type="Alternative" />)
+  .add("tip", () => <Type type="Tip" />)
+  .add("other", () => <Type type="Other" />)
+  .add("undefined / unknown ", () => <Type />);
diff --git a/src/components/molecules/Type/Type.tsx b/src/components/molecules/Type/Type.tsx
new file mode 100644
index 000000000..529e6bc9f
--- /dev/null
+++ b/src/components/molecules/Type/Type.tsx
@@ -0,0 +1,26 @@
+import React from "react";
+import { withTheme } from "styled-components";
+import Background from "./Background";
+import noticeTypeIcons from "../../atoms/icons/types";
+import { Theme } from "app/theme";
+import { getTypeOrFallback, NoticeType } from "app/lmem/noticeType";
+
+interface Style {
+  background: string;
+}
+interface Props {
+  type?: NoticeType;
+  theme: Theme;
+}
+const NoticeTypeIcon = ({ type, theme }: Props) => {
+  const NoticeTypeIcon = getTypeOrFallback(noticeTypeIcons)(type);
+  const style = getTypeOrFallback<Style>(theme.noticeTypes)(type);
+
+  return (
+    <Background color={style && style.background}>
+      {NoticeTypeIcon && <NoticeTypeIcon />}
+    </Background>
+  );
+};
+
+export default withTheme(NoticeTypeIcon);
diff --git a/src/components/organisms/Notice/Container.js b/src/components/organisms/Notice/Container.js
deleted file mode 100644
index d2934e74c..000000000
--- a/src/components/organisms/Notice/Container.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.article`
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    font-size: ${props => (props.details ? '15px' : '16px')};
-
-    &:first-of-type {
-        margin-top: 18px;
-    }
-
-    & + & {
-        margin-top: 18px;
-    }
-`;
diff --git a/src/components/organisms/Notice/Container.ts b/src/components/organisms/Notice/Container.ts
new file mode 100644
index 000000000..4fae748de
--- /dev/null
+++ b/src/components/organisms/Notice/Container.ts
@@ -0,0 +1,20 @@
+import styled from 'styled-components';
+
+interface Props {
+  details?: boolean;
+}
+export default styled.article<Props>`
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  font-size: ${props => (props.details ? '15px' : '16px')};
+
+  &:first-of-type {
+    margin-top: 18px;
+  }
+
+  & + & {
+    margin-top: 18px;
+  }
+`;
diff --git a/src/components/organisms/Notice/Content.js b/src/components/organisms/Notice/Content.js
deleted file mode 100644
index fefad1be5..000000000
--- a/src/components/organisms/Notice/Content.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-import { Link } from 'react-router-dom';
-
-const Content = ({ to, ...props }) => {
-  if (to) {
-    return (<Link to={to} {...props} />);
-  }
-
-  return (<div {...props} />);
-};
-
-export default styled(Content)`
-    box-sizing: border-box;
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    width: 338px;
-    min-height: 85px;
-    padding: 12px 12px 12px 13px;
-    margin-right: 11px;
-    margin-left: 5px;
-    text-decoration: none;
-    background-color: #fff;
-    border-radius: 15px;
-    border: 2px solid transparent;
-    transition: all 0.2s ease-in-out;
-
-    &[href]:hover {
-        border-color: ${props => props.theme.activeColor}
-    }
-
-    & > div:nth-child(2) {
-        width: 245px;
-    }
-
-    & [class^="OpenButton"] {
-        height: auto;
-    }
-
-    & > button {
-        margin-right: auto;
-        margin-left: auto;
-        font-size: 12px;
-        color: ${props => props.theme.secondaryColor};
-        text-align: center;
-
-        &:hover {
-            color: ${props => props.theme.activeColor}
-        }
-    }
-`;
\ No newline at end of file
diff --git a/src/components/organisms/Notice/Content.tsx b/src/components/organisms/Notice/Content.tsx
new file mode 100644
index 000000000..62ccab069
--- /dev/null
+++ b/src/components/organisms/Notice/Content.tsx
@@ -0,0 +1,57 @@
+import React, { ReactNode } from "react";
+import styled from "styled-components";
+import { Link } from "react-router-dom";
+import { LocationDescriptor } from "history";
+
+interface ContentProps {
+  to?: LocationDescriptor;
+  children: ReactNode;
+}
+const Content = ({ to, ...props }: ContentProps) => {
+  if (to) {
+    return <Link to={to} {...props} />;
+  }
+
+  return <div {...props} />;
+};
+
+export default styled(Content)`
+  box-sizing: border-box;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  width: 338px;
+  min-height: 85px;
+  padding: 12px 12px 12px 13px;
+  margin-right: 11px;
+  margin-left: 5px;
+  text-decoration: none;
+  background-color: #fff;
+  border-radius: 15px;
+  border: 2px solid transparent;
+  transition: all 0.2s ease-in-out;
+
+  &[href]:hover {
+    border-color: ${props => props.theme.activeColor};
+  }
+
+  & > div:nth-child(2) {
+    width: 245px;
+  }
+
+  & [class^="OpenButton"] {
+    height: auto;
+  }
+
+  & > button {
+    margin-right: auto;
+    margin-left: auto;
+    font-size: 12px;
+    color: ${props => props.theme.secondaryColor};
+    text-align: center;
+
+    &:hover {
+      color: ${props => props.theme.activeColor};
+    }
+  }
+`;
diff --git a/src/components/organisms/Notice/Notice.js b/src/components/organisms/Notice/Notice.js
deleted file mode 100644
index 34acf5d97..000000000
--- a/src/components/organisms/Notice/Notice.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import React, { Fragment, PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import {
-  Contributor,
-  OpenButton,
-  Button,
-} from '../../atoms';
-import Type from '../../molecules/Type/Type';
-import Container from './Container';
-import Content from './Content';
-import Deleted from './Deleted';
-import DeleteButton from './DeleteButton';
-import Title from './Title';
-
-const strip = (html) => {
-  const tmp = document.createElement('div');
-  tmp.innerHTML = html;
-  return tmp.textContent || tmp.innerText || '';
-};
-
-export default class Notice extends PureComponent {
-  static propTypes = {
-    id: PropTypes.number.isRequired,
-    type: PropTypes.string,
-    message: PropTypes.string.isRequired,
-    contributor: PropTypes.string.isRequired,
-    dismiss: PropTypes.func.isRequired,
-    undismiss: PropTypes.func.isRequired,
-    dismissed: PropTypes.bool,
-    disliked: PropTypes.bool,
-  };
-
-  static defaultProps = {
-    type: 'Other',
-    dismissed: false,
-  };
-
-  render() {
-    const {
-      id, type, message, contributor, dismissed, disliked, dismiss, undismiss
-    } = this.props;
-    return (
-      <Container>
-        {!dismissed && !disliked
-        && <DeleteButton onClick={() => dismiss(id)} />
-        }
-        <Content to={!dismissed && `notices/details/${id}`}>
-          {dismissed || disliked ? (
-            <Fragment>
-              <Deleted>Cette notification ne s’affichera plus !</Deleted>
-              <Button onClick={() => undismiss(id)}>Annuler</Button>
-            </Fragment>
-          ) : (
-            <Fragment>
-              <Type type={type} />
-              <div>
-                <Title>{strip(message)}</Title>
-                <Contributor>
-                      Par :
-                      &nbsp;
-                  {contributor}
-                </Contributor>
-              </div>
-              <OpenButton />
-            </Fragment>
-          )}
-        </Content>
-      </Container>
-    );
-  }
-}
diff --git a/src/components/organisms/Notice/Notice.stories.jsx b/src/components/organisms/Notice/Notice.stories.jsx
deleted file mode 100644
index a00371a79..000000000
--- a/src/components/organisms/Notice/Notice.stories.jsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import { action } from '@storybook/addon-actions';
-import Notice from './Notice';
-
-const message = '<p>Description with a <a href="http://some.url">link</a></p>';
-
-storiesOf('organisms/Notice', module)
-  .addDecorator(getStory => (
-    <Router>
-      {getStory()}
-    </Router>
-  ))
-  .add('Approval', () => (
-    <Notice
-      type="Approval"
-      contributor="Jalil"
-      id="123"
-      message={message}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-      dismissed={false}
-    />
-  ))
-  .add('Disapproval', () => (
-    <Notice
-      type="Disapproval"
-      contributor="Jalil"
-      id="123"
-      message={message}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-      dismissed={false}
-    />
-  ))
-  .add('Tip', () => (
-    <Notice
-      type="Tip"
-      contributor="Jalil"
-      id="123"
-      message={message}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-      dismissed={false}
-    />
-  ))
-  .add('Other', () => (
-    <Notice
-      type="Other"
-      contributor="Jalil"
-      id="123"
-      message={message}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-      dismissed={false}
-    />
-  ))
-  .add('No type', () => (
-    <Notice
-      contributor="Jalil"
-      id="123"
-      message={message}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-      dismissed={false}
-    />
-  ))
-  .add('Undefined type', () => (
-    <Notice
-      type={undefined}
-      contributor="Jalil"
-      id="123"
-      message={message}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-      dismissed={false}
-    />
-  ))
-  .add('Unknown type', () => (
-    <Notice
-      type="some inexistant type"
-      contributor="Jalil"
-      id="123"
-      message={message}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-      dismissed={false}
-    />
-  ))
-  .add('dismissed', () => (
-    <Notice
-      contributor="Jalil"
-      id="123"
-      message={message}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-      dismissed
-    />
-  ))
-  .add('with long title', () => (
-    <Notice
-      contributor="Jalil"
-      id="123"
-      message='<p>This is very long title for a notification with a <a href="http://some.url">link</a> that you may want to read some time in the future</p>'
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-    />
-  ));
diff --git a/src/components/organisms/Notice/Notice.stories.tsx b/src/components/organisms/Notice/Notice.stories.tsx
new file mode 100644
index 000000000..c2045fdea
--- /dev/null
+++ b/src/components/organisms/Notice/Notice.stories.tsx
@@ -0,0 +1,103 @@
+import React from "react";
+import { MemoryRouter as Router } from "react-router-dom";
+import { storiesOf } from "@storybook/react";
+import { action } from "@storybook/addon-actions";
+import Notice from "./Notice";
+
+const message = '<p>Description with a <a href="http://some.url">link</a></p>';
+
+storiesOf("organisms/Notice", module)
+  .addDecorator(getStory => <Router>{getStory()}</Router>)
+  .add("Approval", () => (
+    <Notice
+      type="Approval"
+      contributor="Jalil"
+      id={123}
+      message={message}
+      dismiss={action("dismiss")}
+      undismiss={action("undismiss")}
+      dismissed={false}
+      disliked={false}
+    />
+  ))
+  .add("Disapproval", () => (
+    <Notice
+      type="Disapproval"
+      contributor="Jalil"
+      id={123}
+      message={message}
+      dismiss={action("dismiss")}
+      undismiss={action("undismiss")}
+      dismissed={false}
+      disliked={false}
+    />
+  ))
+  .add("Tip", () => (
+    <Notice
+      type="Tip"
+      contributor="Jalil"
+      id={123}
+      message={message}
+      dismiss={action("dismiss")}
+      undismiss={action("undismiss")}
+      dismissed={false}
+      disliked={false}
+    />
+  ))
+  .add("Other", () => (
+    <Notice
+      type="Other"
+      contributor="Jalil"
+      id={123}
+      message={message}
+      dismiss={action("dismiss")}
+      undismiss={action("undismiss")}
+      dismissed={false}
+      disliked={false}
+    />
+  ))
+  .add("No type", () => (
+    <Notice
+      contributor="Jalil"
+      id={123}
+      message={message}
+      dismiss={action("dismiss")}
+      undismiss={action("undismiss")}
+      dismissed={false}
+      disliked={false}
+    />
+  ))
+  .add("Undefined type", () => (
+    <Notice
+      type={undefined}
+      contributor="Jalil"
+      id={123}
+      message={message}
+      dismiss={action("dismiss")}
+      undismiss={action("undismiss")}
+      dismissed={false}
+      disliked={false}
+    />
+  ))
+  .add("dismissed", () => (
+    <Notice
+      contributor="Jalil"
+      id={123}
+      message={message}
+      dismiss={action("dismiss")}
+      undismiss={action("undismiss")}
+      dismissed
+      disliked={false}
+    />
+  ))
+  .add("with long title", () => (
+    <Notice
+      contributor="Jalil"
+      id={123}
+      message='<p>This is very long title for a notification with a <a href="http://some.url">link</a> that you may want to read some time in the future</p>'
+      dismiss={action("dismiss")}
+      undismiss={action("undismiss")}
+      dismissed={false}
+      disliked={false}
+    />
+  ));
diff --git a/src/components/organisms/Notice/Notice.tsx b/src/components/organisms/Notice/Notice.tsx
new file mode 100644
index 000000000..0e74668da
--- /dev/null
+++ b/src/components/organisms/Notice/Notice.tsx
@@ -0,0 +1,65 @@
+import React, { Fragment, PureComponent } from "react";
+import { NoticeType } from "app/lmem/noticeType";
+import { stripHtml } from "app/utils/stripHtml";
+import { Contributor, OpenButton, Button } from "../../atoms";
+import Type from "../../molecules/Type/Type";
+import Container from "./Container";
+import Content from "./Content";
+import Deleted from "./Deleted";
+import DeleteButton from "./DeleteButton";
+import Title from "./Title";
+
+interface Props {
+  id: number;
+  type: NoticeType;
+  message: string;
+  contributor: string;
+  dismiss: (id: number) => void;
+  undismiss: (id: number) => void;
+  dismissed: boolean;
+  disliked: boolean;
+}
+
+export default class Notice extends PureComponent<Props> {
+  static defaultProps = {
+    type: "Other",
+    dismissed: false
+  };
+
+  onDismiss = () => {
+    this.props.dismiss(this.props.id);
+  };
+
+  onUndismiss = () => {
+    this.props.undismiss(this.props.id);
+  };
+
+  render() {
+    const { id, type, message, contributor, dismissed, disliked } = this.props;
+    return (
+      <Container>
+        {!dismissed && !disliked && <DeleteButton onClick={this.onDismiss} />}
+        <Content to={dismissed ? undefined : `notices/details/${id}`}>
+          {dismissed || disliked ? (
+            <Fragment>
+              <Deleted>Cette notification ne s’affichera plus !</Deleted>
+              <Button onClick={this.onUndismiss}>Annuler</Button>
+            </Fragment>
+          ) : (
+            <Fragment>
+              <Type type={type} />
+              <div>
+                <Title>{stripHtml(message)}</Title>
+                <Contributor>
+                  Par : &nbsp;
+                  {contributor}
+                </Contributor>
+              </div>
+              <OpenButton />
+            </Fragment>
+          )}
+        </Content>
+      </Container>
+    );
+  }
+}
diff --git a/src/components/organisms/Notice/Title.js b/src/components/organisms/Notice/Title.js
deleted file mode 100644
index 06487bce5..000000000
--- a/src/components/organisms/Notice/Title.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import styled from 'styled-components';
-import Truncated from '../../atoms/Truncated';
-
-export const TitleContainer = styled.p`
-    display: inline;
-    margin: 0 10px 0 0;
-    color: ${props => props.theme.activeColor};
-    font-weight: bold;
-    line-height: 1.3;
-`;
-
-const NoticeTitle = ({ children }) => (
-  <TitleContainer>
-    <Truncated numberOfCharacters={60}>{children}</Truncated>
-  </TitleContainer>
-);
-
-NoticeTitle.propTypes = {
-  children: PropTypes.string.isRequired
-};
-
-export default NoticeTitle;
\ No newline at end of file
diff --git a/src/components/organisms/Notice/Title.tsx b/src/components/organisms/Notice/Title.tsx
new file mode 100644
index 000000000..081cff88d
--- /dev/null
+++ b/src/components/organisms/Notice/Title.tsx
@@ -0,0 +1,22 @@
+import React from "react";
+import styled from "styled-components";
+import Truncated from "../../atoms/Truncated";
+
+export const TitleContainer = styled.p`
+  display: inline;
+  margin: 0 10px 0 0;
+  color: ${props => props.theme.activeColor};
+  font-weight: bold;
+  line-height: 1.3;
+`;
+
+interface Props {
+  children: string;
+}
+const NoticeTitle = ({ children }: Props) => (
+  <TitleContainer>
+    <Truncated numberOfCharacters={60}>{children}</Truncated>
+  </TitleContainer>
+);
+
+export default NoticeTitle;
diff --git a/src/components/organisms/Notice/index.js b/src/components/organisms/Notice/index.js
index 8d8e788ae..83932b27f 100644
--- a/src/components/organisms/Notice/index.js
+++ b/src/components/organisms/Notice/index.js
@@ -1,4 +1,3 @@
-export { default as Container } from './Container';
-export { default as Content } from './Content';
-export { default as Deleted } from './Deleted';
-export { default as TypeBackground } from './TypeBackground';
+export { default as Container } from "./Container";
+export { default as Content } from "./Content";
+export { default as Deleted } from "./Deleted";
diff --git a/src/components/organisms/NoticeDetails/Message.js b/src/components/organisms/NoticeDetails/Message.js
deleted file mode 100644
index a3e3bf2a4..000000000
--- a/src/components/organisms/NoticeDetails/Message.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-const MessageBlock = styled.div`
-  p { 
-    margin: 6px 0 12px;
-    font-size: 15px;
-    line-height: 1.4;
-    color: ${props => props.theme.primaryColor};
-  }
-`;
-
-const Message = ({ children }) => <MessageBlock dangerouslySetInnerHTML={{ __html: children }} />;
-
-export default Message;
diff --git a/src/components/organisms/NoticeDetails/Message.tsx b/src/components/organisms/NoticeDetails/Message.tsx
new file mode 100644
index 000000000..5924b8788
--- /dev/null
+++ b/src/components/organisms/NoticeDetails/Message.tsx
@@ -0,0 +1,20 @@
+import React from "react";
+import styled from "styled-components";
+
+const MessageBlock = styled.div`
+  p {
+    margin: 6px 0 12px;
+    font-size: 15px;
+    line-height: 1.4;
+    color: ${props => props.theme.primaryColor};
+  }
+`;
+
+interface Props {
+  children: string;
+}
+const Message = ({ children }: Props) => (
+  <MessageBlock dangerouslySetInnerHTML={{ __html: children }} />
+);
+
+export default Message;
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.js b/src/components/organisms/NoticeDetails/NoticeDetails.js
deleted file mode 100644
index 17689aacc..000000000
--- a/src/components/organisms/NoticeDetails/NoticeDetails.js
+++ /dev/null
@@ -1,128 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { withRouter } from 'react-router';
-import {
-  Contributor,
-  Button,
-  BorderButton
-} from '../../atoms';
-import { Like, Dislike } from '../../atoms/icons/types';
-import Type from '../../molecules/Type/Type';
-import Source from './Source/Source';
-import Anchor from './Source/AnchorIcon';
-import SourceURL from './Source/SourceURL';
-import DetailsContainer from './DetailsContainer';
-import DetailsContent from './DetailsContent';
-import DetailsMeta from './DetailsMeta';
-import DetailsDislike from './DetailsDislike';
-import Message from './Message';
-import Feedbacks from './Feedbacks';
-import Date from './Date';
-
-class NoticeDetails extends PureComponent {
-  static propTypes = {
-    id: PropTypes.number.isRequired,
-    type: PropTypes.string,
-    date: PropTypes.string,
-    message: PropTypes.string.isRequired,
-    source: PropTypes.string.isRequired,
-    like: PropTypes.func,
-    unlike: PropTypes.func,
-    liked: PropTypes.oneOf([true, false, undefined]),
-    dislike: PropTypes.func,
-    undislike: PropTypes.func,
-    disliked: PropTypes.oneOf([true, false, undefined]),
-    contributor: PropTypes.string.isRequired,
-    goBack: PropTypes.func,
-    history: PropTypes.object,
-  };
-
-  static defaultProps = {
-    type: 'Other',
-    date: null,
-    goBack: null,
-    history: null
-  };
-
-  handleLikeClick = () => {
-    const {
-      liked, like, unlike, id
-    } = this.props;
-    if (liked) {
-      unlike(id);
-    } else {
-      like(id);
-    }
-  };
-
-  handleDislikeClick = () => {
-    const {
-      disliked, dislike, undislike, id
-    } = this.props;
-    if (disliked) {
-      undislike(id);
-    } else {
-      dislike(id);
-    }
-  };
-
-  get handleGoBack() {
-    const { goBack, history } = this.props;
-
-    return goBack || history.goBack;
-  }
-
-  render() {
-    const {
-      type, date, message, contributor, source, liked, disliked, dismissed
-    } = this.props;
-
-    return (
-      <DetailsContainer>
-        <DetailsContent>
-          <DetailsMeta>
-            <Date>
-              Le
-              &nbsp;
-              {date}
-            </Date>
-            <Contributor>
-              {contributor}
-              &nbsp;
-              :
-            </Contributor>
-            <Type type={type} />
-          </DetailsMeta>
-          <Message>{message}</Message>
-          <Source>
-            <Anchor />
-              En savoir plus :
-              &nbsp;
-            <SourceURL>{source}</SourceURL>
-          </Source>
-
-          <Feedbacks>
-            <Button onClick={this.handleLikeClick}>
-              <Like active={liked} />
-            </Button>
-            <Button onClick={this.handleDislikeClick}>
-              <Dislike active={disliked} />
-            </Button>
-          </Feedbacks>
-
-          {(disliked || dismissed) && (
-            <DetailsDislike>
-            Merci pour votre retour, cette notification ne s’affichera plus
-              <div>
-                <Button onClick={this.handleDislikeClick}>Annuler</Button>
-                <BorderButton onClick={this.handleGoBack}>OK</BorderButton>
-              </div>
-            </DetailsDislike>
-          )}
-        </DetailsContent>
-      </DetailsContainer>
-    );
-  }
-}
-
-export default withRouter(NoticeDetails);
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.stories.jsx b/src/components/organisms/NoticeDetails/NoticeDetails.stories.jsx
deleted file mode 100644
index 5fe42247a..000000000
--- a/src/components/organisms/NoticeDetails/NoticeDetails.stories.jsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import { action } from '@storybook/addon-actions';
-import NoticeDetails from './NoticeDetails';
-
-const message = `<p> Un message qui décrit <a href="http://www.lmem.net">quelque chose</a> et donc ça prend beaucoup de mots. </p>
-<p>Il peut aussi y avoir plusieurs paragraphes, <a href="http://www.lmem.net">avec encore des liens</a></p>
-`;
-
-storiesOf('organisms/NoticeDetails', module)
-  .addDecorator(getStory => (
-    <Router>
-      {getStory()}
-    </Router>
-  ))
-  .add('Approval', () => (
-    <NoticeDetails
-      type="Approval"
-      contributor="Jalil"
-      id="123"
-      message={message}
-      date="12/12/2042"
-      source="http://www.lmem.net"
-      likes={42}
-      dislikes={2}
-      dismiss={action('dismiss')}
-    />
-  ))
-  .add('Dismissed', () => (
-    <NoticeDetails
-      type="Approval"
-      dismissed
-      contributor="Jalil"
-      id="123"
-      message={message}
-      date="12/12/2042"
-      source="http://www.lmem.net"
-      likes={42}
-      dislikes={2}
-      dismiss={action('dismiss')}
-    />
-  ))
-  .add('Disliked', () => (
-    <NoticeDetails
-      type="Approval"
-      disliked
-      contributor="Jalil"
-      id="123"
-      message={message}
-      date="12/12/2042"
-      source="http://www.lmem.net"
-      likes={42}
-      dislikes={2}
-      dismiss={action('dismiss')}
-    />
-  ));
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
new file mode 100644
index 000000000..2def4f7b5
--- /dev/null
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
@@ -0,0 +1,57 @@
+import React from "react";
+import { MemoryRouter as Router } from "react-router-dom";
+import { storiesOf } from "@storybook/react";
+import { action } from "@storybook/addon-actions";
+import NoticeDetails from "./NoticeDetails";
+
+const message = `
+<p> Un message qui décrit <a href="http://www.lmem.net">quelque chose</a> et donc ça prend beaucoup de mots. </p>
+<p>Il peut aussi y avoir plusieurs paragraphes, <a href="http://www.lmem.net">avec encore des liens</a></p>
+`;
+
+storiesOf("organisms/NoticeDetails", module)
+  .addDecorator(getStory => <Router>{getStory()}</Router>)
+  .add("Approval", () => (
+    <NoticeDetails
+      type="Approval"
+      contributor="Jalil"
+      id={123}
+      message={message}
+      date="12/12/2042"
+      source="http://www.lmem.net"
+      like={action("like")}
+      unlike={action("unlike")}
+      dislike={action("dislike")}
+      undislike={action("undislike")}
+    />
+  ))
+  .add("Dismissed", () => (
+    <NoticeDetails
+      type="Approval"
+      dismissed
+      contributor="Jalil"
+      id={123}
+      message={message}
+      date="12/12/2042"
+      source="http://www.lmem.net"
+      like={action("like")}
+      unlike={action("unlike")}
+      dislike={action("dislike")}
+      undislike={action("undislike")}
+    />
+  ))
+  .add("Disliked", () => (
+    <NoticeDetails
+      type="Approval"
+      disliked
+      contributor="Jalil"
+      id={123}
+      message={message}
+      date="12/12/2042"
+      source="http://www.lmem.net"
+      like={action("like")}
+      unlike={action("unlike")}
+      dislike={action("dislike")}
+      undislike={action("undislike")}
+    />
+  ));
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
new file mode 100644
index 000000000..00196e100
--- /dev/null
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
@@ -0,0 +1,112 @@
+import React, { PureComponent } from "react";
+import { RouteComponentProps, withRouter } from "react-router";
+import { Contributor, Button, BorderButton } from "../../atoms";
+import Like from "../../atoms/icons/types/Like";
+import Dislike from "../../atoms/icons/types/Dislike";
+import Type from "../../molecules/Type/Type";
+import Source from "./Source/Source";
+import Anchor from "./Source/AnchorIcon";
+import SourceURL from "./Source/SourceURL";
+import DetailsContainer from "./DetailsContainer";
+import DetailsContent from "./DetailsContent";
+import DetailsMeta from "./DetailsMeta";
+import DetailsDislike from "./DetailsDislike";
+import Message from "./Message";
+import Feedbacks from "./Feedbacks";
+import Date from "./Date";
+import { NoticeType } from "../../../app/lmem/noticeType";
+
+interface Props {
+  id: number;
+  type: NoticeType;
+  date: string;
+  message: string;
+  source: string;
+  contributor: string;
+  like: (id: number) => void;
+  unlike: (id: number) => void;
+  liked?: boolean;
+  dislike: (id: number) => void;
+  undislike: (id: number) => void;
+  disliked?: boolean;
+  dismissed?: boolean;
+}
+class NoticeDetails extends PureComponent<Props & RouteComponentProps> {
+  handleLikeClick = () => {
+    const { liked, like, unlike, id } = this.props;
+    if (liked) {
+      unlike(id);
+    } else {
+      like(id);
+    }
+  };
+
+  handleDislikeClick = () => {
+    const { disliked, dislike, undislike, id } = this.props;
+    if (disliked) {
+      undislike(id);
+    } else {
+      dislike(id);
+    }
+  };
+
+  render() {
+    const {
+      type,
+      date,
+      message,
+      contributor,
+      source,
+      liked,
+      disliked,
+      dismissed
+    } = this.props;
+
+    return (
+      <DetailsContainer>
+        <DetailsContent>
+          <DetailsMeta>
+            <Date>
+              Le &nbsp;
+              {date}
+            </Date>
+            <Contributor>
+              {contributor}
+              &nbsp; :
+            </Contributor>
+            <Type type={type} />
+          </DetailsMeta>
+          <Message>{message}</Message>
+          <Source>
+            <Anchor />
+            En savoir plus : &nbsp;
+            <SourceURL>{source}</SourceURL>
+          </Source>
+
+          <Feedbacks>
+            <Button onClick={this.handleLikeClick}>
+              <Like active={liked} />
+            </Button>
+            <Button onClick={this.handleDislikeClick}>
+              <Dislike active={disliked} />
+            </Button>
+          </Feedbacks>
+
+          {(disliked || dismissed) && (
+            <DetailsDislike>
+              Merci pour votre retour, cette notification ne s’affichera plus
+              <div>
+                <Button onClick={this.handleDislikeClick}>Annuler</Button>
+                <BorderButton onClick={this.props.history.goBack}>
+                  OK
+                </BorderButton>
+              </div>
+            </DetailsDislike>
+          )}
+        </DetailsContent>
+      </DetailsContainer>
+    );
+  }
+}
+
+export default withRouter(NoticeDetails);
diff --git a/src/components/organisms/NoticeDetails/Source/Source.js b/src/components/organisms/NoticeDetails/Source/Source.js
deleted file mode 100644
index 32236c371..000000000
--- a/src/components/organisms/NoticeDetails/Source/Source.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.div`
-    font-size: 12px;
-    font-weight: bold;
-
-    & > svg {
-        margin-right: 5px;
-        vertical-align: bottom;
-    }
-`;
diff --git a/src/components/organisms/NoticeDetails/Source/Source.ts b/src/components/organisms/NoticeDetails/Source/Source.ts
new file mode 100644
index 000000000..45305dd3f
--- /dev/null
+++ b/src/components/organisms/NoticeDetails/Source/Source.ts
@@ -0,0 +1,11 @@
+import styled from 'styled-components';
+
+export default styled.div`
+  font-size: 12px;
+  font-weight: bold;
+
+  & > svg {
+    margin-right: 5px;
+    vertical-align: bottom;
+  }
+`;
diff --git a/src/components/organisms/NoticeDetails/Source/SourceURL.js b/src/components/organisms/NoticeDetails/Source/SourceURL.js
deleted file mode 100644
index e71fb8450..000000000
--- a/src/components/organisms/NoticeDetails/Source/SourceURL.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import Container from './Container';
-
-export const SourceURL = ({ children, ...props }) => (
-  <Container {...props} href={children}>
-    {children}
-  </Container>
-);
-
-SourceURL.propTypes = {
-  children: PropTypes.string.isRequired,
-};
-
-export default SourceURL;
diff --git a/src/components/organisms/NoticeDetails/Source/SourceURL.tsx b/src/components/organisms/NoticeDetails/Source/SourceURL.tsx
new file mode 100644
index 000000000..60526e2f3
--- /dev/null
+++ b/src/components/organisms/NoticeDetails/Source/SourceURL.tsx
@@ -0,0 +1,13 @@
+import React from "react";
+import Container from "./Container";
+
+interface Props {
+  children: string;
+}
+export const SourceURL = ({ children, ...props }: Props) => (
+  <Container {...props} href={children}>
+    {children}
+  </Container>
+);
+
+export default SourceURL;
diff --git a/src/components/organisms/Notification/Container.js b/src/components/organisms/Notification/Container.js
index edb70f2f1..625135e9e 100644
--- a/src/components/organisms/Notification/Container.js
+++ b/src/components/organisms/Notification/Container.js
@@ -1,5 +1,3 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import styled from 'styled-components';
 
 export const Section = styled.section`
diff --git a/src/components/organisms/Notification/Main.js b/src/components/organisms/Notification/Main.js
deleted file mode 100644
index d1d0a0c83..000000000
--- a/src/components/organisms/Notification/Main.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.main` 
-  position: relative;
-  height: 342px;
-  background-color: ${props => (props.hasNotices ? props.theme.listBg : props.theme.accountListBg)};
-`;
diff --git a/src/components/organisms/Notification/Main.ts b/src/components/organisms/Notification/Main.ts
new file mode 100644
index 000000000..45d2c83f3
--- /dev/null
+++ b/src/components/organisms/Notification/Main.ts
@@ -0,0 +1,12 @@
+import styled from 'styled-components';
+
+interface Props {
+  hasNotices?: boolean;
+}
+
+export default styled('main')<Props>`
+  position: relative;
+  height: 342px;
+  background-color: ${props =>
+    props.hasNotices ? props.theme.listBg : props.theme.accountListBg};
+`;
diff --git a/src/components/organisms/Notification/Notification.stories.jsx b/src/components/organisms/Notification/Notification.stories.jsx
deleted file mode 100644
index c5a687845..000000000
--- a/src/components/organisms/Notification/Notification.stories.jsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import { action } from '@storybook/addon-actions';
-import Notification from '.';
-
-storiesOf('organisms/Notification', module)
-  .add('normal', () => (
-    <Router>
-      <Notification />
-    </Router>
-  ))
-  .add('with title', () => (
-    <Router>
-      <Notification
-        title="Notification title"
-      />
-    </Router>
-  ))
-  .add('with long title', () => (
-    <Router>
-      <Notification
-        title="Very long notification title, it should break"
-      />
-    </Router>
-  ))
-  .add('with nav', () => (
-    <Router initialIndex={2} initialEntries={['/path', '/pass']}>
-      <Notification
-        title="Very long notification title, it should break"
-        onBack={action('handleGoBack')}
-      />
-    </Router>
-  ));
diff --git a/src/components/organisms/Notification/Notification.stories.tsx b/src/components/organisms/Notification/Notification.stories.tsx
new file mode 100644
index 000000000..814ecfed4
--- /dev/null
+++ b/src/components/organisms/Notification/Notification.stories.tsx
@@ -0,0 +1,30 @@
+import React from "react";
+import { MemoryRouter as Router } from "react-router-dom";
+import { storiesOf } from "@storybook/react";
+import { action } from "@storybook/addon-actions";
+import Notification from ".";
+
+storiesOf("organisms/Notification", module)
+  .add("normal", () => (
+    <Router>
+      <Notification />
+    </Router>
+  ))
+  .add("with title", () => (
+    <Router>
+      <Notification title="Notification title" />
+    </Router>
+  ))
+  .add("with long title", () => (
+    <Router>
+      <Notification title="Very long notification title, it should break" />
+    </Router>
+  ))
+  .add("with nav", () => (
+    <Router initialIndex={2} initialEntries={["/path", "/pass"]}>
+      <Notification
+        title="Very long notification title, it should break"
+        onBack={action("handleGoBack")}
+      />
+    </Router>
+  ));
diff --git a/src/components/organisms/Notification/NotificationFooter/NotificationFooter.stories.jsx b/src/components/organisms/Notification/NotificationFooter/NotificationFooter.stories.jsx
deleted file mode 100644
index 8c5ec55ae..000000000
--- a/src/components/organisms/Notification/NotificationFooter/NotificationFooter.stories.jsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import { StaticRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import NotificationFooter from './NotificationFooter';
-
-storiesOf('molecules/NotificationFooter', module)
-  .add('On nothing', () => (
-    <Router><NotificationFooter /></Router>
-  ))
-  .add('On notice', () => (
-    <Router location="/notices"><NotificationFooter /></Router>
-  ))
-  .add('On subscriptions', () => (
-    <Router location="/subscriptions"><NotificationFooter /></Router>
-  ));
diff --git a/src/components/organisms/Notification/NotificationFooter/NotificationFooter.stories.tsx b/src/components/organisms/Notification/NotificationFooter/NotificationFooter.stories.tsx
new file mode 100644
index 000000000..5712a5c2e
--- /dev/null
+++ b/src/components/organisms/Notification/NotificationFooter/NotificationFooter.stories.tsx
@@ -0,0 +1,21 @@
+import React from "react";
+import { StaticRouter as Router } from "react-router-dom";
+import { storiesOf } from "@storybook/react";
+import NotificationFooter from "./NotificationFooter";
+
+storiesOf("molecules/NotificationFooter", module)
+  .add("On nothing", () => (
+    <Router>
+      <NotificationFooter />
+    </Router>
+  ))
+  .add("On notice", () => (
+    <Router location="/notices">
+      <NotificationFooter />
+    </Router>
+  ))
+  .add("On subscriptions", () => (
+    <Router location="/subscriptions">
+      <NotificationFooter />
+    </Router>
+  ));
diff --git a/src/components/organisms/Notification/NotificationHeader/NotificationHeader.stories.jsx b/src/components/organisms/Notification/NotificationHeader/NotificationHeader.stories.jsx
deleted file mode 100644
index 16a580c41..000000000
--- a/src/components/organisms/Notification/NotificationHeader/NotificationHeader.stories.jsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react';
-import { MemoryRouter as Router } from 'react-router-dom';
-import { storiesOf } from '@storybook/react';
-import { action } from '@storybook/addon-actions';
-import NotificationHeader from '.';
-
-storiesOf('molecules/NotificationHeader', module)
-  .add('normal', () => (
-    <Router>
-      <NotificationHeader close={action('close')} />
-    </Router>
-  ))
-  .add('with title', () => (
-    <Router>
-      <NotificationHeader title="title" close={action('close')} />
-    </Router>
-  ))
-  .add('with long title', () => (
-    <Router>
-      <NotificationHeader title="Very long notification title, it should breaktitle" close={action('close')} />
-    </Router>
-  ))
-  .add('with nav history', () => (
-    <Router initialIndex={2} initialEntries={['/path', '/pass']}>
-      <NotificationHeader title="title" close={action('close')} />
-    </Router>
-  ));
diff --git a/src/components/organisms/Notification/NotificationHeader/NotificationHeader.stories.tsx b/src/components/organisms/Notification/NotificationHeader/NotificationHeader.stories.tsx
new file mode 100644
index 000000000..f9c566393
--- /dev/null
+++ b/src/components/organisms/Notification/NotificationHeader/NotificationHeader.stories.tsx
@@ -0,0 +1,30 @@
+import React from "react";
+import { MemoryRouter as Router } from "react-router-dom";
+import { storiesOf } from "@storybook/react";
+import { action } from "@storybook/addon-actions";
+import NotificationHeader from ".";
+
+storiesOf("molecules/NotificationHeader", module)
+  .add("normal", () => (
+    <Router>
+      <NotificationHeader close={action("close")} />
+    </Router>
+  ))
+  .add("with title", () => (
+    <Router>
+      <NotificationHeader title="title" close={action("close")} />
+    </Router>
+  ))
+  .add("with long title", () => (
+    <Router>
+      <NotificationHeader
+        title="Very long notification title, it should breaktitle"
+        close={action("close")}
+      />
+    </Router>
+  ))
+  .add("with nav history", () => (
+    <Router initialIndex={2} initialEntries={["/path", "/pass"]}>
+      <NotificationHeader title="title" close={action("close")} />
+    </Router>
+  ));
diff --git a/src/components/organisms/Notification/NotificationHeader/Title.js b/src/components/organisms/Notification/NotificationHeader/Title.js
deleted file mode 100644
index 0f82dbc17..000000000
--- a/src/components/organisms/Notification/NotificationHeader/Title.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.p`
-    display: inline-block;
-    margin: 0 0 0 auto;
-    padding: 1em 1em 1em 0;
-    font-size: 1.6em;
-    color: ${props => props.theme.activeColor};
-    text-transform: uppercase;
-    font-weight: bold;
-`;
\ No newline at end of file
diff --git a/src/components/organisms/Notification/NotificationHeader/Title.ts b/src/components/organisms/Notification/NotificationHeader/Title.ts
new file mode 100644
index 000000000..161544937
--- /dev/null
+++ b/src/components/organisms/Notification/NotificationHeader/Title.ts
@@ -0,0 +1,11 @@
+import styled from 'types/styled-components';
+
+export default styled.p`
+  display: inline-block;
+  margin: 0 0 0 auto;
+  padding: 1em 1em 1em 0;
+  font-size: 1.6em;
+  color: ${props => props.theme.activeColor};
+  text-transform: uppercase;
+  font-weight: bold;
+`;
diff --git a/src/components/organisms/Notification/NotificationHeader/index.js b/src/components/organisms/Notification/NotificationHeader/index.js
deleted file mode 100644
index 218056334..000000000
--- a/src/components/organisms/Notification/NotificationHeader/index.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { withRouter } from 'react-router';
-import { truncateButPreserveWords } from 'app/utils/truncate';
-import removeHtml from 'app/utils/removeHtml';
-import Container from './Container';
-import LogoContainer from './LogoContainer';
-import LogoImg from './LogoImg';
-import BackButton from './BackButton';
-import CloseButton from './CloseButton';
-import Title from './Title';
-
-const NotificationHeader = ({
-  title, goBack, close, history
-}) => {
-  const handleGoBack = goBack || history.goBack;
-
-  return (
-    <Container>
-      {history.index > 0
-        && <BackButton onClick={handleGoBack} />
-      }
-      {title ? (
-        <Title title={title}>{truncateButPreserveWords(removeHtml(title), 34)}</Title>
-      ) : (
-        <LogoContainer>
-          <LogoImg />
-        </LogoContainer>
-      )}
-      <CloseButton onClick={close} />
-    </Container>
-  );
-};
-
-NotificationHeader.propTypes = {
-  title: PropTypes.string,
-  goBack: PropTypes.func,
-  close: PropTypes.func,
-};
-
-NotificationHeader.defaultProps = {
-  title: null,
-  goBack: null,
-  close: () => {},
-};
-
-export { NotificationHeader };
-
-export default withRouter(NotificationHeader);
diff --git a/src/components/organisms/Notification/NotificationHeader/index.tsx b/src/components/organisms/Notification/NotificationHeader/index.tsx
new file mode 100644
index 000000000..c325d8b12
--- /dev/null
+++ b/src/components/organisms/Notification/NotificationHeader/index.tsx
@@ -0,0 +1,44 @@
+import React from "react";
+import { MemoryHistory } from "history";
+import { RouteComponentProps, withRouter } from "react-router";
+import { truncateButPreserveWords } from "app/utils/truncate";
+import { stripHtml } from "app/utils/stripHtml";
+import Container from "./Container";
+import LogoContainer from "./LogoContainer";
+import LogoImg from "./LogoImg";
+import BackButton from "./BackButton";
+import CloseButton from "./CloseButton";
+import Title from "./Title";
+
+interface OwnProps {
+  title?: string;
+  goBack?: () => void;
+  close?: () => void;
+}
+type Props = OwnProps & RouteComponentProps;
+
+const NotificationHeader = ({ title, goBack, close, history }: Props) => {
+  const handleGoBack = goBack || history.goBack;
+
+  return (
+    <Container>
+      {(history as MemoryHistory).index > 0 && (
+        <BackButton onClick={handleGoBack} />
+      )}
+      {title ? (
+        <Title title={title}>
+          {truncateButPreserveWords(stripHtml(title), 34)}
+        </Title>
+      ) : (
+        <LogoContainer>
+          <LogoImg />
+        </LogoContainer>
+      )}
+      <CloseButton onClick={close} />
+    </Container>
+  );
+};
+
+export { NotificationHeader };
+
+export default withRouter(NotificationHeader);
diff --git a/src/components/organisms/Notification/index.jsx b/src/components/organisms/Notification/index.jsx
deleted file mode 100644
index f56e8f4a1..000000000
--- a/src/components/organisms/Notification/index.jsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-import ContentTitleTop from './ContentTitleTop';
-import NotificationContainer from './Container';
-import NotificationHeader from './NotificationHeader';
-import NotificationFooter from './NotificationFooter';
-import Main from './Main';
-
-export const Notification = ({
-  title, contentTitle, close, onBack, closed, hasNotices, children
-}) => (
-  closed
-    ? null
-    : (
-      <NotificationContainer>
-        <NotificationHeader title={title} close={close} goBack={onBack} />
-        <Main hasNotices={hasNotices}>
-          <ContentTitleTop>{contentTitle}</ContentTitleTop>
-          {children}
-        </Main>
-        <NotificationFooter />
-      </NotificationContainer>
-    )
-);
-
-export default Notification;
diff --git a/src/components/organisms/Notification/index.tsx b/src/components/organisms/Notification/index.tsx
new file mode 100644
index 000000000..000d0b5e9
--- /dev/null
+++ b/src/components/organisms/Notification/index.tsx
@@ -0,0 +1,38 @@
+import React, { ReactNode } from "react";
+import ContentTitleTop from "./ContentTitleTop";
+import NotificationContainer from "./Container";
+import NotificationHeader from "./NotificationHeader";
+import NotificationFooter from "./NotificationFooter";
+import Main from "./Main";
+
+interface Props {
+  title?: string;
+  contentTitle?: string;
+  close?: () => void;
+  onBack?: () => void;
+  closed?: boolean;
+  hasNotices?: boolean;
+  children?: ReactNode;
+}
+
+export const Notification = ({
+  title,
+  contentTitle,
+  close,
+  onBack,
+  closed,
+  hasNotices,
+  children
+}: Props) =>
+  closed ? null : (
+    <NotificationContainer>
+      <NotificationHeader title={title} close={close} goBack={onBack} />
+      <Main hasNotices={hasNotices}>
+        <ContentTitleTop>{contentTitle}</ContentTitleTop>
+        {children}
+      </Main>
+      <NotificationFooter />
+    </NotificationContainer>
+  );
+
+export default Notification;
diff --git a/src/components/organisms/index.js b/src/components/organisms/index.js
deleted file mode 100644
index 5b533cbb8..000000000
--- a/src/components/organisms/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as Notice } from './Notice/Notice';
-export { default as Notification } from './Notification';
-export { default as NoticeDetails } from './NoticeDetails/NoticeDetails';
diff --git a/src/lib/heap.js b/src/lib/heap.js
deleted file mode 100644
index e932beccd..000000000
--- a/src/lib/heap.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export default function (appId) {
-  window.heap=window.heap||[],heap.load=function(e,t){window.heap.appid=e,window.heap.config=t=t||{};var r=t.forceSSL||"https:"===document.location.protocol,a=document.createElement("script");a.type="text/javascript",a.async=!0,a.src=(r?"https:":"http:")+"//cdn.heapanalytics.com/js/heap-"+e+".js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(a,n);for(var o=function(e){return function(){heap.push([e].concat(Array.prototype.slice.call(arguments,0)))}},p=["addEventProperties","addUserProperties","clearEventProperties","identify","removeEventProperty","setEventProperties","track","unsetEventProperty"],c=0;c<p.length;c++)heap[p[c]]=o(p[c])};
-  heap.load(appId, {forceSSL: true});
-
-  return new Promise((resolve) => {
-    (function heapLoader() {
-      if (window.heap && heap.loaded && heap.userId) resolve(heap);
-      else setTimeout(heapLoader, 100);
-    })();
-  });
-}
diff --git a/src/lib/heap.ts b/src/lib/heap.ts
new file mode 100644
index 000000000..a3cd1ae0e
--- /dev/null
+++ b/src/lib/heap.ts
@@ -0,0 +1,15 @@
+export const loadHeap = (appId: string): Promise<Heap> => {
+  const heap = (window as CustomWindow).heap;
+  if (heap) {
+    heap.load(appId, { forceSSL: true });
+  }
+
+  return new Promise(resolve => {
+    (function heapLoader() {
+      if (heap && heap.loaded && heap.userId) resolve(heap);
+      else setTimeout(heapLoader, 100);
+    })();
+  });
+};
+
+export default loadHeap;
diff --git a/src/types/TabInfo.ts b/src/types/TabInfo.ts
new file mode 100644
index 000000000..c38252a58
--- /dev/null
+++ b/src/types/TabInfo.ts
@@ -0,0 +1,36 @@
+// From https://developer.chrome.com/extensions/tabs#type-Tab
+
+type MutedInfoReason =
+  | 'user' // A user input action set the muted state.
+  | 'capture' // Tab capture was started, forcing a muted state change.
+  | 'extension'; // An extension, identified by the extensionId field, set the muted state.
+
+interface MutedInfo {
+  muted: boolean; // Whether the tab is muted (prevented from playing sound). The tab may be muted even if it has not played or is not currently playing sound. Equivalent to whether the 'muted' audio indicator is showing.
+  reason?: MutedInfoReason; // The reason the tab was muted or unmuted. Not set if the tab's mute state has never been changed.
+  extensionId?: string; // The ID of the extension that changed the muted state. Not set if an extension was not the reason the muted state last changed.
+}
+
+export interface TabInfo {
+  id?: number; // The ID of the tab. Tab IDs are unique within a browser session. Under some circumstances a tab may not be assigned an ID; for example, when querying foreign tabs using the sessions API, in which case a session ID may be present. Tab ID can also be set to chrome.tabs.TAB_ID_NONE for apps and devtools windows.
+  index: number; // The zero-based index of the tab within its window.
+  windowId: number; // The ID of the window that contains the tab.
+  openerTabId?: number; // The ID of the tab that opened this tab, if any. This property is only present if the opener tab still exists.
+  highlighted: boolean; // Whether the tab is highlighted.
+  active: boolean; // Whether the tab is active in its window. Does not necessarily mean the window is focused.
+  pinned: boolean; // Whether the tab is pinned.
+  audible?: boolean; // Since Chrome 45. Whether the tab has produced sound over the past couple of seconds (but it might not be heard if also muted). Equivalent to whether the 'speaker audio' indicator is showing.
+  discarded: boolean; // Since Chrome 54. Whether the tab is discarded. A discarded tab is one whose content has been unloaded from memory, but is still visible in the tab strip. Its content is reloaded the next time it is activated.
+  autoDiscardable: boolean; // Since Chrome 54. Whether the tab can be discarded automatically by the browser when resources are low.
+  mutedInfo?: MutedInfo; // Since Chrome 46. The tab's muted state and the reason for the last state change.
+  url?: string; // The URL the tab is displaying. This property is only present if the extension's manifest includes the "tabs" permission.
+  title?: string; // The title of the tab. This property is only present if the extension's manifest includes the "tabs" permission.
+  favIconUrl?: string; // The URL of the tab's favicon. This property is only present if the extension's manifest includes the "tabs" permission. It may also be an empty string if the tab is loading.
+  status?: 'loading' | 'complete'; // Either loading or complete.
+  incognito: boolean; // Whether the tab is in an incognito window.
+  width?: number; // Since Chrome 31. The width of the tab in pixels.
+  height?: number; // Since Chrome 31. The height of the tab in pixels.
+  sessionId?: string; // Since Chrome 31. The session ID used to uniquely identify a tab obtained from the sessions API.
+}
+
+export default TabInfo;
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
new file mode 100644
index 000000000..2188d6d80
--- /dev/null
+++ b/src/types/index.d.ts
@@ -0,0 +1,11 @@
+interface Heap {
+  loaded: boolean;
+  userId: string;
+  load: (appId: string, options: { forceSSL: boolean }) => void;
+  track: (actionType: string, data: {}) => void;
+}
+
+interface CustomWindow extends Window {
+  heap?: Heap;
+  __LMEM__CONTENT_SCRIPT_INJECTED__?: boolean;
+}
diff --git a/src/types/styled-components.ts b/src/types/styled-components.ts
new file mode 100644
index 000000000..18771d88a
--- /dev/null
+++ b/src/types/styled-components.ts
@@ -0,0 +1,14 @@
+import * as styledComponents from 'styled-components';
+
+import { Theme } from '../app/theme';
+
+const {
+  default: styled,
+  css,
+  createGlobalStyle,
+  keyframes,
+  ThemeProvider
+} = styledComponents as styledComponents.ThemedStyledComponentsModule<Theme>;
+
+export { css, createGlobalStyle, keyframes, ThemeProvider };
+export default styled;
diff --git a/test/app/lmem/findMatchingOffersAccordingToPreferences.js b/test/app/lmem/findMatchingOffersAccordingToPreferences.js
index be4c33974..bf9a1f146 100644
--- a/test/app/lmem/findMatchingOffersAccordingToPreferences.js
+++ b/test/app/lmem/findMatchingOffersAccordingToPreferences.js
@@ -1,178 +1,208 @@
-import chai from 'chai';
-import { Map as ImmutableMap, fromJS } from 'immutable';
-
-import findMatchingOffersAccordingToPreferences from '../../../src/app/lmem/findMatchingOffersAccordingToPreferences';
-
+import chai from "chai";
+import { findMatchingOffersAccordingToPreferences } from "../../../src/app/lmem/matchingContext";
 const expect = chai.expect;
 
 const offers = [
-  {url_regex: 'www.samsung.com'},
-  {url_regex: 'arrested.com'},
-];
-const draftRecommendations = [
-  {url_regex: 'www.wordpress.com'},
+  { url_regex: "www.samsung.com" },
+  { url_regex: "arrested.com" }
 ];
+const draftRecommendations = [{ url_regex: "www.wordpress.com" }];
 
-const matchingURL = 'https://www.samsung.com/blabla';
-const matchingDraftURL = 'https://www.wordpress.com/lol';
-const nonMatchingURL = 'https://soundcloud.com/capt-lovelace/meteo-marine';
+const matchingURL = "https://www.samsung.com/blabla";
+const matchingDraftURL = "https://www.wordpress.com/lol";
+const nonMatchingURL = "https://soundcloud.com/capt-lovelace/meteo-marine";
 
-describe('findMatchingOffersAccordingToPreferences', function () {
-
-  it('should be case insensitive', () => {
+describe("findMatchingOffersAccordingToPreferences", function() {
+  it("should be case insensitive", () => {
     const offersWithWeirdCase = [
-      {url_regex: 's.*'},
-      {url_regex: 'SamSung'},
-      {url_regex: 'doesNotMatch'}
+      { url_regex: "s.*" },
+      { url_regex: "SamSung" },
+      { url_regex: "doesNotMatch" }
     ];
 
-    const matches = findMatchingOffersAccordingToPreferences(matchingURL, offersWithWeirdCase, []);
+    const matches = findMatchingOffersAccordingToPreferences(
+      matchingURL,
+      offersWithWeirdCase,
+      []
+    );
 
-    expect(matches).to.be.an('array');
+    expect(matches).to.be.an("array");
     expect(matches).to.be.of.length(2);
     expect(matches[0]).to.equal(offersWithWeirdCase[0]);
     expect(matches[1]).to.equal(offersWithWeirdCase[1]);
   });
 
-  describe('exclusion', () => {
-    it('should exclude matching exclusion of otherwise matching url', () => {
+  describe("exclusion", () => {
+    it("should exclude matching exclusion of otherwise matching url", () => {
       const offersWithExclusion = [
-        { url_regex: 'samsung', exclude_url_regex: 'blabla' },
+        { url_regex: "samsung", exclude_url_regex: "blabla" }
       ];
 
-      const matches = findMatchingOffersAccordingToPreferences(matchingURL, offersWithExclusion, []);
+      const matches = findMatchingOffersAccordingToPreferences(
+        matchingURL,
+        offersWithExclusion,
+        []
+      );
 
-      expect(matches).to.be.an('array');
+      expect(matches).to.be.an("array");
       expect(matches).to.be.of.length(0);
     });
 
-    it('should not exclude non matching exclusion of matching url', () => {
+    it("should not exclude non matching exclusion of matching url", () => {
       const offersWithExclusion = [
-        { url_regex: 'samsung', exclude_url_regex: 'nono' },
+        { url_regex: "samsung", exclude_url_regex: "nono" }
       ];
 
-      const matches = findMatchingOffersAccordingToPreferences(matchingURL, offersWithExclusion, []);
+      const matches = findMatchingOffersAccordingToPreferences(
+        matchingURL,
+        offersWithExclusion,
+        []
+      );
 
-      expect(matches).to.be.an('array');
+      expect(matches).to.be.an("array");
       expect(matches).to.be.of.length(1);
       expect(matches[0]).to.equal(offersWithExclusion[0]);
     });
 
-    it('should exclude its matching context if regex is invalid', () => {
+    it("should exclude its matching context if regex is invalid", () => {
       const offersWithExclusion = [
-        { url_regex: 'samsung', exclude_url_regex: 'isNasty)' }, // SyntaxError: Invalid RegExp: Unmatched ')'
+        { url_regex: "samsung", exclude_url_regex: "isNasty)" } // SyntaxError: Invalid RegExp: Unmatched ')'
       ].concat(offers);
 
-      const matches = findMatchingOffersAccordingToPreferences(matchingURL, offersWithExclusion, []);
+      const matches = findMatchingOffersAccordingToPreferences(
+        matchingURL,
+        offersWithExclusion,
+        []
+      );
 
-      expect(matches).to.be.an('array');
+      expect(matches).to.be.an("array");
       expect(matches).to.be.of.length(1);
       expect(matches[0]).to.equal(offersWithExclusion[1]);
     });
   });
 
-  describe('invalid regex', () => {
-    const nastyOffers = [{url_regex: 'isNasty)'}].concat(offers); // SyntaxError: Invalid RegExp: Unmatched ')'
+  describe("invalid regex", () => {
+    const nastyOffers = [{ url_regex: "isNasty)" }].concat(offers); // SyntaxError: Invalid RegExp: Unmatched ')'
 
-    it('should not screw up the matching engine', () => {
-      const matches = findMatchingOffersAccordingToPreferences(matchingURL, nastyOffers, []);
+    it("should not screw up the matching engine", () => {
+      const matches = findMatchingOffersAccordingToPreferences(
+        matchingURL,
+        nastyOffers,
+        []
+      );
 
-      expect(findMatchingOffersAccordingToPreferences).to.not.throw(SyntaxError);
+      expect(findMatchingOffersAccordingToPreferences).to.not.throw(
+        SyntaxError
+      );
 
-      expect(matches).to.be.an('array');
+      expect(matches).to.be.an("array");
       expect(matches).to.be.of.length(1);
       expect(matches[0]).to.equal(nastyOffers[1]);
     });
   });
 
-  describe('empty prefs, no draft', () => {
-    
-    it('should match when the url matches an offer', () => {
-      const matching = findMatchingOffersAccordingToPreferences(matchingURL, offers, [])
+  describe("empty prefs, no draft", () => {
+    it("should match when the url matches an offer", () => {
+      const matching = findMatchingOffersAccordingToPreferences(
+        matchingURL,
+        offers,
+        []
+      );
 
-      expect(matching).to.be.an('array');
+      expect(matching).to.be.an("array");
       expect(matching).to.be.of.length(1);
-      expect( matching[0] ).to.equal( offers[0] );
-    })
-    
-    it('should not match when the url does not match any offer', () => {
-      const matching = findMatchingOffersAccordingToPreferences(nonMatchingURL, offers, [])
+      expect(matching[0]).to.equal(offers[0]);
+    });
 
-      expect(matching).to.be.an('array');
-      expect(matching).to.be.of.length(0);
-    })
+    it("should not match when the url does not match any offer", () => {
+      const matching = findMatchingOffersAccordingToPreferences(
+        nonMatchingURL,
+        offers,
+        []
+      );
 
-  })
+      expect(matching).to.be.an("array");
+      expect(matching).to.be.of.length(0);
+    });
+  });
 
-  describe('pref with deactivated.everywhereUntil in the future', () => {
-    
+  describe("pref with deactivated.everywhereUntil in the future", () => {
     const prefs = fromJS({
       deactivated: {
         // in the future
-        everywhereUntil : Date.now() + 100*1000
+        everywhereUntil: Date.now() + 100 * 1000
       }
     });
 
-    it('should not match when deactivatedEverywhereUntil is in the future', () => {
-      const matching = findMatchingOffersAccordingToPreferences(matchingURL, offers, [], prefs)
+    it("should not match when deactivatedEverywhereUntil is in the future", () => {
+      const matching = findMatchingOffersAccordingToPreferences(
+        matchingURL,
+        offers,
+        [],
+        prefs
+      );
 
-      expect(matching).to.be.an('array');
+      expect(matching).to.be.an("array");
       expect(matching).to.be.of.length(0);
-    })
-
-  })
+    });
+  });
 
-  describe('pref with deactivatedWebsites', () => {
-    
+  describe("pref with deactivatedWebsites", () => {
     const prefs = fromJS({
       deactivated: {
-        deactivatedWebsites : new Set([
-          'www.samsung.com',
-          'yo.com'
-        ])
+        deactivatedWebsites: new Set(["www.samsung.com", "yo.com"])
       }
     });
 
-    it('should not match with matching url, but pref listing as deactivated', () => {
-      const matching = findMatchingOffersAccordingToPreferences(matchingURL, offers, [], prefs)
+    it("should not match with matching url, but pref listing as deactivated", () => {
+      const matching = findMatchingOffersAccordingToPreferences(
+        matchingURL,
+        offers,
+        [],
+        prefs
+      );
 
-      expect(matching).to.be.an('array');
+      expect(matching).to.be.an("array");
       expect(matching).to.be.of.length(0);
-    })
-
-  })
-
-  describe('draft recommendations', () => {
+    });
+  });
 
-    it('should match a draft recommendation', () => {
-      const matching = findMatchingOffersAccordingToPreferences(matchingDraftURL, offers, draftRecommendations)
+  describe("draft recommendations", () => {
+    it("should match a draft recommendation", () => {
+      const matching = findMatchingOffersAccordingToPreferences(
+        matchingDraftURL,
+        offers,
+        draftRecommendations
+      );
 
-      expect(matching).to.be.an('array');
+      expect(matching).to.be.an("array");
       expect(matching).to.be.of.length(1);
-      expect(matching[0]).to.equal( draftRecommendations[0] );
-    })
+      expect(matching[0]).to.equal(draftRecommendations[0]);
+    });
 
-    it('should favor draft previews over public offers', () => {
+    it("should favor draft previews over public offers", () => {
       const draftRec = {
-        url_regex: 'www.wordpress.com',
+        url_regex: "www.wordpress.com",
         recommendation: {
           visibility: "private"
         }
       };
       const publicRec = {
-        url_regex: 'www.wordpress.com',
+        url_regex: "www.wordpress.com",
         recommendation: {
           visibility: "public"
         }
       };
 
-      const matching = findMatchingOffersAccordingToPreferences(matchingDraftURL, [publicRec], [draftRec])
+      const matching = findMatchingOffersAccordingToPreferences(
+        matchingDraftURL,
+        [publicRec],
+        [draftRec]
+      );
 
-      expect(matching).to.be.an('array');
+      expect(matching).to.be.an("array");
       expect(matching).to.be.of.length(1);
-      expect(matching[0]).to.equal( draftRec );
-    })
-
-  })
-
-});
\ No newline at end of file
+      expect(matching[0]).to.equal(draftRec);
+    });
+  });
+});
diff --git a/test/app/reducers.js b/test/app/reducers.js
index de682a11d..c290f1c9d 100644
--- a/test/app/reducers.js
+++ b/test/app/reducers.js
@@ -1,213 +1,296 @@
-import chai from 'chai';
-import { Map as ImmutableMap, Set as ImmutableSet, fromJS } from 'immutable';
+import chai from "chai";
+import { Map as ImmutableMap, Set as ImmutableSet, fromJS } from "immutable";
 
-import prefsReducer from '../../src/app/background/reducers/prefs';
-import resourcesReducer from '../../src/app/background/reducers/resources';
+import prefsReducer from "../../src/app/background/reducers/prefs";
+import resourcesReducer from "../../src/app/background/reducers/resources";
 
-import makeInitialState from '../../src/app/background/store/makeInitialState';
+import makeInitialState from "../../src/app/background/store/makeInitialState";
 
 import {
   receivedMatchingContexts,
   receivedCriteria,
-  receivedEditors,
-} from '../../src/app/background/actions/kraftBackend';
+  receivedEditors
+} from "../../src/app/background/actions/kraftBackend";
 
-import { deactivate } from '../../src/app/content/actions/ui';
-import { excludeEditor, includeEditor } from '../../src/app/content/actions/filters';
-import { dismissNotice, likeNotice, unlikeNotice, dislikeNotice, undislikeNotice, undismissNotice, reportNotice } from '../../src/app/content/actions/recommendations';
-import { DEACTIVATE_EVERYWHERE, DEACTIVATE_WEBSITE_ALWAYS } from '../../src/app/constants/websites';
+import { deactivate } from "../../src/app/content/actions/ui";
+import {
+  excludeEditor,
+  includeEditor
+} from "../../src/app/content/actions/filters";
+import {
+  dismissNotice,
+  likeNotice,
+  unlikeNotice,
+  dislikeNotice,
+  undislikeNotice,
+  undismissNotice,
+  reportNotice
+} from "../../src/app/content/actions/recommendations";
 
 const expect = chai.expect;
 
-describe('background reducer', function () {
-
-  it('initial state + receivedMatchingContexts => state with offers', () => {
+describe("background reducer", function() {
+  it("initial state + receivedMatchingContexts => state with offers", () => {
     const matchingContexts = new ImmutableSet([{}, {}]);
     const action = receivedMatchingContexts(matchingContexts);
 
-    const nextState = resourcesReducer( makeInitialState().get('resources'), action );
+    const nextState = resourcesReducer(
+      makeInitialState().get("resources"),
+      action
+    );
 
     expect(action.payload.matchingContexts).to.be.an.instanceof(ImmutableSet);
-    expect(nextState.get('matchingContexts')).to.have.size(matchingContexts.size);
+    expect(nextState.get("matchingContexts")).to.have.size(
+      matchingContexts.size
+    );
   });
 
-  it('initial state + criteria => state with criteria', () => {
-    const criteria = new ImmutableMap({crit1: new ImmutableMap({slug: 'crit1'})});
+  it("initial state + criteria => state with criteria", () => {
+    const criteria = new ImmutableMap({
+      crit1: new ImmutableMap({ slug: "crit1" })
+    });
     const action = receivedCriteria(criteria);
 
-    const nextState = prefsReducer( makeInitialState().get('prefs'), action );
-
-    expect(nextState.get('criteria')).to.have.size(1);
-    expect(nextState.get('criteria').get('crit1').get('slug')).to.equal('crit1');
-    expect(nextState.get('criteria').get('crit1').get('isSelected')).to.equal(true);
+    const nextState = prefsReducer(makeInitialState().get("prefs"), action);
+
+    expect(nextState.get("criteria")).to.have.size(1);
+    expect(
+      nextState
+        .get("criteria")
+        .get("crit1")
+        .get("slug")
+    ).to.equal("crit1");
+    expect(
+      nextState
+        .get("criteria")
+        .get("crit1")
+        .get("isSelected")
+    ).to.equal(true);
   });
 
-  it('state with criteria + new criteria => state with memory of initial criteria', () => {
-    const criteria = new ImmutableMap({crit2: new ImmutableMap({slug: 'crit2'})});
+  it("state with criteria + new criteria => state with memory of initial criteria", () => {
+    const criteria = new ImmutableMap({
+      crit2: new ImmutableMap({ slug: "crit2" })
+    });
     const action = receivedCriteria(criteria);
 
     const nextState = prefsReducer(
       fromJS({
         criteria: {
           crit1: {
-            slug: 'crit1',
+            slug: "crit1",
             isSelected: false
           }
         }
       }),
-      action);
-
-    expect(nextState.get('criteria')).to.have.size(2);
-    expect(nextState.get('criteria').get('crit1').get('isSelected')).to.equal(false);
-    expect(nextState.get('criteria').get('crit2').get('isSelected')).to.equal(true);
+      action
+    );
+
+    expect(nextState.get("criteria")).to.have.size(2);
+    expect(
+      nextState
+        .get("criteria")
+        .get("crit1")
+        .get("isSelected")
+    ).to.equal(false);
+    expect(
+      nextState
+        .get("criteria")
+        .get("crit2")
+        .get("isSelected")
+    ).to.equal(true);
   });
 
-  it('initial state + editors => state with editors', () => {
-    const editors = new ImmutableMap({1: new ImmutableMap({id: 1})});
+  it("initial state + editors => state with editors", () => {
+    const editors = new ImmutableMap({ 1: new ImmutableMap({ id: 1 }) });
     const action = receivedEditors(editors);
 
-    const nextState = prefsReducer( makeInitialState().get('prefs'), action );
-
-    expect(nextState.get('editors')).to.have.size(1);
-    expect(nextState.get('editors').get('1').get('id')).to.equal(1);
-    expect(nextState.get('editors').get('1').get('isExcluded')).to.equal(false);
+    const nextState = prefsReducer(makeInitialState().get("prefs"), action);
+
+    expect(nextState.get("editors")).to.have.size(1);
+    expect(
+      nextState
+        .get("editors")
+        .get("1")
+        .get("id")
+    ).to.equal(1);
+    expect(
+      nextState
+        .get("editors")
+        .get("1")
+        .get("isExcluded")
+    ).to.equal(false);
   });
 
-  it('state with editors + new editors => state with memory of initial editors', () => {
-    const editors = new ImmutableMap({2: new ImmutableMap({id: 2})});
+  it("state with editors + new editors => state with memory of initial editors", () => {
+    const editors = new ImmutableMap({ 2: new ImmutableMap({ id: 2 }) });
     const action = receivedEditors(editors);
 
     const nextState = prefsReducer(
       fromJS({
-        'editors': {
+        editors: {
           1: {
             id: 1,
             isExcluded: true
           }
         }
       }),
-      action);
-
-    expect(nextState.get('editors')).to.have.size(2);
-    expect(nextState.get('editors').get('1').get('isExcluded')).to.equal(true);
-    expect(nextState.get('editors').get('2').get('isExcluded')).to.equal(false);
+      action
+    );
+
+    expect(nextState.get("editors")).to.have.size(2);
+    expect(
+      nextState
+        .get("editors")
+        .get("1")
+        .get("isExcluded")
+    ).to.equal(true);
+    expect(
+      nextState
+        .get("editors")
+        .get("2")
+        .get("isExcluded")
+    ).to.equal(false);
   });
 
-  it('initial state + deactivate (everywhere) => state with deactivated pref', () => {
+  it("initial state + deactivate (everywhere) => state with deactivated pref", () => {
     const action = deactivate({
       where: DEACTIVATE_EVERYWHERE,
       duration: 1000
     });
 
-    const nextState = prefsReducer( makeInitialState().get('prefs'), action );
+    const nextState = prefsReducer(makeInitialState().get("prefs"), action);
 
-    expect(nextState.get('websites').get('deactivated').get('everywhereUntil')).to.be.above(Date.now());
+    expect(
+      nextState
+        .get("websites")
+        .get("deactivated")
+        .get("everywhereUntil")
+    ).to.be.above(Date.now());
   });
 
-  it('exclude editor', () => {
+  it("exclude editor", () => {
     const action = excludeEditor(1);
 
     const nextState = prefsReducer(
       fromJS({
-        'editors': {
+        editors: {
           "1": {
             id: 1,
-            'isExcluded': false
+            isExcluded: false
           }
         }
       }),
-      action);
-
-    expect(nextState.get('editors')).to.have.size(1);
-    expect(nextState.get('editors').get('1').get('isExcluded')).to.be.true;
+      action
+    );
+
+    expect(nextState.get("editors")).to.have.size(1);
+    expect(
+      nextState
+        .get("editors")
+        .get("1")
+        .get("isExcluded")
+    ).to.be.true;
   });
 
-  it('include editor', () => {
+  it("include editor", () => {
     const action = includeEditor(1);
 
     const nextState = prefsReducer(
       fromJS({
-        'editors': {
+        editors: {
           "1": {
             id: 1,
-            'isExcluded': true
+            isExcluded: true
           }
         }
       }),
-      action );
-
-    expect(nextState.get('editors')).to.have.size(1);
-    expect(nextState.get('editors').get('1').get('isExcluded')).to.be.false;
+      action
+    );
+
+    expect(nextState.get("editors")).to.have.size(1);
+    expect(
+      nextState
+        .get("editors")
+        .get("1")
+        .get("isExcluded")
+    ).to.be.false;
   });
 
-  it('dismiss notice', () => {
+  it("dismiss notice", () => {
     const action = dismissNotice(1);
 
     const nextState = prefsReducer(
-      fromJS({'dismissedNotices': new ImmutableSet()}),
-      action );
+      fromJS({ dismissedNotices: new ImmutableSet() }),
+      action
+    );
 
-    expect(nextState.get('dismissedNotices')).to.have.size(1);
+    expect(nextState.get("dismissedNotices")).to.have.size(1);
   });
 
-  it('like notice', () => {
+  it("like notice", () => {
     const action = likeNotice(1);
 
     const nextState = prefsReducer(
-      fromJS({ 'likedNotices': new ImmutableSet()}),
-      action );
+      fromJS({ likedNotices: new ImmutableSet() }),
+      action
+    );
 
-    expect(nextState.get('likedNotices')).to.have.size(1);
+    expect(nextState.get("likedNotices")).to.have.size(1);
   });
 
-  it('dislike notice', () => {
+  it("dislike notice", () => {
     const action = dislikeNotice(1);
 
     const nextState = prefsReducer(
-      fromJS({ 'dislikedNotices': new ImmutableSet()}),
-      action );
+      fromJS({ dislikedNotices: new ImmutableSet() }),
+      action
+    );
 
-    expect(nextState.get('dislikedNotices')).to.have.size(1);
+    expect(nextState.get("dislikedNotices")).to.have.size(1);
   });
 
-  it('undismiss notice', () => {
+  it("undismiss notice", () => {
     const action = undismissNotice(42);
 
     const nextState = prefsReducer(
-      fromJS({ 'dismissedNotices': new ImmutableSet([42])}),
-      action );
+      fromJS({ dismissedNotices: new ImmutableSet([42]) }),
+      action
+    );
 
-    expect(nextState.get('dismissedNotices')).to.have.size(0);
+    expect(nextState.get("dismissedNotices")).to.have.size(0);
   });
 
-  it('unlike notice', () => {
+  it("unlike notice", () => {
     const action = unlikeNotice(42);
 
     const nextState = prefsReducer(
-      fromJS({ 'likedNotices': new ImmutableSet([42])}),
-      action );
+      fromJS({ likedNotices: new ImmutableSet([42]) }),
+      action
+    );
 
-    expect(nextState.get('likedNotices')).to.have.size(0);
+    expect(nextState.get("likedNotices")).to.have.size(0);
   });
 
-  it('undislike notice', () => {
+  it("undislike notice", () => {
     const action = undislikeNotice(42);
 
     const nextState = prefsReducer(
-      fromJS({ 'dislikedNotices': new ImmutableSet([42])}),
-      action );
+      fromJS({ dislikedNotices: new ImmutableSet([42]) }),
+      action
+    );
 
-    expect(nextState.get('dislikedNotices')).to.have.size(0);
+    expect(nextState.get("dislikedNotices")).to.have.size(0);
   });
 
-  it('report notice', () => {
+  it("report notice", () => {
     const action = reportNotice(1);
 
     const nextState = prefsReducer(
-      fromJS({'reportedNotices': new ImmutableSet()}),
-      action );
+      fromJS({ reportedNotices: new ImmutableSet() }),
+      action
+    );
 
-    expect(nextState.get('reportedNotices')).to.have.size(1);
+    expect(nextState.get("reportedNotices")).to.have.size(1);
   });
-
 });
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 000000000..79c623d11
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,73 @@
+{
+  "compilerOptions": {
+    "resolveJsonModule": true,
+
+    /* Basic Options */
+    "target": "es5" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */,
+    "module": "es2015" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
+    "lib": [
+      "es2017",
+      "dom"
+    ] /* Specify library files to be included in the compilation. */,
+    "allowJs": true /* Allow javascript files to be compiled. */,
+    "checkJs": true /* Report errors in .js files. */,
+    "jsx": "react" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */,
+    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    "sourceMap": true /* Generates corresponding '.map' file. */,
+    // "outFile": "./build",                       /* Concatenate and emit output to single file. */
+    "outDir": "./build" /* Redirect output structure to the directory. */,
+    // "rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    // "composite": true,                     /* Enable project compilation */
+    // "removeComments": true,                /* Do not emit comments to output. */
+    // "noEmit": true,                        /* Do not emit outputs. */
+    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+    /* Strict Type-Checking Options */
+    "strict": true /* Enable all strict type-checking options. */,
+    "noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */,
+    "strictNullChecks": true /* Enable strict null checks. */,
+    "strictFunctionTypes": true /* Enable strict checking of function types. */,
+    "strictBindCallApply": true /* Enable strict 'bind', 'call', and 'apply' methods on functions. */,
+    "strictPropertyInitialization": true /* Enable strict checking of property initialization in classes. */,
+    "noImplicitThis": true /* Raise error on 'this' expressions with an implied 'any' type. */,
+    "alwaysStrict": true /* Parse in strict mode and emit "use strict" for each source file. */,
+
+    /* Additional Checks */
+    // "noUnusedLocals": true,                /* Report errors on unused locals. */
+    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
+    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    /* Module Resolution Options */
+    "moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
+    "baseUrl": "./src" /* Base directory to resolve non-absolute module names. */,
+    "paths": {},
+    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "typeRoots": [],                       /* List of folders to include type definitions from. */
+    "types": [
+      "chrome"
+    ] /* Type declaration files to be included in compilation. */,
+    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+  },
+  "include": ["./src/**/*"],
+  "exclude": ["./src/app/lmem/draft-preview/grabDraftRecommendations.js"],
+  "awesomeTypescriptLoaderOptions": {
+    "transpileOnly": false,
+    "useCache": false
+  }
+}
diff --git a/tslint.json b/tslint.json
new file mode 100644
index 000000000..6ef41d0f3
--- /dev/null
+++ b/tslint.json
@@ -0,0 +1,15 @@
+{
+  "defaultSeverity": "error",
+  "extends": [
+    "tslint-config-standard",
+    "tslint-react",
+    "tslint-config-prettier"
+  ],
+  "jsRules": {},
+  "rules": {
+    "quotemark": [true, "single"],
+    "jsx-boolean-value": false,
+    "no-unused-expression": false
+  },
+  "rulesDirectory": []
+}
diff --git a/views/background.pug b/views/background.pug
index b037e2f82..676d579ac 100644
--- a/views/background.pug
+++ b/views/background.pug
@@ -3,4 +3,4 @@ doctype html
 html
   head
     include ./includes/devtools
-    script(src=webpackConfig.output.publicPath + '/js/background.bundle.js')
\ No newline at end of file
+    script(src=webpackConfig.output.publicPath + '/js/background.bundle.js')
diff --git a/webpack/config.plugins.js b/webpack/config.plugins.js
index 86b60e061..e32cfff7d 100644
--- a/webpack/config.plugins.js
+++ b/webpack/config.plugins.js
@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require("path");
 const webpack = require("webpack");
 const WebpackCleanupPlugin = require("webpack-cleanup-plugin");
 const HtmlWebpackPlugin = require("html-webpack-plugin");
@@ -7,29 +7,29 @@ const ZipPlugin = require("zip-webpack-plugin");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 
 const manifests = require("../manifest");
-const { version } = require('../package.json');
+const { version } = require("../package.json");
 
 const ENV = {
   dev: {
-    LMEM_BACKEND_ORIGIN: '"https://recommendations.lmem.net"',
+    LMEM_BACKEND_ORIGIN: '"https://recommendations.lmem.net"'
   },
   staging: {
     LMEM_BACKEND_ORIGIN: '"https://staging-recommendations.lmem.net"',
-    UNINSTALL_ORIGIN: '\'https://www.lmem.net/desinstallation\'',
+    UNINSTALL_ORIGIN: "'https://www.lmem.net/desinstallation'",
     HEAP_APPID: '"234457910"', // testing
-    REFRESH_MC_INTERVAL: '5*60*1000',
+    REFRESH_MC_INTERVAL: "5*60*1000"
   },
   chromium: {
     LMEM_BACKEND_ORIGIN: '"https://recommendations.lmem.net"',
-    UNINSTALL_ORIGIN: '\'https://www.lmem.net/desinstallation\'',
-    REFRESH_MC_INTERVAL: '10*60*1000',
+    UNINSTALL_ORIGIN: "'https://www.lmem.net/desinstallation'",
+    REFRESH_MC_INTERVAL: "10*60*1000",
     ONBOARDING_ORIGIN: '"https://bienvenue.lmem.net?extensionInstalled"',
-    HEAP_APPID: '"3705584166"', // production
+    HEAP_APPID: '"3705584166"' // production
   },
   firefox: {
     LMEM_BACKEND_ORIGIN: '"https://recommendations.lmem.net"',
     ONBOARDING_ORIGIN: '"https://bienvenue.lmem.net?extensionInstalled"',
-    REFRESH_MC_INTERVAL: '10*60*1000',
+    REFRESH_MC_INTERVAL: "10*60*1000"
   }
 };
 
@@ -37,28 +37,37 @@ module.exports = (env = {}, argv = {}, outputPath) => {
   const buildPath = path.join(outputPath, env.build);
 
   const copyConfig = [
-    { from: 'src/assets', to: buildPath},
-    { from: 'src/app/lmem/draft-preview/grabDraftRecommendations.js', to: path.join(buildPath, 'js')}
+    { from: "src/assets", to: buildPath },
+    {
+      from: "src/app/lmem/draft-preview/grabDraftRecommendations.js",
+      to: path.join(buildPath, "js")
+    }
   ];
-  if (argv.mode !== 'production') {
+  if (argv.mode !== "production") {
     copyConfig.push(
-      { from: 'test/infrastructure', to: path.join(outputPath, env.build, 'test', 'infrastructure')},
-      { from: 'test/integration', to: path.join(outputPath, env.build, 'test', 'integration') }
+      {
+        from: "test/infrastructure",
+        to: path.join(outputPath, env.build, "test", "infrastructure")
+      },
+      {
+        from: "test/integration",
+        to: path.join(outputPath, env.build, "test", "integration")
+      }
     );
   }
 
   const plugins = [
     new HtmlWebpackPlugin({
-      template: './views/background.pug',
-      filename: 'background.html',
+      template: "./views/background.pug",
+      filename: "background.html",
       inject: false
     }),
     new webpack.DefinePlugin({
-      'process.env': ENV[env.build]
+      "process.env": ENV[env.build]
     }),
     new CreateFilePlugin({
       path: path.join(outputPath, env.build),
-      fileName: 'manifest.json',
+      fileName: "manifest.json",
       content: JSON.stringify(manifests[env.build])
     }),
     new CopyWebpackPlugin(copyConfig)
@@ -68,11 +77,11 @@ module.exports = (env = {}, argv = {}, outputPath) => {
     plugins.push(
       new WebpackCleanupPlugin({ quiet: true }),
       new ZipPlugin({
-        path: '..',
-        filename: `lmem-v${version}-${env.build}.zip`,
-     //   pathPrefix: env.build,
+        path: "..",
+        filename: `lmem-v${version}-${env.build}.zip`
+        //   pathPrefix: env.build,
       })
-    )
+    );
   }
 
   return plugins;
diff --git a/webpack/config.rules.js b/webpack/config.rules.js
index abda009ec..950604259 100644
--- a/webpack/config.rules.js
+++ b/webpack/config.rules.js
@@ -8,7 +8,7 @@ module.exports = (env, mode) => {
     },
     {
       test: /\.jsx?$/,
-      loader: require.resolve("babel-loader"),
+      loader: require.resolve("awesome-typescript-loader"),
       include: [
         path.resolve(__dirname, "..", "src"),
         path.resolve(__dirname, "..", ".storybook")
diff --git a/yarn.lock b/yarn.lock
index d1e0457ec..4b8a889fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1162,6 +1162,11 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
+"@emmetio/extract-abbreviation@0.1.6":
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/@emmetio/extract-abbreviation/-/extract-abbreviation-0.1.6.tgz#e4a9856c1057f0aff7d443b8536477c243abe28c"
+  integrity sha512-Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw==
+
 "@emotion/cache@^0.8.8":
   version "0.8.8"
   resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-0.8.8.tgz#2c3bd1aa5fdb88f1cc2325176a3f3201739e726c"
@@ -1281,6 +1286,50 @@
     node-fetch "^2.1.1"
     url-template "^2.0.8"
 
+"@redux-saga/core@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.0.2.tgz#4336a5bb4253e5ca69681c25a863fbbc03ea6d88"
+  integrity sha512-AsJYcpuYfM1cmxJvfhXs9HAFSZVEG17TMsLPlXH7+Hq5a5ZP4GqcbtijEmS2AC7NR5lLJHy8csxpqz22PeW5dw==
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+    "@redux-saga/deferred" "^1.0.1"
+    "@redux-saga/delay-p" "^1.0.1"
+    "@redux-saga/is" "^1.0.2"
+    "@redux-saga/symbols" "^1.0.1"
+    "@redux-saga/types" "^1.0.2"
+    redux ">=0.10 <5"
+    typescript-tuple "^2.1.0"
+
+"@redux-saga/deferred@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@redux-saga/deferred/-/deferred-1.0.1.tgz#c895445e486bded90acf0b873b4e978fbfe458c2"
+  integrity sha512-+gW5xQ93QXOOmRLAmX8x2Hx1HpbTG6CM6+HcdTSbJovh4uMWaGyeDECnqXSt8QqA/ja3s2nqYXLqXFKepIQ1hw==
+
+"@redux-saga/delay-p@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@redux-saga/delay-p/-/delay-p-1.0.1.tgz#d69fc6103c7509ae80faa144ea17bbc69e51e029"
+  integrity sha512-0SnNDyDLUyB4NThtptAwiprNOnbCNhoed/Rp5JwS7SB+a/AdWynVgg/E6BmjsggLFNr07KW0bzn05tsPRBuU7Q==
+  dependencies:
+    "@redux-saga/symbols" "^1.0.1"
+
+"@redux-saga/is@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@redux-saga/is/-/is-1.0.2.tgz#7f4be014c97061898d7efb11d6c9de31e943ed38"
+  integrity sha512-WnaUOwYvPK2waWjzebT4uhL8zY76XNkzzpJ2EQJe8bN1tByvAjvT7MuJZTSshOhdHL5PsRO0MsH224XIXBJidQ==
+  dependencies:
+    "@redux-saga/symbols" "^1.0.1"
+    "@redux-saga/types" "^1.0.2"
+
+"@redux-saga/symbols@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@redux-saga/symbols/-/symbols-1.0.1.tgz#46512ae1275f88df061c42168d0f600ddb170c1e"
+  integrity sha512-akKkzcVnb1RzJaZV2LQFbi51abvdICMuAKwwLoCjjxLbLAGIw9EJxk5ucNnWSSCEsoEQMeol5tkAcK+Xzuv1Bg==
+
+"@redux-saga/types@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.0.2.tgz#1d94f02800b094753f9271c206a26c2a06ca14ee"
+  integrity sha512-8/qcMh15507AnXJ3lBeuhsdFwnWQqnp68EpUuHlYPixJ5vjVmls7/Jq48cnUlrZI8Jd9U1jkhfCl0gaT5KMgVw==
+
 "@semantic-release/changelog@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@semantic-release/changelog/-/changelog-3.0.0.tgz#e01514b517e775cea47aef7df5f5685c7aff2bf2"
@@ -1793,14 +1842,177 @@
   dependencies:
     "@types/babel-types" "*"
 
+"@types/chrome@^0.0.81":
+  version "0.0.81"
+  resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.81.tgz#4fbf34c370a60235be4f97f32429e701fb644d10"
+  integrity sha512-NKkQGMJSppFwUwMbEbYcq8/p/ACVHmQCUpWaqJVdHn81tU3by+YXnxw86KFa0tUSLamu35wtzFaMyY4TFaMceQ==
+  dependencies:
+    "@types/filesystem" "*"
+
+"@types/filesystem@*":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.29.tgz#ee3748eb5be140dcf980c3bd35f11aec5f7a3748"
+  integrity sha512-85/1KfRedmfPGsbK8YzeaQUyV1FQAvMPMTuWFQ5EkLd2w7szhNO96bk3Rh/SKmOfd9co2rCLf0Voy4o7ECBOvw==
+  dependencies:
+    "@types/filewriter" "*"
+
+"@types/filewriter@*":
+  version "0.0.28"
+  resolved "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.28.tgz#c054e8af4d9dd75db4e63abc76f885168714d4b3"
+  integrity sha1-wFTor02d11205jq8dviFFocU1LM=
+
+"@types/flat@^0.0.28":
+  version "0.0.28"
+  resolved "https://registry.yarnpkg.com/@types/flat/-/flat-0.0.28.tgz#5c788149d85a6cf8ff5f5f000acdd912cdea4274"
+  integrity sha1-XHiBSdhabPj/X18ACs3ZEs3qQnQ=
+
+"@types/history@*", "@types/history@^4.7.2":
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.2.tgz#0e670ea254d559241b6eeb3894f8754991e73220"
+  integrity sha512-ui3WwXmjTaY73fOQ3/m3nnajU/Orhi6cEu5rzX+BrAAJxa3eITXZ5ch9suPqtM03OWhAHhPSyBGCN4UKoxO20Q==
+
+"@types/hoist-non-react-statics@*":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#a59c0c995cc885bef1b8ec2241b114f9b35b517b"
+  integrity sha512-O2OGyW9wlO2bbDmZRH17MecArQfsIa1g//ve2IJk6BnmwEglFz5kdhP1BlgeqjVNH5IHIhsc83DWFo8StCe8+Q==
+  dependencies:
+    "@types/react" "*"
+
+"@types/isomorphic-fetch@^0.0.35":
+  version "0.0.35"
+  resolved "https://registry.yarnpkg.com/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.35.tgz#c1c0d402daac324582b6186b91f8905340ea3361"
+  integrity sha512-DaZNUvLDCAnCTjgwxgiL1eQdxIKEpNLOlTNtAgnZc50bG2copGhRrFN9/PxPBuJe+tZVLCbQ7ls0xveXVRPkvw==
+
+"@types/lodash-es@^4.17.3":
+  version "4.17.3"
+  resolved "https://registry.yarnpkg.com/@types/lodash-es/-/lodash-es-4.17.3.tgz#87eb0b3673b076b8ee655f1890260a136af09a2d"
+  integrity sha512-iHI0i7ZAL1qepz1Y7f3EKg/zUMDwDfTzitx+AlHhJJvXwenP682ZyGbgPSc5Ej3eEAKVbNWKFuwOadCj5vBbYQ==
+  dependencies:
+    "@types/lodash" "*"
+
+"@types/lodash@*":
+  version "4.14.123"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.123.tgz#39be5d211478c8dd3bdae98ee75bb7efe4abfe4d"
+  integrity sha512-pQvPkc4Nltyx7G1Ww45OjVqUsJP4UsZm+GWJpigXgkikZqJgRm4c48g027o6tdgubWHwFRF15iFd+Y4Pmqv6+Q==
+
 "@types/node@*":
   version "10.12.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.0.tgz#ea6dcbddbc5b584c83f06c60e82736d8fbb0c235"
 
+"@types/prop-types@*":
+  version "15.7.0"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.0.tgz#4c48fed958d6dcf9487195a0ef6456d5f6e0163a"
+  integrity sha512-eItQyV43bj4rR3JPV0Skpl1SncRCdziTEK9/v8VwXmV6d/qOUO8/EuWeHBbCZcsfSHfzI5UyMJLCSXtxxznyZg==
+
 "@types/q@^1.5.1":
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.1.tgz#48fd98c1561fe718b61733daed46ff115b496e18"
 
+"@types/ramda@^0.26.3":
+  version "0.26.3"
+  resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.26.3.tgz#e6c35cb0a75843c9cfe58e0be294ffbc4480f33e"
+  integrity sha512-ZTepXW1dgQySkTUbxb2JC61vJxnLqofq4S43rFWpobRRsDh9HgNQxjEWhjQcjoYAMhkyV8JsE9mhE7Pgo3AYbg==
+
+"@types/react-dom@^16.8.2":
+  version "16.8.2"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.8.2.tgz#9bd7d33f908b243ff0692846ef36c81d4941ad12"
+  integrity sha512-MX7n1wq3G/De15RGAAqnmidzhr2Y9O/ClxPxyqaNg96pGyeXUYPSvujgzEVpLo9oIP4Wn1UETl+rxTN02KEpBw==
+  dependencies:
+    "@types/react" "*"
+
+"@types/react-native@*":
+  version "0.57.38"
+  resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.57.38.tgz#2ff6ed1a7cc207afbfd87bf496513d96931d1446"
+  integrity sha512-bmY2ad/vQgP0HMT7Q7EQzirDBt5ibp+kBHclTnY7/i5MrdqE1oY+3b9NkDg3ohXlumr7p5stAG6I55nhfeUV6Q==
+  dependencies:
+    "@types/prop-types" "*"
+    "@types/react" "*"
+
+"@types/react-redux@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.0.3.tgz#b8dc3faa954b7f28e4b0209bcf9209b45251ed6b"
+  integrity sha512-6qsIHHNwF41viooUgR2lXHL81v3uyeJsugq9YCMYE4g2bDyG710G/I/w5nbn7AQ9XfuOLUwrWfm3edV7gDJ9AQ==
+  dependencies:
+    "@types/hoist-non-react-statics" "*"
+    "@types/react" "*"
+    redux "^4.0.0"
+
+"@types/react-router-dom@^4.3.1":
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-4.3.1.tgz#71fe2918f8f60474a891520def40a63997dafe04"
+  integrity sha512-GbztJAScOmQ/7RsQfO4cd55RuH1W4g6V1gDW3j4riLlt+8yxYLqqsiMzmyuXBLzdFmDtX/uU2Bpcm0cmudv44A==
+  dependencies:
+    "@types/history" "*"
+    "@types/react" "*"
+    "@types/react-router" "*"
+
+"@types/react-router@*", "@types/react-router@^4.4.4":
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-4.4.4.tgz#4dbd5588ea6024e0c04519bd8aabe74c0a2b77e5"
+  integrity sha512-TZVfpT6nvUv/lbho/nRtckEtgkhspOQr3qxrnpXixwgQRKKyg5PvDfNKc8Uend/p/Pi70614VCmC0NPAKWF+0g==
+  dependencies:
+    "@types/history" "*"
+    "@types/react" "*"
+
+"@types/react@*", "@types/react@^16.8.7":
+  version "16.8.7"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.8.7.tgz#7b1c0223dd5494f9b4501ad2a69aa6acb350a29b"
+  integrity sha512-0xbkIyrDNKUn4IJVf8JaCn+ucao/cq6ZB8O6kSzhrJub1cVSqgTArtG0qCfdERWKMEIvUbrwLXeQMqWEsyr9dA==
+  dependencies:
+    "@types/prop-types" "*"
+    csstype "^2.2.0"
+
+"@types/redux-immutable-state-invariant@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@types/redux-immutable-state-invariant/-/redux-immutable-state-invariant-2.1.0.tgz#b88d3f49c8187aba691313bd8263f2dd5a41f45c"
+  integrity sha512-QmzPRr4YVC4S7XRORufWopi6B+8c0v/xevSK58iEpwUNIiTKG6RUyZPHtTlUdNQ6S/wHoeNHYRGPh8ryv3b/1Q==
+  dependencies:
+    redux "^3.6.0 || ^4.0.0"
+
+"@types/redux-logger@^3.0.7":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@types/redux-logger/-/redux-logger-3.0.7.tgz#163f6f6865c69c21d56f9356dc8d741718ec0db0"
+  integrity sha512-oV9qiCuowhVR/ehqUobWWkXJjohontbDGLV88Be/7T4bqMQ3kjXwkFNL7doIIqlbg3X2PC5WPziZ8/j/QHNQ4A==
+  dependencies:
+    redux "^3.6.0"
+
+"@types/remote-redux-devtools@^0.5.3":
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/@types/remote-redux-devtools/-/remote-redux-devtools-0.5.3.tgz#04a1ed04566bfd0115be14dc933d5c47a6e59676"
+  integrity sha512-BiYLbXBzN4HA/pSgwlebtAwd35L+PD4lkUPPxzHqFQCZDP5bHTuRp8xCUQDKiU2iRWBgtI9cZRgQQR0Pv1LF3w==
+  dependencies:
+    redux "^4.0.0"
+
+"@types/storybook__addon-actions@^3.4.2":
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/@types/storybook__addon-actions/-/storybook__addon-actions-3.4.2.tgz#1d08689cc3259269ddb3479a2307c9d16944309e"
+  integrity sha512-CWxGz2pXav9PHcwrtXmkuH+xJL7sAu2AmIGEbkdT3Xs5jzBPZUEDEN//ZF7o6IOPP/tdXU37K1hrVMt9TDO0Bw==
+
+"@types/storybook__addon-knobs@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/storybook__addon-knobs/-/storybook__addon-knobs-4.0.1.tgz#fcd7ba4875130b7dddf688a77b95d8f28e35e6f0"
+  integrity sha512-7T1Oaw8ojdGGwVNspbBjpZioxtY9ySmMXvRzf3fCJhpexizNw49uzBD6MwhHUdboP1A/pDFWKVfv9ZDKeNXIHQ==
+  dependencies:
+    "@types/react" "*"
+    "@types/storybook__react" "*"
+
+"@types/storybook__react@*", "@types/storybook__react@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/storybook__react/-/storybook__react-4.0.1.tgz#b6320c9d027b8ee7ef1445fef8b4cba196d48ace"
+  integrity sha512-knkZErqv8Iy2QbebqBa5tsy2itIMKdO6bcQ7C19nmgTc+j1pnQhXCGcVyARzAQ1/NAuSYudSWQAKG+plgK7hyQ==
+  dependencies:
+    "@types/react" "*"
+    "@types/webpack-env" "*"
+
+"@types/styled-components@^4.1.12":
+  version "4.1.12"
+  resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-4.1.12.tgz#62c19bd1aa37b1a904d36c179a0fec66c24ac99c"
+  integrity sha512-Du0bltHm5sWkDnXzYi6cMNhnSKWHQW6//at359DtRJNfjeG1SdtqQPX6jiVtrUkBJ1JsjxqT18DssYBLJ/fg/A==
+  dependencies:
+    "@types/react" "*"
+    "@types/react-native" "*"
+    csstype "^2.2.0"
+
 "@types/unist@*", "@types/unist@^2.0.0":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.2.tgz#5dc0a7f76809b7518c0df58689cd16a19bd751c6"
@@ -1820,6 +2032,11 @@
     "@types/unist" "*"
     "@types/vfile-message" "*"
 
+"@types/webpack-env@*":
+  version "1.13.8"
+  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.8.tgz#859e35ab1811eccd35e6b8d692a622b0fa7b31ec"
+  integrity sha512-PWkdsHTGMQHbiZwCJrFRhookFnOBw5gboW7cLcx+QyTMpwCVEr3SxzVO3L52krDnuoq50S02IiMLGIt6AmhFug==
+
 "@webassemblyjs/ast@1.7.10":
   version "1.7.10"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.10.tgz#0cfc61d61286240b72fc522cb755613699eea40a"
@@ -2504,7 +2721,7 @@ axobject-query@^2.0.1:
   dependencies:
     ast-types-flow "0.0.7"
 
-babel-code-frame@^6.26.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"
   dependencies:
@@ -3124,7 +3341,7 @@ buffer@^5.1.0:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
 
-builtin-modules@^1.0.0:
+builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
@@ -3342,10 +3559,6 @@ chai-as-promised@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-5.3.0.tgz#09d7a402908aa70dfdbead53e5853fc79d3ef21c"
 
-chai-immutable@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/chai-immutable/-/chai-immutable-1.6.0.tgz#9ec00bdd67948b13b20fcbb89cbf4af2ce6f9247"
-
 chai@^3.5.0:
   version "3.5.0"
   resolved "http://registry.npmjs.org/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
@@ -3702,7 +3915,7 @@ commander@2.17.x, commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
 
-commander@^2.11.0, commander@^2.19.0, commander@^2.8.1:
+commander@^2.11.0, commander@^2.12.1, commander@^2.19.0, commander@^2.8.1:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
 
@@ -4236,6 +4449,11 @@ cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
   dependencies:
     cssom "0.3.x"
 
+csstype@^2.2.0:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.3.tgz#b701e5968245bf9b08d54ac83d00b624e622a9fa"
+  integrity sha512-rINUZXOkcBmoHWEyu7JdHu5JMzkGRoMX4ov9830WNgxf5UYxcBUO0QTKAqeJ5EZfSdlrcJYkC8WwfVW7JYi4yg==
+
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -4486,7 +4704,7 @@ dezalgo@^1.0.0, dezalgo@~1.0.3:
     asap "^2.0.0"
     wrappy "1"
 
-diff@3.5.0, diff@^3.5.0:
+diff@3.5.0, diff@^3.2.0, diff@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
@@ -4526,6 +4744,14 @@ dns-txt@^2.0.2:
   dependencies:
     buffer-indexof "^1.0.0"
 
+doctrine@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-0.7.2.tgz#7cb860359ba3be90e040b26b729ce4bfa654c523"
+  integrity sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=
+  dependencies:
+    esutils "^1.1.6"
+    isarray "0.0.1"
+
 doctrine@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
@@ -5138,6 +5364,11 @@ estraverse@~4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
 
+esutils@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375"
+  integrity sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U=
+
 esutils@^2.0.0, esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -7110,6 +7341,7 @@ js-tokens@^3.0.0:
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-tokens@^3.0.2:
   version "3.0.2"
@@ -7122,6 +7354,14 @@ js-yaml@^3.12.0, js-yaml@^3.9.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^3.7.0:
+  version "3.12.2"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz#ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc"
+  integrity sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 jsan@^3.1.5, jsan@^3.1.9:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/jsan/-/jsan-3.1.10.tgz#ba9917b864defff567e0c990a34ae7a8d5eb1d90"
@@ -7204,6 +7444,11 @@ json5@^2.1.0:
   dependencies:
     minimist "^1.2.0"
 
+jsonc-parser@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.3.tgz#1d53d7160e401a783dbceabaad82473f80e6ad7e"
+  integrity sha512-hk/69oAeaIzchq/v3lS50PXuzn5O2ynldopMC+SWBql7J2WtdptfB9dy8Y7+Og5rPkTCpn83zTiO8FMcqlXJ/g==
+
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -7481,14 +7726,10 @@ lockfile@^1.0.4:
   dependencies:
     signal-exit "^3.0.2"
 
-lodash-es@^4.17.11:
+lodash-es@^4.2.1:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0"
 
-lodash-es@^4.17.4:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7"
-
 lodash._baseuniq@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -7578,7 +7819,7 @@ lodash@>4.17.4, lodash@^4.0.1, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.3,
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
 
-lodash@^4.0.0, lodash@^4.11.1, lodash@^4.17.4, lodash@^4.2.1, lodash@~4.17.4:
+lodash@^4.0.0, lodash@^4.17.4, lodash@^4.2.1, lodash@~4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -9524,6 +9765,11 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
   integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
+prettier@^1.16.4:
+  version "1.16.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
+  integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
+
 pretty-error@^2.0.2, pretty-error@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
@@ -9865,6 +10111,11 @@ ramda@^0.21.0:
   version "0.21.0"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.21.0.tgz#a001abedb3ff61077d4ff1d577d44de77e8d0a35"
 
+ramda@^0.26.1:
+  version "0.26.1"
+  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06"
+  integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==
+
 randexp@0.4.6:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
@@ -10382,66 +10633,52 @@ redux-devtools-instrument@^1.9.0:
 redux-immutable-state-invariant@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/redux-immutable-state-invariant/-/redux-immutable-state-invariant-2.1.0.tgz#308fd3cc7415a0e7f11f51ec997b6379c7055ce1"
+  integrity sha512-3czbDKs35FwiBRsx/3KabUk5zSOoTXC+cgVofGkpBNv3jQcqIe5JrHcF5AmVt7B/4hyJ8MijBIpCJ8cife6yJg==
   dependencies:
     invariant "^2.1.0"
     json-stringify-safe "^5.0.1"
 
-redux-immutable@^3.0.10:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/redux-immutable/-/redux-immutable-3.1.0.tgz#cafbd686e0711261119b9c28960935dc47a49d0a"
-  dependencies:
-    immutable "^3.8.1"
-
 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-persist-immutable@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/redux-persist-immutable/-/redux-persist-immutable-4.3.0.tgz#cb919dd957622a4f9d7bb3d2ff99251b77d1c1ac"
-  dependencies:
-    redux-persist "^4.0.0"
-    redux-persist-transform-immutable "^4.1.0"
-
-redux-persist-transform-immutable@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/redux-persist-transform-immutable/-/redux-persist-transform-immutable-4.3.0.tgz#24720c99f0707dd99e920b95f851ae3d1baa6ed8"
-  dependencies:
-    transit-immutable-js "^0.7.0"
-    transit-js "^0.8.846"
-
-redux-persist@^3.2.2:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/redux-persist/-/redux-persist-3.5.0.tgz#84bd74c2b17e32d490aea71196a812f2013fcc8e"
-  dependencies:
-    json-stringify-safe "^5.0.1"
-    lodash "^4.11.1"
+redux-persist@^5.10.0:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/redux-persist/-/redux-persist-5.10.0.tgz#5d8d802c5571e55924efc1c3a9b23575283be62b"
+  integrity sha512-sSJAzNq7zka3qVHKce1hbvqf0Vf5DuTVm7dr4GtsqQVOexnrvbV47RWFiPxQ8fscnyiuWyD2O92DOxPl0tGCRg==
 
-redux-persist@^4.0.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/redux-persist/-/redux-persist-4.8.0.tgz#17fd998949bdeef9275e4cf60ad5bbe1c73675fc"
+redux-saga@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.0.2.tgz#0599703f975438f1b2f9d2b9a965ec58f0fdfcd7"
+  integrity sha512-dHV256by3eF2AnBPx1l3HqazQFkErZ82HDXgh4jSRpT72OrX31wyg8DA1q8+0HvENRfJAyhT/4qT5yH/vVqFfw==
   dependencies:
-    json-stringify-safe "^5.0.1"
-    lodash "^4.17.4"
-    lodash-es "^4.17.4"
-
-redux-saga@^0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-0.16.2.tgz#993662e86bc945d8509ac2b8daba3a8c615cc971"
+    "@redux-saga/core" "^1.0.2"
 
 redux-thunk@^2.0.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
+  integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==
 
-redux@^4.0.1:
+"redux@>=0.10 <5", "redux@^3.6.0 || ^4.0.0", redux@^4.0.0, redux@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5"
+  integrity sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==
   dependencies:
     loose-envify "^1.4.0"
     symbol-observable "^1.2.0"
 
+redux@^3.6.0:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
+  integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==
+  dependencies:
+    lodash "^4.2.1"
+    lodash-es "^4.2.1"
+    loose-envify "^1.1.0"
+    symbol-observable "^1.0.3"
+
 regenerate-unicode-properties@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
@@ -11949,7 +12186,7 @@ svgo@^1.1.1:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
-symbol-observable@^1.0.2, symbol-observable@^1.2.0:
+symbol-observable@^1.0.2, symbol-observable@^1.0.3, symbol-observable@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
 
@@ -12175,14 +12412,6 @@ tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
 
-transit-immutable-js@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/transit-immutable-js/-/transit-immutable-js-0.7.0.tgz#993e25089b6311ff402140f556276d6d253005d9"
-
-transit-js@^0.8.846:
-  version "0.8.846"
-  resolved "https://registry.yarnpkg.com/transit-js/-/transit-js-0.8.846.tgz#76e06e8f0e6be27675e3442112f5c9bb75343464"
-
 traverse@~0.6.6:
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
@@ -12221,10 +12450,76 @@ trough@^1.0.0:
   dependencies:
     glob "^7.1.2"
 
-tslib@^1.9.0:
+tslib@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
+  integrity sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==
+
+tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
 
+tslint-config-prettier@^1.18.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37"
+  integrity sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==
+
+tslint-config-standard@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/tslint-config-standard/-/tslint-config-standard-8.0.1.tgz#e4dd3128e84b0e34b51990b68715a641f2b417e4"
+  integrity sha512-OWG+NblgjQlVuUS/Dmq3ax2v5QDZwRx4L0kEuDi7qFY9UI6RJhhNfoCV1qI4el8Fw1c5a5BTrjQJP0/jhGXY/Q==
+  dependencies:
+    tslint-eslint-rules "^5.3.1"
+
+tslint-eslint-rules@^5.3.1:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-5.4.0.tgz#e488cc9181bf193fe5cd7bfca213a7695f1737b5"
+  integrity sha512-WlSXE+J2vY/VPgIcqQuijMQiel+UtmXS+4nvK4ZzlDiqBfXse8FAvkNnTcYhnQyOTW5KFM+uRRGXxYhFpuBc6w==
+  dependencies:
+    doctrine "0.7.2"
+    tslib "1.9.0"
+    tsutils "^3.0.0"
+
+tslint-react@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/tslint-react/-/tslint-react-3.6.0.tgz#7f462c95c4a0afaae82507f06517ff02942196a1"
+  integrity sha512-AIv1QcsSnj7e9pFir6cJ6vIncTqxfqeFF3Lzh8SuuBljueYzEAtByuB6zMaD27BL0xhMEqsZ9s5eHuCONydjBw==
+  dependencies:
+    tsutils "^2.13.1"
+
+tslint@^5.13.1:
+  version "5.13.1"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.13.1.tgz#fbc0541c425647a33cd9108ce4fd4cd18d7904ed"
+  integrity sha512-fplQqb2miLbcPhyHoMV4FU9PtNRbgmm/zI5d3SZwwmJQM6V0eodju+hplpyfhLWpmwrDNfNYU57uYRb8s0zZoQ==
+  dependencies:
+    babel-code-frame "^6.22.0"
+    builtin-modules "^1.1.1"
+    chalk "^2.3.0"
+    commander "^2.12.1"
+    diff "^3.2.0"
+    glob "^7.1.1"
+    js-yaml "^3.7.0"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    resolve "^1.3.2"
+    semver "^5.3.0"
+    tslib "^1.8.0"
+    tsutils "^2.27.2"
+
+tsutils@^2.13.1, tsutils@^2.27.2:
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
+  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
+  dependencies:
+    tslib "^1.8.1"
+
+tsutils@^3.0.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.8.0.tgz#7a3dbadc88e465596440622b65c04edc8e187ae5"
+  integrity sha512-XQdPhgcoTbCD8baXC38PQ0vpTZ8T3YrE+vR66YIj/xvDt1//8iAhafpIT/4DmvzzC1QFapEImERu48Pa01dIUA==
+  dependencies:
+    tslib "^1.8.1"
+
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -12276,6 +12571,40 @@ typeface-sedgwick-ave@^0.0.54:
   version "0.0.54"
   resolved "https://registry.yarnpkg.com/typeface-sedgwick-ave/-/typeface-sedgwick-ave-0.0.54.tgz#8d851f9ead51b4f2bab7c92c933268df9047490b"
 
+typescript-compare@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/typescript-compare/-/typescript-compare-0.0.2.tgz#7ee40a400a406c2ea0a7e551efd3309021d5f425"
+  integrity sha512-8ja4j7pMHkfLJQO2/8tut7ub+J3Lw2S3061eJLFQcvs3tsmJKp8KG5NtpLn7KcY2w08edF74BSVN7qJS0U6oHA==
+  dependencies:
+    typescript-logic "^0.0.0"
+
+typescript-logic@^0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/typescript-logic/-/typescript-logic-0.0.0.tgz#66ebd82a2548f2b444a43667bec120b496890196"
+  integrity sha512-zXFars5LUkI3zP492ls0VskH3TtdeHCqu0i7/duGt60i5IGPIpAHE/DWo5FqJ6EjQ15YKXrt+AETjv60Dat34Q==
+
+typescript-styled-plugin@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/typescript-styled-plugin/-/typescript-styled-plugin-0.14.0.tgz#6691a8e673ed9eacee52c38fecd87d428eff0f71"
+  integrity sha512-RGa+tDPr7OFd+vCEvCYwtNhQSfTFaQebHXiiSABOnjwVE/M0q3vxZcB+Ppp9UGE1PDuLJ9EQRUc7VdqTZtk+oQ==
+  dependencies:
+    typescript-template-language-service-decorator "^2.2.0"
+    vscode-css-languageservice "^3.0.13-next.12"
+    vscode-emmet-helper "1.2.11"
+    vscode-languageserver-types "^3.13.0"
+
+typescript-template-language-service-decorator@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/typescript-template-language-service-decorator/-/typescript-template-language-service-decorator-2.2.0.tgz#4ee6d580f307fb9239978e69626f2775b8a59b2a"
+  integrity sha512-xiolqt1i7e22rpqMaprPgSFVgU64u3b9n6EJlAaUYE61jumipKAdI1+O5khPlWslpTUj80YzjUKjJ2jxT0D74w==
+
+typescript-tuple@^2.1.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/typescript-tuple/-/typescript-tuple-2.2.1.tgz#7d9813fb4b355f69ac55032e0363e8bb0f04dad2"
+  integrity sha512-Zcr0lbt8z5ZdEzERHAMAniTiIKerFCMgd7yjq1fPnDJ43et/k9twIFQMUYff9k5oXcsQ0WpvFcgzK2ZKASoW6Q==
+  dependencies:
+    typescript-compare "^0.0.2"
+
 typescript@^3.3.3333:
   version "3.3.3333"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3333.tgz#171b2c5af66c59e9431199117a3bcadc66fdcfd6"
@@ -12695,6 +13024,33 @@ void-elements@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
 
+vscode-css-languageservice@^3.0.13-next.12:
+  version "3.0.13"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.13.tgz#1788735b65fde54181ea458e6a52cc2bd6dd9126"
+  integrity sha512-RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg==
+  dependencies:
+    vscode-languageserver-types "^3.13.0"
+    vscode-nls "^4.0.0"
+
+vscode-emmet-helper@1.2.11:
+  version "1.2.11"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.11.tgz#4de78223666bf917eb6dc4b225b6c40f6901950c"
+  integrity sha512-ms6/Z9TfNbjXS8r/KgbGxrNrFlu4RcIfVJxTZ2yFi0K4gn+Ka9X1+8cXvb5+5IOBGUrOsPjR0BuefdDkG+CKbQ==
+  dependencies:
+    "@emmetio/extract-abbreviation" "0.1.6"
+    jsonc-parser "^1.0.0"
+    vscode-languageserver-types "^3.6.0-next.1"
+
+vscode-languageserver-types@^3.13.0, vscode-languageserver-types@^3.6.0-next.1:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
+  integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
+
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
+  integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw==
+
 warning@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"

From dae53cf606ae90cb4259b5cf0a4894340f547557 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Wed, 27 Mar 2019 00:46:16 +0100
Subject: [PATCH 025/100] test: migrate tests to Typescript

---
 package.json                                  |   16 +-
 src/app/background/reducers/prefs.ts          |    2 +-
 src/app/lmem/notice.ts                        |    4 +-
 test/app/actions.js                           |  109 -
 test/app/actions.ts                           |  135 +
 test/app/analytics/eventsMapper.js            |   49 -
 test/app/analytics/eventsMapper.ts            |   49 +
 test/app/content/actions.js                   |  129 -
 test/app/content/actions.ts                   |   72 +
 test/app/content/reducers.js                  |   35 -
 ...ndMatchingOffersAccordingToPreferences.ts} |   95 +-
 test/app/lmem/marshmalling.js                 |  120 -
 test/app/lmem/recommendationIsValid.js        |  330 -
 test/app/lmem/recommendationIsValid.ts        |  319 +
 test/app/middlewares/analytics.js             |   63 -
 test/app/middlewares/analytics.ts             |   42 +
 test/app/reducers.js                          |  296 -
 test/app/reducers.ts                          |  128 +
 test/app/store/makeInitialState.js            |   11 -
 test/app/store/migrations.js                  |   70 -
 test/app/utils.js                             |   85 -
 test/app/utils.ts                             |   19 +
 .../WebConsole-mocha-reporter.js              |  117 -
 test/infrastructure/chai-as-promised.js       |  375 -
 test/infrastructure/chai.js                   | 6132 ---------------
 test/infrastructure/mocha.js                  | 6564 -----------------
 test/infrastructure/neverThrowingObject.js    |   15 -
 tsconfig.json                                 |    5 +-
 yarn.lock                                     |  429 +-
 29 files changed, 1110 insertions(+), 14705 deletions(-)
 delete mode 100644 test/app/actions.js
 create mode 100644 test/app/actions.ts
 delete mode 100644 test/app/analytics/eventsMapper.js
 create mode 100644 test/app/analytics/eventsMapper.ts
 delete mode 100644 test/app/content/actions.js
 create mode 100644 test/app/content/actions.ts
 delete mode 100644 test/app/content/reducers.js
 rename test/app/lmem/{findMatchingOffersAccordingToPreferences.js => findMatchingOffersAccordingToPreferences.ts} (68%)
 delete mode 100644 test/app/lmem/marshmalling.js
 delete mode 100644 test/app/lmem/recommendationIsValid.js
 create mode 100644 test/app/lmem/recommendationIsValid.ts
 delete mode 100644 test/app/middlewares/analytics.js
 create mode 100644 test/app/middlewares/analytics.ts
 delete mode 100644 test/app/reducers.js
 create mode 100644 test/app/reducers.ts
 delete mode 100644 test/app/store/makeInitialState.js
 delete mode 100644 test/app/store/migrations.js
 delete mode 100644 test/app/utils.js
 create mode 100644 test/app/utils.ts
 delete mode 100644 test/infrastructure/WebConsole-mocha-reporter.js
 delete mode 100644 test/infrastructure/chai-as-promised.js
 delete mode 100644 test/infrastructure/chai.js
 delete mode 100644 test/infrastructure/mocha.js
 delete mode 100644 test/infrastructure/neverThrowingObject.js

diff --git a/package.json b/package.json
index 2229dd214..744391600 100644
--- a/package.json
+++ b/package.json
@@ -66,10 +66,14 @@
     "@storybook/addon-knobs": "^4.1.12",
     "@storybook/addons": "^4.1.11",
     "@storybook/react": "^4.1.11",
+    "@types/chai": "^4.1.7",
     "@types/chrome": "^0.0.81",
+    "@types/mocha": "^5.2.6",
     "@types/redux-immutable-state-invariant": "^2.1.0",
     "@types/redux-logger": "^3.0.7",
     "@types/remote-redux-devtools": "^0.5.3",
+    "@types/sinon": "^7.0.10",
+    "@types/sinon-chai": "^3.2.2",
     "@types/storybook__addon-actions": "^3.4.2",
     "@types/storybook__addon-knobs": "^4.0.1",
     "@types/storybook__react": "^4.0.1",
@@ -81,10 +85,9 @@
     "babel-plugin-module-resolver": "^3.2.0",
     "babel-plugin-styled-components": "^1.8.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.19",
-    "chai": "^3.5.0",
-    "chai-as-promised": "^5.3.0",
+    "chai": "^4.2.0",
+    "chai-as-promised": "^7.1.1",
     "chromedriver": "^2.21.2",
-    "co-mocha": "^1.2.2",
     "copy-webpack-plugin": "^5.0.0",
     "create-file-webpack": "^1.0.2",
     "css-loader": "^2.0.1",
@@ -102,7 +105,7 @@
     "file-loader": "^2.0.0",
     "html-webpack-plugin": "^3.2.0",
     "jsdom": "^8.1.0",
-    "mocha": "^5.2.0",
+    "mocha": "^6.0.2",
     "node-sass": "^4.9.4",
     "npm": "6.4.1",
     "null-loader": "^0.1.1",
@@ -118,8 +121,8 @@
     "selenium-webdriver": "^2.52.0",
     "semantic-release": "^15.8.1",
     "semantic-release-chrome": "^1.1.0",
-    "sinon": "^6.3.5",
-    "sinon-chai": "^3.2.0",
+    "sinon": "^7.3.0",
+    "sinon-chai": "^3.3.0",
     "source-map-loader": "^0.2.4",
     "style-loader": "^0.23.1",
     "stylelint": "^9.7.1",
@@ -128,6 +131,7 @@
     "stylelint-custom-processor-loader": "^0.5.0",
     "stylelint-processor-styled-components": "^1.5.0",
     "svg-url-loader": "^2.0.2",
+    "ts-mocha": "^6.0.0",
     "tslint": "^5.13.1",
     "tslint-config-prettier": "^1.18.0",
     "tslint-config-standard": "^8.0.1",
diff --git a/src/app/background/reducers/prefs.ts b/src/app/background/reducers/prefs.ts
index ce326f0b6..c298d7e50 100644
--- a/src/app/background/reducers/prefs.ts
+++ b/src/app/background/reducers/prefs.ts
@@ -67,7 +67,7 @@ export function prefs(state: PrefsState = initialPrefs, action: AppAction) {
             )
           };
       }
-      break;
+      return state;
     default:
       return state;
   }
diff --git a/src/app/lmem/notice.ts b/src/app/lmem/notice.ts
index 4cca7fb38..ce9408806 100644
--- a/src/app/lmem/notice.ts
+++ b/src/app/lmem/notice.ts
@@ -87,7 +87,9 @@ export const getNotice = <N extends Notice>(
   notices: N[]
 ): N | undefined => find((notice: N): boolean => notice.id === id, notices);
 
-export const isNoticeValid = (notice: Notice): boolean => {
+export const isNoticeValid = (notice: {
+  [key: string]: any;
+}): notice is Notice => {
   if (Object(notice) !== notice) return false;
 
   const {
diff --git a/test/app/actions.js b/test/app/actions.js
deleted file mode 100644
index cc1284b9f..000000000
--- a/test/app/actions.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import chai from 'chai';
-import sinon from 'sinon';
-import sinonChai from 'sinon-chai';
-
-import {
-  receivedMatchingContexts,
-  receivedCriteria,
-  receivedEditors,
-  refreshMatchingContextsEvery,
-} from '../../src/app/background/actions/kraftBackend';
-
-import { contextTriggered, noticeDisplayed, noticeIgnored } from '../../src/app/background/actions/tabs';
-
-const expect = chai.expect;
-chai.use(sinonChai);
-
-
-describe('background actions', function () {
-
-  it('receivedMatchingContexts', () => {
-    const matchingContexts = [{}, {}];
-    const action = receivedMatchingContexts(matchingContexts);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.payload.matchingContexts).to.equal(matchingContexts);
-  });
-
-  it('receivedCriteria', () => {
-    const criteria = [{}, {}];
-    const action = receivedCriteria(criteria);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.payload.criteria).to.equal(criteria);
-  });
-
-  it('receivedEditors', () => {
-    const editors = [{}, {}];
-    const action = receivedEditors(editors);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.payload.editors).to.equal(editors);
-  });
-
-  it('contextTriggered', () => {
-    const trigger = '';
-    const triggeredContexts = [];
-    const action = contextTriggered(triggeredContexts, { trigger });
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.meta.trigger).to.equal(trigger);
-    expect(action.payload.triggeredContexts).to.equal(triggeredContexts);
-  });
-
-  it('noticeDisplayed', () => {
-    const trigger = '';
-    const notice = {};
-    const action = noticeDisplayed(notice, trigger);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.meta.trigger).to.equal(trigger);
-    expect(action.payload.notice).to.equal(notice);
-  });
-
-  it('noticeIgnored when notice dismissed', () => {
-    const trigger = '';
-    const notice = { dismissed: true };
-    const action = noticeIgnored(notice, trigger);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.meta.trigger).to.equal(trigger);
-    expect(action.payload.notice).to.equal(notice);
-    expect(action.payload.reason).to.equal('dismiss');
-  });
-
-  it('noticeIgnored when notice disliked', () => {
-    const trigger = '';
-    const notice = { disliked: true };
-    const action = noticeIgnored(notice, trigger);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.meta.trigger).to.equal(trigger);
-    expect(action.payload.notice).to.equal(notice);
-    expect(action.payload.reason).to.equal('dislike');
-  });
-
-  describe('auto refresh matching contexts', () => {
-    before(() => {
-      this.clock = sinon.useFakeTimers();
-    });
-
-    it('every x minutes', () => {
-      const recursiveFn = refreshMatchingContextsEvery(10000);
-      const dispatch = sinon.fake();
-
-      recursiveFn(dispatch);
-      expect(dispatch).to.not.have.been.called;
-
-      this.clock.next();
-      this.clock.next();
-      expect(dispatch).to.have.been.calledTwice;
-      expect(dispatch.lastCall.lastArg.type).to.be.a('string').of.length.above(5);
-    });
-
-    after(() => {
-      this.clock.restore();
-    });
-  });
-
-});
diff --git a/test/app/actions.ts b/test/app/actions.ts
new file mode 100644
index 000000000..9b14454a7
--- /dev/null
+++ b/test/app/actions.ts
@@ -0,0 +1,135 @@
+import chai from "chai";
+import sinon from "sinon";
+import sinonChai from "sinon-chai";
+
+import {
+  receivedMatchingContexts,
+  refreshMatchingContextsEvery
+} from "../../src/app/actions/kraftBackend";
+
+import {
+  contextTriggered,
+  noticeDisplayed,
+  noticeIgnored
+} from "../../src/app/actions/tabs";
+import { MatchingContext } from "../../src/app/lmem/matchingContext";
+import { EnhancedNotice } from "../../src/app/lmem/notice";
+
+const expect = chai.expect;
+chai.use(sinonChai);
+
+const notice: EnhancedNotice = {
+  id: 1,
+  title: "This is a title",
+  description: "This is a notice",
+  resource: {
+    author: "Jalil",
+    label: "Jalil's feed",
+    url: "http://jalil",
+    editor: { id: 1, label: "editor", url: "http://editor" }
+  },
+  contributor: { organization: "LMEM", name: "Jalil", image: "" },
+  visibility: "public",
+  valid: true,
+  alternatives: [],
+  criteria: [],
+  dislikes: 0,
+  filters: [],
+  likes: 0,
+  disliked: false,
+  dismissed: false,
+  liked: false
+};
+
+describe("background actions", function() {
+  it("receivedMatchingContexts", () => {
+    const matchingContexts: MatchingContext[] = [
+      { recommendation_url: "http://1", url_regex: "/1/" },
+      { recommendation_url: "http://2", url_regex: "/2/" }
+    ];
+    const action = receivedMatchingContexts(matchingContexts);
+
+    expect(action.type)
+      .to.be.a("string")
+      .of.length.above(5);
+    expect(action.payload.matchingContexts).to.equal(matchingContexts);
+  });
+
+  it("contextTriggered", () => {
+    const trigger = "";
+    const triggeredContexts: MatchingContext[] = [];
+    const action = contextTriggered(1, trigger, triggeredContexts);
+
+    expect(action.type)
+      .to.be.a("string")
+      .of.length.above(5);
+    expect(action.payload.url).to.equal(trigger);
+    expect(action.payload.triggeredContexts).to.equal(triggeredContexts);
+  });
+
+  it("noticeDisplayed", () => {
+    const trigger = "http://trigger";
+    const action = noticeDisplayed(notice, trigger);
+
+    expect(action.type)
+      .to.be.a("string")
+      .of.length.above(5);
+    expect(action.payload.url).to.equal(trigger);
+    expect(action.payload.notice).to.equal(notice);
+  });
+
+  it("noticeIgnored when notice dismissed", () => {
+    const trigger = "http://trigger";
+    const dismissedNotice = { ...notice, dismissed: true };
+    const action = noticeIgnored(dismissedNotice, trigger);
+
+    expect(action.type)
+      .to.be.a("string")
+      .of.length.above(5);
+    expect(action.payload.url).to.equal(trigger);
+    expect(action.payload.notice).to.equal(dismissedNotice);
+    expect(action.payload.reason).to.equal("dismiss");
+  });
+
+  it("noticeIgnored when notice disliked", () => {
+    const trigger = "http://trigger";
+    const dislikedNotice = { ...notice, disliked: true };
+    const action = noticeIgnored(dislikedNotice, trigger);
+
+    expect(action.type)
+      .to.be.a("string")
+      .of.length.above(5);
+    expect(action.payload.url).to.equal(trigger);
+    expect(action.payload.notice).to.equal(dislikedNotice);
+    expect(action.payload.reason).to.equal("dislike");
+  });
+
+  describe("auto refresh matching contexts", () => {
+    interface SuiteWithClock extends Mocha.Suite {
+      clock: { next: () => void; restore: () => void };
+    }
+    before(() => {
+      (this as SuiteWithClock).clock = sinon.useFakeTimers();
+    });
+
+    it("every x minutes", () => {
+      const self = this as SuiteWithClock;
+      const recursiveFn = refreshMatchingContextsEvery(10000);
+      const dispatch = sinon.fake();
+
+      recursiveFn(dispatch);
+      expect(dispatch).to.not.have.been.called;
+
+      self.clock.next();
+      self.clock.next();
+      expect(dispatch).to.have.been.calledTwice;
+      expect(dispatch.lastCall.lastArg.type)
+        .to.be.a("string")
+        .of.length.above(5);
+    });
+
+    after(() => {
+      (this as SuiteWithClock).clock.restore();
+    });
+  });
+});
diff --git a/test/app/analytics/eventsMapper.js b/test/app/analytics/eventsMapper.js
deleted file mode 100644
index 46485f614..000000000
--- a/test/app/analytics/eventsMapper.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import chai from 'chai';
-
-import mapEventsFromAction from '../../../src/app/analytics/eventsMapper';
-
-const expect = chai.expect;
-
-const fakeAction = Object.freeze({
-  type: 'FAKE_ACTION_TYPE',
-});
-
-function makeFakeAction(obj) {
-  return Object.assign({}, fakeAction, obj);
-}
-
-describe('Analytics eventsMapper', () => {
-
-  it('removes type property', () => {
-    const mappedEvent = mapEventsFromAction(makeFakeAction({ foo: 'bar' }));
-
-    expect(mappedEvent).to.not.have.any.keys('type');
-  });
-
-  it('flattens action object', () => {
-    const action = makeFakeAction({
-      foo: 'first level',
-      bar: { bbaarr: 'second level' },
-      too: { ttoo: { tttooo: 'third level' }},
-    });
-    const mappedEvent = mapEventsFromAction(action);
-
-    expect(mappedEvent).to.not.have.any.keys('bar', 'too');
-    expect(mappedEvent).to.have.keys('too.ttoo', 'bar.bbaarr', 'foo');
-    expect(mappedEvent.foo).to.equal('first level');
-    expect(mappedEvent['bar.bbaarr']).to.equal('second level');
-    expect(mappedEvent['too.ttoo']).to.include({ tttooo: 'third level' });
-  });
-
-  it('copies action object', () => {
-    let mutableObj = makeFakeAction({ foobar: 'original' });
-    let mappedEvent = mapEventsFromAction(mutableObj);
-
-    mutableObj.foobar = 'changed';
-
-    expect(mappedEvent).to.include({ foobar: 'original' });
-    expect(mutableObj).to.include({ foobar: 'changed' });
-    expect(mutableObj).to.include(fakeAction);
-  });
-
-});
diff --git a/test/app/analytics/eventsMapper.ts b/test/app/analytics/eventsMapper.ts
new file mode 100644
index 000000000..1ac5dcd68
--- /dev/null
+++ b/test/app/analytics/eventsMapper.ts
@@ -0,0 +1,49 @@
+import chai from "chai";
+
+import mapEventsFromAction from "../../../src/app/analytics/eventsMapper";
+
+const expect = chai.expect;
+
+const fakeAction = Object.freeze({
+  type: "FAKE_ACTION_TYPE"
+});
+
+function makeFakeAction(obj: {
+  [key: string]: any;
+}): { type: string; [key: string]: any } {
+  return Object.assign({}, fakeAction, obj);
+}
+
+describe("Analytics eventsMapper", () => {
+  it("removes type property", () => {
+    const mappedEvent = mapEventsFromAction(makeFakeAction({ foo: "bar" }));
+
+    expect(mappedEvent).to.not.have.any.keys("type");
+  });
+
+  it("flattens action object", () => {
+    const action = makeFakeAction({
+      foo: "first level",
+      bar: { bbaarr: "second level" },
+      too: { ttoo: { tttooo: "third level" } }
+    });
+    const mappedEvent = mapEventsFromAction(action);
+
+    expect(mappedEvent).to.not.have.any.keys("bar", "too");
+    expect(mappedEvent).to.have.keys("too.ttoo", "bar.bbaarr", "foo");
+    expect(mappedEvent.foo).to.equal("first level");
+    expect(mappedEvent["bar.bbaarr"]).to.equal("second level");
+    expect(mappedEvent["too.ttoo"]).to.include({ tttooo: "third level" });
+  });
+
+  it("copies action object", () => {
+    let mutableObj = makeFakeAction({ foobar: "original" });
+    let mappedEvent = mapEventsFromAction(mutableObj);
+
+    mutableObj.foobar = "changed";
+
+    expect(mappedEvent).to.include({ foobar: "original" });
+    expect(mutableObj).to.include({ foobar: "changed" });
+    expect(mutableObj).to.include(fakeAction);
+  });
+});
diff --git a/test/app/content/actions.js b/test/app/content/actions.js
deleted file mode 100644
index 3d1808984..000000000
--- a/test/app/content/actions.js
+++ /dev/null
@@ -1,129 +0,0 @@
-import chai from 'chai';
-
-import {
-  noticesFound,
-  dismissNotice,
-  likeNotice,
-  reportNotice
-} from '../../../src/app/content/actions/recommendations';
-import { reduce, extend, deactivate } from '../../../src/app/content/actions/ui';
-import {
-  updateCriteria,
-  updateEditors,
-  selectCriterion,
-  unselectCriterion,
-  excludeEditor,
-  includeEditor
-} from '../../../src/app/content/actions/filters';
-import { init } from '../../../src/app/background/actions/tabs';
-
-const expect = chai.expect;
-
-describe('content actions', function () {
-  it('init', () => {
-    const payload = [{}, [], []];
-    const action = init(...payload);
-    expect(action.payload).to.be.an('object').to.include.all.keys('onInstalledDetails', 'criteria', 'editors');
-  })
-
-  it('noticesFound', () => {
-    const notices = [{}, {}];
-
-    const action = noticesFound(notices);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.payload.notices).to.equal(notices);
-  });
-
-  it('reduce', () => {
-    const action = reduce();
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-  });
-
-  it('extend', () => {
-    const action = extend();
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-  });
-
-  it('deactivate', () => {
-    const details = {};
-    const action = deactivate(details);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-  });
-
-  it('update criteria', () => {
-    const criteria = {};
-    const action = updateCriteria(criteria);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.payload.criteria).to.equal(criteria);
-  });
-
-  it('select criterion', () => {
-    const slug = 'slug';
-    const action = selectCriterion(slug);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.payload.slug).to.equal(slug);
-  });
-
-  it('unselect criterion', () => {
-    const slug = 'slug';
-    const action = unselectCriterion(slug);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.payload.slug).to.equal(slug);
-  });
-
-  it('update editor', () => {
-    const editors = {};
-    const action = updateEditors(editors);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.payload.editors).to.equal(editors);
-  });
-
-  it('exclude editor', () => {
-    const id = 0;
-    const action = excludeEditor(id);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.payload.id).to.equal(id);
-  });
-
-  it('include editor', () => {
-    const id = 0;
-    const action = includeEditor(id);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.payload.id).to.equal(id);
-  });
-
-  it('dismiss reco', () => {
-    const id = 0;
-    const action = dismissNotice(id);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.payload.id).to.equal(id);
-  });
-
-  it('likes notice', () => {
-    const id = 0;
-    const action = likeNotice(id);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.payload.id).to.equal(id);
-  });
-
-  it('report reco', () => {
-    const id = 0;
-    const action = reportNotice(id);
-
-    expect(action.type).to.be.a('string').of.length.above(5);
-    expect(action.payload.id).to.equal(id);
-  });
-
-});
diff --git a/test/app/content/actions.ts b/test/app/content/actions.ts
new file mode 100644
index 000000000..c5fabad0d
--- /dev/null
+++ b/test/app/content/actions.ts
@@ -0,0 +1,72 @@
+import chai from "chai";
+
+import {
+  noticesFound,
+  dismissNotice,
+  likeNotice
+} from "../../../src/app/actions/recommendations";
+import { init } from "../../../src/app/actions/tabs";
+import { EnhancedNotice } from "../../../src/app/lmem/notice";
+
+const expect = chai.expect;
+
+const notice1: EnhancedNotice = {
+  id: 1,
+  title: "This is a title",
+  description: "This is a notice",
+  resource: {
+    author: "Jalil",
+    label: "Jalil's feed",
+    url: "http://jalil",
+    editor: { id: 1, label: "editor", url: "http://editor" }
+  },
+  contributor: { organization: "LMEM", name: "Jalil", image: "" },
+  visibility: "public",
+  valid: true,
+  alternatives: [],
+  criteria: [],
+  dislikes: 0,
+  filters: [],
+  likes: 0,
+  disliked: false,
+  dismissed: false,
+  liked: false
+};
+
+describe("content actions", function() {
+  it("init", () => {
+    const action = init(1, { version: "0.1" });
+    expect(action.payload)
+      .to.be.an("object")
+      .to.include.all.keys("installationDetails", "tab");
+  });
+
+  it("noticesFound", () => {
+    const action = noticesFound([notice1], 1);
+
+    expect(action.type)
+      .to.be.a("string")
+      .of.length.above(5);
+    expect(action.payload.notices).to.deep.equal([notice1]);
+  });
+
+  it("dismiss reco", () => {
+    const id = 0;
+    const action = dismissNotice(id);
+
+    expect(action.type)
+      .to.be.a("string")
+      .of.length.above(5);
+    expect(action.payload.id).to.equal(id);
+  });
+
+  it("likes notice", () => {
+    const id = 0;
+    const action = likeNotice(id);
+
+    expect(action.type)
+      .to.be.a("string")
+      .of.length.above(5);
+    expect(action.payload.id).to.equal(id);
+  });
+});
diff --git a/test/app/content/reducers.js b/test/app/content/reducers.js
deleted file mode 100644
index 3925a5afd..000000000
--- a/test/app/content/reducers.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import chai from 'chai';
-import { createMemoryHistory } from 'history'
-import { Map as ImmutableMap } from 'immutable';
-import { excludeEditor, includeEditor } from '../../../src/app/content/actions/filters';
-import reducerCreator from '../../../src/app/content/reducers/';
-
-const expect = chai.expect;
-
-const reducer = reducerCreator(createMemoryHistory())
-
-describe('content reducer', function () {
-
-  it('exclude editor', () => {
-    const id = 1;
-    const action = excludeEditor(id);
-
-    const nextState = reducer(
-      new ImmutableMap({ editors: new ImmutableMap({"1": new ImmutableMap({id: 1, isExcluded: false})}) })
-      , action );
-
-    expect(nextState.get("editors").get("1").get("isExcluded")).to.be.true;
-  });
-
-  it('include editor', () => {
-    const id = 1;
-    const action = includeEditor(id);
-
-    const nextState = reducer(
-      new ImmutableMap({ editors: new ImmutableMap({"1": new ImmutableMap({id: 1, isExcluded: true})}) })
-      , action );
-
-    expect(nextState.get("editors").get("1").get("isExcluded")).to.be.false;
-  });
-
-});
diff --git a/test/app/lmem/findMatchingOffersAccordingToPreferences.js b/test/app/lmem/findMatchingOffersAccordingToPreferences.ts
similarity index 68%
rename from test/app/lmem/findMatchingOffersAccordingToPreferences.js
rename to test/app/lmem/findMatchingOffersAccordingToPreferences.ts
index bf9a1f146..eb68d6d42 100644
--- a/test/app/lmem/findMatchingOffersAccordingToPreferences.js
+++ b/test/app/lmem/findMatchingOffersAccordingToPreferences.ts
@@ -1,12 +1,17 @@
 import chai from "chai";
-import { findMatchingOffersAccordingToPreferences } from "../../../src/app/lmem/matchingContext";
+import {
+  findMatchingOffersAccordingToPreferences,
+  MatchingContext
+} from "../../../src/app/lmem/matchingContext";
 const expect = chai.expect;
 
-const offers = [
-  { url_regex: "www.samsung.com" },
-  { url_regex: "arrested.com" }
+const offers: MatchingContext[] = [
+  { url_regex: "www.samsung.com", recommendation_url: "http://b" },
+  { url_regex: "arrested.com", recommendation_url: "http://b" }
+];
+const draftRecommendations = [
+  { url_regex: "www.wordpress.com", recommendation_url: "http://b" }
 ];
-const draftRecommendations = [{ url_regex: "www.wordpress.com" }];
 
 const matchingURL = "https://www.samsung.com/blabla";
 const matchingDraftURL = "https://www.wordpress.com/lol";
@@ -14,10 +19,10 @@ const nonMatchingURL = "https://soundcloud.com/capt-lovelace/meteo-marine";
 
 describe("findMatchingOffersAccordingToPreferences", function() {
   it("should be case insensitive", () => {
-    const offersWithWeirdCase = [
-      { url_regex: "s.*" },
-      { url_regex: "SamSung" },
-      { url_regex: "doesNotMatch" }
+    const offersWithWeirdCase: MatchingContext[] = [
+      { url_regex: "s.*", recommendation_url: "http://s" },
+      { url_regex: "SamSung", recommendation_url: "http://S" },
+      { url_regex: "doesNotMatch", recommendation_url: "http://d" }
     ];
 
     const matches = findMatchingOffersAccordingToPreferences(
@@ -34,8 +39,12 @@ describe("findMatchingOffersAccordingToPreferences", function() {
 
   describe("exclusion", () => {
     it("should exclude matching exclusion of otherwise matching url", () => {
-      const offersWithExclusion = [
-        { url_regex: "samsung", exclude_url_regex: "blabla" }
+      const offersWithExclusion: MatchingContext[] = [
+        {
+          url_regex: "samsung",
+          exclude_url_regex: "blabla",
+          recommendation_url: "http://b"
+        }
       ];
 
       const matches = findMatchingOffersAccordingToPreferences(
@@ -50,7 +59,11 @@ describe("findMatchingOffersAccordingToPreferences", function() {
 
     it("should not exclude non matching exclusion of matching url", () => {
       const offersWithExclusion = [
-        { url_regex: "samsung", exclude_url_regex: "nono" }
+        {
+          url_regex: "samsung",
+          exclude_url_regex: "nono",
+          recommendation_url: "http://b"
+        }
       ];
 
       const matches = findMatchingOffersAccordingToPreferences(
@@ -65,9 +78,14 @@ describe("findMatchingOffersAccordingToPreferences", function() {
     });
 
     it("should exclude its matching context if regex is invalid", () => {
-      const offersWithExclusion = [
-        { url_regex: "samsung", exclude_url_regex: "isNasty)" } // SyntaxError: Invalid RegExp: Unmatched ')'
-      ].concat(offers);
+      const offersWithExclusion: MatchingContext[] = [
+        {
+          url_regex: "samsung",
+          exclude_url_regex: "isNasty)",
+          recommendation_url: "http://b"
+        }, // SyntaxError: Invalid RegExp: Unmatched ')',
+        ...offers
+      ];
 
       const matches = findMatchingOffersAccordingToPreferences(
         matchingURL,
@@ -82,7 +100,9 @@ describe("findMatchingOffersAccordingToPreferences", function() {
   });
 
   describe("invalid regex", () => {
-    const nastyOffers = [{ url_regex: "isNasty)" }].concat(offers); // SyntaxError: Invalid RegExp: Unmatched ')'
+    const nastyOffers = [
+      { url_regex: "isNasty)", recommendation_url: "http://b" }
+    ].concat(offers); // SyntaxError: Invalid RegExp: Unmatched ')'
 
     it("should not screw up the matching engine", () => {
       const matches = findMatchingOffersAccordingToPreferences(
@@ -126,47 +146,6 @@ describe("findMatchingOffersAccordingToPreferences", function() {
     });
   });
 
-  describe("pref with deactivated.everywhereUntil in the future", () => {
-    const prefs = fromJS({
-      deactivated: {
-        // in the future
-        everywhereUntil: Date.now() + 100 * 1000
-      }
-    });
-
-    it("should not match when deactivatedEverywhereUntil is in the future", () => {
-      const matching = findMatchingOffersAccordingToPreferences(
-        matchingURL,
-        offers,
-        [],
-        prefs
-      );
-
-      expect(matching).to.be.an("array");
-      expect(matching).to.be.of.length(0);
-    });
-  });
-
-  describe("pref with deactivatedWebsites", () => {
-    const prefs = fromJS({
-      deactivated: {
-        deactivatedWebsites: new Set(["www.samsung.com", "yo.com"])
-      }
-    });
-
-    it("should not match with matching url, but pref listing as deactivated", () => {
-      const matching = findMatchingOffersAccordingToPreferences(
-        matchingURL,
-        offers,
-        [],
-        prefs
-      );
-
-      expect(matching).to.be.an("array");
-      expect(matching).to.be.of.length(0);
-    });
-  });
-
   describe("draft recommendations", () => {
     it("should match a draft recommendation", () => {
       const matching = findMatchingOffersAccordingToPreferences(
@@ -183,12 +162,14 @@ describe("findMatchingOffersAccordingToPreferences", function() {
     it("should favor draft previews over public offers", () => {
       const draftRec = {
         url_regex: "www.wordpress.com",
+        recommendation_url: "http://b",
         recommendation: {
           visibility: "private"
         }
       };
       const publicRec = {
         url_regex: "www.wordpress.com",
+        recommendation_url: "http://b",
         recommendation: {
           visibility: "public"
         }
diff --git a/test/app/lmem/marshmalling.js b/test/app/lmem/marshmalling.js
deleted file mode 100644
index dac5f9741..000000000
--- a/test/app/lmem/marshmalling.js
+++ /dev/null
@@ -1,120 +0,0 @@
-import chai from 'chai';
-var chaiImmutable = require('chai-immutable');
-import { Map as ImmutableMap, Set as ImmutableSet } from 'immutable';
-
-import fromJS from '../../../src/app/utils/customFromJS'
-import { serialize, deserialize } from '../../../src/app/background/store/reduxPersistTransform';
-
-chai.use(chaiImmutable);
-const expect = chai.expect;
-
-const stateWithOneOffer = fromJS({
-  offers: [
-    {
-      "id":4,
-      "recommendation": {
-        "id":4,
-        "visibility": "public",
-        "alternatives": [
-          {
-            "id":4,"url_to_redirect":"http://a.b/c",
-            "label":"Voir l’article"
-          }
-        ],
-        "matching_contexts":[],
-        "criteria":[{"id":5,"label":"risk","description":"Risque"}],
-        "title":"Site e-commerce à risque",
-        "description":"azerty"
-      },
-      "url_regex":"azerty.(fr|com).*",
-      "description":"azerty"
-    }
-  ]
-});
-
-const stateWithAlwaysDeactivateWebsitePref = fromJS({
-  websites: {
-    deactivated: {
-      deactivatedWebsites : [
-        'www.samsung.com'
-      ]
-    }
-  }
-});
-
-
-const stateWithDeactivateUntilPref = fromJS({
-  websites: {
-    deactivated: {
-      everywhereUntil : 1462701600000
-    }
-  }
-});
-
-const critOrEditPartOfState = new ImmutableMap({
-    id: new ImmutableMap({ id: 'myID', label: 'myLabel' })
-});
-
-
-describe('marshmalling', function () {
-
-  describe('serialize', () => {
-    it('should be an empty JSON object for an empty object', () => {
-      expect( serialize({}) ).to.eql('{}');
-    });
-    
-    it('should serialize an offer', () => {
-      expect( serialize(stateWithOneOffer) )
-      .to.eql( JSON.stringify(stateWithOneOffer) )
-    });
-    
-    it('should serialize state with deactivatedWebsites preference', () => {
-      expect( serialize(stateWithAlwaysDeactivateWebsitePref) )
-      .to.eql( '{"websites":{"deactivated":{"deactivatedWebsites":["www.samsung.com"]}}}' )
-    });
-    
-    it('should serialize state with deactivatedEverywhereUntil preference', () => {
-      expect( serialize(stateWithDeactivateUntilPref) )
-      .to.eql( '{"websites":{"deactivated":{"everywhereUntil":1462701600000}}}' )
-    });
-    
-  });
-
-  describe('deserialize', () => {
-    it('should be an empty Map for an empty JSON object', () => {
-      expect( deserialize(serialize({})) ).to.equal( new ImmutableMap() );
-    });
-    
-    it('should deserialize an offer', () => {
-      expect( deserialize(serialize(stateWithOneOffer)) )
-      .to.equal( stateWithOneOffer )
-    });
-    
-    it('should deserialize state with deactivatedWebsites preference', () => {
-      const bfState = deserialize(serialize(stateWithAlwaysDeactivateWebsitePref));
-
-      expect( bfState )
-      .to.deep.equal( stateWithAlwaysDeactivateWebsitePref )
-
-      expect( bfState.get('websites').get('deactivated').get('deactivatedWebsites'))
-      .to.be.an.instanceof(ImmutableSet);
-    });
-    
-    it('should deserialize state with deactivatedEverywhereUntil preference', () => {
-      expect( deserialize(serialize(stateWithDeactivateUntilPref)) )
-      .to.deep.equal( stateWithDeactivateUntilPref )
-    });
-
-    it('should deserialize state with criteria', () => {
-      expect( deserialize(serialize(critOrEditPartOfState), 'criteria') )
-      .to.deep.equal( critOrEditPartOfState )
-    });
-
-    it('should deserialize state with editors', () => {
-      expect( deserialize(serialize(critOrEditPartOfState), 'editors') )
-      .to.deep.equal( critOrEditPartOfState )
-    });
-    
-  });
-
-});
\ No newline at end of file
diff --git a/test/app/lmem/recommendationIsValid.js b/test/app/lmem/recommendationIsValid.js
deleted file mode 100644
index d7e5b57e9..000000000
--- a/test/app/lmem/recommendationIsValid.js
+++ /dev/null
@@ -1,330 +0,0 @@
-import chai from 'chai';
-
-import recommendationIsValid from '../../../src/app/lmem/recommendationIsValid';
-
-const expect = chai.expect;
-
-describe('recommendationIsValid', function () {
-
-  it('Non objects are not valid', () => {
-    expect( recommendationIsValid(true) ).to.be.false;
-    expect( recommendationIsValid(32) ).to.be.false;
-    expect( recommendationIsValid("yo") ).to.be.false; //man!
-    expect( recommendationIsValid(null) ).to.be.false;
-    expect( recommendationIsValid(undefined) ).to.be.false;
-  });
-
-  it('Empty object is not valid', () => {
-    expect( recommendationIsValid({}) ).to.be.false;
-  });
-
-  it('Object with missing contributor is not valid', () => {
-    const reco = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      description: 'Que vous ayez un usage basique, avancé, professionnel [...]',
-      // contributor: {
-      //   name: 'Maarten Samson',
-      // },
-      criteria: [
-        {
-          slug: 'health',
-          label: 'Santé',
-        },
-      ],
-      resource: {
-        author: 'Boby',
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr',
-        },
-      },
-      alternatives: [
-        {
-          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          label: 'Voir l’alternative',
-        },
-      ],
-    };
-
-
-    expect( recommendationIsValid(reco) ).to.be.false;
-  });
-
-  it('Object with missing title is not valid', () => {
-    const reco = {
-      // title: 'Il y a mieux que le Samsung Galaxy S6',
-      description: 'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        name: 'Maarten Samson',
-      },
-      criteria: [
-        {
-          slug: 'health',
-          label: 'Santé',
-        },
-      ],
-      resource: {
-        author: 'Boby',
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr',
-        },
-      },
-      alternatives: [
-        {
-          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          label: 'Voir l’alternative',
-        },
-      ],
-    };
-
-    expect( recommendationIsValid(reco) ).to.be.false;
-  });
-
-  it('Object with missing description is not valid', () => {
-    const reco = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      // description: 'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        name: 'Maarten Samson',
-      },
-      criteria: [
-        {
-          slug: 'health',
-          label: 'Santé',
-        },
-      ],
-      resource: {
-        author: 'Boby',
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr',
-        },
-      },
-      alternatives: [
-        {
-          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          label: 'Voir l’alternative',
-        },
-      ],
-    };
-
-    expect( recommendationIsValid(reco) ).to.be.false;
-  });
-
-  it('Object with missing resource is not valid', () => {
-    const reco = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      description: 'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        name: 'Maarten Samson',
-      },
-      criteria: [
-        {
-          slug: 'health',
-          label: 'Santé',
-        },
-      ],
-      resource: {
-        author: 'Boby',
-        // url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        // label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr',
-        },
-      },
-      alternatives: [
-        {
-          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          label: 'Voir l’alternative',
-        },
-      ],
-    };
-
-
-    expect( recommendationIsValid(reco) ).to.be.false;
-  });
-
-  it('Object with missing editor is not valid', () => {
-    const reco = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      description: 'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        name: 'Maarten Samson',
-      },
-      criteria: [
-        {
-          slug: 'health',
-          label: 'Santé',
-        },
-      ],
-      resource: {
-        author: 'Boby',
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif',
-        // editor: {
-        //   label: 'Le Gorafi',
-        //   url: 'http://legorafi.fr',
-        // },
-      },
-      alternatives: [
-        {
-          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          label: 'Voir l’alternative',
-        },
-      ],
-    };
-
-
-    expect( recommendationIsValid(reco) ).to.be.false;
-  });
-
-  it('Object with wrong criterion is not valid', () => {
-    const reco = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      description: 'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        name: 'Maarten Samson',
-      },
-      criteria: [
-        {
-          slug: 'health',
-          label: 'Santé',
-        },
-        {
-          // label: 'health',
-          // description: 'Santé',
-        },
-      ],
-      resource: {
-        author: 'Boby',
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr',
-        },
-      },
-      alternatives: [
-        {
-          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          label: 'Voir l’alternative',
-        },
-      ],
-    };
-
-    expect( recommendationIsValid(reco) ).to.be.false;
-  });
-
-  it('Object with wrong alternative is not valid', () => {
-    const reco = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      description: 'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        name: 'Maarten Samson',
-      },
-      criteria: [
-        {
-          slug: 'health',
-          label: 'Santé',
-        },
-      ],
-      resource: {
-        author: 'Boby',
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr',
-        },
-      },
-      alternatives: [
-        {
-          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          label: 'Voir l’alternative',
-        },
-        {
-          // url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          // label: 'Voir l’alternative',
-        },
-      ],
-    };
-
-    expect( recommendationIsValid(reco) ).to.be.false;
-  });
-
-  it('Object with all props is valid', () => {
-    const reco = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      description: 'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        name: 'Maarten Samson',
-      },
-      criteria: [
-        {
-          slug: 'health',
-          label: 'Santé',
-        },
-      ],
-      resource: {
-        author: 'Boby',
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr',
-        },
-      },
-      alternatives: [
-        {
-          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          label: 'Voir l’alternative',
-        },
-      ],
-    };
-
-    expect( recommendationIsValid(reco) ).to.be.true;
-  });
-
-  it('Object with all props but optional is valid', () => {
-    const reco = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      description: 'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        name: 'Maarten Samson',
-      },
-      // criteria: [
-      //   {
-      //     slug: 'health',
-      //     label: 'Santé',
-      //   },
-      // ],
-      resource: {
-        // author: 'Boby',
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr',
-        },
-      },
-      alternatives: [
-      //   {
-      //     url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-      //     label: 'Voir l’alternative',
-      //   },
-      ],
-    };
-
-    expect( recommendationIsValid(reco) ).to.be.true;
-  });
-
-
-});
\ No newline at end of file
diff --git a/test/app/lmem/recommendationIsValid.ts b/test/app/lmem/recommendationIsValid.ts
new file mode 100644
index 000000000..eef234144
--- /dev/null
+++ b/test/app/lmem/recommendationIsValid.ts
@@ -0,0 +1,319 @@
+import chai from "chai";
+import { isNoticeValid } from "../../../src/app/lmem/notice";
+
+const expect = chai.expect;
+
+describe("isNoticeValid", function() {
+  it("Object with missing contributor is not valid", () => {
+    const reco = {
+      title: "Il y a mieux que le Samsung Galaxy S6",
+      description:
+        "Que vous ayez un usage basique, avancé, professionnel [...]",
+      // contributor: {
+      //   name: 'Maarten Samson',
+      // },
+      criteria: [
+        {
+          slug: "health",
+          label: "Santé"
+        }
+      ],
+      resource: {
+        author: "Boby",
+        url: "http://choisir.lmem.net/samsung-galaxy-s6",
+        label: "Lire le comparatif",
+        editor: {
+          label: "Le Gorafi",
+          url: "http://legorafi.fr"
+        }
+      },
+      alternatives: [
+        {
+          url_to_redirect: "http://choisir.lmem.net/samsung-galaxy-s6",
+          label: "Voir l’alternative"
+        }
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.false;
+  });
+
+  it("Object with missing title is not valid", () => {
+    const reco = {
+      // title: 'Il y a mieux que le Samsung Galaxy S6',
+      description:
+        "Que vous ayez un usage basique, avancé, professionnel [...]",
+      contributor: {
+        name: "Maarten Samson"
+      },
+      criteria: [
+        {
+          slug: "health",
+          label: "Santé"
+        }
+      ],
+      resource: {
+        author: "Boby",
+        url: "http://choisir.lmem.net/samsung-galaxy-s6",
+        label: "Lire le comparatif",
+        editor: {
+          label: "Le Gorafi",
+          url: "http://legorafi.fr"
+        }
+      },
+      alternatives: [
+        {
+          url_to_redirect: "http://choisir.lmem.net/samsung-galaxy-s6",
+          label: "Voir l’alternative"
+        }
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.false;
+  });
+
+  it("Object with missing description is not valid", () => {
+    const reco = {
+      title: "Il y a mieux que le Samsung Galaxy S6",
+      // description: 'Que vous ayez un usage basique, avancé, professionnel [...]',
+      contributor: {
+        name: "Maarten Samson"
+      },
+      criteria: [
+        {
+          slug: "health",
+          label: "Santé"
+        }
+      ],
+      resource: {
+        author: "Boby",
+        url: "http://choisir.lmem.net/samsung-galaxy-s6",
+        label: "Lire le comparatif",
+        editor: {
+          label: "Le Gorafi",
+          url: "http://legorafi.fr"
+        }
+      },
+      alternatives: [
+        {
+          url_to_redirect: "http://choisir.lmem.net/samsung-galaxy-s6",
+          label: "Voir l’alternative"
+        }
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.false;
+  });
+
+  it("Object with missing resource is not valid", () => {
+    const reco = {
+      title: "Il y a mieux que le Samsung Galaxy S6",
+      description:
+        "Que vous ayez un usage basique, avancé, professionnel [...]",
+      contributor: {
+        name: "Maarten Samson"
+      },
+      criteria: [
+        {
+          slug: "health",
+          label: "Santé"
+        }
+      ],
+      resource: {
+        author: "Boby",
+        // url: 'http://choisir.lmem.net/samsung-galaxy-s6',
+        // label: 'Lire le comparatif',
+        editor: {
+          label: "Le Gorafi",
+          url: "http://legorafi.fr"
+        }
+      },
+      alternatives: [
+        {
+          url_to_redirect: "http://choisir.lmem.net/samsung-galaxy-s6",
+          label: "Voir l’alternative"
+        }
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.false;
+  });
+
+  it("Object with missing editor is not valid", () => {
+    const reco = {
+      title: "Il y a mieux que le Samsung Galaxy S6",
+      description:
+        "Que vous ayez un usage basique, avancé, professionnel [...]",
+      contributor: {
+        name: "Maarten Samson"
+      },
+      criteria: [
+        {
+          slug: "health",
+          label: "Santé"
+        }
+      ],
+      resource: {
+        author: "Boby",
+        url: "http://choisir.lmem.net/samsung-galaxy-s6",
+        label: "Lire le comparatif"
+        // editor: {
+        //   label: 'Le Gorafi',
+        //   url: 'http://legorafi.fr',
+        // },
+      },
+      alternatives: [
+        {
+          url_to_redirect: "http://choisir.lmem.net/samsung-galaxy-s6",
+          label: "Voir l’alternative"
+        }
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.false;
+  });
+
+  it("Object with wrong criterion is not valid", () => {
+    const reco = {
+      title: "Il y a mieux que le Samsung Galaxy S6",
+      description:
+        "Que vous ayez un usage basique, avancé, professionnel [...]",
+      contributor: {
+        name: "Maarten Samson"
+      },
+      criteria: [
+        {
+          slug: "health",
+          label: "Santé"
+        },
+        {
+          // label: 'health',
+          // description: 'Santé',
+        }
+      ],
+      resource: {
+        author: "Boby",
+        url: "http://choisir.lmem.net/samsung-galaxy-s6",
+        label: "Lire le comparatif",
+        editor: {
+          label: "Le Gorafi",
+          url: "http://legorafi.fr"
+        }
+      },
+      alternatives: [
+        {
+          url_to_redirect: "http://choisir.lmem.net/samsung-galaxy-s6",
+          label: "Voir l’alternative"
+        }
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.false;
+  });
+
+  it("Object with wrong alternative is not valid", () => {
+    const reco = {
+      title: "Il y a mieux que le Samsung Galaxy S6",
+      description:
+        "Que vous ayez un usage basique, avancé, professionnel [...]",
+      contributor: {
+        name: "Maarten Samson"
+      },
+      criteria: [
+        {
+          slug: "health",
+          label: "Santé"
+        }
+      ],
+      resource: {
+        author: "Boby",
+        url: "http://choisir.lmem.net/samsung-galaxy-s6",
+        label: "Lire le comparatif",
+        editor: {
+          label: "Le Gorafi",
+          url: "http://legorafi.fr"
+        }
+      },
+      alternatives: [
+        {
+          url_to_redirect: "http://choisir.lmem.net/samsung-galaxy-s6",
+          label: "Voir l’alternative"
+        },
+        {
+          // url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
+          // label: 'Voir l’alternative',
+        }
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.false;
+  });
+
+  it("Object with all props is valid", () => {
+    const reco = {
+      title: "Il y a mieux que le Samsung Galaxy S6",
+      description:
+        "Que vous ayez un usage basique, avancé, professionnel [...]",
+      contributor: {
+        name: "Maarten Samson"
+      },
+      criteria: [
+        {
+          slug: "health",
+          label: "Santé"
+        }
+      ],
+      resource: {
+        author: "Boby",
+        url: "http://choisir.lmem.net/samsung-galaxy-s6",
+        label: "Lire le comparatif",
+        editor: {
+          label: "Le Gorafi",
+          url: "http://legorafi.fr"
+        }
+      },
+      alternatives: [
+        {
+          url_to_redirect: "http://choisir.lmem.net/samsung-galaxy-s6",
+          label: "Voir l’alternative"
+        }
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.true;
+  });
+
+  it("Object with all props but optional is valid", () => {
+    const reco = {
+      title: "Il y a mieux que le Samsung Galaxy S6",
+      description:
+        "Que vous ayez un usage basique, avancé, professionnel [...]",
+      contributor: {
+        name: "Maarten Samson"
+      },
+      // criteria: [
+      //   {
+      //     slug: 'health',
+      //     label: 'Santé',
+      //   },
+      // ],
+      resource: {
+        // author: 'Boby',
+        url: "http://choisir.lmem.net/samsung-galaxy-s6",
+        label: "Lire le comparatif",
+        editor: {
+          label: "Le Gorafi",
+          url: "http://legorafi.fr"
+        }
+      },
+      alternatives: [
+        //   {
+        //     url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
+        //     label: 'Voir l’alternative',
+        //   },
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.true;
+  });
+});
diff --git a/test/app/middlewares/analytics.js b/test/app/middlewares/analytics.js
deleted file mode 100644
index 2a4f457f0..000000000
--- a/test/app/middlewares/analytics.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import chai from 'chai';
-import sinon from 'sinon';
-import sinonChai from 'sinon-chai';
-
-import middleware from '../../../src/app/background/middlewares/analytics';
-import { POPUP_CLICK } from '../../../src/app/constants/ActionTypes';
-
-const expect = chai.expect;
-chai.use(sinonChai);
-
-
-function create() {
-  const store = {
-    getState: sinon.stub().returns({}),
-    dispatch: sinon.stub(),
-  };
-  const next = sinon.stub();
-  const track = sinon.stub();
-
-  const invoke = action => middleware({
-    getCurrentTabs: () => Promise.resolve([{url: 'https://lmem.net'}]),
-    track,
-  })(store)(next)(action);
-
-  return {store, next, track, invoke};
-}
-
-describe('Analytics middleware', () => {
-
-  it('passes through api actions', () => {
-    const { next, invoke } = create();
-    const action = { type: 'api/bypass' };
-    invoke(action);
-    expect(next).to.have.been.calledWith(action)
-  });
-
-  it('passes through persist actions', () => {
-    const { next, invoke } = create();
-    const action = { type: 'persist/bypass' };
-    invoke(action);
-    expect(next).to.have.been.calledWith(action)
-  });
-
-  it('tracks actions', () => {
-    const { track, invoke } = create();
-    const action = { type: 'gothroughthisone' };
-    invoke(action);
-    expect(track).to.have.been.calledWith(action);
-  });
-
-  it('tracks actions with current tab url on POPUP', (done) => {
-    const { track, invoke } = create();
-    const action = { type: POPUP_CLICK };
-    invoke(action);
-
-    // next tick
-    setTimeout(() => {
-      expect(track).to.have.been.calledWith({ type: POPUP_CLICK, currentHref: 'https://lmem.net' });
-      done();
-    }, 0)
-  });
-
-});
diff --git a/test/app/middlewares/analytics.ts b/test/app/middlewares/analytics.ts
new file mode 100644
index 000000000..b5d1f23c3
--- /dev/null
+++ b/test/app/middlewares/analytics.ts
@@ -0,0 +1,42 @@
+import chai from "chai";
+import sinon from "sinon";
+import sinonChai from "sinon-chai";
+
+import middleware from "../../../src/app/background/middlewares/analytics";
+import { POPUP_CLICK } from "../../../src/app/constants/ActionTypes";
+import { Action } from "redux";
+
+const expect = chai.expect;
+chai.use(sinonChai);
+
+function create() {
+  const next = sinon.stub();
+  const track = sinon.stub();
+
+  const invoke = (action: Action) => middleware(track)()(next)(action);
+
+  return { next, track, invoke };
+}
+
+describe("Analytics middleware", () => {
+  it("passes through api actions", () => {
+    const { next, invoke } = create();
+    const action = { type: "api/bypass" };
+    invoke(action);
+    expect(next).to.have.been.calledWith(action);
+  });
+
+  it("passes through persist actions", () => {
+    const { next, invoke } = create();
+    const action = { type: "persist/bypass" };
+    invoke(action);
+    expect(next).to.have.been.calledWith(action);
+  });
+
+  it("tracks actions", () => {
+    const { track, invoke } = create();
+    const action = { type: "gothroughthisone" };
+    invoke(action);
+    expect(track).to.have.been.calledWith(action);
+  });
+});
diff --git a/test/app/reducers.js b/test/app/reducers.js
deleted file mode 100644
index c290f1c9d..000000000
--- a/test/app/reducers.js
+++ /dev/null
@@ -1,296 +0,0 @@
-import chai from "chai";
-import { Map as ImmutableMap, Set as ImmutableSet, fromJS } from "immutable";
-
-import prefsReducer from "../../src/app/background/reducers/prefs";
-import resourcesReducer from "../../src/app/background/reducers/resources";
-
-import makeInitialState from "../../src/app/background/store/makeInitialState";
-
-import {
-  receivedMatchingContexts,
-  receivedCriteria,
-  receivedEditors
-} from "../../src/app/background/actions/kraftBackend";
-
-import { deactivate } from "../../src/app/content/actions/ui";
-import {
-  excludeEditor,
-  includeEditor
-} from "../../src/app/content/actions/filters";
-import {
-  dismissNotice,
-  likeNotice,
-  unlikeNotice,
-  dislikeNotice,
-  undislikeNotice,
-  undismissNotice,
-  reportNotice
-} from "../../src/app/content/actions/recommendations";
-
-const expect = chai.expect;
-
-describe("background reducer", function() {
-  it("initial state + receivedMatchingContexts => state with offers", () => {
-    const matchingContexts = new ImmutableSet([{}, {}]);
-    const action = receivedMatchingContexts(matchingContexts);
-
-    const nextState = resourcesReducer(
-      makeInitialState().get("resources"),
-      action
-    );
-
-    expect(action.payload.matchingContexts).to.be.an.instanceof(ImmutableSet);
-    expect(nextState.get("matchingContexts")).to.have.size(
-      matchingContexts.size
-    );
-  });
-
-  it("initial state + criteria => state with criteria", () => {
-    const criteria = new ImmutableMap({
-      crit1: new ImmutableMap({ slug: "crit1" })
-    });
-    const action = receivedCriteria(criteria);
-
-    const nextState = prefsReducer(makeInitialState().get("prefs"), action);
-
-    expect(nextState.get("criteria")).to.have.size(1);
-    expect(
-      nextState
-        .get("criteria")
-        .get("crit1")
-        .get("slug")
-    ).to.equal("crit1");
-    expect(
-      nextState
-        .get("criteria")
-        .get("crit1")
-        .get("isSelected")
-    ).to.equal(true);
-  });
-
-  it("state with criteria + new criteria => state with memory of initial criteria", () => {
-    const criteria = new ImmutableMap({
-      crit2: new ImmutableMap({ slug: "crit2" })
-    });
-    const action = receivedCriteria(criteria);
-
-    const nextState = prefsReducer(
-      fromJS({
-        criteria: {
-          crit1: {
-            slug: "crit1",
-            isSelected: false
-          }
-        }
-      }),
-      action
-    );
-
-    expect(nextState.get("criteria")).to.have.size(2);
-    expect(
-      nextState
-        .get("criteria")
-        .get("crit1")
-        .get("isSelected")
-    ).to.equal(false);
-    expect(
-      nextState
-        .get("criteria")
-        .get("crit2")
-        .get("isSelected")
-    ).to.equal(true);
-  });
-
-  it("initial state + editors => state with editors", () => {
-    const editors = new ImmutableMap({ 1: new ImmutableMap({ id: 1 }) });
-    const action = receivedEditors(editors);
-
-    const nextState = prefsReducer(makeInitialState().get("prefs"), action);
-
-    expect(nextState.get("editors")).to.have.size(1);
-    expect(
-      nextState
-        .get("editors")
-        .get("1")
-        .get("id")
-    ).to.equal(1);
-    expect(
-      nextState
-        .get("editors")
-        .get("1")
-        .get("isExcluded")
-    ).to.equal(false);
-  });
-
-  it("state with editors + new editors => state with memory of initial editors", () => {
-    const editors = new ImmutableMap({ 2: new ImmutableMap({ id: 2 }) });
-    const action = receivedEditors(editors);
-
-    const nextState = prefsReducer(
-      fromJS({
-        editors: {
-          1: {
-            id: 1,
-            isExcluded: true
-          }
-        }
-      }),
-      action
-    );
-
-    expect(nextState.get("editors")).to.have.size(2);
-    expect(
-      nextState
-        .get("editors")
-        .get("1")
-        .get("isExcluded")
-    ).to.equal(true);
-    expect(
-      nextState
-        .get("editors")
-        .get("2")
-        .get("isExcluded")
-    ).to.equal(false);
-  });
-
-  it("initial state + deactivate (everywhere) => state with deactivated pref", () => {
-    const action = deactivate({
-      where: DEACTIVATE_EVERYWHERE,
-      duration: 1000
-    });
-
-    const nextState = prefsReducer(makeInitialState().get("prefs"), action);
-
-    expect(
-      nextState
-        .get("websites")
-        .get("deactivated")
-        .get("everywhereUntil")
-    ).to.be.above(Date.now());
-  });
-
-  it("exclude editor", () => {
-    const action = excludeEditor(1);
-
-    const nextState = prefsReducer(
-      fromJS({
-        editors: {
-          "1": {
-            id: 1,
-            isExcluded: false
-          }
-        }
-      }),
-      action
-    );
-
-    expect(nextState.get("editors")).to.have.size(1);
-    expect(
-      nextState
-        .get("editors")
-        .get("1")
-        .get("isExcluded")
-    ).to.be.true;
-  });
-
-  it("include editor", () => {
-    const action = includeEditor(1);
-
-    const nextState = prefsReducer(
-      fromJS({
-        editors: {
-          "1": {
-            id: 1,
-            isExcluded: true
-          }
-        }
-      }),
-      action
-    );
-
-    expect(nextState.get("editors")).to.have.size(1);
-    expect(
-      nextState
-        .get("editors")
-        .get("1")
-        .get("isExcluded")
-    ).to.be.false;
-  });
-
-  it("dismiss notice", () => {
-    const action = dismissNotice(1);
-
-    const nextState = prefsReducer(
-      fromJS({ dismissedNotices: new ImmutableSet() }),
-      action
-    );
-
-    expect(nextState.get("dismissedNotices")).to.have.size(1);
-  });
-
-  it("like notice", () => {
-    const action = likeNotice(1);
-
-    const nextState = prefsReducer(
-      fromJS({ likedNotices: new ImmutableSet() }),
-      action
-    );
-
-    expect(nextState.get("likedNotices")).to.have.size(1);
-  });
-
-  it("dislike notice", () => {
-    const action = dislikeNotice(1);
-
-    const nextState = prefsReducer(
-      fromJS({ dislikedNotices: new ImmutableSet() }),
-      action
-    );
-
-    expect(nextState.get("dislikedNotices")).to.have.size(1);
-  });
-
-  it("undismiss notice", () => {
-    const action = undismissNotice(42);
-
-    const nextState = prefsReducer(
-      fromJS({ dismissedNotices: new ImmutableSet([42]) }),
-      action
-    );
-
-    expect(nextState.get("dismissedNotices")).to.have.size(0);
-  });
-
-  it("unlike notice", () => {
-    const action = unlikeNotice(42);
-
-    const nextState = prefsReducer(
-      fromJS({ likedNotices: new ImmutableSet([42]) }),
-      action
-    );
-
-    expect(nextState.get("likedNotices")).to.have.size(0);
-  });
-
-  it("undislike notice", () => {
-    const action = undislikeNotice(42);
-
-    const nextState = prefsReducer(
-      fromJS({ dislikedNotices: new ImmutableSet([42]) }),
-      action
-    );
-
-    expect(nextState.get("dislikedNotices")).to.have.size(0);
-  });
-
-  it("report notice", () => {
-    const action = reportNotice(1);
-
-    const nextState = prefsReducer(
-      fromJS({ reportedNotices: new ImmutableSet() }),
-      action
-    );
-
-    expect(nextState.get("reportedNotices")).to.have.size(1);
-  });
-});
diff --git a/test/app/reducers.ts b/test/app/reducers.ts
new file mode 100644
index 000000000..4c2cecb98
--- /dev/null
+++ b/test/app/reducers.ts
@@ -0,0 +1,128 @@
+import chai from "chai";
+import prefsReducer from "../../src/app/background/reducers/prefs";
+import resourcesReducer from "../../src/app/background/reducers/resources";
+import { receivedMatchingContexts } from "../../src/app/actions/kraftBackend";
+
+import {
+  dismissNotice,
+  likeNotice,
+  unlikeNotice,
+  dislikeNotice,
+  undislikeNotice,
+  undismissNotice
+} from "../../src/app/actions/recommendations";
+import { MatchingContext } from "../../src/app/lmem/matchingContext";
+
+const expect = chai.expect;
+
+describe("background reducer", function() {
+  it("initial state + receivedMatchingContexts => state with offers", () => {
+    const matchingContexts: MatchingContext[] = [
+      { recommendation_url: "http://1", url_regex: "/1/" },
+      { recommendation_url: "http://2", url_regex: "/2/" }
+    ];
+    const action = receivedMatchingContexts(matchingContexts);
+
+    const nextState = resourcesReducer(undefined, action);
+
+    expect(nextState.matchingContexts).to.have.lengthOf(
+      matchingContexts.length
+    );
+  });
+
+  it("dismiss notice", () => {
+    const action = dismissNotice(1);
+
+    const nextState = prefsReducer(
+      {
+        dismissedNotices: [],
+        likedNotices: [],
+        dislikedNotices: [],
+        installationDetails: { version: "0.1" }
+      },
+      action
+    );
+
+    expect(nextState.dismissedNotices).to.have.lengthOf(1);
+  });
+
+  it("like notice", () => {
+    const action = likeNotice(1);
+
+    const nextState = prefsReducer(
+      {
+        dismissedNotices: [],
+        likedNotices: [],
+        dislikedNotices: [],
+        installationDetails: { version: "0.1" }
+      },
+      action
+    );
+
+    expect(nextState.likedNotices).to.have.lengthOf(1);
+  });
+
+  it("dislike notice", () => {
+    const action = dislikeNotice(1);
+
+    const nextState = prefsReducer(
+      {
+        dismissedNotices: [],
+        likedNotices: [],
+        dislikedNotices: [],
+        installationDetails: { version: "0.1" }
+      },
+      action
+    );
+
+    expect(nextState.dislikedNotices).to.have.lengthOf(1);
+  });
+
+  it("undismiss notice", () => {
+    const action = undismissNotice(42);
+
+    const nextState = prefsReducer(
+      {
+        dismissedNotices: [42],
+        likedNotices: [],
+        dislikedNotices: [],
+        installationDetails: { version: "0.1" }
+      },
+      action
+    );
+
+    expect(nextState.dismissedNotices).to.have.lengthOf(0);
+  });
+
+  it("unlike notice", () => {
+    const action = unlikeNotice(42);
+
+    const nextState = prefsReducer(
+      {
+        dismissedNotices: [],
+        likedNotices: [42],
+        dislikedNotices: [],
+        installationDetails: { version: "0.1" }
+      },
+      action
+    );
+
+    expect(nextState.likedNotices).to.have.lengthOf(0);
+  });
+
+  it("undislike notice", () => {
+    const action = undislikeNotice(42);
+
+    const nextState = prefsReducer(
+      {
+        dismissedNotices: [],
+        likedNotices: [],
+        dislikedNotices: [42],
+        installationDetails: { version: "0.1" }
+      },
+      action
+    );
+
+    expect(nextState.dislikedNotices).to.have.lengthOf(0);
+  });
+});
diff --git a/test/app/store/makeInitialState.js b/test/app/store/makeInitialState.js
deleted file mode 100644
index bf6d02e8f..000000000
--- a/test/app/store/makeInitialState.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import chai from 'chai';
-
-import makeInitialState from '../../../src/app/background/store/makeInitialState';
-
-const expect = chai.expect;
-
-describe('makeInitialState', function () {
-  it('init structure', function () {
-    expect(makeInitialState()).to.not.be.empty;
-  });
-});
\ No newline at end of file
diff --git a/test/app/store/migrations.js b/test/app/store/migrations.js
deleted file mode 100644
index aa7d9f0f5..000000000
--- a/test/app/store/migrations.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import chai from 'chai';
-const expect = chai.expect;
-
-import fromJS from '../../../src/app/utils/customFromJS';
-
-import migrate from '../../../src/app/background/store/migrations';
-import makeInitialState from '../../../src/app/background/store/makeInitialState';
-
-describe('migrate', function () {
-  it('should create a Map with basic fields if no loaded state', function () {
-
-    const initialState = fromJS({
-      prefs: {
-        websites: undefined,
-      }
-    });
-
-    expect(migrate(undefined, initialState)).to.deep.equal(initialState);
-  });
-
-  it('should create a Map with values from loaded state', function () {
-
-    const initialState = makeInitialState();
-
-    const loadedState = fromJS({
-      websites: 1,
-      prefs: {
-        criteria: 2
-      }
-    });
-
-    expect(migrate(loadedState, initialState).getIn(['prefs', 'websites'])).to.equal(1);
-    expect(migrate(loadedState, initialState).getIn(['prefs', 'criteria'])).to.equal(2);
-    expect(migrate(loadedState, initialState).getIn(['prefs', 'editors']))
-    .to.deep.equal(initialState.getIn(['prefs', 'editors']));
-    expect(migrate(loadedState, initialState).getIn(['prefs', 'dismissedRecos']))
-    .to.deep.equal(initialState.getIn(['prefs', 'dismissedRecos']));
-    expect(migrate(loadedState, initialState).getIn(['prefs', 'approvedRecos']))
-    .to.deep.equal(initialState.getIn(['prefs', 'approvedRecos']));
-    expect(migrate(loadedState, initialState).getIn(['prefs', 'onInstalledDetails']))
-    .to.deep.equal(initialState.getIn(['prefs', 'onInstalledDetails']));
-  });
-
-  it('copies approvedRecos to likedNotices', function () {
-    const initialState = makeInitialState();
-
-    const previouslyLikedNotices = ['some', 'ids'];
-
-    const loadedState = fromJS({
-      prefs: {
-        approvedRecos: previouslyLikedNotices
-      }
-    });
-
-    const migratedState = migrate(loadedState, initialState);
-
-    expect(migratedState.getIn(['prefs', 'likedNotices'])).to.include('some');
-  });
-  it('initialize dislikedNotices if not existent', function () {
-    const initialState = makeInitialState();
-
-    const loadedState = fromJS({
-      prefs: {}
-    });
-
-    const migratedState = migrate(loadedState, initialState);
-
-    expect(migratedState.getIn(['prefs', 'dislikedNotices'])).to.exist
-  });
-});
diff --git a/test/app/utils.js b/test/app/utils.js
deleted file mode 100644
index 4f66110bf..000000000
--- a/test/app/utils.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import chai from 'chai';
-
-import { makeUrlFromFilters } from '../../src/app/background/actions/kraftBackend';
-import { makeRecoFeedback } from '../../src/app/background/middlewares/sendFeedback';
-import { LIKE_NOTICE } from '../../src/app/constants/ActionTypes';
-import isAction from "../../src/app/utils/isAction";
-import createAction from "../../src/app/utils/createAction";
-
-const expect = chai.expect;
-
-describe('background makeUrlFromFilters', function () {
-  it('only criteria', () => {
-    const criteria = ['crit1', 'crit2'];
-    const url = makeUrlFromFilters(criteria, []);
-
-    expect(url).to.be.a('string')
-    expect(url.split('?')[1]).to.equal('criteria=crit1,crit2');
-  });
-
-  it('only editors', () => {
-    const editors = ['edit1', 'edit2'];
-    const url = makeUrlFromFilters([], editors);
-
-    expect(url).to.be.a('string')
-    expect(url.split('?')[1]).to.equal('excluded_editors=edit1,edit2');
-  });
-
-  it('criteria and editors', () => {
-    const criteria = ['crit1', 'crit2'];
-    const editors = ['edit1', 'edit2'];
-    const url = makeUrlFromFilters(criteria, editors);
-
-    expect(url).to.be.a('string')
-    expect(url.split('?')[1]).to.equal('criteria=crit1,crit2&excluded_editors=edit1,edit2');
-  });
-});
-
-describe('background makeRecoFeedback', function () {
-  it('should have right feedback and contexts', () => {
-    const type = LIKE_NOTICE;
-    const url = 'myUrl';
-
-    const output = makeRecoFeedback(type, url);
-
-    expect(output.feedback).to.equal('like');
-    expect(output.contexts.datetime).to.be.a('string').of.length(24);
-    expect(output.contexts.url).to.equal(url);
-  });
-
-  it('should throw an error on wrong feedback type', () => {
-    const type =  'WRONG_TYPE';
-    const url = 'myUrl';
-
-    expect(makeRecoFeedback.bind(makeRecoFeedback, type, url)).to.throw();
-  });
-
-});
-
-describe('isAction', () => {
-  const standardActionWithError = {
-    type: 'type',
-    payload: new Error(),
-    error: true,
-    meta: { tab: 1 }
-  };
-
-  it('shall return true for a standard action', () => {
-    expect(isAction(standardActionWithError)).to.equal(true);
-  });
-
-  it('shall return true for an action created with the action creator', () => {
-    const action = createAction('type')('payload');
-
-    expect(isAction(action)).to.equal(true);
-  });
-
-  it('shall return false when an extra key is found', () => {
-    const action = {
-      ...standardActionWithError,
-      extraKey: 'extra'
-    };
-
-    expect(isAction(action)).to.equal(false);
-  });
-});
diff --git a/test/app/utils.ts b/test/app/utils.ts
new file mode 100644
index 000000000..b015a02b2
--- /dev/null
+++ b/test/app/utils.ts
@@ -0,0 +1,19 @@
+import chai from "chai";
+import { makeRecoFeedback } from "../../src/app/background/middlewares/sendFeedback";
+
+const expect = chai.expect;
+
+describe("background makeRecoFeedback", function() {
+  it("should have right feedback and contexts", () => {
+    const type = "like";
+    const url = "myUrl";
+
+    const output = makeRecoFeedback(type, url);
+
+    expect(output.feedback).to.equal("like");
+    expect(output.contexts.datetime)
+      .to.be.a("string")
+      .of.length(24);
+    expect(output.contexts.url).to.equal(url);
+  });
+});
diff --git a/test/infrastructure/WebConsole-mocha-reporter.js b/test/infrastructure/WebConsole-mocha-reporter.js
deleted file mode 100644
index 25e9a078c..000000000
--- a/test/infrastructure/WebConsole-mocha-reporter.js
+++ /dev/null
@@ -1,117 +0,0 @@
-// Source : https://github.com/eeroan/WebConsole-reporter/ (MIT licence https://github.com/eeroan/WebConsole-reporter/blob/ff96efddbe6ac5d355e430fc146a7f6543938871/bower.json#L15 )
-
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define([''], factory);
-  } else {
-    root.WebConsole = factory();
-  }
-})(this, function () {
-  function WebConsole(runner) {
-    // TODO needs to be removed to options somehow
-    var reporterQueryParameter = 'test=console';
-
-    var stats = { suites: 0, tests: 0, passes: 0, pending: 0, failures: 0 };
-    var failures = this.failures = [];
-    var total = runner.total;
-    var title = document.title;
-    var calls = [];
-    runner.stats = stats;
-
-    runner.on('pass', function (test) {
-      stats.passes = stats.passes || 0;
-      var medium = test.slow() / 2;
-      test.speed = test.duration > test.slow() ? 'slow' : test.duration > medium ? 'medium' : 'fast';
-      stats.passes++;
-    });
-
-    runner.on('pending', function () {
-      stats.pending++;
-    });
-
-    runner.on('start', function () {
-      stats.start = (new Date);
-    });
-
-    runner.on('test', function (test) {
-      console.log('Running test:', test.title);
-    });
-
-    runner.on('fail', function (test, err) {
-      stats.failures = stats.failures || 0;
-      stats.failures++;
-      test.err = err;
-      failures.push(test);
-      calls.push(['info', null, test.title]);
-      calls.push(['error', null, test.err.stack]);
-      calls.push(['log', null, { Expected: err.expected, Actual: err.actual }]);
-      flagFailures(test.parent);
-    });
-
-    function parentSuiteTitle(suite) {
-      if (!suite.parent) return suite.title;
-      return parentSuiteTitle(suite.parent) + ' ' + suite.title;
-    }
-
-    function flagFailures(node) {
-      node.hasFailures = true;
-      if (node.parent) flagFailures(node.parent);
-    }
-
-    runner.on('suite', function (suite) {
-      stats.suites = stats.suites || 0;
-      suite.root || stats.suites++;
-
-      var parameter = '?grep=' + encodeURIComponent(suite.fullTitle()) + '&' + reporterQueryParameter;
-      var location = document.location;
-      var url = location.origin + location.pathname + parameter;
-      calls.push(['group', suite, suite.title]);
-      calls.push(['groupCollapsed', suite, 'url']);
-      calls.push(['log', suite, url]);
-      calls.push(['groupEnd', suite]);
-    });
-
-    runner.on('suite end', function (suite) {
-      calls.push(['groupEnd', suite]);
-      logNewCalls();
-    });
-
-    runner.on('test end', function (test) {
-      stats.tests = stats.tests || 0;
-      stats.tests++;
-      var percent = stats.tests / total * 100 | 0;
-      document.title = percent + '% ' + (stats.failures ? stats.failures + ' failures ' : '') + title;
-    });
-
-    runner.on('end', function () {
-      stats.end = (new Date);
-      stats.duration = (new Date) - stats.start;
-      logNewCalls();
-      if (stats.errors) console.warn(stats.errors, ' errors');
-      if (stats.failures) console.warn(stats.failures, ' failures');
-      var skipped = stats.tests - stats.failures - stats.passes;
-      if (skipped) console.warn(skipped, ' skipped');
-      console.log(stats.passes, ' tests passed');
-      console.log(stats.duration / 1000, ' seconds');
-      console.log((new Date).toUTCString());
-      console.log('Run all tests ' + location.origin + location.pathname + '?' + reporterQueryParameter);
-    });
-
-    function logNewCalls() {
-      while (calls.length > 0) {
-        logCall(calls.shift());
-      }
-    }
-
-    function logCall(call) {
-      var command = call.shift();
-      var suite = call.shift();
-      var failures = !suite || suite.hasFailures;
-      if (failures || command === 'info' || command === 'error') {
-        console[command].apply(console, call);
-      }
-    }
-  }
-
-  return WebConsole;
-});
diff --git a/test/infrastructure/chai-as-promised.js b/test/infrastructure/chai-as-promised.js
deleted file mode 100644
index 522f3c417..000000000
--- a/test/infrastructure/chai-as-promised.js
+++ /dev/null
@@ -1,375 +0,0 @@
-(function () {
-  'use strict';
-
-    // Module systems magic dance.
-
-    /* istanbul ignore else */
-  if (typeof require === 'function' && typeof exports === 'object' && typeof module === 'object') {
-        // NodeJS
-    module.exports = chaiAsPromised;
-  } else if (typeof define === 'function' && define.amd) {
-        // AMD
-    define(function () {
-      return chaiAsPromised;
-    });
-  } else {
-        /* global self: false */
-
-        // Other environment (usually <script> tag): plug in to global chai instance directly.
-    chai.use(chaiAsPromised);
-
-        // Expose as a property of the global object so that consumers can configure the `transferPromiseness` property.
-    self.chaiAsPromised = chaiAsPromised;
-  }
-
-  chaiAsPromised.transferPromiseness = function (assertion, promise) {
-    assertion.then = promise.then.bind(promise);
-  };
-
-  chaiAsPromised.transformAsserterArgs = function (values) {
-    return values;
-  };
-
-  function chaiAsPromised(chai, utils) {
-    var Assertion = chai.Assertion;
-    var assert = chai.assert;
-
-    function isLegacyJQueryPromise(thenable) {
-            // jQuery promises are Promises/A+-compatible since 3.0.0. jQuery 3.0.0 is also the first version
-            // to define the catch method.
-      return typeof thenable.catch !== 'function' &&
-                   typeof thenable.always === 'function' &&
-                   typeof thenable.done === 'function' &&
-                   typeof thenable.fail === 'function' &&
-                   typeof thenable.pipe === 'function' &&
-                   typeof thenable.progress === 'function' &&
-                   typeof thenable.state === 'function';
-    }
-
-    function assertIsAboutPromise(assertion) {
-      if (typeof assertion._obj.then !== 'function') {
-        throw new TypeError(utils.inspect(assertion._obj) + ' is not a thenable.');
-      }
-      if (isLegacyJQueryPromise(assertion._obj)) {
-        throw new TypeError('Chai as Promised is incompatible with thenables of jQuery<3.0.0, sorry! Please ' +
-                                    'upgrade jQuery or use another Promises/A+ compatible library (see ' +
-                                    'http://promisesaplus.com/).');
-      }
-    }
-
-    function method(name, asserter) {
-      utils.addMethod(Assertion.prototype, name, function () {
-        assertIsAboutPromise(this);
-        return asserter.apply(this, arguments);
-      });
-    }
-
-    function property(name, asserter) {
-      utils.addProperty(Assertion.prototype, name, function () {
-        assertIsAboutPromise(this);
-        return asserter.apply(this, arguments);
-      });
-    }
-
-    function doNotify(promise, done) {
-      promise.then(function () { done(); }, done);
-    }
-
-        // These are for clarity and to bypass Chai refusing to allow `undefined` as actual when used with `assert`.
-    function assertIfNegated(assertion, message, extra) {
-      assertion.assert(true, null, message, extra.expected, extra.actual);
-    }
-
-    function assertIfNotNegated(assertion, message, extra) {
-      assertion.assert(false, message, null, extra.expected, extra.actual);
-    }
-
-    function getBasePromise(assertion) {
-            // We need to chain subsequent asserters on top of ones in the chain already (consider
-            // `eventually.have.property("foo").that.equals("bar")`), only running them after the existing ones pass.
-            // So the first base-promise is `assertion._obj`, but after that we use the assertions themselves, i.e.
-            // previously derived promises, to chain off of.
-      return typeof assertion.then === 'function' ? assertion : assertion._obj;
-    }
-
-        // Grab these first, before we modify `Assertion.prototype`.
-
-    var propertyNames = Object.getOwnPropertyNames(Assertion.prototype);
-
-    var propertyDescs = {};
-    propertyNames.forEach(function (name) {
-      propertyDescs[name] = Object.getOwnPropertyDescriptor(Assertion.prototype, name);
-    });
-
-    property('fulfilled', function () {
-      var that = this;
-      var derivedPromise = getBasePromise(that).then(
-                function (value) {
-                  that._obj = value;
-                  assertIfNegated(that,
-                                    'expected promise not to be fulfilled but it was fulfilled with #{act}',
-                                    { actual: value });
-                  return value;
-                },
-                function (reason) {
-                  assertIfNotNegated(that,
-                                       'expected promise to be fulfilled but it was rejected with #{act}',
-                                       { actual: reason });
-                }
-            );
-
-      chaiAsPromised.transferPromiseness(that, derivedPromise);
-    });
-
-    property('rejected', function () {
-      var that = this;
-      var derivedPromise = getBasePromise(that).then(
-                function (value) {
-                  that._obj = value;
-                  assertIfNotNegated(that,
-                                       'expected promise to be rejected but it was fulfilled with #{act}',
-                                       { actual: value });
-                  return value;
-                },
-                function (reason) {
-                  assertIfNegated(that,
-                                    'expected promise not to be rejected but it was rejected with #{act}',
-                                    { actual: reason });
-
-                    // Return the reason, transforming this into a fulfillment, to allow further assertions, e.g.
-                    // `promise.should.be.rejected.and.eventually.equal("reason")`.
-                  return reason;
-                }
-            );
-
-      chaiAsPromised.transferPromiseness(that, derivedPromise);
-    });
-
-    method('rejectedWith', function (Constructor, message) {
-      var desiredReason = null;
-      var constructorName = null;
-
-      if (Constructor instanceof RegExp || typeof Constructor === 'string') {
-        message = Constructor;
-        Constructor = null;
-      } else if (Constructor && Constructor instanceof Error) {
-        desiredReason = Constructor;
-        Constructor = null;
-        message = null;
-      } else if (typeof Constructor === 'function') {
-        constructorName = (new Constructor()).name;
-      } else {
-        Constructor = null;
-      }
-
-      var that = this;
-      var derivedPromise = getBasePromise(that).then(
-                function (value) {
-                  var assertionMessage = null;
-                  var expected = null;
-
-                  if (Constructor) {
-                    assertionMessage = 'expected promise to be rejected with #{exp} but it was fulfilled with ' +
-                                           '#{act}';
-                    expected = constructorName;
-                  } else if (message) {
-                    var verb = message instanceof RegExp ? 'matching' : 'including';
-                    assertionMessage = 'expected promise to be rejected with an error ' + verb + ' #{exp} but it ' +
-                                           'was fulfilled with #{act}';
-                    expected = message;
-                  } else if (desiredReason) {
-                    assertionMessage = 'expected promise to be rejected with #{exp} but it was fulfilled with ' +
-                                           '#{act}';
-                    expected = desiredReason;
-                  }
-
-                  that._obj = value;
-
-                  assertIfNotNegated(that, assertionMessage, { expected: expected, actual: value });
-                },
-                function (reason) {
-                  if (Constructor) {
-                    that.assert(reason instanceof Constructor,
-                                    'expected promise to be rejected with #{exp} but it was rejected with #{act}',
-                                    'expected promise not to be rejected with #{exp} but it was rejected with #{act}',
-                                    constructorName,
-                                    reason);
-                  }
-
-                  var reasonMessage = utils.type(reason) === 'object' && 'message' in reason ?
-                                            reason.message :
-                                            '' + reason;
-                  if (message && reasonMessage !== null && reasonMessage !== undefined) {
-                    if (message instanceof RegExp) {
-                      that.assert(message.test(reasonMessage),
-                                        'expected promise to be rejected with an error matching #{exp} but got #{act}',
-                                        'expected promise not to be rejected with an error matching #{exp}',
-                                        message,
-                                        reasonMessage);
-                    }
-                    if (typeof message === 'string') {
-                      that.assert(reasonMessage.indexOf(message) !== -1,
-                                        'expected promise to be rejected with an error including #{exp} but got #{act}',
-                                        'expected promise not to be rejected with an error including #{exp}',
-                                        message,
-                                        reasonMessage);
-                    }
-                  }
-
-                  if (desiredReason) {
-                    that.assert(reason === desiredReason,
-                                    'expected promise to be rejected with #{exp} but it was rejected with #{act}',
-                                    'expected promise not to be rejected with #{exp}',
-                                    desiredReason,
-                                    reason);
-                  }
-                }
-            );
-
-      chaiAsPromised.transferPromiseness(that, derivedPromise);
-    });
-
-    property('eventually', function () {
-      utils.flag(this, 'eventually', true);
-    });
-
-    method('notify', function (done) {
-      doNotify(getBasePromise(this), done);
-    });
-
-    method('become', function (value, message) {
-      return this.eventually.deep.equal(value, message);
-    });
-
-        // //////
-        // `eventually`
-
-        // We need to be careful not to trigger any getters, thus `Object.getOwnPropertyDescriptor` usage.
-    var methodNames = propertyNames.filter(function (name) {
-      return name !== 'assert' && typeof propertyDescs[name].value === 'function';
-    });
-
-    methodNames.forEach(function (methodName) {
-      Assertion.overwriteMethod(methodName, function (originalMethod) {
-        return function () {
-          doAsserterAsyncAndAddThen(originalMethod, this, arguments);
-        };
-      });
-    });
-
-    var getterNames = propertyNames.filter(function (name) {
-      return name !== '_obj' && typeof propertyDescs[name].get === 'function';
-    });
-
-    getterNames.forEach(function (getterName) {
-            // Chainable methods are things like `an`, which can work both for `.should.be.an.instanceOf` and as
-            // `should.be.an("object")`. We need to handle those specially.
-      var isChainableMethod = Assertion.prototype.__methods.hasOwnProperty(getterName);
-
-      if (isChainableMethod) {
-        Assertion.overwriteChainableMethod(
-                    getterName,
-                    function (originalMethod) {
-                      return function () {
-                        doAsserterAsyncAndAddThen(originalMethod, this, arguments);
-                      };
-                    },
-                    function (originalGetter) {
-                      return function () {
-                        doAsserterAsyncAndAddThen(originalGetter, this);
-                      };
-                    }
-                );
-      } else {
-        Assertion.overwriteProperty(getterName, function (originalGetter) {
-          return function () {
-            doAsserterAsyncAndAddThen(originalGetter, this);
-          };
-        });
-      }
-    });
-
-    function doAsserterAsyncAndAddThen(asserter, assertion, args) {
-            // Since we're intercepting all methods/properties, we need to just pass through if they don't want
-            // `eventually`, or if we've already fulfilled the promise (see below).
-      if (!utils.flag(assertion, 'eventually')) {
-        return asserter.apply(assertion, args);
-      }
-
-      var derivedPromise = getBasePromise(assertion).then(function (value) {
-                // Set up the environment for the asserter to actually run: `_obj` should be the fulfillment value, and
-                // now that we have the value, we're no longer in "eventually" mode, so we won't run any of this code,
-                // just the base Chai code that we get to via the short-circuit above.
-        assertion._obj = value;
-        utils.flag(assertion, 'eventually', false);
-
-        return args ? chaiAsPromised.transformAsserterArgs(args) : args;
-      }).then(function (args) {
-        asserter.apply(assertion, args);
-
-                // Because asserters, for example `property`, can change the value of `_obj` (i.e. change the "object"
-                // flag), we need to communicate this value change to subsequent chained asserters. Since we build a
-                // promise chain paralleling the asserter chain, we can use it to communicate such changes.
-        return assertion._obj;
-      });
-
-      chaiAsPromised.transferPromiseness(assertion, derivedPromise);
-    }
-
-        // /////
-        // Now use the `Assertion` framework to build an `assert` interface.
-    var originalAssertMethods = Object.getOwnPropertyNames(assert).filter(function (propName) {
-      return typeof assert[propName] === 'function';
-    });
-
-    assert.isFulfilled = function (promise, message) {
-      return (new Assertion(promise, message)).to.be.fulfilled;
-    };
-
-    assert.isRejected = function (promise, toTestAgainst, message) {
-      if (typeof toTestAgainst === 'string') {
-        message = toTestAgainst;
-        toTestAgainst = undefined;
-      }
-
-      var assertion = (new Assertion(promise, message));
-      return toTestAgainst !== undefined ? assertion.to.be.rejectedWith(toTestAgainst) : assertion.to.be.rejected;
-    };
-
-    assert.becomes = function (promise, value, message) {
-      return assert.eventually.deepEqual(promise, value, message);
-    };
-
-    assert.doesNotBecome = function (promise, value, message) {
-      return assert.eventually.notDeepEqual(promise, value, message);
-    };
-
-    assert.eventually = {};
-    originalAssertMethods.forEach(function (assertMethodName) {
-      assert.eventually[assertMethodName] = function (promise) {
-        var otherArgs = Array.prototype.slice.call(arguments, 1);
-
-        var customRejectionHandler;
-        var message = arguments[assert[assertMethodName].length - 1];
-        if (typeof message === 'string') {
-          customRejectionHandler = function (reason) {
-            throw new chai.AssertionError(message + '\n\nOriginal reason: ' + utils.inspect(reason));
-          };
-        }
-
-        var returnedPromise = promise.then(
-                    function (fulfillmentValue) {
-                      return assert[assertMethodName].apply(assert, [fulfillmentValue].concat(otherArgs));
-                    },
-                    customRejectionHandler
-                );
-
-        returnedPromise.notify = function (done) {
-          doNotify(returnedPromise, done);
-        };
-
-        return returnedPromise;
-      };
-    });
-  }
-}());
diff --git a/test/infrastructure/chai.js b/test/infrastructure/chai.js
deleted file mode 100644
index 4e7958481..000000000
--- a/test/infrastructure/chai.js
+++ /dev/null
@@ -1,6132 +0,0 @@
-(function (f) { if (typeof exports === 'object' && typeof module !== 'undefined') { module.exports = f(); } else if (typeof define === 'function' && define.amd) { define([], f); } else { var g; if (typeof window !== 'undefined') { g = window; } else if (typeof global !== 'undefined') { g = global; } else if (typeof self !== 'undefined') { g = self; } else { g = this; }g.chai = f(); } })(function () { var define, module, exports; return (function e(t, n, r) { function s(o, u) { if (!n[o]) { if (!t[o]) { var a = typeof require == 'function' && require; if (!u && a) return a(o, !0); if (i) return i(o, !0); var f = new Error('Cannot find module \'' + o + '\''); throw f.code = 'MODULE_NOT_FOUND', f; } var l = n[o] = { exports:{} }; t[o][0].call(l.exports, function (e) { var n = t[o][1][e]; return s(n ? n : e); }, l, l.exports, e, t, n, r); } return n[o].exports; } var i = typeof require == 'function' && require; for (var o = 0; o < r.length; o++)s(r[o]); return s; })({ 1:[function (require, module, exports) {
-  module.exports = require('./lib/chai');
-
-}, { './lib/chai':2 }], 2:[function (require, module, exports) {
-/*!
- * chai
- * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-  var used = []
-  , exports = module.exports = {};
-
-/*!
- * Chai version
- */
-
-  exports.version = '3.5.0';
-
-/*!
- * Assertion Error
- */
-
-  exports.AssertionError = require('assertion-error');
-
-/*!
- * Utils for plugins (not exported)
- */
-
-  var util = require('./chai/utils');
-
-/**
- * # .use(function)
- *
- * Provides a way to extend the internals of Chai
- *
- * @param {Function}
- * @returns {this} for chaining
- * @api public
- */
-
-  exports.use = function (fn) {
-    if (!~used.indexOf(fn)) {
-      fn(this, util);
-      used.push(fn);
-    }
-
-    return this;
-  };
-
-/*!
- * Utility Functions
- */
-
-  exports.util = util;
-
-/*!
- * Configuration
- */
-
-  var config = require('./chai/config');
-  exports.config = config;
-
-/*!
- * Primary `Assertion` prototype
- */
-
-  var assertion = require('./chai/assertion');
-  exports.use(assertion);
-
-/*!
- * Core Assertions
- */
-
-  var core = require('./chai/core/assertions');
-  exports.use(core);
-
-/*!
- * Expect interface
- */
-
-  var expect = require('./chai/interface/expect');
-  exports.use(expect);
-
-/*!
- * Should interface
- */
-
-  var should = require('./chai/interface/should');
-  exports.use(should);
-
-/*!
- * Assert interface
- */
-
-  var assert = require('./chai/interface/assert');
-  exports.use(assert);
-
-}, { './chai/assertion':3, './chai/config':4, './chai/core/assertions':5, './chai/interface/assert':6, './chai/interface/expect':7, './chai/interface/should':8, './chai/utils':22, 'assertion-error':30 }], 3:[function (require, module, exports) {
-/*!
- * chai
- * http://chaijs.com
- * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-  var config = require('./config');
-
-  module.exports = function (_chai, util) {
-  /*!
-   * Module dependencies.
-   */
-
-    var AssertionError = _chai.AssertionError
-    , flag = util.flag;
-
-  /*!
-   * Module export.
-   */
-
-    _chai.Assertion = Assertion;
-
-  /*!
-   * Assertion Constructor
-   *
-   * Creates object for chaining.
-   *
-   * @api private
-   */
-
-    function Assertion(obj, msg, stack) {
-      flag(this, 'ssfi', stack || arguments.callee);
-      flag(this, 'object', obj);
-      flag(this, 'message', msg);
-    }
-
-    Object.defineProperty(Assertion, 'includeStack', {
-      get: function () {
-        console.warn('Assertion.includeStack is deprecated, use chai.config.includeStack instead.');
-        return config.includeStack;
-      },
-      set: function (value) {
-        console.warn('Assertion.includeStack is deprecated, use chai.config.includeStack instead.');
-        config.includeStack = value;
-      }
-    });
-
-    Object.defineProperty(Assertion, 'showDiff', {
-      get: function () {
-        console.warn('Assertion.showDiff is deprecated, use chai.config.showDiff instead.');
-        return config.showDiff;
-      },
-      set: function (value) {
-        console.warn('Assertion.showDiff is deprecated, use chai.config.showDiff instead.');
-        config.showDiff = value;
-      }
-    });
-
-    Assertion.addProperty = function (name, fn) {
-      util.addProperty(this.prototype, name, fn);
-    };
-
-    Assertion.addMethod = function (name, fn) {
-      util.addMethod(this.prototype, name, fn);
-    };
-
-    Assertion.addChainableMethod = function (name, fn, chainingBehavior) {
-      util.addChainableMethod(this.prototype, name, fn, chainingBehavior);
-    };
-
-    Assertion.overwriteProperty = function (name, fn) {
-      util.overwriteProperty(this.prototype, name, fn);
-    };
-
-    Assertion.overwriteMethod = function (name, fn) {
-      util.overwriteMethod(this.prototype, name, fn);
-    };
-
-    Assertion.overwriteChainableMethod = function (name, fn, chainingBehavior) {
-      util.overwriteChainableMethod(this.prototype, name, fn, chainingBehavior);
-    };
-
-  /**
-   * ### .assert(expression, message, negateMessage, expected, actual, showDiff)
-   *
-   * Executes an expression and check expectations. Throws AssertionError for reporting if test doesn't pass.
-   *
-   * @name assert
-   * @param {Philosophical} expression to be tested
-   * @param {String|Function} message or function that returns message to display if expression fails
-   * @param {String|Function} negatedMessage or function that returns negatedMessage to display if negated expression fails
-   * @param {Mixed} expected value (remember to check for negation)
-   * @param {Mixed} actual (optional) will default to `this.obj`
-   * @param {Boolean} showDiff (optional) when set to `true`, assert will display a diff in addition to the message if expression fails
-   * @api private
-   */
-
-    Assertion.prototype.assert = function (expr, msg, negateMsg, expected, _actual, showDiff) {
-      var ok = util.test(this, arguments);
-      if (true !== showDiff) showDiff = false;
-      if (true !== config.showDiff) showDiff = false;
-
-      if (!ok) {
-        var msg = util.getMessage(this, arguments)
-        , actual = util.getActual(this, arguments);
-        throw new AssertionError(msg, {
-          actual: actual
-        , expected: expected
-        , showDiff: showDiff
-        }, (config.includeStack) ? this.assert : flag(this, 'ssfi'));
-      }
-    };
-
-  /*!
-   * ### ._obj
-   *
-   * Quick reference to stored `actual` value for plugin developers.
-   *
-   * @api private
-   */
-
-    Object.defineProperty(Assertion.prototype, '_obj',
-    { get: function () {
-      return flag(this, 'object');
-    }
-    , set: function (val) {
-      flag(this, 'object', val);
-    }
-  });
-  };
-
-}, { './config':4 }], 4:[function (require, module, exports) {
-  module.exports = {
-
-  /**
-   * ### config.includeStack
-   *
-   * User configurable property, influences whether stack trace
-   * is included in Assertion error message. Default of false
-   * suppresses stack trace in the error message.
-   *
-   *     chai.config.includeStack = true;  // enable stack on error
-   *
-   * @param {Boolean}
-   * @api public
-   */
-
-    includeStack: false,
-
-  /**
-   * ### config.showDiff
-   *
-   * User configurable property, influences whether or not
-   * the `showDiff` flag should be included in the thrown
-   * AssertionErrors. `false` will always be `false`; `true`
-   * will be true when the assertion has requested a diff
-   * be shown.
-   *
-   * @param {Boolean}
-   * @api public
-   */
-
-    showDiff: true,
-
-  /**
-   * ### config.truncateThreshold
-   *
-   * User configurable property, sets length threshold for actual and
-   * expected values in assertion errors. If this threshold is exceeded, for
-   * example for large data structures, the value is replaced with something
-   * like `[ Array(3) ]` or `{ Object (prop1, prop2) }`.
-   *
-   * Set it to zero if you want to disable truncating altogether.
-   *
-   * This is especially userful when doing assertions on arrays: having this
-   * set to a reasonable large value makes the failure messages readily
-   * inspectable.
-   *
-   *     chai.config.truncateThreshold = 0;  // disable truncating
-   *
-   * @param {Number}
-   * @api public
-   */
-
-    truncateThreshold: 40
-
-  };
-
-}, {}], 5:[function (require, module, exports) {
-/*!
- * chai
- * http://chaijs.com
- * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-  module.exports = function (chai, _) {
-    var Assertion = chai.Assertion
-    , toString = Object.prototype.toString
-    , flag = _.flag;
-
-  /**
-   * ### Language Chains
-   *
-   * The following are provided as chainable getters to
-   * improve the readability of your assertions. They
-   * do not provide testing capabilities unless they
-   * have been overwritten by a plugin.
-   *
-   * **Chains**
-   *
-   * - to
-   * - be
-   * - been
-   * - is
-   * - that
-   * - which
-   * - and
-   * - has
-   * - have
-   * - with
-   * - at
-   * - of
-   * - same
-   *
-   * @name language chains
-   * @namespace BDD
-   * @api public
-   */
-
-    ['to', 'be', 'been'
-  , 'is', 'and', 'has', 'have'
-  , 'with', 'that', 'which', 'at'
-  , 'of', 'same'].forEach(function (chain) {
-    Assertion.addProperty(chain, function () {
-      return this;
-    });
-  });
-
-  /**
-   * ### .not
-   *
-   * Negates any of assertions following in the chain.
-   *
-   *     expect(foo).to.not.equal('bar');
-   *     expect(goodFn).to.not.throw(Error);
-   *     expect({ foo: 'baz' }).to.have.property('foo')
-   *       .and.not.equal('bar');
-   *
-   * @name not
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addProperty('not', function () {
-      flag(this, 'negate', true);
-    });
-
-  /**
-   * ### .deep
-   *
-   * Sets the `deep` flag, later used by the `equal` and
-   * `property` assertions.
-   *
-   *     expect(foo).to.deep.equal({ bar: 'baz' });
-   *     expect({ foo: { bar: { baz: 'quux' } } })
-   *       .to.have.deep.property('foo.bar.baz', 'quux');
-   *
-   * `.deep.property` special characters can be escaped
-   * by adding two slashes before the `.` or `[]`.
-   *
-   *     var deepCss = { '.link': { '[target]': 42 }};
-   *     expect(deepCss).to.have.deep.property('\\.link.\\[target\\]', 42);
-   *
-   * @name deep
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addProperty('deep', function () {
-      flag(this, 'deep', true);
-    });
-
-  /**
-   * ### .any
-   *
-   * Sets the `any` flag, (opposite of the `all` flag)
-   * later used in the `keys` assertion.
-   *
-   *     expect(foo).to.have.any.keys('bar', 'baz');
-   *
-   * @name any
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addProperty('any', function () {
-      flag(this, 'any', true);
-      flag(this, 'all', false);
-    });
-
-
-  /**
-   * ### .all
-   *
-   * Sets the `all` flag (opposite of the `any` flag)
-   * later used by the `keys` assertion.
-   *
-   *     expect(foo).to.have.all.keys('bar', 'baz');
-   *
-   * @name all
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addProperty('all', function () {
-      flag(this, 'all', true);
-      flag(this, 'any', false);
-    });
-
-  /**
-   * ### .a(type)
-   *
-   * The `a` and `an` assertions are aliases that can be
-   * used either as language chains or to assert a value's
-   * type.
-   *
-   *     // typeof
-   *     expect('test').to.be.a('string');
-   *     expect({ foo: 'bar' }).to.be.an('object');
-   *     expect(null).to.be.a('null');
-   *     expect(undefined).to.be.an('undefined');
-   *     expect(new Error).to.be.an('error');
-   *     expect(new Promise).to.be.a('promise');
-   *     expect(new Float32Array()).to.be.a('float32array');
-   *     expect(Symbol()).to.be.a('symbol');
-   *
-   *     // es6 overrides
-   *     expect({[Symbol.toStringTag]:()=>'foo'}).to.be.a('foo');
-   *
-   *     // language chain
-   *     expect(foo).to.be.an.instanceof(Foo);
-   *
-   * @name a
-   * @alias an
-   * @param {String} type
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function an(type, msg) {
-      if (msg) flag(this, 'message', msg);
-      type = type.toLowerCase();
-      var obj = flag(this, 'object')
-      , article = ~['a', 'e', 'i', 'o', 'u'].indexOf(type.charAt(0)) ? 'an ' : 'a ';
-
-      this.assert(
-        type === _.type(obj)
-      , 'expected #{this} to be ' + article + type
-      , 'expected #{this} not to be ' + article + type
-    );
-    }
-
-    Assertion.addChainableMethod('an', an);
-    Assertion.addChainableMethod('a', an);
-
-  /**
-   * ### .include(value)
-   *
-   * The `include` and `contain` assertions can be used as either property
-   * based language chains or as methods to assert the inclusion of an object
-   * in an array or a substring in a string. When used as language chains,
-   * they toggle the `contains` flag for the `keys` assertion.
-   *
-   *     expect([1,2,3]).to.include(2);
-   *     expect('foobar').to.contain('foo');
-   *     expect({ foo: 'bar', hello: 'universe' }).to.include.keys('foo');
-   *
-   * @name include
-   * @alias contain
-   * @alias includes
-   * @alias contains
-   * @param {Object|String|Number} obj
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function includeChainingBehavior() {
-      flag(this, 'contains', true);
-    }
-
-    function include(val, msg) {
-      _.expectTypes(this, ['array', 'object', 'string']);
-
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object');
-      var expected = false;
-
-      if (_.type(obj) === 'array' && _.type(val) === 'object') {
-        for (var i in obj) {
-          if (_.eql(obj[i], val)) {
-            expected = true;
-            break;
-          }
-        }
-      } else if (_.type(val) === 'object') {
-        if (!flag(this, 'negate')) {
-          for (var k in val) new Assertion(obj).property(k, val[k]);
-          return;
-        }
-        var subset = {};
-        for (var k in val) subset[k] = obj[k];
-        expected = _.eql(subset, val);
-      } else {
-        expected = (obj != undefined) && ~obj.indexOf(val);
-      }
-      this.assert(
-        expected
-      , 'expected #{this} to include ' + _.inspect(val)
-      , 'expected #{this} to not include ' + _.inspect(val));
-    }
-
-    Assertion.addChainableMethod('include', include, includeChainingBehavior);
-    Assertion.addChainableMethod('contain', include, includeChainingBehavior);
-    Assertion.addChainableMethod('contains', include, includeChainingBehavior);
-    Assertion.addChainableMethod('includes', include, includeChainingBehavior);
-
-  /**
-   * ### .ok
-   *
-   * Asserts that the target is truthy.
-   *
-   *     expect('everything').to.be.ok;
-   *     expect(1).to.be.ok;
-   *     expect(false).to.not.be.ok;
-   *     expect(undefined).to.not.be.ok;
-   *     expect(null).to.not.be.ok;
-   *
-   * @name ok
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addProperty('ok', function () {
-      this.assert(
-        flag(this, 'object')
-      , 'expected #{this} to be truthy'
-      , 'expected #{this} to be falsy');
-    });
-
-  /**
-   * ### .true
-   *
-   * Asserts that the target is `true`.
-   *
-   *     expect(true).to.be.true;
-   *     expect(1).to.not.be.true;
-   *
-   * @name true
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addProperty('true', function () {
-      this.assert(
-        true === flag(this, 'object')
-      , 'expected #{this} to be true'
-      , 'expected #{this} to be false'
-      , this.negate ? false : true
-    );
-    });
-
-  /**
-   * ### .false
-   *
-   * Asserts that the target is `false`.
-   *
-   *     expect(false).to.be.false;
-   *     expect(0).to.not.be.false;
-   *
-   * @name false
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addProperty('false', function () {
-      this.assert(
-        false === flag(this, 'object')
-      , 'expected #{this} to be false'
-      , 'expected #{this} to be true'
-      , this.negate ? true : false
-    );
-    });
-
-  /**
-   * ### .null
-   *
-   * Asserts that the target is `null`.
-   *
-   *     expect(null).to.be.null;
-   *     expect(undefined).to.not.be.null;
-   *
-   * @name null
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addProperty('null', function () {
-      this.assert(
-        null === flag(this, 'object')
-      , 'expected #{this} to be null'
-      , 'expected #{this} not to be null'
-    );
-    });
-
-  /**
-   * ### .undefined
-   *
-   * Asserts that the target is `undefined`.
-   *
-   *     expect(undefined).to.be.undefined;
-   *     expect(null).to.not.be.undefined;
-   *
-   * @name undefined
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addProperty('undefined', function () {
-      this.assert(
-        undefined === flag(this, 'object')
-      , 'expected #{this} to be undefined'
-      , 'expected #{this} not to be undefined'
-    );
-    });
-
-  /**
-   * ### .NaN
-   * Asserts that the target is `NaN`.
-   *
-   *     expect('foo').to.be.NaN;
-   *     expect(4).not.to.be.NaN;
-   *
-   * @name NaN
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addProperty('NaN', function () {
-      this.assert(
-        isNaN(flag(this, 'object'))
-        , 'expected #{this} to be NaN'
-        , 'expected #{this} not to be NaN'
-    );
-    });
-
-  /**
-   * ### .exist
-   *
-   * Asserts that the target is neither `null` nor `undefined`.
-   *
-   *     var foo = 'hi'
-   *       , bar = null
-   *       , baz;
-   *
-   *     expect(foo).to.exist;
-   *     expect(bar).to.not.exist;
-   *     expect(baz).to.not.exist;
-   *
-   * @name exist
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addProperty('exist', function () {
-      this.assert(
-        null != flag(this, 'object')
-      , 'expected #{this} to exist'
-      , 'expected #{this} to not exist'
-    );
-    });
-
-
-  /**
-   * ### .empty
-   *
-   * Asserts that the target's length is `0`. For arrays and strings, it checks
-   * the `length` property. For objects, it gets the count of
-   * enumerable keys.
-   *
-   *     expect([]).to.be.empty;
-   *     expect('').to.be.empty;
-   *     expect({}).to.be.empty;
-   *
-   * @name empty
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addProperty('empty', function () {
-      var obj = flag(this, 'object')
-      , expected = obj;
-
-      if (Array.isArray(obj) || 'string' === typeof object) {
-        expected = obj.length;
-      } else if (typeof obj === 'object') {
-        expected = Object.keys(obj).length;
-      }
-
-      this.assert(
-        !expected
-      , 'expected #{this} to be empty'
-      , 'expected #{this} not to be empty'
-    );
-    });
-
-  /**
-   * ### .arguments
-   *
-   * Asserts that the target is an arguments object.
-   *
-   *     function test () {
-   *       expect(arguments).to.be.arguments;
-   *     }
-   *
-   * @name arguments
-   * @alias Arguments
-   * @namespace BDD
-   * @api public
-   */
-
-    function checkArguments() {
-      var obj = flag(this, 'object')
-      , type = Object.prototype.toString.call(obj);
-      this.assert(
-        '[object Arguments]' === type
-      , 'expected #{this} to be arguments but got ' + type
-      , 'expected #{this} to not be arguments'
-    );
-    }
-
-    Assertion.addProperty('arguments', checkArguments);
-    Assertion.addProperty('Arguments', checkArguments);
-
-  /**
-   * ### .equal(value)
-   *
-   * Asserts that the target is strictly equal (`===`) to `value`.
-   * Alternately, if the `deep` flag is set, asserts that
-   * the target is deeply equal to `value`.
-   *
-   *     expect('hello').to.equal('hello');
-   *     expect(42).to.equal(42);
-   *     expect(1).to.not.equal(true);
-   *     expect({ foo: 'bar' }).to.not.equal({ foo: 'bar' });
-   *     expect({ foo: 'bar' }).to.deep.equal({ foo: 'bar' });
-   *
-   * @name equal
-   * @alias equals
-   * @alias eq
-   * @alias deep.equal
-   * @param {Mixed} value
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function assertEqual(val, msg) {
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object');
-      if (flag(this, 'deep')) {
-        return this.eql(val);
-      } else {
-        this.assert(
-          val === obj
-        , 'expected #{this} to equal #{exp}'
-        , 'expected #{this} to not equal #{exp}'
-        , val
-        , this._obj
-        , true
-      );
-      }
-    }
-
-    Assertion.addMethod('equal', assertEqual);
-    Assertion.addMethod('equals', assertEqual);
-    Assertion.addMethod('eq', assertEqual);
-
-  /**
-   * ### .eql(value)
-   *
-   * Asserts that the target is deeply equal to `value`.
-   *
-   *     expect({ foo: 'bar' }).to.eql({ foo: 'bar' });
-   *     expect([ 1, 2, 3 ]).to.eql([ 1, 2, 3 ]);
-   *
-   * @name eql
-   * @alias eqls
-   * @param {Mixed} value
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function assertEql(obj, msg) {
-      if (msg) flag(this, 'message', msg);
-      this.assert(
-        _.eql(obj, flag(this, 'object'))
-      , 'expected #{this} to deeply equal #{exp}'
-      , 'expected #{this} to not deeply equal #{exp}'
-      , obj
-      , this._obj
-      , true
-    );
-    }
-
-    Assertion.addMethod('eql', assertEql);
-    Assertion.addMethod('eqls', assertEql);
-
-  /**
-   * ### .above(value)
-   *
-   * Asserts that the target is greater than `value`.
-   *
-   *     expect(10).to.be.above(5);
-   *
-   * Can also be used in conjunction with `length` to
-   * assert a minimum length. The benefit being a
-   * more informative error message than if the length
-   * was supplied directly.
-   *
-   *     expect('foo').to.have.length.above(2);
-   *     expect([ 1, 2, 3 ]).to.have.length.above(2);
-   *
-   * @name above
-   * @alias gt
-   * @alias greaterThan
-   * @param {Number} value
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function assertAbove(n, msg) {
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object');
-      if (flag(this, 'doLength')) {
-        new Assertion(obj, msg).to.have.property('length');
-        var len = obj.length;
-        this.assert(
-          len > n
-        , 'expected #{this} to have a length above #{exp} but got #{act}'
-        , 'expected #{this} to not have a length above #{exp}'
-        , n
-        , len
-      );
-      } else {
-        this.assert(
-          obj > n
-        , 'expected #{this} to be above ' + n
-        , 'expected #{this} to be at most ' + n
-      );
-      }
-    }
-
-    Assertion.addMethod('above', assertAbove);
-    Assertion.addMethod('gt', assertAbove);
-    Assertion.addMethod('greaterThan', assertAbove);
-
-  /**
-   * ### .least(value)
-   *
-   * Asserts that the target is greater than or equal to `value`.
-   *
-   *     expect(10).to.be.at.least(10);
-   *
-   * Can also be used in conjunction with `length` to
-   * assert a minimum length. The benefit being a
-   * more informative error message than if the length
-   * was supplied directly.
-   *
-   *     expect('foo').to.have.length.of.at.least(2);
-   *     expect([ 1, 2, 3 ]).to.have.length.of.at.least(3);
-   *
-   * @name least
-   * @alias gte
-   * @param {Number} value
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function assertLeast(n, msg) {
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object');
-      if (flag(this, 'doLength')) {
-        new Assertion(obj, msg).to.have.property('length');
-        var len = obj.length;
-        this.assert(
-          len >= n
-        , 'expected #{this} to have a length at least #{exp} but got #{act}'
-        , 'expected #{this} to have a length below #{exp}'
-        , n
-        , len
-      );
-      } else {
-        this.assert(
-          obj >= n
-        , 'expected #{this} to be at least ' + n
-        , 'expected #{this} to be below ' + n
-      );
-      }
-    }
-
-    Assertion.addMethod('least', assertLeast);
-    Assertion.addMethod('gte', assertLeast);
-
-  /**
-   * ### .below(value)
-   *
-   * Asserts that the target is less than `value`.
-   *
-   *     expect(5).to.be.below(10);
-   *
-   * Can also be used in conjunction with `length` to
-   * assert a maximum length. The benefit being a
-   * more informative error message than if the length
-   * was supplied directly.
-   *
-   *     expect('foo').to.have.length.below(4);
-   *     expect([ 1, 2, 3 ]).to.have.length.below(4);
-   *
-   * @name below
-   * @alias lt
-   * @alias lessThan
-   * @param {Number} value
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function assertBelow(n, msg) {
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object');
-      if (flag(this, 'doLength')) {
-        new Assertion(obj, msg).to.have.property('length');
-        var len = obj.length;
-        this.assert(
-          len < n
-        , 'expected #{this} to have a length below #{exp} but got #{act}'
-        , 'expected #{this} to not have a length below #{exp}'
-        , n
-        , len
-      );
-      } else {
-        this.assert(
-          obj < n
-        , 'expected #{this} to be below ' + n
-        , 'expected #{this} to be at least ' + n
-      );
-      }
-    }
-
-    Assertion.addMethod('below', assertBelow);
-    Assertion.addMethod('lt', assertBelow);
-    Assertion.addMethod('lessThan', assertBelow);
-
-  /**
-   * ### .most(value)
-   *
-   * Asserts that the target is less than or equal to `value`.
-   *
-   *     expect(5).to.be.at.most(5);
-   *
-   * Can also be used in conjunction with `length` to
-   * assert a maximum length. The benefit being a
-   * more informative error message than if the length
-   * was supplied directly.
-   *
-   *     expect('foo').to.have.length.of.at.most(4);
-   *     expect([ 1, 2, 3 ]).to.have.length.of.at.most(3);
-   *
-   * @name most
-   * @alias lte
-   * @param {Number} value
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function assertMost(n, msg) {
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object');
-      if (flag(this, 'doLength')) {
-        new Assertion(obj, msg).to.have.property('length');
-        var len = obj.length;
-        this.assert(
-          len <= n
-        , 'expected #{this} to have a length at most #{exp} but got #{act}'
-        , 'expected #{this} to have a length above #{exp}'
-        , n
-        , len
-      );
-      } else {
-        this.assert(
-          obj <= n
-        , 'expected #{this} to be at most ' + n
-        , 'expected #{this} to be above ' + n
-      );
-      }
-    }
-
-    Assertion.addMethod('most', assertMost);
-    Assertion.addMethod('lte', assertMost);
-
-  /**
-   * ### .within(start, finish)
-   *
-   * Asserts that the target is within a range.
-   *
-   *     expect(7).to.be.within(5,10);
-   *
-   * Can also be used in conjunction with `length` to
-   * assert a length range. The benefit being a
-   * more informative error message than if the length
-   * was supplied directly.
-   *
-   *     expect('foo').to.have.length.within(2,4);
-   *     expect([ 1, 2, 3 ]).to.have.length.within(2,4);
-   *
-   * @name within
-   * @param {Number} start lowerbound inclusive
-   * @param {Number} finish upperbound inclusive
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addMethod('within', function (start, finish, msg) {
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object')
-      , range = start + '..' + finish;
-      if (flag(this, 'doLength')) {
-        new Assertion(obj, msg).to.have.property('length');
-        var len = obj.length;
-        this.assert(
-          len >= start && len <= finish
-        , 'expected #{this} to have a length within ' + range
-        , 'expected #{this} to not have a length within ' + range
-      );
-      } else {
-        this.assert(
-          obj >= start && obj <= finish
-        , 'expected #{this} to be within ' + range
-        , 'expected #{this} to not be within ' + range
-      );
-      }
-    });
-
-  /**
-   * ### .instanceof(constructor)
-   *
-   * Asserts that the target is an instance of `constructor`.
-   *
-   *     var Tea = function (name) { this.name = name; }
-   *       , Chai = new Tea('chai');
-   *
-   *     expect(Chai).to.be.an.instanceof(Tea);
-   *     expect([ 1, 2, 3 ]).to.be.instanceof(Array);
-   *
-   * @name instanceof
-   * @param {Constructor} constructor
-   * @param {String} message _optional_
-   * @alias instanceOf
-   * @namespace BDD
-   * @api public
-   */
-
-    function assertInstanceOf(constructor, msg) {
-      if (msg) flag(this, 'message', msg);
-      var name = _.getName(constructor);
-      this.assert(
-        flag(this, 'object') instanceof constructor
-      , 'expected #{this} to be an instance of ' + name
-      , 'expected #{this} to not be an instance of ' + name
-    );
-    }
-
-    Assertion.addMethod('instanceof', assertInstanceOf);
-    Assertion.addMethod('instanceOf', assertInstanceOf);
-
-  /**
-   * ### .property(name, [value])
-   *
-   * Asserts that the target has a property `name`, optionally asserting that
-   * the value of that property is strictly equal to  `value`.
-   * If the `deep` flag is set, you can use dot- and bracket-notation for deep
-   * references into objects and arrays.
-   *
-   *     // simple referencing
-   *     var obj = { foo: 'bar' };
-   *     expect(obj).to.have.property('foo');
-   *     expect(obj).to.have.property('foo', 'bar');
-   *
-   *     // deep referencing
-   *     var deepObj = {
-   *         green: { tea: 'matcha' }
-   *       , teas: [ 'chai', 'matcha', { tea: 'konacha' } ]
-   *     };
-   *
-   *     expect(deepObj).to.have.deep.property('green.tea', 'matcha');
-   *     expect(deepObj).to.have.deep.property('teas[1]', 'matcha');
-   *     expect(deepObj).to.have.deep.property('teas[2].tea', 'konacha');
-   *
-   * You can also use an array as the starting point of a `deep.property`
-   * assertion, or traverse nested arrays.
-   *
-   *     var arr = [
-   *         [ 'chai', 'matcha', 'konacha' ]
-   *       , [ { tea: 'chai' }
-   *         , { tea: 'matcha' }
-   *         , { tea: 'konacha' } ]
-   *     ];
-   *
-   *     expect(arr).to.have.deep.property('[0][1]', 'matcha');
-   *     expect(arr).to.have.deep.property('[1][2].tea', 'konacha');
-   *
-   * Furthermore, `property` changes the subject of the assertion
-   * to be the value of that property from the original object. This
-   * permits for further chainable assertions on that property.
-   *
-   *     expect(obj).to.have.property('foo')
-   *       .that.is.a('string');
-   *     expect(deepObj).to.have.property('green')
-   *       .that.is.an('object')
-   *       .that.deep.equals({ tea: 'matcha' });
-   *     expect(deepObj).to.have.property('teas')
-   *       .that.is.an('array')
-   *       .with.deep.property('[2]')
-   *         .that.deep.equals({ tea: 'konacha' });
-   *
-   * Note that dots and bracket in `name` must be backslash-escaped when
-   * the `deep` flag is set, while they must NOT be escaped when the `deep`
-   * flag is not set.
-   *
-   *     // simple referencing
-   *     var css = { '.link[target]': 42 };
-   *     expect(css).to.have.property('.link[target]', 42);
-   *
-   *     // deep referencing
-   *     var deepCss = { '.link': { '[target]': 42 }};
-   *     expect(deepCss).to.have.deep.property('\\.link.\\[target\\]', 42);
-   *
-   * @name property
-   * @alias deep.property
-   * @param {String} name
-   * @param {Mixed} value (optional)
-   * @param {String} message _optional_
-   * @returns value of property for chaining
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addMethod('property', function (name, val, msg) {
-      if (msg) flag(this, 'message', msg);
-
-      var isDeep = !!flag(this, 'deep')
-      , descriptor = isDeep ? 'deep property ' : 'property '
-      , negate = flag(this, 'negate')
-      , obj = flag(this, 'object')
-      , pathInfo = isDeep ? _.getPathInfo(name, obj) : null
-      , hasProperty = isDeep
-        ? pathInfo.exists
-        : _.hasProperty(name, obj)
-      , value = isDeep
-        ? pathInfo.value
-        : obj[name];
-
-      if (negate && arguments.length > 1) {
-        if (undefined === value) {
-          msg = (msg != null) ? msg + ': ' : '';
-          throw new Error(msg + _.inspect(obj) + ' has no ' + descriptor + _.inspect(name));
-        }
-      } else {
-        this.assert(
-          hasProperty
-        , 'expected #{this} to have a ' + descriptor + _.inspect(name)
-        , 'expected #{this} to not have ' + descriptor + _.inspect(name));
-      }
-
-      if (arguments.length > 1) {
-        this.assert(
-          val === value
-        , 'expected #{this} to have a ' + descriptor + _.inspect(name) + ' of #{exp}, but got #{act}'
-        , 'expected #{this} to not have a ' + descriptor + _.inspect(name) + ' of #{act}'
-        , val
-        , value
-      );
-      }
-
-      flag(this, 'object', value);
-    });
-
-
-  /**
-   * ### .ownProperty(name)
-   *
-   * Asserts that the target has an own property `name`.
-   *
-   *     expect('test').to.have.ownProperty('length');
-   *
-   * @name ownProperty
-   * @alias haveOwnProperty
-   * @param {String} name
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function assertOwnProperty(name, msg) {
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object');
-      this.assert(
-        obj.hasOwnProperty(name)
-      , 'expected #{this} to have own property ' + _.inspect(name)
-      , 'expected #{this} to not have own property ' + _.inspect(name)
-    );
-    }
-
-    Assertion.addMethod('ownProperty', assertOwnProperty);
-    Assertion.addMethod('haveOwnProperty', assertOwnProperty);
-
-  /**
-   * ### .ownPropertyDescriptor(name[, descriptor[, message]])
-   *
-   * Asserts that the target has an own property descriptor `name`, that optionally matches `descriptor`.
-   *
-   *     expect('test').to.have.ownPropertyDescriptor('length');
-   *     expect('test').to.have.ownPropertyDescriptor('length', { enumerable: false, configurable: false, writable: false, value: 4 });
-   *     expect('test').not.to.have.ownPropertyDescriptor('length', { enumerable: false, configurable: false, writable: false, value: 3 });
-   *     expect('test').ownPropertyDescriptor('length').to.have.property('enumerable', false);
-   *     expect('test').ownPropertyDescriptor('length').to.have.keys('value');
-   *
-   * @name ownPropertyDescriptor
-   * @alias haveOwnPropertyDescriptor
-   * @param {String} name
-   * @param {Object} descriptor _optional_
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function assertOwnPropertyDescriptor(name, descriptor, msg) {
-      if (typeof descriptor === 'string') {
-        msg = descriptor;
-        descriptor = null;
-      }
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object');
-      var actualDescriptor = Object.getOwnPropertyDescriptor(Object(obj), name);
-      if (actualDescriptor && descriptor) {
-        this.assert(
-          _.eql(descriptor, actualDescriptor)
-        , 'expected the own property descriptor for ' + _.inspect(name) + ' on #{this} to match ' + _.inspect(descriptor) + ', got ' + _.inspect(actualDescriptor)
-        , 'expected the own property descriptor for ' + _.inspect(name) + ' on #{this} to not match ' + _.inspect(descriptor)
-        , descriptor
-        , actualDescriptor
-        , true
-      );
-      } else {
-        this.assert(
-          actualDescriptor
-        , 'expected #{this} to have an own property descriptor for ' + _.inspect(name)
-        , 'expected #{this} to not have an own property descriptor for ' + _.inspect(name)
-      );
-      }
-      flag(this, 'object', actualDescriptor);
-    }
-
-    Assertion.addMethod('ownPropertyDescriptor', assertOwnPropertyDescriptor);
-    Assertion.addMethod('haveOwnPropertyDescriptor', assertOwnPropertyDescriptor);
-
-  /**
-   * ### .length
-   *
-   * Sets the `doLength` flag later used as a chain precursor to a value
-   * comparison for the `length` property.
-   *
-   *     expect('foo').to.have.length.above(2);
-   *     expect([ 1, 2, 3 ]).to.have.length.above(2);
-   *     expect('foo').to.have.length.below(4);
-   *     expect([ 1, 2, 3 ]).to.have.length.below(4);
-   *     expect('foo').to.have.length.within(2,4);
-   *     expect([ 1, 2, 3 ]).to.have.length.within(2,4);
-   *
-   * *Deprecation notice:* Using `length` as an assertion will be deprecated
-   * in version 2.4.0 and removed in 3.0.0. Code using the old style of
-   * asserting for `length` property value using `length(value)` should be
-   * switched to use `lengthOf(value)` instead.
-   *
-   * @name length
-   * @namespace BDD
-   * @api public
-   */
-
-  /**
-   * ### .lengthOf(value[, message])
-   *
-   * Asserts that the target's `length` property has
-   * the expected value.
-   *
-   *     expect([ 1, 2, 3]).to.have.lengthOf(3);
-   *     expect('foobar').to.have.lengthOf(6);
-   *
-   * @name lengthOf
-   * @param {Number} length
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function assertLengthChain() {
-      flag(this, 'doLength', true);
-    }
-
-    function assertLength(n, msg) {
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object');
-      new Assertion(obj, msg).to.have.property('length');
-      var len = obj.length;
-
-      this.assert(
-        len == n
-      , 'expected #{this} to have a length of #{exp} but got #{act}'
-      , 'expected #{this} to not have a length of #{act}'
-      , n
-      , len
-    );
-    }
-
-    Assertion.addChainableMethod('length', assertLength, assertLengthChain);
-    Assertion.addMethod('lengthOf', assertLength);
-
-  /**
-   * ### .match(regexp)
-   *
-   * Asserts that the target matches a regular expression.
-   *
-   *     expect('foobar').to.match(/^foo/);
-   *
-   * @name match
-   * @alias matches
-   * @param {RegExp} RegularExpression
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-    function assertMatch(re, msg) {
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object');
-      this.assert(
-        re.exec(obj)
-      , 'expected #{this} to match ' + re
-      , 'expected #{this} not to match ' + re
-    );
-    }
-
-    Assertion.addMethod('match', assertMatch);
-    Assertion.addMethod('matches', assertMatch);
-
-  /**
-   * ### .string(string)
-   *
-   * Asserts that the string target contains another string.
-   *
-   *     expect('foobar').to.have.string('bar');
-   *
-   * @name string
-   * @param {String} string
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addMethod('string', function (str, msg) {
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object');
-      new Assertion(obj, msg).is.a('string');
-
-      this.assert(
-        ~obj.indexOf(str)
-      , 'expected #{this} to contain ' + _.inspect(str)
-      , 'expected #{this} to not contain ' + _.inspect(str)
-    );
-    });
-
-
-  /**
-   * ### .keys(key1, [key2], [...])
-   *
-   * Asserts that the target contains any or all of the passed-in keys.
-   * Use in combination with `any`, `all`, `contains`, or `have` will affect
-   * what will pass.
-   *
-   * When used in conjunction with `any`, at least one key that is passed
-   * in must exist in the target object. This is regardless whether or not
-   * the `have` or `contain` qualifiers are used. Note, either `any` or `all`
-   * should be used in the assertion. If neither are used, the assertion is
-   * defaulted to `all`.
-   *
-   * When both `all` and `contain` are used, the target object must have at
-   * least all of the passed-in keys but may have more keys not listed.
-   *
-   * When both `all` and `have` are used, the target object must both contain
-   * all of the passed-in keys AND the number of keys in the target object must
-   * match the number of keys passed in (in other words, a target object must
-   * have all and only all of the passed-in keys).
-   *
-   *     expect({ foo: 1, bar: 2 }).to.have.any.keys('foo', 'baz');
-   *     expect({ foo: 1, bar: 2 }).to.have.any.keys('foo');
-   *     expect({ foo: 1, bar: 2 }).to.contain.any.keys('bar', 'baz');
-   *     expect({ foo: 1, bar: 2 }).to.contain.any.keys(['foo']);
-   *     expect({ foo: 1, bar: 2 }).to.contain.any.keys({'foo': 6});
-   *     expect({ foo: 1, bar: 2 }).to.have.all.keys(['bar', 'foo']);
-   *     expect({ foo: 1, bar: 2 }).to.have.all.keys({'bar': 6, 'foo': 7});
-   *     expect({ foo: 1, bar: 2, baz: 3 }).to.contain.all.keys(['bar', 'foo']);
-   *     expect({ foo: 1, bar: 2, baz: 3 }).to.contain.all.keys({'bar': 6});
-   *
-   *
-   * @name keys
-   * @alias key
-   * @param {...String|Array|Object} keys
-   * @namespace BDD
-   * @api public
-   */
-
-    function assertKeys(keys) {
-      var obj = flag(this, 'object')
-      , str
-      , ok = true
-      , mixedArgsMsg = 'keys must be given single argument of Array|Object|String, or multiple String arguments';
-
-      switch (_.type(keys)) {
-        case 'array':
-          if (arguments.length > 1) throw (new Error(mixedArgsMsg));
-          break;
-        case 'object':
-          if (arguments.length > 1) throw (new Error(mixedArgsMsg));
-          keys = Object.keys(keys);
-          break;
-        default:
-          keys = Array.prototype.slice.call(arguments);
-      }
-
-      if (!keys.length) throw new Error('keys required');
-
-      var actual = Object.keys(obj)
-      , expected = keys
-      , len = keys.length
-      , any = flag(this, 'any')
-      , all = flag(this, 'all');
-
-      if (!any && !all) {
-        all = true;
-      }
-
-    // Has any
-      if (any) {
-        var intersection = expected.filter(function (key) {
-          return ~actual.indexOf(key);
-        });
-        ok = intersection.length > 0;
-      }
-
-    // Has all
-      if (all) {
-        ok = keys.every(function (key) {
-          return ~actual.indexOf(key);
-        });
-        if (!flag(this, 'negate') && !flag(this, 'contains')) {
-          ok = ok && keys.length == actual.length;
-        }
-      }
-
-    // Key string
-      if (len > 1) {
-        keys = keys.map(function (key) {
-          return _.inspect(key);
-        });
-        var last = keys.pop();
-        if (all) {
-          str = keys.join(', ') + ', and ' + last;
-        }
-        if (any) {
-          str = keys.join(', ') + ', or ' + last;
-        }
-      } else {
-        str = _.inspect(keys[0]);
-      }
-
-    // Form
-      str = (len > 1 ? 'keys ' : 'key ') + str;
-
-    // Have / include
-      str = (flag(this, 'contains') ? 'contain ' : 'have ') + str;
-
-    // Assertion
-      this.assert(
-        ok
-      , 'expected #{this} to ' + str
-      , 'expected #{this} to not ' + str
-      , expected.slice(0).sort()
-      , actual.sort()
-      , true
-    );
-    }
-
-    Assertion.addMethod('keys', assertKeys);
-    Assertion.addMethod('key', assertKeys);
-
-  /**
-   * ### .throw(constructor)
-   *
-   * Asserts that the function target will throw a specific error, or specific type of error
-   * (as determined using `instanceof`), optionally with a RegExp or string inclusion test
-   * for the error's message.
-   *
-   *     var err = new ReferenceError('This is a bad function.');
-   *     var fn = function () { throw err; }
-   *     expect(fn).to.throw(ReferenceError);
-   *     expect(fn).to.throw(Error);
-   *     expect(fn).to.throw(/bad function/);
-   *     expect(fn).to.not.throw('good function');
-   *     expect(fn).to.throw(ReferenceError, /bad function/);
-   *     expect(fn).to.throw(err);
-   *
-   * Please note that when a throw expectation is negated, it will check each
-   * parameter independently, starting with error constructor type. The appropriate way
-   * to check for the existence of a type of error but for a message that does not match
-   * is to use `and`.
-   *
-   *     expect(fn).to.throw(ReferenceError)
-   *        .and.not.throw(/good function/);
-   *
-   * @name throw
-   * @alias throws
-   * @alias Throw
-   * @param {ErrorConstructor} constructor
-   * @param {String|RegExp} expected error message
-   * @param {String} message _optional_
-   * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
-   * @returns error for chaining (null if no error)
-   * @namespace BDD
-   * @api public
-   */
-
-    function assertThrows(constructor, errMsg, msg) {
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object');
-      new Assertion(obj, msg).is.a('function');
-
-      var thrown = false
-      , desiredError = null
-      , name = null
-      , thrownError = null;
-
-      if (arguments.length === 0) {
-        errMsg = null;
-        constructor = null;
-      } else if (constructor && (constructor instanceof RegExp || 'string' === typeof constructor)) {
-        errMsg = constructor;
-        constructor = null;
-      } else if (constructor && constructor instanceof Error) {
-        desiredError = constructor;
-        constructor = null;
-        errMsg = null;
-      } else if (typeof constructor === 'function') {
-        name = constructor.prototype.name;
-        if (!name || (name === 'Error' && constructor !== Error)) {
-          name = constructor.name || (new constructor()).name;
-        }
-      } else {
-        constructor = null;
-      }
-
-      try {
-        obj();
-      } catch (err) {
-      // first, check desired error
-        if (desiredError) {
-          this.assert(
-            err === desiredError
-          , 'expected #{this} to throw #{exp} but #{act} was thrown'
-          , 'expected #{this} to not throw #{exp}'
-          , (desiredError instanceof Error ? desiredError.toString() : desiredError)
-          , (err instanceof Error ? err.toString() : err)
-        );
-
-          flag(this, 'object', err);
-          return this;
-        }
-
-      // next, check constructor
-        if (constructor) {
-          this.assert(
-            err instanceof constructor
-          , 'expected #{this} to throw #{exp} but #{act} was thrown'
-          , 'expected #{this} to not throw #{exp} but #{act} was thrown'
-          , name
-          , (err instanceof Error ? err.toString() : err)
-        );
-
-          if (!errMsg) {
-            flag(this, 'object', err);
-            return this;
-          }
-        }
-
-      // next, check message
-        var message = 'error' === _.type(err) && 'message' in err
-        ? err.message
-        : '' + err;
-
-        if ((message != null) && errMsg && errMsg instanceof RegExp) {
-          this.assert(
-            errMsg.exec(message)
-          , 'expected #{this} to throw error matching #{exp} but got #{act}'
-          , 'expected #{this} to throw error not matching #{exp}'
-          , errMsg
-          , message
-        );
-
-          flag(this, 'object', err);
-          return this;
-        } else if ((message != null) && errMsg && 'string' === typeof errMsg) {
-          this.assert(
-            ~message.indexOf(errMsg)
-          , 'expected #{this} to throw error including #{exp} but got #{act}'
-          , 'expected #{this} to throw error not including #{act}'
-          , errMsg
-          , message
-        );
-
-          flag(this, 'object', err);
-          return this;
-        } else {
-          thrown = true;
-          thrownError = err;
-        }
-      }
-
-      var actuallyGot = ''
-      , expectedThrown = name !== null
-        ? name
-        : desiredError
-          ? '#{exp}' // _.inspect(desiredError)
-          : 'an error';
-
-      if (thrown) {
-        actuallyGot = ' but #{act} was thrown';
-      }
-
-      this.assert(
-        thrown === true
-      , 'expected #{this} to throw ' + expectedThrown + actuallyGot
-      , 'expected #{this} to not throw ' + expectedThrown + actuallyGot
-      , (desiredError instanceof Error ? desiredError.toString() : desiredError)
-      , (thrownError instanceof Error ? thrownError.toString() : thrownError)
-    );
-
-      flag(this, 'object', thrownError);
-    }
-
-    Assertion.addMethod('throw', assertThrows);
-    Assertion.addMethod('throws', assertThrows);
-    Assertion.addMethod('Throw', assertThrows);
-
-  /**
-   * ### .respondTo(method)
-   *
-   * Asserts that the object or class target will respond to a method.
-   *
-   *     Klass.prototype.bar = function(){};
-   *     expect(Klass).to.respondTo('bar');
-   *     expect(obj).to.respondTo('bar');
-   *
-   * To check if a constructor will respond to a static function,
-   * set the `itself` flag.
-   *
-   *     Klass.baz = function(){};
-   *     expect(Klass).itself.to.respondTo('baz');
-   *
-   * @name respondTo
-   * @alias respondsTo
-   * @param {String} method
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function respondTo(method, msg) {
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object')
-      , itself = flag(this, 'itself')
-      , context = ('function' === _.type(obj) && !itself)
-        ? obj.prototype[method]
-        : obj[method];
-
-      this.assert(
-        'function' === typeof context
-      , 'expected #{this} to respond to ' + _.inspect(method)
-      , 'expected #{this} to not respond to ' + _.inspect(method)
-    );
-    }
-
-    Assertion.addMethod('respondTo', respondTo);
-    Assertion.addMethod('respondsTo', respondTo);
-
-  /**
-   * ### .itself
-   *
-   * Sets the `itself` flag, later used by the `respondTo` assertion.
-   *
-   *     function Foo() {}
-   *     Foo.bar = function() {}
-   *     Foo.prototype.baz = function() {}
-   *
-   *     expect(Foo).itself.to.respondTo('bar');
-   *     expect(Foo).itself.not.to.respondTo('baz');
-   *
-   * @name itself
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addProperty('itself', function () {
-      flag(this, 'itself', true);
-    });
-
-  /**
-   * ### .satisfy(method)
-   *
-   * Asserts that the target passes a given truth test.
-   *
-   *     expect(1).to.satisfy(function(num) { return num > 0; });
-   *
-   * @name satisfy
-   * @alias satisfies
-   * @param {Function} matcher
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function satisfy(matcher, msg) {
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object');
-      var result = matcher(obj);
-      this.assert(
-        result
-      , 'expected #{this} to satisfy ' + _.objDisplay(matcher)
-      , 'expected #{this} to not satisfy' + _.objDisplay(matcher)
-      , this.negate ? false : true
-      , result
-    );
-    }
-
-    Assertion.addMethod('satisfy', satisfy);
-    Assertion.addMethod('satisfies', satisfy);
-
-  /**
-   * ### .closeTo(expected, delta)
-   *
-   * Asserts that the target is equal `expected`, to within a +/- `delta` range.
-   *
-   *     expect(1.5).to.be.closeTo(1, 0.5);
-   *
-   * @name closeTo
-   * @alias approximately
-   * @param {Number} expected
-   * @param {Number} delta
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function closeTo(expected, delta, msg) {
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object');
-
-      new Assertion(obj, msg).is.a('number');
-      if (_.type(expected) !== 'number' || _.type(delta) !== 'number') {
-        throw new Error('the arguments to closeTo or approximately must be numbers');
-      }
-
-      this.assert(
-        Math.abs(obj - expected) <= delta
-      , 'expected #{this} to be close to ' + expected + ' +/- ' + delta
-      , 'expected #{this} not to be close to ' + expected + ' +/- ' + delta
-    );
-    }
-
-    Assertion.addMethod('closeTo', closeTo);
-    Assertion.addMethod('approximately', closeTo);
-
-    function isSubsetOf(subset, superset, cmp) {
-      return subset.every(function (elem) {
-        if (!cmp) return superset.indexOf(elem) !== -1;
-
-        return superset.some(function (elem2) {
-          return cmp(elem, elem2);
-        });
-      });
-    }
-
-  /**
-   * ### .members(set)
-   *
-   * Asserts that the target is a superset of `set`,
-   * or that the target and `set` have the same strictly-equal (===) members.
-   * Alternately, if the `deep` flag is set, set members are compared for deep
-   * equality.
-   *
-   *     expect([1, 2, 3]).to.include.members([3, 2]);
-   *     expect([1, 2, 3]).to.not.include.members([3, 2, 8]);
-   *
-   *     expect([4, 2]).to.have.members([2, 4]);
-   *     expect([5, 2]).to.not.have.members([5, 2, 1]);
-   *
-   *     expect([{ id: 1 }]).to.deep.include.members([{ id: 1 }]);
-   *
-   * @name members
-   * @param {Array} set
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addMethod('members', function (subset, msg) {
-      if (msg) flag(this, 'message', msg);
-      var obj = flag(this, 'object');
-
-      new Assertion(obj).to.be.an('array');
-      new Assertion(subset).to.be.an('array');
-
-      var cmp = flag(this, 'deep') ? _.eql : undefined;
-
-      if (flag(this, 'contains')) {
-        return this.assert(
-          isSubsetOf(subset, obj, cmp)
-        , 'expected #{this} to be a superset of #{act}'
-        , 'expected #{this} to not be a superset of #{act}'
-        , obj
-        , subset
-      );
-      }
-
-      this.assert(
-        isSubsetOf(obj, subset, cmp) && isSubsetOf(subset, obj, cmp)
-        , 'expected #{this} to have the same members as #{act}'
-        , 'expected #{this} to not have the same members as #{act}'
-        , obj
-        , subset
-    );
-    });
-
-  /**
-   * ### .oneOf(list)
-   *
-   * Assert that a value appears somewhere in the top level of array `list`.
-   *
-   *     expect('a').to.be.oneOf(['a', 'b', 'c']);
-   *     expect(9).to.not.be.oneOf(['z']);
-   *     expect([3]).to.not.be.oneOf([1, 2, [3]]);
-   *
-   *     var three = [3];
-   *     // for object-types, contents are not compared
-   *     expect(three).to.not.be.oneOf([1, 2, [3]]);
-   *     // comparing references works
-   *     expect(three).to.be.oneOf([1, 2, three]);
-   *
-   * @name oneOf
-   * @param {Array<*>} list
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function oneOf(list, msg) {
-      if (msg) flag(this, 'message', msg);
-      var expected = flag(this, 'object');
-      new Assertion(list).to.be.an('array');
-
-      this.assert(
-        list.indexOf(expected) > -1
-      , 'expected #{this} to be one of #{exp}'
-      , 'expected #{this} to not be one of #{exp}'
-      , list
-      , expected
-    );
-    }
-
-    Assertion.addMethod('oneOf', oneOf);
-
-
-  /**
-   * ### .change(function)
-   *
-   * Asserts that a function changes an object property
-   *
-   *     var obj = { val: 10 };
-   *     var fn = function() { obj.val += 3 };
-   *     var noChangeFn = function() { return 'foo' + 'bar'; }
-   *     expect(fn).to.change(obj, 'val');
-   *     expect(noChangeFn).to.not.change(obj, 'val')
-   *
-   * @name change
-   * @alias changes
-   * @alias Change
-   * @param {String} object
-   * @param {String} property name
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function assertChanges(object, prop, msg) {
-      if (msg) flag(this, 'message', msg);
-      var fn = flag(this, 'object');
-      new Assertion(object, msg).to.have.property(prop);
-      new Assertion(fn).is.a('function');
-
-      var initial = object[prop];
-      fn();
-
-      this.assert(
-      initial !== object[prop]
-      , 'expected .' + prop + ' to change'
-      , 'expected .' + prop + ' to not change'
-    );
-    }
-
-    Assertion.addChainableMethod('change', assertChanges);
-    Assertion.addChainableMethod('changes', assertChanges);
-
-  /**
-   * ### .increase(function)
-   *
-   * Asserts that a function increases an object property
-   *
-   *     var obj = { val: 10 };
-   *     var fn = function() { obj.val = 15 };
-   *     expect(fn).to.increase(obj, 'val');
-   *
-   * @name increase
-   * @alias increases
-   * @alias Increase
-   * @param {String} object
-   * @param {String} property name
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function assertIncreases(object, prop, msg) {
-      if (msg) flag(this, 'message', msg);
-      var fn = flag(this, 'object');
-      new Assertion(object, msg).to.have.property(prop);
-      new Assertion(fn).is.a('function');
-
-      var initial = object[prop];
-      fn();
-
-      this.assert(
-      object[prop] - initial > 0
-      , 'expected .' + prop + ' to increase'
-      , 'expected .' + prop + ' to not increase'
-    );
-    }
-
-    Assertion.addChainableMethod('increase', assertIncreases);
-    Assertion.addChainableMethod('increases', assertIncreases);
-
-  /**
-   * ### .decrease(function)
-   *
-   * Asserts that a function decreases an object property
-   *
-   *     var obj = { val: 10 };
-   *     var fn = function() { obj.val = 5 };
-   *     expect(fn).to.decrease(obj, 'val');
-   *
-   * @name decrease
-   * @alias decreases
-   * @alias Decrease
-   * @param {String} object
-   * @param {String} property name
-   * @param {String} message _optional_
-   * @namespace BDD
-   * @api public
-   */
-
-    function assertDecreases(object, prop, msg) {
-      if (msg) flag(this, 'message', msg);
-      var fn = flag(this, 'object');
-      new Assertion(object, msg).to.have.property(prop);
-      new Assertion(fn).is.a('function');
-
-      var initial = object[prop];
-      fn();
-
-      this.assert(
-      object[prop] - initial < 0
-      , 'expected .' + prop + ' to decrease'
-      , 'expected .' + prop + ' to not decrease'
-    );
-    }
-
-    Assertion.addChainableMethod('decrease', assertDecreases);
-    Assertion.addChainableMethod('decreases', assertDecreases);
-
-  /**
-   * ### .extensible
-   *
-   * Asserts that the target is extensible (can have new properties added to
-   * it).
-   *
-   *     var nonExtensibleObject = Object.preventExtensions({});
-   *     var sealedObject = Object.seal({});
-   *     var frozenObject = Object.freeze({});
-   *
-   *     expect({}).to.be.extensible;
-   *     expect(nonExtensibleObject).to.not.be.extensible;
-   *     expect(sealedObject).to.not.be.extensible;
-   *     expect(frozenObject).to.not.be.extensible;
-   *
-   * @name extensible
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addProperty('extensible', function () {
-      var obj = flag(this, 'object');
-
-    // In ES5, if the argument to this method is not an object (a primitive), then it will cause a TypeError.
-    // In ES6, a non-object argument will be treated as if it was a non-extensible ordinary object, simply return false.
-    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/isExtensible
-    // The following provides ES6 behavior when a TypeError is thrown under ES5.
-
-      var isExtensible;
-
-      try {
-        isExtensible = Object.isExtensible(obj);
-      } catch (err) {
-        if (err instanceof TypeError) isExtensible = false;
-        else throw err;
-      }
-
-      this.assert(
-      isExtensible
-      , 'expected #{this} to be extensible'
-      , 'expected #{this} to not be extensible'
-    );
-    });
-
-  /**
-   * ### .sealed
-   *
-   * Asserts that the target is sealed (cannot have new properties added to it
-   * and its existing properties cannot be removed).
-   *
-   *     var sealedObject = Object.seal({});
-   *     var frozenObject = Object.freeze({});
-   *
-   *     expect(sealedObject).to.be.sealed;
-   *     expect(frozenObject).to.be.sealed;
-   *     expect({}).to.not.be.sealed;
-   *
-   * @name sealed
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addProperty('sealed', function () {
-      var obj = flag(this, 'object');
-
-    // In ES5, if the argument to this method is not an object (a primitive), then it will cause a TypeError.
-    // In ES6, a non-object argument will be treated as if it was a sealed ordinary object, simply return true.
-    // See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/isSealed
-    // The following provides ES6 behavior when a TypeError is thrown under ES5.
-
-      var isSealed;
-
-      try {
-        isSealed = Object.isSealed(obj);
-      } catch (err) {
-        if (err instanceof TypeError) isSealed = true;
-        else throw err;
-      }
-
-      this.assert(
-      isSealed
-      , 'expected #{this} to be sealed'
-      , 'expected #{this} to not be sealed'
-    );
-    });
-
-  /**
-   * ### .frozen
-   *
-   * Asserts that the target is frozen (cannot have new properties added to it
-   * and its existing properties cannot be modified).
-   *
-   *     var frozenObject = Object.freeze({});
-   *
-   *     expect(frozenObject).to.be.frozen;
-   *     expect({}).to.not.be.frozen;
-   *
-   * @name frozen
-   * @namespace BDD
-   * @api public
-   */
-
-    Assertion.addProperty('frozen', function () {
-      var obj = flag(this, 'object');
-
-    // In ES5, if the argument to this method is not an object (a primitive), then it will cause a TypeError.
-    // In ES6, a non-object argument will be treated as if it was a frozen ordinary object, simply return true.
-    // See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/isFrozen
-    // The following provides ES6 behavior when a TypeError is thrown under ES5.
-
-      var isFrozen;
-
-      try {
-        isFrozen = Object.isFrozen(obj);
-      } catch (err) {
-        if (err instanceof TypeError) isFrozen = true;
-        else throw err;
-      }
-
-      this.assert(
-      isFrozen
-      , 'expected #{this} to be frozen'
-      , 'expected #{this} to not be frozen'
-    );
-    });
-  };
-
-}, {}], 6:[function (require, module, exports) {
-/*!
- * chai
- * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-
-  module.exports = function (chai, util) {
-
-  /*!
-   * Chai dependencies.
-   */
-
-    var Assertion = chai.Assertion
-    , flag = util.flag;
-
-  /*!
-   * Module export.
-   */
-
-  /**
-   * ### assert(expression, message)
-   *
-   * Write your own test expressions.
-   *
-   *     assert('foo' !== 'bar', 'foo is not bar');
-   *     assert(Array.isArray([]), 'empty arrays are arrays');
-   *
-   * @param {Mixed} expression to test for truthiness
-   * @param {String} message to display on error
-   * @name assert
-   * @namespace Assert
-   * @api public
-   */
-
-    var assert = chai.assert = function (express, errmsg) {
-      var test = new Assertion(null, null, chai.assert);
-      test.assert(
-        express
-      , errmsg
-      , '[ negation message unavailable ]'
-    );
-    };
-
-  /**
-   * ### .fail(actual, expected, [message], [operator])
-   *
-   * Throw a failure. Node.js `assert` module-compatible.
-   *
-   * @name fail
-   * @param {Mixed} actual
-   * @param {Mixed} expected
-   * @param {String} message
-   * @param {String} operator
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.fail = function (actual, expected, message, operator) {
-      message = message || 'assert.fail()';
-      throw new chai.AssertionError(message, {
-        actual: actual
-      , expected: expected
-      , operator: operator
-      }, assert.fail);
-    };
-
-  /**
-   * ### .isOk(object, [message])
-   *
-   * Asserts that `object` is truthy.
-   *
-   *     assert.isOk('everything', 'everything is ok');
-   *     assert.isOk(false, 'this will fail');
-   *
-   * @name isOk
-   * @alias ok
-   * @param {Mixed} object to test
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isOk = function (val, msg) {
-      new Assertion(val, msg).is.ok;
-    };
-
-  /**
-   * ### .isNotOk(object, [message])
-   *
-   * Asserts that `object` is falsy.
-   *
-   *     assert.isNotOk('everything', 'this will fail');
-   *     assert.isNotOk(false, 'this will pass');
-   *
-   * @name isNotOk
-   * @alias notOk
-   * @param {Mixed} object to test
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isNotOk = function (val, msg) {
-      new Assertion(val, msg).is.not.ok;
-    };
-
-  /**
-   * ### .equal(actual, expected, [message])
-   *
-   * Asserts non-strict equality (`==`) of `actual` and `expected`.
-   *
-   *     assert.equal(3, '3', '== coerces values to strings');
-   *
-   * @name equal
-   * @param {Mixed} actual
-   * @param {Mixed} expected
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.equal = function (act, exp, msg) {
-      var test = new Assertion(act, msg, assert.equal);
-
-      test.assert(
-        exp == flag(test, 'object')
-      , 'expected #{this} to equal #{exp}'
-      , 'expected #{this} to not equal #{act}'
-      , exp
-      , act
-    );
-    };
-
-  /**
-   * ### .notEqual(actual, expected, [message])
-   *
-   * Asserts non-strict inequality (`!=`) of `actual` and `expected`.
-   *
-   *     assert.notEqual(3, 4, 'these numbers are not equal');
-   *
-   * @name notEqual
-   * @param {Mixed} actual
-   * @param {Mixed} expected
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.notEqual = function (act, exp, msg) {
-      var test = new Assertion(act, msg, assert.notEqual);
-
-      test.assert(
-        exp != flag(test, 'object')
-      , 'expected #{this} to not equal #{exp}'
-      , 'expected #{this} to equal #{act}'
-      , exp
-      , act
-    );
-    };
-
-  /**
-   * ### .strictEqual(actual, expected, [message])
-   *
-   * Asserts strict equality (`===`) of `actual` and `expected`.
-   *
-   *     assert.strictEqual(true, true, 'these booleans are strictly equal');
-   *
-   * @name strictEqual
-   * @param {Mixed} actual
-   * @param {Mixed} expected
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.strictEqual = function (act, exp, msg) {
-      new Assertion(act, msg).to.equal(exp);
-    };
-
-  /**
-   * ### .notStrictEqual(actual, expected, [message])
-   *
-   * Asserts strict inequality (`!==`) of `actual` and `expected`.
-   *
-   *     assert.notStrictEqual(3, '3', 'no coercion for strict equality');
-   *
-   * @name notStrictEqual
-   * @param {Mixed} actual
-   * @param {Mixed} expected
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.notStrictEqual = function (act, exp, msg) {
-      new Assertion(act, msg).to.not.equal(exp);
-    };
-
-  /**
-   * ### .deepEqual(actual, expected, [message])
-   *
-   * Asserts that `actual` is deeply equal to `expected`.
-   *
-   *     assert.deepEqual({ tea: 'green' }, { tea: 'green' });
-   *
-   * @name deepEqual
-   * @param {Mixed} actual
-   * @param {Mixed} expected
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.deepEqual = function (act, exp, msg) {
-      new Assertion(act, msg).to.eql(exp);
-    };
-
-  /**
-   * ### .notDeepEqual(actual, expected, [message])
-   *
-   * Assert that `actual` is not deeply equal to `expected`.
-   *
-   *     assert.notDeepEqual({ tea: 'green' }, { tea: 'jasmine' });
-   *
-   * @name notDeepEqual
-   * @param {Mixed} actual
-   * @param {Mixed} expected
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.notDeepEqual = function (act, exp, msg) {
-      new Assertion(act, msg).to.not.eql(exp);
-    };
-
-   /**
-   * ### .isAbove(valueToCheck, valueToBeAbove, [message])
-   *
-   * Asserts `valueToCheck` is strictly greater than (>) `valueToBeAbove`
-   *
-   *     assert.isAbove(5, 2, '5 is strictly greater than 2');
-   *
-   * @name isAbove
-   * @param {Mixed} valueToCheck
-   * @param {Mixed} valueToBeAbove
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isAbove = function (val, abv, msg) {
-      new Assertion(val, msg).to.be.above(abv);
-    };
-
-   /**
-   * ### .isAtLeast(valueToCheck, valueToBeAtLeast, [message])
-   *
-   * Asserts `valueToCheck` is greater than or equal to (>=) `valueToBeAtLeast`
-   *
-   *     assert.isAtLeast(5, 2, '5 is greater or equal to 2');
-   *     assert.isAtLeast(3, 3, '3 is greater or equal to 3');
-   *
-   * @name isAtLeast
-   * @param {Mixed} valueToCheck
-   * @param {Mixed} valueToBeAtLeast
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isAtLeast = function (val, atlst, msg) {
-      new Assertion(val, msg).to.be.least(atlst);
-    };
-
-   /**
-   * ### .isBelow(valueToCheck, valueToBeBelow, [message])
-   *
-   * Asserts `valueToCheck` is strictly less than (<) `valueToBeBelow`
-   *
-   *     assert.isBelow(3, 6, '3 is strictly less than 6');
-   *
-   * @name isBelow
-   * @param {Mixed} valueToCheck
-   * @param {Mixed} valueToBeBelow
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isBelow = function (val, blw, msg) {
-      new Assertion(val, msg).to.be.below(blw);
-    };
-
-   /**
-   * ### .isAtMost(valueToCheck, valueToBeAtMost, [message])
-   *
-   * Asserts `valueToCheck` is less than or equal to (<=) `valueToBeAtMost`
-   *
-   *     assert.isAtMost(3, 6, '3 is less than or equal to 6');
-   *     assert.isAtMost(4, 4, '4 is less than or equal to 4');
-   *
-   * @name isAtMost
-   * @param {Mixed} valueToCheck
-   * @param {Mixed} valueToBeAtMost
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isAtMost = function (val, atmst, msg) {
-      new Assertion(val, msg).to.be.most(atmst);
-    };
-
-  /**
-   * ### .isTrue(value, [message])
-   *
-   * Asserts that `value` is true.
-   *
-   *     var teaServed = true;
-   *     assert.isTrue(teaServed, 'the tea has been served');
-   *
-   * @name isTrue
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isTrue = function (val, msg) {
-      new Assertion(val, msg).is['true'];
-    };
-
-  /**
-   * ### .isNotTrue(value, [message])
-   *
-   * Asserts that `value` is not true.
-   *
-   *     var tea = 'tasty chai';
-   *     assert.isNotTrue(tea, 'great, time for tea!');
-   *
-   * @name isNotTrue
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isNotTrue = function (val, msg) {
-      new Assertion(val, msg).to.not.equal(true);
-    };
-
-  /**
-   * ### .isFalse(value, [message])
-   *
-   * Asserts that `value` is false.
-   *
-   *     var teaServed = false;
-   *     assert.isFalse(teaServed, 'no tea yet? hmm...');
-   *
-   * @name isFalse
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isFalse = function (val, msg) {
-      new Assertion(val, msg).is['false'];
-    };
-
-  /**
-   * ### .isNotFalse(value, [message])
-   *
-   * Asserts that `value` is not false.
-   *
-   *     var tea = 'tasty chai';
-   *     assert.isNotFalse(tea, 'great, time for tea!');
-   *
-   * @name isNotFalse
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isNotFalse = function (val, msg) {
-      new Assertion(val, msg).to.not.equal(false);
-    };
-
-  /**
-   * ### .isNull(value, [message])
-   *
-   * Asserts that `value` is null.
-   *
-   *     assert.isNull(err, 'there was no error');
-   *
-   * @name isNull
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isNull = function (val, msg) {
-      new Assertion(val, msg).to.equal(null);
-    };
-
-  /**
-   * ### .isNotNull(value, [message])
-   *
-   * Asserts that `value` is not null.
-   *
-   *     var tea = 'tasty chai';
-   *     assert.isNotNull(tea, 'great, time for tea!');
-   *
-   * @name isNotNull
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isNotNull = function (val, msg) {
-      new Assertion(val, msg).to.not.equal(null);
-    };
-
-  /**
-   * ### .isNaN
-   * Asserts that value is NaN
-   *
-   *    assert.isNaN('foo', 'foo is NaN');
-   *
-   * @name isNaN
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isNaN = function (val, msg) {
-      new Assertion(val, msg).to.be.NaN;
-    };
-
-  /**
-   * ### .isNotNaN
-   * Asserts that value is not NaN
-   *
-   *    assert.isNotNaN(4, '4 is not NaN');
-   *
-   * @name isNotNaN
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-    assert.isNotNaN = function (val, msg) {
-      new Assertion(val, msg).not.to.be.NaN;
-    };
-
-  /**
-   * ### .isUndefined(value, [message])
-   *
-   * Asserts that `value` is `undefined`.
-   *
-   *     var tea;
-   *     assert.isUndefined(tea, 'no tea defined');
-   *
-   * @name isUndefined
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isUndefined = function (val, msg) {
-      new Assertion(val, msg).to.equal(undefined);
-    };
-
-  /**
-   * ### .isDefined(value, [message])
-   *
-   * Asserts that `value` is not `undefined`.
-   *
-   *     var tea = 'cup of chai';
-   *     assert.isDefined(tea, 'tea has been defined');
-   *
-   * @name isDefined
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isDefined = function (val, msg) {
-      new Assertion(val, msg).to.not.equal(undefined);
-    };
-
-  /**
-   * ### .isFunction(value, [message])
-   *
-   * Asserts that `value` is a function.
-   *
-   *     function serveTea() { return 'cup of tea'; };
-   *     assert.isFunction(serveTea, 'great, we can have tea now');
-   *
-   * @name isFunction
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isFunction = function (val, msg) {
-      new Assertion(val, msg).to.be.a('function');
-    };
-
-  /**
-   * ### .isNotFunction(value, [message])
-   *
-   * Asserts that `value` is _not_ a function.
-   *
-   *     var serveTea = [ 'heat', 'pour', 'sip' ];
-   *     assert.isNotFunction(serveTea, 'great, we have listed the steps');
-   *
-   * @name isNotFunction
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isNotFunction = function (val, msg) {
-      new Assertion(val, msg).to.not.be.a('function');
-    };
-
-  /**
-   * ### .isObject(value, [message])
-   *
-   * Asserts that `value` is an object of type 'Object' (as revealed by `Object.prototype.toString`).
-   * _The assertion does not match subclassed objects._
-   *
-   *     var selection = { name: 'Chai', serve: 'with spices' };
-   *     assert.isObject(selection, 'tea selection is an object');
-   *
-   * @name isObject
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isObject = function (val, msg) {
-      new Assertion(val, msg).to.be.a('object');
-    };
-
-  /**
-   * ### .isNotObject(value, [message])
-   *
-   * Asserts that `value` is _not_ an object of type 'Object' (as revealed by `Object.prototype.toString`).
-   *
-   *     var selection = 'chai'
-   *     assert.isNotObject(selection, 'tea selection is not an object');
-   *     assert.isNotObject(null, 'null is not an object');
-   *
-   * @name isNotObject
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isNotObject = function (val, msg) {
-      new Assertion(val, msg).to.not.be.a('object');
-    };
-
-  /**
-   * ### .isArray(value, [message])
-   *
-   * Asserts that `value` is an array.
-   *
-   *     var menu = [ 'green', 'chai', 'oolong' ];
-   *     assert.isArray(menu, 'what kind of tea do we want?');
-   *
-   * @name isArray
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isArray = function (val, msg) {
-      new Assertion(val, msg).to.be.an('array');
-    };
-
-  /**
-   * ### .isNotArray(value, [message])
-   *
-   * Asserts that `value` is _not_ an array.
-   *
-   *     var menu = 'green|chai|oolong';
-   *     assert.isNotArray(menu, 'what kind of tea do we want?');
-   *
-   * @name isNotArray
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isNotArray = function (val, msg) {
-      new Assertion(val, msg).to.not.be.an('array');
-    };
-
-  /**
-   * ### .isString(value, [message])
-   *
-   * Asserts that `value` is a string.
-   *
-   *     var teaOrder = 'chai';
-   *     assert.isString(teaOrder, 'order placed');
-   *
-   * @name isString
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isString = function (val, msg) {
-      new Assertion(val, msg).to.be.a('string');
-    };
-
-  /**
-   * ### .isNotString(value, [message])
-   *
-   * Asserts that `value` is _not_ a string.
-   *
-   *     var teaOrder = 4;
-   *     assert.isNotString(teaOrder, 'order placed');
-   *
-   * @name isNotString
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isNotString = function (val, msg) {
-      new Assertion(val, msg).to.not.be.a('string');
-    };
-
-  /**
-   * ### .isNumber(value, [message])
-   *
-   * Asserts that `value` is a number.
-   *
-   *     var cups = 2;
-   *     assert.isNumber(cups, 'how many cups');
-   *
-   * @name isNumber
-   * @param {Number} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isNumber = function (val, msg) {
-      new Assertion(val, msg).to.be.a('number');
-    };
-
-  /**
-   * ### .isNotNumber(value, [message])
-   *
-   * Asserts that `value` is _not_ a number.
-   *
-   *     var cups = '2 cups please';
-   *     assert.isNotNumber(cups, 'how many cups');
-   *
-   * @name isNotNumber
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isNotNumber = function (val, msg) {
-      new Assertion(val, msg).to.not.be.a('number');
-    };
-
-  /**
-   * ### .isBoolean(value, [message])
-   *
-   * Asserts that `value` is a boolean.
-   *
-   *     var teaReady = true
-   *       , teaServed = false;
-   *
-   *     assert.isBoolean(teaReady, 'is the tea ready');
-   *     assert.isBoolean(teaServed, 'has tea been served');
-   *
-   * @name isBoolean
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isBoolean = function (val, msg) {
-      new Assertion(val, msg).to.be.a('boolean');
-    };
-
-  /**
-   * ### .isNotBoolean(value, [message])
-   *
-   * Asserts that `value` is _not_ a boolean.
-   *
-   *     var teaReady = 'yep'
-   *       , teaServed = 'nope';
-   *
-   *     assert.isNotBoolean(teaReady, 'is the tea ready');
-   *     assert.isNotBoolean(teaServed, 'has tea been served');
-   *
-   * @name isNotBoolean
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isNotBoolean = function (val, msg) {
-      new Assertion(val, msg).to.not.be.a('boolean');
-    };
-
-  /**
-   * ### .typeOf(value, name, [message])
-   *
-   * Asserts that `value`'s type is `name`, as determined by
-   * `Object.prototype.toString`.
-   *
-   *     assert.typeOf({ tea: 'chai' }, 'object', 'we have an object');
-   *     assert.typeOf(['chai', 'jasmine'], 'array', 'we have an array');
-   *     assert.typeOf('tea', 'string', 'we have a string');
-   *     assert.typeOf(/tea/, 'regexp', 'we have a regular expression');
-   *     assert.typeOf(null, 'null', 'we have a null');
-   *     assert.typeOf(undefined, 'undefined', 'we have an undefined');
-   *
-   * @name typeOf
-   * @param {Mixed} value
-   * @param {String} name
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.typeOf = function (val, type, msg) {
-      new Assertion(val, msg).to.be.a(type);
-    };
-
-  /**
-   * ### .notTypeOf(value, name, [message])
-   *
-   * Asserts that `value`'s type is _not_ `name`, as determined by
-   * `Object.prototype.toString`.
-   *
-   *     assert.notTypeOf('tea', 'number', 'strings are not numbers');
-   *
-   * @name notTypeOf
-   * @param {Mixed} value
-   * @param {String} typeof name
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.notTypeOf = function (val, type, msg) {
-      new Assertion(val, msg).to.not.be.a(type);
-    };
-
-  /**
-   * ### .instanceOf(object, constructor, [message])
-   *
-   * Asserts that `value` is an instance of `constructor`.
-   *
-   *     var Tea = function (name) { this.name = name; }
-   *       , chai = new Tea('chai');
-   *
-   *     assert.instanceOf(chai, Tea, 'chai is an instance of tea');
-   *
-   * @name instanceOf
-   * @param {Object} object
-   * @param {Constructor} constructor
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.instanceOf = function (val, type, msg) {
-      new Assertion(val, msg).to.be.instanceOf(type);
-    };
-
-  /**
-   * ### .notInstanceOf(object, constructor, [message])
-   *
-   * Asserts `value` is not an instance of `constructor`.
-   *
-   *     var Tea = function (name) { this.name = name; }
-   *       , chai = new String('chai');
-   *
-   *     assert.notInstanceOf(chai, Tea, 'chai is not an instance of tea');
-   *
-   * @name notInstanceOf
-   * @param {Object} object
-   * @param {Constructor} constructor
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.notInstanceOf = function (val, type, msg) {
-      new Assertion(val, msg).to.not.be.instanceOf(type);
-    };
-
-  /**
-   * ### .include(haystack, needle, [message])
-   *
-   * Asserts that `haystack` includes `needle`. Works
-   * for strings and arrays.
-   *
-   *     assert.include('foobar', 'bar', 'foobar contains string "bar"');
-   *     assert.include([ 1, 2, 3 ], 3, 'array contains value');
-   *
-   * @name include
-   * @param {Array|String} haystack
-   * @param {Mixed} needle
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.include = function (exp, inc, msg) {
-      new Assertion(exp, msg, assert.include).include(inc);
-    };
-
-  /**
-   * ### .notInclude(haystack, needle, [message])
-   *
-   * Asserts that `haystack` does not include `needle`. Works
-   * for strings and arrays.
-   *
-   *     assert.notInclude('foobar', 'baz', 'string not include substring');
-   *     assert.notInclude([ 1, 2, 3 ], 4, 'array not include contain value');
-   *
-   * @name notInclude
-   * @param {Array|String} haystack
-   * @param {Mixed} needle
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.notInclude = function (exp, inc, msg) {
-      new Assertion(exp, msg, assert.notInclude).not.include(inc);
-    };
-
-  /**
-   * ### .match(value, regexp, [message])
-   *
-   * Asserts that `value` matches the regular expression `regexp`.
-   *
-   *     assert.match('foobar', /^foo/, 'regexp matches');
-   *
-   * @name match
-   * @param {Mixed} value
-   * @param {RegExp} regexp
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.match = function (exp, re, msg) {
-      new Assertion(exp, msg).to.match(re);
-    };
-
-  /**
-   * ### .notMatch(value, regexp, [message])
-   *
-   * Asserts that `value` does not match the regular expression `regexp`.
-   *
-   *     assert.notMatch('foobar', /^foo/, 'regexp does not match');
-   *
-   * @name notMatch
-   * @param {Mixed} value
-   * @param {RegExp} regexp
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.notMatch = function (exp, re, msg) {
-      new Assertion(exp, msg).to.not.match(re);
-    };
-
-  /**
-   * ### .property(object, property, [message])
-   *
-   * Asserts that `object` has a property named by `property`.
-   *
-   *     assert.property({ tea: { green: 'matcha' }}, 'tea');
-   *
-   * @name property
-   * @param {Object} object
-   * @param {String} property
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.property = function (obj, prop, msg) {
-      new Assertion(obj, msg).to.have.property(prop);
-    };
-
-  /**
-   * ### .notProperty(object, property, [message])
-   *
-   * Asserts that `object` does _not_ have a property named by `property`.
-   *
-   *     assert.notProperty({ tea: { green: 'matcha' }}, 'coffee');
-   *
-   * @name notProperty
-   * @param {Object} object
-   * @param {String} property
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.notProperty = function (obj, prop, msg) {
-      new Assertion(obj, msg).to.not.have.property(prop);
-    };
-
-  /**
-   * ### .deepProperty(object, property, [message])
-   *
-   * Asserts that `object` has a property named by `property`, which can be a
-   * string using dot- and bracket-notation for deep reference.
-   *
-   *     assert.deepProperty({ tea: { green: 'matcha' }}, 'tea.green');
-   *
-   * @name deepProperty
-   * @param {Object} object
-   * @param {String} property
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.deepProperty = function (obj, prop, msg) {
-      new Assertion(obj, msg).to.have.deep.property(prop);
-    };
-
-  /**
-   * ### .notDeepProperty(object, property, [message])
-   *
-   * Asserts that `object` does _not_ have a property named by `property`, which
-   * can be a string using dot- and bracket-notation for deep reference.
-   *
-   *     assert.notDeepProperty({ tea: { green: 'matcha' }}, 'tea.oolong');
-   *
-   * @name notDeepProperty
-   * @param {Object} object
-   * @param {String} property
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.notDeepProperty = function (obj, prop, msg) {
-      new Assertion(obj, msg).to.not.have.deep.property(prop);
-    };
-
-  /**
-   * ### .propertyVal(object, property, value, [message])
-   *
-   * Asserts that `object` has a property named by `property` with value given
-   * by `value`.
-   *
-   *     assert.propertyVal({ tea: 'is good' }, 'tea', 'is good');
-   *
-   * @name propertyVal
-   * @param {Object} object
-   * @param {String} property
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.propertyVal = function (obj, prop, val, msg) {
-      new Assertion(obj, msg).to.have.property(prop, val);
-    };
-
-  /**
-   * ### .propertyNotVal(object, property, value, [message])
-   *
-   * Asserts that `object` has a property named by `property`, but with a value
-   * different from that given by `value`.
-   *
-   *     assert.propertyNotVal({ tea: 'is good' }, 'tea', 'is bad');
-   *
-   * @name propertyNotVal
-   * @param {Object} object
-   * @param {String} property
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.propertyNotVal = function (obj, prop, val, msg) {
-      new Assertion(obj, msg).to.not.have.property(prop, val);
-    };
-
-  /**
-   * ### .deepPropertyVal(object, property, value, [message])
-   *
-   * Asserts that `object` has a property named by `property` with value given
-   * by `value`. `property` can use dot- and bracket-notation for deep
-   * reference.
-   *
-   *     assert.deepPropertyVal({ tea: { green: 'matcha' }}, 'tea.green', 'matcha');
-   *
-   * @name deepPropertyVal
-   * @param {Object} object
-   * @param {String} property
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.deepPropertyVal = function (obj, prop, val, msg) {
-      new Assertion(obj, msg).to.have.deep.property(prop, val);
-    };
-
-  /**
-   * ### .deepPropertyNotVal(object, property, value, [message])
-   *
-   * Asserts that `object` has a property named by `property`, but with a value
-   * different from that given by `value`. `property` can use dot- and
-   * bracket-notation for deep reference.
-   *
-   *     assert.deepPropertyNotVal({ tea: { green: 'matcha' }}, 'tea.green', 'konacha');
-   *
-   * @name deepPropertyNotVal
-   * @param {Object} object
-   * @param {String} property
-   * @param {Mixed} value
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.deepPropertyNotVal = function (obj, prop, val, msg) {
-      new Assertion(obj, msg).to.not.have.deep.property(prop, val);
-    };
-
-  /**
-   * ### .lengthOf(object, length, [message])
-   *
-   * Asserts that `object` has a `length` property with the expected value.
-   *
-   *     assert.lengthOf([1,2,3], 3, 'array has length of 3');
-   *     assert.lengthOf('foobar', 6, 'string has length of 6');
-   *
-   * @name lengthOf
-   * @param {Mixed} object
-   * @param {Number} length
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.lengthOf = function (exp, len, msg) {
-      new Assertion(exp, msg).to.have.length(len);
-    };
-
-  /**
-   * ### .throws(function, [constructor/string/regexp], [string/regexp], [message])
-   *
-   * Asserts that `function` will throw an error that is an instance of
-   * `constructor`, or alternately that it will throw an error with message
-   * matching `regexp`.
-   *
-   *     assert.throws(fn, 'function throws a reference error');
-   *     assert.throws(fn, /function throws a reference error/);
-   *     assert.throws(fn, ReferenceError);
-   *     assert.throws(fn, ReferenceError, 'function throws a reference error');
-   *     assert.throws(fn, ReferenceError, /function throws a reference error/);
-   *
-   * @name throws
-   * @alias throw
-   * @alias Throw
-   * @param {Function} function
-   * @param {ErrorConstructor} constructor
-   * @param {RegExp} regexp
-   * @param {String} message
-   * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.throws = function (fn, errt, errs, msg) {
-      if ('string' === typeof errt || errt instanceof RegExp) {
-        errs = errt;
-        errt = null;
-      }
-
-      var assertErr = new Assertion(fn, msg).to.throw(errt, errs);
-      return flag(assertErr, 'object');
-    };
-
-  /**
-   * ### .doesNotThrow(function, [constructor/regexp], [message])
-   *
-   * Asserts that `function` will _not_ throw an error that is an instance of
-   * `constructor`, or alternately that it will not throw an error with message
-   * matching `regexp`.
-   *
-   *     assert.doesNotThrow(fn, Error, 'function does not throw');
-   *
-   * @name doesNotThrow
-   * @param {Function} function
-   * @param {ErrorConstructor} constructor
-   * @param {RegExp} regexp
-   * @param {String} message
-   * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.doesNotThrow = function (fn, type, msg) {
-      if ('string' === typeof type) {
-        msg = type;
-        type = null;
-      }
-
-      new Assertion(fn, msg).to.not.Throw(type);
-    };
-
-  /**
-   * ### .operator(val1, operator, val2, [message])
-   *
-   * Compares two values using `operator`.
-   *
-   *     assert.operator(1, '<', 2, 'everything is ok');
-   *     assert.operator(1, '>', 2, 'this will fail');
-   *
-   * @name operator
-   * @param {Mixed} val1
-   * @param {String} operator
-   * @param {Mixed} val2
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.operator = function (val, operator, val2, msg) {
-      var ok;
-      switch (operator) {
-        case '==':
-          ok = val == val2;
-          break;
-        case '===':
-          ok = val === val2;
-          break;
-        case '>':
-          ok = val > val2;
-          break;
-        case '>=':
-          ok = val >= val2;
-          break;
-        case '<':
-          ok = val < val2;
-          break;
-        case '<=':
-          ok = val <= val2;
-          break;
-        case '!=':
-          ok = val != val2;
-          break;
-        case '!==':
-          ok = val !== val2;
-          break;
-        default:
-          throw new Error('Invalid operator "' + operator + '"');
-      }
-      var test = new Assertion(ok, msg);
-      test.assert(
-        true === flag(test, 'object')
-      , 'expected ' + util.inspect(val) + ' to be ' + operator + ' ' + util.inspect(val2)
-      , 'expected ' + util.inspect(val) + ' to not be ' + operator + ' ' + util.inspect(val2));
-    };
-
-  /**
-   * ### .closeTo(actual, expected, delta, [message])
-   *
-   * Asserts that the target is equal `expected`, to within a +/- `delta` range.
-   *
-   *     assert.closeTo(1.5, 1, 0.5, 'numbers are close');
-   *
-   * @name closeTo
-   * @param {Number} actual
-   * @param {Number} expected
-   * @param {Number} delta
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.closeTo = function (act, exp, delta, msg) {
-      new Assertion(act, msg).to.be.closeTo(exp, delta);
-    };
-
-  /**
-   * ### .approximately(actual, expected, delta, [message])
-   *
-   * Asserts that the target is equal `expected`, to within a +/- `delta` range.
-   *
-   *     assert.approximately(1.5, 1, 0.5, 'numbers are close');
-   *
-   * @name approximately
-   * @param {Number} actual
-   * @param {Number} expected
-   * @param {Number} delta
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.approximately = function (act, exp, delta, msg) {
-      new Assertion(act, msg).to.be.approximately(exp, delta);
-    };
-
-  /**
-   * ### .sameMembers(set1, set2, [message])
-   *
-   * Asserts that `set1` and `set2` have the same members.
-   * Order is not taken into account.
-   *
-   *     assert.sameMembers([ 1, 2, 3 ], [ 2, 1, 3 ], 'same members');
-   *
-   * @name sameMembers
-   * @param {Array} set1
-   * @param {Array} set2
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.sameMembers = function (set1, set2, msg) {
-      new Assertion(set1, msg).to.have.same.members(set2);
-    };
-
-  /**
-   * ### .sameDeepMembers(set1, set2, [message])
-   *
-   * Asserts that `set1` and `set2` have the same members - using a deep equality checking.
-   * Order is not taken into account.
-   *
-   *     assert.sameDeepMembers([ {b: 3}, {a: 2}, {c: 5} ], [ {c: 5}, {b: 3}, {a: 2} ], 'same deep members');
-   *
-   * @name sameDeepMembers
-   * @param {Array} set1
-   * @param {Array} set2
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.sameDeepMembers = function (set1, set2, msg) {
-      new Assertion(set1, msg).to.have.same.deep.members(set2);
-    };
-
-  /**
-   * ### .includeMembers(superset, subset, [message])
-   *
-   * Asserts that `subset` is included in `superset`.
-   * Order is not taken into account.
-   *
-   *     assert.includeMembers([ 1, 2, 3 ], [ 2, 1 ], 'include members');
-   *
-   * @name includeMembers
-   * @param {Array} superset
-   * @param {Array} subset
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.includeMembers = function (superset, subset, msg) {
-      new Assertion(superset, msg).to.include.members(subset);
-    };
-
-  /**
-   * ### .includeDeepMembers(superset, subset, [message])
-   *
-   * Asserts that `subset` is included in `superset` - using deep equality checking.
-   * Order is not taken into account.
-   * Duplicates are ignored.
-   *
-   *     assert.includeDeepMembers([ {a: 1}, {b: 2}, {c: 3} ], [ {b: 2}, {a: 1}, {b: 2} ], 'include deep members');
-   *
-   * @name includeDeepMembers
-   * @param {Array} superset
-   * @param {Array} subset
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.includeDeepMembers = function (superset, subset, msg) {
-      new Assertion(superset, msg).to.include.deep.members(subset);
-    };
-
-  /**
-   * ### .oneOf(inList, list, [message])
-   *
-   * Asserts that non-object, non-array value `inList` appears in the flat array `list`.
-   *
-   *     assert.oneOf(1, [ 2, 1 ], 'Not found in list');
-   *
-   * @name oneOf
-   * @param {*} inList
-   * @param {Array<*>} list
-   * @param {String} message
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.oneOf = function (inList, list, msg) {
-      new Assertion(inList, msg).to.be.oneOf(list);
-    };
-
-   /**
-   * ### .changes(function, object, property)
-   *
-   * Asserts that a function changes the value of a property
-   *
-   *     var obj = { val: 10 };
-   *     var fn = function() { obj.val = 22 };
-   *     assert.changes(fn, obj, 'val');
-   *
-   * @name changes
-   * @param {Function} modifier function
-   * @param {Object} object
-   * @param {String} property name
-   * @param {String} message _optional_
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.changes = function (fn, obj, prop) {
-      new Assertion(fn).to.change(obj, prop);
-    };
-
-   /**
-   * ### .doesNotChange(function, object, property)
-   *
-   * Asserts that a function does not changes the value of a property
-   *
-   *     var obj = { val: 10 };
-   *     var fn = function() { console.log('foo'); };
-   *     assert.doesNotChange(fn, obj, 'val');
-   *
-   * @name doesNotChange
-   * @param {Function} modifier function
-   * @param {Object} object
-   * @param {String} property name
-   * @param {String} message _optional_
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.doesNotChange = function (fn, obj, prop) {
-      new Assertion(fn).to.not.change(obj, prop);
-    };
-
-   /**
-   * ### .increases(function, object, property)
-   *
-   * Asserts that a function increases an object property
-   *
-   *     var obj = { val: 10 };
-   *     var fn = function() { obj.val = 13 };
-   *     assert.increases(fn, obj, 'val');
-   *
-   * @name increases
-   * @param {Function} modifier function
-   * @param {Object} object
-   * @param {String} property name
-   * @param {String} message _optional_
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.increases = function (fn, obj, prop) {
-      new Assertion(fn).to.increase(obj, prop);
-    };
-
-   /**
-   * ### .doesNotIncrease(function, object, property)
-   *
-   * Asserts that a function does not increase object property
-   *
-   *     var obj = { val: 10 };
-   *     var fn = function() { obj.val = 8 };
-   *     assert.doesNotIncrease(fn, obj, 'val');
-   *
-   * @name doesNotIncrease
-   * @param {Function} modifier function
-   * @param {Object} object
-   * @param {String} property name
-   * @param {String} message _optional_
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.doesNotIncrease = function (fn, obj, prop) {
-      new Assertion(fn).to.not.increase(obj, prop);
-    };
-
-   /**
-   * ### .decreases(function, object, property)
-   *
-   * Asserts that a function decreases an object property
-   *
-   *     var obj = { val: 10 };
-   *     var fn = function() { obj.val = 5 };
-   *     assert.decreases(fn, obj, 'val');
-   *
-   * @name decreases
-   * @param {Function} modifier function
-   * @param {Object} object
-   * @param {String} property name
-   * @param {String} message _optional_
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.decreases = function (fn, obj, prop) {
-      new Assertion(fn).to.decrease(obj, prop);
-    };
-
-   /**
-   * ### .doesNotDecrease(function, object, property)
-   *
-   * Asserts that a function does not decreases an object property
-   *
-   *     var obj = { val: 10 };
-   *     var fn = function() { obj.val = 15 };
-   *     assert.doesNotDecrease(fn, obj, 'val');
-   *
-   * @name doesNotDecrease
-   * @param {Function} modifier function
-   * @param {Object} object
-   * @param {String} property name
-   * @param {String} message _optional_
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.doesNotDecrease = function (fn, obj, prop) {
-      new Assertion(fn).to.not.decrease(obj, prop);
-    };
-
-  /*!
-   * ### .ifError(object)
-   *
-   * Asserts if value is not a false value, and throws if it is a true value.
-   * This is added to allow for chai to be a drop-in replacement for Node's
-   * assert class.
-   *
-   *     var err = new Error('I am a custom error');
-   *     assert.ifError(err); // Rethrows err!
-   *
-   * @name ifError
-   * @param {Object} object
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.ifError = function (val) {
-      if (val) {
-        throw (val);
-      }
-    };
-
-  /**
-   * ### .isExtensible(object)
-   *
-   * Asserts that `object` is extensible (can have new properties added to it).
-   *
-   *     assert.isExtensible({});
-   *
-   * @name isExtensible
-   * @alias extensible
-   * @param {Object} object
-   * @param {String} message _optional_
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isExtensible = function (obj, msg) {
-      new Assertion(obj, msg).to.be.extensible;
-    };
-
-  /**
-   * ### .isNotExtensible(object)
-   *
-   * Asserts that `object` is _not_ extensible.
-   *
-   *     var nonExtensibleObject = Object.preventExtensions({});
-   *     var sealedObject = Object.seal({});
-   *     var frozenObject = Object.freese({});
-   *
-   *     assert.isNotExtensible(nonExtensibleObject);
-   *     assert.isNotExtensible(sealedObject);
-   *     assert.isNotExtensible(frozenObject);
-   *
-   * @name isNotExtensible
-   * @alias notExtensible
-   * @param {Object} object
-   * @param {String} message _optional_
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isNotExtensible = function (obj, msg) {
-      new Assertion(obj, msg).to.not.be.extensible;
-    };
-
-  /**
-   * ### .isSealed(object)
-   *
-   * Asserts that `object` is sealed (cannot have new properties added to it
-   * and its existing properties cannot be removed).
-   *
-   *     var sealedObject = Object.seal({});
-   *     var frozenObject = Object.seal({});
-   *
-   *     assert.isSealed(sealedObject);
-   *     assert.isSealed(frozenObject);
-   *
-   * @name isSealed
-   * @alias sealed
-   * @param {Object} object
-   * @param {String} message _optional_
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isSealed = function (obj, msg) {
-      new Assertion(obj, msg).to.be.sealed;
-    };
-
-  /**
-   * ### .isNotSealed(object)
-   *
-   * Asserts that `object` is _not_ sealed.
-   *
-   *     assert.isNotSealed({});
-   *
-   * @name isNotSealed
-   * @alias notSealed
-   * @param {Object} object
-   * @param {String} message _optional_
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isNotSealed = function (obj, msg) {
-      new Assertion(obj, msg).to.not.be.sealed;
-    };
-
-  /**
-   * ### .isFrozen(object)
-   *
-   * Asserts that `object` is frozen (cannot have new properties added to it
-   * and its existing properties cannot be modified).
-   *
-   *     var frozenObject = Object.freeze({});
-   *     assert.frozen(frozenObject);
-   *
-   * @name isFrozen
-   * @alias frozen
-   * @param {Object} object
-   * @param {String} message _optional_
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isFrozen = function (obj, msg) {
-      new Assertion(obj, msg).to.be.frozen;
-    };
-
-  /**
-   * ### .isNotFrozen(object)
-   *
-   * Asserts that `object` is _not_ frozen.
-   *
-   *     assert.isNotFrozen({});
-   *
-   * @name isNotFrozen
-   * @alias notFrozen
-   * @param {Object} object
-   * @param {String} message _optional_
-   * @namespace Assert
-   * @api public
-   */
-
-    assert.isNotFrozen = function (obj, msg) {
-      new Assertion(obj, msg).to.not.be.frozen;
-    };
-
-  /*!
-   * Aliases.
-   */
-
-    (function alias(name, as) {
-      assert[as] = assert[name];
-      return alias;
-    })('isOk', 'ok')('isNotOk', 'notOk')('throws', 'throw')('throws', 'Throw')('isExtensible', 'extensible')('isNotExtensible', 'notExtensible')('isSealed', 'sealed')('isNotSealed', 'notSealed')('isFrozen', 'frozen')('isNotFrozen', 'notFrozen');
-  };
-
-}, {}], 7:[function (require, module, exports) {
-/*!
- * chai
- * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-  module.exports = function (chai, util) {
-    chai.expect = function (val, message) {
-      return new chai.Assertion(val, message);
-    };
-
-  /**
-   * ### .fail(actual, expected, [message], [operator])
-   *
-   * Throw a failure.
-   *
-   * @name fail
-   * @param {Mixed} actual
-   * @param {Mixed} expected
-   * @param {String} message
-   * @param {String} operator
-   * @namespace Expect
-   * @api public
-   */
-
-    chai.expect.fail = function (actual, expected, message, operator) {
-      message = message || 'expect.fail()';
-      throw new chai.AssertionError(message, {
-        actual: actual
-      , expected: expected
-      , operator: operator
-      }, chai.expect.fail);
-    };
-  };
-
-}, {}], 8:[function (require, module, exports) {
-/*!
- * chai
- * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-  module.exports = function (chai, util) {
-    var Assertion = chai.Assertion;
-
-    function loadShould() {
-    // explicitly define this method as function as to have it's name to include as `ssfi`
-      function shouldGetter() {
-        if (this instanceof String || this instanceof Number || this instanceof Boolean) {
-          return new Assertion(this.valueOf(), null, shouldGetter);
-        }
-        return new Assertion(this, null, shouldGetter);
-      }
-      function shouldSetter(value) {
-      // See https://github.com/chaijs/chai/issues/86: this makes
-      // `whatever.should = someValue` actually set `someValue`, which is
-      // especially useful for `global.should = require('chai').should()`.
-      //
-      // Note that we have to use [[DefineProperty]] instead of [[Put]]
-      // since otherwise we would trigger this very setter!
-        Object.defineProperty(this, 'should', {
-          value: value,
-          enumerable: true,
-          configurable: true,
-          writable: true
-        });
-      }
-    // modify Object.prototype to have `should`
-      Object.defineProperty(Object.prototype, 'should', {
-        set: shouldSetter
-      , get: shouldGetter
-      , configurable: true
-      });
-
-      var should = {};
-
-    /**
-     * ### .fail(actual, expected, [message], [operator])
-     *
-     * Throw a failure.
-     *
-     * @name fail
-     * @param {Mixed} actual
-     * @param {Mixed} expected
-     * @param {String} message
-     * @param {String} operator
-     * @namespace Should
-     * @api public
-     */
-
-      should.fail = function (actual, expected, message, operator) {
-        message = message || 'should.fail()';
-        throw new chai.AssertionError(message, {
-          actual: actual
-        , expected: expected
-        , operator: operator
-        }, should.fail);
-      };
-
-    /**
-     * ### .equal(actual, expected, [message])
-     *
-     * Asserts non-strict equality (`==`) of `actual` and `expected`.
-     *
-     *     should.equal(3, '3', '== coerces values to strings');
-     *
-     * @name equal
-     * @param {Mixed} actual
-     * @param {Mixed} expected
-     * @param {String} message
-     * @namespace Should
-     * @api public
-     */
-
-      should.equal = function (val1, val2, msg) {
-        new Assertion(val1, msg).to.equal(val2);
-      };
-
-    /**
-     * ### .throw(function, [constructor/string/regexp], [string/regexp], [message])
-     *
-     * Asserts that `function` will throw an error that is an instance of
-     * `constructor`, or alternately that it will throw an error with message
-     * matching `regexp`.
-     *
-     *     should.throw(fn, 'function throws a reference error');
-     *     should.throw(fn, /function throws a reference error/);
-     *     should.throw(fn, ReferenceError);
-     *     should.throw(fn, ReferenceError, 'function throws a reference error');
-     *     should.throw(fn, ReferenceError, /function throws a reference error/);
-     *
-     * @name throw
-     * @alias Throw
-     * @param {Function} function
-     * @param {ErrorConstructor} constructor
-     * @param {RegExp} regexp
-     * @param {String} message
-     * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
-     * @namespace Should
-     * @api public
-     */
-
-      should.Throw = function (fn, errt, errs, msg) {
-        new Assertion(fn, msg).to.Throw(errt, errs);
-      };
-
-    /**
-     * ### .exist
-     *
-     * Asserts that the target is neither `null` nor `undefined`.
-     *
-     *     var foo = 'hi';
-     *
-     *     should.exist(foo, 'foo exists');
-     *
-     * @name exist
-     * @namespace Should
-     * @api public
-     */
-
-      should.exist = function (val, msg) {
-        new Assertion(val, msg).to.exist;
-      };
-
-    // negation
-      should.not = {};
-
-    /**
-     * ### .not.equal(actual, expected, [message])
-     *
-     * Asserts non-strict inequality (`!=`) of `actual` and `expected`.
-     *
-     *     should.not.equal(3, 4, 'these numbers are not equal');
-     *
-     * @name not.equal
-     * @param {Mixed} actual
-     * @param {Mixed} expected
-     * @param {String} message
-     * @namespace Should
-     * @api public
-     */
-
-      should.not.equal = function (val1, val2, msg) {
-        new Assertion(val1, msg).to.not.equal(val2);
-      };
-
-    /**
-     * ### .throw(function, [constructor/regexp], [message])
-     *
-     * Asserts that `function` will _not_ throw an error that is an instance of
-     * `constructor`, or alternately that it will not throw an error with message
-     * matching `regexp`.
-     *
-     *     should.not.throw(fn, Error, 'function does not throw');
-     *
-     * @name not.throw
-     * @alias not.Throw
-     * @param {Function} function
-     * @param {ErrorConstructor} constructor
-     * @param {RegExp} regexp
-     * @param {String} message
-     * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
-     * @namespace Should
-     * @api public
-     */
-
-      should.not.Throw = function (fn, errt, errs, msg) {
-        new Assertion(fn, msg).to.not.Throw(errt, errs);
-      };
-
-    /**
-     * ### .not.exist
-     *
-     * Asserts that the target is neither `null` nor `undefined`.
-     *
-     *     var bar = null;
-     *
-     *     should.not.exist(bar, 'bar does not exist');
-     *
-     * @name not.exist
-     * @namespace Should
-     * @api public
-     */
-
-      should.not.exist = function (val, msg) {
-        new Assertion(val, msg).to.not.exist;
-      };
-
-      should['throw'] = should['Throw'];
-      should.not['throw'] = should.not['Throw'];
-
-      return should;
-    }
-
-    chai.should = loadShould;
-    chai.Should = loadShould;
-  };
-
-}, {}], 9:[function (require, module, exports) {
-/*!
- * Chai - addChainingMethod utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/*!
- * Module dependencies
- */
-
-  var transferFlags = require('./transferFlags');
-  var flag = require('./flag');
-  var config = require('../config');
-
-/*!
- * Module variables
- */
-
-// Check whether `__proto__` is supported
-  var hasProtoSupport = '__proto__' in Object;
-
-// Without `__proto__` support, this module will need to add properties to a function.
-// However, some Function.prototype methods cannot be overwritten,
-// and there seems no easy cross-platform way to detect them (@see chaijs/chai/issues/69).
-  var excludeNames = /^(?:length|name|arguments|caller)$/;
-
-// Cache `Function` properties
-  var call = Function.prototype.call,
-    apply = Function.prototype.apply;
-
-/**
- * ### addChainableMethod (ctx, name, method, chainingBehavior)
- *
- * Adds a method to an object, such that the method can also be chained.
- *
- *     utils.addChainableMethod(chai.Assertion.prototype, 'foo', function (str) {
- *       var obj = utils.flag(this, 'object');
- *       new chai.Assertion(obj).to.be.equal(str);
- *     });
- *
- * Can also be accessed directly from `chai.Assertion`.
- *
- *     chai.Assertion.addChainableMethod('foo', fn, chainingBehavior);
- *
- * The result can then be used as both a method assertion, executing both `method` and
- * `chainingBehavior`, or as a language chain, which only executes `chainingBehavior`.
- *
- *     expect(fooStr).to.be.foo('bar');
- *     expect(fooStr).to.be.foo.equal('foo');
- *
- * @param {Object} ctx object to which the method is added
- * @param {String} name of method to add
- * @param {Function} method function to be used for `name`, when called
- * @param {Function} chainingBehavior function to be called every time the property is accessed
- * @namespace Utils
- * @name addChainableMethod
- * @api public
- */
-
-  module.exports = function (ctx, name, method, chainingBehavior) {
-    if (typeof chainingBehavior !== 'function') {
-      chainingBehavior = function () { };
-    }
-
-    var chainableBehavior = {
-      method: method
-    , chainingBehavior: chainingBehavior
-    };
-
-  // save the methods so we can overwrite them later, if we need to.
-    if (!ctx.__methods) {
-      ctx.__methods = {};
-    }
-    ctx.__methods[name] = chainableBehavior;
-
-    Object.defineProperty(ctx, name,
-    { get: function () {
-      chainableBehavior.chainingBehavior.call(this);
-
-      var assert = function assert() {
-        var old_ssfi = flag(this, 'ssfi');
-        if (old_ssfi && config.includeStack === false)
-          flag(this, 'ssfi', assert);
-        var result = chainableBehavior.method.apply(this, arguments);
-        return result === undefined ? this : result;
-      };
-
-        // Use `__proto__` if available
-      if (hasProtoSupport) {
-          // Inherit all properties from the object by replacing the `Function` prototype
-        var prototype = assert.__proto__ = Object.create(this);
-          // Restore the `call` and `apply` methods from `Function`
-        prototype.call = call;
-        prototype.apply = apply;
-      }
-        // Otherwise, redefine all properties (slow!)
-      else {
-        var asserterNames = Object.getOwnPropertyNames(ctx);
-        asserterNames.forEach(function (asserterName) {
-          if (!excludeNames.test(asserterName)) {
-            var pd = Object.getOwnPropertyDescriptor(ctx, asserterName);
-            Object.defineProperty(assert, asserterName, pd);
-          }
-        });
-      }
-
-      transferFlags(this, assert);
-      return assert;
-    }
-    , configurable: true
-  });
-  };
-
-}, { '../config':4, './flag':13, './transferFlags':29 }], 10:[function (require, module, exports) {
-/*!
- * Chai - addMethod utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-  var config = require('../config');
-
-/**
- * ### .addMethod (ctx, name, method)
- *
- * Adds a method to the prototype of an object.
- *
- *     utils.addMethod(chai.Assertion.prototype, 'foo', function (str) {
- *       var obj = utils.flag(this, 'object');
- *       new chai.Assertion(obj).to.be.equal(str);
- *     });
- *
- * Can also be accessed directly from `chai.Assertion`.
- *
- *     chai.Assertion.addMethod('foo', fn);
- *
- * Then can be used as any other assertion.
- *
- *     expect(fooStr).to.be.foo('bar');
- *
- * @param {Object} ctx object to which the method is added
- * @param {String} name of method to add
- * @param {Function} method function to be used for name
- * @namespace Utils
- * @name addMethod
- * @api public
- */
-  var flag = require('./flag');
-
-  module.exports = function (ctx, name, method) {
-    ctx[name] = function () {
-      var old_ssfi = flag(this, 'ssfi');
-      if (old_ssfi && config.includeStack === false)
-        flag(this, 'ssfi', ctx[name]);
-      var result = method.apply(this, arguments);
-      return result === undefined ? this : result;
-    };
-  };
-
-}, { '../config':4, './flag':13 }], 11:[function (require, module, exports) {
-/*!
- * Chai - addProperty utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-  var config = require('../config');
-  var flag = require('./flag');
-
-/**
- * ### addProperty (ctx, name, getter)
- *
- * Adds a property to the prototype of an object.
- *
- *     utils.addProperty(chai.Assertion.prototype, 'foo', function () {
- *       var obj = utils.flag(this, 'object');
- *       new chai.Assertion(obj).to.be.instanceof(Foo);
- *     });
- *
- * Can also be accessed directly from `chai.Assertion`.
- *
- *     chai.Assertion.addProperty('foo', fn);
- *
- * Then can be used as any other assertion.
- *
- *     expect(myFoo).to.be.foo;
- *
- * @param {Object} ctx object to which the property is added
- * @param {String} name of property to add
- * @param {Function} getter function to be used for name
- * @namespace Utils
- * @name addProperty
- * @api public
- */
-
-  module.exports = function (ctx, name, getter) {
-    Object.defineProperty(ctx, name,
-    { get: function addProperty() {
-      var old_ssfi = flag(this, 'ssfi');
-      if (old_ssfi && config.includeStack === false)
-        flag(this, 'ssfi', addProperty);
-
-      var result = getter.call(this);
-      return result === undefined ? this : result;
-    }
-    , configurable: true
-  });
-  };
-
-}, { '../config':4, './flag':13 }], 12:[function (require, module, exports) {
-/*!
- * Chai - expectTypes utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### expectTypes(obj, types)
- *
- * Ensures that the object being tested against is of a valid type.
- *
- *     utils.expectTypes(this, ['array', 'object', 'string']);
- *
- * @param {Mixed} obj constructed Assertion
- * @param {Array} type A list of allowed types for this assertion
- * @namespace Utils
- * @name expectTypes
- * @api public
- */
-
-  var AssertionError = require('assertion-error');
-  var flag = require('./flag');
-  var type = require('type-detect');
-
-  module.exports = function (obj, types) {
-    var obj = flag(obj, 'object');
-    types = types.map(function (t) { return t.toLowerCase(); });
-    types.sort();
-
-  // Transforms ['lorem', 'ipsum'] into 'a lirum, or an ipsum'
-    var str = types.map(function (t, index) {
-      var art = ~['a', 'e', 'i', 'o', 'u'].indexOf(t.charAt(0)) ? 'an' : 'a';
-      var or = types.length > 1 && index === types.length - 1 ? 'or ' : '';
-      return or + art + ' ' + t;
-    }).join(', ');
-
-    if (!types.some(function (expected) { return type(obj) === expected; })) {
-      throw new AssertionError(
-      'object tested must be ' + str + ', but ' + type(obj) + ' given'
-    );
-    }
-  };
-
-}, { './flag':13, 'assertion-error':30, 'type-detect':35 }], 13:[function (require, module, exports) {
-/*!
- * Chai - flag utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### flag(object, key, [value])
- *
- * Get or set a flag value on an object. If a
- * value is provided it will be set, else it will
- * return the currently set value or `undefined` if
- * the value is not set.
- *
- *     utils.flag(this, 'foo', 'bar'); // setter
- *     utils.flag(this, 'foo'); // getter, returns `bar`
- *
- * @param {Object} object constructed Assertion
- * @param {String} key
- * @param {Mixed} value (optional)
- * @namespace Utils
- * @name flag
- * @api private
- */
-
-  module.exports = function (obj, key, value) {
-    var flags = obj.__flags || (obj.__flags = Object.create(null));
-    if (arguments.length === 3) {
-      flags[key] = value;
-    } else {
-      return flags[key];
-    }
-  };
-
-}, {}], 14:[function (require, module, exports) {
-/*!
- * Chai - getActual utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * # getActual(object, [actual])
- *
- * Returns the `actual` value for an Assertion
- *
- * @param {Object} object (constructed Assertion)
- * @param {Arguments} chai.Assertion.prototype.assert arguments
- * @namespace Utils
- * @name getActual
- */
-
-  module.exports = function (obj, args) {
-    return args.length > 4 ? args[4] : obj._obj;
-  };
-
-}, {}], 15:[function (require, module, exports) {
-/*!
- * Chai - getEnumerableProperties utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### .getEnumerableProperties(object)
- *
- * This allows the retrieval of enumerable property names of an object,
- * inherited or not.
- *
- * @param {Object} object
- * @returns {Array}
- * @namespace Utils
- * @name getEnumerableProperties
- * @api public
- */
-
-  module.exports = function getEnumerableProperties(object) {
-    var result = [];
-    for (var name in object) {
-      result.push(name);
-    }
-    return result;
-  };
-
-}, {}], 16:[function (require, module, exports) {
-/*!
- * Chai - message composition utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/*!
- * Module dependancies
- */
-
-  var flag = require('./flag')
-  , getActual = require('./getActual')
-  , inspect = require('./inspect')
-  , objDisplay = require('./objDisplay');
-
-/**
- * ### .getMessage(object, message, negateMessage)
- *
- * Construct the error message based on flags
- * and template tags. Template tags will return
- * a stringified inspection of the object referenced.
- *
- * Message template tags:
- * - `#{this}` current asserted object
- * - `#{act}` actual value
- * - `#{exp}` expected value
- *
- * @param {Object} object (constructed Assertion)
- * @param {Arguments} chai.Assertion.prototype.assert arguments
- * @namespace Utils
- * @name getMessage
- * @api public
- */
-
-  module.exports = function (obj, args) {
-    var negate = flag(obj, 'negate')
-    , val = flag(obj, 'object')
-    , expected = args[3]
-    , actual = getActual(obj, args)
-    , msg = negate ? args[2] : args[1]
-    , flagMsg = flag(obj, 'message');
-
-    if (typeof msg === 'function') msg = msg();
-    msg = msg || '';
-    msg = msg
-    .replace(/#\{this\}/g, function () { return objDisplay(val); })
-    .replace(/#\{act\}/g, function () { return objDisplay(actual); })
-    .replace(/#\{exp\}/g, function () { return objDisplay(expected); });
-
-    return flagMsg ? flagMsg + ': ' + msg : msg;
-  };
-
-}, { './flag':13, './getActual':14, './inspect':23, './objDisplay':24 }], 17:[function (require, module, exports) {
-/*!
- * Chai - getName utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * # getName(func)
- *
- * Gets the name of a function, in a cross-browser way.
- *
- * @param {Function} a function (usually a constructor)
- * @namespace Utils
- * @name getName
- */
-
-  module.exports = function (func) {
-    if (func.name) return func.name;
-
-    var match = /^\s?function ([^(]*)\(/.exec(func);
-    return match && match[1] ? match[1] : '';
-  };
-
-}, {}], 18:[function (require, module, exports) {
-/*!
- * Chai - getPathInfo utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-  var hasProperty = require('./hasProperty');
-
-/**
- * ### .getPathInfo(path, object)
- *
- * This allows the retrieval of property info in an
- * object given a string path.
- *
- * The path info consists of an object with the
- * following properties:
- *
- * * parent - The parent object of the property referenced by `path`
- * * name - The name of the final property, a number if it was an array indexer
- * * value - The value of the property, if it exists, otherwise `undefined`
- * * exists - Whether the property exists or not
- *
- * @param {String} path
- * @param {Object} object
- * @returns {Object} info
- * @namespace Utils
- * @name getPathInfo
- * @api public
- */
-
-  module.exports = function getPathInfo(path, obj) {
-    var parsed = parsePath(path),
-      last = parsed[parsed.length - 1];
-
-    var info = {
-      parent: parsed.length > 1 ? _getPathValue(parsed, obj, parsed.length - 1) : obj,
-      name: last.p || last.i,
-      value: _getPathValue(parsed, obj)
-    };
-    info.exists = hasProperty(info.name, info.parent);
-
-    return info;
-  };
-
-
-/*!
- * ## parsePath(path)
- *
- * Helper function used to parse string object
- * paths. Use in conjunction with `_getPathValue`.
- *
- *      var parsed = parsePath('myobject.property.subprop');
- *
- * ### Paths:
- *
- * * Can be as near infinitely deep and nested
- * * Arrays are also valid using the formal `myobject.document[3].property`.
- * * Literal dots and brackets (not delimiter) must be backslash-escaped.
- *
- * @param {String} path
- * @returns {Object} parsed
- * @api private
- */
-
-  function parsePath(path) {
-    var str = path.replace(/([^\\])\[/g, '$1.[')
-    , parts = str.match(/(\\\.|[^.]+?)+/g);
-    return parts.map(function (value) {
-      var re = /^\[(\d+)\]$/
-      , mArr = re.exec(value);
-      if (mArr) return { i: parseFloat(mArr[1]) };
-      else return { p: value.replace(/\\([.\[\]])/g, '$1') };
-    });
-  }
-
-
-/*!
- * ## _getPathValue(parsed, obj)
- *
- * Helper companion function for `.parsePath` that returns
- * the value located at the parsed address.
- *
- *      var value = getPathValue(parsed, obj);
- *
- * @param {Object} parsed definition from `parsePath`.
- * @param {Object} object to search against
- * @param {Number} object to search against
- * @returns {Object|Undefined} value
- * @api private
- */
-
-  function _getPathValue(parsed, obj, index) {
-    var tmp = obj
-    , res;
-
-    index = (index === undefined ? parsed.length : index);
-
-    for (var i = 0, l = index; i < l; i++) {
-      var part = parsed[i];
-      if (tmp) {
-        if ('undefined' !== typeof part.p)
-          tmp = tmp[part.p];
-        else if ('undefined' !== typeof part.i)
-          tmp = tmp[part.i];
-        if (i == (l - 1)) res = tmp;
-      } else {
-        res = undefined;
-      }
-    }
-    return res;
-  }
-
-}, { './hasProperty':21 }], 19:[function (require, module, exports) {
-/*!
- * Chai - getPathValue utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * @see https://github.com/logicalparadox/filtr
- * MIT Licensed
- */
-
-  var getPathInfo = require('./getPathInfo');
-
-/**
- * ### .getPathValue(path, object)
- *
- * This allows the retrieval of values in an
- * object given a string path.
- *
- *     var obj = {
- *         prop1: {
- *             arr: ['a', 'b', 'c']
- *           , str: 'Hello'
- *         }
- *       , prop2: {
- *             arr: [ { nested: 'Universe' } ]
- *           , str: 'Hello again!'
- *         }
- *     }
- *
- * The following would be the results.
- *
- *     getPathValue('prop1.str', obj); // Hello
- *     getPathValue('prop1.att[2]', obj); // b
- *     getPathValue('prop2.arr[0].nested', obj); // Universe
- *
- * @param {String} path
- * @param {Object} object
- * @returns {Object} value or `undefined`
- * @namespace Utils
- * @name getPathValue
- * @api public
- */
-  module.exports = function (path, obj) {
-    var info = getPathInfo(path, obj);
-    return info.value;
-  };
-
-}, { './getPathInfo':18 }], 20:[function (require, module, exports) {
-/*!
- * Chai - getProperties utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### .getProperties(object)
- *
- * This allows the retrieval of property names of an object, enumerable or not,
- * inherited or not.
- *
- * @param {Object} object
- * @returns {Array}
- * @namespace Utils
- * @name getProperties
- * @api public
- */
-
-  module.exports = function getProperties(object) {
-    var result = Object.getOwnPropertyNames(object);
-
-    function addProperty(property) {
-      if (result.indexOf(property) === -1) {
-        result.push(property);
-      }
-    }
-
-    var proto = Object.getPrototypeOf(object);
-    while (proto !== null) {
-      Object.getOwnPropertyNames(proto).forEach(addProperty);
-      proto = Object.getPrototypeOf(proto);
-    }
-
-    return result;
-  };
-
-}, {}], 21:[function (require, module, exports) {
-/*!
- * Chai - hasProperty utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-  var type = require('type-detect');
-
-/**
- * ### .hasProperty(object, name)
- *
- * This allows checking whether an object has
- * named property or numeric array index.
- *
- * Basically does the same thing as the `in`
- * operator but works properly with natives
- * and null/undefined values.
- *
- *     var obj = {
- *         arr: ['a', 'b', 'c']
- *       , str: 'Hello'
- *     }
- *
- * The following would be the results.
- *
- *     hasProperty('str', obj);  // true
- *     hasProperty('constructor', obj);  // true
- *     hasProperty('bar', obj);  // false
- *
- *     hasProperty('length', obj.str); // true
- *     hasProperty(1, obj.str);  // true
- *     hasProperty(5, obj.str);  // false
- *
- *     hasProperty('length', obj.arr);  // true
- *     hasProperty(2, obj.arr);  // true
- *     hasProperty(3, obj.arr);  // false
- *
- * @param {Objuect} object
- * @param {String|Number} name
- * @returns {Boolean} whether it exists
- * @namespace Utils
- * @name getPathInfo
- * @api public
- */
-
-  var literals = {
-    'number': Number
-  , 'string': String
-  };
-
-  module.exports = function hasProperty(name, obj) {
-    var ot = type(obj);
-
-  // Bad Object, obviously no props at all
-    if (ot === 'null' || ot === 'undefined')
-      return false;
-
-  // The `in` operator does not work with certain literals
-  // box these before the check
-    if (literals[ot] && typeof obj !== 'object')
-      obj = new literals[ot](obj);
-
-    return name in obj;
-  };
-
-}, { 'type-detect':35 }], 22:[function (require, module, exports) {
-/*!
- * chai
- * Copyright(c) 2011 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/*!
- * Main exports
- */
-
-  var exports = module.exports = {};
-
-/*!
- * test utility
- */
-
-  exports.test = require('./test');
-
-/*!
- * type utility
- */
-
-  exports.type = require('type-detect');
-
-/*!
- * expectTypes utility
- */
-  exports.expectTypes = require('./expectTypes');
-
-/*!
- * message utility
- */
-
-  exports.getMessage = require('./getMessage');
-
-/*!
- * actual utility
- */
-
-  exports.getActual = require('./getActual');
-
-/*!
- * Inspect util
- */
-
-  exports.inspect = require('./inspect');
-
-/*!
- * Object Display util
- */
-
-  exports.objDisplay = require('./objDisplay');
-
-/*!
- * Flag utility
- */
-
-  exports.flag = require('./flag');
-
-/*!
- * Flag transferring utility
- */
-
-  exports.transferFlags = require('./transferFlags');
-
-/*!
- * Deep equal utility
- */
-
-  exports.eql = require('deep-eql');
-
-/*!
- * Deep path value
- */
-
-  exports.getPathValue = require('./getPathValue');
-
-/*!
- * Deep path info
- */
-
-  exports.getPathInfo = require('./getPathInfo');
-
-/*!
- * Check if a property exists
- */
-
-  exports.hasProperty = require('./hasProperty');
-
-/*!
- * Function name
- */
-
-  exports.getName = require('./getName');
-
-/*!
- * add Property
- */
-
-  exports.addProperty = require('./addProperty');
-
-/*!
- * add Method
- */
-
-  exports.addMethod = require('./addMethod');
-
-/*!
- * overwrite Property
- */
-
-  exports.overwriteProperty = require('./overwriteProperty');
-
-/*!
- * overwrite Method
- */
-
-  exports.overwriteMethod = require('./overwriteMethod');
-
-/*!
- * Add a chainable method
- */
-
-  exports.addChainableMethod = require('./addChainableMethod');
-
-/*!
- * Overwrite chainable method
- */
-
-  exports.overwriteChainableMethod = require('./overwriteChainableMethod');
-
-}, { './addChainableMethod':9, './addMethod':10, './addProperty':11, './expectTypes':12, './flag':13, './getActual':14, './getMessage':16, './getName':17, './getPathInfo':18, './getPathValue':19, './hasProperty':21, './inspect':23, './objDisplay':24, './overwriteChainableMethod':25, './overwriteMethod':26, './overwriteProperty':27, './test':28, './transferFlags':29, 'deep-eql':31, 'type-detect':35 }], 23:[function (require, module, exports) {
-// This is (almost) directly from Node.js utils
-// https://github.com/joyent/node/blob/f8c335d0caf47f16d31413f89aa28eda3878e3aa/lib/util.js
-
-  var getName = require('./getName');
-  var getProperties = require('./getProperties');
-  var getEnumerableProperties = require('./getEnumerableProperties');
-
-  module.exports = inspect;
-
-/**
- * Echos the value of a value. Trys to print the value out
- * in the best way possible given the different types.
- *
- * @param {Object} obj The object to print out.
- * @param {Boolean} showHidden Flag that shows hidden (not enumerable)
- *    properties of objects.
- * @param {Number} depth Depth in which to descend in object. Default is 2.
- * @param {Boolean} colors Flag to turn on ANSI escape codes to color the
- *    output. Default is false (no coloring).
- * @namespace Utils
- * @name inspect
- */
-  function inspect(obj, showHidden, depth, colors) {
-    var ctx = {
-      showHidden: showHidden,
-      seen: [],
-      stylize: function (str) { return str; }
-    };
-    return formatValue(ctx, obj, (typeof depth === 'undefined' ? 2 : depth));
-  }
-
-// Returns true if object is a DOM element.
-  var isDOMElement = function (object) {
-    if (typeof HTMLElement === 'object') {
-      return object instanceof HTMLElement;
-    } else {
-      return object &&
-      typeof object === 'object' &&
-      object.nodeType === 1 &&
-      typeof object.nodeName === 'string';
-    }
-  };
-
-  function formatValue(ctx, value, recurseTimes) {
-  // Provide a hook for user-specified inspect functions.
-  // Check that value is an object with an inspect function on it
-    if (value && typeof value.inspect === 'function' &&
-      // Filter out the util module, it's inspect function is special
-      value.inspect !== exports.inspect &&
-      // Also filter out any prototype objects using the circular check.
-      !(value.constructor && value.constructor.prototype === value)) {
-      var ret = value.inspect(recurseTimes);
-      if (typeof ret !== 'string') {
-        ret = formatValue(ctx, ret, recurseTimes);
-      }
-      return ret;
-    }
-
-  // Primitive types cannot have properties
-    var primitive = formatPrimitive(ctx, value);
-    if (primitive) {
-      return primitive;
-    }
-
-  // If this is a DOM element, try to get the outer HTML.
-    if (isDOMElement(value)) {
-      if ('outerHTML' in value) {
-        return value.outerHTML;
-      // This value does not have an outerHTML attribute,
-      //   it could still be an XML element
-      } else {
-      // Attempt to serialize it
-        try {
-          if (document.xmlVersion) {
-            var xmlSerializer = new XMLSerializer();
-            return xmlSerializer.serializeToString(value);
-          } else {
-          // Firefox 11- do not support outerHTML
-          //   It does, however, support innerHTML
-          //   Use the following to render the element
-            var ns = 'http://www.w3.org/1999/xhtml';
-            var container = document.createElementNS(ns, '_');
-
-            container.appendChild(value.cloneNode(false));
-            html = container.innerHTML
-            .replace('><', '>' + value.innerHTML + '<');
-            container.innerHTML = '';
-            return html;
-          }
-        } catch (err) {
-        // This could be a non-native DOM implementation,
-        //   continue with the normal flow:
-        //   printing the element as if it is an object.
-        }
-      }
-    }
-
-  // Look up the keys of the object.
-    var visibleKeys = getEnumerableProperties(value);
-    var keys = ctx.showHidden ? getProperties(value) : visibleKeys;
-
-  // Some type of object without properties can be shortcutted.
-  // In IE, errors have a single `stack` property, or if they are vanilla `Error`,
-  // a `stack` plus `description` property; ignore those for consistency.
-    if (keys.length === 0 || (isError(value) && (
-      (keys.length === 1 && keys[0] === 'stack') ||
-      (keys.length === 2 && keys[0] === 'description' && keys[1] === 'stack')
-     ))) {
-      if (typeof value === 'function') {
-        var name = getName(value);
-        var nameSuffix = name ? ': ' + name : '';
-        return ctx.stylize('[Function' + nameSuffix + ']', 'special');
-      }
-      if (isRegExp(value)) {
-        return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
-      }
-      if (isDate(value)) {
-        return ctx.stylize(Date.prototype.toUTCString.call(value), 'date');
-      }
-      if (isError(value)) {
-        return formatError(value);
-      }
-    }
-
-    var base = '', array = false, braces = ['{', '}'];
-
-  // Make Array say that they are Array
-    if (isArray(value)) {
-      array = true;
-      braces = ['[', ']'];
-    }
-
-  // Make functions say that they are functions
-    if (typeof value === 'function') {
-      var name = getName(value);
-      var nameSuffix = name ? ': ' + name : '';
-      base = ' [Function' + nameSuffix + ']';
-    }
-
-  // Make RegExps say that they are RegExps
-    if (isRegExp(value)) {
-      base = ' ' + RegExp.prototype.toString.call(value);
-    }
-
-  // Make dates with properties first say the date
-    if (isDate(value)) {
-      base = ' ' + Date.prototype.toUTCString.call(value);
-    }
-
-  // Make error with message first say the error
-    if (isError(value)) {
-      return formatError(value);
-    }
-
-    if (keys.length === 0 && (!array || value.length == 0)) {
-      return braces[0] + base + braces[1];
-    }
-
-    if (recurseTimes < 0) {
-      if (isRegExp(value)) {
-        return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
-      } else {
-        return ctx.stylize('[Object]', 'special');
-      }
-    }
-
-    ctx.seen.push(value);
-
-    var output;
-    if (array) {
-      output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
-    } else {
-      output = keys.map(function (key) {
-        return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
-      });
-    }
-
-    ctx.seen.pop();
-
-    return reduceToSingleString(output, base, braces);
-  }
-
-
-  function formatPrimitive(ctx, value) {
-    switch (typeof value) {
-      case 'undefined':
-        return ctx.stylize('undefined', 'undefined');
-
-      case 'string':
-        var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
-                                               .replace(/'/g, '\\\'')
-                                               .replace(/\\"/g, '"') + '\'';
-        return ctx.stylize(simple, 'string');
-
-      case 'number':
-        if (value === 0 && (1 / value) === -Infinity) {
-          return ctx.stylize('-0', 'number');
-        }
-        return ctx.stylize('' + value, 'number');
-
-      case 'boolean':
-        return ctx.stylize('' + value, 'boolean');
-    }
-  // For some reason typeof null is "object", so special case here.
-    if (value === null) {
-      return ctx.stylize('null', 'null');
-    }
-  }
-
-
-  function formatError(value) {
-    return '[' + Error.prototype.toString.call(value) + ']';
-  }
-
-
-  function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
-    var output = [];
-    for (var i = 0, l = value.length; i < l; ++i) {
-      if (Object.prototype.hasOwnProperty.call(value, String(i))) {
-        output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
-          String(i), true));
-      } else {
-        output.push('');
-      }
-    }
-    keys.forEach(function (key) {
-      if (!key.match(/^\d+$/)) {
-        output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
-          key, true));
-      }
-    });
-    return output;
-  }
-
-
-  function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
-    var name, str;
-    if (value.__lookupGetter__) {
-      if (value.__lookupGetter__(key)) {
-        if (value.__lookupSetter__(key)) {
-          str = ctx.stylize('[Getter/Setter]', 'special');
-        } else {
-          str = ctx.stylize('[Getter]', 'special');
-        }
-      } else {
-        if (value.__lookupSetter__(key)) {
-          str = ctx.stylize('[Setter]', 'special');
-        }
-      }
-    }
-    if (visibleKeys.indexOf(key) < 0) {
-      name = '[' + key + ']';
-    }
-    if (!str) {
-      if (ctx.seen.indexOf(value[key]) < 0) {
-        if (recurseTimes === null) {
-          str = formatValue(ctx, value[key], null);
-        } else {
-          str = formatValue(ctx, value[key], recurseTimes - 1);
-        }
-        if (str.indexOf('\n') > -1) {
-          if (array) {
-            str = str.split('\n').map(function (line) {
-              return '  ' + line;
-            }).join('\n').substr(2);
-          } else {
-            str = '\n' + str.split('\n').map(function (line) {
-              return '   ' + line;
-            }).join('\n');
-          }
-        }
-      } else {
-        str = ctx.stylize('[Circular]', 'special');
-      }
-    }
-    if (typeof name === 'undefined') {
-      if (array && key.match(/^\d+$/)) {
-        return str;
-      }
-      name = JSON.stringify('' + key);
-      if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
-        name = name.substr(1, name.length - 2);
-        name = ctx.stylize(name, 'name');
-      } else {
-        name = name.replace(/'/g, '\\\'')
-                 .replace(/\\"/g, '"')
-                 .replace(/(^"|"$)/g, '\'');
-        name = ctx.stylize(name, 'string');
-      }
-    }
-
-    return name + ': ' + str;
-  }
-
-
-  function reduceToSingleString(output, base, braces) {
-    var numLinesEst = 0;
-    var length = output.reduce(function (prev, cur) {
-      numLinesEst++;
-      if (cur.indexOf('\n') >= 0) numLinesEst++;
-      return prev + cur.length + 1;
-    }, 0);
-
-    if (length > 60) {
-      return braces[0] +
-           (base === '' ? '' : base + '\n ') +
-           ' ' +
-           output.join(',\n  ') +
-           ' ' +
-           braces[1];
-    }
-
-    return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
-  }
-
-  function isArray(ar) {
-    return Array.isArray(ar) ||
-         (typeof ar === 'object' && objectToString(ar) === '[object Array]');
-  }
-
-  function isRegExp(re) {
-    return typeof re === 'object' && objectToString(re) === '[object RegExp]';
-  }
-
-  function isDate(d) {
-    return typeof d === 'object' && objectToString(d) === '[object Date]';
-  }
-
-  function isError(e) {
-    return typeof e === 'object' && objectToString(e) === '[object Error]';
-  }
-
-  function objectToString(o) {
-    return Object.prototype.toString.call(o);
-  }
-
-}, { './getEnumerableProperties':15, './getName':17, './getProperties':20 }], 24:[function (require, module, exports) {
-/*!
- * Chai - flag utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/*!
- * Module dependancies
- */
-
-  var inspect = require('./inspect');
-  var config = require('../config');
-
-/**
- * ### .objDisplay (object)
- *
- * Determines if an object or an array matches
- * criteria to be inspected in-line for error
- * messages or should be truncated.
- *
- * @param {Mixed} javascript object to inspect
- * @name objDisplay
- * @namespace Utils
- * @api public
- */
-
-  module.exports = function (obj) {
-    var str = inspect(obj)
-    , type = Object.prototype.toString.call(obj);
-
-    if (config.truncateThreshold && str.length >= config.truncateThreshold) {
-      if (type === '[object Function]') {
-        return !obj.name || obj.name === ''
-        ? '[Function]'
-        : '[Function: ' + obj.name + ']';
-      } else if (type === '[object Array]') {
-        return '[ Array(' + obj.length + ') ]';
-      } else if (type === '[object Object]') {
-        var keys = Object.keys(obj)
-        , kstr = keys.length > 2
-          ? keys.splice(0, 2).join(', ') + ', ...'
-          : keys.join(', ');
-        return '{ Object (' + kstr + ') }';
-      } else {
-        return str;
-      }
-    } else {
-      return str;
-    }
-  };
-
-}, { '../config':4, './inspect':23 }], 25:[function (require, module, exports) {
-/*!
- * Chai - overwriteChainableMethod utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### overwriteChainableMethod (ctx, name, method, chainingBehavior)
- *
- * Overwites an already existing chainable method
- * and provides access to the previous function or
- * property.  Must return functions to be used for
- * name.
- *
- *     utils.overwriteChainableMethod(chai.Assertion.prototype, 'length',
- *       function (_super) {
- *       }
- *     , function (_super) {
- *       }
- *     );
- *
- * Can also be accessed directly from `chai.Assertion`.
- *
- *     chai.Assertion.overwriteChainableMethod('foo', fn, fn);
- *
- * Then can be used as any other assertion.
- *
- *     expect(myFoo).to.have.length(3);
- *     expect(myFoo).to.have.length.above(3);
- *
- * @param {Object} ctx object whose method / property is to be overwritten
- * @param {String} name of method / property to overwrite
- * @param {Function} method function that returns a function to be used for name
- * @param {Function} chainingBehavior function that returns a function to be used for property
- * @namespace Utils
- * @name overwriteChainableMethod
- * @api public
- */
-
-  module.exports = function (ctx, name, method, chainingBehavior) {
-    var chainableBehavior = ctx.__methods[name];
-
-    var _chainingBehavior = chainableBehavior.chainingBehavior;
-    chainableBehavior.chainingBehavior = function () {
-      var result = chainingBehavior(_chainingBehavior).call(this);
-      return result === undefined ? this : result;
-    };
-
-    var _method = chainableBehavior.method;
-    chainableBehavior.method = function () {
-      var result = method(_method).apply(this, arguments);
-      return result === undefined ? this : result;
-    };
-  };
-
-}, {}], 26:[function (require, module, exports) {
-/*!
- * Chai - overwriteMethod utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### overwriteMethod (ctx, name, fn)
- *
- * Overwites an already existing method and provides
- * access to previous function. Must return function
- * to be used for name.
- *
- *     utils.overwriteMethod(chai.Assertion.prototype, 'equal', function (_super) {
- *       return function (str) {
- *         var obj = utils.flag(this, 'object');
- *         if (obj instanceof Foo) {
- *           new chai.Assertion(obj.value).to.equal(str);
- *         } else {
- *           _super.apply(this, arguments);
- *         }
- *       }
- *     });
- *
- * Can also be accessed directly from `chai.Assertion`.
- *
- *     chai.Assertion.overwriteMethod('foo', fn);
- *
- * Then can be used as any other assertion.
- *
- *     expect(myFoo).to.equal('bar');
- *
- * @param {Object} ctx object whose method is to be overwritten
- * @param {String} name of method to overwrite
- * @param {Function} method function that returns a function to be used for name
- * @namespace Utils
- * @name overwriteMethod
- * @api public
- */
-
-  module.exports = function (ctx, name, method) {
-    var _method = ctx[name]
-    , _super = function () { return this; };
-
-    if (_method && 'function' === typeof _method)
-      _super = _method;
-
-    ctx[name] = function () {
-      var result = method(_super).apply(this, arguments);
-      return result === undefined ? this : result;
-    };
-  };
-
-}, {}], 27:[function (require, module, exports) {
-/*!
- * Chai - overwriteProperty utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### overwriteProperty (ctx, name, fn)
- *
- * Overwites an already existing property getter and provides
- * access to previous value. Must return function to use as getter.
- *
- *     utils.overwriteProperty(chai.Assertion.prototype, 'ok', function (_super) {
- *       return function () {
- *         var obj = utils.flag(this, 'object');
- *         if (obj instanceof Foo) {
- *           new chai.Assertion(obj.name).to.equal('bar');
- *         } else {
- *           _super.call(this);
- *         }
- *       }
- *     });
- *
- *
- * Can also be accessed directly from `chai.Assertion`.
- *
- *     chai.Assertion.overwriteProperty('foo', fn);
- *
- * Then can be used as any other assertion.
- *
- *     expect(myFoo).to.be.ok;
- *
- * @param {Object} ctx object whose property is to be overwritten
- * @param {String} name of property to overwrite
- * @param {Function} getter function that returns a getter function to be used for name
- * @namespace Utils
- * @name overwriteProperty
- * @api public
- */
-
-  module.exports = function (ctx, name, getter) {
-    var _get = Object.getOwnPropertyDescriptor(ctx, name)
-    , _super = function () {};
-
-    if (_get && 'function' === typeof _get.get)
-      _super = _get.get;
-
-    Object.defineProperty(ctx, name,
-    { get: function () {
-      var result = getter(_super).call(this);
-      return result === undefined ? this : result;
-    }
-    , configurable: true
-  });
-  };
-
-}, {}], 28:[function (require, module, exports) {
-/*!
- * Chai - test utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/*!
- * Module dependancies
- */
-
-  var flag = require('./flag');
-
-/**
- * # test(object, expression)
- *
- * Test and object for expression.
- *
- * @param {Object} object (constructed Assertion)
- * @param {Arguments} chai.Assertion.prototype.assert arguments
- * @namespace Utils
- * @name test
- */
-
-  module.exports = function (obj, args) {
-    var negate = flag(obj, 'negate')
-    , expr = args[0];
-    return negate ? !expr : expr;
-  };
-
-}, { './flag':13 }], 29:[function (require, module, exports) {
-/*!
- * Chai - transferFlags utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### transferFlags(assertion, object, includeAll = true)
- *
- * Transfer all the flags for `assertion` to `object`. If
- * `includeAll` is set to `false`, then the base Chai
- * assertion flags (namely `object`, `ssfi`, and `message`)
- * will not be transferred.
- *
- *
- *     var newAssertion = new Assertion();
- *     utils.transferFlags(assertion, newAssertion);
- *
- *     var anotherAsseriton = new Assertion(myObj);
- *     utils.transferFlags(assertion, anotherAssertion, false);
- *
- * @param {Assertion} assertion the assertion to transfer the flags from
- * @param {Object} object the object to transfer the flags to; usually a new assertion
- * @param {Boolean} includeAll
- * @namespace Utils
- * @name transferFlags
- * @api private
- */
-
-  module.exports = function (assertion, object, includeAll) {
-    var flags = assertion.__flags || (assertion.__flags = Object.create(null));
-
-    if (!object.__flags) {
-      object.__flags = Object.create(null);
-    }
-
-    includeAll = arguments.length === 3 ? includeAll : true;
-
-    for (var flag in flags) {
-      if (includeAll ||
-        (flag !== 'object' && flag !== 'ssfi' && flag != 'message')) {
-        object.__flags[flag] = flags[flag];
-      }
-    }
-  };
-
-}, {}], 30:[function (require, module, exports) {
-/*!
- * assertion-error
- * Copyright(c) 2013 Jake Luer <jake@qualiancy.com>
- * MIT Licensed
- */
-
-/*!
- * Return a function that will copy properties from
- * one object to another excluding any originally
- * listed. Returned function will create a new `{}`.
- *
- * @param {String} excluded properties ...
- * @return {Function}
- */
-
-  function exclude() {
-    var excludes = [].slice.call(arguments);
-
-    function excludeProps(res, obj) {
-      Object.keys(obj).forEach(function (key) {
-        if (!~excludes.indexOf(key)) res[key] = obj[key];
-      });
-    }
-
-    return function extendExclude() {
-      var args = [].slice.call(arguments)
-      , i = 0
-      , res = {};
-
-      for (; i < args.length; i++) {
-        excludeProps(res, args[i]);
-      }
-
-      return res;
-    };
-  }
-
-/*!
- * Primary Exports
- */
-
-  module.exports = AssertionError;
-
-/**
- * ### AssertionError
- *
- * An extension of the JavaScript `Error` constructor for
- * assertion and validation scenarios.
- *
- * @param {String} message
- * @param {Object} properties to include (optional)
- * @param {callee} start stack function (optional)
- */
-
-  function AssertionError(message, _props, ssf) {
-    var extend = exclude('name', 'message', 'stack', 'constructor', 'toJSON')
-    , props = extend(_props || {});
-
-  // default values
-    this.message = message || 'Unspecified AssertionError';
-    this.showDiff = false;
-
-  // copy from properties
-    for (var key in props) {
-      this[key] = props[key];
-    }
-
-  // capture stack trace
-    ssf = ssf || arguments.callee;
-    if (ssf && Error.captureStackTrace) {
-      Error.captureStackTrace(this, ssf);
-    } else {
-      this.stack = new Error().stack;
-    }
-  }
-
-/*!
- * Inherit from Error.prototype
- */
-
-  AssertionError.prototype = Object.create(Error.prototype);
-
-/*!
- * Statically set name
- */
-
-  AssertionError.prototype.name = 'AssertionError';
-
-/*!
- * Ensure correct constructor
- */
-
-  AssertionError.prototype.constructor = AssertionError;
-
-/**
- * Allow errors to be converted to JSON for static transfer.
- *
- * @param {Boolean} include stack (default: `true`)
- * @return {Object} object that can be `JSON.stringify`
- */
-
-  AssertionError.prototype.toJSON = function (stack) {
-    var extend = exclude('constructor', 'toJSON', 'stack')
-    , props = extend({ name: this.name }, this);
-
-  // include stack if exists and not turned off
-    if (false !== stack && this.stack) {
-      props.stack = this.stack;
-    }
-
-    return props;
-  };
-
-}, {}], 31:[function (require, module, exports) {
-  module.exports = require('./lib/eql');
-
-}, { './lib/eql':32 }], 32:[function (require, module, exports) {
-/*!
- * deep-eql
- * Copyright(c) 2013 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/*!
- * Module dependencies
- */
-
-  var type = require('type-detect');
-
-/*!
- * Buffer.isBuffer browser shim
- */
-
-  var Buffer;
-  try { Buffer = require('buffer').Buffer; }
-catch (ex) {
-  Buffer = {};
-  Buffer.isBuffer = function () { return false; };
-}
-
-/*!
- * Primary Export
- */
-
-  module.exports = deepEqual;
-
-/**
- * Assert super-strict (egal) equality between
- * two objects of any type.
- *
- * @param {Mixed} a
- * @param {Mixed} b
- * @param {Array} memoised (optional)
- * @return {Boolean} equal match
- */
-
-  function deepEqual(a, b, m) {
-    if (sameValue(a, b)) {
-      return true;
-    } else if ('date' === type(a)) {
-      return dateEqual(a, b);
-    } else if ('regexp' === type(a)) {
-      return regexpEqual(a, b);
-    } else if (Buffer.isBuffer(a)) {
-      return bufferEqual(a, b);
-    } else if ('arguments' === type(a)) {
-      return argumentsEqual(a, b, m);
-    } else if (!typeEqual(a, b)) {
-      return false;
-    } else if (('object' !== type(a) && 'object' !== type(b))
-  && ('array' !== type(a) && 'array' !== type(b))) {
-      return sameValue(a, b);
-    } else {
-      return objectEqual(a, b, m);
-    }
-  }
-
-/*!
- * Strict (egal) equality test. Ensures that NaN always
- * equals NaN and `-0` does not equal `+0`.
- *
- * @param {Mixed} a
- * @param {Mixed} b
- * @return {Boolean} equal match
- */
-
-  function sameValue(a, b) {
-    if (a === b) return a !== 0 || 1 / a === 1 / b;
-    return a !== a && b !== b;
-  }
-
-/*!
- * Compare the types of two given objects and
- * return if they are equal. Note that an Array
- * has a type of `array` (not `object`) and arguments
- * have a type of `arguments` (not `array`/`object`).
- *
- * @param {Mixed} a
- * @param {Mixed} b
- * @return {Boolean} result
- */
-
-  function typeEqual(a, b) {
-    return type(a) === type(b);
-  }
-
-/*!
- * Compare two Date objects by asserting that
- * the time values are equal using `saveValue`.
- *
- * @param {Date} a
- * @param {Date} b
- * @return {Boolean} result
- */
-
-  function dateEqual(a, b) {
-    if ('date' !== type(b)) return false;
-    return sameValue(a.getTime(), b.getTime());
-  }
-
-/*!
- * Compare two regular expressions by converting them
- * to string and checking for `sameValue`.
- *
- * @param {RegExp} a
- * @param {RegExp} b
- * @return {Boolean} result
- */
-
-  function regexpEqual(a, b) {
-    if ('regexp' !== type(b)) return false;
-    return sameValue(a.toString(), b.toString());
-  }
-
-/*!
- * Assert deep equality of two `arguments` objects.
- * Unfortunately, these must be sliced to arrays
- * prior to test to ensure no bad behavior.
- *
- * @param {Arguments} a
- * @param {Arguments} b
- * @param {Array} memoize (optional)
- * @return {Boolean} result
- */
-
-  function argumentsEqual(a, b, m) {
-    if ('arguments' !== type(b)) return false;
-    a = [].slice.call(a);
-    b = [].slice.call(b);
-    return deepEqual(a, b, m);
-  }
-
-/*!
- * Get enumerable properties of a given object.
- *
- * @param {Object} a
- * @return {Array} property names
- */
-
-  function enumerable(a) {
-    var res = [];
-    for (var key in a) res.push(key);
-    return res;
-  }
-
-/*!
- * Simple equality for flat iterable objects
- * such as Arrays or Node.js buffers.
- *
- * @param {Iterable} a
- * @param {Iterable} b
- * @return {Boolean} result
- */
-
-  function iterableEqual(a, b) {
-    if (a.length !== b.length) return false;
-
-    var i = 0;
-    var match = true;
-
-    for (; i < a.length; i++) {
-      if (a[i] !== b[i]) {
-        match = false;
-        break;
-      }
-    }
-
-    return match;
-  }
-
-/*!
- * Extension to `iterableEqual` specifically
- * for Node.js Buffers.
- *
- * @param {Buffer} a
- * @param {Mixed} b
- * @return {Boolean} result
- */
-
-  function bufferEqual(a, b) {
-    if (!Buffer.isBuffer(b)) return false;
-    return iterableEqual(a, b);
-  }
-
-/*!
- * Block for `objectEqual` ensuring non-existing
- * values don't get in.
- *
- * @param {Mixed} object
- * @return {Boolean} result
- */
-
-  function isValue(a) {
-    return a !== null && a !== undefined;
-  }
-
-/*!
- * Recursively check the equality of two objects.
- * Once basic sameness has been established it will
- * defer to `deepEqual` for each enumerable key
- * in the object.
- *
- * @param {Mixed} a
- * @param {Mixed} b
- * @return {Boolean} result
- */
-
-  function objectEqual(a, b, m) {
-    if (!isValue(a) || !isValue(b)) {
-      return false;
-    }
-
-    if (a.prototype !== b.prototype) {
-      return false;
-    }
-
-    var i;
-    if (m) {
-      for (i = 0; i < m.length; i++) {
-        if ((m[i][0] === a && m[i][1] === b)
-      || (m[i][0] === b && m[i][1] === a)) {
-          return true;
-        }
-      }
-    } else {
-      m = [];
-    }
-
-    try {
-      var ka = enumerable(a);
-      var kb = enumerable(b);
-    } catch (ex) {
-      return false;
-    }
-
-    ka.sort();
-    kb.sort();
-
-    if (!iterableEqual(ka, kb)) {
-      return false;
-    }
-
-    m.push([a, b]);
-
-    var key;
-    for (i = ka.length - 1; i >= 0; i--) {
-      key = ka[i];
-      if (!deepEqual(a[key], b[key], m)) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-}, { 'buffer':undefined, 'type-detect':33 }], 33:[function (require, module, exports) {
-  module.exports = require('./lib/type');
-
-}, { './lib/type':34 }], 34:[function (require, module, exports) {
-/*!
- * type-detect
- * Copyright(c) 2013 jake luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/*!
- * Primary Exports
- */
-
-  var exports = module.exports = getType;
-
-/*!
- * Detectable javascript natives
- */
-
-  var natives = {
-    '[object Array]': 'array'
-  , '[object RegExp]': 'regexp'
-  , '[object Function]': 'function'
-  , '[object Arguments]': 'arguments'
-  , '[object Date]': 'date'
-  };
-
-/**
- * ### typeOf (obj)
- *
- * Use several different techniques to determine
- * the type of object being tested.
- *
- *
- * @param {Mixed} object
- * @return {String} object type
- * @api public
- */
-
-  function getType(obj) {
-    var str = Object.prototype.toString.call(obj);
-    if (natives[str]) return natives[str];
-    if (obj === null) return 'null';
-    if (obj === undefined) return 'undefined';
-    if (obj === Object(obj)) return 'object';
-    return typeof obj;
-  }
-
-  exports.Library = Library;
-
-/**
- * ### Library
- *
- * Create a repository for custom type detection.
- *
- * ```js
- * var lib = new type.Library;
- * ```
- *
- */
-
-  function Library() {
-    this.tests = {};
-  }
-
-/**
- * #### .of (obj)
- *
- * Expose replacement `typeof` detection to the library.
- *
- * ```js
- * if ('string' === lib.of('hello world')) {
- *   // ...
- * }
- * ```
- *
- * @param {Mixed} object to test
- * @return {String} type
- */
-
-  Library.prototype.of = getType;
-
-/**
- * #### .define (type, test)
- *
- * Add a test to for the `.test()` assertion.
- *
- * Can be defined as a regular expression:
- *
- * ```js
- * lib.define('int', /^[0-9]+$/);
- * ```
- *
- * ... or as a function:
- *
- * ```js
- * lib.define('bln', function (obj) {
- *   if ('boolean' === lib.of(obj)) return true;
- *   var blns = [ 'yes', 'no', 'true', 'false', 1, 0 ];
- *   if ('string' === lib.of(obj)) obj = obj.toLowerCase();
- *   return !! ~blns.indexOf(obj);
- * });
- * ```
- *
- * @param {String} type
- * @param {RegExp|Function} test
- * @api public
- */
-
-  Library.prototype.define = function (type, test) {
-    if (arguments.length === 1) return this.tests[type];
-    this.tests[type] = test;
-    return this;
-  };
-
-/**
- * #### .test (obj, test)
- *
- * Assert that an object is of type. Will first
- * check natives, and if that does not pass it will
- * use the user defined custom tests.
- *
- * ```js
- * assert(lib.test('1', 'int'));
- * assert(lib.test('yes', 'bln'));
- * ```
- *
- * @param {Mixed} object
- * @param {String} type
- * @return {Boolean} result
- * @api public
- */
-
-  Library.prototype.test = function (obj, type) {
-    if (type === getType(obj)) return true;
-    var test = this.tests[type];
-
-    if (test && 'regexp' === getType(test)) {
-      return test.test(obj);
-    } else if (test && 'function' === getType(test)) {
-      return test(obj);
-    } else {
-      throw new ReferenceError('Type test "' + type + '" not defined or invalid.');
-    }
-  };
-
-}, {}], 35:[function (require, module, exports) {
-  arguments[4][33][0].apply(exports, arguments);
-}, { './lib/type':36, 'dup':33 }], 36:[function (require, module, exports) {
-/*!
- * type-detect
- * Copyright(c) 2013 jake luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/*!
- * Primary Exports
- */
-
-  var exports = module.exports = getType;
-
-/**
- * ### typeOf (obj)
- *
- * Use several different techniques to determine
- * the type of object being tested.
- *
- *
- * @param {Mixed} object
- * @return {String} object type
- * @api public
- */
-  var objectTypeRegexp = /^\[object (.*)\]$/;
-
-  function getType(obj) {
-    var type = Object.prototype.toString.call(obj).match(objectTypeRegexp)[1].toLowerCase();
-  // Let "new String('')" return 'object'
-    if (typeof Promise === 'function' && obj instanceof Promise) return 'promise';
-  // PhantomJS has type "DOMWindow" for null
-    if (obj === null) return 'null';
-  // PhantomJS has type "DOMWindow" for undefined
-    if (obj === undefined) return 'undefined';
-    return type;
-  }
-
-  exports.Library = Library;
-
-/**
- * ### Library
- *
- * Create a repository for custom type detection.
- *
- * ```js
- * var lib = new type.Library;
- * ```
- *
- */
-
-  function Library() {
-    if (!(this instanceof Library)) return new Library();
-    this.tests = {};
-  }
-
-/**
- * #### .of (obj)
- *
- * Expose replacement `typeof` detection to the library.
- *
- * ```js
- * if ('string' === lib.of('hello world')) {
- *   // ...
- * }
- * ```
- *
- * @param {Mixed} object to test
- * @return {String} type
- */
-
-  Library.prototype.of = getType;
-
-/**
- * #### .define (type, test)
- *
- * Add a test to for the `.test()` assertion.
- *
- * Can be defined as a regular expression:
- *
- * ```js
- * lib.define('int', /^[0-9]+$/);
- * ```
- *
- * ... or as a function:
- *
- * ```js
- * lib.define('bln', function (obj) {
- *   if ('boolean' === lib.of(obj)) return true;
- *   var blns = [ 'yes', 'no', 'true', 'false', 1, 0 ];
- *   if ('string' === lib.of(obj)) obj = obj.toLowerCase();
- *   return !! ~blns.indexOf(obj);
- * });
- * ```
- *
- * @param {String} type
- * @param {RegExp|Function} test
- * @api public
- */
-
-  Library.prototype.define = function (type, test) {
-    if (arguments.length === 1) return this.tests[type];
-    this.tests[type] = test;
-    return this;
-  };
-
-/**
- * #### .test (obj, test)
- *
- * Assert that an object is of type. Will first
- * check natives, and if that does not pass it will
- * use the user defined custom tests.
- *
- * ```js
- * assert(lib.test('1', 'int'));
- * assert(lib.test('yes', 'bln'));
- * ```
- *
- * @param {Mixed} object
- * @param {String} type
- * @return {Boolean} result
- * @api public
- */
-
-  Library.prototype.test = function (obj, type) {
-    if (type === getType(obj)) return true;
-    var test = this.tests[type];
-
-    if (test && 'regexp' === getType(test)) {
-      return test.test(obj);
-    } else if (test && 'function' === getType(test)) {
-      return test(obj);
-    } else {
-      throw new ReferenceError('Type test "' + type + '" not defined or invalid.');
-    }
-  };
-
-}, {}] }, {}, [1])(1);
-});
\ No newline at end of file
diff --git a/test/infrastructure/mocha.js b/test/infrastructure/mocha.js
deleted file mode 100644
index ec967929f..000000000
--- a/test/infrastructure/mocha.js
+++ /dev/null
@@ -1,6564 +0,0 @@
-(function () {
-
-// CommonJS require()
-
-  function require(p) {
-    var path = require.resolve(p)
-      , mod = require.modules[path];
-    if (!mod) throw new Error('failed to require "' + p + '"');
-    if (!mod.exports) {
-      mod.exports = {};
-      mod.call(mod.exports, mod, mod.exports, require.relative(path));
-    }
-    return mod.exports;
-  }
-
-  require.modules = {};
-
-  require.resolve = function (path) {
-    var orig = path
-      , reg = path + '.js'
-      , index = path + '/index.js';
-    return require.modules[reg] && reg
-      || require.modules[index] && index
-      || orig;
-  };
-
-  require.register = function (path, fn) {
-    require.modules[path] = fn;
-  };
-
-  require.relative = function (parent) {
-    return function (p) {
-      if ('.' != p.charAt(0)) return require(p);
-
-      var path = parent.split('/')
-        , segs = p.split('/');
-      path.pop();
-
-      for (var i = 0; i < segs.length; i++) {
-        var seg = segs[i];
-        if ('..' == seg) path.pop();
-        else if ('.' != seg) path.push(seg);
-      }
-
-      return require(path.join('/'));
-    };
-  };
-
-
-  require.register('browser/debug.js', function (module, exports, require) {
-    module.exports = function (type) {
-      return function () {
-      };
-    };
-
-  }); // module: browser/debug.js
-
-  require.register('browser/diff.js', function (module, exports, require) {
-/* See LICENSE file for terms of use */
-
-/*
- * Text diff implementation.
- *
- * This library supports the following APIS:
- * JsDiff.diffChars: Character by character diff
- * JsDiff.diffWords: Word (as defined by \b regex) diff which ignores whitespace
- * JsDiff.diffLines: Line based diff
- *
- * JsDiff.diffCss: Diff targeted at CSS content
- *
- * These methods are based on the implementation proposed in
- * "An O(ND) Difference Algorithm and its Variations" (Myers, 1986).
- * http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.6927
- */
-    var JsDiff = (function () {
-  /* jshint maxparams: 5*/
-      function clonePath(path) {
-        return { newPos: path.newPos, components: path.components.slice(0) };
-      }
-      function removeEmpty(array) {
-        var ret = [];
-        for (var i = 0; i < array.length; i++) {
-          if (array[i]) {
-            ret.push(array[i]);
-          }
-        }
-        return ret;
-      }
-      function escapeHTML(s) {
-        var n = s;
-        n = n.replace(/&/g, '&amp;');
-        n = n.replace(/</g, '&lt;');
-        n = n.replace(/>/g, '&gt;');
-        n = n.replace(/"/g, '&quot;');
-
-        return n;
-      }
-
-      var Diff = function (ignoreWhitespace) {
-        this.ignoreWhitespace = ignoreWhitespace;
-      };
-      Diff.prototype = {
-        diff: function (oldString, newString) {
-        // Handle the identity case (this is due to unrolling editLength == 0
-          if (newString === oldString) {
-            return [{ value: newString }];
-          }
-          if (!newString) {
-            return [{ value: oldString, removed: true }];
-          }
-          if (!oldString) {
-            return [{ value: newString, added: true }];
-          }
-
-          newString = this.tokenize(newString);
-          oldString = this.tokenize(oldString);
-
-          var newLen = newString.length, oldLen = oldString.length;
-          var maxEditLength = newLen + oldLen;
-          var bestPath = [{ newPos: -1, components: [] }];
-
-        // Seed editLength = 0
-          var oldPos = this.extractCommon(bestPath[0], newString, oldString, 0);
-          if (bestPath[0].newPos + 1 >= newLen && oldPos + 1 >= oldLen) {
-            return bestPath[0].components;
-          }
-
-          for (var editLength = 1; editLength <= maxEditLength; editLength++) {
-            for (var diagonalPath = -1 * editLength; diagonalPath <= editLength; diagonalPath += 2) {
-              var basePath;
-              var addPath = bestPath[diagonalPath - 1],
-                removePath = bestPath[diagonalPath + 1];
-              oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;
-              if (addPath) {
-              // No one else is going to attempt to use this value, clear it
-                bestPath[diagonalPath - 1] = undefined;
-              }
-
-              var canAdd = addPath && addPath.newPos + 1 < newLen;
-              var canRemove = removePath && 0 <= oldPos && oldPos < oldLen;
-              if (!canAdd && !canRemove) {
-                bestPath[diagonalPath] = undefined;
-                continue;
-              }
-
-            // Select the diagonal that we want to branch from. We select the prior
-            // path whose position in the new string is the farthest from the origin
-            // and does not pass the bounds of the diff graph
-              if (!canAdd || (canRemove && addPath.newPos < removePath.newPos)) {
-                basePath = clonePath(removePath);
-                this.pushComponent(basePath.components, oldString[oldPos], undefined, true);
-              } else {
-                basePath = clonePath(addPath);
-                basePath.newPos++;
-                this.pushComponent(basePath.components, newString[basePath.newPos], true, undefined);
-              }
-
-              var oldPos = this.extractCommon(basePath, newString, oldString, diagonalPath);
-
-              if (basePath.newPos + 1 >= newLen && oldPos + 1 >= oldLen) {
-                return basePath.components;
-              } else {
-                bestPath[diagonalPath] = basePath;
-              }
-            }
-          }
-        },
-
-        pushComponent: function (components, value, added, removed) {
-          var last = components[components.length - 1];
-          if (last && last.added === added && last.removed === removed) {
-          // We need to clone here as the component clone operation is just
-          // as shallow array clone
-            components[components.length - 1] =
-            { value: this.join(last.value, value), added: added, removed: removed };
-          } else {
-            components.push({ value: value, added: added, removed: removed });
-          }
-        },
-        extractCommon: function (basePath, newString, oldString, diagonalPath) {
-          var newLen = newString.length,
-            oldLen = oldString.length,
-            newPos = basePath.newPos,
-            oldPos = newPos - diagonalPath;
-          while (newPos + 1 < newLen && oldPos + 1 < oldLen && this.equals(newString[newPos + 1], oldString[oldPos + 1])) {
-            newPos++;
-            oldPos++;
-
-            this.pushComponent(basePath.components, newString[newPos], undefined, undefined);
-          }
-          basePath.newPos = newPos;
-          return oldPos;
-        },
-
-        equals: function (left, right) {
-          var reWhitespace = /\S/;
-          if (this.ignoreWhitespace && !reWhitespace.test(left) && !reWhitespace.test(right)) {
-            return true;
-          } else {
-            return left === right;
-          }
-        },
-        join: function (left, right) {
-          return left + right;
-        },
-        tokenize: function (value) {
-          return value;
-        }
-      };
-
-      var CharDiff = new Diff();
-
-      var WordDiff = new Diff(true);
-      var WordWithSpaceDiff = new Diff();
-      WordDiff.tokenize = WordWithSpaceDiff.tokenize = function (value) {
-        return removeEmpty(value.split(/(\s+|\b)/));
-      };
-
-      var CssDiff = new Diff(true);
-      CssDiff.tokenize = function (value) {
-        return removeEmpty(value.split(/([{}:;,]|\s+)/));
-      };
-
-      var LineDiff = new Diff();
-      LineDiff.tokenize = function (value) {
-        var retLines = [],
-          lines = value.split(/^/m);
-
-        for (var i = 0; i < lines.length; i++) {
-          var line = lines[i],
-            lastLine = lines[i - 1];
-
-      // Merge lines that may contain windows new lines
-          if (line == '\n' && lastLine && lastLine[lastLine.length - 1] === '\r') {
-            retLines[retLines.length - 1] += '\n';
-          } else if (line) {
-            retLines.push(line);
-          }
-        }
-
-        return retLines;
-      };
-
-      return {
-        Diff: Diff,
-
-        diffChars: function (oldStr, newStr) { return CharDiff.diff(oldStr, newStr); },
-        diffWords: function (oldStr, newStr) { return WordDiff.diff(oldStr, newStr); },
-        diffWordsWithSpace: function (oldStr, newStr) { return WordWithSpaceDiff.diff(oldStr, newStr); },
-        diffLines: function (oldStr, newStr) { return LineDiff.diff(oldStr, newStr); },
-
-        diffCss: function (oldStr, newStr) { return CssDiff.diff(oldStr, newStr); },
-
-        createPatch: function (fileName, oldStr, newStr, oldHeader, newHeader) {
-          var ret = [];
-
-          ret.push('Index: ' + fileName);
-          ret.push('===================================================================');
-          ret.push('--- ' + fileName + (typeof oldHeader === 'undefined' ? '' : '\t' + oldHeader));
-          ret.push('+++ ' + fileName + (typeof newHeader === 'undefined' ? '' : '\t' + newHeader));
-
-          var diff = LineDiff.diff(oldStr, newStr);
-          if (!diff[diff.length - 1].value) {
-            diff.pop();   // Remove trailing newline add
-          }
-          diff.push({ value: '', lines: [] });   // Append an empty value to make cleanup easier
-
-          function contextLines(lines) {
-            return lines.map(function (entry) { return ' ' + entry; });
-          }
-          function eofNL(curRange, i, current) {
-            var last = diff[diff.length - 2],
-              isLast = i === diff.length - 2,
-              isLastOfType = i === diff.length - 3 && (current.added !== last.added || current.removed !== last.removed);
-
-        // Figure out if this is the last line for the given file and missing NL
-            if (!/\n$/.test(current.value) && (isLast || isLastOfType)) {
-              curRange.push('\\ No newline at end of file');
-            }
-          }
-
-          var oldRangeStart = 0, newRangeStart = 0, curRange = [],
-            oldLine = 1, newLine = 1;
-          for (var i = 0; i < diff.length; i++) {
-            var current = diff[i],
-              lines = current.lines || current.value.replace(/\n$/, '').split('\n');
-            current.lines = lines;
-
-            if (current.added || current.removed) {
-              if (!oldRangeStart) {
-                var prev = diff[i - 1];
-                oldRangeStart = oldLine;
-                newRangeStart = newLine;
-
-                if (prev) {
-                  curRange = contextLines(prev.lines.slice(-4));
-                  oldRangeStart -= curRange.length;
-                  newRangeStart -= curRange.length;
-                }
-              }
-              curRange.push.apply(curRange, lines.map(function (entry) { return (current.added ? '+' : '-') + entry; }));
-              eofNL(curRange, i, current);
-
-              if (current.added) {
-                newLine += lines.length;
-              } else {
-                oldLine += lines.length;
-              }
-            } else {
-              if (oldRangeStart) {
-            // Close out any changes that have been output (or join overlapping)
-                if (lines.length <= 8 && i < diff.length - 2) {
-              // Overlapping
-                  curRange.push.apply(curRange, contextLines(lines));
-                } else {
-              // end the range and output
-                  var contextSize = Math.min(lines.length, 4);
-                  ret.push(
-                  '@@ -' + oldRangeStart + ',' + (oldLine - oldRangeStart + contextSize)
-                  + ' +' + newRangeStart + ',' + (newLine - newRangeStart + contextSize)
-                  + ' @@');
-                  ret.push.apply(ret, curRange);
-                  ret.push.apply(ret, contextLines(lines.slice(0, contextSize)));
-                  if (lines.length <= 4) {
-                    eofNL(ret, i, current);
-                  }
-
-                  oldRangeStart = 0; newRangeStart = 0; curRange = [];
-                }
-              }
-              oldLine += lines.length;
-              newLine += lines.length;
-            }
-          }
-
-          return ret.join('\n') + '\n';
-        },
-
-        applyPatch: function (oldStr, uniDiff) {
-          var diffstr = uniDiff.split('\n');
-          var diff = [];
-          var remEOFNL = false,
-            addEOFNL = false;
-
-          for (var i = (diffstr[0][0] === 'I' ? 4 : 0); i < diffstr.length; i++) {
-            if (diffstr[i][0] === '@') {
-              var meh = diffstr[i].split(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
-              diff.unshift({
-                start:meh[3],
-                oldlength:meh[2],
-                oldlines:[],
-                newlength:meh[4],
-                newlines:[]
-              });
-            } else if (diffstr[i][0] === '+') {
-              diff[0].newlines.push(diffstr[i].substr(1));
-            } else if (diffstr[i][0] === '-') {
-              diff[0].oldlines.push(diffstr[i].substr(1));
-            } else if (diffstr[i][0] === ' ') {
-              diff[0].newlines.push(diffstr[i].substr(1));
-              diff[0].oldlines.push(diffstr[i].substr(1));
-            } else if (diffstr[i][0] === '\\') {
-            if (diffstr[i - 1][0] === '+') {
-            remEOFNL = true;
-          } else if (diffstr[i - 1][0] === '-') {
-            addEOFNL = true;
-          }
-          }
-          }
-
-          var str = oldStr.split('\n');
-          for (var i = diff.length - 1; i >= 0; i--) {
-            var d = diff[i];
-            for (var j = 0; j < d.oldlength; j++) {
-              if (str[d.start - 1 + j] !== d.oldlines[j]) {
-                return false;
-              }
-            }
-            Array.prototype.splice.apply(str, [d.start - 1, +d.oldlength].concat(d.newlines));
-          }
-
-          if (remEOFNL) {
-            while (!str[str.length - 1]) {
-              str.pop();
-            }
-          } else if (addEOFNL) {
-            str.push('');
-          }
-          return str.join('\n');
-        },
-
-        convertChangesToXML: function (changes) {
-          var ret = [];
-          for (var i = 0; i < changes.length; i++) {
-            var change = changes[i];
-            if (change.added) {
-              ret.push('<ins>');
-            } else if (change.removed) {
-              ret.push('<del>');
-            }
-
-            ret.push(escapeHTML(change.value));
-
-            if (change.added) {
-              ret.push('</ins>');
-            } else if (change.removed) {
-              ret.push('</del>');
-            }
-          }
-          return ret.join('');
-        },
-
-    // See: http://code.google.com/p/google-diff-match-patch/wiki/API
-        convertChangesToDMP: function (changes) {
-          var ret = [], change;
-          for (var i = 0; i < changes.length; i++) {
-            change = changes[i];
-            ret.push([(change.added ? 1 : change.removed ? -1 : 0), change.value]);
-          }
-          return ret;
-        }
-      };
-    })();
-
-    if (typeof module !== 'undefined') {
-      module.exports = JsDiff;
-    }
-
-  }); // module: browser/diff.js
-
-  require.register('browser/escape-string-regexp.js', function (module, exports, require) {
-    'use strict';
-
-    var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
-
-    module.exports = function (str) {
-      if (typeof str !== 'string') {
-        throw new TypeError('Expected a string');
-      }
-
-      return str.replace(matchOperatorsRe, '\\$&');
-    };
-
-  }); // module: browser/escape-string-regexp.js
-
-  require.register('browser/events.js', function (module, exports, require) {
-/**
- * Module exports.
- */
-
-    exports.EventEmitter = EventEmitter;
-
-/**
- * Check if `obj` is an array.
- */
-
-    function isArray(obj) {
-      return '[object Array]' == {}.toString.call(obj);
-    }
-
-/**
- * Event emitter constructor.
- *
- * @api public
- */
-
-    function EventEmitter() {}
-
-/**
- * Adds a listener.
- *
- * @api public
- */
-
-    EventEmitter.prototype.on = function (name, fn) {
-      if (!this.$events) {
-        this.$events = {};
-      }
-
-      if (!this.$events[name]) {
-        this.$events[name] = fn;
-      } else if (isArray(this.$events[name])) {
-        this.$events[name].push(fn);
-      } else {
-        this.$events[name] = [this.$events[name], fn];
-      }
-
-      return this;
-    };
-
-    EventEmitter.prototype.addListener = EventEmitter.prototype.on;
-
-/**
- * Adds a volatile listener.
- *
- * @api public
- */
-
-    EventEmitter.prototype.once = function (name, fn) {
-      var self = this;
-
-      function on() {
-        self.removeListener(name, on);
-        fn.apply(this, arguments);
-      }
-
-      on.listener = fn;
-      this.on(name, on);
-
-      return this;
-    };
-
-/**
- * Removes a listener.
- *
- * @api public
- */
-
-    EventEmitter.prototype.removeListener = function (name, fn) {
-      if (this.$events && this.$events[name]) {
-        var list = this.$events[name];
-
-        if (isArray(list)) {
-          var pos = -1;
-
-          for (var i = 0, l = list.length; i < l; i++) {
-            if (list[i] === fn || (list[i].listener && list[i].listener === fn)) {
-              pos = i;
-              break;
-            }
-          }
-
-          if (pos < 0) {
-            return this;
-          }
-
-          list.splice(pos, 1);
-
-          if (!list.length) {
-            delete this.$events[name];
-          }
-        } else if (list === fn || (list.listener && list.listener === fn)) {
-          delete this.$events[name];
-        }
-      }
-
-      return this;
-    };
-
-/**
- * Removes all listeners for an event.
- *
- * @api public
- */
-
-    EventEmitter.prototype.removeAllListeners = function (name) {
-      if (name === undefined) {
-        this.$events = {};
-        return this;
-      }
-
-      if (this.$events && this.$events[name]) {
-        this.$events[name] = null;
-      }
-
-      return this;
-    };
-
-/**
- * Gets all listeners for a certain event.
- *
- * @api public
- */
-
-    EventEmitter.prototype.listeners = function (name) {
-      if (!this.$events) {
-        this.$events = {};
-      }
-
-      if (!this.$events[name]) {
-        this.$events[name] = [];
-      }
-
-      if (!isArray(this.$events[name])) {
-        this.$events[name] = [this.$events[name]];
-      }
-
-      return this.$events[name];
-    };
-
-/**
- * Emits an event.
- *
- * @api public
- */
-
-    EventEmitter.prototype.emit = function (name) {
-      if (!this.$events) {
-        return false;
-      }
-
-      var handler = this.$events[name];
-
-      if (!handler) {
-        return false;
-      }
-
-      var args = [].slice.call(arguments, 1);
-
-      if ('function' == typeof handler) {
-        handler.apply(this, args);
-      } else if (isArray(handler)) {
-        var listeners = handler.slice();
-
-        for (var i = 0, l = listeners.length; i < l; i++) {
-          listeners[i].apply(this, args);
-        }
-      } else {
-        return false;
-      }
-
-      return true;
-    };
-
-  }); // module: browser/events.js
-
-  require.register('browser/fs.js', function (module, exports, require) {
-
-  }); // module: browser/fs.js
-
-  require.register('browser/glob.js', function (module, exports, require) {
-
-  }); // module: browser/glob.js
-
-  require.register('browser/path.js', function (module, exports, require) {
-
-  }); // module: browser/path.js
-
-  require.register('browser/progress.js', function (module, exports, require) {
-/**
- * Expose `Progress`.
- */
-
-    module.exports = Progress;
-
-/**
- * Initialize a new `Progress` indicator.
- */
-
-    function Progress() {
-      this.percent = 0;
-      this.size(0);
-      this.fontSize(11);
-      this.font('helvetica, arial, sans-serif');
-    }
-
-/**
- * Set progress size to `n`.
- *
- * @param {Number} n
- * @return {Progress} for chaining
- * @api public
- */
-
-    Progress.prototype.size = function (n) {
-      this._size = n;
-      return this;
-    };
-
-/**
- * Set text to `str`.
- *
- * @param {String} str
- * @return {Progress} for chaining
- * @api public
- */
-
-    Progress.prototype.text = function (str) {
-      this._text = str;
-      return this;
-    };
-
-/**
- * Set font size to `n`.
- *
- * @param {Number} n
- * @return {Progress} for chaining
- * @api public
- */
-
-    Progress.prototype.fontSize = function (n) {
-      this._fontSize = n;
-      return this;
-    };
-
-/**
- * Set font `family`.
- *
- * @param {String} family
- * @return {Progress} for chaining
- */
-
-    Progress.prototype.font = function (family) {
-      this._font = family;
-      return this;
-    };
-
-/**
- * Update percentage to `n`.
- *
- * @param {Number} n
- * @return {Progress} for chaining
- */
-
-    Progress.prototype.update = function (n) {
-      this.percent = n;
-      return this;
-    };
-
-/**
- * Draw on `ctx`.
- *
- * @param {CanvasRenderingContext2d} ctx
- * @return {Progress} for chaining
- */
-
-    Progress.prototype.draw = function (ctx) {
-      try {
-        var percent = Math.min(this.percent, 100)
-      , size = this._size
-      , half = size / 2
-      , x = half
-      , y = half
-      , rad = half - 1
-      , fontSize = this._fontSize;
-
-        ctx.font = fontSize + 'px ' + this._font;
-
-        var angle = Math.PI * 2 * (percent / 100);
-        ctx.clearRect(0, 0, size, size);
-
-    // outer circle
-        ctx.strokeStyle = '#9f9f9f';
-        ctx.beginPath();
-        ctx.arc(x, y, rad, 0, angle, false);
-        ctx.stroke();
-
-    // inner circle
-        ctx.strokeStyle = '#eee';
-        ctx.beginPath();
-        ctx.arc(x, y, rad - 1, 0, angle, true);
-        ctx.stroke();
-
-    // text
-        var text = this._text || (percent | 0) + '%'
-      , w = ctx.measureText(text).width;
-
-        ctx.fillText(
-        text
-      , x - w / 2 + 1
-      , y + fontSize / 2 - 1);
-      } catch (ex) {} // don't fail if we can't render progress
-      return this;
-    };
-
-  }); // module: browser/progress.js
-
-  require.register('browser/tty.js', function (module, exports, require) {
-    exports.isatty = function () {
-      return true;
-    };
-
-    exports.getWindowSize = function () {
-      if ('innerHeight' in global) {
-        return [global.innerHeight, global.innerWidth];
-      } else {
-    // In a Web Worker, the DOM Window is not available.
-        return [640, 480];
-      }
-    };
-
-  }); // module: browser/tty.js
-
-  require.register('context.js', function (module, exports, require) {
-/**
- * Expose `Context`.
- */
-
-    module.exports = Context;
-
-/**
- * Initialize a new `Context`.
- *
- * @api private
- */
-
-    function Context() {}
-
-/**
- * Set or get the context `Runnable` to `runnable`.
- *
- * @param {Runnable} runnable
- * @return {Context}
- * @api private
- */
-
-    Context.prototype.runnable = function (runnable) {
-      if (0 == arguments.length) return this._runnable;
-      this.test = this._runnable = runnable;
-      return this;
-    };
-
-/**
- * Set test timeout `ms`.
- *
- * @param {Number} ms
- * @return {Context} self
- * @api private
- */
-
-    Context.prototype.timeout = function (ms) {
-      if (arguments.length === 0) return this.runnable().timeout();
-      this.runnable().timeout(ms);
-      return this;
-    };
-
-/**
- * Set test timeout `enabled`.
- *
- * @param {Boolean} enabled
- * @return {Context} self
- * @api private
- */
-
-    Context.prototype.enableTimeouts = function (enabled) {
-      this.runnable().enableTimeouts(enabled);
-      return this;
-    };
-
-
-/**
- * Set test slowness threshold `ms`.
- *
- * @param {Number} ms
- * @return {Context} self
- * @api private
- */
-
-    Context.prototype.slow = function (ms) {
-      this.runnable().slow(ms);
-      return this;
-    };
-
-/**
- * Mark a test as skipped.
- *
- * @return {Context} self
- * @api private
- */
-
-    Context.prototype.skip = function () {
-      this.runnable().skip();
-      return this;
-    };
-
-/**
- * Inspect the context void of `._runnable`.
- *
- * @return {String}
- * @api private
- */
-
-    Context.prototype.inspect = function () {
-      return JSON.stringify(this, function (key, val) {
-        if ('_runnable' == key) return;
-        if ('test' == key) return;
-        return val;
-      }, 2);
-    };
-
-  }); // module: context.js
-
-  require.register('hook.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Runnable = require('./runnable');
-
-/**
- * Expose `Hook`.
- */
-
-    module.exports = Hook;
-
-/**
- * Initialize a new `Hook` with the given `title` and callback `fn`.
- *
- * @param {String} title
- * @param {Function} fn
- * @api private
- */
-
-    function Hook(title, fn) {
-      Runnable.call(this, title, fn);
-      this.type = 'hook';
-    }
-
-/**
- * Inherit from `Runnable.prototype`.
- */
-
-    function F() {}
-    F.prototype = Runnable.prototype;
-    Hook.prototype = new F;
-    Hook.prototype.constructor = Hook;
-
-
-/**
- * Get or set the test `err`.
- *
- * @param {Error} err
- * @return {Error}
- * @api public
- */
-
-    Hook.prototype.error = function (err) {
-      if (0 == arguments.length) {
-        var err = this._error;
-        this._error = null;
-        return err;
-      }
-
-      this._error = err;
-    };
-
-  }); // module: hook.js
-
-  require.register('interfaces/bdd.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Suite = require('../suite')
-  , Test = require('../test')
-  , utils = require('../utils')
-  , escapeRe = require('browser/escape-string-regexp');
-
-/**
- * BDD-style interface:
- *
- *      describe('Array', function(){
- *        describe('#indexOf()', function(){
- *          it('should return -1 when not present', function(){
- *
- *          });
- *
- *          it('should return the index when present', function(){
- *
- *          });
- *        });
- *      });
- *
- */
-
-    module.exports = function (suite) {
-      var suites = [suite];
-
-      suite.on('pre-require', function (context, file, mocha) {
-
-        var common = require('./common')(suites, context);
-
-        context.before = common.before;
-        context.after = common.after;
-        context.beforeEach = common.beforeEach;
-        context.afterEach = common.afterEach;
-        context.run = mocha.options.delay && common.runWithSuite(suite);
-    /**
-     * Describe a "suite" with the given `title`
-     * and callback `fn` containing nested suites
-     * and/or tests.
-     */
-
-        context.describe = context.context = function (title, fn) {
-          var suite = Suite.create(suites[0], title);
-          suite.file = file;
-          suites.unshift(suite);
-          fn.call(suite);
-          suites.shift();
-          return suite;
-        };
-
-    /**
-     * Pending describe.
-     */
-
-        context.xdescribe =
-    context.xcontext =
-    context.describe.skip = function (title, fn) {
-      var suite = Suite.create(suites[0], title);
-      suite.pending = true;
-      suites.unshift(suite);
-      fn.call(suite);
-      suites.shift();
-    };
-
-    /**
-     * Exclusive suite.
-     */
-
-        context.describe.only = function (title, fn) {
-          var suite = context.describe(title, fn);
-          mocha.grep(suite.fullTitle());
-          return suite;
-        };
-
-    /**
-     * Describe a specification or test-case
-     * with the given `title` and callback `fn`
-     * acting as a thunk.
-     */
-
-        context.it = context.specify = function (title, fn) {
-          var suite = suites[0];
-          if (suite.pending) fn = null;
-          var test = new Test(title, fn);
-          test.file = file;
-          suite.addTest(test);
-          return test;
-        };
-
-    /**
-     * Exclusive test-case.
-     */
-
-        context.it.only = function (title, fn) {
-          var test = context.it(title, fn);
-          var reString = '^' + escapeRe(test.fullTitle()) + '$';
-          mocha.grep(new RegExp(reString));
-          return test;
-        };
-
-    /**
-     * Pending test case.
-     */
-
-        context.xit =
-    context.xspecify =
-    context.it.skip = function (title) {
-      context.it(title);
-    };
-
-      });
-    };
-
-  }); // module: interfaces/bdd.js
-
-  require.register('interfaces/common.js', function (module, exports, require) {
-/**
- * Functions common to more than one interface
- * @module lib/interfaces/common
- */
-
-    'use strict';
-
-    module.exports = function (suites, context) {
-
-      return {
-    /**
-     * This is only present if flag --delay is passed into Mocha.  It triggers
-     * root suite execution.  Returns a function which runs the root suite.
-     */
-        runWithSuite: function runWithSuite(suite) {
-          return function run() {
-            suite.run();
-          };
-        },
-
-    /**
-     * Execute before running tests.
-     */
-        before: function (name, fn) {
-          suites[0].beforeAll(name, fn);
-        },
-
-    /**
-     * Execute after running tests.
-     */
-        after: function (name, fn) {
-          suites[0].afterAll(name, fn);
-        },
-
-    /**
-     * Execute before each test case.
-     */
-        beforeEach: function (name, fn) {
-          suites[0].beforeEach(name, fn);
-        },
-
-    /**
-     * Execute after each test case.
-     */
-        afterEach: function (name, fn) {
-          suites[0].afterEach(name, fn);
-        },
-
-        test: {
-      /**
-       * Pending test case.
-       */
-          skip: function (title) {
-            context.test(title);
-          }
-        }
-      };
-    };
-
-  }); // module: interfaces/common.js
-
-  require.register('interfaces/exports.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Suite = require('../suite')
-  , Test = require('../test');
-
-/**
- * TDD-style interface:
- *
- *     exports.Array = {
- *       '#indexOf()': {
- *         'should return -1 when the value is not present': function(){
- *
- *         },
- *
- *         'should return the correct index when the value is present': function(){
- *
- *         }
- *       }
- *     };
- *
- */
-
-    module.exports = function (suite) {
-      var suites = [suite];
-
-      suite.on('require', visit);
-
-      function visit(obj, file) {
-        var suite;
-        for (var key in obj) {
-          if ('function' == typeof obj[key]) {
-            var fn = obj[key];
-            switch (key) {
-              case 'before':
-                suites[0].beforeAll(fn);
-                break;
-              case 'after':
-                suites[0].afterAll(fn);
-                break;
-              case 'beforeEach':
-                suites[0].beforeEach(fn);
-                break;
-              case 'afterEach':
-                suites[0].afterEach(fn);
-                break;
-              default:
-                var test = new Test(key, fn);
-                test.file = file;
-                suites[0].addTest(test);
-            }
-          } else {
-            suite = Suite.create(suites[0], key);
-            suites.unshift(suite);
-            visit(obj[key]);
-            suites.shift();
-          }
-        }
-      }
-    };
-
-  }); // module: interfaces/exports.js
-
-  require.register('interfaces/index.js', function (module, exports, require) {
-    exports.bdd = require('./bdd');
-    exports.tdd = require('./tdd');
-    exports.qunit = require('./qunit');
-    exports.exports = require('./exports');
-
-  }); // module: interfaces/index.js
-
-  require.register('interfaces/qunit.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Suite = require('../suite')
-  , Test = require('../test')
-  , escapeRe = require('browser/escape-string-regexp')
-  , utils = require('../utils');
-
-/**
- * QUnit-style interface:
- *
- *     suite('Array');
- *
- *     test('#length', function(){
- *       var arr = [1,2,3];
- *       ok(arr.length == 3);
- *     });
- *
- *     test('#indexOf()', function(){
- *       var arr = [1,2,3];
- *       ok(arr.indexOf(1) == 0);
- *       ok(arr.indexOf(2) == 1);
- *       ok(arr.indexOf(3) == 2);
- *     });
- *
- *     suite('String');
- *
- *     test('#length', function(){
- *       ok('foo'.length == 3);
- *     });
- *
- */
-
-    module.exports = function (suite) {
-      var suites = [suite];
-
-      suite.on('pre-require', function (context, file, mocha) {
-
-        var common = require('./common')(suites, context);
-
-        context.before = common.before;
-        context.after = common.after;
-        context.beforeEach = common.beforeEach;
-        context.afterEach = common.afterEach;
-        context.run = mocha.options.delay && common.runWithSuite(suite);
-    /**
-     * Describe a "suite" with the given `title`.
-     */
-
-        context.suite = function (title) {
-          if (suites.length > 1) suites.shift();
-          var suite = Suite.create(suites[0], title);
-          suite.file = file;
-          suites.unshift(suite);
-          return suite;
-        };
-
-    /**
-     * Exclusive test-case.
-     */
-
-        context.suite.only = function (title, fn) {
-          var suite = context.suite(title, fn);
-          mocha.grep(suite.fullTitle());
-        };
-
-    /**
-     * Describe a specification or test-case
-     * with the given `title` and callback `fn`
-     * acting as a thunk.
-     */
-
-        context.test = function (title, fn) {
-          var test = new Test(title, fn);
-          test.file = file;
-          suites[0].addTest(test);
-          return test;
-        };
-
-    /**
-     * Exclusive test-case.
-     */
-
-        context.test.only = function (title, fn) {
-          var test = context.test(title, fn);
-          var reString = '^' + escapeRe(test.fullTitle()) + '$';
-          mocha.grep(new RegExp(reString));
-        };
-
-        context.test.skip = common.test.skip;
-
-      });
-    };
-
-  }); // module: interfaces/qunit.js
-
-  require.register('interfaces/tdd.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Suite = require('../suite')
-  , Test = require('../test')
-  , escapeRe = require('browser/escape-string-regexp')
-  , utils = require('../utils');
-
-/**
- * TDD-style interface:
- *
- *      suite('Array', function(){
- *        suite('#indexOf()', function(){
- *          suiteSetup(function(){
- *
- *          });
- *
- *          test('should return -1 when not present', function(){
- *
- *          });
- *
- *          test('should return the index when present', function(){
- *
- *          });
- *
- *          suiteTeardown(function(){
- *
- *          });
- *        });
- *      });
- *
- */
-
-    module.exports = function (suite) {
-      var suites = [suite];
-
-      suite.on('pre-require', function (context, file, mocha) {
-
-        var common = require('./common')(suites, context);
-
-        context.setup = common.beforeEach;
-        context.teardown = common.afterEach;
-        context.suiteSetup = common.before;
-        context.suiteTeardown = common.after;
-        context.run = mocha.options.delay && common.runWithSuite(suite);
-    /**
-     * Describe a "suite" with the given `title`
-     * and callback `fn` containing nested suites
-     * and/or tests.
-     */
-
-        context.suite = function (title, fn) {
-          var suite = Suite.create(suites[0], title);
-          suite.file = file;
-          suites.unshift(suite);
-          fn.call(suite);
-          suites.shift();
-          return suite;
-        };
-
-    /**
-     * Pending suite.
-     */
-        context.suite.skip = function (title, fn) {
-          var suite = Suite.create(suites[0], title);
-          suite.pending = true;
-          suites.unshift(suite);
-          fn.call(suite);
-          suites.shift();
-        };
-
-    /**
-     * Exclusive test-case.
-     */
-
-        context.suite.only = function (title, fn) {
-          var suite = context.suite(title, fn);
-          mocha.grep(suite.fullTitle());
-        };
-
-    /**
-     * Describe a specification or test-case
-     * with the given `title` and callback `fn`
-     * acting as a thunk.
-     */
-
-        context.test = function (title, fn) {
-          var suite = suites[0];
-          if (suite.pending) fn = null;
-          var test = new Test(title, fn);
-          test.file = file;
-          suite.addTest(test);
-          return test;
-        };
-
-    /**
-     * Exclusive test-case.
-     */
-
-        context.test.only = function (title, fn) {
-          var test = context.test(title, fn);
-          var reString = '^' + escapeRe(test.fullTitle()) + '$';
-          mocha.grep(new RegExp(reString));
-        };
-
-        context.test.skip = common.test.skip;
-      });
-    };
-
-  }); // module: interfaces/tdd.js
-
-  require.register('mocha.js', function (module, exports, require) {
-/*!
- * mocha
- * Copyright(c) 2011 TJ Holowaychuk <tj@vision-media.ca>
- * MIT Licensed
- */
-
-/**
- * Module dependencies.
- */
-
-    var path = require('browser/path')
-  , escapeRe = require('browser/escape-string-regexp')
-  , utils = require('./utils');
-
-/**
- * Expose `Mocha`.
- */
-
-    exports = module.exports = Mocha;
-
-/**
- * To require local UIs and reporters when running in node.
- */
-
-    if (typeof process !== 'undefined' && typeof process.cwd === 'function') {
-      var join = path.join
-    , cwd = process.cwd();
-      module.paths.push(cwd, join(cwd, 'node_modules'));
-    }
-
-/**
- * Expose internals.
- */
-
-    exports.utils = utils;
-    exports.interfaces = require('./interfaces');
-    exports.reporters = require('./reporters');
-    exports.Runnable = require('./runnable');
-    exports.Context = require('./context');
-    exports.Runner = require('./runner');
-    exports.Suite = require('./suite');
-    exports.Hook = require('./hook');
-    exports.Test = require('./test');
-
-/**
- * Return image `name` path.
- *
- * @param {String} name
- * @return {String}
- * @api private
- */
-
-    function image(name) {
-      return __dirname + '/../images/' + name + '.png';
-    }
-
-/**
- * Setup mocha with `options`.
- *
- * Options:
- *
- *   - `ui` name "bdd", "tdd", "exports" etc
- *   - `reporter` reporter instance, defaults to `mocha.reporters.spec`
- *   - `globals` array of accepted globals
- *   - `timeout` timeout in milliseconds
- *   - `bail` bail on the first test failure
- *   - `slow` milliseconds to wait before considering a test slow
- *   - `ignoreLeaks` ignore global leaks
- *   - `fullTrace` display the full stack-trace on failing
- *   - `grep` string or regexp to filter tests with
- *
- * @param {Object} options
- * @api public
- */
-
-    function Mocha(options) {
-      options = options || {};
-      this.files = [];
-      this.options = options;
-      if (options.grep) this.grep(new RegExp(options.grep));
-      if (options.fgrep) this.grep(options.fgrep);
-      this.suite = new exports.Suite('', new exports.Context);
-      this.ui(options.ui);
-      this.bail(options.bail);
-      this.reporter(options.reporter, options.reporterOptions);
-      if (null != options.timeout) this.timeout(options.timeout);
-      this.useColors(options.useColors);
-      if (options.enableTimeouts !== null) this.enableTimeouts(options.enableTimeouts);
-      if (options.slow) this.slow(options.slow);
-
-      this.suite.on('pre-require', function (context) {
-        exports.afterEach = context.afterEach || context.teardown;
-        exports.after = context.after || context.suiteTeardown;
-        exports.beforeEach = context.beforeEach || context.setup;
-        exports.before = context.before || context.suiteSetup;
-        exports.describe = context.describe || context.suite;
-        exports.it = context.it || context.test;
-        exports.setup = context.setup || context.beforeEach;
-        exports.suiteSetup = context.suiteSetup || context.before;
-        exports.suiteTeardown = context.suiteTeardown || context.after;
-        exports.suite = context.suite || context.describe;
-        exports.teardown = context.teardown || context.afterEach;
-        exports.test = context.test || context.it;
-        exports.run = context.run;
-      });
-    }
-
-/**
- * Enable or disable bailing on the first failure.
- *
- * @param {Boolean} [bail]
- * @api public
- */
-
-    Mocha.prototype.bail = function (bail) {
-      if (0 == arguments.length) bail = true;
-      this.suite.bail(bail);
-      return this;
-    };
-
-/**
- * Add test `file`.
- *
- * @param {String} file
- * @api public
- */
-
-    Mocha.prototype.addFile = function (file) {
-      this.files.push(file);
-      return this;
-    };
-
-/**
- * Set reporter to `reporter`, defaults to "spec".
- *
- * @param {String|Function} reporter name or constructor
- * @param {Object} reporterOptions optional options
- * @api public
- */
-    Mocha.prototype.reporter = function (reporter, reporterOptions) {
-      if ('function' == typeof reporter) {
-        this._reporter = reporter;
-      } else {
-        reporter = reporter || 'spec';
-        var _reporter;
-        try { _reporter = require('./reporters/' + reporter); } catch (err) {}
-        if (!_reporter) try { _reporter = require(reporter); } catch (err) {
-          err.message.indexOf('Cannot find module') !== -1
-        ? console.warn('"' + reporter + '" reporter not found')
-        : console.warn('"' + reporter + '" reporter blew up with error:\n' + err.stack);
-        }
-        if (!_reporter && reporter === 'teamcity')
-          console.warn('The Teamcity reporter was moved to a package named ' +
-        'mocha-teamcity-reporter ' +
-        '(https://npmjs.org/package/mocha-teamcity-reporter).');
-        if (!_reporter) throw new Error('invalid reporter "' + reporter + '"');
-        this._reporter = _reporter;
-      }
-      this.options.reporterOptions = reporterOptions;
-      return this;
-    };
-
-/**
- * Set test UI `name`, defaults to "bdd".
- *
- * @param {String} bdd
- * @api public
- */
-
-    Mocha.prototype.ui = function (name) {
-      name = name || 'bdd';
-      this._ui = exports.interfaces[name];
-      if (!this._ui) try { this._ui = require(name); } catch (err) {}
-      if (!this._ui) throw new Error('invalid interface "' + name + '"');
-      this._ui = this._ui(this.suite);
-      return this;
-    };
-
-/**
- * Load registered files.
- *
- * @api private
- */
-
-    Mocha.prototype.loadFiles = function (fn) {
-      var self = this;
-      var suite = this.suite;
-      var pending = this.files.length;
-      this.files.forEach(function (file) {
-        file = path.resolve(file);
-        suite.emit('pre-require', global, file, self);
-        suite.emit('require', require(file), file, self);
-        suite.emit('post-require', global, file, self);
-        --pending || (fn && fn());
-      });
-    };
-
-/**
- * Enable growl support.
- *
- * @api private
- */
-
-    Mocha.prototype._growl = function (runner, reporter) {
-      var notify = require('growl');
-
-      runner.on('end', function () {
-        var stats = reporter.stats;
-        if (stats.failures) {
-          var msg = stats.failures + ' of ' + runner.total + ' tests failed';
-          notify(msg, { name: 'mocha', title: 'Failed', image: image('error') });
-        } else {
-          notify(stats.passes + ' tests passed in ' + stats.duration + 'ms', {
-            name: 'mocha'
-        , title: 'Passed'
-        , image: image('ok')
-          });
-        }
-      });
-    };
-
-/**
- * Add regexp to grep, if `re` is a string it is escaped.
- *
- * @param {RegExp|String} re
- * @return {Mocha}
- * @api public
- */
-
-    Mocha.prototype.grep = function (re) {
-      this.options.grep = 'string' == typeof re
-    ? new RegExp(escapeRe(re))
-    : re;
-      return this;
-    };
-
-/**
- * Invert `.grep()` matches.
- *
- * @return {Mocha}
- * @api public
- */
-
-    Mocha.prototype.invert = function () {
-      this.options.invert = true;
-      return this;
-    };
-
-/**
- * Ignore global leaks.
- *
- * @param {Boolean} ignore
- * @return {Mocha}
- * @api public
- */
-
-    Mocha.prototype.ignoreLeaks = function (ignore) {
-      this.options.ignoreLeaks = !!ignore;
-      return this;
-    };
-
-/**
- * Enable global leak checking.
- *
- * @return {Mocha}
- * @api public
- */
-
-    Mocha.prototype.checkLeaks = function () {
-      this.options.ignoreLeaks = false;
-      return this;
-    };
-
-/**
- * Display long stack-trace on failing
- *
- * @return {Mocha}
- * @api public
- */
-
-    Mocha.prototype.fullTrace = function () {
-      this.options.fullStackTrace = true;
-      return this;
-    };
-
-/**
- * Enable growl support.
- *
- * @return {Mocha}
- * @api public
- */
-
-    Mocha.prototype.growl = function () {
-      this.options.growl = true;
-      return this;
-    };
-
-/**
- * Ignore `globals` array or string.
- *
- * @param {Array|String} globals
- * @return {Mocha}
- * @api public
- */
-
-    Mocha.prototype.globals = function (globals) {
-      this.options.globals = (this.options.globals || []).concat(globals);
-      return this;
-    };
-
-/**
- * Emit color output.
- *
- * @param {Boolean} colors
- * @return {Mocha}
- * @api public
- */
-
-    Mocha.prototype.useColors = function (colors) {
-      if (colors !== undefined) {
-        this.options.useColors = colors;
-      }
-      return this;
-    };
-
-/**
- * Use inline diffs rather than +/-.
- *
- * @param {Boolean} inlineDiffs
- * @return {Mocha}
- * @api public
- */
-
-    Mocha.prototype.useInlineDiffs = function (inlineDiffs) {
-      this.options.useInlineDiffs = arguments.length && inlineDiffs != undefined
-  ? inlineDiffs
-  : false;
-      return this;
-    };
-
-/**
- * Set the timeout in milliseconds.
- *
- * @param {Number} timeout
- * @return {Mocha}
- * @api public
- */
-
-    Mocha.prototype.timeout = function (timeout) {
-      this.suite.timeout(timeout);
-      return this;
-    };
-
-/**
- * Set slowness threshold in milliseconds.
- *
- * @param {Number} slow
- * @return {Mocha}
- * @api public
- */
-
-    Mocha.prototype.slow = function (slow) {
-      this.suite.slow(slow);
-      return this;
-    };
-
-/**
- * Enable timeouts.
- *
- * @param {Boolean} enabled
- * @return {Mocha}
- * @api public
- */
-
-    Mocha.prototype.enableTimeouts = function (enabled) {
-      this.suite.enableTimeouts(arguments.length && enabled !== undefined
-    ? enabled
-    : true);
-      return this;
-    };
-
-/**
- * Makes all tests async (accepting a callback)
- *
- * @return {Mocha}
- * @api public
- */
-
-    Mocha.prototype.asyncOnly = function () {
-      this.options.asyncOnly = true;
-      return this;
-    };
-
-/**
- * Disable syntax highlighting (in browser).
- * @returns {Mocha}
- * @api public
- */
-    Mocha.prototype.noHighlighting = function () {
-      this.options.noHighlighting = true;
-      return this;
-    };
-
-/**
- * Delay root suite execution.
- * @returns {Mocha}
- * @api public
- */
-    Mocha.prototype.delay = function delay() {
-      this.options.delay = true;
-      return this;
-    };
-
-/**
- * Run tests and invoke `fn()` when complete.
- *
- * @param {Function} fn
- * @return {Runner}
- * @api public
- */
-    Mocha.prototype.run = function (fn) {
-      if (this.files.length) this.loadFiles();
-      var suite = this.suite;
-      var options = this.options;
-      options.files = this.files;
-      var runner = new exports.Runner(suite, options.delay);
-      var reporter = new this._reporter(runner, options);
-      runner.ignoreLeaks = false !== options.ignoreLeaks;
-      runner.fullStackTrace = options.fullStackTrace;
-      runner.asyncOnly = options.asyncOnly;
-      if (options.grep) runner.grep(options.grep, options.invert);
-      if (options.globals) runner.globals(options.globals);
-      if (options.growl) this._growl(runner, reporter);
-      if (options.useColors !== undefined) {
-        exports.reporters.Base.useColors = options.useColors;
-      }
-      exports.reporters.Base.inlineDiffs = options.useInlineDiffs;
-
-      function done(failures) {
-        if (reporter.done) {
-          reporter.done(failures, fn);
-        } else fn && fn(failures);
-      }
-
-      return runner.run(done);
-    };
-
-  }); // module: mocha.js
-
-  require.register('ms.js', function (module, exports, require) {
-/**
- * Helpers.
- */
-
-    var s = 1000;
-    var m = s * 60;
-    var h = m * 60;
-    var d = h * 24;
-    var y = d * 365.25;
-
-/**
- * Parse or format the given `val`.
- *
- * Options:
- *
- *  - `long` verbose formatting [false]
- *
- * @param {String|Number} val
- * @param {Object} options
- * @return {String|Number}
- * @api public
- */
-
-    module.exports = function (val, options) {
-      options = options || {};
-      if ('string' == typeof val) return parse(val);
-      return options['long'] ? longFormat(val) : shortFormat(val);
-    };
-
-/**
- * Parse the given `str` and return milliseconds.
- *
- * @param {String} str
- * @return {Number}
- * @api private
- */
-
-    function parse(str) {
-      var match = /^((?:\d+)?\.?\d+) *(ms|seconds?|s|minutes?|m|hours?|h|days?|d|years?|y)?$/i.exec(str);
-      if (!match) return;
-      var n = parseFloat(match[1]);
-      var type = (match[2] || 'ms').toLowerCase();
-      switch (type) {
-        case 'years':
-        case 'year':
-        case 'y':
-          return n * y;
-        case 'days':
-        case 'day':
-        case 'd':
-          return n * d;
-        case 'hours':
-        case 'hour':
-        case 'h':
-          return n * h;
-        case 'minutes':
-        case 'minute':
-        case 'm':
-          return n * m;
-        case 'seconds':
-        case 'second':
-        case 's':
-          return n * s;
-        case 'ms':
-          return n;
-      }
-    }
-
-/**
- * Short format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
-
-    function shortFormat(ms) {
-      if (ms >= d) return Math.round(ms / d) + 'd';
-      if (ms >= h) return Math.round(ms / h) + 'h';
-      if (ms >= m) return Math.round(ms / m) + 'm';
-      if (ms >= s) return Math.round(ms / s) + 's';
-      return ms + 'ms';
-    }
-
-/**
- * Long format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
-
-    function longFormat(ms) {
-      return plural(ms, d, 'day')
-    || plural(ms, h, 'hour')
-    || plural(ms, m, 'minute')
-    || plural(ms, s, 'second')
-    || ms + ' ms';
-    }
-
-/**
- * Pluralization helper.
- */
-
-    function plural(ms, n, name) {
-      if (ms < n) return;
-      if (ms < n * 1.5) return Math.floor(ms / n) + ' ' + name;
-      return Math.ceil(ms / n) + ' ' + name + 's';
-    }
-
-  }); // module: ms.js
-
-  require.register('pending.js', function (module, exports, require) {
-
-/**
- * Expose `Pending`.
- */
-
-    module.exports = Pending;
-
-/**
- * Initialize a new `Pending` error with the given message.
- *
- * @param {String} message
- */
-
-    function Pending(message) {
-      this.message = message;
-    }
-
-  }); // module: pending.js
-
-  require.register('reporters/base.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var tty = require('browser/tty')
-  , diff = require('browser/diff')
-  , ms = require('../ms')
-  , utils = require('../utils')
-  , supportsColor = process.env ? require('supports-color') : null;
-
-/**
- * Save timer references to avoid Sinon interfering (see GH-237).
- */
-
-    var Date = global.Date
-  , setTimeout = global.setTimeout
-  , setInterval = global.setInterval
-  , clearTimeout = global.clearTimeout
-  , clearInterval = global.clearInterval;
-
-/**
- * Check if both stdio streams are associated with a tty.
- */
-
-    var isatty = tty.isatty(1) && tty.isatty(2);
-
-/**
- * Expose `Base`.
- */
-
-    exports = module.exports = Base;
-
-/**
- * Enable coloring by default, except in the browser interface.
- */
-
-    exports.useColors = process.env
-  ? (supportsColor || (process.env.MOCHA_COLORS !== undefined))
-  : false;
-
-/**
- * Inline diffs instead of +/-
- */
-
-    exports.inlineDiffs = false;
-
-/**
- * Default color map.
- */
-
-    exports.colors = {
-      'pass': 90
-  , 'fail': 31
-  , 'bright pass': 92
-  , 'bright fail': 91
-  , 'bright yellow': 93
-  , 'pending': 36
-  , 'suite': 0
-  , 'error title': 0
-  , 'error message': 31
-  , 'error stack': 90
-  , 'checkmark': 32
-  , 'fast': 90
-  , 'medium': 33
-  , 'slow': 31
-  , 'green': 32
-  , 'light': 90
-  , 'diff gutter': 90
-  , 'diff added': 42
-  , 'diff removed': 41
-    };
-
-/**
- * Default symbol map.
- */
-
-    exports.symbols = {
-      ok: '✓',
-      err: '✖',
-      dot: '․'
-    };
-
-// With node.js on Windows: use symbols available in terminal default fonts
-    if ('win32' == process.platform) {
-      exports.symbols.ok = '\u221A';
-      exports.symbols.err = '\u00D7';
-      exports.symbols.dot = '.';
-    }
-
-/**
- * Color `str` with the given `type`,
- * allowing colors to be disabled,
- * as well as user-defined color
- * schemes.
- *
- * @param {String} type
- * @param {String} str
- * @return {String}
- * @api private
- */
-
-    var color = exports.color = function (type, str) {
-      if (!exports.useColors) return String(str);
-      return '\u001b[' + exports.colors[type] + 'm' + str + '\u001b[0m';
-    };
-
-/**
- * Expose term window size, with some
- * defaults for when stderr is not a tty.
- */
-
-    exports.window = {
-      width: isatty
-    ? process.stdout.getWindowSize
-      ? process.stdout.getWindowSize(1)[0]
-      : tty.getWindowSize()[1]
-    : 75
-    };
-
-/**
- * Expose some basic cursor interactions
- * that are common among reporters.
- */
-
-    exports.cursor = {
-      hide: function () {
-        isatty && process.stdout.write('\u001b[?25l');
-      },
-
-      show: function () {
-        isatty && process.stdout.write('\u001b[?25h');
-      },
-
-      deleteLine: function () {
-        isatty && process.stdout.write('\u001b[2K');
-      },
-
-      beginningOfLine: function () {
-        isatty && process.stdout.write('\u001b[0G');
-      },
-
-      CR: function () {
-        if (isatty) {
-          exports.cursor.deleteLine();
-          exports.cursor.beginningOfLine();
-        } else {
-          process.stdout.write('\r');
-        }
-      }
-    };
-
-/**
- * Outut the given `failures` as a list.
- *
- * @param {Array} failures
- * @api public
- */
-
-    exports.list = function (failures) {
-      console.log();
-      failures.forEach(function (test, i) {
-    // format
-        var fmt = color('error title', '  %s) %s:\n')
-      + color('error message', '     %s')
-      + color('error stack', '\n%s\n');
-
-    // msg
-        var err = test.err
-      , message = err.message || ''
-      , stack = err.stack || message
-      , index = stack.indexOf(message)
-      , actual = err.actual
-      , expected = err.expected
-      , escape = true;
-        if (index === -1) {
-          msg = message;
-        } else {
-          index += message.length;
-          msg = stack.slice(0, index);
-      // remove msg from stack
-          stack = stack.slice(index + 1);
-        }
-
-    // uncaught
-        if (err.uncaught) {
-          msg = 'Uncaught ' + msg;
-        }
-    // explicitly show diff
-        if (err.showDiff !== false && sameType(actual, expected)
-        && expected !== undefined) {
-
-          if ('string' !== typeof actual) {
-            escape = false;
-            err.actual = actual = utils.stringify(actual);
-            err.expected = expected = utils.stringify(expected);
-          }
-
-          fmt = color('error title', '  %s) %s:\n%s') + color('error stack', '\n%s\n');
-          var match = message.match(/^([^:]+): expected/);
-          msg = '\n      ' + color('error message', match ? match[1] : msg);
-
-          if (exports.inlineDiffs) {
-            msg += inlineDiff(err, escape);
-          } else {
-            msg += unifiedDiff(err, escape);
-          }
-        }
-
-    // indent stack trace
-        stack = stack.replace(/^/gm, '  ');
-
-        console.log(fmt, (i + 1), test.fullTitle(), msg, stack);
-      });
-    };
-
-/**
- * Initialize a new `Base` reporter.
- *
- * All other reporters generally
- * inherit from this reporter, providing
- * stats such as test duration, number
- * of tests passed / failed etc.
- *
- * @param {Runner} runner
- * @api public
- */
-
-    function Base(runner) {
-      var self = this
-    , stats = this.stats = { suites: 0, tests: 0, passes: 0, pending: 0, failures: 0 }
-    , failures = this.failures = [];
-
-      if (!runner) return;
-      this.runner = runner;
-
-      runner.stats = stats;
-
-      runner.on('start', function () {
-        stats.start = new Date;
-      });
-
-      runner.on('suite', function (suite) {
-        stats.suites = stats.suites || 0;
-        suite.root || stats.suites++;
-      });
-
-      runner.on('test end', function (test) {
-        stats.tests = stats.tests || 0;
-        stats.tests++;
-      });
-
-      runner.on('pass', function (test) {
-        stats.passes = stats.passes || 0;
-
-        var medium = test.slow() / 2;
-        test.speed = test.duration > test.slow()
-      ? 'slow'
-      : test.duration > medium
-        ? 'medium'
-        : 'fast';
-
-        stats.passes++;
-      });
-
-      runner.on('fail', function (test, err) {
-        stats.failures = stats.failures || 0;
-        stats.failures++;
-        test.err = err;
-        failures.push(test);
-      });
-
-      runner.on('end', function () {
-        stats.end = new Date;
-        stats.duration = new Date - stats.start;
-      });
-
-      runner.on('pending', function () {
-        stats.pending++;
-      });
-    }
-
-/**
- * Output common epilogue used by many of
- * the bundled reporters.
- *
- * @api public
- */
-
-    Base.prototype.epilogue = function () {
-      var stats = this.stats;
-      var tests;
-      var fmt;
-
-      console.log();
-
-  // passes
-      fmt = color('bright pass', ' ')
-    + color('green', ' %d passing')
-    + color('light', ' (%s)');
-
-      console.log(fmt,
-    stats.passes || 0,
-    ms(stats.duration));
-
-  // pending
-      if (stats.pending) {
-        fmt = color('pending', ' ')
-      + color('pending', ' %d pending');
-
-        console.log(fmt, stats.pending);
-      }
-
-  // failures
-      if (stats.failures) {
-        fmt = color('fail', '  %d failing');
-
-        console.log(fmt, stats.failures);
-
-        Base.list(this.failures);
-        console.log();
-      }
-
-      console.log();
-    };
-
-/**
- * Pad the given `str` to `len`.
- *
- * @param {String} str
- * @param {String} len
- * @return {String}
- * @api private
- */
-
-    function pad(str, len) {
-      str = String(str);
-      return Array(len - str.length + 1).join(' ') + str;
-    }
-
-
-/**
- * Returns an inline diff between 2 strings with coloured ANSI output
- *
- * @param {Error} Error with actual/expected
- * @return {String} Diff
- * @api private
- */
-
-    function inlineDiff(err, escape) {
-      var msg = errorDiff(err, 'WordsWithSpace', escape);
-
-  // linenos
-      var lines = msg.split('\n');
-      if (lines.length > 4) {
-        var width = String(lines.length).length;
-        msg = lines.map(function (str, i) {
-          return pad(++i, width) + ' |' + ' ' + str;
-        }).join('\n');
-      }
-
-  // legend
-      msg = '\n'
-    + color('diff removed', 'actual')
-    + ' '
-    + color('diff added', 'expected')
-    + '\n\n'
-    + msg
-    + '\n';
-
-  // indent
-      msg = msg.replace(/^/gm, '      ');
-      return msg;
-    }
-
-/**
- * Returns a unified diff between 2 strings
- *
- * @param {Error} Error with actual/expected
- * @return {String} Diff
- * @api private
- */
-
-    function unifiedDiff(err, escape) {
-      var indent = '      ';
-      function cleanUp(line) {
-        if (escape) {
-          line = escapeInvisibles(line);
-        }
-        if (line[0] === '+') return indent + colorLines('diff added', line);
-        if (line[0] === '-') return indent + colorLines('diff removed', line);
-        if (line.match(/\@\@/)) return null;
-        if (line.match(/\\ No newline/)) return null;
-        else return indent + line;
-      }
-      function notBlank(line) {
-        return line != null;
-      }
-      var msg = diff.createPatch('string', err.actual, err.expected);
-      var lines = msg.split('\n').splice(4);
-      return '\n      '
-         + colorLines('diff added', '+ expected') + ' '
-         + colorLines('diff removed', '- actual')
-         + '\n\n'
-         + lines.map(cleanUp).filter(notBlank).join('\n');
-    }
-
-/**
- * Return a character diff for `err`.
- *
- * @param {Error} err
- * @return {String}
- * @api private
- */
-
-    function errorDiff(err, type, escape) {
-      var actual = escape ? escapeInvisibles(err.actual) : err.actual;
-      var expected = escape ? escapeInvisibles(err.expected) : err.expected;
-      return diff['diff' + type](actual, expected).map(function (str) {
-        if (str.added) return colorLines('diff added', str.value);
-        if (str.removed) return colorLines('diff removed', str.value);
-        return str.value;
-      }).join('');
-    }
-
-/**
- * Returns a string with all invisible characters in plain text
- *
- * @param {String} line
- * @return {String}
- * @api private
- */
-    function escapeInvisibles(line) {
-      return line.replace(/\t/g, '<tab>')
-               .replace(/\r/g, '<CR>')
-               .replace(/\n/g, '<LF>\n');
-    }
-
-/**
- * Color lines for `str`, using the color `name`.
- *
- * @param {String} name
- * @param {String} str
- * @return {String}
- * @api private
- */
-
-    function colorLines(name, str) {
-      return str.split('\n').map(function (str) {
-        return color(name, str);
-      }).join('\n');
-    }
-
-/**
- * Check that a / b have the same type.
- *
- * @param {Object} a
- * @param {Object} b
- * @return {Boolean}
- * @api private
- */
-
-    function sameType(a, b) {
-      a = Object.prototype.toString.call(a);
-      b = Object.prototype.toString.call(b);
-      return a == b;
-    }
-
-  }); // module: reporters/base.js
-
-  require.register('reporters/doc.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Base = require('./base')
-  , utils = require('../utils');
-
-/**
- * Expose `Doc`.
- */
-
-    exports = module.exports = Doc;
-
-/**
- * Initialize a new `Doc` reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-    function Doc(runner) {
-      Base.call(this, runner);
-
-      var self = this
-    , stats = this.stats
-    , total = runner.total
-    , indents = 2;
-
-      function indent() {
-        return Array(indents).join('  ');
-      }
-
-      runner.on('suite', function (suite) {
-        if (suite.root) return;
-        ++indents;
-        console.log('%s<section class="suite">', indent());
-        ++indents;
-        console.log('%s<h1>%s</h1>', indent(), utils.escape(suite.title));
-        console.log('%s<dl>', indent());
-      });
-
-      runner.on('suite end', function (suite) {
-        if (suite.root) return;
-        console.log('%s</dl>', indent());
-        --indents;
-        console.log('%s</section>', indent());
-        --indents;
-      });
-
-      runner.on('pass', function (test) {
-        console.log('%s  <dt>%s</dt>', indent(), utils.escape(test.title));
-        var code = utils.escape(utils.clean(test.fn.toString()));
-        console.log('%s  <dd><pre><code>%s</code></pre></dd>', indent(), code);
-      });
-
-      runner.on('fail', function (test, err) {
-        console.log('%s  <dt class="error">%s</dt>', indent(), utils.escape(test.title));
-        var code = utils.escape(utils.clean(test.fn.toString()));
-        console.log('%s  <dd class="error"><pre><code>%s</code></pre></dd>', indent(), code);
-        console.log('%s  <dd class="error">%s</dd>', indent(), utils.escape(err));
-      });
-    }
-
-  }); // module: reporters/doc.js
-
-  require.register('reporters/dot.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Base = require('./base')
-  , color = Base.color;
-
-/**
- * Expose `Dot`.
- */
-
-    exports = module.exports = Dot;
-
-/**
- * Initialize a new `Dot` matrix test reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-    function Dot(runner) {
-      Base.call(this, runner);
-
-      var self = this
-    , stats = this.stats
-    , width = Base.window.width * .75 | 0
-    , n = -1;
-
-      runner.on('start', function () {
-        process.stdout.write('\n');
-      });
-
-      runner.on('pending', function (test) {
-        if (++n % width == 0) process.stdout.write('\n  ');
-        process.stdout.write(color('pending', Base.symbols.dot));
-      });
-
-      runner.on('pass', function (test) {
-        if (++n % width == 0) process.stdout.write('\n  ');
-        if ('slow' == test.speed) {
-          process.stdout.write(color('bright yellow', Base.symbols.dot));
-        } else {
-          process.stdout.write(color(test.speed, Base.symbols.dot));
-        }
-      });
-
-      runner.on('fail', function (test, err) {
-        if (++n % width == 0) process.stdout.write('\n  ');
-        process.stdout.write(color('fail', Base.symbols.dot));
-      });
-
-      runner.on('end', function () {
-        console.log();
-        self.epilogue();
-      });
-    }
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-    function F() {}
-    F.prototype = Base.prototype;
-    Dot.prototype = new F;
-    Dot.prototype.constructor = Dot;
-
-
-  }); // module: reporters/dot.js
-
-  require.register('reporters/html-cov.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var JSONCov = require('./json-cov')
-  , fs = require('browser/fs');
-
-/**
- * Expose `HTMLCov`.
- */
-
-    exports = module.exports = HTMLCov;
-
-/**
- * Initialize a new `JsCoverage` reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-    function HTMLCov(runner) {
-      var jade = require('jade')
-    , file = __dirname + '/templates/coverage.jade'
-    , str = fs.readFileSync(file, 'utf8')
-    , fn = jade.compile(str, { filename: file })
-    , self = this;
-
-      JSONCov.call(this, runner, false);
-
-      runner.on('end', function () {
-        process.stdout.write(fn({
-          cov: self.cov
-      , coverageClass: coverageClass
-        }));
-      });
-    }
-
-/**
- * Return coverage class for `n`.
- *
- * @return {String}
- * @api private
- */
-
-    function coverageClass(n) {
-      if (n >= 75) return 'high';
-      if (n >= 50) return 'medium';
-      if (n >= 25) return 'low';
-      return 'terrible';
-    }
-
-  }); // module: reporters/html-cov.js
-
-  require.register('reporters/html.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Base = require('./base')
-  , utils = require('../utils')
-  , Progress = require('../browser/progress')
-  , escape = utils.escape;
-
-/**
- * Save timer references to avoid Sinon interfering (see GH-237).
- */
-
-    var Date = global.Date
-  , setTimeout = global.setTimeout
-  , setInterval = global.setInterval
-  , clearTimeout = global.clearTimeout
-  , clearInterval = global.clearInterval;
-
-/**
- * Expose `HTML`.
- */
-
-    exports = module.exports = HTML;
-
-/**
- * Stats template.
- */
-
-    var statsTemplate = '<ul id="mocha-stats">'
-  + '<li class="progress"><canvas width="40" height="40"></canvas></li>'
-  + '<li class="passes"><a href="#">passes:</a> <em>0</em></li>'
-  + '<li class="failures"><a href="#">failures:</a> <em>0</em></li>'
-  + '<li class="duration">duration: <em>0</em>s</li>'
-  + '</ul>';
-
-/**
- * Initialize a new `HTML` reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-    function HTML(runner) {
-      Base.call(this, runner);
-
-      var self = this
-    , stats = this.stats
-    , total = runner.total
-    , stat = fragment(statsTemplate)
-    , items = stat.getElementsByTagName('li')
-    , passes = items[1].getElementsByTagName('em')[0]
-    , passesLink = items[1].getElementsByTagName('a')[0]
-    , failures = items[2].getElementsByTagName('em')[0]
-    , failuresLink = items[2].getElementsByTagName('a')[0]
-    , duration = items[3].getElementsByTagName('em')[0]
-    , canvas = stat.getElementsByTagName('canvas')[0]
-    , report = fragment('<ul id="mocha-report"></ul>')
-    , stack = [report]
-    , progress
-    , ctx
-    , root = document.getElementById('mocha');
-
-      if (canvas.getContext) {
-        var ratio = window.devicePixelRatio || 1;
-        canvas.style.width = canvas.width;
-        canvas.style.height = canvas.height;
-        canvas.width *= ratio;
-        canvas.height *= ratio;
-        ctx = canvas.getContext('2d');
-        ctx.scale(ratio, ratio);
-        progress = new Progress;
-      }
-
-      if (!root) return error('#mocha div missing, add it to your document');
-
-  // pass toggle
-      on(passesLink, 'click', function () {
-        unhide();
-        var name = /pass/.test(report.className) ? '' : ' pass';
-        report.className = report.className.replace(/fail|pass/g, '') + name;
-        if (report.className.trim()) hideSuitesWithout('test pass');
-      });
-
-  // failure toggle
-      on(failuresLink, 'click', function () {
-        unhide();
-        var name = /fail/.test(report.className) ? '' : ' fail';
-        report.className = report.className.replace(/fail|pass/g, '') + name;
-        if (report.className.trim()) hideSuitesWithout('test fail');
-      });
-
-      root.appendChild(stat);
-      root.appendChild(report);
-
-      if (progress) progress.size(40);
-
-      runner.on('suite', function (suite) {
-        if (suite.root) return;
-
-    // suite
-        var url = self.suiteURL(suite);
-        var el = fragment('<li class="suite"><h1><a href="%s">%s</a></h1></li>', url, escape(suite.title));
-
-    // container
-        stack[0].appendChild(el);
-        stack.unshift(document.createElement('ul'));
-        el.appendChild(stack[0]);
-      });
-
-      runner.on('suite end', function (suite) {
-        if (suite.root) return;
-        stack.shift();
-      });
-
-      runner.on('fail', function (test, err) {
-        if ('hook' == test.type) runner.emit('test end', test);
-      });
-
-      runner.on('test end', function (test) {
-    // TODO: add to stats
-        var percent = stats.tests / this.total * 100 | 0;
-        if (progress) progress.update(percent).draw(ctx);
-
-    // update stats
-        var ms = new Date - stats.start;
-        text(passes, stats.passes);
-        text(failures, stats.failures);
-        text(duration, (ms / 1000).toFixed(2));
-
-    // test
-        if ('passed' == test.state) {
-          var url = self.testURL(test);
-          var el = fragment('<li class="test pass %e"><h2>%e<span class="duration">%ems</span> <a href="%s" class="replay">‣</a></h2></li>', test.speed, test.title, test.duration, url);
-        } else if (test.pending) {
-          var el = fragment('<li class="test pass pending"><h2>%e</h2></li>', test.title);
-        } else {
-          var el = fragment('<li class="test fail"><h2>%e <a href="%e" class="replay">‣</a></h2></li>', test.title, self.testURL(test));
-          var str = test.err.stack || test.err.toString();
-
-      // FF / Opera do not add the message
-          if (!~str.indexOf(test.err.message)) {
-            str = test.err.message + '\n' + str;
-          }
-
-      // <=IE7 stringifies to [Object Error]. Since it can be overloaded, we
-      // check for the result of the stringifying.
-          if ('[object Error]' == str) str = test.err.message;
-
-      // Safari doesn't give you a stack. Let's at least provide a source line.
-          if (!test.err.stack && test.err.sourceURL && test.err.line !== undefined) {
-            str += '\n(' + test.err.sourceURL + ':' + test.err.line + ')';
-          }
-
-          el.appendChild(fragment('<pre class="error">%e</pre>', str));
-        }
-
-    // toggle code
-    // TODO: defer
-        if (!test.pending) {
-          var h2 = el.getElementsByTagName('h2')[0];
-
-          on(h2, 'click', function () {
-            pre.style.display = 'none' == pre.style.display
-          ? 'block'
-          : 'none';
-          });
-
-          var pre = fragment('<pre><code>%e</code></pre>', utils.clean(test.fn.toString()));
-          el.appendChild(pre);
-          pre.style.display = 'none';
-        }
-
-    // Don't call .appendChild if #mocha-report was already .shift()'ed off the stack.
-        if (stack[0]) stack[0].appendChild(el);
-      });
-    }
-
-/**
- * Makes a URL, preserving querystring ("search") parameters.
- * @param {string} s
- * @returns {string} your new URL
- */
-    var makeUrl = function makeUrl(s) {
-      var search = window.location.search;
-
-  // Remove previous grep query parameter if present
-      if (search) {
-        search = search.replace(/[?&]grep=[^&\s]*/g, '').replace(/^&/, '?');
-      }
-
-      return window.location.pathname + (search ? search + '&' : '?') + 'grep=' + encodeURIComponent(s);
-    };
-
-/**
- * Provide suite URL
- *
- * @param {Object} [suite]
- */
-    HTML.prototype.suiteURL = function (suite) {
-      return makeUrl(suite.fullTitle());
-    };
-
-/**
- * Provide test URL
- *
- * @param {Object} [test]
- */
-
-    HTML.prototype.testURL = function (test) {
-      return makeUrl(test.fullTitle());
-    };
-
-/**
- * Display error `msg`.
- */
-
-    function error(msg) {
-      document.body.appendChild(fragment('<div id="mocha-error">%s</div>', msg));
-    }
-
-/**
- * Return a DOM fragment from `html`.
- */
-
-    function fragment(html) {
-      var args = arguments
-    , div = document.createElement('div')
-    , i = 1;
-
-      div.innerHTML = html.replace(/%([se])/g, function (_, type) {
-        switch (type) {
-          case 's': return String(args[i++]);
-          case 'e': return escape(args[i++]);
-        }
-      });
-
-      return div.firstChild;
-    }
-
-/**
- * Check for suites that do not have elements
- * with `classname`, and hide them.
- */
-
-    function hideSuitesWithout(classname) {
-      var suites = document.getElementsByClassName('suite');
-      for (var i = 0; i < suites.length; i++) {
-        var els = suites[i].getElementsByClassName(classname);
-        if (0 == els.length) suites[i].className += ' hidden';
-      }
-    }
-
-/**
- * Unhide .hidden suites.
- */
-
-    function unhide() {
-      var els = document.getElementsByClassName('suite hidden');
-      for (var i = 0; i < els.length; ++i) {
-        els[i].className = els[i].className.replace('suite hidden', 'suite');
-      }
-    }
-
-/**
- * Set `el` text to `str`.
- */
-
-    function text(el, str) {
-      if (el.textContent) {
-        el.textContent = str;
-      } else {
-        el.innerText = str;
-      }
-    }
-
-/**
- * Listen on `event` with callback `fn`.
- */
-
-    function on(el, event, fn) {
-      if (el.addEventListener) {
-        el.addEventListener(event, fn, false);
-      } else {
-        el.attachEvent('on' + event, fn);
-      }
-    }
-
-  }); // module: reporters/html.js
-
-  require.register('reporters/index.js', function (module, exports, require) {
-    exports.Base = require('./base');
-    exports.Dot = require('./dot');
-    exports.Doc = require('./doc');
-    exports.TAP = require('./tap');
-    exports.JSON = require('./json');
-    exports.HTML = require('./html');
-    exports.List = require('./list');
-    exports.Min = require('./min');
-    exports.Spec = require('./spec');
-    exports.Nyan = require('./nyan');
-    exports.XUnit = require('./xunit');
-    exports.Markdown = require('./markdown');
-    exports.Progress = require('./progress');
-    exports.Landing = require('./landing');
-    exports.JSONCov = require('./json-cov');
-    exports.HTMLCov = require('./html-cov');
-    exports.JSONStream = require('./json-stream');
-
-  }); // module: reporters/index.js
-
-  require.register('reporters/json-cov.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Base = require('./base');
-
-/**
- * Expose `JSONCov`.
- */
-
-    exports = module.exports = JSONCov;
-
-/**
- * Initialize a new `JsCoverage` reporter.
- *
- * @param {Runner} runner
- * @param {Boolean} output
- * @api public
- */
-
-    function JSONCov(runner, output) {
-      var self = this
-    , output = 1 == arguments.length ? true : output;
-
-      Base.call(this, runner);
-
-      var tests = []
-    , failures = []
-    , passes = [];
-
-      runner.on('test end', function (test) {
-        tests.push(test);
-      });
-
-      runner.on('pass', function (test) {
-        passes.push(test);
-      });
-
-      runner.on('fail', function (test) {
-        failures.push(test);
-      });
-
-      runner.on('end', function () {
-        var cov = global._$jscoverage || {};
-        var result = self.cov = map(cov);
-        result.stats = self.stats;
-        result.tests = tests.map(clean);
-        result.failures = failures.map(clean);
-        result.passes = passes.map(clean);
-        if (!output) return;
-        process.stdout.write(JSON.stringify(result, null, 2));
-      });
-    }
-
-/**
- * Map jscoverage data to a JSON structure
- * suitable for reporting.
- *
- * @param {Object} cov
- * @return {Object}
- * @api private
- */
-
-    function map(cov) {
-      var ret = {
-        instrumentation: 'node-jscoverage'
-    , sloc: 0
-    , hits: 0
-    , misses: 0
-    , coverage: 0
-    , files: []
-      };
-
-      for (var filename in cov) {
-        var data = coverage(filename, cov[filename]);
-        ret.files.push(data);
-        ret.hits += data.hits;
-        ret.misses += data.misses;
-        ret.sloc += data.sloc;
-      }
-
-      ret.files.sort(function (a, b) {
-        return a.filename.localeCompare(b.filename);
-      });
-
-      if (ret.sloc > 0) {
-        ret.coverage = (ret.hits / ret.sloc) * 100;
-      }
-
-      return ret;
-    }
-
-/**
- * Map jscoverage data for a single source file
- * to a JSON structure suitable for reporting.
- *
- * @param {String} filename name of the source file
- * @param {Object} data jscoverage coverage data
- * @return {Object}
- * @api private
- */
-
-    function coverage(filename, data) {
-      var ret = {
-        filename: filename,
-        coverage: 0,
-        hits: 0,
-        misses: 0,
-        sloc: 0,
-        source: {}
-      };
-
-      data.source.forEach(function (line, num) {
-        num++;
-
-        if (data[num] === 0) {
-          ret.misses++;
-          ret.sloc++;
-        } else if (data[num] !== undefined) {
-          ret.hits++;
-          ret.sloc++;
-        }
-
-        ret.source[num] = {
-          source: line
-      , coverage: data[num] === undefined
-        ? ''
-        : data[num]
-        };
-      });
-
-      ret.coverage = ret.hits / ret.sloc * 100;
-
-      return ret;
-    }
-
-/**
- * Return a plain-object representation of `test`
- * free of cyclic properties etc.
- *
- * @param {Object} test
- * @return {Object}
- * @api private
- */
-
-    function clean(test) {
-      return {
-        title: test.title
-    , fullTitle: test.fullTitle()
-    , duration: test.duration
-      };
-    }
-
-  }); // module: reporters/json-cov.js
-
-  require.register('reporters/json-stream.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Base = require('./base')
-  , color = Base.color;
-
-/**
- * Expose `List`.
- */
-
-    exports = module.exports = List;
-
-/**
- * Initialize a new `List` test reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-    function List(runner) {
-      Base.call(this, runner);
-
-      var self = this
-    , stats = this.stats
-    , total = runner.total;
-
-      runner.on('start', function () {
-        console.log(JSON.stringify(['start', { total: total }]));
-      });
-
-      runner.on('pass', function (test) {
-        console.log(JSON.stringify(['pass', clean(test)]));
-      });
-
-      runner.on('fail', function (test, err) {
-        test = clean(test);
-        test.err = err.message;
-        console.log(JSON.stringify(['fail', test]));
-      });
-
-      runner.on('end', function () {
-        process.stdout.write(JSON.stringify(['end', self.stats]));
-      });
-    }
-
-/**
- * Return a plain-object representation of `test`
- * free of cyclic properties etc.
- *
- * @param {Object} test
- * @return {Object}
- * @api private
- */
-
-    function clean(test) {
-      return {
-        title: test.title
-    , fullTitle: test.fullTitle()
-    , duration: test.duration
-      };
-    }
-
-  }); // module: reporters/json-stream.js
-
-  require.register('reporters/json.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Base = require('./base')
-  , cursor = Base.cursor
-  , color = Base.color;
-
-/**
- * Expose `JSON`.
- */
-
-    exports = module.exports = JSONReporter;
-
-/**
- * Initialize a new `JSON` reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-    function JSONReporter(runner) {
-      var self = this;
-      Base.call(this, runner);
-
-      var tests = []
-    , pending = []
-    , failures = []
-    , passes = [];
-
-      runner.on('test end', function (test) {
-        tests.push(test);
-      });
-
-      runner.on('pass', function (test) {
-        passes.push(test);
-      });
-
-      runner.on('fail', function (test) {
-        failures.push(test);
-      });
-
-      runner.on('pending', function (test) {
-        pending.push(test);
-      });
-
-      runner.on('end', function () {
-        var obj = {
-          stats: self.stats,
-          tests: tests.map(clean),
-          pending: pending.map(clean),
-          failures: failures.map(clean),
-          passes: passes.map(clean)
-        };
-
-        runner.testResults = obj;
-
-        process.stdout.write(JSON.stringify(obj, null, 2));
-      });
-    }
-
-/**
- * Return a plain-object representation of `test`
- * free of cyclic properties etc.
- *
- * @param {Object} test
- * @return {Object}
- * @api private
- */
-
-    function clean(test) {
-      return {
-        title: test.title,
-        fullTitle: test.fullTitle(),
-        duration: test.duration,
-        err: errorJSON(test.err || {})
-      };
-    }
-
-/**
- * Transform `error` into a JSON object.
- * @param {Error} err
- * @return {Object}
- */
-
-    function errorJSON(err) {
-      var res = {};
-      Object.getOwnPropertyNames(err).forEach(function (key) {
-        res[key] = err[key];
-      }, err);
-      return res;
-    }
-
-  }); // module: reporters/json.js
-
-  require.register('reporters/landing.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Base = require('./base')
-  , cursor = Base.cursor
-  , color = Base.color;
-
-/**
- * Expose `Landing`.
- */
-
-    exports = module.exports = Landing;
-
-/**
- * Airplane color.
- */
-
-    Base.colors.plane = 0;
-
-/**
- * Airplane crash color.
- */
-
-    Base.colors['plane crash'] = 31;
-
-/**
- * Runway color.
- */
-
-    Base.colors.runway = 90;
-
-/**
- * Initialize a new `Landing` reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-    function Landing(runner) {
-      Base.call(this, runner);
-
-      var self = this
-    , stats = this.stats
-    , width = Base.window.width * .75 | 0
-    , total = runner.total
-    , stream = process.stdout
-    , plane = color('plane', '✈')
-    , crashed = -1
-    , n = 0;
-
-      function runway() {
-        var buf = Array(width).join('-');
-        return '  ' + color('runway', buf);
-      }
-
-      runner.on('start', function () {
-        stream.write('\n\n\n  ');
-        cursor.hide();
-      });
-
-      runner.on('test end', function (test) {
-    // check if the plane crashed
-        var col = -1 == crashed
-      ? width * ++n / total | 0
-      : crashed;
-
-    // show the crash
-        if ('failed' == test.state) {
-          plane = color('plane crash', '✈');
-          crashed = col;
-        }
-
-    // render landing strip
-        stream.write('\u001b[' + (width + 1) + 'D\u001b[2A');
-        stream.write(runway());
-        stream.write('\n  ');
-        stream.write(color('runway', Array(col).join('⋅')));
-        stream.write(plane);
-        stream.write(color('runway', Array(width - col).join('⋅') + '\n'));
-        stream.write(runway());
-        stream.write('\u001b[0m');
-      });
-
-      runner.on('end', function () {
-        cursor.show();
-        console.log();
-        self.epilogue();
-      });
-    }
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-    function F() {}
-    F.prototype = Base.prototype;
-    Landing.prototype = new F;
-    Landing.prototype.constructor = Landing;
-
-
-  }); // module: reporters/landing.js
-
-  require.register('reporters/list.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Base = require('./base')
-  , cursor = Base.cursor
-  , color = Base.color;
-
-/**
- * Expose `List`.
- */
-
-    exports = module.exports = List;
-
-/**
- * Initialize a new `List` test reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-    function List(runner) {
-      Base.call(this, runner);
-
-      var self = this
-    , stats = this.stats
-    , n = 0;
-
-      runner.on('start', function () {
-        console.log();
-      });
-
-      runner.on('test', function (test) {
-        process.stdout.write(color('pass', '    ' + test.fullTitle() + ': '));
-      });
-
-      runner.on('pending', function (test) {
-        var fmt = color('checkmark', '  -')
-      + color('pending', ' %s');
-        console.log(fmt, test.fullTitle());
-      });
-
-      runner.on('pass', function (test) {
-        var fmt = color('checkmark', '  ' + Base.symbols.dot)
-      + color('pass', ' %s: ')
-      + color(test.speed, '%dms');
-        cursor.CR();
-        console.log(fmt, test.fullTitle(), test.duration);
-      });
-
-      runner.on('fail', function (test, err) {
-        cursor.CR();
-        console.log(color('fail', '  %d) %s'), ++n, test.fullTitle());
-      });
-
-      runner.on('end', self.epilogue.bind(self));
-    }
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-    function F() {}
-    F.prototype = Base.prototype;
-    List.prototype = new F;
-    List.prototype.constructor = List;
-
-
-  }); // module: reporters/list.js
-
-  require.register('reporters/markdown.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Base = require('./base')
-  , utils = require('../utils');
-
-/**
- * Constants
- */
-
-    var SUITE_PREFIX = '$';
-
-/**
- * Expose `Markdown`.
- */
-
-    exports = module.exports = Markdown;
-
-/**
- * Initialize a new `Markdown` reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-    function Markdown(runner) {
-      Base.call(this, runner);
-
-      var self = this
-    , stats = this.stats
-    , level = 0
-    , buf = '';
-
-      function title(str) {
-        return Array(level).join('#') + ' ' + str;
-      }
-
-      function indent() {
-        return Array(level).join('  ');
-      }
-
-      function mapTOC(suite, obj) {
-        var ret = obj,
-          key = SUITE_PREFIX + suite.title;
-        obj = obj[key] = obj[key] || { suite: suite };
-        suite.suites.forEach(function (suite) {
-          mapTOC(suite, obj);
-        });
-        return ret;
-      }
-
-      function stringifyTOC(obj, level) {
-        ++level;
-        var buf = '';
-        var link;
-        for (var key in obj) {
-          if ('suite' == key) continue;
-          if (key !== SUITE_PREFIX) {
-            link = ' - [' + key.substring(1) + ']';
-            link += '(#' + utils.slug(obj[key].suite.fullTitle()) + ')\n';
-            buf += Array(level).join('  ') + link;
-          }
-          buf += stringifyTOC(obj[key], level);
-        }
-        return buf;
-      }
-
-      function generateTOC(suite) {
-        var obj = mapTOC(suite, {});
-        return stringifyTOC(obj, 0);
-      }
-
-      generateTOC(runner.suite);
-
-      runner.on('suite', function (suite) {
-        ++level;
-        var slug = utils.slug(suite.fullTitle());
-        buf += '<a name="' + slug + '"></a>' + '\n';
-        buf += title(suite.title) + '\n';
-      });
-
-      runner.on('suite end', function (suite) {
-        --level;
-      });
-
-      runner.on('pass', function (test) {
-        var code = utils.clean(test.fn.toString());
-        buf += test.title + '.\n';
-        buf += '\n```js\n';
-        buf += code + '\n';
-        buf += '```\n\n';
-      });
-
-      runner.on('end', function () {
-        process.stdout.write('# TOC\n');
-        process.stdout.write(generateTOC(runner.suite));
-        process.stdout.write(buf);
-      });
-    }
-
-  }); // module: reporters/markdown.js
-
-  require.register('reporters/min.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Base = require('./base');
-
-/**
- * Expose `Min`.
- */
-
-    exports = module.exports = Min;
-
-/**
- * Initialize a new `Min` minimal test reporter (best used with --watch).
- *
- * @param {Runner} runner
- * @api public
- */
-
-    function Min(runner) {
-      Base.call(this, runner);
-
-      runner.on('start', function () {
-    // clear screen
-        process.stdout.write('\u001b[2J');
-    // set cursor position
-        process.stdout.write('\u001b[1;3H');
-      });
-
-      runner.on('end', this.epilogue.bind(this));
-    }
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-    function F() {}
-    F.prototype = Base.prototype;
-    Min.prototype = new F;
-    Min.prototype.constructor = Min;
-
-
-  }); // module: reporters/min.js
-
-  require.register('reporters/nyan.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Base = require('./base');
-
-/**
- * Expose `Dot`.
- */
-
-    exports = module.exports = NyanCat;
-
-/**
- * Initialize a new `Dot` matrix test reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-    function NyanCat(runner) {
-      Base.call(this, runner);
-      var self = this
-    , stats = this.stats
-    , width = Base.window.width * .75 | 0
-    , rainbowColors = this.rainbowColors = self.generateColors()
-    , colorIndex = this.colorIndex = 0
-    , numerOfLines = this.numberOfLines = 4
-    , trajectories = this.trajectories = [[], [], [], []]
-    , nyanCatWidth = this.nyanCatWidth = 11
-    , trajectoryWidthMax = this.trajectoryWidthMax = (width - nyanCatWidth)
-    , scoreboardWidth = this.scoreboardWidth = 5
-    , tick = this.tick = 0
-    , n = 0;
-
-      runner.on('start', function () {
-        Base.cursor.hide();
-        self.draw();
-      });
-
-      runner.on('pending', function (test) {
-        self.draw();
-      });
-
-      runner.on('pass', function (test) {
-        self.draw();
-      });
-
-      runner.on('fail', function (test, err) {
-        self.draw();
-      });
-
-      runner.on('end', function () {
-        Base.cursor.show();
-        for (var i = 0; i < self.numberOfLines; i++) write('\n');
-        self.epilogue();
-      });
-    }
-
-/**
- * Draw the nyan cat
- *
- * @api private
- */
-
-    NyanCat.prototype.draw = function () {
-      this.appendRainbow();
-      this.drawScoreboard();
-      this.drawRainbow();
-      this.drawNyanCat();
-      this.tick = !this.tick;
-    };
-
-/**
- * Draw the "scoreboard" showing the number
- * of passes, failures and pending tests.
- *
- * @api private
- */
-
-    NyanCat.prototype.drawScoreboard = function () {
-      var stats = this.stats;
-
-      function draw(type, n) {
-        write(' ');
-        write(Base.color(type, n));
-        write('\n');
-      }
-
-      draw('green', stats.passes);
-      draw('fail', stats.failures);
-      draw('pending', stats.pending);
-      write('\n');
-
-      this.cursorUp(this.numberOfLines);
-    };
-
-/**
- * Append the rainbow.
- *
- * @api private
- */
-
-    NyanCat.prototype.appendRainbow = function () {
-      var segment = this.tick ? '_' : '-';
-      var rainbowified = this.rainbowify(segment);
-
-      for (var index = 0; index < this.numberOfLines; index++) {
-        var trajectory = this.trajectories[index];
-        if (trajectory.length >= this.trajectoryWidthMax) trajectory.shift();
-        trajectory.push(rainbowified);
-      }
-    };
-
-/**
- * Draw the rainbow.
- *
- * @api private
- */
-
-    NyanCat.prototype.drawRainbow = function () {
-      var self = this;
-
-      this.trajectories.forEach(function (line, index) {
-        write('\u001b[' + self.scoreboardWidth + 'C');
-        write(line.join(''));
-        write('\n');
-      });
-
-      this.cursorUp(this.numberOfLines);
-    };
-
-/**
- * Draw the nyan cat
- *
- * @api private
- */
-
-    NyanCat.prototype.drawNyanCat = function () {
-      var self = this;
-      var startWidth = this.scoreboardWidth + this.trajectories[0].length;
-      var dist = '\u001b[' + startWidth + 'C';
-      var padding = '';
-
-      write(dist);
-      write('_,------,');
-      write('\n');
-
-      write(dist);
-      padding = self.tick ? '  ' : '   ';
-      write('_|' + padding + '/\\_/\\ ');
-      write('\n');
-
-      write(dist);
-      padding = self.tick ? '_' : '__';
-      var tail = self.tick ? '~' : '^';
-      var face;
-      write(tail + '|' + padding + this.face() + ' ');
-      write('\n');
-
-      write(dist);
-      padding = self.tick ? ' ' : '  ';
-      write(padding + '""  "" ');
-      write('\n');
-
-      this.cursorUp(this.numberOfLines);
-    };
-
-/**
- * Draw nyan cat face.
- *
- * @return {String}
- * @api private
- */
-
-    NyanCat.prototype.face = function () {
-      var stats = this.stats;
-      if (stats.failures) {
-        return '( x .x)';
-      } else if (stats.pending) {
-        return '( o .o)';
-      } else if (stats.passes) {
-        return '( ^ .^)';
-      } else {
-        return '( - .-)';
-      }
-    };
-
-/**
- * Move cursor up `n`.
- *
- * @param {Number} n
- * @api private
- */
-
-    NyanCat.prototype.cursorUp = function (n) {
-      write('\u001b[' + n + 'A');
-    };
-
-/**
- * Move cursor down `n`.
- *
- * @param {Number} n
- * @api private
- */
-
-    NyanCat.prototype.cursorDown = function (n) {
-      write('\u001b[' + n + 'B');
-    };
-
-/**
- * Generate rainbow colors.
- *
- * @return {Array}
- * @api private
- */
-
-    NyanCat.prototype.generateColors = function () {
-      var colors = [];
-
-      for (var i = 0; i < (6 * 7); i++) {
-        var pi3 = Math.floor(Math.PI / 3);
-        var n = (i * (1.0 / 6));
-        var r = Math.floor(3 * Math.sin(n) + 3);
-        var g = Math.floor(3 * Math.sin(n + 2 * pi3) + 3);
-        var b = Math.floor(3 * Math.sin(n + 4 * pi3) + 3);
-        colors.push(36 * r + 6 * g + b + 16);
-      }
-
-      return colors;
-    };
-
-/**
- * Apply rainbow to the given `str`.
- *
- * @param {String} str
- * @return {String}
- * @api private
- */
-
-    NyanCat.prototype.rainbowify = function (str) {
-      if (!Base.useColors)
-        return str;
-      var color = this.rainbowColors[this.colorIndex % this.rainbowColors.length];
-      this.colorIndex += 1;
-      return '\u001b[38;5;' + color + 'm' + str + '\u001b[0m';
-    };
-
-/**
- * Stdout helper.
- */
-
-    function write(string) {
-      process.stdout.write(string);
-    }
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-    function F() {}
-    F.prototype = Base.prototype;
-    NyanCat.prototype = new F;
-    NyanCat.prototype.constructor = NyanCat;
-
-
-  }); // module: reporters/nyan.js
-
-  require.register('reporters/progress.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Base = require('./base')
-  , cursor = Base.cursor
-  , color = Base.color;
-
-/**
- * Expose `Progress`.
- */
-
-    exports = module.exports = Progress;
-
-/**
- * General progress bar color.
- */
-
-    Base.colors.progress = 90;
-
-/**
- * Initialize a new `Progress` bar test reporter.
- *
- * @param {Runner} runner
- * @param {Object} options
- * @api public
- */
-
-    function Progress(runner, options) {
-      Base.call(this, runner);
-
-      var self = this
-    , options = options || {}
-    , stats = this.stats
-    , width = Base.window.width * .50 | 0
-    , total = runner.total
-    , complete = 0
-    , max = Math.max
-    , lastN = -1;
-
-  // default chars
-      options.open = options.open || '[';
-      options.complete = options.complete || '▬';
-      options.incomplete = options.incomplete || Base.symbols.dot;
-      options.close = options.close || ']';
-      options.verbose = false;
-
-  // tests started
-      runner.on('start', function () {
-        console.log();
-        cursor.hide();
-      });
-
-  // tests complete
-      runner.on('test end', function () {
-        complete++;
-        var incomplete = total - complete
-      , percent = complete / total
-      , n = width * percent | 0
-      , i = width - n;
-
-        if (lastN === n && !options.verbose) {
-      // Don't re-render the line if it hasn't changed
-          return;
-        }
-        lastN = n;
-
-        cursor.CR();
-        process.stdout.write('\u001b[J');
-        process.stdout.write(color('progress', '  ' + options.open));
-        process.stdout.write(Array(n).join(options.complete));
-        process.stdout.write(Array(i).join(options.incomplete));
-        process.stdout.write(color('progress', options.close));
-        if (options.verbose) {
-          process.stdout.write(color('progress', ' ' + complete + ' of ' + total));
-        }
-      });
-
-  // tests are complete, output some stats
-  // and the failures if any
-      runner.on('end', function () {
-        cursor.show();
-        console.log();
-        self.epilogue();
-      });
-    }
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-    function F() {}
-    F.prototype = Base.prototype;
-    Progress.prototype = new F;
-    Progress.prototype.constructor = Progress;
-
-
-  }); // module: reporters/progress.js
-
-  require.register('reporters/spec.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Base = require('./base')
-  , cursor = Base.cursor
-  , color = Base.color;
-
-/**
- * Expose `Spec`.
- */
-
-    exports = module.exports = Spec;
-
-/**
- * Initialize a new `Spec` test reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-    function Spec(runner) {
-      Base.call(this, runner);
-
-      var self = this
-    , stats = this.stats
-    , indents = 0
-    , n = 0;
-
-      function indent() {
-        return Array(indents).join('  ');
-      }
-
-      runner.on('start', function () {
-        console.log();
-      });
-
-      runner.on('suite', function (suite) {
-        ++indents;
-        console.log(color('suite', '%s%s'), indent(), suite.title);
-      });
-
-      runner.on('suite end', function (suite) {
-        --indents;
-        if (1 == indents) console.log();
-      });
-
-      runner.on('pending', function (test) {
-        var fmt = indent() + color('pending', '  - %s');
-        console.log(fmt, test.title);
-      });
-
-      runner.on('pass', function (test) {
-        if ('fast' == test.speed) {
-          var fmt = indent()
-        + color('checkmark', '  ' + Base.symbols.ok)
-        + color('pass', ' %s');
-          cursor.CR();
-          console.log(fmt, test.title);
-        } else {
-          var fmt = indent()
-        + color('checkmark', '  ' + Base.symbols.ok)
-        + color('pass', ' %s')
-        + color(test.speed, ' (%dms)');
-          cursor.CR();
-          console.log(fmt, test.title, test.duration);
-        }
-      });
-
-      runner.on('fail', function (test, err) {
-        cursor.CR();
-        console.log(indent() + color('fail', '  %d) %s'), ++n, test.title);
-      });
-
-      runner.on('end', self.epilogue.bind(self));
-    }
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-    function F() {}
-    F.prototype = Base.prototype;
-    Spec.prototype = new F;
-    Spec.prototype.constructor = Spec;
-
-
-  }); // module: reporters/spec.js
-
-  require.register('reporters/tap.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Base = require('./base')
-  , cursor = Base.cursor
-  , color = Base.color;
-
-/**
- * Expose `TAP`.
- */
-
-    exports = module.exports = TAP;
-
-/**
- * Initialize a new `TAP` reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-    function TAP(runner) {
-      Base.call(this, runner);
-
-      var self = this
-    , stats = this.stats
-    , n = 1
-    , passes = 0
-    , failures = 0;
-
-      runner.on('start', function () {
-        var total = runner.grepTotal(runner.suite);
-        console.log('%d..%d', 1, total);
-      });
-
-      runner.on('test end', function () {
-        ++n;
-      });
-
-      runner.on('pending', function (test) {
-        console.log('ok %d %s # SKIP -', n, title(test));
-      });
-
-      runner.on('pass', function (test) {
-        passes++;
-        console.log('ok %d %s', n, title(test));
-      });
-
-      runner.on('fail', function (test, err) {
-        failures++;
-        console.log('not ok %d %s', n, title(test));
-        if (err.stack) console.log(err.stack.replace(/^/gm, '  '));
-      });
-
-      runner.on('end', function () {
-        console.log('# tests ' + (passes + failures));
-        console.log('# pass ' + passes);
-        console.log('# fail ' + failures);
-      });
-    }
-
-/**
- * Return a TAP-safe title of `test`
- *
- * @param {Object} test
- * @return {String}
- * @api private
- */
-
-    function title(test) {
-      return test.fullTitle().replace(/#/g, '');
-    }
-
-  }); // module: reporters/tap.js
-
-  require.register('reporters/xunit.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Base = require('./base')
-  , utils = require('../utils')
-  , fs = require('browser/fs')
-  , escape = utils.escape;
-
-/**
- * Save timer references to avoid Sinon interfering (see GH-237).
- */
-
-    var Date = global.Date
-  , setTimeout = global.setTimeout
-  , setInterval = global.setInterval
-  , clearTimeout = global.clearTimeout
-  , clearInterval = global.clearInterval;
-
-/**
- * Expose `XUnit`.
- */
-
-    exports = module.exports = XUnit;
-
-/**
- * Initialize a new `XUnit` reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-    function XUnit(runner, options) {
-      Base.call(this, runner);
-      var stats = this.stats
-    , tests = []
-    , self = this;
-
-      if (options.reporterOptions && options.reporterOptions.output) {
-        if (! fs.createWriteStream) {
-          throw new Error('file output not supported in browser');
-        }
-        self.fileStream = fs.createWriteStream(options.reporterOptions.output);
-      }
-
-      runner.on('pending', function (test) {
-        tests.push(test);
-      });
-
-      runner.on('pass', function (test) {
-        tests.push(test);
-      });
-
-      runner.on('fail', function (test) {
-        tests.push(test);
-      });
-
-      runner.on('end', function () {
-        self.write(tag('testsuite', {
-          name: 'Mocha Tests'
-      , tests: stats.tests
-      , failures: stats.failures
-      , errors: stats.failures
-      , skipped: stats.tests - stats.failures - stats.passes
-      , timestamp: (new Date).toUTCString()
-      , time: (stats.duration / 1000) || 0
-        }, false));
-
-        tests.forEach(function (t) { self.test(t); });
-        self.write('</testsuite>');
-      });
-    }
-
-/**
- * Override done to close the stream (if it's a file).
- */
-    XUnit.prototype.done = function (failures, fn) {
-      if (this.fileStream) {
-        this.fileStream.end(function () {
-          fn(failures);
-        });
-      } else {
-        fn(failures);
-      }
-    };
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-    function F() {}
-    F.prototype = Base.prototype;
-    XUnit.prototype = new F;
-    XUnit.prototype.constructor = XUnit;
-
-
-/**
- * Write out the given line
- */
-    XUnit.prototype.write = function (line) {
-      if (this.fileStream) {
-        this.fileStream.write(line + '\n');
-      } else {
-        console.log(line);
-      }
-    };
-
-/**
- * Output tag for the given `test.`
- */
-
-    XUnit.prototype.test = function (test, ostream) {
-      var attrs = {
-        classname: test.parent.fullTitle()
-    , name: test.title
-    , time: (test.duration / 1000) || 0
-      };
-
-      if ('failed' == test.state) {
-        var err = test.err;
-        this.write(tag('testcase', attrs, false, tag('failure', {}, false, cdata(escape(err.message) + '\n' + err.stack))));
-      } else if (test.pending) {
-        this.write(tag('testcase', attrs, false, tag('skipped', {}, true)));
-      } else {
-        this.write(tag('testcase', attrs, true));
-      }
-    };
-
-/**
- * HTML tag helper.
- */
-
-    function tag(name, attrs, close, content) {
-      var end = close ? '/>' : '>'
-    , pairs = []
-    , tag;
-
-      for (var key in attrs) {
-        pairs.push(key + '="' + escape(attrs[key]) + '"');
-      }
-
-      tag = '<' + name + (pairs.length ? ' ' + pairs.join(' ') : '') + end;
-      if (content) tag += content + '</' + name + end;
-      return tag;
-    }
-
-/**
- * Return cdata escaped CDATA `str`.
- */
-
-    function cdata(str) {
-      return '<![CDATA[' + escape(str) + ']]>';
-    }
-
-  }); // module: reporters/xunit.js
-
-  require.register('runnable.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var EventEmitter = require('browser/events').EventEmitter
-  , debug = require('browser/debug')('mocha:runnable')
-  , Pending = require('./pending')
-  , milliseconds = require('./ms')
-  , utils = require('./utils');
-
-/**
- * Save timer references to avoid Sinon interfering (see GH-237).
- */
-
-    var Date = global.Date
-  , setTimeout = global.setTimeout
-  , setInterval = global.setInterval
-  , clearTimeout = global.clearTimeout
-  , clearInterval = global.clearInterval;
-
-/**
- * Object#toString().
- */
-
-    var toString = Object.prototype.toString;
-
-/**
- * Expose `Runnable`.
- */
-
-    module.exports = Runnable;
-
-/**
- * Initialize a new `Runnable` with the given `title` and callback `fn`.
- *
- * @param {String} title
- * @param {Function} fn
- * @api private
- */
-
-    function Runnable(title, fn) {
-      this.title = title;
-      this.fn = fn;
-      this.async = fn && fn.length;
-      this.sync = ! this.async;
-      this._timeout = 2000;
-      this._slow = 75;
-      this._enableTimeouts = true;
-      this.timedOut = false;
-      this._trace = new Error('done() called multiple times');
-    }
-
-/**
- * Inherit from `EventEmitter.prototype`.
- */
-
-    function F() {}
-    F.prototype = EventEmitter.prototype;
-    Runnable.prototype = new F;
-    Runnable.prototype.constructor = Runnable;
-
-
-/**
- * Set & get timeout `ms`.
- *
- * @param {Number|String} ms
- * @return {Runnable|Number} ms or self
- * @api private
- */
-
-    Runnable.prototype.timeout = function (ms) {
-      if (0 == arguments.length) return this._timeout;
-      if (ms === 0) this._enableTimeouts = false;
-      if ('string' == typeof ms) ms = milliseconds(ms);
-      debug('timeout %d', ms);
-      this._timeout = ms;
-      if (this.timer) this.resetTimeout();
-      return this;
-    };
-
-/**
- * Set & get slow `ms`.
- *
- * @param {Number|String} ms
- * @return {Runnable|Number} ms or self
- * @api private
- */
-
-    Runnable.prototype.slow = function (ms) {
-      if (0 === arguments.length) return this._slow;
-      if ('string' == typeof ms) ms = milliseconds(ms);
-      debug('timeout %d', ms);
-      this._slow = ms;
-      return this;
-    };
-
-/**
- * Set and & get timeout `enabled`.
- *
- * @param {Boolean} enabled
- * @return {Runnable|Boolean} enabled or self
- * @api private
- */
-
-    Runnable.prototype.enableTimeouts = function (enabled) {
-      if (arguments.length === 0) return this._enableTimeouts;
-      debug('enableTimeouts %s', enabled);
-      this._enableTimeouts = enabled;
-      return this;
-    };
-
-/**
- * Halt and mark as pending.
- *
- * @api private
- */
-
-    Runnable.prototype.skip = function () {
-      throw new Pending();
-    };
-
-/**
- * Return the full title generated by recursively
- * concatenating the parent's full title.
- *
- * @return {String}
- * @api public
- */
-
-    Runnable.prototype.fullTitle = function () {
-      return this.parent.fullTitle() + ' ' + this.title;
-    };
-
-/**
- * Clear the timeout.
- *
- * @api private
- */
-
-    Runnable.prototype.clearTimeout = function () {
-      clearTimeout(this.timer);
-    };
-
-/**
- * Inspect the runnable void of private properties.
- *
- * @return {String}
- * @api private
- */
-
-    Runnable.prototype.inspect = function () {
-      return JSON.stringify(this, function (key, val) {
-        if ('_' == key[0]) return;
-        if ('parent' == key) return '#<Suite>';
-        if ('ctx' == key) return '#<Context>';
-        return val;
-      }, 2);
-    };
-
-/**
- * Reset the timeout.
- *
- * @api private
- */
-
-    Runnable.prototype.resetTimeout = function () {
-      var self = this;
-      var ms = this.timeout() || 1e9;
-
-      if (!this._enableTimeouts) return;
-      this.clearTimeout();
-      this.timer = setTimeout(function () {
-        if (!self._enableTimeouts) return;
-        self.callback(new Error('timeout of ' + ms + 'ms exceeded. Ensure the done() callback is being called in this test.'));
-        self.timedOut = true;
-      }, ms);
-    };
-
-/**
- * Whitelist these globals for this test run
- *
- * @api private
- */
-    Runnable.prototype.globals = function (arr) {
-      var self = this;
-      this._allowedGlobals = arr;
-    };
-
-/**
- * Run the test and invoke `fn(err)`.
- *
- * @param {Function} fn
- * @api private
- */
-
-    Runnable.prototype.run = function (fn) {
-      var self = this
-    , start = new Date
-    , ctx = this.ctx
-    , finished
-    , emitted;
-
-  // Some times the ctx exists but it is not runnable
-      if (ctx && ctx.runnable) ctx.runnable(this);
-
-  // called multiple times
-      function multiple(err) {
-        if (emitted) return;
-        emitted = true;
-        self.emit('error', err || new Error('done() called multiple times; stacktrace may be inaccurate'));
-      }
-
-  // finished
-      function done(err) {
-        var ms = self.timeout();
-        if (self.timedOut) return;
-        if (finished) return multiple(err || self._trace);
-
-    // Discard the resolution if this test has already failed asynchronously
-        if (self.state) return;
-
-        self.clearTimeout();
-        self.duration = new Date - start;
-        finished = true;
-        if (!err && self.duration > ms && self._enableTimeouts) err = new Error('timeout of ' + ms + 'ms exceeded. Ensure the done() callback is being called in this test.');
-        fn(err);
-      }
-
-  // for .resetTimeout()
-      this.callback = done;
-
-  // explicit async with `done` argument
-      if (this.async) {
-        this.resetTimeout();
-
-        try {
-          this.fn.call(ctx, function (err) {
-            if (err instanceof Error || toString.call(err) === '[object Error]') return done(err);
-            if (null != err) {
-              if (Object.prototype.toString.call(err) === '[object Object]') {
-                return done(new Error('done() invoked with non-Error: ' + JSON.stringify(err)));
-              } else {
-                return done(new Error('done() invoked with non-Error: ' + err));
-              }
-            }
-            done();
-          });
-        } catch (err) {
-          done(utils.getError(err));
-        }
-        return;
-      }
-
-      if (this.asyncOnly) {
-        return done(new Error('--async-only option in use without declaring `done()`'));
-      }
-
-  // sync or promise-returning
-      try {
-        if (this.pending) {
-          done();
-        } else {
-          callFn(this.fn);
-        }
-      } catch (err) {
-        done(utils.getError(err));
-      }
-
-      function callFn(fn) {
-        var result = fn.call(ctx);
-        if (result && typeof result.then === 'function') {
-          self.resetTimeout();
-          result
-        .then(function () {
-          done();
-        },
-        function (reason) {
-          done(reason || new Error('Promise rejected with no or falsy reason'));
-        });
-        } else {
-          done();
-        }
-      }
-    };
-
-  }); // module: runnable.js
-
-  require.register('runner.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var EventEmitter = require('browser/events').EventEmitter
-  , debug = require('browser/debug')('mocha:runner')
-  , Pending = require('./pending')
-  , Test = require('./test')
-  , utils = require('./utils')
-  , filter = utils.filter
-  , keys = utils.keys
-  , type = utils.type
-  , stringify = utils.stringify
-  , stackFilter = utils.stackTraceFilter();
-
-/**
- * Non-enumerable globals.
- */
-
-    var globals = [
-      'setTimeout',
-      'clearTimeout',
-      'setInterval',
-      'clearInterval',
-      'XMLHttpRequest',
-      'Date',
-      'setImmediate',
-      'clearImmediate'
-    ];
-
-/**
- * Expose `Runner`.
- */
-
-    module.exports = Runner;
-
-/**
- * Initialize a `Runner` for the given `suite`.
- *
- * Events:
- *
- *   - `start`  execution started
- *   - `end`  execution complete
- *   - `suite`  (suite) test suite execution started
- *   - `suite end`  (suite) all tests (and sub-suites) have finished
- *   - `test`  (test) test execution started
- *   - `test end`  (test) test completed
- *   - `hook`  (hook) hook execution started
- *   - `hook end`  (hook) hook complete
- *   - `pass`  (test) test passed
- *   - `fail`  (test, err) test failed
- *   - `pending`  (test) test pending
- *
- * @param {Suite} suite Root suite
- * @param {boolean} [delay] Whether or not to delay execution of root suite
- *   until ready.
- * @api public
- */
-
-    function Runner(suite, delay) {
-      var self = this;
-      this._globals = [];
-      this._abort = false;
-      this._delay = delay;
-      this.suite = suite;
-      this.total = suite.total();
-      this.failures = 0;
-      this.on('test end', function (test) { self.checkGlobals(test); });
-      this.on('hook end', function (hook) { self.checkGlobals(hook); });
-      this.grep(/.*/);
-      this.globals(this.globalProps().concat(extraGlobals()));
-    }
-
-/**
- * Wrapper for setImmediate, process.nextTick, or browser polyfill.
- *
- * @param {Function} fn
- * @api private
- */
-
-    Runner.immediately = global.setImmediate || process.nextTick;
-
-/**
- * Inherit from `EventEmitter.prototype`.
- */
-
-    function F() {}
-    F.prototype = EventEmitter.prototype;
-    Runner.prototype = new F;
-    Runner.prototype.constructor = Runner;
-
-
-/**
- * Run tests with full titles matching `re`. Updates runner.total
- * with number of tests matched.
- *
- * @param {RegExp} re
- * @param {Boolean} invert
- * @return {Runner} for chaining
- * @api public
- */
-
-    Runner.prototype.grep = function (re, invert) {
-      debug('grep %s', re);
-      this._grep = re;
-      this._invert = invert;
-      this.total = this.grepTotal(this.suite);
-      return this;
-    };
-
-/**
- * Returns the number of tests matching the grep search for the
- * given suite.
- *
- * @param {Suite} suite
- * @return {Number}
- * @api public
- */
-
-    Runner.prototype.grepTotal = function (suite) {
-      var self = this;
-      var total = 0;
-
-      suite.eachTest(function (test) {
-        var match = self._grep.test(test.fullTitle());
-        if (self._invert) match = !match;
-        if (match) total++;
-      });
-
-      return total;
-    };
-
-/**
- * Return a list of global properties.
- *
- * @return {Array}
- * @api private
- */
-
-    Runner.prototype.globalProps = function () {
-      var props = utils.keys(global);
-
-  // non-enumerables
-      for (var i = 0; i < globals.length; ++i) {
-        if (~utils.indexOf(props, globals[i])) continue;
-        props.push(globals[i]);
-      }
-
-      return props;
-    };
-
-/**
- * Allow the given `arr` of globals.
- *
- * @param {Array} arr
- * @return {Runner} for chaining
- * @api public
- */
-
-    Runner.prototype.globals = function (arr) {
-      if (0 == arguments.length) return this._globals;
-      debug('globals %j', arr);
-      this._globals = this._globals.concat(arr);
-      return this;
-    };
-
-/**
- * Check for global variable leaks.
- *
- * @api private
- */
-
-    Runner.prototype.checkGlobals = function (test) {
-      if (this.ignoreLeaks) return;
-      var ok = this._globals;
-
-      var globals = this.globalProps();
-      var leaks;
-
-      if (test) {
-        ok = ok.concat(test._allowedGlobals || []);
-      }
-
-      if (this.prevGlobalsLength == globals.length) return;
-      this.prevGlobalsLength = globals.length;
-
-      leaks = filterLeaks(ok, globals);
-      this._globals = this._globals.concat(leaks);
-
-      if (leaks.length > 1) {
-        this.fail(test, new Error('global leaks detected: ' + leaks.join(', ') + ''));
-      } else if (leaks.length) {
-        this.fail(test, new Error('global leak detected: ' + leaks[0]));
-      }
-    };
-
-/**
- * Fail the given `test`.
- *
- * @param {Test} test
- * @param {Error} err
- * @api private
- */
-
-    Runner.prototype.fail = function (test, err) {
-      ++this.failures;
-      test.state = 'failed';
-
-      if (!(err instanceof Error)) {
-        err = new Error('the ' + type(err) + ' ' + stringify(err) + ' was thrown, throw an Error :)');
-      }
-
-      err.stack = (this.fullStackTrace || !err.stack)
-    ? err.stack
-    : stackFilter(err.stack);
-
-      this.emit('fail', test, err);
-    };
-
-/**
- * Fail the given `hook` with `err`.
- *
- * Hook failures work in the following pattern:
- * - If bail, then exit
- * - Failed `before` hook skips all tests in a suite and subsuites,
- *   but jumps to corresponding `after` hook
- * - Failed `before each` hook skips remaining tests in a
- *   suite and jumps to corresponding `after each` hook,
- *   which is run only once
- * - Failed `after` hook does not alter
- *   execution order
- * - Failed `after each` hook skips remaining tests in a
- *   suite and subsuites, but executes other `after each`
- *   hooks
- *
- * @param {Hook} hook
- * @param {Error} err
- * @api private
- */
-
-    Runner.prototype.failHook = function (hook, err) {
-      this.fail(hook, err);
-      if (this.suite.bail()) {
-        this.emit('end');
-      }
-    };
-
-/**
- * Run hook `name` callbacks and then invoke `fn()`.
- *
- * @param {String} name
- * @param {Function} function
- * @api private
- */
-
-    Runner.prototype.hook = function (name, fn) {
-      var suite = this.suite
-    , hooks = suite['_' + name]
-    , self = this
-    , timer;
-
-      function next(i) {
-        var hook = hooks[i];
-        if (!hook) return fn();
-        self.currentRunnable = hook;
-
-        hook.ctx.currentTest = self.test;
-
-        self.emit('hook', hook);
-
-        hook.on('error', function (err) {
-          self.failHook(hook, err);
-        });
-
-        hook.run(function (err) {
-          hook.removeAllListeners('error');
-          var testError = hook.error();
-          if (testError) self.fail(self.test, testError);
-          if (err) {
-            if (err instanceof Pending) {
-              suite.pending = true;
-            } else {
-              self.failHook(hook, err);
-
-          // stop executing hooks, notify callee of hook err
-              return fn(err);
-            }
-          }
-          self.emit('hook end', hook);
-          delete hook.ctx.currentTest;
-          next(++i);
-        });
-      }
-
-      Runner.immediately(function () {
-        next(0);
-      });
-    };
-
-/**
- * Run hook `name` for the given array of `suites`
- * in order, and callback `fn(err, errSuite)`.
- *
- * @param {String} name
- * @param {Array} suites
- * @param {Function} fn
- * @api private
- */
-
-    Runner.prototype.hooks = function (name, suites, fn) {
-      var self = this
-    , orig = this.suite;
-
-      function next(suite) {
-        self.suite = suite;
-
-        if (!suite) {
-          self.suite = orig;
-          return fn();
-        }
-
-        self.hook(name, function (err) {
-          if (err) {
-            var errSuite = self.suite;
-            self.suite = orig;
-            return fn(err, errSuite);
-          }
-
-          next(suites.pop());
-        });
-      }
-
-      next(suites.pop());
-    };
-
-/**
- * Run hooks from the top level down.
- *
- * @param {String} name
- * @param {Function} fn
- * @api private
- */
-
-    Runner.prototype.hookUp = function (name, fn) {
-      var suites = [this.suite].concat(this.parents()).reverse();
-      this.hooks(name, suites, fn);
-    };
-
-/**
- * Run hooks from the bottom up.
- *
- * @param {String} name
- * @param {Function} fn
- * @api private
- */
-
-    Runner.prototype.hookDown = function (name, fn) {
-      var suites = [this.suite].concat(this.parents());
-      this.hooks(name, suites, fn);
-    };
-
-/**
- * Return an array of parent Suites from
- * closest to furthest.
- *
- * @return {Array}
- * @api private
- */
-
-    Runner.prototype.parents = function () {
-      var suite = this.suite
-    , suites = [];
-      while (suite = suite.parent) suites.push(suite);
-      return suites;
-    };
-
-/**
- * Run the current test and callback `fn(err)`.
- *
- * @param {Function} fn
- * @api private
- */
-
-    Runner.prototype.runTest = function (fn) {
-      var test = this.test
-    , self = this;
-
-      if (this.asyncOnly) test.asyncOnly = true;
-
-      try {
-        test.on('error', function (err) {
-          self.fail(test, err);
-        });
-        test.run(fn);
-      } catch (err) {
-        fn(err);
-      }
-    };
-
-/**
- * Run tests in the given `suite` and invoke
- * the callback `fn()` when complete.
- *
- * @param {Suite} suite
- * @param {Function} fn
- * @api private
- */
-
-    Runner.prototype.runTests = function (suite, fn) {
-      var self = this
-    , tests = suite.tests.slice()
-    , test;
-
-
-      function hookErr(err, errSuite, after) {
-    // before/after Each hook for errSuite failed:
-        var orig = self.suite;
-
-    // for failed 'after each' hook start from errSuite parent,
-    // otherwise start from errSuite itself
-        self.suite = after ? errSuite.parent : errSuite;
-
-        if (self.suite) {
-      // call hookUp afterEach
-          self.hookUp('afterEach', function (err2, errSuite2) {
-            self.suite = orig;
-        // some hooks may fail even now
-            if (err2) return hookErr(err2, errSuite2, true);
-        // report error suite
-            fn(errSuite);
-          });
-        } else {
-      // there is no need calling other 'after each' hooks
-          self.suite = orig;
-          fn(errSuite);
-        }
-      }
-
-      function next(err, errSuite) {
-    // if we bail after first err
-        if (self.failures && suite._bail) return fn();
-
-        if (self._abort) return fn();
-
-        if (err) return hookErr(err, errSuite, true);
-
-    // next test
-        test = tests.shift();
-
-    // all done
-        if (!test) return fn();
-
-    // grep
-        var match = self._grep.test(test.fullTitle());
-        if (self._invert) match = !match;
-        if (!match) return next();
-
-    // pending
-        if (test.pending) {
-          self.emit('pending', test);
-          self.emit('test end', test);
-          return next();
-        }
-
-    // execute test and hook(s)
-        self.emit('test', self.test = test);
-        self.hookDown('beforeEach', function (err, errSuite) {
-
-          if (suite.pending) {
-            self.emit('pending', test);
-            self.emit('test end', test);
-            return next();
-          }
-          if (err) return hookErr(err, errSuite, false);
-
-          self.currentRunnable = self.test;
-          self.runTest(function (err) {
-            test = self.test;
-
-            if (err) {
-              if (err instanceof Pending) {
-                self.emit('pending', test);
-              } else {
-                self.fail(test, err);
-              }
-              self.emit('test end', test);
-
-              if (err instanceof Pending) {
-                return next();
-              }
-
-              return self.hookUp('afterEach', next);
-            }
-
-            test.state = 'passed';
-            self.emit('pass', test);
-            self.emit('test end', test);
-            self.hookUp('afterEach', next);
-          });
-        });
-      }
-
-      this.next = next;
-      next();
-    };
-
-/**
- * Run the given `suite` and invoke the
- * callback `fn()` when complete.
- *
- * @param {Suite} suite
- * @param {Function} fn
- * @api private
- */
-
-    Runner.prototype.runSuite = function (suite, fn) {
-      var total = this.grepTotal(suite)
-    , self = this
-    , i = 0;
-
-      debug('run suite %s', suite.fullTitle());
-
-      if (!total) return fn();
-
-      this.emit('suite', this.suite = suite);
-
-      function next(errSuite) {
-        if (errSuite) {
-      // current suite failed on a hook from errSuite
-          if (errSuite == suite) {
-        // if errSuite is current suite
-        // continue to the next sibling suite
-            return done();
-          } else {
-        // errSuite is among the parents of current suite
-        // stop execution of errSuite and all sub-suites
-            return done(errSuite);
-          }
-        }
-
-        if (self._abort) return done();
-
-        var curr = suite.suites[i++];
-        if (!curr) return done();
-        self.runSuite(curr, next);
-      }
-
-      function done(errSuite) {
-        self.suite = suite;
-        self.hook('afterAll', function () {
-          self.emit('suite end', suite);
-          fn(errSuite);
-        });
-      }
-
-      this.hook('beforeAll', function (err) {
-        if (err) return done();
-        self.runTests(suite, next);
-      });
-    };
-
-/**
- * Handle uncaught exceptions.
- *
- * @param {Error} err
- * @api private
- */
-
-    Runner.prototype.uncaught = function (err) {
-      if (err) {
-        debug('uncaught exception %s', err !== function () {
-          return this;
-        }.call(err) ? err : (err.message || err));
-      } else {
-        debug('uncaught undefined exception');
-        err = utils.undefinedError();
-      }
-      err.uncaught = true;
-
-      var runnable = this.currentRunnable;
-      if (!runnable) return;
-
-      runnable.clearTimeout();
-
-  // Ignore errors if complete
-      if (runnable.state) return;
-      this.fail(runnable, err);
-
-  // recover from test
-      if ('test' == runnable.type) {
-        this.emit('test end', runnable);
-        this.hookUp('afterEach', this.next);
-        return;
-      }
-
-  // bail on hooks
-      this.emit('end');
-    };
-
-/**
- * Run the root suite and invoke `fn(failures)`
- * on completion.
- *
- * @param {Function} fn
- * @return {Runner} for chaining
- * @api public
- */
-
-    Runner.prototype.run = function (fn) {
-      var self = this,
-        rootSuite = this.suite;
-
-      fn = fn || function () {};
-
-      function uncaught(err) {
-        self.uncaught(err);
-      }
-
-      function start() {
-        self.emit('start');
-        self.runSuite(rootSuite, function () {
-          debug('finished running');
-          self.emit('end');
-        });
-      }
-
-      debug('start');
-
-  // callback
-      this.on('end', function () {
-        debug('end');
-        process.removeListener('uncaughtException', uncaught);
-        fn(self.failures);
-      });
-
-  // uncaught exception
-      process.on('uncaughtException', uncaught);
-
-      if (this._delay) {
-    // for reporters, I guess.
-    // might be nice to debounce some dots while we wait.
-        this.emit('waiting', rootSuite);
-        rootSuite.once('run', start);
-      }
-      else {
-        start();
-      }
-
-      return this;
-    };
-
-/**
- * Cleanly abort execution
- *
- * @return {Runner} for chaining
- * @api public
- */
-    Runner.prototype.abort = function () {
-      debug('aborting');
-      this._abort = true;
-    };
-
-/**
- * Filter leaks with the given globals flagged as `ok`.
- *
- * @param {Array} ok
- * @param {Array} globals
- * @return {Array}
- * @api private
- */
-
-    function filterLeaks(ok, globals) {
-      return filter(globals, function (key) {
-    // Firefox and Chrome exposes iframes as index inside the window object
-        if (/^d+/.test(key)) return false;
-
-    // in firefox
-    // if runner runs in an iframe, this iframe's window.getInterface method not init at first
-    // it is assigned in some seconds
-        if (global.navigator && /^getInterface/.test(key)) return false;
-
-    // an iframe could be approached by window[iframeIndex]
-    // in ie6,7,8 and opera, iframeIndex is enumerable, this could cause leak
-        if (global.navigator && /^\d+/.test(key)) return false;
-
-    // Opera and IE expose global variables for HTML element IDs (issue #243)
-        if (/^mocha-/.test(key)) return false;
-
-        var matched = filter(ok, function (ok) {
-          if (~ok.indexOf('*')) return 0 == key.indexOf(ok.split('*')[0]);
-          return key == ok;
-        });
-        return matched.length == 0 && (!global.navigator || 'onerror' !== key);
-      });
-    }
-
-/**
- * Array of globals dependent on the environment.
- *
- * @return {Array}
- * @api private
- */
-
-    function extraGlobals() {
-      if (typeof(process) === 'object' &&
-     typeof(process.version) === 'string') {
-
-        var nodeVersion = process.version.split('.').reduce(function (a, v) {
-          return a << 8 | v;
-        });
-
-   // 'errno' was renamed to process._errno in v0.9.11.
-
-        if (nodeVersion < 0x00090B) {
-          return ['errno'];
-        }
-      }
-
-      return [];
-    }
-
-  }); // module: runner.js
-
-  require.register('suite.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var EventEmitter = require('browser/events').EventEmitter
-  , debug = require('browser/debug')('mocha:suite')
-  , milliseconds = require('./ms')
-  , utils = require('./utils')
-  , Hook = require('./hook');
-
-/**
- * Expose `Suite`.
- */
-
-    exports = module.exports = Suite;
-
-/**
- * Create a new `Suite` with the given `title`
- * and parent `Suite`. When a suite with the
- * same title is already present, that suite
- * is returned to provide nicer reporter
- * and more flexible meta-testing.
- *
- * @param {Suite} parent
- * @param {String} title
- * @return {Suite}
- * @api public
- */
-
-    exports.create = function (parent, title) {
-      var suite = new Suite(title, parent.ctx);
-      suite.parent = parent;
-      if (parent.pending) suite.pending = true;
-      title = suite.fullTitle();
-      parent.addSuite(suite);
-      return suite;
-    };
-
-/**
- * Initialize a new `Suite` with the given
- * `title` and `ctx`.
- *
- * @param {String} title
- * @param {Context} ctx
- * @api private
- */
-
-    function Suite(title, parentContext) {
-      this.title = title;
-      var context = function () {};
-      context.prototype = parentContext;
-      this.ctx = new context();
-      this.suites = [];
-      this.tests = [];
-      this.pending = false;
-      this._beforeEach = [];
-      this._beforeAll = [];
-      this._afterEach = [];
-      this._afterAll = [];
-      this.root = !title;
-      this._timeout = 2000;
-      this._enableTimeouts = true;
-      this._slow = 75;
-      this._bail = false;
-      this.delayed = false;
-    }
-
-/**
- * Inherit from `EventEmitter.prototype`.
- */
-
-    function F() {}
-    F.prototype = EventEmitter.prototype;
-    Suite.prototype = new F;
-    Suite.prototype.constructor = Suite;
-
-
-/**
- * Return a clone of this `Suite`.
- *
- * @return {Suite}
- * @api private
- */
-
-    Suite.prototype.clone = function () {
-      var suite = new Suite(this.title);
-      debug('clone');
-      suite.ctx = this.ctx;
-      suite.timeout(this.timeout());
-      suite.enableTimeouts(this.enableTimeouts());
-      suite.slow(this.slow());
-      suite.bail(this.bail());
-      return suite;
-    };
-
-/**
- * Set timeout `ms` or short-hand such as "2s".
- *
- * @param {Number|String} ms
- * @return {Suite|Number} for chaining
- * @api private
- */
-
-    Suite.prototype.timeout = function (ms) {
-      if (0 == arguments.length) return this._timeout;
-      if (ms.toString() === '0') this._enableTimeouts = false;
-      if ('string' == typeof ms) ms = milliseconds(ms);
-      debug('timeout %d', ms);
-      this._timeout = parseInt(ms, 10);
-      return this;
-    };
-
-/**
-  * Set timeout `enabled`.
-  *
-  * @param {Boolean} enabled
-  * @return {Suite|Boolean} self or enabled
-  * @api private
-  */
-
-    Suite.prototype.enableTimeouts = function (enabled) {
-      if (arguments.length === 0) return this._enableTimeouts;
-      debug('enableTimeouts %s', enabled);
-      this._enableTimeouts = enabled;
-      return this;
-    };
-
-/**
- * Set slow `ms` or short-hand such as "2s".
- *
- * @param {Number|String} ms
- * @return {Suite|Number} for chaining
- * @api private
- */
-
-    Suite.prototype.slow = function (ms) {
-      if (0 === arguments.length) return this._slow;
-      if ('string' == typeof ms) ms = milliseconds(ms);
-      debug('slow %d', ms);
-      this._slow = ms;
-      return this;
-    };
-
-/**
- * Sets whether to bail after first error.
- *
- * @param {Boolean} bail
- * @return {Suite|Number} for chaining
- * @api private
- */
-
-    Suite.prototype.bail = function (bail) {
-      if (0 == arguments.length) return this._bail;
-      debug('bail %s', bail);
-      this._bail = bail;
-      return this;
-    };
-
-/**
- * Run `fn(test[, done])` before running tests.
- *
- * @param {Function} fn
- * @return {Suite} for chaining
- * @api private
- */
-
-    Suite.prototype.beforeAll = function (title, fn) {
-      if (this.pending) return this;
-      if ('function' === typeof title) {
-        fn = title;
-        title = fn.name;
-      }
-      title = '"before all" hook' + (title ? ': ' + title : '');
-
-      var hook = new Hook(title, fn);
-      hook.parent = this;
-      hook.timeout(this.timeout());
-      hook.enableTimeouts(this.enableTimeouts());
-      hook.slow(this.slow());
-      hook.ctx = this.ctx;
-      this._beforeAll.push(hook);
-      this.emit('beforeAll', hook);
-      return this;
-    };
-
-/**
- * Run `fn(test[, done])` after running tests.
- *
- * @param {Function} fn
- * @return {Suite} for chaining
- * @api private
- */
-
-    Suite.prototype.afterAll = function (title, fn) {
-      if (this.pending) return this;
-      if ('function' === typeof title) {
-        fn = title;
-        title = fn.name;
-      }
-      title = '"after all" hook' + (title ? ': ' + title : '');
-
-      var hook = new Hook(title, fn);
-      hook.parent = this;
-      hook.timeout(this.timeout());
-      hook.enableTimeouts(this.enableTimeouts());
-      hook.slow(this.slow());
-      hook.ctx = this.ctx;
-      this._afterAll.push(hook);
-      this.emit('afterAll', hook);
-      return this;
-    };
-
-/**
- * Run `fn(test[, done])` before each test case.
- *
- * @param {Function} fn
- * @return {Suite} for chaining
- * @api private
- */
-
-    Suite.prototype.beforeEach = function (title, fn) {
-      if (this.pending) return this;
-      if ('function' === typeof title) {
-        fn = title;
-        title = fn.name;
-      }
-      title = '"before each" hook' + (title ? ': ' + title : '');
-
-      var hook = new Hook(title, fn);
-      hook.parent = this;
-      hook.timeout(this.timeout());
-      hook.enableTimeouts(this.enableTimeouts());
-      hook.slow(this.slow());
-      hook.ctx = this.ctx;
-      this._beforeEach.push(hook);
-      this.emit('beforeEach', hook);
-      return this;
-    };
-
-/**
- * Run `fn(test[, done])` after each test case.
- *
- * @param {Function} fn
- * @return {Suite} for chaining
- * @api private
- */
-
-    Suite.prototype.afterEach = function (title, fn) {
-      if (this.pending) return this;
-      if ('function' === typeof title) {
-        fn = title;
-        title = fn.name;
-      }
-      title = '"after each" hook' + (title ? ': ' + title : '');
-
-      var hook = new Hook(title, fn);
-      hook.parent = this;
-      hook.timeout(this.timeout());
-      hook.enableTimeouts(this.enableTimeouts());
-      hook.slow(this.slow());
-      hook.ctx = this.ctx;
-      this._afterEach.push(hook);
-      this.emit('afterEach', hook);
-      return this;
-    };
-
-/**
- * Add a test `suite`.
- *
- * @param {Suite} suite
- * @return {Suite} for chaining
- * @api private
- */
-
-    Suite.prototype.addSuite = function (suite) {
-      suite.parent = this;
-      suite.timeout(this.timeout());
-      suite.enableTimeouts(this.enableTimeouts());
-      suite.slow(this.slow());
-      suite.bail(this.bail());
-      this.suites.push(suite);
-      this.emit('suite', suite);
-      return this;
-    };
-
-/**
- * Add a `test` to this suite.
- *
- * @param {Test} test
- * @return {Suite} for chaining
- * @api private
- */
-
-    Suite.prototype.addTest = function (test) {
-      test.parent = this;
-      test.timeout(this.timeout());
-      test.enableTimeouts(this.enableTimeouts());
-      test.slow(this.slow());
-      test.ctx = this.ctx;
-      this.tests.push(test);
-      this.emit('test', test);
-      return this;
-    };
-
-/**
- * Return the full title generated by recursively
- * concatenating the parent's full title.
- *
- * @return {String}
- * @api public
- */
-
-    Suite.prototype.fullTitle = function () {
-      if (this.parent) {
-        var full = this.parent.fullTitle();
-        if (full) return full + ' ' + this.title;
-      }
-      return this.title;
-    };
-
-/**
- * Return the total number of tests.
- *
- * @return {Number}
- * @api public
- */
-
-    Suite.prototype.total = function () {
-      return utils.reduce(this.suites, function (sum, suite) {
-        return sum + suite.total();
-      }, 0) + this.tests.length;
-    };
-
-/**
- * Iterates through each suite recursively to find
- * all tests. Applies a function in the format
- * `fn(test)`.
- *
- * @param {Function} fn
- * @return {Suite}
- * @api private
- */
-
-    Suite.prototype.eachTest = function (fn) {
-      utils.forEach(this.tests, fn);
-      utils.forEach(this.suites, function (suite) {
-        suite.eachTest(fn);
-      });
-      return this;
-    };
-
-/**
- * This will run the root suite if we happen to be running in delayed mode.
- */
-    Suite.prototype.run = function run() {
-      if (this.root) {
-        this.emit('run');
-      }
-    };
-
-  }); // module: suite.js
-
-  require.register('test.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var Runnable = require('./runnable');
-
-/**
- * Expose `Test`.
- */
-
-    module.exports = Test;
-
-/**
- * Initialize a new `Test` with the given `title` and callback `fn`.
- *
- * @param {String} title
- * @param {Function} fn
- * @api private
- */
-
-    function Test(title, fn) {
-      Runnable.call(this, title, fn);
-      this.pending = !fn;
-      this.type = 'test';
-    }
-
-/**
- * Inherit from `Runnable.prototype`.
- */
-
-    function F() {}
-    F.prototype = Runnable.prototype;
-    Test.prototype = new F;
-    Test.prototype.constructor = Test;
-
-
-  }); // module: test.js
-
-  require.register('utils.js', function (module, exports, require) {
-/**
- * Module dependencies.
- */
-
-    var fs = require('browser/fs')
-  , path = require('browser/path')
-  , basename = path.basename
-  , exists = fs.existsSync || path.existsSync
-  , glob = require('browser/glob')
-  , join = path.join
-  , debug = require('browser/debug')('mocha:watch');
-
-/**
- * Ignored directories.
- */
-
-    var ignore = ['node_modules', '.git'];
-
-/**
- * Escape special characters in the given string of html.
- *
- * @param  {String} html
- * @return {String}
- * @api private
- */
-
-    exports.escape = function (html) {
-      return String(html)
-    .replace(/&/g, '&amp;')
-    .replace(/"/g, '&quot;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;');
-    };
-
-/**
- * Array#forEach (<=IE8)
- *
- * @param {Array} array
- * @param {Function} fn
- * @param {Object} scope
- * @api private
- */
-
-    exports.forEach = function (arr, fn, scope) {
-      for (var i = 0, l = arr.length; i < l; i++)
-        fn.call(scope, arr[i], i);
-    };
-
-/**
- * Array#map (<=IE8)
- *
- * @param {Array} array
- * @param {Function} fn
- * @param {Object} scope
- * @api private
- */
-
-    exports.map = function (arr, fn, scope) {
-      var result = [];
-      for (var i = 0, l = arr.length; i < l; i++)
-        result.push(fn.call(scope, arr[i], i, arr));
-      return result;
-    };
-
-/**
- * Array#indexOf (<=IE8)
- *
- * @parma {Array} arr
- * @param {Object} obj to find index of
- * @param {Number} start
- * @api private
- */
-
-    exports.indexOf = function (arr, obj, start) {
-      for (var i = start || 0, l = arr.length; i < l; i++) {
-        if (arr[i] === obj)
-          return i;
-      }
-      return -1;
-    };
-
-/**
- * Array#reduce (<=IE8)
- *
- * @param {Array} array
- * @param {Function} fn
- * @param {Object} initial value
- * @api private
- */
-
-    exports.reduce = function (arr, fn, val) {
-      var rval = val;
-
-      for (var i = 0, l = arr.length; i < l; i++) {
-        rval = fn(rval, arr[i], i, arr);
-      }
-
-      return rval;
-    };
-
-/**
- * Array#filter (<=IE8)
- *
- * @param {Array} array
- * @param {Function} fn
- * @api private
- */
-
-    exports.filter = function (arr, fn) {
-      var ret = [];
-
-      for (var i = 0, l = arr.length; i < l; i++) {
-        var val = arr[i];
-        if (fn(val, i, arr)) ret.push(val);
-      }
-
-      return ret;
-    };
-
-/**
- * Object.keys (<=IE8)
- *
- * @param {Object} obj
- * @return {Array} keys
- * @api private
- */
-
-    exports.keys = Object.keys || function (obj) {
-      var keys = []
-    , has = Object.prototype.hasOwnProperty; // for `window` on <=IE8
-
-      for (var key in obj) {
-        if (has.call(obj, key)) {
-          keys.push(key);
-        }
-      }
-
-      return keys;
-    };
-
-/**
- * Watch the given `files` for changes
- * and invoke `fn(file)` on modification.
- *
- * @param {Array} files
- * @param {Function} fn
- * @api private
- */
-
-    exports.watch = function (files, fn) {
-      var options = { interval: 100 };
-      files.forEach(function (file) {
-        debug('file %s', file);
-        fs.watchFile(file, options, function (curr, prev) {
-          if (prev.mtime < curr.mtime) fn(file);
-        });
-      });
-    };
-
-/**
- * Array.isArray (<=IE8)
- *
- * @param {Object} obj
- * @return {Boolean}
- * @api private
- */
-    var isArray = Array.isArray || function (obj) {
-      return '[object Array]' == {}.toString.call(obj);
-    };
-
-/**
- * @description
- * Buffer.prototype.toJSON polyfill
- * @type {Function}
- */
-    if (typeof Buffer !== 'undefined' && Buffer.prototype) {
-      Buffer.prototype.toJSON = Buffer.prototype.toJSON || function () {
-        return Array.prototype.slice.call(this, 0);
-      };
-    }
-
-/**
- * Ignored files.
- */
-
-    function ignored(path) {
-      return !~ignore.indexOf(path);
-    }
-
-/**
- * Lookup files in the given `dir`.
- *
- * @return {Array}
- * @api private
- */
-
-    exports.files = function (dir, ext, ret) {
-      ret = ret || [];
-      ext = ext || ['js'];
-
-      var re = new RegExp('\\.(' + ext.join('|') + ')$');
-
-      fs.readdirSync(dir)
-    .filter(ignored)
-    .forEach(function (path) {
-      path = join(dir, path);
-      if (fs.statSync(path).isDirectory()) {
-        exports.files(path, ext, ret);
-      } else if (path.match(re)) {
-        ret.push(path);
-      }
-    });
-
-      return ret;
-    };
-
-/**
- * Compute a slug from the given `str`.
- *
- * @param {String} str
- * @return {String}
- * @api private
- */
-
-    exports.slug = function (str) {
-      return str
-    .toLowerCase()
-    .replace(/ +/g, '-')
-    .replace(/[^-\w]/g, '');
-    };
-
-/**
- * Strip the function definition from `str`,
- * and re-indent for pre whitespace.
- */
-
-    exports.clean = function (str) {
-      str = str
-    .replace(/\r\n?|[\n\u2028\u2029]/g, '\n').replace(/^\uFEFF/, '')
-    .replace(/^function *\(.*\)\s*{|\(.*\) *=> *{?/, '')
-    .replace(/\s+\}$/, '');
-
-      var spaces = str.match(/^\n?( *)/)[1].length
-    , tabs = str.match(/^\n?(\t*)/)[1].length
-    , re = new RegExp('^\n?' + (tabs ? '\t' : ' ') + '{' + (tabs ? tabs : spaces) + '}', 'gm');
-
-      str = str.replace(re, '');
-
-      return exports.trim(str);
-    };
-
-/**
- * Trim the given `str`.
- *
- * @param {String} str
- * @return {String}
- * @api private
- */
-
-    exports.trim = function (str) {
-      return str.replace(/^\s+|\s+$/g, '');
-    };
-
-/**
- * Parse the given `qs`.
- *
- * @param {String} qs
- * @return {Object}
- * @api private
- */
-
-    exports.parseQuery = function (qs) {
-      return exports.reduce(qs.replace('?', '').split('&'), function (obj, pair) {
-        var i = pair.indexOf('=')
-      , key = pair.slice(0, i)
-      , val = pair.slice(++i);
-
-        obj[key] = decodeURIComponent(val);
-        return obj;
-      }, {});
-    };
-
-/**
- * Highlight the given string of `js`.
- *
- * @param {String} js
- * @return {String}
- * @api private
- */
-
-    function highlight(js) {
-      return js
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/\/\/(.*)/gm, '<span class="comment">//$1</span>')
-    .replace(/('.*?')/gm, '<span class="string">$1</span>')
-    .replace(/(\d+\.\d+)/gm, '<span class="number">$1</span>')
-    .replace(/(\d+)/gm, '<span class="number">$1</span>')
-    .replace(/\bnew[ \t]+(\w+)/gm, '<span class="keyword">new</span> <span class="init">$1</span>')
-    .replace(/\b(function|new|throw|return|var|if|else)\b/gm, '<span class="keyword">$1</span>');
-    }
-
-/**
- * Highlight the contents of tag `name`.
- *
- * @param {String} name
- * @api private
- */
-
-    exports.highlightTags = function (name) {
-      var code = document.getElementById('mocha').getElementsByTagName(name);
-      for (var i = 0, len = code.length; i < len; ++i) {
-        code[i].innerHTML = highlight(code[i].innerHTML);
-      }
-    };
-
-/**
- * If a value could have properties, and has none, this function is called, which returns
- * a string representation of the empty value.
- *
- * Functions w/ no properties return `'[Function]'`
- * Arrays w/ length === 0 return `'[]'`
- * Objects w/ no properties return `'{}'`
- * All else: return result of `value.toString()`
- *
- * @param {*} value Value to inspect
- * @param {string} [type] The type of the value, if known.
- * @returns {string}
- */
-    var emptyRepresentation = function emptyRepresentation(value, type) {
-      type = type || exports.type(value);
-
-      switch (type) {
-        case 'function':
-          return '[Function]';
-        case 'object':
-          return '{}';
-        case 'array':
-          return '[]';
-        default:
-          return value.toString();
-      }
-    };
-
-/**
- * Takes some variable and asks `{}.toString()` what it thinks it is.
- * @param {*} value Anything
- * @example
- * type({}) // 'object'
- * type([]) // 'array'
- * type(1) // 'number'
- * type(false) // 'boolean'
- * type(Infinity) // 'number'
- * type(null) // 'null'
- * type(new Date()) // 'date'
- * type(/foo/) // 'regexp'
- * type('type') // 'string'
- * type(global) // 'global'
- * @api private
- * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/toString
- * @returns {string}
- */
-    exports.type = function type(value) {
-      if (typeof Buffer !== 'undefined' && Buffer.isBuffer(value)) {
-        return 'buffer';
-      }
-      return Object.prototype.toString.call(value)
-    .replace(/^\[.+\s(.+?)\]$/, '$1')
-    .toLowerCase();
-    };
-
-/**
- * @summary Stringify `value`.
- * @description Different behavior depending on type of value.
- * - If `value` is undefined or null, return `'[undefined]'` or `'[null]'`, respectively.
- * - If `value` is not an object, function or array, return result of `value.toString()` wrapped in double-quotes.
- * - If `value` is an *empty* object, function, or array, return result of function
- *   {@link emptyRepresentation}.
- * - If `value` has properties, call {@link exports.canonicalize} on it, then return result of
- *   JSON.stringify().
- *
- * @see exports.type
- * @param {*} value
- * @return {string}
- * @api private
- */
-
-    exports.stringify = function (value) {
-      var type = exports.type(value);
-
-      if (!~exports.indexOf(['object', 'array', 'function'], type)) {
-        if (type != 'buffer') {
-          return jsonStringify(value);
-        }
-        var json = value.toJSON();
-    // Based on the toJSON result
-        return jsonStringify(json.data && json.type ? json.data : json, 2)
-      .replace(/,(\n|$)/g, '$1');
-      }
-
-      for (var prop in value) {
-        if (Object.prototype.hasOwnProperty.call(value, prop)) {
-          return jsonStringify(exports.canonicalize(value), 2).replace(/,(\n|$)/g, '$1');
-        }
-      }
-
-      return emptyRepresentation(value, type);
-    };
-
-/**
- * @description
- * like JSON.stringify but more sense.
- * @param {Object}  object
- * @param {Number=} spaces
- * @param {number=} depth
- * @returns {*}
- * @private
- */
-    function jsonStringify(object, spaces, depth) {
-      if (typeof spaces == 'undefined') return _stringify(object);  // primitive types
-
-      depth = depth || 1;
-      var space = spaces * depth
-    , str = isArray(object) ? '[' : '{'
-    , end = isArray(object) ? ']' : '}'
-    , length = object.length || exports.keys(object).length
-    , repeat = function (s, n) { return new Array(n).join(s); }; // `.repeat()` polyfill
-
-      function _stringify(val) {
-        switch (exports.type(val)) {
-          case 'null':
-          case 'undefined':
-            val = '[' + val + ']';
-            break;
-          case 'array':
-          case 'object':
-            val = jsonStringify(val, spaces, depth + 1);
-            break;
-          case 'boolean':
-          case 'regexp':
-          case 'number':
-            val = val === 0 && (1 / val) === -Infinity // `-0`
-          ? '-0'
-          : val.toString();
-            break;
-          case 'date':
-            val = '[Date: ' + val.toISOString() + ']';
-            break;
-          case 'buffer':
-            var json = val.toJSON();
-        // Based on the toJSON result
-            json = json.data && json.type ? json.data : json;
-            val = '[Buffer: ' + jsonStringify(json, 2, depth + 1) + ']';
-            break;
-          default:
-            val = (val == '[Function]' || val == '[Circular]')
-          ? val
-          : '"' + val + '"'; // string
-        }
-        return val;
-      }
-
-      for (var i in object) {
-        if (!object.hasOwnProperty(i)) continue;        // not my business
-        --length;
-        str += '\n ' + repeat(' ', space)
-      + (isArray(object) ? '' : '"' + i + '": ') // key
-      + _stringify(object[i])                   // value
-      + (length ? ',' : '');                     // comma
-      }
-
-      return str + (str.length != 1                    // [], {}
-    ? '\n' + repeat(' ', --space) + end
-    : end);
-    }
-
-/**
- * Return if obj is a Buffer
- * @param {Object} arg
- * @return {Boolean}
- * @api private
- */
-    exports.isBuffer = function (arg) {
-      return typeof Buffer !== 'undefined' && Buffer.isBuffer(arg);
-    };
-
-/**
- * @summary Return a new Thing that has the keys in sorted order.  Recursive.
- * @description If the Thing...
- * - has already been seen, return string `'[Circular]'`
- * - is `undefined`, return string `'[undefined]'`
- * - is `null`, return value `null`
- * - is some other primitive, return the value
- * - is not a primitive or an `Array`, `Object`, or `Function`, return the value of the Thing's `toString()` method
- * - is a non-empty `Array`, `Object`, or `Function`, return the result of calling this function again.
- * - is an empty `Array`, `Object`, or `Function`, return the result of calling `emptyRepresentation()`
- *
- * @param {*} value Thing to inspect.  May or may not have properties.
- * @param {Array} [stack=[]] Stack of seen values
- * @return {(Object|Array|Function|string|undefined)}
- * @see {@link exports.stringify}
- * @api private
- */
-
-    exports.canonicalize = function (value, stack) {
-      var canonicalizedObj,
-        type = exports.type(value),
-        prop,
-        withStack = function withStack(value, fn) {
-          stack.push(value);
-          fn();
-          stack.pop();
-        };
-
-      stack = stack || [];
-
-      if (exports.indexOf(stack, value) !== -1) {
-        return '[Circular]';
-      }
-
-      switch (type) {
-        case 'undefined':
-        case 'buffer':
-        case 'null':
-          canonicalizedObj = value;
-          break;
-        case 'array':
-          withStack(value, function () {
-            canonicalizedObj = exports.map(value, function (item) {
-              return exports.canonicalize(item, stack);
-            });
-          });
-          break;
-        case 'function':
-          for (prop in value) {
-            canonicalizedObj = {};
-            break;
-          }
-          if (!canonicalizedObj) {
-            canonicalizedObj = emptyRepresentation(value, type);
-            break;
-          }
-    /* falls through */
-        case 'object':
-          canonicalizedObj = canonicalizedObj || {};
-          withStack(value, function () {
-            exports.forEach(exports.keys(value).sort(), function (key) {
-              canonicalizedObj[key] = exports.canonicalize(value[key], stack);
-            });
-          });
-          break;
-        case 'date':
-        case 'number':
-        case 'regexp':
-        case 'boolean':
-          canonicalizedObj = value;
-          break;
-        default:
-          canonicalizedObj = value.toString();
-      }
-
-      return canonicalizedObj;
-    };
-
-/**
- * Lookup file names at the given `path`.
- */
-    exports.lookupFiles = function lookupFiles(path, extensions, recursive) {
-      var files = [];
-      var re = new RegExp('\\.(' + extensions.join('|') + ')$');
-
-      if (!exists(path)) {
-        if (exists(path + '.js')) {
-          path += '.js';
-        } else {
-          files = glob.sync(path);
-          if (!files.length) throw new Error('cannot resolve path (or pattern) \'' + path + '\'');
-          return files;
-        }
-      }
-
-      try {
-        var stat = fs.statSync(path);
-        if (stat.isFile()) return path;
-      }
-  catch (ignored) {
-    return;
-  }
-
-      fs.readdirSync(path).forEach(function (file) {
-        file = join(path, file);
-        try {
-          var stat = fs.statSync(file);
-          if (stat.isDirectory()) {
-            if (recursive) {
-              files = files.concat(lookupFiles(file, extensions, recursive));
-            }
-            return;
-          }
-        }
-    catch (ignored) {
-      return;
-    }
-        if (!stat.isFile() || !re.test(file) || basename(file)[0] === '.') return;
-        files.push(file);
-      });
-
-      return files;
-    };
-
-/**
- * Generate an undefined error with a message warning the user.
- *
- * @return {Error}
- */
-
-    exports.undefinedError = function () {
-      return new Error('Caught undefined error, did you throw without specifying what?');
-    };
-
-/**
- * Generate an undefined error if `err` is not defined.
- *
- * @param {Error} err
- * @return {Error}
- */
-
-    exports.getError = function (err) {
-      return err || exports.undefinedError();
-    };
-
-
-/**
- * @summary
- * This Filter based on `mocha-clean` module.(see: `github.com/rstacruz/mocha-clean`)
- * @description
- * When invoking this function you get a filter function that get the Error.stack as an input,
- * and return a prettify output.
- * (i.e: strip Mocha, node_modules, bower and componentJS from stack trace).
- * @returns {Function}
- */
-
-    exports.stackTraceFilter = function () {
-      var slash = '/'
-    , is = typeof document === 'undefined'
-      ? { node: true }
-      : { browser: true }
-    , cwd = is.node
-      ? process.cwd() + slash
-      : location.href.replace(/\/[^\/]*$/, '/');
-
-      function isNodeModule(line) {
-        return (~line.indexOf('node_modules'));
-      }
-
-      function isMochaInternal(line) {
-        return (~line.indexOf('node_modules' + slash + 'mocha')) ||
-      (~line.indexOf('components' + slash + 'mochajs')) ||
-      (~line.indexOf('components' + slash + 'mocha'));
-      }
-
-  // node_modules, bower, componentJS
-      function isBrowserModule(line) {
-        return (~line.indexOf('node_modules')) ||
-      (~line.indexOf('components'));
-      }
-
-      function isNodeInternal(line) {
-        return (~line.indexOf('(timers.js:')) ||
-      (~line.indexOf('(events.js:')) ||
-      (~line.indexOf('(node.js:')) ||
-      (~line.indexOf('(module.js:')) ||
-      (~line.indexOf('GeneratorFunctionPrototype.next (native)')) ||
-      false;
-      }
-
-      return function (stack) {
-        stack = stack.split('\n');
-
-        stack = exports.reduce(stack, function (list, line) {
-          if (is.node && (isNodeModule(line) ||
-        isMochaInternal(line) ||
-        isNodeInternal(line)))
-            return list;
-
-          if (is.browser && (isBrowserModule(line)))
-            return list;
-
-      // Clean up cwd(absolute)
-          list.push(line.replace(cwd, ''));
-          return list;
-        }, []);
-
-        return stack.join('\n');
-      };
-    };
-  }); // module: utils.js
-// The global object is "self" in Web Workers.
-  var global = (function () { return this; })();
-
-/**
- * Save timer references to avoid Sinon interfering (see GH-237).
- */
-
-  var Date = global.Date;
-  var setTimeout = global.setTimeout;
-  var setInterval = global.setInterval;
-  var clearTimeout = global.clearTimeout;
-  var clearInterval = global.clearInterval;
-
-/**
- * Node shims.
- *
- * These are meant only to allow
- * mocha.js to run untouched, not
- * to allow running node code in
- * the browser.
- */
-
-  var process = {};
-  process.exit = function (status) {};
-  process.stdout = {};
-
-  var uncaughtExceptionHandlers = [];
-
-  var originalOnerrorHandler = global.onerror;
-
-/**
- * Remove uncaughtException listener.
- * Revert to original onerror handler if previously defined.
- */
-
-  process.removeListener = function (e, fn) {
-    if ('uncaughtException' == e) {
-      if (originalOnerrorHandler) {
-        global.onerror = originalOnerrorHandler;
-      } else {
-        global.onerror = function () {};
-      }
-      var i = Mocha.utils.indexOf(uncaughtExceptionHandlers, fn);
-      if (i != -1) { uncaughtExceptionHandlers.splice(i, 1); }
-    }
-  };
-
-/**
- * Implements uncaughtException listener.
- */
-
-  process.on = function (e, fn) {
-    if ('uncaughtException' == e) {
-      global.onerror = function (err, url, line) {
-        fn(new Error(err + ' (' + url + ':' + line + ')'));
-        return true;
-      };
-      uncaughtExceptionHandlers.push(fn);
-    }
-  };
-
-/**
- * Expose mocha.
- */
-
-  var Mocha = global.Mocha = require('mocha'),
-    mocha = global.mocha = new Mocha({ reporter: 'html' });
-
-// The BDD UI is registered by default, but no UI will be functional in the
-// browser without an explicit call to the overridden `mocha.ui` (see below).
-// Ensure that this default UI does not expose its methods to the global scope.
-  mocha.suite.removeAllListeners('pre-require');
-
-  var immediateQueue = []
-  , immediateTimeout;
-
-  function timeslice() {
-    var immediateStart = new Date().getTime();
-    while (immediateQueue.length && (new Date().getTime() - immediateStart) < 100) {
-      immediateQueue.shift()();
-    }
-    if (immediateQueue.length) {
-      immediateTimeout = setTimeout(timeslice, 0);
-    } else {
-      immediateTimeout = null;
-    }
-  }
-
-/**
- * High-performance override of Runner.immediately.
- */
-
-  Mocha.Runner.immediately = function (callback) {
-    immediateQueue.push(callback);
-    if (!immediateTimeout) {
-      immediateTimeout = setTimeout(timeslice, 0);
-    }
-  };
-
-/**
- * Function to allow assertion libraries to throw errors directly into mocha.
- * This is useful when running tests in a browser because window.onerror will
- * only receive the 'message' attribute of the Error.
- */
-  mocha.throwError = function (err) {
-    Mocha.utils.forEach(uncaughtExceptionHandlers, function (fn) {
-      fn(err);
-    });
-    throw err;
-  };
-
-/**
- * Override ui to ensure that the ui functions are initialized.
- * Normally this would happen in Mocha.prototype.loadFiles.
- */
-
-  mocha.ui = function (ui) {
-    Mocha.prototype.ui.call(this, ui);
-    this.suite.emit('pre-require', global, null, this);
-    return this;
-  };
-
-/**
- * Setup mocha with the given setting options.
- */
-
-  mocha.setup = function (opts) {
-    if ('string' == typeof opts) opts = { ui: opts };
-    for (var opt in opts) this[opt](opts[opt]);
-    return this;
-  };
-
-/**
- * Run mocha, returning the Runner.
- */
-
-  mocha.run = function (fn) {
-    var options = mocha.options;
-    mocha.globals('location');
-
-    var query = Mocha.utils.parseQuery(global.location.search || '');
-    if (query.grep) mocha.grep(new RegExp(query.grep));
-    if (query.fgrep) mocha.grep(query.fgrep);
-    if (query.invert) mocha.invert();
-
-    return Mocha.prototype.run.call(mocha, function (err) {
-    // The DOM Document is not available in Web Workers.
-      var document = global.document;
-      if (document && document.getElementById('mocha') && options.noHighlighting !== true) {
-        Mocha.utils.highlightTags('code');
-      }
-      if (fn) fn(err);
-    });
-  };
-
-/**
- * Expose the process shim.
- */
-
-  Mocha.process = process;
-})();
diff --git a/test/infrastructure/neverThrowingObject.js b/test/infrastructure/neverThrowingObject.js
deleted file mode 100644
index a18b4f1d6..000000000
--- a/test/infrastructure/neverThrowingObject.js
+++ /dev/null
@@ -1,15 +0,0 @@
-
-if(typeof Proxy === 'undefined'){
-  console.warn("The standard Proxy built-in is not defined. You need Node v6+. You're using version", process.version)
-  process.exit(-1);
-}
-
-export default function(){
-  const target = function () { return proxy; };
-  const handler = {
-    get() { return proxy; }
-  }
-  const proxy = new Proxy(target, handler);
-
-  return proxy;
-}
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 79c623d11..dbb3648d9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,7 +4,7 @@
 
     /* Basic Options */
     "target": "es5" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */,
-    "module": "es2015" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
+    "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
     "lib": [
       "es2017",
       "dom"
@@ -48,7 +48,8 @@
     // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
     "types": [
-      "chrome"
+      "chrome",
+      "mocha"
     ] /* Type declaration files to be included in compilation. */,
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
     "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
diff --git a/yarn.lock b/yarn.lock
index 4b8a889fc..b6b349b5b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1434,27 +1434,40 @@
     into-stream "^3.1.0"
     lodash "^4.17.4"
 
+"@sinonjs/commons@^1", "@sinonjs/commons@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.4.0.tgz#7b3ec2d96af481d7a0321252e7b1c94724ec5a78"
+  integrity sha512-9jHK3YF/8HtJ9wCAbG+j8cD0i0+ATS9A7gXFqS36TblLPNy6rEEc+SB0imo91eCboGaBYGV/MT1/br/J+EE7Tw==
+  dependencies:
+    type-detect "4.0.8"
+
 "@sinonjs/commons@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.0.2.tgz#3e0ac737781627b8844257fadc3d803997d0526e"
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/formatio@3.0.0", "@sinonjs/formatio@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-3.0.0.tgz#9d282d81030a03a03fa0c5ce31fd8786a4da311a"
+"@sinonjs/formatio@^3.1.0", "@sinonjs/formatio@^3.2.1":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-3.2.1.tgz#52310f2f9bcbc67bdac18c94ad4901b95fde267e"
+  integrity sha512-tsHvOB24rvyvV2+zKMmPkZ7dXX6LSLKZ7aOtXY6Edklp0uRcgGpOsQTTGTcWViFyx4uhWc6GV8QdnALbIbIdeQ==
   dependencies:
-    "@sinonjs/samsam" "2.1.0"
+    "@sinonjs/commons" "^1"
+    "@sinonjs/samsam" "^3.1.0"
 
-"@sinonjs/samsam@2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-2.1.0.tgz#b8b8f5b819605bd63601a6ede459156880f38ea3"
+"@sinonjs/samsam@^3.1.0", "@sinonjs/samsam@^3.3.0":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-3.3.1.tgz#e88c53fbd9d91ad9f0f2b0140c16c7c107fe0d07"
+  integrity sha512-wRSfmyd81swH0hA1bxJZJ57xr22kC07a1N4zuIL47yTS04bDk6AoCkczcqHEjcRPmJ+FruGJ9WBQiJwMtIElFw==
   dependencies:
+    "@sinonjs/commons" "^1.0.2"
     array-from "^2.1.1"
+    lodash "^4.17.11"
 
-"@sinonjs/samsam@^2.1.2":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-2.1.2.tgz#16947fce5f57258d01f1688fdc32723093c55d3f"
+"@sinonjs/text-encoding@^0.7.1":
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
+  integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
 
 "@storybook/addon-actions@^4.1.11":
   version "4.1.11"
@@ -1842,6 +1855,11 @@
   dependencies:
     "@types/babel-types" "*"
 
+"@types/chai@*", "@types/chai@^4.1.7":
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.7.tgz#1b8e33b61a8c09cbe1f85133071baa0dbf9fa71a"
+  integrity sha512-2Y8uPt0/jwjhQ6EiluT0XCri1Dbplr0ZxfFXUz+ye13gaqE8u5gL5ppao1JrUYr9cIip5S6MvQzBS7Kke7U9VA==
+
 "@types/chrome@^0.0.81":
   version "0.0.81"
   resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.81.tgz#4fbf34c370a60235be4f97f32429e701fb644d10"
@@ -1883,6 +1901,11 @@
   resolved "https://registry.yarnpkg.com/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.35.tgz#c1c0d402daac324582b6186b91f8905340ea3361"
   integrity sha512-DaZNUvLDCAnCTjgwxgiL1eQdxIKEpNLOlTNtAgnZc50bG2copGhRrFN9/PxPBuJe+tZVLCbQ7ls0xveXVRPkvw==
 
+"@types/json5@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+
 "@types/lodash-es@^4.17.3":
   version "4.17.3"
   resolved "https://registry.yarnpkg.com/@types/lodash-es/-/lodash-es-4.17.3.tgz#87eb0b3673b076b8ee655f1890260a136af09a2d"
@@ -1895,6 +1918,11 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.123.tgz#39be5d211478c8dd3bdae98ee75bb7efe4abfe4d"
   integrity sha512-pQvPkc4Nltyx7G1Ww45OjVqUsJP4UsZm+GWJpigXgkikZqJgRm4c48g027o6tdgubWHwFRF15iFd+Y4Pmqv6+Q==
 
+"@types/mocha@^5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.6.tgz#b8622d50557dd155e9f2f634b7d68fd38de5e94b"
+  integrity sha512-1axi39YdtBI7z957vdqXI4Ac25e7YihYQtJa+Clnxg1zTJEaIRbndt71O3sP4GAMgiAm0pY26/b9BrY4MR/PMw==
+
 "@types/node@*":
   version "10.12.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.0.tgz#ea6dcbddbc5b584c83f06c60e82736d8fbb0c235"
@@ -1983,6 +2011,19 @@
   dependencies:
     redux "^4.0.0"
 
+"@types/sinon-chai@^3.2.2":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@types/sinon-chai/-/sinon-chai-3.2.2.tgz#5cfdbda70bae30f79a9423334af9e490e4cce793"
+  integrity sha512-5zSs2AslzyPZdOsbm2NRtuSNAI2aTWzNKOHa/GRecKo7a5efYD7qGcPxMZXQDayVXT2Vnd5waXxBvV31eCZqiA==
+  dependencies:
+    "@types/chai" "*"
+    "@types/sinon" "*"
+
+"@types/sinon@*", "@types/sinon@^7.0.10":
+  version "7.0.10"
+  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.0.10.tgz#1f921f0c347b19f754e61dbc671c088df73fe1ff"
+  integrity sha512-4w7SvsiUOtd4mUfund9QROPSJ5At/GQskDpqd87pJIRI6ULWSJqHI3GIZE337wQuN3aznroJGr94+o8fwvL37Q==
+
 "@types/storybook__addon-actions@^3.4.2":
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/@types/storybook__addon-actions/-/storybook__addon-actions-3.4.2.tgz#1d08689cc3259269ddb3479a2307c9d16944309e"
@@ -2345,6 +2386,11 @@ ansi-align@^3.0.0:
   dependencies:
     string-width "^3.0.0"
 
+ansi-colors@3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
+  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
+
 ansi-colors@^3.0.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95"
@@ -2610,9 +2656,10 @@ assert@^1.1.1:
   dependencies:
     util "0.10.3"
 
-assertion-error@^1.0.1:
+assertion-error@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
+  integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
 
 assign-symbols@^1.0.0:
   version "1.0.0"
@@ -3314,7 +3361,7 @@ buffer-fill@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
 
-buffer-from@^1.0.0:
+buffer-from@^1.0.0, buffer-from@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
 
@@ -3555,17 +3602,24 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chai-as-promised@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-5.3.0.tgz#09d7a402908aa70dfdbead53e5853fc79d3ef21c"
+chai-as-promised@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0"
+  integrity sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==
+  dependencies:
+    check-error "^1.0.2"
 
-chai@^3.5.0:
-  version "3.5.0"
-  resolved "http://registry.npmjs.org/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
+chai@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.2.0.tgz#760aa72cf20e3795e84b12877ce0e83737aa29e5"
+  integrity sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==
   dependencies:
-    assertion-error "^1.0.1"
-    deep-eql "^0.1.3"
-    type-detect "^1.0.0"
+    assertion-error "^1.1.0"
+    check-error "^1.0.2"
+    deep-eql "^3.0.1"
+    get-func-name "^2.0.0"
+    pathval "^1.1.0"
+    type-detect "^4.0.5"
 
 chalk@2.4.1, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1:
   version "2.4.1"
@@ -3619,6 +3673,11 @@ chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
 
+check-error@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
+  integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
+
 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"
@@ -3828,14 +3887,7 @@ cmd-shim@^2.0.2, cmd-shim@~2.0.2:
     graceful-fs "^4.1.2"
     mkdirp "~0.5.0"
 
-co-mocha@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/co-mocha/-/co-mocha-1.2.2.tgz#c4fdf24d37f43ca4da668b14542a96e9377479ab"
-  dependencies:
-    co "^4.0.0"
-    is-generator "^1.0.1"
-
-co@^4.0.0, co@^4.6.0:
+co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
 
@@ -3907,10 +3959,6 @@ comma-separated-tokens@^1.0.0:
   dependencies:
     trim "0.0.1"
 
-commander@2.15.1:
-  version "2.15.1"
-  resolved "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
-
 commander@2.17.x, commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
@@ -4511,7 +4559,7 @@ debug@3.1.0, debug@=3.1.0, debug@^3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.2.5:
+debug@3.2.6, debug@^3.2.5:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   dependencies:
@@ -4558,11 +4606,12 @@ deep-diff@^0.3.5:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84"
 
-deep-eql@^0.1.3:
-  version "0.1.3"
-  resolved "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2"
+deep-eql@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
+  integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==
   dependencies:
-    type-detect "0.1.1"
+    type-detect "^4.0.0"
 
 deep-equal@^1.0.1:
   version "1.0.1"
@@ -4576,6 +4625,11 @@ deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
+deepmerge@^2.0.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
+  integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
+
 default-gateway@^2.6.0:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
@@ -4667,6 +4721,11 @@ destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
 
+detect-file@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
+
 detect-indent@^5.0.0, detect-indent@~5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
@@ -4704,7 +4763,7 @@ dezalgo@^1.0.0, dezalgo@~1.0.3:
     asap "^2.0.0"
     wrappy "1"
 
-diff@3.5.0, diff@^3.2.0, diff@^3.5.0:
+diff@3.5.0, diff@^3.1.0, diff@^3.2.0, diff@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
@@ -5797,6 +5856,16 @@ find-versions@^2.0.0:
     array-uniq "^1.0.0"
     semver-regex "^1.0.0"
 
+findup-sync@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
+  integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^3.1.0"
+    micromatch "^3.0.4"
+    resolve-dir "^1.0.1"
+
 flat-cache@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
@@ -6032,6 +6101,11 @@ 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"
 
+get-func-name@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
+  integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
+
 get-params@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/get-params/-/get-params-0.1.2.tgz#bae0dfaba588a0c60d7834c0d8dc2ff60eeef2fe"
@@ -6109,9 +6183,9 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@7.1.2, glob@^7.0.0, glob@^7.1.2, glob@~7.1.1:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+glob@7.1.3, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.3, glob@~7.1.2:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -6120,9 +6194,9 @@ glob@7.1.2, glob@^7.0.0, glob@^7.1.2, glob@~7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.3, glob@~7.1.2:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+glob@^7.0.0, glob@^7.1.2, glob@~7.1.1:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -6408,11 +6482,7 @@ hawk@~3.1.3:
     hoek "2.x.x"
     sntp "1.x.x"
 
-he@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-
-he@1.2.x:
+he@1.2.0, he@1.2.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
 
@@ -7079,10 +7149,6 @@ is-generator-function@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.6.tgz#9e71653cd15fff341c79c4151460a131d31e9fc4"
 
-is-generator@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-generator/-/is-generator-1.0.3.tgz#c14c21057ed36e328db80347966c693f886389f3"
-
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@@ -7347,7 +7413,7 @@ 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.12.0, js-yaml@^3.9.0:
+js-yaml@3.12.0, js-yaml@^3.12.0, js-yaml@^3.9.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   dependencies:
@@ -7438,6 +7504,13 @@ json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
 
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
 json5@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
@@ -7491,9 +7564,10 @@ jsx-ast-utils@^2.0.1:
   dependencies:
     array-includes "^3.0.3"
 
-just-extend@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-3.0.0.tgz#cee004031eaabf6406da03a7b84e4fe9d78ef288"
+just-extend@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.0.2.tgz#f3f47f7dfca0f989c55410a7ebc8854b07108afc"
+  integrity sha512-FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw==
 
 kew@^0.7.0:
   version "0.7.0"
@@ -7774,10 +7848,6 @@ lodash.flattendeep@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
 
-lodash.get@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-
 lodash.isequal@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
@@ -7827,7 +7897,7 @@ lodash@^4.17.10, lodash@^4.8.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
-log-symbols@^2.0.0, log-symbols@^2.1.0:
+log-symbols@2.2.0, log-symbols@^2.0.0, log-symbols@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
   dependencies:
@@ -7845,10 +7915,15 @@ loglevelnext@^1.0.1:
     es6-symbol "^3.1.1"
     object.assign "^4.1.0"
 
-lolex@^2.3.2, lolex@^2.7.5:
+lolex@^2.3.2:
   version "2.7.5"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.7.5.tgz#113001d56bfc7e02d56e36291cc5c413d1aa0733"
 
+lolex@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lolex/-/lolex-3.1.0.tgz#1a7feb2fefd75b3e3a7f79f0e110d9476e294434"
+  integrity sha512-zFo5MgCJ0rZ7gQg69S4pqBsLURbFw11X68C18OcJjJQbqaXm2NoTrGl1IMM3TIz0/BnN1tIs2tzmmqvCsOMMjw==
+
 longest-streak@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz#2421b6ba939a443bb9ffebf596585a50b4c38e2e"
@@ -7911,7 +7986,7 @@ make-dir@^1.0.0:
   dependencies:
     pify "^3.0.0"
 
-make-error@^1.3.5:
+make-error@^1.1.1, make-error@^1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
 
@@ -8139,7 +8214,7 @@ micromatch@^2.3.11:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
+micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   dependencies:
@@ -8314,21 +8389,34 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi
   dependencies:
     minimist "0.0.8"
 
-mocha@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
+mocha@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.0.2.tgz#cdc1a6fdf66472c079b5605bac59d29807702d2c"
+  integrity sha512-RtTJsmmToGyeTznSOMoM6TPEk1A84FQaHIciKrRqARZx+B5ccJ5tXlmJzEKGBxZdqk9UjpRsesZTUkZmR5YnuQ==
   dependencies:
+    ansi-colors "3.2.3"
     browser-stdout "1.3.1"
-    commander "2.15.1"
-    debug "3.1.0"
+    debug "3.2.6"
     diff "3.5.0"
     escape-string-regexp "1.0.5"
-    glob "7.1.2"
+    findup-sync "2.0.0"
+    glob "7.1.3"
     growl "1.10.5"
-    he "1.1.1"
+    he "1.2.0"
+    js-yaml "3.12.0"
+    log-symbols "2.2.0"
     minimatch "3.0.4"
     mkdirp "0.5.1"
-    supports-color "5.4.0"
+    ms "2.1.1"
+    node-environment-flags "1.0.4"
+    object.assign "4.1.0"
+    strip-json-comments "2.0.1"
+    supports-color "6.0.0"
+    which "1.3.1"
+    wide-align "1.1.3"
+    yargs "12.0.5"
+    yargs-parser "11.1.1"
+    yargs-unparser "1.5.0"
 
 modify-values@^1.0.0:
   version "1.0.1"
@@ -8444,15 +8532,16 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-nise@^1.4.5:
-  version "1.4.6"
-  resolved "https://registry.yarnpkg.com/nise/-/nise-1.4.6.tgz#76cc3915925056ae6c405dd8ad5d12bde570c19f"
+nise@^1.4.10:
+  version "1.4.10"
+  resolved "https://registry.yarnpkg.com/nise/-/nise-1.4.10.tgz#ae46a09a26436fae91a38a60919356ae6db143b6"
+  integrity sha512-sa0RRbj53dovjc7wombHmVli9ZihXbXCQ2uH3TNm03DyvOSIQbxg+pbqDKrk2oxMK1rtLGVlKxcB9rrc6X5YjA==
   dependencies:
-    "@sinonjs/formatio" "3.0.0"
-    just-extend "^3.0.0"
+    "@sinonjs/formatio" "^3.1.0"
+    "@sinonjs/text-encoding" "^0.7.1"
+    just-extend "^4.0.2"
     lolex "^2.3.2"
     path-to-regexp "^1.7.0"
-    text-encoding "^0.6.4"
 
 no-case@^2.2.0:
   version "2.3.2"
@@ -8472,6 +8561,13 @@ node-emoji@^1.4.1:
   dependencies:
     lodash.toarray "^4.4.0"
 
+node-environment-flags@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.4.tgz#0b784a6551426bfc16d3b2208424dcbc2b2ff038"
+  integrity sha512-M9rwCnWVLW7PX+NUWe3ejEdiLYinRpsEre9hMkU/6NS4h+EEulYaDH1gCEZ2gyXsmw+RXYDaV2JkkTNcsPDJ0Q==
+  dependencies:
+    object.getownpropertydescriptors "^2.0.3"
+
 node-fetch-npm@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
@@ -9002,7 +9098,7 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0:
+object.assign@4.1.0, object.assign@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
   dependencies:
@@ -9462,6 +9558,11 @@ path@^0.12.7:
     process "^0.11.1"
     util "^0.10.3"
 
+pathval@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
+  integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA=
+
 pbkdf2@^3.0.3:
   version "3.0.17"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
@@ -11005,7 +11106,7 @@ resolve-cwd@^2.0.0:
   dependencies:
     resolve-from "^3.0.0"
 
-resolve-dir@^1.0.0:
+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:
@@ -11447,23 +11548,23 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
-sinon-chai@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/sinon-chai/-/sinon-chai-3.2.0.tgz#ed995e13a8a3cfccec18f218d9b767edc47e0715"
+sinon-chai@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/sinon-chai/-/sinon-chai-3.3.0.tgz#8084ff99451064910fbe2c2cb8ab540c00b740ea"
+  integrity sha512-r2JhDY7gbbmh5z3Q62pNbrjxZdOAjpsqW/8yxAZRSqLZqowmfGZPGUZPFf3UX36NLis0cv8VEM5IJh9HgkSOAA==
 
-sinon@^6.3.5:
-  version "6.3.5"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-6.3.5.tgz#0f6d6a5b4ebaad1f6e8e019395542d1d02c144a0"
+sinon@^7.3.0:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-7.3.0.tgz#fd409432bf2ef8ee6a302cf47ca1b0c95fd4de38"
+  integrity sha512-0pYvgRv46fODzT/PByqb79MVNpyxsxf38WEiXTABOF8RfIMcIARfZ+1ORuxwAmHkreZ/jST3UDBdKCRhUy/e1A==
   dependencies:
-    "@sinonjs/commons" "^1.0.2"
-    "@sinonjs/formatio" "^3.0.0"
-    "@sinonjs/samsam" "^2.1.2"
+    "@sinonjs/commons" "^1.4.0"
+    "@sinonjs/formatio" "^3.2.1"
+    "@sinonjs/samsam" "^3.3.0"
     diff "^3.5.0"
-    lodash.get "^4.4.2"
-    lolex "^2.7.5"
-    nise "^1.4.5"
+    lolex "^3.1.0"
+    nise "^1.4.10"
     supports-color "^5.5.0"
-    type-detect "^4.0.8"
 
 slash@^1.0.0:
   version "1.0.0"
@@ -11636,6 +11737,14 @@ source-map-support@^0.5.3, source-map-support@~0.5.9:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
+source-map-support@^0.5.6:
+  version "0.5.11"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
+  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-support@^0.5.9:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
@@ -12016,7 +12125,7 @@ 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, strip-json-comments@~2.0.1:
+strip-json-comments@2.0.1, strip-json-comments@^2.0.1, 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"
 
@@ -12133,9 +12242,10 @@ sugarss@^2.0.0:
   dependencies:
     postcss "^7.0.2"
 
-supports-color@5.4.0, supports-color@^5.3.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+supports-color@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
+  integrity sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==
   dependencies:
     has-flag "^3.0.0"
 
@@ -12150,6 +12260,12 @@ supports-color@^5.1.0, supports-color@^5.4.0, supports-color@^5.5.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^5.3.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+  dependencies:
+    has-flag "^3.0.0"
+
 supports-color@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
@@ -12272,10 +12388,6 @@ terser@^3.16.1:
     source-map "~0.6.1"
     source-map-support "~0.5.9"
 
-text-encoding@^0.6.4:
-  version "0.6.4"
-  resolved "http://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
-
 text-extensions@^1.0.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.7.0.tgz#faaaba2625ed746d568a23e4d0aacd9bf08a8b39"
@@ -12450,6 +12562,40 @@ trough@^1.0.0:
   dependencies:
     glob "^7.1.2"
 
+ts-mocha@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/ts-mocha/-/ts-mocha-6.0.0.tgz#40b8c5462ffce6f5dcee5ff729655b2958f26e50"
+  integrity sha512-ZCtJK8WXxHNbFNjvUKQIXZby/+ybQQkaBcM/3QhBQUfwjpdGFE9F6iWsHhF5ifQNFV/lWiOODi2VMD5AyPcQyg==
+  dependencies:
+    ts-node "7.0.1"
+  optionalDependencies:
+    tsconfig-paths "^3.5.0"
+
+ts-node@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-7.0.1.tgz#9562dc2d1e6d248d24bc55f773e3f614337d9baf"
+  integrity sha512-BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw==
+  dependencies:
+    arrify "^1.0.0"
+    buffer-from "^1.1.0"
+    diff "^3.1.0"
+    make-error "^1.1.1"
+    minimist "^1.2.0"
+    mkdirp "^0.5.1"
+    source-map-support "^0.5.6"
+    yn "^2.0.0"
+
+tsconfig-paths@^3.5.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.8.0.tgz#4e34202d5b41958f269cf56b01ed95b853d59f72"
+  integrity sha512-zZEYFo4sjORK8W58ENkRn9s+HmQFkkwydDG7My5s/fnfr2YYCaiyXe/HBUcIgU8epEKOXwiahOO+KZYjiXlWyQ==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    deepmerge "^2.0.1"
+    json5 "^1.0.1"
+    minimist "^1.2.0"
+    strip-bom "^3.0.0"
+
 tslib@1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
@@ -12540,17 +12686,10 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-detect@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
-
-type-detect@4.0.8, type-detect@^4.0.8:
+type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
-
-type-detect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
+  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
 type-is@~1.6.16:
   version "1.6.16"
@@ -13265,7 +13404,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, which@^1.2.14, which@^1.3.0, which@^1.3.1:
+which@1, which@1.3.1, which@^1.2.14, which@^1.3.0, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   dependencies:
@@ -13277,7 +13416,7 @@ which@1.2.x, which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
+wide-align@1.1.3, wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
   dependencies:
@@ -13411,19 +13550,19 @@ yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
 
-yargs-parser@^10.0.0, yargs-parser@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  dependencies:
-    camelcase "^4.1.0"
-
-yargs-parser@^11.1.1:
+yargs-parser@11.1.1, yargs-parser@^11.1.1:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^10.0.0, yargs-parser@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  dependencies:
+    camelcase "^4.1.0"
+
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
@@ -13436,6 +13575,15 @@ yargs-parser@^9.0.2:
   dependencies:
     camelcase "^4.1.0"
 
+yargs-unparser@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.5.0.tgz#f2bb2a7e83cbc87bb95c8e572828a06c9add6e0d"
+  integrity sha512-HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw==
+  dependencies:
+    flat "^4.1.0"
+    lodash "^4.17.11"
+    yargs "^12.0.5"
+
 yargs@12.0.2, yargs@^12.0.2:
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
@@ -13453,6 +13601,23 @@ yargs@12.0.2, yargs@^12.0.2:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^10.1.0"
 
+yargs@12.0.5, yargs@^12.0.5:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.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 || ^4.0.0"
+    yargs-parser "^11.1.1"
+
 yargs@^11.0.0:
   version "11.1.0"
   resolved "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
@@ -13487,23 +13652,6 @@ yargs@^12.0.0:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^10.1.0"
 
-yargs@^12.0.5:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.2.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.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 || ^4.0.0"
-    yargs-parser "^11.1.1"
-
 yargs@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
@@ -13544,6 +13692,11 @@ yazl@^2.4.3:
   dependencies:
     buffer-crc32 "~0.2.3"
 
+yn@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
+  integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
+
 zip-stream@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"

From 26b26414b64a6980e503a3fee28cfc3ec4dd0644 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Fri, 29 Mar 2019 23:29:00 +0100
Subject: [PATCH 026/100] chore(build): fix missing manifest.json

---
 package.json              |  28 ++-
 webpack.config.js         |  10 +-
 webpack/config.plugins.js |  64 +++--
 webpack/config.stats.js   |   2 +-
 yarn.lock                 | 475 +++++++++++++++++++++++++++++++-------
 5 files changed, 451 insertions(+), 128 deletions(-)

diff --git a/package.json b/package.json
index 744391600..e21a01f1b 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,9 @@
   "name": "lmem-recommendations",
   "version": "1.1.1",
   "description": "LMEM Recommendations web extensions using React+Redux.",
+  "engines": {
+    "node": ">=8"
+  },
   "scripts": {
     "start": "webpack --watch --progress --hot --env.hmr --mode=development --env.build=dev",
     "build:staging": "webpack --mode=production --env.build=staging",
@@ -12,18 +15,24 @@
     "clean": "rm -rf build",
     "test": "LMEM_BACKEND_ORIGIN='' NODE_ENV=test ts-mocha --paths test/app/*.ts test/app/**/*.ts",
     "lint": "yarn lint:ts && yarn lint:css",
-    "lint-git-hook": "git diff-index --name-only --cached HEAD | grep \\.ts$ | xargs tslint --fix",
     "lint:ts": "tslint './src/**/*.ts'",
     "lint:css": "stylelint './src/**/*.js'",
     "analyse": "babel-node ./node_modules/webpack/bin/webpack --optimize-minimize --mode production --config webpack/chromium.config.js --profile --json > stats.json",
     "storybook": "start-storybook -p 6007 -c .storybook",
     "build-storybook": "build-storybook"
   },
-  "pre-commit": [
-    "lint-git-hook"
-  ],
-  "engines": {
-    "node": ">=8"
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged",
+      "pre-push": "yarn test"
+    }
+  },
+  "lint-staged": {
+    "*.{ts,tsx,js,jsx}": [
+      "tslint",
+      "prettier --write",
+      "git add"
+    ]
   },
   "repository": {
     "type": "git",
@@ -77,6 +86,7 @@
     "@types/storybook__addon-actions": "^3.4.2",
     "@types/storybook__addon-knobs": "^4.0.1",
     "@types/storybook__react": "^4.0.1",
+    "add-asset-webpack-plugin": "^0.1.0",
     "awesome-typescript-loader": "^5.2.1",
     "babel-eslint": "^10.0.1",
     "babel-loader": "^8.0.4",
@@ -88,8 +98,8 @@
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chromedriver": "^2.21.2",
+    "clean-webpack-plugin": "^2.0.1",
     "copy-webpack-plugin": "^5.0.0",
-    "create-file-webpack": "^1.0.2",
     "css-loader": "^2.0.1",
     "del": "^2.2.0",
     "enzyme": "^3.7.0",
@@ -104,12 +114,13 @@
     "expect": "^1.15.2",
     "file-loader": "^2.0.0",
     "html-webpack-plugin": "^3.2.0",
+    "husky": "^1.3.1",
     "jsdom": "^8.1.0",
+    "lint-staged": "^8.1.5",
     "mocha": "^6.0.2",
     "node-sass": "^4.9.4",
     "npm": "6.4.1",
     "null-loader": "^0.1.1",
-    "pre-commit": "^1.1.3",
     "prettier": "^1.16.4",
     "pug": "^2.0.3",
     "pug-loader": "^2.4.0",
@@ -139,7 +150,6 @@
     "typescript": "^3.3.3333",
     "typescript-styled-plugin": "^0.14.0",
     "webpack": "^4.23.1",
-    "webpack-cleanup-plugin": "^0.5.1",
     "webpack-cli": "^3.1.2",
     "webpack-dev-server": "^3.1.10",
     "webpack-hot-middleware": "^2.10.0",
diff --git a/webpack.config.js b/webpack.config.js
index 9c03d3d3b..fdd20a405 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,8 +1,8 @@
-const path = require("path");
+const path = require('path');
 const entry = require('./webpack/config.entry');
-const rules = require("./webpack/config.rules");
-const plugins = require("./webpack/config.plugins.js");
-const stats = require("./webpack/config.stats");
+const rules = require('./webpack/config.rules');
+const plugins = require('./webpack/config.plugins.js');
+const stats = require('./webpack/config.stats');
 
 module.exports = function webpack(env = {}, argv = {}) {
   const srcPath = path.resolve(__dirname, 'src');
@@ -16,7 +16,7 @@ module.exports = function webpack(env = {}, argv = {}) {
       filename: 'js/[name].bundle.js',
       chunkFilename: 'js/[id].chunk.js',
       path: path.join(__dirname, 'build', env.build),
-      publicPath: '.',
+      publicPath: '.'
     },
     module: { rules: rules(argv.mode) },
     plugins: plugins(env, argv, path.join(__dirname, 'build')),
diff --git a/webpack/config.plugins.js b/webpack/config.plugins.js
index e32cfff7d..32ebcb014 100644
--- a/webpack/config.plugins.js
+++ b/webpack/config.plugins.js
@@ -1,13 +1,13 @@
-const path = require("path");
-const webpack = require("webpack");
-const WebpackCleanupPlugin = require("webpack-cleanup-plugin");
-const HtmlWebpackPlugin = require("html-webpack-plugin");
-const CreateFilePlugin = require("create-file-webpack");
-const ZipPlugin = require("zip-webpack-plugin");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
+const path = require('path');
+const webpack = require('webpack');
+const CleanWebpackPlugin = require('clean-webpack-plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const AddAssetWebpackPlugin = require('add-asset-webpack-plugin');
+const ZipPlugin = require('zip-webpack-plugin');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
 
-const manifests = require("../manifest");
-const { version } = require("../package.json");
+const manifests = require('../manifest');
+const { version } = require('../package.json');
 
 const ENV = {
   dev: {
@@ -17,19 +17,19 @@ const ENV = {
     LMEM_BACKEND_ORIGIN: '"https://staging-recommendations.lmem.net"',
     UNINSTALL_ORIGIN: "'https://www.lmem.net/desinstallation'",
     HEAP_APPID: '"234457910"', // testing
-    REFRESH_MC_INTERVAL: "5*60*1000"
+    REFRESH_MC_INTERVAL: '5*60*1000'
   },
   chromium: {
     LMEM_BACKEND_ORIGIN: '"https://recommendations.lmem.net"',
     UNINSTALL_ORIGIN: "'https://www.lmem.net/desinstallation'",
-    REFRESH_MC_INTERVAL: "10*60*1000",
+    REFRESH_MC_INTERVAL: '10*60*1000',
     ONBOARDING_ORIGIN: '"https://bienvenue.lmem.net?extensionInstalled"',
     HEAP_APPID: '"3705584166"' // production
   },
   firefox: {
     LMEM_BACKEND_ORIGIN: '"https://recommendations.lmem.net"',
     ONBOARDING_ORIGIN: '"https://bienvenue.lmem.net?extensionInstalled"',
-    REFRESH_MC_INTERVAL: "10*60*1000"
+    REFRESH_MC_INTERVAL: '10*60*1000'
   }
 };
 
@@ -37,49 +37,47 @@ module.exports = (env = {}, argv = {}, outputPath) => {
   const buildPath = path.join(outputPath, env.build);
 
   const copyConfig = [
-    { from: "src/assets", to: buildPath },
+    { from: 'src/assets', to: buildPath },
     {
-      from: "src/app/lmem/draft-preview/grabDraftRecommendations.js",
-      to: path.join(buildPath, "js")
+      from: 'src/app/lmem/draft-preview/grabDraftRecommendations.js',
+      to: path.join(buildPath, 'js')
     }
   ];
-  if (argv.mode !== "production") {
+  if (argv.mode !== 'production') {
     copyConfig.push(
       {
-        from: "test/infrastructure",
-        to: path.join(outputPath, env.build, "test", "infrastructure")
+        from: 'test/infrastructure',
+        to: path.join(outputPath, env.build, 'test', 'infrastructure')
       },
       {
-        from: "test/integration",
-        to: path.join(outputPath, env.build, "test", "integration")
+        from: 'test/integration',
+        to: path.join(outputPath, env.build, 'test', 'integration')
       }
     );
   }
 
   const plugins = [
-    new HtmlWebpackPlugin({
-      template: "./views/background.pug",
-      filename: "background.html",
-      inject: false
-    }),
     new webpack.DefinePlugin({
-      "process.env": ENV[env.build]
+      'process.env': ENV[env.build]
     }),
-    new CreateFilePlugin({
-      path: path.join(outputPath, env.build),
-      fileName: "manifest.json",
-      content: JSON.stringify(manifests[env.build])
+    new HtmlWebpackPlugin({
+      template: './views/background.pug',
+      filename: 'background.html',
+      inject: false
     }),
+    new AddAssetWebpackPlugin(
+      'manifest.json',
+      JSON.stringify(manifests[env.build], null, 2)
+    ),
     new CopyWebpackPlugin(copyConfig)
   ];
 
   if (!env.hmr) {
     plugins.push(
-      new WebpackCleanupPlugin({ quiet: true }),
+      new CleanWebpackPlugin(),
       new ZipPlugin({
-        path: "..",
+        path: '..',
         filename: `lmem-v${version}-${env.build}.zip`
-        //   pathPrefix: env.build,
       })
     );
   }
diff --git a/webpack/config.stats.js b/webpack/config.stats.js
index 87bba8d50..4bd1ae685 100644
--- a/webpack/config.stats.js
+++ b/webpack/config.stats.js
@@ -94,7 +94,7 @@ module.exports = {
   moduleTrace: true,
 
   // Show performance hint when file size exceeds `performance.maxAssetSize`
-  performance: true,
+  performance: false,
 
   // Show the exports of the modules
   providedExports: true,
diff --git a/yarn.lock b/yarn.lock
index b6b349b5b..1d8d997c9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1330,6 +1330,13 @@
   resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.0.2.tgz#1d94f02800b094753f9271c206a26c2a06ca14ee"
   integrity sha512-8/qcMh15507AnXJ3lBeuhsdFwnWQqnp68EpUuHlYPixJ5vjVmls7/Jq48cnUlrZI8Jd9U1jkhfCl0gaT5KMgVw==
 
+"@samverschueren/stream-to-observable@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
+  integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==
+  dependencies:
+    any-observable "^0.3.0"
+
 "@semantic-release/changelog@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@semantic-release/changelog/-/changelog-3.0.0.tgz#e01514b517e775cea47aef7df5f5685c7aff2bf2"
@@ -2282,6 +2289,11 @@ acorn@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.2.tgz#6a459041c320ab17592c6317abbfdf4bbaa98ca4"
 
+add-asset-webpack-plugin@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/add-asset-webpack-plugin/-/add-asset-webpack-plugin-0.1.0.tgz#2d2b16538b44f5ef0e17d60ee3c688978a6f9d82"
+  integrity sha1-LSsWU4tE9e8OF9YO48aIl4pvnYI=
+
 address@1.0.3, address@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
@@ -2443,6 +2455,11 @@ ansistyles@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
 
+any-observable@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
+  integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -3214,7 +3231,7 @@ boxen@^2.0.0:
     term-size "^1.2.0"
     widest-line "^2.0.0"
 
-brace-expansion@^1.0.0, brace-expansion@^1.1.7:
+brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
@@ -3629,7 +3646,7 @@ chalk@2.4.1, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -3639,7 +3656,7 @@ chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.4.2:
+chalk@^2.3.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   dependencies:
@@ -3754,6 +3771,11 @@ ci-info@^1.4.0, ci-info@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
 
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+
 cidr-regex@^2.0.10:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/cidr-regex/-/cidr-regex-2.0.10.tgz#af13878bd4ad704de77d6dc800799358b3afa70d"
@@ -3794,6 +3816,13 @@ clean-stack@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-1.3.0.tgz#9e821501ae979986c46b1d66d2d432db2fd4ae31"
 
+clean-webpack-plugin@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-2.0.1.tgz#2241526b0030aa0249e78714471298f867fc2829"
+  integrity sha512-vway5pXGVd91bicwjaf8j188Al6VMf9R9Ekl6q0qeiaWStRsOOXuh4qtjX1UrUvmz5XevQVCdjBuzr4Tzsnpog==
+  dependencies:
+    del "^4.0.0"
+
 cli-boxes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
@@ -3805,7 +3834,7 @@ cli-columns@^3.1.2:
     string-width "^2.0.0"
     strip-ansi "^3.0.1"
 
-cli-cursor@^2.1.0:
+cli-cursor@^2.0.0, cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   dependencies:
@@ -3826,6 +3855,14 @@ cli-table@^0.3.1:
   dependencies:
     colors "1.0.3"
 
+cli-truncate@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
+  integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=
+  dependencies:
+    slice-ansi "0.0.4"
+    string-width "^1.0.1"
+
 cli-width@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
@@ -3963,7 +4000,7 @@ commander@2.17.x, commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
 
-commander@^2.11.0, commander@^2.12.1, commander@^2.19.0, commander@^2.8.1:
+commander@^2.11.0, commander@^2.12.1, commander@^2.14.1, commander@^2.19.0, commander@^2.8.1, commander@^2.9.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
 
@@ -4022,7 +4059,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@1.6.0, concat-stream@^1.4.7:
+concat-stream@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
@@ -4244,6 +4281,16 @@ cosmiconfig@^5.0.1:
     js-yaml "^3.9.0"
     parse-json "^4.0.0"
 
+cosmiconfig@^5.0.2:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
+  integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
+  dependencies:
+    import-fresh "^2.0.0"
+    is-directory "^0.3.1"
+    js-yaml "^3.13.0"
+    parse-json "^4.0.0"
+
 cosmiconfig@^5.0.5:
   version "5.0.6"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39"
@@ -4278,14 +4325,6 @@ create-error-class@^3.0.0:
   dependencies:
     capture-stack-trace "^1.0.0"
 
-create-file-webpack@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/create-file-webpack/-/create-file-webpack-1.0.2.tgz#c206474fe15a6aab12e2a278a7798d244befff0b"
-  integrity sha512-+J6kQTE+Wcobc6gHP8E2zmoeIC+J+p6IXqjFrzoxCl1VYlimWoincPUABAhODuXAJGrZcNZ/Up0PTqq1ISiwvA==
-  dependencies:
-    path "^0.12.7"
-    write "^1.0.3"
-
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
   resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
@@ -4533,6 +4572,11 @@ dashify@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/dashify/-/dashify-0.2.2.tgz#6a07415a01c91faf4a32e38d9dfba71f61cb20fe"
 
+date-fns@^1.27.2:
+  version "1.30.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
+  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
+
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
@@ -4602,6 +4646,11 @@ 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"
 
+dedent@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
+
 deep-diff@^0.3.5:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84"
@@ -4698,6 +4747,18 @@ del@^3.0.0:
     pify "^3.0.0"
     rimraf "^2.2.8"
 
+del@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-4.0.0.tgz#4fa27e92c366cb45b9bdaa56a9b8703dced17437"
+  integrity sha512-/BnSJ+SuZyLu7xMn48kZY0nMXDi+5KNmR4g8n21Wivsl8+B9njV6/5kcTNE9juSprp0zRWBU28JuHUq0FqK1Nw==
+  dependencies:
+    globby "^6.1.0"
+    is-path-cwd "^2.0.0"
+    is-path-in-cwd "^2.0.0"
+    p-map "^2.0.0"
+    pify "^4.0.1"
+    rimraf "^2.6.2"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -4989,6 +5050,11 @@ electron-to-chromium@^1.3.82:
   version "1.3.84"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.84.tgz#2e55df59e818f150a9f61b53471ebf4f0feecc65"
 
+elegant-spinner@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
+  integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
+
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -5198,7 +5264,7 @@ escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
 
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
@@ -5487,6 +5553,19 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.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"
@@ -5718,6 +5797,14 @@ figgy-pudding@^3.0.0, figgy-pudding@^3.1.0, figgy-pudding@^3.4.1, figgy-pudding@
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
 
+figures@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+    object-assign "^4.1.0"
+
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
@@ -5830,6 +5917,11 @@ find-npm-prefix@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz#8d8ce2c78b3b4b9e66c8acc6a37c231eb841cfdf"
 
+find-parent-dir@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
+  integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=
+
 find-up@3.0.0, find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -5888,6 +5980,11 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
 
+fn-name@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
+  integrity sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=
+
 follow-redirects@^1.0.0:
   version "1.5.9"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.9.tgz#c9ed9d748b814a39535716e531b9196a845d89c6"
@@ -6061,6 +6158,15 @@ fuse.js@^3.0.1, fuse.js@^3.3.0:
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.4.2.tgz#d7a638c436ecd7b9c4c0051478c09594eb956212"
 
+g-status@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/g-status/-/g-status-2.0.2.tgz#270fd32119e8fc9496f066fe5fe88e0a6bc78b97"
+  integrity sha512-kQoE9qH+T1AHKgSSD0Hkv98bobE90ILQcXAF4wvGgsr7uFqNvwmh8j+Lq3l0RVt3E3HjSbv2B9biEGcEtpHLCA==
+  dependencies:
+    arrify "^1.0.1"
+    matcher "^1.0.0"
+    simple-git "^1.85.0"
+
 gauge@~2.7.1, gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -6106,6 +6212,11 @@ get-func-name@^2.0.0:
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
   integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
 
+get-own-enumerable-property-symbols@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203"
+  integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==
+
 get-params@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/get-params/-/get-params-0.1.2.tgz#bae0dfaba588a0c60d7834c0d8dc2ff60eeef2fe"
@@ -6122,6 +6233,13 @@ get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
 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"
@@ -6701,6 +6819,22 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
+husky@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0"
+  integrity sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==
+  dependencies:
+    cosmiconfig "^5.0.7"
+    execa "^1.0.0"
+    find-up "^3.0.0"
+    get-stdin "^6.0.0"
+    is-ci "^2.0.0"
+    pkg-dir "^3.0.0"
+    please-upgrade-node "^3.1.1"
+    read-pkg "^4.0.1"
+    run-node "^1.0.0"
+    slash "^2.0.0"
+
 iconv-lite@0.4.23:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
@@ -7025,6 +7159,13 @@ is-ci@^1.0.10:
   dependencies:
     ci-info "^1.5.0"
 
+is-ci@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
+  dependencies:
+    ci-info "^2.0.0"
+
 is-cidr@^2.0.6:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-2.0.7.tgz#0fd4b863c26b2eb2d157ed21060c4f3f8dd356ce"
@@ -7205,20 +7346,39 @@ is-number@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
   integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
-is-obj@^1.0.0:
+is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
 
+is-observable@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
+  integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==
+  dependencies:
+    symbol-observable "^1.1.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"
 
+is-path-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.0.0.tgz#d4777a8e227a00096a31f030db3770f84b116c02"
+  integrity sha512-m5dHHzpOXEiv18JEORttBO64UgTEypx99vCxQLjbBvGhOJxnTNglYoFXxwo6AbsQb79sqqycQEHv2hWkHZAijA==
+
 is-path-in-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
   dependencies:
     is-path-inside "^1.0.0"
 
+is-path-in-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.0.0.tgz#68e452a6eec260500cec21e029c0a44cc0dcd2ea"
+  integrity sha512-6Vz5Gc9s/sDA3JBVu0FzWufm8xaBsqy1zn8Q6gmvGP6nSDMw78aS4poBNeatWjaRpTpxxLn1WOndAiOlk+qY8A==
+  dependencies:
+    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"
@@ -7420,6 +7580,14 @@ js-yaml@3.12.0, js-yaml@^3.12.0, js-yaml@^3.9.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^3.13.0:
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.0.tgz#38ee7178ac0eea2c97ff6d96fff4b18c7d8cf98e"
+  integrity sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 js-yaml@^3.7.0:
   version "3.12.2"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz#ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc"
@@ -7717,6 +7885,81 @@ linked-list@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/linked-list/-/linked-list-0.1.0.tgz#798b0ff97d1b92a4fd08480f55aea4e9d49d37bf"
 
+lint-staged@^8.1.5:
+  version "8.1.5"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.1.5.tgz#372476fe1a58b8834eb562ed4c99126bd60bdd79"
+  integrity sha512-e5ZavfnSLcBJE1BTzRTqw6ly8OkqVyO3GL2M6teSmTBYQ/2BuueD5GIt2RPsP31u/vjKdexUyDCxSyK75q4BDA==
+  dependencies:
+    chalk "^2.3.1"
+    commander "^2.14.1"
+    cosmiconfig "^5.0.2"
+    debug "^3.1.0"
+    dedent "^0.7.0"
+    del "^3.0.0"
+    execa "^1.0.0"
+    find-parent-dir "^0.3.0"
+    g-status "^2.0.2"
+    is-glob "^4.0.0"
+    is-windows "^1.0.2"
+    listr "^0.14.2"
+    listr-update-renderer "^0.5.0"
+    lodash "^4.17.11"
+    log-symbols "^2.2.0"
+    micromatch "^3.1.8"
+    npm-which "^3.0.1"
+    p-map "^1.1.1"
+    path-is-inside "^1.0.2"
+    pify "^3.0.0"
+    please-upgrade-node "^3.0.2"
+    staged-git-files "1.1.2"
+    string-argv "^0.0.2"
+    stringify-object "^3.2.2"
+    yup "^0.26.10"
+
+listr-silent-renderer@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
+  integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=
+
+listr-update-renderer@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"
+  integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==
+  dependencies:
+    chalk "^1.1.3"
+    cli-truncate "^0.2.1"
+    elegant-spinner "^1.0.1"
+    figures "^1.7.0"
+    indent-string "^3.0.0"
+    log-symbols "^1.0.2"
+    log-update "^2.3.0"
+    strip-ansi "^3.0.1"
+
+listr-verbose-renderer@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db"
+  integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==
+  dependencies:
+    chalk "^2.4.1"
+    cli-cursor "^2.1.0"
+    date-fns "^1.27.2"
+    figures "^2.0.0"
+
+listr@^0.14.2:
+  version "0.14.3"
+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586"
+  integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==
+  dependencies:
+    "@samverschueren/stream-to-observable" "^0.3.0"
+    is-observable "^1.1.0"
+    is-promise "^2.1.0"
+    is-stream "^1.1.0"
+    listr-silent-renderer "^1.1.1"
+    listr-update-renderer "^0.5.0"
+    listr-verbose-renderer "^0.5.0"
+    p-map "^2.0.0"
+    rxjs "^6.3.3"
+
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -7873,7 +8116,7 @@ lodash.toarray@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
 
-lodash.union@4.6.0, lodash.union@~4.6.0:
+lodash.union@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
 
@@ -7897,12 +8140,28 @@ lodash@^4.17.10, lodash@^4.8.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
-log-symbols@2.2.0, log-symbols@^2.0.0, log-symbols@^2.1.0:
+log-symbols@2.2.0, log-symbols@^2.0.0, log-symbols@^2.1.0, log-symbols@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
   dependencies:
     chalk "^2.0.1"
 
+log-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
+  integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=
+  dependencies:
+    chalk "^1.0.0"
+
+log-update@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
+  integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg=
+  dependencies:
+    ansi-escapes "^3.0.0"
+    cli-cursor "^2.0.0"
+    wrap-ansi "^3.0.1"
+
 loglevel@^1.4.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
@@ -8068,6 +8327,13 @@ marked@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.4.0.tgz#9ad2c2a7a1791f10a852e0112f77b571dce10c66"
 
+matcher@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/matcher/-/matcher-1.1.1.tgz#51d8301e138f840982b338b116bb0c09af62c1c2"
+  integrity sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==
+  dependencies:
+    escape-string-regexp "^1.0.4"
+
 material-colors@^1.2.1:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
@@ -8283,13 +8549,6 @@ 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@3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
-  integrity sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=
-  dependencies:
-    brace-expansion "^1.0.0"
-
 minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -8820,6 +9079,13 @@ npm-packlist@^1.1.10, npm-packlist@^1.1.11, npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
+npm-path@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64"
+  integrity sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==
+  dependencies:
+    which "^1.2.10"
+
 npm-pick-manifest@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.1.0.tgz#dc381bdd670c35d81655e1d5a94aa3dd4d87fce5"
@@ -8884,6 +9150,15 @@ npm-user-validate@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz#8ceca0f5cea04d4e93519ef72d0557a75122e951"
 
+npm-which@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa"
+  integrity sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=
+  dependencies:
+    commander "^2.9.0"
+    npm-path "^2.0.2"
+    which "^1.2.10"
+
 npm@6.4.1:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/npm/-/npm-6.4.1.tgz#4f39f9337b557a28faed4a771d5c8802d6b4288b"
@@ -9252,10 +9527,6 @@ os-locale@^3.0.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-shim@^0.1.2:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917"
-
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -9328,6 +9599,11 @@ p-map@^1.0.0, p-map@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
 
+p-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.0.0.tgz#be18c5a5adeb8e156460651421aceca56c213a50"
+  integrity sha512-GO107XdrSUmtHxVoi60qc9tUl/KkNKm+X2CF4P9amalpGxv5YqVPJNfSb0wcA+syCopkZvYYIzW8OVTQW59x/w==
+
 p-reduce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
@@ -9550,14 +9826,6 @@ path-type@^3.0.0:
   dependencies:
     pify "^3.0.0"
 
-path@^0.12.7:
-  version "0.12.7"
-  resolved "https://registry.yarnpkg.com/path/-/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"
-  integrity sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=
-  dependencies:
-    process "^0.11.1"
-    util "^0.10.3"
-
 pathval@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
@@ -9593,7 +9861,7 @@ pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
 
-pify@^4.0.0:
+pify@^4.0.0, pify@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
 
@@ -9637,6 +9905,13 @@ pkg-up@2.0.0, pkg-up@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
+please-upgrade-node@^3.0.2, please-upgrade-node@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
+  integrity sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==
+  dependencies:
+    semver-compare "^1.0.0"
+
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
@@ -9845,14 +10120,6 @@ postcss@^7.0.6:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
-pre-commit@^1.1.3:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/pre-commit/-/pre-commit-1.2.2.tgz#dbcee0ee9de7235e57f79c56d7ce94641a69eec6"
-  dependencies:
-    cross-spawn "^5.0.1"
-    spawn-sync "^1.0.15"
-    which "1.2.x"
-
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -9890,7 +10157,7 @@ process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
 
-process@^0.11.1, process@^0.11.10:
+process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
@@ -9966,6 +10233,11 @@ prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
+property-expr@^1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-1.5.1.tgz#22e8706894a0c8e28d58735804f6ba3a3673314f"
+  integrity sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g==
+
 property-information@^5.0.0, property-information@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.0.1.tgz#c3b09f4f5750b1634c0b24205adbf78f18bdf94f"
@@ -10589,7 +10861,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-read-pkg@^4.0.0:
+read-pkg@^4.0.0, read-pkg@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
   dependencies:
@@ -10684,11 +10956,6 @@ rechoir@^0.6.2:
   dependencies:
     resolve "^1.1.6"
 
-recursive-readdir-sync@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/recursive-readdir-sync/-/recursive-readdir-sync-1.0.6.tgz#1dbf6d32f3c5bb8d3cde97a6c588d547a9e13d56"
-  integrity sha1-Hb9tMvPFu4083pemxYjVR6nhPVY=
-
 recursive-readdir@2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f"
@@ -11207,6 +11474,11 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
+run-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
+  integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==
+
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -11219,7 +11491,7 @@ rxjs@^6.1.0:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.4.0:
+rxjs@^6.3.3, rxjs@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
   dependencies:
@@ -11379,6 +11651,11 @@ semantic-release@^15.8.1:
     semver "^5.4.1"
     yargs "^12.0.0"
 
+semver-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
+
 semver-diff@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
@@ -11548,6 +11825,13 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
+simple-git@^1.85.0:
+  version "1.110.0"
+  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.110.0.tgz#54eb179089d055a7783d32399246cebc9d9933e9"
+  integrity sha512-UYY0rQkknk0P5eb+KW+03F4TevZ9ou0H+LoGaj7iiVgpnZH4wdj/HTViy/1tNNkmIPcmtxuBqXWiYt2YwlRKOQ==
+  dependencies:
+    debug "^4.0.1"
+
 sinon-chai@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/sinon-chai/-/sinon-chai-3.3.0.tgz#8084ff99451064910fbe2c2cb8ab540c00b740ea"
@@ -11574,6 +11858,11 @@ slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
 
+slice-ansi@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+  integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
+
 slice-ansi@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
@@ -11802,13 +12091,6 @@ spawn-promise@^0.1.8:
   dependencies:
     co "^4.6.0"
 
-spawn-sync@^1.0.15:
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476"
-  dependencies:
-    concat-stream "^1.4.7"
-    os-shim "^0.1.2"
-
 spdx-correct@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.2.tgz#19bb409e91b47b1ad54159243f7312a858db3c2e"
@@ -11920,6 +12202,11 @@ stackframe@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-0.3.1.tgz#33aa84f1177a5548c8935533cbfeb3420975f5a4"
 
+staged-git-files@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.2.tgz#4326d33886dc9ecfa29a6193bf511ba90a46454b"
+  integrity sha512-0Eyrk6uXW6tg9PYkhi/V/J4zHp33aNyi2hOCmhFLqLTIhbgqWn5jlSzI+IU0VqrZq6+DbHcabQl/WP6P3BG0QA==
+
 state-toggle@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.1.tgz#c3cb0974f40a6a0f8e905b96789eb41afa1cde3a"
@@ -11991,6 +12278,11 @@ strict-uri-encode@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
 
+string-argv@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736"
+  integrity sha1-2sMECGkMIfPDYwo/86BYd73L1zY=
+
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -12075,6 +12367,15 @@ stringify-entities@^1.0.1:
     is-alphanumerical "^1.0.0"
     is-hexadecimal "^1.0.0"
 
+stringify-object@^3.2.2:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
+  integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
+  dependencies:
+    get-own-enumerable-property-symbols "^3.0.0"
+    is-obj "^1.0.1"
+    is-regexp "^1.0.0"
+
 stringify-package@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.0.tgz#e02828089333d7d45cd8c287c30aa9a13375081b"
@@ -12302,7 +12603,7 @@ svgo@^1.1.1:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
-symbol-observable@^1.0.2, symbol-observable@^1.0.3, symbol-observable@^1.2.0:
+symbol-observable@^1.0.2, symbol-observable@^1.0.3, symbol-observable@^1.1.0, symbol-observable@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
 
@@ -12316,6 +12617,11 @@ symbol.prototype.description@^1.0.0:
   dependencies:
     has-symbols "^1.0.0"
 
+synchronous-promise@^2.0.5:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.7.tgz#3574b3d2fae86b145356a4b89103e1577f646fe3"
+  integrity sha512-16GbgwTmFMYFyQMLvtQjvNWh30dsFe1cAW5Fg1wm5+dg84L9Pe36mftsIRU95/W2YsISxsz/xq4VB23sqpgb/A==
+
 table@^5.0.0, table@^5.0.2:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/table/-/table-5.1.0.tgz#69a54644f6f01ad1628f8178715b408dc6bf11f7"
@@ -12501,6 +12807,11 @@ toposort@^1.0.0:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
 
+toposort@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
+  integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
+
 tough-cookie@^2.2.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
@@ -13230,15 +13541,6 @@ webidl-conversions@^3.0.0, webidl-conversions@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
 
-webpack-cleanup-plugin@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/webpack-cleanup-plugin/-/webpack-cleanup-plugin-0.5.1.tgz#df2d706bd75364c06e65b051186316d674eb96af"
-  integrity sha1-3y1wa9dTZMBuZbBRGGMW1nTrlq8=
-  dependencies:
-    lodash.union "4.6.0"
-    minimatch "3.0.3"
-    recursive-readdir-sync "1.0.6"
-
 webpack-cli@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.1.2.tgz#17d7e01b77f89f884a2bbf9db545f0f6a648e746"
@@ -13404,13 +13706,13 @@ 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, which@1.3.1, which@^1.2.14, which@^1.3.0, which@^1.3.1:
+which@1, which@1.3.1, which@^1.2.10, which@^1.2.14, which@^1.3.0, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   dependencies:
     isexe "^2.0.0"
 
-which@1.2.x, which@^1.2.9:
+which@^1.2.9:
   version "1.2.14"
   resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
   dependencies:
@@ -13464,6 +13766,14 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
+wrap-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
+  integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -13483,13 +13793,6 @@ write@^0.2.1:
   dependencies:
     mkdirp "^0.5.1"
 
-write@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
-  dependencies:
-    mkdirp "^0.5.1"
-
 ws@5.1.1:
   version "5.1.1"
   resolved "http://registry.npmjs.org/ws/-/ws-5.1.1.tgz#1d43704689711ac1942fd2f283e38f825c4b8b95"
@@ -13697,6 +14000,18 @@ yn@^2.0.0:
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
   integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
+yup@^0.26.10:
+  version "0.26.10"
+  resolved "https://registry.yarnpkg.com/yup/-/yup-0.26.10.tgz#3545839663289038faf25facfc07e11fd67c0cb1"
+  integrity sha512-keuNEbNSnsOTOuGCt3UJW69jDE3O4P+UHAakO7vSeFMnjaitcmlbij/a3oNb9g1Y1KvSKH/7O1R2PQ4m4TRylw==
+  dependencies:
+    "@babel/runtime" "7.0.0"
+    fn-name "~2.0.1"
+    lodash "^4.17.10"
+    property-expr "^1.5.0"
+    synchronous-promise "^2.0.5"
+    toposort "^2.0.2"
+
 zip-stream@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"

From eea0a5cad79bae9910c69876017e5d015ddd008d Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Fri, 29 Mar 2019 23:35:33 +0100
Subject: [PATCH 027/100] refactor: remove unused @ts-ignore

---
 src/app/background/reducers/resources.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/app/background/reducers/resources.ts b/src/app/background/reducers/resources.ts
index c5674c98f..466c0ebc3 100644
--- a/src/app/background/reducers/resources.ts
+++ b/src/app/background/reducers/resources.ts
@@ -15,23 +15,20 @@ export default function(
   state: ResourcesState = initialResources,
   action: AppAction
 ) {
-  // @ts-ignore
-  // @ts-ignore
-  // @ts-ignore
   switch (action.type) {
     case 'api/UPDATE_MATCHING_CONTEXTS':
       return { ...state, matchingContexts: action.payload.matchingContexts };
 
-    // @ts-ignore
+    /* Action is not existing yet, but will come soon.
     case 'UPDATE_DRAFT_RECOMMENDATIONS': {
       return {
         ...state,
-        // @ts-ignore
         draftRecommendations: action.payload.draftRecommendations
       };
     }
+    */
 
-    // @ts-ignore
+    /* Will be used ?
     case 'UNINSTALL': {
       console.warn(
         'Extension uninstallation is disabled when environment is development.'
@@ -42,6 +39,7 @@ export default function(
       }
       return state;
     }
+    */
 
     default:
       return state;

From 8208772df166520c8f0f14b82f702d2505f8ad1d Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Sat, 30 Mar 2019 22:01:45 +0100
Subject: [PATCH 028/100] fix(analytics): revert Heap lib injection

---
 .prettierignore | 1 +
 src/lib/heap.ts | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 .prettierignore

diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 000000000..b377cd92c
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1 @@
+src/lib/heap.ts
diff --git a/src/lib/heap.ts b/src/lib/heap.ts
index a3cd1ae0e..30b7f9f53 100644
--- a/src/lib/heap.ts
+++ b/src/lib/heap.ts
@@ -1,4 +1,11 @@
 export const loadHeap = (appId: string): Promise<Heap> => {
+
+  // heap lib injection in window object
+  /* tslint:disable */
+  // @ts-ignore
+  window.heap=window.heap||[],heap.load=function(e,t){window.heap.appid=e,window.heap.config=t=t||{};var r=t.forceSSL||"https:"===document.location.protocol,a=document.createElement("script");a.type="text/javascript",a.async=!0,a.src=(r?"https:":"http:")+"//cdn.heapanalytics.com/js/heap-"+e+".js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(a,n);for(var o=function(e){return function(){heap.push([e].concat(Array.prototype.slice.call(arguments,0)))}},p=["addEventProperties","addUserProperties","clearEventProperties","identify","removeEventProperty","setEventProperties","track","unsetEventProperty"],c=0;c<p.length;c++)heap[p[c]]=o(p[c])};
+  /* tslint:enable */
+
   const heap = (window as CustomWindow).heap;
   if (heap) {
     heap.load(appId, { forceSSL: true });

From aa9cdeb672e3015ec811f59e6bb9fe90df09a5a4 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Sat, 30 Mar 2019 22:10:24 +0100
Subject: [PATCH 029/100] style: remove unused named export

---
 src/components/atoms/icons/types/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/atoms/icons/types/index.ts b/src/components/atoms/icons/types/index.ts
index e822ccb5b..b88cf9db6 100644
--- a/src/components/atoms/icons/types/index.ts
+++ b/src/components/atoms/icons/types/index.ts
@@ -11,7 +11,7 @@ import Other from './Other';
 interface Props {
   active?: boolean;
 }
-export const TypesIcons: { [key in NoticeType]: ComponentType<Props> } = {
+const TypesIcons: { [key in NoticeType]: ComponentType<Props> } = {
   Approval,
   Disapproval,
   Tip,

From 0ac84b2d09c1341ab611911da27d44b39ed6d153 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Sat, 30 Mar 2019 22:22:28 +0100
Subject: [PATCH 030/100] fix: read version directly from package.json, at
 build time

---
 src/app/actions/install.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/actions/install.ts b/src/app/actions/install.ts
index 361befa5f..29aa7a5d0 100644
--- a/src/app/actions/install.ts
+++ b/src/app/actions/install.ts
@@ -1,6 +1,7 @@
 import { Dispatch } from 'redux';
 import { InstallationDetails } from '../lmem/installation';
 import { BaseAction } from './BaseAction';
+import { version } from '../../../package.json';
 
 export interface InstalledAction extends BaseAction {
   type: 'INSTALLED';
@@ -25,7 +26,7 @@ const onInstalledPromise = new Promise<InstallationDetails>(resolve => {
     resolve({
       ...details,
       datetime: new Date(),
-      version: chrome.runtime.getManifest().version
+      version
     });
   });
 });

From ccfbeb8460cc04c55debb5ea7ee1076ea0d17066 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Sat, 30 Mar 2019 22:34:41 +0100
Subject: [PATCH 031/100] refactor: clean up actions files

---
 src/app/actions/BaseAction.ts                    | 13 -------------
 .../{browser/browserAction.ts => browser.ts}     |  2 +-
 src/app/actions/filters.ts                       |  2 +-
 src/app/actions/index.ts                         | 16 ++++++++++++++--
 src/app/actions/install.ts                       |  2 +-
 src/app/actions/kraftBackend.ts                  |  2 +-
 src/app/actions/recommendations.ts               |  2 +-
 src/app/actions/tabs.ts                          |  2 +-
 .../{browser/tabs.ts => tabsLifecycle.ts}        |  2 +-
 src/app/actions/ui.ts                            |  2 +-
 src/app/actions/updateDraftRecommendations.ts    |  2 +-
 src/app/background/sagas/tab.ts                  |  9 ++++++---
 .../services/createBrowserActionChannel.ts       |  2 +-
 src/app/background/store/listenTabs.ts           |  2 +-
 14 files changed, 31 insertions(+), 29 deletions(-)
 delete mode 100644 src/app/actions/BaseAction.ts
 rename src/app/actions/{browser/browserAction.ts => browser.ts} (88%)
 rename src/app/actions/{browser/tabs.ts => tabsLifecycle.ts} (94%)

diff --git a/src/app/actions/BaseAction.ts b/src/app/actions/BaseAction.ts
deleted file mode 100644
index 31ef018af..000000000
--- a/src/app/actions/BaseAction.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Action } from 'redux';
-import { ActionMeta } from './index';
-
-export interface BaseAction extends Action {
-  payload?: {};
-  meta?: ActionMeta;
-}
-
-export type TabAction = BaseAction & {
-  meta: ActionMeta & {
-    tab: number;
-  };
-};
diff --git a/src/app/actions/browser/browserAction.ts b/src/app/actions/browser.ts
similarity index 88%
rename from src/app/actions/browser/browserAction.ts
rename to src/app/actions/browser.ts
index f0008d632..bca6ac369 100644
--- a/src/app/actions/browser/browserAction.ts
+++ b/src/app/actions/browser.ts
@@ -1,4 +1,4 @@
-import { TabAction } from '../BaseAction';
+import { TabAction } from '.';
 
 export interface BrowserActionClickedAction extends TabAction {
   type: 'BROWSER/BROWSER_ACTION_CLICKED';
diff --git a/src/app/actions/filters.ts b/src/app/actions/filters.ts
index ae2076a8e..44df08c3d 100644
--- a/src/app/actions/filters.ts
+++ b/src/app/actions/filters.ts
@@ -1,5 +1,5 @@
 import { InstallationDetails } from '../lmem/installation';
-import { BaseAction } from './BaseAction';
+import { BaseAction } from '.';
 
 export interface InstalledDetailsAction extends BaseAction {
   type: 'INSTALLED_DETAILS';
diff --git a/src/app/actions/index.ts b/src/app/actions/index.ts
index d15f8395c..ef079e9f2 100644
--- a/src/app/actions/index.ts
+++ b/src/app/actions/index.ts
@@ -1,10 +1,10 @@
 import { LocationChangeAction } from 'connected-react-router';
-import { BrowserActionClickedAction } from './browser/browserAction';
+import { BrowserActionClickedAction } from './browser';
 import {
   TabCreatedAction,
   TabRemovedAction,
   TabUpdatedAction
-} from './browser/tabs';
+} from './tabsLifecycle';
 import { InstalledAction } from './install';
 import {
   RefreshMatchingContextsAction,
@@ -22,6 +22,18 @@ import {
 import { InstalledDetailsAction } from './filters';
 import { CloseAction, ClosedAction, OpenAction, OpenedAction } from './ui';
 import { FeedbackOnNoticeAction, NoticesFoundAction } from './recommendations';
+import { Action } from 'redux';
+
+export interface BaseAction extends Action {
+  payload?: {};
+  meta?: ActionMeta;
+}
+
+export type TabAction = BaseAction & {
+  meta: ActionMeta & {
+    tab: number;
+  };
+};
 
 export interface ActionMeta {
   tab?: number;
diff --git a/src/app/actions/install.ts b/src/app/actions/install.ts
index 29aa7a5d0..f3b9d92ba 100644
--- a/src/app/actions/install.ts
+++ b/src/app/actions/install.ts
@@ -1,6 +1,6 @@
 import { Dispatch } from 'redux';
 import { InstallationDetails } from '../lmem/installation';
-import { BaseAction } from './BaseAction';
+import { BaseAction } from '.';
 import { version } from '../../../package.json';
 
 export interface InstalledAction extends BaseAction {
diff --git a/src/app/actions/kraftBackend.ts b/src/app/actions/kraftBackend.ts
index 06aeb94d1..7d6906338 100644
--- a/src/app/actions/kraftBackend.ts
+++ b/src/app/actions/kraftBackend.ts
@@ -2,7 +2,7 @@ import fetch from 'isomorphic-fetch';
 import { LMEM_BACKEND_ORIGIN } from 'app/constants/origins';
 import { MatchingContext } from 'app/lmem/matchingContext';
 import { Dispatch } from 'redux';
-import { BaseAction } from './BaseAction';
+import { BaseAction } from '.';
 
 function fetchJson(url: string) {
   return fetch(url).then(response => {
diff --git a/src/app/actions/recommendations.ts b/src/app/actions/recommendations.ts
index 1b192dd73..c337b43dd 100644
--- a/src/app/actions/recommendations.ts
+++ b/src/app/actions/recommendations.ts
@@ -1,5 +1,5 @@
 import { EnhancedNotice } from 'app/lmem/notice';
-import { BaseAction, TabAction } from './BaseAction';
+import { BaseAction, TabAction } from '.';
 
 export interface NoticesFoundAction extends TabAction {
   type: 'NOTICES_FOUND';
diff --git a/src/app/actions/tabs.ts b/src/app/actions/tabs.ts
index 2dcce685a..4e47bd7cb 100644
--- a/src/app/actions/tabs.ts
+++ b/src/app/actions/tabs.ts
@@ -8,7 +8,7 @@ import {
 import { InstallationDetails } from 'app/lmem/installation';
 import { Editor } from 'app/lmem/editors';
 import { MatchingContext } from 'app/lmem/matchingContext';
-import { BaseAction, TabAction } from './BaseAction';
+import { BaseAction, TabAction } from '.';
 
 export interface InitAction extends TabAction {
   type: 'INIT';
diff --git a/src/app/actions/browser/tabs.ts b/src/app/actions/tabsLifecycle.ts
similarity index 94%
rename from src/app/actions/browser/tabs.ts
rename to src/app/actions/tabsLifecycle.ts
index 63667fd3f..8644eadc3 100644
--- a/src/app/actions/browser/tabs.ts
+++ b/src/app/actions/tabsLifecycle.ts
@@ -1,4 +1,4 @@
-import { TabAction } from '../BaseAction';
+import { TabAction } from '.';
 
 export interface TabCreatedAction extends TabAction {
   type: 'BROWSER/TAB_CREATED';
diff --git a/src/app/actions/ui.ts b/src/app/actions/ui.ts
index d567d89b5..9d283e02b 100644
--- a/src/app/actions/ui.ts
+++ b/src/app/actions/ui.ts
@@ -1,4 +1,4 @@
-import { BaseAction } from './BaseAction';
+import { BaseAction } from '.';
 
 export interface OpenAction extends BaseAction {
   type: 'OPEN';
diff --git a/src/app/actions/updateDraftRecommendations.ts b/src/app/actions/updateDraftRecommendations.ts
index afa196bc0..ac8cdb348 100644
--- a/src/app/actions/updateDraftRecommendations.ts
+++ b/src/app/actions/updateDraftRecommendations.ts
@@ -1,4 +1,4 @@
-import { BaseAction } from './BaseAction';
+import { BaseAction } from '.';
 
 interface UpdateDraftRecommendationsAction extends BaseAction {
   type: 'UPDATE_DRAFT_RECOMMENDATIONS';
diff --git a/src/app/background/sagas/tab.ts b/src/app/background/sagas/tab.ts
index 0278ccbbe..ed6744506 100644
--- a/src/app/background/sagas/tab.ts
+++ b/src/app/background/sagas/tab.ts
@@ -28,18 +28,21 @@ import {
 } from 'app/actions/tabs';
 import { noticesFound } from 'app/actions/recommendations';
 import watchSingleMessageSaga from '../../utils/watchSingleMessageSaga';
-import { TabAction } from '../../actions/BaseAction';
+import { TabAction } from '../../actions';
 import fetchContentScript from '../services/fetchContentScript';
 import executeTabScript, {
   ExecuteContentScript
 } from '../services/executeTabScript';
 import createBrowserActionChannel from '../services/createBrowserActionChannel';
-import { TabCreatedAction, TabUpdatedAction } from '../../actions/browser/tabs';
+import {
+  TabCreatedAction,
+  TabUpdatedAction
+} from '../../actions/tabsLifecycle';
 import * as R from 'ramda';
 import { MatchingContext } from '../../lmem/matchingContext';
 import { EnhancedNotice } from '../../lmem/notice';
 import sendToTab from '../services/sendToTab';
-import { AppAction } from '../../actions';
+import { AppAction } from '../../actions/';
 import { fetchMatchingNotices } from '../../lmem/fetchMatchingNotices';
 
 export const tabSaga = (executeContentScript: ExecuteContentScript) =>
diff --git a/src/app/background/services/createBrowserActionChannel.ts b/src/app/background/services/createBrowserActionChannel.ts
index 10a6d4cbb..271418b25 100644
--- a/src/app/background/services/createBrowserActionChannel.ts
+++ b/src/app/background/services/createBrowserActionChannel.ts
@@ -1,5 +1,5 @@
 import { eventChannel } from 'redux-saga';
-import { browserActionClicked } from 'app/actions/browser/browserAction';
+import { browserActionClicked } from 'app/actions/browser';
 
 export const createBrowserActionChannel = () => {
   return eventChannel(emit => {
diff --git a/src/app/background/store/listenTabs.ts b/src/app/background/store/listenTabs.ts
index 424f04100..ceaa01284 100644
--- a/src/app/background/store/listenTabs.ts
+++ b/src/app/background/store/listenTabs.ts
@@ -1,4 +1,4 @@
-import { tabCreated, tabRemoved, tabUpdated } from 'app/actions/browser/tabs';
+import { tabCreated, tabRemoved, tabUpdated } from 'app/actions/tabsLifecycle';
 import { Store } from 'redux';
 
 export const onTabCreated = (store: Store) => ({

From 6a074aaf5cb20adaff872d2133b3e83023a2fb5a Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Sat, 30 Mar 2019 22:35:09 +0100
Subject: [PATCH 032/100] chore: remove unexisting test/infra inclusion

---
 webpack/config.plugins.js | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/webpack/config.plugins.js b/webpack/config.plugins.js
index 32ebcb014..743682072 100644
--- a/webpack/config.plugins.js
+++ b/webpack/config.plugins.js
@@ -44,16 +44,10 @@ module.exports = (env = {}, argv = {}, outputPath) => {
     }
   ];
   if (argv.mode !== 'production') {
-    copyConfig.push(
-      {
-        from: 'test/infrastructure',
-        to: path.join(outputPath, env.build, 'test', 'infrastructure')
-      },
-      {
-        from: 'test/integration',
-        to: path.join(outputPath, env.build, 'test', 'integration')
-      }
-    );
+    copyConfig.push({
+      from: 'test/integration',
+      to: path.join(outputPath, env.build, 'test', 'integration')
+    });
   }
 
   const plugins = [

From b954cb0a46cfc9f7a139998fa5bbcab971348aff Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Tue, 9 Apr 2019 22:27:00 +0200
Subject: [PATCH 033/100] style: fix TSLint

---
 package.json                                  |  4 +-
 src/app/actions/kraftBackend.ts               |  3 +-
 src/app/background/index.ts                   | 27 ++++--
 src/app/background/middlewares/index.js       | 10 +--
 src/app/background/sagas/matchingContexts.js  |  6 +-
 .../App/Account/About/About.stories.tsx       | 16 ++--
 src/app/content/App/Account/About/index.tsx   | 34 ++++----
 .../App/Account/Filters/Filters.stories.tsx   | 12 +--
 .../content/App/Account/Filters/Filters.tsx   |  4 +-
 .../content/App/Account/Menu/Menu.stories.tsx | 10 +--
 src/app/content/App/Account/Menu/index.tsx    | 10 +--
 src/app/content/App/Account/index.tsx         | 16 ++--
 src/app/content/App/Error/Error.stories.tsx   | 10 +--
 src/app/content/App/Error/Illustration.js     |  5 +-
 src/app/content/App/Help/Help.stories.tsx     | 12 +--
 src/app/content/App/Help/index.tsx            | 12 +--
 src/app/content/App/Loading/Illustration.js   |  2 +-
 .../content/App/Loading/Loading.stories.tsx   | 14 ++--
 src/app/content/App/Loading/index.tsx         | 10 +--
 src/app/content/App/Loading/withConnect.js    |  4 +-
 .../content/App/Notice/List/List.stories.tsx  | 50 +++++------
 .../App/Notice/List/NoNotice/Illustration.js  |  6 +-
 src/app/content/App/Notice/index.tsx          |  8 +-
 .../content/App/Subscriptions/Illustration.js | 82 +++++++++++--------
 .../Subscriptions/Subscriptions.stories.tsx   | 12 +--
 src/app/content/App/Subscriptions/index.tsx   | 12 +--
 src/app/content/App/index.tsx                 | 32 ++++----
 src/app/content/middlewares/index.js          |  4 +-
 src/app/content/sagas/browserAction.js        |  8 +-
 src/app/content/sagas/ui.tsx                  | 30 +++----
 .../atoms/Buttons/AddNoticeLink/AddIcon.js    |  6 +-
 .../AddNoticeLink/AddNoticeLink.stories.tsx   |  8 +-
 .../BorderButton/BorderButton.stories.tsx     | 14 ++--
 .../Buttons/OpenButton/OpenButton.stories.tsx |  8 +-
 .../ContentTitle/ContentTitle.stories.tsx     | 12 +--
 .../atoms/Forms/Textarea/Textarea.stories.tsx |  8 +-
 src/components/atoms/Time.tsx                 |  4 +-
 src/components/atoms/Truncated.tsx            |  6 +-
 src/components/atoms/icons/Arrow.js           | 18 ++--
 src/components/atoms/icons/Close.js           | 11 ++-
 .../atoms/icons/types/Alternative.tsx         |  2 +-
 src/components/atoms/icons/types/Dislike.tsx  |  8 +-
 src/components/atoms/icons/types/Like.tsx     |  8 +-
 src/components/atoms/icons/types/Other.tsx    |  2 +-
 src/components/atoms/icons/types/Tip.tsx      |  2 +-
 .../molecules/Type/Type.stories.tsx           | 22 ++---
 src/components/molecules/Type/Type.tsx        | 12 +--
 src/components/organisms/Notice/Content.tsx   | 10 +--
 src/components/organisms/Notice/DeleteIcon.js |  6 +-
 .../organisms/Notice/Notice.stories.tsx       | 64 ++++++++-------
 src/components/organisms/Notice/Title.tsx     |  6 +-
 src/components/organisms/Notice/index.js      |  6 +-
 .../organisms/NoticeDetails/Message.tsx       |  4 +-
 .../NoticeDetails/NoticeDetails.stories.tsx   | 42 +++++-----
 .../NoticeDetails/Source/AnchorIcon.js        |  5 +-
 .../NoticeDetails/Source/SourceURL.tsx        |  4 +-
 .../Notification/Notification.stories.tsx     | 24 +++---
 .../NotificationFooter/AccountIcon.js         |  6 +-
 .../NotificationFooter/BubbleIcon.js          |  6 +-
 .../NotificationFooter/CheckListIcon.js       | 14 ++--
 .../NotificationFooter/HelpIcon.js            |  6 +-
 .../NotificationFooter.stories.tsx            | 16 ++--
 .../NotificationHeader/LogoImg.js             | 74 ++++++++---------
 .../NotificationHeader.stories.tsx            | 30 +++----
 .../Notification/NotificationHeader/index.tsx | 22 ++---
 .../organisms/Notification/index.tsx          | 12 +--
 tslint.json                                   |  4 +-
 67 files changed, 497 insertions(+), 480 deletions(-)

diff --git a/package.json b/package.json
index 3316afdc9..ac9d7d81c 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "clean": "rm -rf build",
     "test": "LMEM_BACKEND_ORIGIN='' NODE_ENV=test ts-mocha --paths test/app/*.ts test/app/**/*.ts",
     "lint": "yarn lint:ts && yarn lint:css",
-    "lint:ts": "tslint './src/**/*.ts'",
+    "lint:ts": "tslint -p .",
     "lint:css": "stylelint './src/**/*.js'",
     "analyse": "babel-node ./node_modules/webpack/bin/webpack --optimize-minimize --mode production --config webpack/chromium.config.js --profile --json > stats.json",
     "storybook": "start-storybook -p 6007 -c .storybook",
@@ -29,7 +29,7 @@
   },
   "lint-staged": {
     "*.{ts,tsx,js,jsx}": [
-      "tslint",
+      "tslint -p .",
       "prettier --write",
       "git add"
     ]
diff --git a/src/app/actions/kraftBackend.ts b/src/app/actions/kraftBackend.ts
index 7d6906338..1558950da 100644
--- a/src/app/actions/kraftBackend.ts
+++ b/src/app/actions/kraftBackend.ts
@@ -33,11 +33,10 @@ export const receivedMatchingContexts = (
 });
 
 export function dispatchInitialStateFromBackend() {
-  return (dispatch: Dispatch) => {
+  return (dispatch: Dispatch) =>
     fetchMatchingContexts().then((matchingContexts: MatchingContext[]) =>
       dispatch(receivedMatchingContexts(matchingContexts))
     );
-  };
 }
 
 export interface RefreshMatchingContextsAction extends BaseAction {
diff --git a/src/app/background/index.ts b/src/app/background/index.ts
index 7ad97671e..2ce4ba4a1 100644
--- a/src/app/background/index.ts
+++ b/src/app/background/index.ts
@@ -18,17 +18,28 @@ if (process.env.NODE_ENV !== 'production') {
 }
 console.info(`LMEM_BACKEND_ORIGIN "${LMEM_BACKEND_ORIGIN}"`);
 
+const setUninstallURL = (heapUserId: string) => {
+  const uninstallOrigin = process.env.UNINSTALL_ORIGIN;
+  if (typeof uninstallOrigin === 'string') {
+    chrome.runtime.setUninstallURL(
+      uninstallOrigin + '?u=' + encodeURIComponent(heapUserId || '-1')
+    );
+  }
+};
+
 const heapAppId = process.env.HEAP_APPID;
 if (typeof heapAppId === 'string') {
   console.info(`Heap loading with appId "${heapAppId}"`);
-  loadHeap(heapAppId).then(heap => {
-    const uninstallOrigin = process.env.UNINSTALL_ORIGIN;
-    if (typeof uninstallOrigin === 'string') {
-      chrome.runtime.setUninstallURL(
-        uninstallOrigin + '?u=' + encodeURIComponent(heap.userId)
-      );
-    }
-  });
+  loadHeap(heapAppId)
+    .catch(error => {
+      console.warn('Could not load Heap Analytics', error);
+    })
+    .then(heap => {
+      if (heap) setUninstallURL(heap.userId);
+    })
+    .catch(error => {
+      console.warn('Could not load set uninstall URL', error);
+    });
 } else {
   console.warn(
     'Heap analytics disabled: assuming "process.env.HEAP_APPID" is deliberately not defined.'
diff --git a/src/app/background/middlewares/index.js b/src/app/background/middlewares/index.js
index 74c6369ad..7e76aec24 100644
--- a/src/app/background/middlewares/index.js
+++ b/src/app/background/middlewares/index.js
@@ -1,8 +1,8 @@
-import thunk from "redux-thunk";
-import sendFeedback from "./sendFeedback";
-import analytics from "./analytics";
-import sagaMiddleware from "./saga";
-import track from "../../analytics/trackEvents";
+import thunk from 'redux-thunk';
+import sendFeedback from './sendFeedback';
+import analytics from './analytics';
+import sagaMiddleware from './saga';
+import track from '../../analytics/trackEvents';
 
 export { sagaMiddleware };
 
diff --git a/src/app/background/sagas/matchingContexts.js b/src/app/background/sagas/matchingContexts.js
index 045be4ac0..b619f0544 100644
--- a/src/app/background/sagas/matchingContexts.js
+++ b/src/app/background/sagas/matchingContexts.js
@@ -1,17 +1,17 @@
-import { put, takeLatest, call } from "redux-saga/effects";
+import { put, takeLatest, call } from 'redux-saga/effects';
 import {
   REFRESH_MATCHING_CONTEXTS,
   EXCLUDE_EDITOR,
   INCLUDE_EDITOR,
   SELECT_CRITERION,
   UNSELECT_CRITERION
-} from "../../constants/ActionTypes";
+} from '../../constants/ActionTypes';
 
 import {
   fetchMatchingContexts,
   receivedMatchingContexts,
   refreshMatchingContexts
-} from "app/actions/kraftBackend";
+} from 'app/actions/kraftBackend';
 
 export function* refreshMatchingContextsSaga() {
   const matchingContexts = yield call(fetchMatchingContexts);
diff --git a/src/app/content/App/Account/About/About.stories.tsx b/src/app/content/App/Account/About/About.stories.tsx
index 02f86bb3b..4e93a0154 100644
--- a/src/app/content/App/Account/About/About.stories.tsx
+++ b/src/app/content/App/Account/About/About.stories.tsx
@@ -1,15 +1,15 @@
-import React from "react";
-import { MemoryRouter as Router } from "react-router-dom";
-import { storiesOf } from "@storybook/react";
-import { action } from "@storybook/addon-actions";
-import { About } from ".";
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import { About } from '.';
 
-storiesOf("screens/About", module)
+storiesOf('screens/About', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add("normal", () => (
+  .add('normal', () => (
     <About
       extensionVersion="1.2.3"
-      close={action("close")}
+      close={action('close')}
       installationDate={new Date()}
     />
   ));
diff --git a/src/app/content/App/Account/About/index.tsx b/src/app/content/App/Account/About/index.tsx
index c60a3ecce..0935f0914 100644
--- a/src/app/content/App/Account/About/index.tsx
+++ b/src/app/content/App/Account/About/index.tsx
@@ -1,10 +1,10 @@
-import React from "react";
-import { ExternalLink, Time } from "components/atoms";
-import { Notification } from "components/organisms/Notification";
-import Title from "./Title";
-import Content from "./Content";
-import Container from "./Container";
-import withConnect from "./withConnect";
+import React from 'react';
+import { ExternalLink, Time } from 'components/atoms';
+import { Notification } from 'components/organisms/Notification';
+import Title from './Title';
+import Content from './Content';
+import Container from './Container';
+import withConnect from './withConnect';
 
 interface Props {
   installationDate?: Date;
@@ -28,7 +28,7 @@ export const About = ({ close, installationDate, extensionVersion }: Props) => (
       )}
 
       <Content>
-        Pour découvrir ou faire découvrir le Même en Mieux autour de vous,{" "}
+        Pour découvrir ou faire découvrir le Même en Mieux autour de vous,{' '}
         <ExternalLink href="https://choisir.lmem.net/decouvrir-exemples/">
           rendez-vous sur cette page d’exemples
         </ExternalLink>
@@ -38,19 +38,19 @@ export const About = ({ close, installationDate, extensionVersion }: Props) => (
       <nav>
         <ExternalLink href="https://choisir.lmem.net/questions-frequentes-aide/">
           Aide
-        </ExternalLink>{" "}
-        -{" "}
-        <ExternalLink href="https://www.lmem.net/projet">À propos</ExternalLink>{" "}
-        -{" "}
+        </ExternalLink>{' '}
+        -{' '}
+        <ExternalLink href="https://www.lmem.net/projet">À propos</ExternalLink>{' '}
+        -{' '}
         <ExternalLink href="https://www.lmem.net/contact.html">
           Contact
-        </ExternalLink>{" "}
-        -{" "}
+        </ExternalLink>{' '}
+        -{' '}
         <ExternalLink href="https://choisir.lmem.net/charte-de-respect-de-la-vie-privee-5-regles-dor/">
           Vie privée
-        </ExternalLink>{" "}
-        - <ExternalLink href="https://www.lmem.net/cgu.html">CGU</ExternalLink>{" "}
-        -{" "}
+        </ExternalLink>{' '}
+        - <ExternalLink href="https://www.lmem.net/cgu.html">CGU</ExternalLink>{' '}
+        -{' '}
         <ExternalLink href="https://choisir.lmem.net/desinstaller-meme-mieux/">
           Désinstaller
         </ExternalLink>
diff --git a/src/app/content/App/Account/Filters/Filters.stories.tsx b/src/app/content/App/Account/Filters/Filters.stories.tsx
index f47758c83..8e64cfd4a 100644
--- a/src/app/content/App/Account/Filters/Filters.stories.tsx
+++ b/src/app/content/App/Account/Filters/Filters.stories.tsx
@@ -1,8 +1,8 @@
-import React from "react";
-import { MemoryRouter as Router } from "react-router-dom";
-import { storiesOf } from "@storybook/react";
-import Filters from "./Filters";
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import Filters from './Filters';
 
-storiesOf("screens/Filters", module)
+storiesOf('screens/Filters', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add("normal", () => <Filters />);
+  .add('normal', () => <Filters />);
diff --git a/src/app/content/App/Account/Filters/Filters.tsx b/src/app/content/App/Account/Filters/Filters.tsx
index 2f1d2569d..d38962a87 100644
--- a/src/app/content/App/Account/Filters/Filters.tsx
+++ b/src/app/content/App/Account/Filters/Filters.tsx
@@ -1,5 +1,5 @@
-import React from "react";
-import Notification from "components/organisms/Notification";
+import React from 'react';
+import Notification from 'components/organisms/Notification';
 
 interface Props {
   close?: () => void;
diff --git a/src/app/content/App/Account/Menu/Menu.stories.tsx b/src/app/content/App/Account/Menu/Menu.stories.tsx
index 6a98ef6a1..0d4a98863 100644
--- a/src/app/content/App/Account/Menu/Menu.stories.tsx
+++ b/src/app/content/App/Account/Menu/Menu.stories.tsx
@@ -1,9 +1,9 @@
-import React from "react";
-import { MemoryRouter as Router, Route } from "react-router-dom";
-import { storiesOf } from "@storybook/react";
-import Menu from ".";
+import React from 'react';
+import { MemoryRouter as Router, Route } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import Menu from '.';
 
-storiesOf("screens/Menu", module).add("Menu", () => (
+storiesOf('screens/Menu', module).add('Menu', () => (
   <Router>
     <Route component={Menu} />
   </Router>
diff --git a/src/app/content/App/Account/Menu/index.tsx b/src/app/content/App/Account/Menu/index.tsx
index fe431929c..d14e1c8e1 100644
--- a/src/app/content/App/Account/Menu/index.tsx
+++ b/src/app/content/App/Account/Menu/index.tsx
@@ -1,8 +1,8 @@
-import React from "react";
-import { Link, RouteComponentProps } from "react-router-dom";
-import Notification from "components/organisms/Notification";
-import { OpenButton } from "components/atoms";
-import Account from "./Account";
+import React from 'react';
+import { Link, RouteComponentProps } from 'react-router-dom';
+import Notification from 'components/organisms/Notification';
+import { OpenButton } from 'components/atoms';
+import Account from './Account';
 
 interface OwnProps {
   close?: () => void;
diff --git a/src/app/content/App/Account/index.tsx b/src/app/content/App/Account/index.tsx
index 56940484c..22c7c08c0 100644
--- a/src/app/content/App/Account/index.tsx
+++ b/src/app/content/App/Account/index.tsx
@@ -1,11 +1,11 @@
-import { RouteComponentProps } from "react-router";
-import { Route, Switch } from "react-router-dom";
-import React from "react";
-import Filters from "./Filters/Filters";
-import Menu from "./Menu";
-import About from "./About";
-import Error from "../Error";
-import Loading from "../Loading";
+import { RouteComponentProps } from 'react-router';
+import { Route, Switch } from 'react-router-dom';
+import React from 'react';
+import Filters from './Filters/Filters';
+import Menu from './Menu';
+import About from './About';
+import Error from '../Error';
+import Loading from '../Loading';
 
 export default ({ match }: RouteComponentProps) => (
   <Switch>
diff --git a/src/app/content/App/Error/Error.stories.tsx b/src/app/content/App/Error/Error.stories.tsx
index 042faaaee..fd2c08ba5 100644
--- a/src/app/content/App/Error/Error.stories.tsx
+++ b/src/app/content/App/Error/Error.stories.tsx
@@ -1,9 +1,9 @@
-import React from "react";
-import { MemoryRouter as Router } from "react-router";
-import { storiesOf } from "@storybook/react";
-import Error from ".";
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router';
+import { storiesOf } from '@storybook/react';
+import Error from '.';
 
-storiesOf("screens/Error", module).add("normal", () => (
+storiesOf('screens/Error', module).add('normal', () => (
   <Router>
     <Error />
   </Router>
diff --git a/src/app/content/App/Error/Illustration.js b/src/app/content/App/Error/Illustration.js
index 0825d93db..4f44eb69c 100644
--- a/src/app/content/App/Error/Illustration.js
+++ b/src/app/content/App/Error/Illustration.js
@@ -16,7 +16,8 @@ export default () => (
     />
     <path
       fill="#ebeaee"
-      d="M131.366 22.037H.757V5.045A4.286 4.286 0 0 1 5.045.757h122.03a4.286 4.286 0 0 1 4.288 4.288v16.992z" />
+      d="M131.366 22.037H.757V5.045A4.286 4.286 0 0 1 5.045.757h122.03a4.286 4.286 0 0 1 4.288 4.288v16.992z"
+    />
     <path
       d="M131.367 22.793H.757A.758.758 0 0 1 0 22.035V5.045A5.051 5.051 0 0 1 5.045 0h122.03a5.051 5.051 
       0 0 1 5.045 5.045v16.99a.755.755 0 0 1-.753.758zM1.511 21.281h129.095V5.045a3.539 3.539 0
@@ -56,4 +57,4 @@ export default () => (
       fill="#1d3d70"
     />
   </svg>
-);
\ No newline at end of file
+);
diff --git a/src/app/content/App/Help/Help.stories.tsx b/src/app/content/App/Help/Help.stories.tsx
index dbcb43278..144a9fb12 100644
--- a/src/app/content/App/Help/Help.stories.tsx
+++ b/src/app/content/App/Help/Help.stories.tsx
@@ -1,8 +1,8 @@
-import React from "react";
-import { MemoryRouter as Router } from "react-router-dom";
-import { storiesOf } from "@storybook/react";
-import Help from ".";
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import Help from '.';
 
-storiesOf("screens/Help", module)
+storiesOf('screens/Help', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add("normal", () => <Help />);
+  .add('normal', () => <Help />);
diff --git a/src/app/content/App/Help/index.tsx b/src/app/content/App/Help/index.tsx
index fa05c82ab..700368ced 100644
--- a/src/app/content/App/Help/index.tsx
+++ b/src/app/content/App/Help/index.tsx
@@ -1,14 +1,14 @@
-import React from "react";
-import Notification from "components/organisms/Notification";
+import React from 'react';
+import Notification from 'components/organisms/Notification';
 import {
   BorderButton,
   CenterContainer,
   List,
   ExternalLink
-} from "components/atoms";
-import { Textarea } from "components/atoms/Forms";
-import Container from "./Container";
-import ContentTitle from "./ContentTitle";
+} from 'components/atoms';
+import { Textarea } from 'components/atoms/Forms';
+import Container from './Container';
+import ContentTitle from './ContentTitle';
 
 interface Props {
   close?: () => void;
diff --git a/src/app/content/App/Loading/Illustration.js b/src/app/content/App/Loading/Illustration.js
index 5df4fa348..2e49eec36 100644
--- a/src/app/content/App/Loading/Illustration.js
+++ b/src/app/content/App/Loading/Illustration.js
@@ -16,4 +16,4 @@ export default () => (
               1.145-2.78 3.784 3.784 0 0 0-1.145-2.783A3.8 3.8 0 0 0 16.365 0zm0 0"
     />
   </svg>
-);
\ No newline at end of file
+);
diff --git a/src/app/content/App/Loading/Loading.stories.tsx b/src/app/content/App/Loading/Loading.stories.tsx
index d6f5448b2..3070d1ef5 100644
--- a/src/app/content/App/Loading/Loading.stories.tsx
+++ b/src/app/content/App/Loading/Loading.stories.tsx
@@ -1,9 +1,9 @@
-import React from "react";
-import { MemoryRouter as Router } from "react-router-dom";
-import { storiesOf } from "@storybook/react";
-import { action } from "@storybook/addon-actions";
-import { Loading } from ".";
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import { Loading } from '.';
 
-storiesOf("screens/Loading", module)
+storiesOf('screens/Loading', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add("normal", () => <Loading close={action("close")} />);
+  .add('normal', () => <Loading close={action('close')} />);
diff --git a/src/app/content/App/Loading/index.tsx b/src/app/content/App/Loading/index.tsx
index d587a37dd..8e9fed5eb 100644
--- a/src/app/content/App/Loading/index.tsx
+++ b/src/app/content/App/Loading/index.tsx
@@ -1,8 +1,8 @@
-import React from "react";
-import Notification from "components/organisms/Notification";
-import Illustration from "./Illustration";
-import Container from "./Container";
-import withConnect from "./withConnect";
+import React from 'react';
+import Notification from 'components/organisms/Notification';
+import Illustration from './Illustration';
+import Container from './Container';
+import withConnect from './withConnect';
 
 interface Props {
   close: () => void;
diff --git a/src/app/content/App/Loading/withConnect.js b/src/app/content/App/Loading/withConnect.js
index 1a14ea4e9..543536e70 100644
--- a/src/app/content/App/Loading/withConnect.js
+++ b/src/app/content/App/Loading/withConnect.js
@@ -1,5 +1,5 @@
-import { connect } from "react-redux";
-import { close } from "app/actions/ui";
+import { connect } from 'react-redux';
+import { close } from 'app/actions/ui';
 
 const mapDispatchToProps = {
   close
diff --git a/src/app/content/App/Notice/List/List.stories.tsx b/src/app/content/App/Notice/List/List.stories.tsx
index 98eb33d91..92e70da08 100644
--- a/src/app/content/App/Notice/List/List.stories.tsx
+++ b/src/app/content/App/Notice/List/List.stories.tsx
@@ -1,27 +1,27 @@
-import React from "react";
-import { MemoryRouter as Router } from "react-router-dom";
-import { storiesOf } from "@storybook/react";
-import { action } from "@storybook/addon-actions";
-import { List } from ".";
-import { EnhancedNotice } from "../../../../lmem/notice";
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import { List } from '.';
+import { EnhancedNotice } from '../../../../lmem/notice';
 
 const notices: EnhancedNotice[] = [
   {
     id: 123,
-    title: "title is going to be removed",
+    title: 'title is going to be removed',
     description: '<p>Description with a <a href="http://some.url">link</a></p>',
-    contributor: { name: "John Doe", image: "image", organization: "org" },
-    criteria: [{ label: "label", slug: "slug" }],
+    contributor: { name: 'John Doe', image: 'image', organization: 'org' },
+    criteria: [{ label: 'label', slug: 'slug' }],
     resource: {
-      author: "Jack Daniels",
-      editor: { id: 42, label: "LMEM", url: "url" },
-      label: "label",
-      url: "url"
+      author: 'Jack Daniels',
+      editor: { id: 42, label: 'LMEM', url: 'url' },
+      label: 'label',
+      url: 'url'
     },
     alternatives: [
       {
-        label: "some alternative",
-        url_to_redirect: "url"
+        label: 'some alternative',
+        url_to_redirect: 'url'
       }
     ],
     dismissed: false,
@@ -30,25 +30,25 @@ const notices: EnhancedNotice[] = [
     dislikes: 0,
     likes: 0,
     valid: true,
-    visibility: "public"
+    visibility: 'public'
   }
 ];
 
-storiesOf("screens/Notice/List", module)
+storiesOf('screens/Notice/List', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add("with 1 notification", () => (
+  .add('with 1 notification', () => (
     <List
-      close={action("close")}
-      dismiss={action("dismiss")}
-      undismiss={action("undismiss")}
+      close={action('close')}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
       notices={notices}
     />
   ))
-  .add("empty list", () => (
+  .add('empty list', () => (
     <List
-      close={action("close")}
-      dismiss={action("dismiss")}
-      undismiss={action("undismiss")}
+      close={action('close')}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
       notices={[]}
     />
   ));
diff --git a/src/app/content/App/Notice/List/NoNotice/Illustration.js b/src/app/content/App/Notice/List/NoNotice/Illustration.js
index 5435e9c97..7225f4ee0 100644
--- a/src/app/content/App/Notice/List/NoNotice/Illustration.js
+++ b/src/app/content/App/Notice/List/NoNotice/Illustration.js
@@ -36,7 +36,8 @@ export default () => (
       />
       <path
         d="M3.64 21.851a1.792 1.792 0 1 1-1.79-1.793 1.793 1.793 0 0 1 1.79 1.793z"
-        fill="#07c4ef" />
+        fill="#07c4ef"
+      />
       <circle
         cx="6.911"
         cy="6.911"
@@ -60,5 +61,4 @@ export default () => (
       />
     </g>
   </svg>
-
-);
\ No newline at end of file
+);
diff --git a/src/app/content/App/Notice/index.tsx b/src/app/content/App/Notice/index.tsx
index 1b9838f16..43cb85f60 100644
--- a/src/app/content/App/Notice/index.tsx
+++ b/src/app/content/App/Notice/index.tsx
@@ -1,7 +1,7 @@
-import React from "react";
-import { Route, RouteComponentProps, Switch } from "react-router-dom";
-import List from "./List";
-import Details from "./Details";
+import React from 'react';
+import { Route, RouteComponentProps, Switch } from 'react-router-dom';
+import List from './List';
+import Details from './Details';
 
 export default ({ match }: RouteComponentProps) => (
   <Switch>
diff --git a/src/app/content/App/Subscriptions/Illustration.js b/src/app/content/App/Subscriptions/Illustration.js
index 0022e8c91..38729d2b1 100644
--- a/src/app/content/App/Subscriptions/Illustration.js
+++ b/src/app/content/App/Subscriptions/Illustration.js
@@ -4,63 +4,79 @@ export default () => (
   <svg width="80.568" height="93.094">
     <defs>
       <clipPath id="a">
-        <path 
-          fill="none" 
-          stroke="#707070" 
+        <path
+          fill="none"
+          stroke="#707070"
           d="M31.957-8.872c5.788 0 14.029 1.85 35.574-4.222C69.054-9 
           80.568 35.076 80.568 40c0 22.091-18.476 40-40.568 40A40 40 0 0 1 0 40C0 17.909 9.866-8.872 
           31.957-8.872z"
-          transform="translate(1681.167 179)" />
+          transform="translate(1681.167 179)"
+        />
       </clipPath>
     </defs>
     <g transform="translate(-1681.167 -165.906)">
-      <circle cx="40" cy="40" r="40" fill="#e1f3f7" transform="translate(1681.167 179)" />
+      <circle
+        cx="40"
+        cy="40"
+        r="40"
+        fill="#e1f3f7"
+        transform="translate(1681.167 179)"
+      />
       <g clipPath="url(#a)">
-        <path 
-          fill="#004a7b" 
+        <path
+          fill="#004a7b"
           d="M1754.309 203.581l-17.092 59.606a7.109 7.109 0 0 1-8.804 
         4.88l-45.921-13.167a7.109 7.109 0 0 1-4.88-8.805l17.091-59.606a7.109 7.109 0 0 1 8.804-4.88l45.922 
-        13.168a7.109 7.109 0 0 1 4.88 8.804z" />
-        <path 
-          fill="#00345b" 
+        13.168a7.109 7.109 0 0 1 4.88 8.804z"
+        />
+        <path
+          fill="#00345b"
           d="M1754.305 203.58l-17.092 59.606a7.109 7.109 0 0 1-8.804 4.88l-22.957-6.583 21.016-73.29 22.96 
-          6.584a7.109 7.109 0 0 1 4.877 8.803z" />
-        <path 
-          fill="#e1f1fb" 
+          6.584a7.109 7.109 0 0 1 4.877 8.803z"
+        />
+        <path
+          fill="#e1f1fb"
           d="M1749.747 202.274l-17.092 59.606a2.35 2.35 0 0 1-2.935 1.627l-45.92-13.168a2.35 2.35 0 0 
-          1-1.628-2.935l17.092-59.606a2.35 2.35 0 0 1 2.935-1.627l45.92 13.168a2.35 2.35 0 0 1 1.628 2.935z" />
-        <path 
-          fill="#fff" 
+          1-1.628-2.935l17.092-59.606a2.35 2.35 0 0 1 2.935-1.627l45.92 13.168a2.35 2.35 0 0 1 1.628 2.935z"
+        />
+        <path
+          fill="#fff"
           d="M1749.747 202.274l-17.092 59.606a2.35 2.35 0 0 1-2.935 1.627l-22.96-6.584 18.4-64.168 22.96 
-          6.584a2.35 2.35 0 0 1 1.627 2.935z" />
-        <path 
-          fill="#17ace8" 
+          6.584a2.35 2.35 0 0 1 1.627 2.935z"
+        />
+        <path
+          fill="#17ace8"
           d="M1736.9 186.248l-18.247-5.232a7.118 7.118 0 0 0-3.924 13.684l18.246 5.232a7.118 7.118 0 1 0 
-          3.924-13.684z" />
-        <path 
-          fill="#66bd21" 
+          3.924-13.684z"
+        />
+        <path
+          fill="#66bd21"
           d="M1698.193 229.06a2.373 2.373 0 0 0 3.225.924l11.74-6.507a2.372 2.372 0 0 0-2.3-4.15l-9.664 
           5.357-2.105-3.794a2.372 2.372 0 0 0-4.15 2.3zM1705.626 237.575l-9.665 5.358-2.105-3.794a2.372 2.372 0
-           0 0-4.149 2.298l3.253 5.869a2.371 2.371 0 0 0 3.223.924l11.74-6.507a2.372 2.372 0 0 0-2.297-4.151z" />
-        <path 
-          fill="#fd3c65" 
+           0 0-4.149 2.298l3.253 5.869a2.371 2.371 0 0 0 3.223.924l11.74-6.507a2.372 2.372 0 0 0-2.297-4.151z"
+        />
+        <path
+          fill="#fd3c65"
           d="M1698.908 209.35a2.372 2.372 0 0 0 3.225.926l3.795-2.103 2.104 3.796a2.372 2.372 0 0 0 
           4.15-2.3l-2.104-3.796 3.796-2.104a2.372 2.372 0 1 0-2.3-4.15l-3.796 2.104-2.105-3.796a2.372 2.372 0 1
-           0-4.15 2.3l2.105 3.797-3.796 2.104a2.37 2.37 0 0 0-.924 3.223z" />
-        <path 
-          fill="#5b8ad6" 
+           0-4.15 2.3l2.105 3.797-3.796 2.104a2.37 2.37 0 0 0-.924 3.223z"
+        />
+        <path
+          fill="#5b8ad6"
           d="M1739.59 211.867l-9.274-2.66a2.373 2.373 0 0 1 1.308-4.56l9.275 2.66a2.373 2.373 0 1 1-1.308 
           4.56zM1736.975 220.99l-13.837-3.967a2.373 2.373 0 1 1 1.308-4.561l13.838 3.968a2.373 2.373 0 1 
           1-1.308 4.56zM1734.315 230.266l-9.275-2.66a2.373 2.373 0 1 1 1.308-4.561l9.275 2.66a2.373 2.373 0 1 
           1-1.308 4.56zM1731.699 239.39l-13.837-3.967a2.373 2.373 0 1 1 1.308-4.562l13.838 3.968a2.373 2.373 0 
           1 1-1.308 4.561zM1729.083 248.513l-9.275-2.66a2.373 2.373 0 1 1 1.307-4.56l9.276 2.66a2.373 2.373 0 1 
           1-1.308 4.56zM1726.467 257.637l-13.837-3.968a2.373 2.373 0 1 1 1.308-4.562l13.838 3.968a2.373 2.373 0 
-          0 1-1.308 4.562z" />
-        <path 
-          fill="#1689fc" 
+          0 1-1.308 4.562z"
+        />
+        <path
+          fill="#1689fc"
           d="M1741.78 195.052a7.109 7.109 0 0 1-8.805 4.88l-9.123-2.616 3.924-13.684 9.123 2.616a7.109 7.109 0 
-          0 1 4.88 8.804z" />
+          0 1 4.88 8.804z"
+        />
       </g>
     </g>
   </svg>
-);
\ No newline at end of file
+);
diff --git a/src/app/content/App/Subscriptions/Subscriptions.stories.tsx b/src/app/content/App/Subscriptions/Subscriptions.stories.tsx
index 19cb0a846..8920935b2 100644
--- a/src/app/content/App/Subscriptions/Subscriptions.stories.tsx
+++ b/src/app/content/App/Subscriptions/Subscriptions.stories.tsx
@@ -1,8 +1,8 @@
-import React from "react";
-import { MemoryRouter as Router } from "react-router-dom";
-import { storiesOf } from "@storybook/react";
-import Subscriptions from ".";
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import Subscriptions from '.';
 
-storiesOf("screens/Subscriptions", module)
+storiesOf('screens/Subscriptions', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add("normal", () => <Subscriptions />);
+  .add('normal', () => <Subscriptions />);
diff --git a/src/app/content/App/Subscriptions/index.tsx b/src/app/content/App/Subscriptions/index.tsx
index 421d5952c..1a9e0ca7e 100644
--- a/src/app/content/App/Subscriptions/index.tsx
+++ b/src/app/content/App/Subscriptions/index.tsx
@@ -1,9 +1,9 @@
-import React from "react";
-import Notification from "components/organisms/Notification";
-import BorderButton from "components/atoms/Buttons/BorderButton/BorderButton";
-import Illustration from "./Illustration";
-import Container from "./Container";
-import SubscriptionsData from "./SubscriptionsData";
+import React from 'react';
+import Notification from 'components/organisms/Notification';
+import BorderButton from 'components/atoms/Buttons/BorderButton/BorderButton';
+import Illustration from './Illustration';
+import Container from './Container';
+import SubscriptionsData from './SubscriptionsData';
 
 interface Props {
   close?: () => void;
diff --git a/src/app/content/App/index.tsx b/src/app/content/App/index.tsx
index a060ccc8a..633fe19fc 100644
--- a/src/app/content/App/index.tsx
+++ b/src/app/content/App/index.tsx
@@ -1,20 +1,20 @@
-import React from "react";
-import { Provider, connect } from "react-redux";
-import { Redirect, Route, Switch } from "react-router-dom";
-import { ConnectedRouter } from "connected-react-router/immutable";
-import { ThemeProvider, StyleSheetManager } from "styled-components";
-import theme from "../../theme";
-import store, { history, State } from "../store";
-import GlobalStyle from "../GlobalStyle";
-import Account from "./Account";
-import Error from "./Error";
-import Loading from "./Loading";
-import Notice from "./Notice";
-import Subscriptions from "./Subscriptions";
-import Help from "./Help";
-import { isOpen } from "../selectors";
+import React from 'react';
+import { Provider, connect } from 'react-redux';
+import { Redirect, Route, Switch } from 'react-router-dom';
+import { ConnectedRouter } from 'connected-react-router/immutable';
+import { ThemeProvider, StyleSheetManager } from 'styled-components';
+import theme from '../../theme';
+import store, { history, State } from '../store';
+import GlobalStyle from '../GlobalStyle';
+import Account from './Account';
+import Error from './Error';
+import Loading from './Loading';
+import Notice from './Notice';
+import Subscriptions from './Subscriptions';
+import Help from './Help';
+import { isOpen } from '../selectors';
 
-const DELAY_BEFORE_SHOWING = process.env.NODE_ENV === "production" ? 4000 : 10;
+const DELAY_BEFORE_SHOWING = process.env.NODE_ENV === 'production' ? 4000 : 10;
 
 const mapStateToProps = (state: State) => ({
   open: isOpen(state)
diff --git a/src/app/content/middlewares/index.js b/src/app/content/middlewares/index.js
index c64196908..affca6f41 100644
--- a/src/app/content/middlewares/index.js
+++ b/src/app/content/middlewares/index.js
@@ -1,5 +1,5 @@
-import { backgroundPublisher } from "./backgroundPublisher";
-import sagaMiddleware from "./saga";
+import { backgroundPublisher } from './backgroundPublisher';
+import sagaMiddleware from './saga';
 
 export { sagaMiddleware };
 
diff --git a/src/app/content/sagas/browserAction.js b/src/app/content/sagas/browserAction.js
index afae5101c..519987567 100644
--- a/src/app/content/sagas/browserAction.js
+++ b/src/app/content/sagas/browserAction.js
@@ -1,7 +1,7 @@
-import { put, takeLatest, select } from "redux-saga/effects";
-import { BROWSER_ACTION_CLICKED } from "../../constants/browser/action";
-import { open, close } from "app/actions/ui";
-import { isOpen as isNotificationOpen } from "../selectors";
+import { put, takeLatest, select } from 'redux-saga/effects';
+import { BROWSER_ACTION_CLICKED } from '../../constants/browser/action';
+import { open, close } from 'app/actions/ui';
+import { isOpen as isNotificationOpen } from '../selectors';
 
 export function* browserActionClickedSaga() {
   const isOpen = yield select(isNotificationOpen);
diff --git a/src/app/content/sagas/ui.tsx b/src/app/content/sagas/ui.tsx
index 5b62c31e6..2ad5029a0 100644
--- a/src/app/content/sagas/ui.tsx
+++ b/src/app/content/sagas/ui.tsx
@@ -1,26 +1,26 @@
-import React from "react";
-import { put, takeLatest, select, call } from "redux-saga/effects";
-import { render } from "react-dom";
-import { push } from "connected-react-router";
-import { open, opened, closed } from "app/actions/ui";
+import React from 'react';
+import { put, takeLatest, select, call } from 'redux-saga/effects';
+import { render } from 'react-dom';
+import { push } from 'connected-react-router';
+import { open, opened, closed } from 'app/actions/ui';
 import {
   isOpen as isNotificationOpen,
   isMounted as isNotificationMounted
-} from "../selectors";
-import { CLOSE, OPEN, NOTICES_FOUND } from "../../constants/ActionTypes";
-import { append, create } from "../extensionIframe";
-import theme from "../../theme";
-import App from "../App";
-import { State } from "../store";
+} from '../selectors';
+import { CLOSE, OPEN, NOTICES_FOUND } from '../../constants/ActionTypes';
+import { append, create } from '../extensionIframe';
+import theme from '../../theme';
+import App from '../App';
+import { State } from '../store';
 
 const iframe = create(theme.iframe.style);
 
 const getLocation = (state: State) => state.router.location.pathname;
 
 const setFrameImportant = () => {
-  const frame = document.querySelector("#lmemFrame");
+  const frame = document.querySelector('#lmemFrame');
   if (frame) {
-    (frame as HTMLIFrameElement).style.setProperty("display", "", "important");
+    (frame as HTMLIFrameElement).style.setProperty('display', '', 'important');
   }
 };
 
@@ -31,14 +31,14 @@ export function* openSaga() {
   if (!isOpen) {
     const location = yield select(getLocation);
     if (location) {
-      yield put(push("/"));
+      yield put(push('/'));
     }
 
     if (isMounted) {
       setFrameImportant();
     } else {
       const contentDocument = yield call(append, iframe);
-      const root = document.createElement("div");
+      const root = document.createElement('div');
       contentDocument.body.appendChild(root);
       const show = () =>
         render(<App contentDocument={contentDocument} />, root);
diff --git a/src/components/atoms/Buttons/AddNoticeLink/AddIcon.js b/src/components/atoms/Buttons/AddNoticeLink/AddIcon.js
index e65f2dfe3..b30b86f19 100644
--- a/src/components/atoms/Buttons/AddNoticeLink/AddIcon.js
+++ b/src/components/atoms/Buttons/AddNoticeLink/AddIcon.js
@@ -6,7 +6,7 @@ export default () => (
       d="M-1.566 1500.3c-.3.3-.3.7 0 1 .1.1.3.2.5.2h4.8v4.8c0 
       .4.3.7.7.7.2 0 .4-.1.5-.2.1-.1.2-.3.2-.5v-4.8h4.8c.4 0 
       .7-.2.8-.6 0-.4-.2-.7-.6-.8H5.234v-4.8c0-.4-.4-.7-.8-.6-.3 
-      0-.6.3-.6.6v4.8h-4.8c-.3 0-.5.1-.6.2z" />
+      0-.6.3-.6.6v4.8h-4.8c-.3 0-.5.1-.6.2z"
+    />
   </svg>
-
-);
\ No newline at end of file
+);
diff --git a/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.tsx b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.tsx
index 045e5fda1..6d4fa2b2f 100644
--- a/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.tsx
+++ b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.stories.tsx
@@ -1,7 +1,7 @@
-import React from "react";
-import { storiesOf } from "@storybook/react";
-import AddNoticeLink from "./AddNoticeLink";
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import AddNoticeLink from './AddNoticeLink';
 
-storiesOf("atoms/Buttons/AddNoticeLink", module).add("normal", () => (
+storiesOf('atoms/Buttons/AddNoticeLink', module).add('normal', () => (
   <AddNoticeLink />
 ));
diff --git a/src/components/atoms/Buttons/BorderButton/BorderButton.stories.tsx b/src/components/atoms/Buttons/BorderButton/BorderButton.stories.tsx
index 8d0c4d476..fa04edd56 100644
--- a/src/components/atoms/Buttons/BorderButton/BorderButton.stories.tsx
+++ b/src/components/atoms/Buttons/BorderButton/BorderButton.stories.tsx
@@ -1,12 +1,12 @@
-import React from "react";
-import { storiesOf } from "@storybook/react";
-import { withKnobs, text } from "@storybook/addon-knobs";
-import BorderButton from "./BorderButton";
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { withKnobs, text } from '@storybook/addon-knobs';
+import BorderButton from './BorderButton';
 
-storiesOf("atoms/Buttons/BorderButton", module)
+storiesOf('atoms/Buttons/BorderButton', module)
   .addDecorator(withKnobs)
-  .add("normal", () => (
+  .add('normal', () => (
     <BorderButton
-      dangerouslySetInnerHTML={{ __html: text("content", "Ajouter") }}
+      dangerouslySetInnerHTML={{ __html: text('content', 'Ajouter') }}
     />
   ));
diff --git a/src/components/atoms/Buttons/OpenButton/OpenButton.stories.tsx b/src/components/atoms/Buttons/OpenButton/OpenButton.stories.tsx
index 1476f192a..cc987c783 100644
--- a/src/components/atoms/Buttons/OpenButton/OpenButton.stories.tsx
+++ b/src/components/atoms/Buttons/OpenButton/OpenButton.stories.tsx
@@ -1,7 +1,7 @@
-import React from "react";
-import { storiesOf } from "@storybook/react";
-import OpenButton from "./OpenButton";
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import OpenButton from './OpenButton';
 
-storiesOf("atoms/Buttons/OpenButton", module).add("normal", () => (
+storiesOf('atoms/Buttons/OpenButton', module).add('normal', () => (
   <OpenButton />
 ));
diff --git a/src/components/atoms/ContentTitle/ContentTitle.stories.tsx b/src/components/atoms/ContentTitle/ContentTitle.stories.tsx
index 16a8f2c1b..3fbcc12c1 100644
--- a/src/components/atoms/ContentTitle/ContentTitle.stories.tsx
+++ b/src/components/atoms/ContentTitle/ContentTitle.stories.tsx
@@ -1,8 +1,8 @@
-import { storiesOf } from "@storybook/react";
-import { withKnobs, text } from "@storybook/addon-knobs";
-import React from "react";
-import ContentTitle from ".";
+import { storiesOf } from '@storybook/react';
+import { withKnobs, text } from '@storybook/addon-knobs';
+import React from 'react';
+import ContentTitle from '.';
 
-storiesOf("atoms/ContentTitle", module)
+storiesOf('atoms/ContentTitle', module)
   .addDecorator(withKnobs)
-  .add("normal", () => <ContentTitle>{text("title", "Title")}</ContentTitle>);
+  .add('normal', () => <ContentTitle>{text('title', 'Title')}</ContentTitle>);
diff --git a/src/components/atoms/Forms/Textarea/Textarea.stories.tsx b/src/components/atoms/Forms/Textarea/Textarea.stories.tsx
index 8d1551bde..c05efa749 100644
--- a/src/components/atoms/Forms/Textarea/Textarea.stories.tsx
+++ b/src/components/atoms/Forms/Textarea/Textarea.stories.tsx
@@ -1,5 +1,5 @@
-import React from "react";
-import { storiesOf } from "@storybook/react";
-import Textarea from "./Textarea";
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import Textarea from './Textarea';
 
-storiesOf("atoms/Forms/Textarea", module).add("normal", () => <Textarea />);
+storiesOf('atoms/Forms/Textarea', module).add('normal', () => <Textarea />);
diff --git a/src/components/atoms/Time.tsx b/src/components/atoms/Time.tsx
index e80ff4300..cba641a5f 100644
--- a/src/components/atoms/Time.tsx
+++ b/src/components/atoms/Time.tsx
@@ -1,5 +1,5 @@
-import React from "react";
-import formatLocaleDate from "../../app/utils/formatLocaleDate";
+import React from 'react';
+import formatLocaleDate from '../../app/utils/formatLocaleDate';
 
 interface Props {
   children: Date;
diff --git a/src/components/atoms/Truncated.tsx b/src/components/atoms/Truncated.tsx
index 89615f49b..fa77e86a2 100644
--- a/src/components/atoms/Truncated.tsx
+++ b/src/components/atoms/Truncated.tsx
@@ -1,5 +1,5 @@
-import React, { Fragment } from "react";
-import truncate from "../../app/utils/truncate";
+import React, { Fragment } from 'react';
+import truncate from '../../app/utils/truncate';
 
 interface Props {
   children: string;
@@ -15,7 +15,7 @@ const Truncated = ({ numberOfCharacters, preserveWords, children }: Props) => (
 );
 
 Truncated.defaultProps = {
-  children: "",
+  children: '',
   preserveWords: true
 };
 
diff --git a/src/components/atoms/icons/Arrow.js b/src/components/atoms/icons/Arrow.js
index 49626752c..ae7fdde9a 100644
--- a/src/components/atoms/icons/Arrow.js
+++ b/src/components/atoms/icons/Arrow.js
@@ -2,13 +2,13 @@ import React from 'react';
 
 export default () => (
   <svg width="7" height="12">
-    <path 
-      fill="none" 
-      fillRule="evenodd" 
-      strokeLinecap="round" 
-      strokeLinejoin="round" 
-      strokeWidth="2" 
-      d="M6.046 1L1 6.046 6.046 11" />
+    <path
+      fill="none"
+      fillRule="evenodd"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      strokeWidth="2"
+      d="M6.046 1L1 6.046 6.046 11"
+    />
   </svg>
-
-);
\ No newline at end of file
+);
diff --git a/src/components/atoms/icons/Close.js b/src/components/atoms/icons/Close.js
index 49e4c47b7..0f8dedf79 100644
--- a/src/components/atoms/icons/Close.js
+++ b/src/components/atoms/icons/Close.js
@@ -1,12 +1,11 @@
 import React from 'react';
 
 export default () => (
-  <svg 
-    width="13.233" 
-    height="13.203">
-    <path 
+  <svg width="13.233" height="13.203">
+    <path
       d="M1.007 0A1.006 1.006 0 0 0 .3 1.718L5.191 6.6.319 11.462a1.006 1.006 0 0 0 .712 1.717 
       1 1 0 0 0 .712-.294l4.874-4.862 4.9 4.885a1.007 1.007 0 1 0 1.424-1.423L8.042 6.6l4.872-4.86A1.007 
-      1.007 0 0 0 11.491.318L6.617 5.18 1.719.294A1 1 0 0 0 1.007 0z" />
+      1.007 0 0 0 11.491.318L6.617 5.18 1.719.294A1 1 0 0 0 1.007 0z"
+    />
   </svg>
-);
\ No newline at end of file
+);
diff --git a/src/components/atoms/icons/types/Alternative.tsx b/src/components/atoms/icons/types/Alternative.tsx
index bb141339f..987a3ae58 100644
--- a/src/components/atoms/icons/types/Alternative.tsx
+++ b/src/components/atoms/icons/types/Alternative.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React from 'react';
 
 export default () => (
   <svg width="27.432" height="20.971" viewBox="0 0 27 21">
diff --git a/src/components/atoms/icons/types/Dislike.tsx b/src/components/atoms/icons/types/Dislike.tsx
index 41cc7fab6..616e8d91e 100644
--- a/src/components/atoms/icons/types/Dislike.tsx
+++ b/src/components/atoms/icons/types/Dislike.tsx
@@ -1,13 +1,13 @@
-import React from "react";
-import { withTheme } from "styled-components";
-import { Theme } from "app/theme";
+import React from 'react';
+import { withTheme } from 'styled-components';
+import { Theme } from 'app/theme';
 
 interface Props {
   active?: boolean;
   theme: Theme;
 }
 const Dislike = ({ active, theme }: Props) => {
-  const stroke = !active ? theme.secondaryColor : "#fff";
+  const stroke = !active ? theme.secondaryColor : '#fff';
   const fill = active ? theme.secondaryColor : undefined;
 
   return (
diff --git a/src/components/atoms/icons/types/Like.tsx b/src/components/atoms/icons/types/Like.tsx
index f33486c60..1197a7a96 100644
--- a/src/components/atoms/icons/types/Like.tsx
+++ b/src/components/atoms/icons/types/Like.tsx
@@ -1,13 +1,13 @@
-import React from "react";
-import { withTheme } from "styled-components";
-import { Theme } from "app/theme";
+import React from 'react';
+import { withTheme } from 'styled-components';
+import { Theme } from 'app/theme';
 
 interface Props {
   active?: boolean;
   theme: Theme;
 }
 const Like = ({ active, theme }: Props) => {
-  const stroke = !active ? theme.secondaryColor : "#fff";
+  const stroke = !active ? theme.secondaryColor : '#fff';
   const fill = active ? theme.secondaryColor : undefined;
 
   return (
diff --git a/src/components/atoms/icons/types/Other.tsx b/src/components/atoms/icons/types/Other.tsx
index 6b8a08409..0ccb734b1 100644
--- a/src/components/atoms/icons/types/Other.tsx
+++ b/src/components/atoms/icons/types/Other.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React from 'react';
 
 export default () => (
   <svg width="28.809" height="28.809" viewBox="0 0 28.809 28.809">
diff --git a/src/components/atoms/icons/types/Tip.tsx b/src/components/atoms/icons/types/Tip.tsx
index 9290d4278..27f2d9be0 100644
--- a/src/components/atoms/icons/types/Tip.tsx
+++ b/src/components/atoms/icons/types/Tip.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React from 'react';
 
 export default () => (
   <svg width="11.453" height="24.922" viewBox=" 0 0 11.453 24.922">
diff --git a/src/components/molecules/Type/Type.stories.tsx b/src/components/molecules/Type/Type.stories.tsx
index 6977a8688..11696b687 100644
--- a/src/components/molecules/Type/Type.stories.tsx
+++ b/src/components/molecules/Type/Type.stories.tsx
@@ -1,13 +1,13 @@
-import React from "react";
-import { MemoryRouter as Router } from "react-router-dom";
-import { storiesOf } from "@storybook/react";
-import Type from "./Type";
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import Type from './Type';
 
-storiesOf("molecules/Type", module)
+storiesOf('molecules/Type', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add("approval", () => <Type type="Approval" />)
-  .add("disapproval", () => <Type type="Disapproval" />)
-  .add("alternative", () => <Type type="Alternative" />)
-  .add("tip", () => <Type type="Tip" />)
-  .add("other", () => <Type type="Other" />)
-  .add("undefined / unknown ", () => <Type />);
+  .add('approval', () => <Type type="Approval" />)
+  .add('disapproval', () => <Type type="Disapproval" />)
+  .add('alternative', () => <Type type="Alternative" />)
+  .add('tip', () => <Type type="Tip" />)
+  .add('other', () => <Type type="Other" />)
+  .add('undefined / unknown ', () => <Type />);
diff --git a/src/components/molecules/Type/Type.tsx b/src/components/molecules/Type/Type.tsx
index 529e6bc9f..0ff3c42b7 100644
--- a/src/components/molecules/Type/Type.tsx
+++ b/src/components/molecules/Type/Type.tsx
@@ -1,9 +1,9 @@
-import React from "react";
-import { withTheme } from "styled-components";
-import Background from "./Background";
-import noticeTypeIcons from "../../atoms/icons/types";
-import { Theme } from "app/theme";
-import { getTypeOrFallback, NoticeType } from "app/lmem/noticeType";
+import React from 'react';
+import { withTheme } from 'styled-components';
+import Background from './Background';
+import noticeTypeIcons from '../../atoms/icons/types';
+import { Theme } from 'app/theme';
+import { getTypeOrFallback, NoticeType } from 'app/lmem/noticeType';
 
 interface Style {
   background: string;
diff --git a/src/components/organisms/Notice/Content.tsx b/src/components/organisms/Notice/Content.tsx
index 62ccab069..308446783 100644
--- a/src/components/organisms/Notice/Content.tsx
+++ b/src/components/organisms/Notice/Content.tsx
@@ -1,7 +1,7 @@
-import React, { ReactNode } from "react";
-import styled from "styled-components";
-import { Link } from "react-router-dom";
-import { LocationDescriptor } from "history";
+import React, { ReactNode } from 'react';
+import styled from 'styled-components';
+import { Link } from 'react-router-dom';
+import { LocationDescriptor } from 'history';
 
 interface ContentProps {
   to?: LocationDescriptor;
@@ -39,7 +39,7 @@ export default styled(Content)`
     width: 245px;
   }
 
-  & [class^="OpenButton"] {
+  & [class^='OpenButton'] {
     height: auto;
   }
 
diff --git a/src/components/organisms/Notice/DeleteIcon.js b/src/components/organisms/Notice/DeleteIcon.js
index c6a24e159..918dd9003 100644
--- a/src/components/organisms/Notice/DeleteIcon.js
+++ b/src/components/organisms/Notice/DeleteIcon.js
@@ -3,8 +3,6 @@ import React from 'react';
 
 export default () => (
   <svg viewBox="0 0 13.233 13.203">
-    <path
-      d="M1.007 0A1.006 1.006 0 0 0 .3 1.718L5.191 6.6.319 11.462a1.006 1.006 0 0 0 .712 1.717 1 1 0 0 0 .712-.294l4.874-4.862 4.9 4.885a1.007 1.007 0 1 0 1.424-1.423L8.042 6.6l4.872-4.86A1.007 1.007 0 0 0 11.491.318L6.617 5.18 1.719.294A1 1 0 0 0 1.007 0z"
-    />
+    <path d="M1.007 0A1.006 1.006 0 0 0 .3 1.718L5.191 6.6.319 11.462a1.006 1.006 0 0 0 .712 1.717 1 1 0 0 0 .712-.294l4.874-4.862 4.9 4.885a1.007 1.007 0 1 0 1.424-1.423L8.042 6.6l4.872-4.86A1.007 1.007 0 0 0 11.491.318L6.617 5.18 1.719.294A1 1 0 0 0 1.007 0z" />
   </svg>
-);
\ No newline at end of file
+);
diff --git a/src/components/organisms/Notice/Notice.stories.tsx b/src/components/organisms/Notice/Notice.stories.tsx
index c2045fdea..403897a19 100644
--- a/src/components/organisms/Notice/Notice.stories.tsx
+++ b/src/components/organisms/Notice/Notice.stories.tsx
@@ -1,102 +1,104 @@
-import React from "react";
-import { MemoryRouter as Router } from "react-router-dom";
-import { storiesOf } from "@storybook/react";
-import { action } from "@storybook/addon-actions";
-import Notice from "./Notice";
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import Notice from './Notice';
 
 const message = '<p>Description with a <a href="http://some.url">link</a></p>';
 
-storiesOf("organisms/Notice", module)
+storiesOf('organisms/Notice', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add("Approval", () => (
+  .add('Approval', () => (
     <Notice
       type="Approval"
       contributor="Jalil"
       id={123}
       message={message}
-      dismiss={action("dismiss")}
-      undismiss={action("undismiss")}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
       dismissed={false}
       disliked={false}
     />
   ))
-  .add("Disapproval", () => (
+  .add('Disapproval', () => (
     <Notice
       type="Disapproval"
       contributor="Jalil"
       id={123}
       message={message}
-      dismiss={action("dismiss")}
-      undismiss={action("undismiss")}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
       dismissed={false}
       disliked={false}
     />
   ))
-  .add("Tip", () => (
+  .add('Tip', () => (
     <Notice
       type="Tip"
       contributor="Jalil"
       id={123}
       message={message}
-      dismiss={action("dismiss")}
-      undismiss={action("undismiss")}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
       dismissed={false}
       disliked={false}
     />
   ))
-  .add("Other", () => (
+  .add('Other', () => (
     <Notice
       type="Other"
       contributor="Jalil"
       id={123}
       message={message}
-      dismiss={action("dismiss")}
-      undismiss={action("undismiss")}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
       dismissed={false}
       disliked={false}
     />
   ))
-  .add("No type", () => (
+  .add('No type', () => (
     <Notice
       contributor="Jalil"
       id={123}
       message={message}
-      dismiss={action("dismiss")}
-      undismiss={action("undismiss")}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
       dismissed={false}
       disliked={false}
     />
   ))
-  .add("Undefined type", () => (
+  .add('Undefined type', () => (
     <Notice
       type={undefined}
       contributor="Jalil"
       id={123}
       message={message}
-      dismiss={action("dismiss")}
-      undismiss={action("undismiss")}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
       dismissed={false}
       disliked={false}
     />
   ))
-  .add("dismissed", () => (
+  .add('dismissed', () => (
     <Notice
       contributor="Jalil"
       id={123}
       message={message}
-      dismiss={action("dismiss")}
-      undismiss={action("undismiss")}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
       dismissed
       disliked={false}
     />
   ))
-  .add("with long title", () => (
+  .add('with long title', () => (
     <Notice
       contributor="Jalil"
       id={123}
-      message='<p>This is very long title for a notification with a <a href="http://some.url">link</a> that you may want to read some time in the future</p>'
-      dismiss={action("dismiss")}
-      undismiss={action("undismiss")}
+      message={
+        '<p>This is very long title for a notification with a <a href="http://some.url">link</a> that you may want to read some time in the future</p>'
+      }
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
       dismissed={false}
       disliked={false}
     />
diff --git a/src/components/organisms/Notice/Title.tsx b/src/components/organisms/Notice/Title.tsx
index 081cff88d..a991b6a96 100644
--- a/src/components/organisms/Notice/Title.tsx
+++ b/src/components/organisms/Notice/Title.tsx
@@ -1,6 +1,6 @@
-import React from "react";
-import styled from "styled-components";
-import Truncated from "../../atoms/Truncated";
+import React from 'react';
+import styled from 'styled-components';
+import Truncated from '../../atoms/Truncated';
 
 export const TitleContainer = styled.p`
   display: inline;
diff --git a/src/components/organisms/Notice/index.js b/src/components/organisms/Notice/index.js
index 83932b27f..7e96ff30c 100644
--- a/src/components/organisms/Notice/index.js
+++ b/src/components/organisms/Notice/index.js
@@ -1,3 +1,3 @@
-export { default as Container } from "./Container";
-export { default as Content } from "./Content";
-export { default as Deleted } from "./Deleted";
+export { default as Container } from './Container';
+export { default as Content } from './Content';
+export { default as Deleted } from './Deleted';
diff --git a/src/components/organisms/NoticeDetails/Message.tsx b/src/components/organisms/NoticeDetails/Message.tsx
index 5924b8788..5e7b4b041 100644
--- a/src/components/organisms/NoticeDetails/Message.tsx
+++ b/src/components/organisms/NoticeDetails/Message.tsx
@@ -1,5 +1,5 @@
-import React from "react";
-import styled from "styled-components";
+import React from 'react';
+import styled from 'styled-components';
 
 const MessageBlock = styled.div`
   p {
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
index 2def4f7b5..bfe121b0a 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
@@ -1,17 +1,17 @@
-import React from "react";
-import { MemoryRouter as Router } from "react-router-dom";
-import { storiesOf } from "@storybook/react";
-import { action } from "@storybook/addon-actions";
-import NoticeDetails from "./NoticeDetails";
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import NoticeDetails from './NoticeDetails';
 
 const message = `
 <p> Un message qui décrit <a href="http://www.lmem.net">quelque chose</a> et donc ça prend beaucoup de mots. </p>
 <p>Il peut aussi y avoir plusieurs paragraphes, <a href="http://www.lmem.net">avec encore des liens</a></p>
 `;
 
-storiesOf("organisms/NoticeDetails", module)
+storiesOf('organisms/NoticeDetails', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add("Approval", () => (
+  .add('Approval', () => (
     <NoticeDetails
       type="Approval"
       contributor="Jalil"
@@ -19,13 +19,13 @@ storiesOf("organisms/NoticeDetails", module)
       message={message}
       date="12/12/2042"
       source="http://www.lmem.net"
-      like={action("like")}
-      unlike={action("unlike")}
-      dislike={action("dislike")}
-      undislike={action("undislike")}
+      like={action('like')}
+      unlike={action('unlike')}
+      dislike={action('dislike')}
+      undislike={action('undislike')}
     />
   ))
-  .add("Dismissed", () => (
+  .add('Dismissed', () => (
     <NoticeDetails
       type="Approval"
       dismissed
@@ -34,13 +34,13 @@ storiesOf("organisms/NoticeDetails", module)
       message={message}
       date="12/12/2042"
       source="http://www.lmem.net"
-      like={action("like")}
-      unlike={action("unlike")}
-      dislike={action("dislike")}
-      undislike={action("undislike")}
+      like={action('like')}
+      unlike={action('unlike')}
+      dislike={action('dislike')}
+      undislike={action('undislike')}
     />
   ))
-  .add("Disliked", () => (
+  .add('Disliked', () => (
     <NoticeDetails
       type="Approval"
       disliked
@@ -49,9 +49,9 @@ storiesOf("organisms/NoticeDetails", module)
       message={message}
       date="12/12/2042"
       source="http://www.lmem.net"
-      like={action("like")}
-      unlike={action("unlike")}
-      dislike={action("dislike")}
-      undislike={action("undislike")}
+      like={action('like')}
+      unlike={action('unlike')}
+      dislike={action('dislike')}
+      undislike={action('undislike')}
     />
   ));
diff --git a/src/components/organisms/NoticeDetails/Source/AnchorIcon.js b/src/components/organisms/NoticeDetails/Source/AnchorIcon.js
index 6e04ecaba..0b6834a09 100644
--- a/src/components/organisms/NoticeDetails/Source/AnchorIcon.js
+++ b/src/components/organisms/NoticeDetails/Source/AnchorIcon.js
@@ -9,7 +9,7 @@ export default () => (
       0 0-2.934 0l-4.418 4.414a2.077 2.077 0 1 0 2.937 2.937l2.612-2.615a.346.346 0 0 1 .377-.076 
       5.823 5.823 0 0 0 2.214.429h.138a.346.346 0 0 1 .246.592l-3.632 3.632a4.812 4.812 0 0 1-3.421 1.408z"
     />
-    <path 
+    <path
       fill="#404348"
       d="M11.531 14.087h-.263a4.8 4.8 0 0 1-.515-.048 5.867 5.867 0 0 
       1-.419-.086l-.2-.055c-.073-.021-.149-.045-.221-.073s-.149-.052-.221-.083-.145-.059-.218-.093a4.8 
@@ -20,5 +20,4 @@ export default () => (
       1.273h-.053l-.2.041-.111.021-.239.035h-.118c-.09 0-.17.017-.246.021z"
     />
   </svg>
-
-);
\ No newline at end of file
+);
diff --git a/src/components/organisms/NoticeDetails/Source/SourceURL.tsx b/src/components/organisms/NoticeDetails/Source/SourceURL.tsx
index 60526e2f3..7bf807651 100644
--- a/src/components/organisms/NoticeDetails/Source/SourceURL.tsx
+++ b/src/components/organisms/NoticeDetails/Source/SourceURL.tsx
@@ -1,5 +1,5 @@
-import React from "react";
-import Container from "./Container";
+import React from 'react';
+import Container from './Container';
 
 interface Props {
   children: string;
diff --git a/src/components/organisms/Notification/Notification.stories.tsx b/src/components/organisms/Notification/Notification.stories.tsx
index 814ecfed4..14ec38c64 100644
--- a/src/components/organisms/Notification/Notification.stories.tsx
+++ b/src/components/organisms/Notification/Notification.stories.tsx
@@ -1,30 +1,30 @@
-import React from "react";
-import { MemoryRouter as Router } from "react-router-dom";
-import { storiesOf } from "@storybook/react";
-import { action } from "@storybook/addon-actions";
-import Notification from ".";
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import Notification from '.';
 
-storiesOf("organisms/Notification", module)
-  .add("normal", () => (
+storiesOf('organisms/Notification', module)
+  .add('normal', () => (
     <Router>
       <Notification />
     </Router>
   ))
-  .add("with title", () => (
+  .add('with title', () => (
     <Router>
       <Notification title="Notification title" />
     </Router>
   ))
-  .add("with long title", () => (
+  .add('with long title', () => (
     <Router>
       <Notification title="Very long notification title, it should break" />
     </Router>
   ))
-  .add("with nav", () => (
-    <Router initialIndex={2} initialEntries={["/path", "/pass"]}>
+  .add('with nav', () => (
+    <Router initialIndex={2} initialEntries={['/path', '/pass']}>
       <Notification
         title="Very long notification title, it should break"
-        onBack={action("handleGoBack")}
+        onBack={action('handleGoBack')}
       />
     </Router>
   ));
diff --git a/src/components/organisms/Notification/NotificationFooter/AccountIcon.js b/src/components/organisms/Notification/NotificationFooter/AccountIcon.js
index aa331e230..ec29b7cdc 100644
--- a/src/components/organisms/Notification/NotificationFooter/AccountIcon.js
+++ b/src/components/organisms/Notification/NotificationFooter/AccountIcon.js
@@ -3,8 +3,6 @@ import React from 'react';
 
 export default () => (
   <svg viewBox="0 0 24.715 28.008">
-    <path
-      d="M24.713 21.79v-.01-.1-.068c-.034-1.133-.125-4.141-2.931-5.1l-.063-.019-.032-.003a23.323 23.323 0 0 1-4.942-2.274c.045-.048.09-.1.134-.146 2.328-2.625 1.987-7.021 1.933-7.574-.158-3.3-1.739-4.875-3.038-5.618A6.908 6.908 0 0 0 12.426 0h-.1a6.9 6.9 0 0 0-3.339.852c-1.321.746-2.922 2.33-3.079 5.638-.053.553-.393 4.95 1.933 7.573.048.055.1.108.148.16a24.57 24.57 0 0 1-4.952 2.253 1.153 1.153 0 0 0-.084.024h-.014c-2.807.963-2.9 3.966-2.932 5.105v.104a.458.458 0 0 0 0 .056v.009a9.154 9.154 0 0 0 .325 2.8 1.193 1.193 0 0 0 .481.586 22.468 22.468 0 0 0 11.554 2.848 22.489 22.489 0 0 0 11.561-2.844 1.234 1.234 0 0 0 .479-.586 9.57 9.57 0 0 0 .306-2.788zM8.369 6.643c.168-3.623 2.547-4.163 3.95-4.163h.059c1.719.039 3.8.792 3.96 4.158a.56.56 0 0 0 .011.117c.031.348.291 3.856-1.323 5.674a3.324 3.324 0 0 1-2.639 1.086h-.053a3.348 3.348 0 0 1-2.647-1.087c-1.681-1.889-1.335-5.608-1.326-5.7v-.011a.487.487 0 0 0 .008-.074zm2.018 9.061a6.8 6.8 0 0 0 1.875.286h.193a6.736 6.736 0 0 0 1.907-.3 30.97 30.97 0 0 0 6.656 3.177c.954.351 1.175 1.34 1.221 2.818 0 .05 0 .1.006.165a11.68 11.68 0 0 1-.08 1.472 21.017 21.017 0 0 1-9.805 2.213 21.135 21.135 0 0 1-9.811-2.22 10.517 10.517 0 0 1-.078-1.5v-.042-.1c.047-1.478.268-2.468 1.221-2.818a32.175 32.175 0 0 0 6.695-3.151z" />
+    <path d="M24.713 21.79v-.01-.1-.068c-.034-1.133-.125-4.141-2.931-5.1l-.063-.019-.032-.003a23.323 23.323 0 0 1-4.942-2.274c.045-.048.09-.1.134-.146 2.328-2.625 1.987-7.021 1.933-7.574-.158-3.3-1.739-4.875-3.038-5.618A6.908 6.908 0 0 0 12.426 0h-.1a6.9 6.9 0 0 0-3.339.852c-1.321.746-2.922 2.33-3.079 5.638-.053.553-.393 4.95 1.933 7.573.048.055.1.108.148.16a24.57 24.57 0 0 1-4.952 2.253 1.153 1.153 0 0 0-.084.024h-.014c-2.807.963-2.9 3.966-2.932 5.105v.104a.458.458 0 0 0 0 .056v.009a9.154 9.154 0 0 0 .325 2.8 1.193 1.193 0 0 0 .481.586 22.468 22.468 0 0 0 11.554 2.848 22.489 22.489 0 0 0 11.561-2.844 1.234 1.234 0 0 0 .479-.586 9.57 9.57 0 0 0 .306-2.788zM8.369 6.643c.168-3.623 2.547-4.163 3.95-4.163h.059c1.719.039 3.8.792 3.96 4.158a.56.56 0 0 0 .011.117c.031.348.291 3.856-1.323 5.674a3.324 3.324 0 0 1-2.639 1.086h-.053a3.348 3.348 0 0 1-2.647-1.087c-1.681-1.889-1.335-5.608-1.326-5.7v-.011a.487.487 0 0 0 .008-.074zm2.018 9.061a6.8 6.8 0 0 0 1.875.286h.193a6.736 6.736 0 0 0 1.907-.3 30.97 30.97 0 0 0 6.656 3.177c.954.351 1.175 1.34 1.221 2.818 0 .05 0 .1.006.165a11.68 11.68 0 0 1-.08 1.472 21.017 21.017 0 0 1-9.805 2.213 21.135 21.135 0 0 1-9.811-2.22 10.517 10.517 0 0 1-.078-1.5v-.042-.1c.047-1.478.268-2.468 1.221-2.818a32.175 32.175 0 0 0 6.695-3.151z" />
   </svg>
-
-);
\ No newline at end of file
+);
diff --git a/src/components/organisms/Notification/NotificationFooter/BubbleIcon.js b/src/components/organisms/Notification/NotificationFooter/BubbleIcon.js
index 80a621af2..7e0af69c1 100644
--- a/src/components/organisms/Notification/NotificationFooter/BubbleIcon.js
+++ b/src/components/organisms/Notification/NotificationFooter/BubbleIcon.js
@@ -5,9 +5,7 @@ export default () => (
   <svg viewBox="0 0 27.621 25.227">
     <defs />
     <g transform="translate(.48)">
-      <path
-        d="M23.571 0H13.358a3.6 3.6 0 0 0-3.619 3.573V7.7H3.128A3.607 3.607 0 0 0-.48 11.3v7.5a3.59 3.59 0 0 0 3.608 3.563h9.252l2.817 2.584a1.038 1.038 0 0 0 .7.279.993.993 0 0 0 .413-.085 1.031 1.031 0 0 0 .61-.941v-7.849a1.037 1.037 0 0 0-2.073 0v5.489l-1.373-1.265a1.037 1.037 0 0 0-.694-.285H3.128a1.515 1.515 0 0 1-1.535-1.49v-7.5a1.531 1.531 0 0 1 1.535-1.524h6.611v6.7a1.052 1.052 0 0 0 1.756.766l2.446-2.229.083-.076.093-.084.209-.19H23.571a3.583 3.583 0 0 0 3.57-3.588v-7.5A3.576 3.576 0 0 0 23.571 0zm1.5 3.573v7.5a1.507 1.507 0 0 1-1.5 1.514h-9.033a2.027 2.027 0 0 0-1.825.735c-.02.019-.044.038-.068.057s-.076.063-.111.1l-.721.652V3.573a1.525 1.525 0 0 1 1.546-1.5h10.212a1.482 1.482 0 0 1 1.497 1.5z"
-      />
+      <path d="M23.571 0H13.358a3.6 3.6 0 0 0-3.619 3.573V7.7H3.128A3.607 3.607 0 0 0-.48 11.3v7.5a3.59 3.59 0 0 0 3.608 3.563h9.252l2.817 2.584a1.038 1.038 0 0 0 .7.279.993.993 0 0 0 .413-.085 1.031 1.031 0 0 0 .61-.941v-7.849a1.037 1.037 0 0 0-2.073 0v5.489l-1.373-1.265a1.037 1.037 0 0 0-.694-.285H3.128a1.515 1.515 0 0 1-1.535-1.49v-7.5a1.531 1.531 0 0 1 1.535-1.524h6.611v6.7a1.052 1.052 0 0 0 1.756.766l2.446-2.229.083-.076.093-.084.209-.19H23.571a3.583 3.583 0 0 0 3.57-3.588v-7.5A3.576 3.576 0 0 0 23.571 0zm1.5 3.573v7.5a1.507 1.507 0 0 1-1.5 1.514h-9.033a2.027 2.027 0 0 0-1.825.735c-.02.019-.044.038-.068.057s-.076.063-.111.1l-.721.652V3.573a1.525 1.525 0 0 1 1.546-1.5h10.212a1.482 1.482 0 0 1 1.497 1.5z" />
       <circle
         cx=".657"
         cy=".657"
@@ -41,4 +39,4 @@ export default () => (
       />
     </g>
   </svg>
-);
\ No newline at end of file
+);
diff --git a/src/components/organisms/Notification/NotificationFooter/CheckListIcon.js b/src/components/organisms/Notification/NotificationFooter/CheckListIcon.js
index d018bffb9..950c7825a 100644
--- a/src/components/organisms/Notification/NotificationFooter/CheckListIcon.js
+++ b/src/components/organisms/Notification/NotificationFooter/CheckListIcon.js
@@ -4,22 +4,20 @@ import React from 'react';
 export default () => (
   <svg viewBox="0 0 25.665 25.059">
     <defs />
-    <g
-      transform="translate(-.176)">
+    <g transform="translate(-.176)">
       <circle
         cx="2.192"
         cy="2.192"
         r="2.192"
-        transform="translate(2.12 11.049)" />
+        transform="translate(2.12 11.049)"
+      />
       <circle
         cx="2.204"
         cy="2.204"
         r="2.204"
-        transform="translate(2.108 20.65)" />
-      <path
-        d="M3.265 3.593l-1.51-1.522L.176 3.644 1.692 5.16l1.567 1.579 1.574-1.567 3.615-3.593L6.876 0zM10.592 22.096h15.249v1.788H10.592zM10.592 12.471h8.642v1.788h-8.642zM10.592 2.848h12.606v1.788H10.592z"
+        transform="translate(2.108 20.65)"
       />
+      <path d="M3.265 3.593l-1.51-1.522L.176 3.644 1.692 5.16l1.567 1.579 1.574-1.567 3.615-3.593L6.876 0zM10.592 22.096h15.249v1.788H10.592zM10.592 12.471h8.642v1.788h-8.642zM10.592 2.848h12.606v1.788H10.592z" />
     </g>
   </svg>
-
-);
\ No newline at end of file
+);
diff --git a/src/components/organisms/Notification/NotificationFooter/HelpIcon.js b/src/components/organisms/Notification/NotificationFooter/HelpIcon.js
index 031a72386..a8876fa38 100644
--- a/src/components/organisms/Notification/NotificationFooter/HelpIcon.js
+++ b/src/components/organisms/Notification/NotificationFooter/HelpIcon.js
@@ -3,8 +3,6 @@ import React from 'react';
 
 export default () => (
   <svg viewBox="0 0 27.807 27.807">
-    <path 
-      d="M13.9 0a13.9 13.9 0 1 0 13.9 13.9A13.9 13.9 0 0 0 13.9 0zm0 25.634A11.731 11.731 0 1 1 25.634 13.9 11.724 11.724 0 0 1 13.9 25.634zm4.345-14.31a4.352 4.352 0 0 1-3.259 4.207V17.3a1.086 1.086 0 0 1-2.172 0v-2.718A1.086 1.086 0 0 1 13.9 13.5a2.172 2.172 0 1 0-2.172-2.172 1.086 1.086 0 0 1-2.172 0 4.345 4.345 0 1 1 8.689 0zm-2.987 9.233A1.358 1.358 0 1 1 13.9 19.2a1.358 1.358 0 0 1 1.361 1.356z" />
+    <path d="M13.9 0a13.9 13.9 0 1 0 13.9 13.9A13.9 13.9 0 0 0 13.9 0zm0 25.634A11.731 11.731 0 1 1 25.634 13.9 11.724 11.724 0 0 1 13.9 25.634zm4.345-14.31a4.352 4.352 0 0 1-3.259 4.207V17.3a1.086 1.086 0 0 1-2.172 0v-2.718A1.086 1.086 0 0 1 13.9 13.5a2.172 2.172 0 1 0-2.172-2.172 1.086 1.086 0 0 1-2.172 0 4.345 4.345 0 1 1 8.689 0zm-2.987 9.233A1.358 1.358 0 1 1 13.9 19.2a1.358 1.358 0 0 1 1.361 1.356z" />
   </svg>
-
-);
\ No newline at end of file
+);
diff --git a/src/components/organisms/Notification/NotificationFooter/NotificationFooter.stories.tsx b/src/components/organisms/Notification/NotificationFooter/NotificationFooter.stories.tsx
index 5712a5c2e..36e7d97b4 100644
--- a/src/components/organisms/Notification/NotificationFooter/NotificationFooter.stories.tsx
+++ b/src/components/organisms/Notification/NotificationFooter/NotificationFooter.stories.tsx
@@ -1,20 +1,20 @@
-import React from "react";
-import { StaticRouter as Router } from "react-router-dom";
-import { storiesOf } from "@storybook/react";
-import NotificationFooter from "./NotificationFooter";
+import React from 'react';
+import { StaticRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import NotificationFooter from './NotificationFooter';
 
-storiesOf("molecules/NotificationFooter", module)
-  .add("On nothing", () => (
+storiesOf('molecules/NotificationFooter', module)
+  .add('On nothing', () => (
     <Router>
       <NotificationFooter />
     </Router>
   ))
-  .add("On notice", () => (
+  .add('On notice', () => (
     <Router location="/notices">
       <NotificationFooter />
     </Router>
   ))
-  .add("On subscriptions", () => (
+  .add('On subscriptions', () => (
     <Router location="/subscriptions">
       <NotificationFooter />
     </Router>
diff --git a/src/components/organisms/Notification/NotificationHeader/LogoImg.js b/src/components/organisms/Notification/NotificationHeader/LogoImg.js
index 552d5767f..76840f66d 100644
--- a/src/components/organisms/Notification/NotificationHeader/LogoImg.js
+++ b/src/components/organisms/Notification/NotificationHeader/LogoImg.js
@@ -3,55 +3,55 @@ import React from 'react';
 
 export default () => (
   <svg id="Calque_1" viewBox="133.1 1436 1063.3 129" width="200">
-    <path 
-      d="M1192.5 1547.9c-96.6 18-175.4 24.5-298.8 5.9-2.7-.4-4.5-3-4.1-5.6.4-2.6 2.8-4.6 5.4-4.3 98.6 13.2 198.3 11.2 295.8-5.8 2.6-.5 5.1 1.5 5.6 4 .4 2.7-1.3 5.3-3.9 5.8z" 
-      fill="#F06D6E" 
+    <path
+      d="M1192.5 1547.9c-96.6 18-175.4 24.5-298.8 5.9-2.7-.4-4.5-3-4.1-5.6.4-2.6 2.8-4.6 5.4-4.3 98.6 13.2 198.3 11.2 295.8-5.8 2.6-.5 5.1 1.5 5.6 4 .4 2.7-1.3 5.3-3.9 5.8z"
+      fill="#F06D6E"
     />
-    <path 
-      d="M333.3 1437.3c.9-.9 2-1.3 3.3-1.3 1.3 0 2.4.4 3.3 1.3.9.9 1.3 2 1.3 3.3v65.2c0 1.3-.4 2.3-1.3 3.2s-2 1.3-3.3 1.3c-1.3 0-2.4-.4-3.3-1.3-.9-.9-1.3-1.9-1.3-3.2v-65.2c-.1-1.4.4-2.5 1.3-3.3zM370.1 1498.2c2.9 2.7 6.9 4 12.1 4 5.2 0 9.5-.9 13-2.6 1.2-.6 2.2-.9 3.1-.9s1.7.4 2.5 1.1c.8.7 1.2 1.6 1.2 2.5 0 1.7-.7 3-2.2 3.8-1.4.8-2.7 1.4-3.9 2-1.1.5-2.4 1-3.7 1.4-3 .9-6.5 1.3-10.4 1.3-8.2 0-14.6-2.3-19.2-6.9-4.6-4.6-6.8-11.2-6.8-19.7 0-7.4 1.9-13.5 5.7-18.4 4.3-5.5 10.4-8.2 18.3-8.2 7.5 0 13.4 2.5 17.8 7.6 4.1 4.8 6.1 10.6 6.1 17.7 0 1.3-.4 2.3-1.3 3.2-.8.9-2 1.3-3.4 1.3h-34c.5 4.5 2.2 8.2 5.1 10.8zm9.7-32.9c-6 0-10.3 2.6-13.1 7.9-1 1.9-1.6 4.1-1.7 6.7h29.6c-.3-4.8-2-8.5-5.2-11.2-2.7-2.3-5.9-3.4-9.6-3.4zM453.3 1466.8c4.1-6.2 9.8-9.2 17.1-9.2 3.6 0 6.9 1.1 9.8 3.2 2.4 1.7 4.3 4.1 5.5 7.1 1.9-2.9 3.7-5 5.5-6.2 3.8-2.7 8.1-4.1 13-4.1 5.4 0 9.7 2.1 12.8 6.2 2.7 3.5 4 7.9 4 13.1v28.9c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3-1.3 0-2.3-.4-3.2-1.3-.9-.9-1.3-1.9-1.3-3.2v-27.2c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3-1.3 0-2.3-.4-3.2-1.3-.9-.9-1.3-1.9-1.3-3.2v-27c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3-1.3 0-2.3-.4-3.2-1.3-.9-.9-1.3-1.9-1.3-3.2v-42.9c0-1.3.4-2.4 1.3-3.3s1.9-1.4 3.2-1.4c1.3 0 2.4.5 3.3 1.4s1.4 2 1.4 3.3v4.1h.3zM548.8 1498.2c2.9 2.7 6.9 4 12.1 4 5.2 0 9.5-.9 13-2.6 1.2-.6 2.2-.9 3.1-.9s1.7.4 2.5 1.1c.8.7 1.2 1.6 1.2 2.5 0 1.7-.7 3-2.2 3.8-1.4.8-2.7 1.4-3.9 2-1.1.5-2.4 1-3.7 1.4-3 .9-6.5 1.3-10.4 1.3-8.2 0-14.6-2.3-19.2-6.9-4.6-4.6-6.8-11.2-6.8-19.7 0-7.4 1.9-13.5 5.7-18.4 4.3-5.5 10.4-8.2 18.3-8.2 7.5 0 13.4 2.5 17.8 7.6 4.1 4.8 6.1 10.6 6.1 17.7 0 1.3-.4 2.3-1.3 3.2-.8.9-2 1.3-3.4 1.3h-34.1c.6 4.5 2.3 8.2 5.2 10.8zm9.7-32.9c-6 0-10.3 2.6-13.1 7.9-1 1.9-1.6 4.1-1.7 6.7h29.6c-.3-4.8-2-8.5-5.2-11.2-2.7-2.3-5.9-3.4-9.6-3.4zm12.6-17.3c.5.5.8 1.2.8 2s-.3 1.5-.9 2.1-1.3.9-2.1.9-1.4-.2-1.9-.7l-8.7-7.4-8.7 7.4c-.5.5-1.1.7-1.9.7s-1.5-.3-2.1-.9c-.6-.6-.9-1.1-.9-1.5v-1.2c0-.4.3-.9.8-1.4l6.8-7c1.3-1.3 2.7-2 4-2h3.8c1.3 0 2.7.7 4 2l7 7zM604.9 1466.8c4.1-6.2 9.8-9.2 17.1-9.2 3.6 0 6.9 1.1 9.8 3.2 2.4 1.7 4.3 4.1 5.5 7.1 1.9-2.9 3.7-5 5.5-6.2 3.8-2.7 8.1-4.1 13-4.1 5.4 0 9.7 2.1 12.8 6.2 2.7 3.5 4 7.9 4 13.1v28.9c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-27.2c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-27c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-42.9c0-1.3.4-2.4 1.3-3.3.9-.9 1.9-1.4 3.2-1.4 1.3 0 2.4.5 3.3 1.4.9.9 1.4 2 1.4 3.3v4.1h.3zM700.4 1498.2c2.9 2.7 6.9 4 12.1 4s9.5-.9 13-2.6c1.2-.6 2.2-.9 3.1-.9.9 0 1.7.4 2.5 1.1.8.7 1.2 1.6 1.2 2.5 0 1.7-.7 3-2.2 3.8-1.4.8-2.7 1.4-3.9 2-1.1.5-2.4 1-3.7 1.4-3 .9-6.5 1.3-10.4 1.3-8.2 0-14.6-2.3-19.2-6.9-4.6-4.6-6.8-11.2-6.8-19.7 0-7.4 1.9-13.5 5.7-18.4 4.3-5.5 10.4-8.2 18.3-8.2 7.5 0 13.4 2.5 17.8 7.6 4.1 4.8 6.1 10.6 6.1 17.7 0 1.3-.4 2.3-1.3 3.2-.8.9-2 1.3-3.4 1.3h-34.1c.6 4.5 2.3 8.2 5.2 10.8zm9.6-32.9c-6 0-10.3 2.6-13.1 7.9-1 1.9-1.6 4.1-1.7 6.7h29.6c-.3-4.8-2-8.5-5.2-11.2-2.6-2.3-5.8-3.4-9.6-3.4zM788.3 1498.1c2.9 2.7 6.9 4 12.1 4s9.5-.9 13-2.6c1.2-.6 2.2-.9 3.1-.9.9 0 1.7.4 2.5 1.1.8.7 1.2 1.6 1.2 2.5 0 1.7-.7 3-2.2 3.8-1.4.8-2.7 1.4-3.9 2-1.1.5-2.4 1-3.7 1.4-3 .9-6.5 1.3-10.4 1.3-8.2 0-14.6-2.3-19.2-6.9-4.6-4.6-6.8-11.2-6.8-19.7 0-7.4 1.9-13.5 5.7-18.4 4.3-5.5 10.4-8.2 18.3-8.2 7.5 0 13.4 2.5 17.8 7.6 4.1 4.8 6.1 10.6 6.1 17.7 0 1.3-.4 2.3-1.3 3.2-.8.9-2 1.3-3.4 1.3h-34.1c.6 4.5 2.3 8.1 5.2 10.8zm9.6-33c-6 0-10.3 2.6-13.1 7.9-1 1.9-1.6 4.1-1.7 6.7h29.7c-.3-4.8-2-8.5-5.2-11.2-2.7-2.2-5.9-3.4-9.7-3.4zM857.3 1465.8c-5.9 0-11.4 3.2-16.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-43.1c0-1.3.4-2.4 1.3-3.3.9-.9 1.9-1.3 3.2-1.3 1.3 0 2.4.4 3.3 1.3.9.9 1.4 2 1.4 3.3v4.1c2.7-2.8 5-4.8 6.9-5.9 3.8-2.2 7.4-3.3 10.9-3.3 3.4 0 6.3.5 8.5 1.6 2.2 1 4.1 2.5 5.6 4.3 3.1 3.7 4.7 8.3 4.7 13.9v28.5c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-27.5c0-3.8-.9-6.8-2.6-9-1.5-2.2-4.4-3.3-8.3-3.3zM923.1 1466.6c4.1-6.2 9.8-9.2 17.1-9.2 3.6 0 6.9 1.1 9.8 3.2 2.4 1.7 4.3 4.1 5.5 7.1 1.9-2.9 3.7-5 5.5-6.2 3.8-2.7 8.1-4.1 13-4.1 5.4 0 9.7 2.1 12.8 6.2 2.7 3.5 4 7.9 4 13.1v28.9c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-27.1c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-27.1c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2s-2 1.3-3.3 1.3-2.3-.4-3.2-1.3-1.3-1.9-1.3-3.2v-43.1c0-1.3.4-2.4 1.3-3.3.9-.9 1.9-1.4 3.2-1.4s2.4.5 3.3 1.4c.9.9 1.4 2 1.4 3.3v4.3h.3zM1014.2 1442.8c0 1.4-.5 2.6-1.5 3.6s-2.2 1.5-3.6 1.5h-.6c-1.4 0-2.6-.5-3.6-1.5s-1.5-2.2-1.5-3.6v-.4c0-1.4.5-2.6 1.5-3.6s2.2-1.5 3.6-1.5h.6c1.4 0 2.6.5 3.6 1.5s1.5 2.2 1.5 3.6v.4zm-8.7 16.4c.9-.9 2-1.3 3.3-1.3s2.4.4 3.3 1.3c.9.9 1.3 2 1.3 3.3v43.1c0 1.3-.4 2.3-1.3 3.2-.9.9-2 1.3-3.3 1.3s-2.4-.4-3.3-1.3c-.9-.9-1.3-1.9-1.3-3.2v-43.1c0-1.3.4-2.4 1.3-3.3zM1038.4 1498.1c2.9 2.7 6.9 4 12.1 4s9.5-.9 13-2.6c1.2-.6 2.2-.9 3.1-.9s1.7.4 2.5 1.1c.8.7 1.2 1.6 1.2 2.5 0 1.7-.7 3-2.2 3.8-1.4.8-2.7 1.4-3.9 2-1.1.5-2.4 1-3.7 1.4-3 .9-6.5 1.3-10.4 1.3-8.2 0-14.6-2.3-19.2-6.9-4.6-4.6-6.8-11.2-6.8-19.7 0-7.4 1.9-13.5 5.7-18.4 4.3-5.5 10.4-8.2 18.3-8.2 7.5 0 13.4 2.5 17.8 7.6 4.1 4.8 6.1 10.6 6.1 17.7 0 1.3-.4 2.3-1.3 3.2-.8.9-2 1.3-3.4 1.3h-34.1c.6 4.5 2.3 8.1 5.2 10.8zm9.6-33c-6 0-10.3 2.6-13.1 7.9-1 1.9-1.6 4.1-1.7 6.7h29.6c-.3-4.8-2-8.5-5.2-11.2-2.6-2.2-5.8-3.4-9.6-3.4zM1101.6 1502.2c5.9 0 11.4-3.2 16.5-9.6v-30.1c0-1.3.5-2.3 1.4-3.2.9-.9 2-1.3 3.3-1.3 1.3 0 2.3.4 3.2 1.3.9.9 1.3 1.9 1.3 3.2v43.1c0 1.3-.4 2.4-1.3 3.3-.9.9-1.9 1.3-3.2 1.3-1.3 0-2.4-.4-3.3-1.3-.9-.9-1.4-2-1.4-3.3v-4.1c-2.7 2.8-5 4.8-6.9 5.9-3.8 2.2-7.5 3.3-10.9 3.3s-6.3-.5-8.5-1.6c-2.2-1-4.1-2.5-5.6-4.3-3.1-3.7-4.7-8.3-4.7-13.9v-28.5c0-1.3.5-2.3 1.4-3.2.9-.9 2-1.3 3.3-1.3 1.3 0 2.3.4 3.2 1.3.9.9 1.3 1.9 1.3 3.2v27.5c0 3.8.9 6.8 2.6 9 1.5 2.2 4.3 3.3 8.3 3.3zM1180.8 1502.6c.7.9 1.1 1.9 1.1 3s-.4 2.1-1.2 3.1c-.8 1-1.9 1.5-3.4 1.5s-2.7-.6-3.6-1.8l-14.3-17.1-13.3 16.8c-1 1.3-2.2 2-3.7 2s-2.6-.4-3.4-1.3c-.8-.8-1.2-1.9-1.2-3.1 0-1.2.3-2.2 1-3.1l15.6-18.4-15.6-19c-.7-.9-1.1-2-1.1-3.2s.4-2.2 1.3-3c.9-.8 2-1.2 3.5-1.2 1.4 0 2.6.6 3.4 1.7l14.1 17.4 14-17.4c.8-1.1 1.9-1.7 3.4-1.7 1.4 0 2.6.4 3.5 1.3.9.8 1.3 1.8 1.3 2.9s-.3 2.1-1 3l-15.9 18.7 15.5 18.9z" 
-      fill="#0C52B4" 
+    <path
+      d="M333.3 1437.3c.9-.9 2-1.3 3.3-1.3 1.3 0 2.4.4 3.3 1.3.9.9 1.3 2 1.3 3.3v65.2c0 1.3-.4 2.3-1.3 3.2s-2 1.3-3.3 1.3c-1.3 0-2.4-.4-3.3-1.3-.9-.9-1.3-1.9-1.3-3.2v-65.2c-.1-1.4.4-2.5 1.3-3.3zM370.1 1498.2c2.9 2.7 6.9 4 12.1 4 5.2 0 9.5-.9 13-2.6 1.2-.6 2.2-.9 3.1-.9s1.7.4 2.5 1.1c.8.7 1.2 1.6 1.2 2.5 0 1.7-.7 3-2.2 3.8-1.4.8-2.7 1.4-3.9 2-1.1.5-2.4 1-3.7 1.4-3 .9-6.5 1.3-10.4 1.3-8.2 0-14.6-2.3-19.2-6.9-4.6-4.6-6.8-11.2-6.8-19.7 0-7.4 1.9-13.5 5.7-18.4 4.3-5.5 10.4-8.2 18.3-8.2 7.5 0 13.4 2.5 17.8 7.6 4.1 4.8 6.1 10.6 6.1 17.7 0 1.3-.4 2.3-1.3 3.2-.8.9-2 1.3-3.4 1.3h-34c.5 4.5 2.2 8.2 5.1 10.8zm9.7-32.9c-6 0-10.3 2.6-13.1 7.9-1 1.9-1.6 4.1-1.7 6.7h29.6c-.3-4.8-2-8.5-5.2-11.2-2.7-2.3-5.9-3.4-9.6-3.4zM453.3 1466.8c4.1-6.2 9.8-9.2 17.1-9.2 3.6 0 6.9 1.1 9.8 3.2 2.4 1.7 4.3 4.1 5.5 7.1 1.9-2.9 3.7-5 5.5-6.2 3.8-2.7 8.1-4.1 13-4.1 5.4 0 9.7 2.1 12.8 6.2 2.7 3.5 4 7.9 4 13.1v28.9c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3-1.3 0-2.3-.4-3.2-1.3-.9-.9-1.3-1.9-1.3-3.2v-27.2c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3-1.3 0-2.3-.4-3.2-1.3-.9-.9-1.3-1.9-1.3-3.2v-27c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3-1.3 0-2.3-.4-3.2-1.3-.9-.9-1.3-1.9-1.3-3.2v-42.9c0-1.3.4-2.4 1.3-3.3s1.9-1.4 3.2-1.4c1.3 0 2.4.5 3.3 1.4s1.4 2 1.4 3.3v4.1h.3zM548.8 1498.2c2.9 2.7 6.9 4 12.1 4 5.2 0 9.5-.9 13-2.6 1.2-.6 2.2-.9 3.1-.9s1.7.4 2.5 1.1c.8.7 1.2 1.6 1.2 2.5 0 1.7-.7 3-2.2 3.8-1.4.8-2.7 1.4-3.9 2-1.1.5-2.4 1-3.7 1.4-3 .9-6.5 1.3-10.4 1.3-8.2 0-14.6-2.3-19.2-6.9-4.6-4.6-6.8-11.2-6.8-19.7 0-7.4 1.9-13.5 5.7-18.4 4.3-5.5 10.4-8.2 18.3-8.2 7.5 0 13.4 2.5 17.8 7.6 4.1 4.8 6.1 10.6 6.1 17.7 0 1.3-.4 2.3-1.3 3.2-.8.9-2 1.3-3.4 1.3h-34.1c.6 4.5 2.3 8.2 5.2 10.8zm9.7-32.9c-6 0-10.3 2.6-13.1 7.9-1 1.9-1.6 4.1-1.7 6.7h29.6c-.3-4.8-2-8.5-5.2-11.2-2.7-2.3-5.9-3.4-9.6-3.4zm12.6-17.3c.5.5.8 1.2.8 2s-.3 1.5-.9 2.1-1.3.9-2.1.9-1.4-.2-1.9-.7l-8.7-7.4-8.7 7.4c-.5.5-1.1.7-1.9.7s-1.5-.3-2.1-.9c-.6-.6-.9-1.1-.9-1.5v-1.2c0-.4.3-.9.8-1.4l6.8-7c1.3-1.3 2.7-2 4-2h3.8c1.3 0 2.7.7 4 2l7 7zM604.9 1466.8c4.1-6.2 9.8-9.2 17.1-9.2 3.6 0 6.9 1.1 9.8 3.2 2.4 1.7 4.3 4.1 5.5 7.1 1.9-2.9 3.7-5 5.5-6.2 3.8-2.7 8.1-4.1 13-4.1 5.4 0 9.7 2.1 12.8 6.2 2.7 3.5 4 7.9 4 13.1v28.9c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-27.2c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-27c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-42.9c0-1.3.4-2.4 1.3-3.3.9-.9 1.9-1.4 3.2-1.4 1.3 0 2.4.5 3.3 1.4.9.9 1.4 2 1.4 3.3v4.1h.3zM700.4 1498.2c2.9 2.7 6.9 4 12.1 4s9.5-.9 13-2.6c1.2-.6 2.2-.9 3.1-.9.9 0 1.7.4 2.5 1.1.8.7 1.2 1.6 1.2 2.5 0 1.7-.7 3-2.2 3.8-1.4.8-2.7 1.4-3.9 2-1.1.5-2.4 1-3.7 1.4-3 .9-6.5 1.3-10.4 1.3-8.2 0-14.6-2.3-19.2-6.9-4.6-4.6-6.8-11.2-6.8-19.7 0-7.4 1.9-13.5 5.7-18.4 4.3-5.5 10.4-8.2 18.3-8.2 7.5 0 13.4 2.5 17.8 7.6 4.1 4.8 6.1 10.6 6.1 17.7 0 1.3-.4 2.3-1.3 3.2-.8.9-2 1.3-3.4 1.3h-34.1c.6 4.5 2.3 8.2 5.2 10.8zm9.6-32.9c-6 0-10.3 2.6-13.1 7.9-1 1.9-1.6 4.1-1.7 6.7h29.6c-.3-4.8-2-8.5-5.2-11.2-2.6-2.3-5.8-3.4-9.6-3.4zM788.3 1498.1c2.9 2.7 6.9 4 12.1 4s9.5-.9 13-2.6c1.2-.6 2.2-.9 3.1-.9.9 0 1.7.4 2.5 1.1.8.7 1.2 1.6 1.2 2.5 0 1.7-.7 3-2.2 3.8-1.4.8-2.7 1.4-3.9 2-1.1.5-2.4 1-3.7 1.4-3 .9-6.5 1.3-10.4 1.3-8.2 0-14.6-2.3-19.2-6.9-4.6-4.6-6.8-11.2-6.8-19.7 0-7.4 1.9-13.5 5.7-18.4 4.3-5.5 10.4-8.2 18.3-8.2 7.5 0 13.4 2.5 17.8 7.6 4.1 4.8 6.1 10.6 6.1 17.7 0 1.3-.4 2.3-1.3 3.2-.8.9-2 1.3-3.4 1.3h-34.1c.6 4.5 2.3 8.1 5.2 10.8zm9.6-33c-6 0-10.3 2.6-13.1 7.9-1 1.9-1.6 4.1-1.7 6.7h29.7c-.3-4.8-2-8.5-5.2-11.2-2.7-2.2-5.9-3.4-9.7-3.4zM857.3 1465.8c-5.9 0-11.4 3.2-16.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-43.1c0-1.3.4-2.4 1.3-3.3.9-.9 1.9-1.3 3.2-1.3 1.3 0 2.4.4 3.3 1.3.9.9 1.4 2 1.4 3.3v4.1c2.7-2.8 5-4.8 6.9-5.9 3.8-2.2 7.4-3.3 10.9-3.3 3.4 0 6.3.5 8.5 1.6 2.2 1 4.1 2.5 5.6 4.3 3.1 3.7 4.7 8.3 4.7 13.9v28.5c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-27.5c0-3.8-.9-6.8-2.6-9-1.5-2.2-4.4-3.3-8.3-3.3zM923.1 1466.6c4.1-6.2 9.8-9.2 17.1-9.2 3.6 0 6.9 1.1 9.8 3.2 2.4 1.7 4.3 4.1 5.5 7.1 1.9-2.9 3.7-5 5.5-6.2 3.8-2.7 8.1-4.1 13-4.1 5.4 0 9.7 2.1 12.8 6.2 2.7 3.5 4 7.9 4 13.1v28.9c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-27.1c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-27.1c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2s-2 1.3-3.3 1.3-2.3-.4-3.2-1.3-1.3-1.9-1.3-3.2v-43.1c0-1.3.4-2.4 1.3-3.3.9-.9 1.9-1.4 3.2-1.4s2.4.5 3.3 1.4c.9.9 1.4 2 1.4 3.3v4.3h.3zM1014.2 1442.8c0 1.4-.5 2.6-1.5 3.6s-2.2 1.5-3.6 1.5h-.6c-1.4 0-2.6-.5-3.6-1.5s-1.5-2.2-1.5-3.6v-.4c0-1.4.5-2.6 1.5-3.6s2.2-1.5 3.6-1.5h.6c1.4 0 2.6.5 3.6 1.5s1.5 2.2 1.5 3.6v.4zm-8.7 16.4c.9-.9 2-1.3 3.3-1.3s2.4.4 3.3 1.3c.9.9 1.3 2 1.3 3.3v43.1c0 1.3-.4 2.3-1.3 3.2-.9.9-2 1.3-3.3 1.3s-2.4-.4-3.3-1.3c-.9-.9-1.3-1.9-1.3-3.2v-43.1c0-1.3.4-2.4 1.3-3.3zM1038.4 1498.1c2.9 2.7 6.9 4 12.1 4s9.5-.9 13-2.6c1.2-.6 2.2-.9 3.1-.9s1.7.4 2.5 1.1c.8.7 1.2 1.6 1.2 2.5 0 1.7-.7 3-2.2 3.8-1.4.8-2.7 1.4-3.9 2-1.1.5-2.4 1-3.7 1.4-3 .9-6.5 1.3-10.4 1.3-8.2 0-14.6-2.3-19.2-6.9-4.6-4.6-6.8-11.2-6.8-19.7 0-7.4 1.9-13.5 5.7-18.4 4.3-5.5 10.4-8.2 18.3-8.2 7.5 0 13.4 2.5 17.8 7.6 4.1 4.8 6.1 10.6 6.1 17.7 0 1.3-.4 2.3-1.3 3.2-.8.9-2 1.3-3.4 1.3h-34.1c.6 4.5 2.3 8.1 5.2 10.8zm9.6-33c-6 0-10.3 2.6-13.1 7.9-1 1.9-1.6 4.1-1.7 6.7h29.6c-.3-4.8-2-8.5-5.2-11.2-2.6-2.2-5.8-3.4-9.6-3.4zM1101.6 1502.2c5.9 0 11.4-3.2 16.5-9.6v-30.1c0-1.3.5-2.3 1.4-3.2.9-.9 2-1.3 3.3-1.3 1.3 0 2.3.4 3.2 1.3.9.9 1.3 1.9 1.3 3.2v43.1c0 1.3-.4 2.4-1.3 3.3-.9.9-1.9 1.3-3.2 1.3-1.3 0-2.4-.4-3.3-1.3-.9-.9-1.4-2-1.4-3.3v-4.1c-2.7 2.8-5 4.8-6.9 5.9-3.8 2.2-7.5 3.3-10.9 3.3s-6.3-.5-8.5-1.6c-2.2-1-4.1-2.5-5.6-4.3-3.1-3.7-4.7-8.3-4.7-13.9v-28.5c0-1.3.5-2.3 1.4-3.2.9-.9 2-1.3 3.3-1.3 1.3 0 2.3.4 3.2 1.3.9.9 1.3 1.9 1.3 3.2v27.5c0 3.8.9 6.8 2.6 9 1.5 2.2 4.3 3.3 8.3 3.3zM1180.8 1502.6c.7.9 1.1 1.9 1.1 3s-.4 2.1-1.2 3.1c-.8 1-1.9 1.5-3.4 1.5s-2.7-.6-3.6-1.8l-14.3-17.1-13.3 16.8c-1 1.3-2.2 2-3.7 2s-2.6-.4-3.4-1.3c-.8-.8-1.2-1.9-1.2-3.1 0-1.2.3-2.2 1-3.1l15.6-18.4-15.6-19c-.7-.9-1.1-2-1.1-3.2s.4-2.2 1.3-3c.9-.8 2-1.2 3.5-1.2 1.4 0 2.6.6 3.4 1.7l14.1 17.4 14-17.4c.8-1.1 1.9-1.7 3.4-1.7 1.4 0 2.6.4 3.5 1.3.9.8 1.3 1.8 1.3 2.9s-.3 2.1-1 3l-15.9 18.7 15.5 18.9z"
+      fill="#0C52B4"
     />
     <g>
-      <path 
-        d="M286.2 1447.7c-9.5-9.5-23.3-12.4-35.3-8.7l-43.3 9.9c-2 .3-4.7 2-5.1 4-.2 1-.3 2.8 3.1 4.7l13.3 5.1c5.6 2.7 4.9 7.3 3.9 10.9-4.1 10.4-7.9 22-10.9 31.8-1.1 3.4-4.9 3.3-6.8 3l-1.3-.3-14.4-3.3c-5.2-1.4-9.5-1-6.1 6.3l1.6 4.3c.7 2.8.4 5.4-1.6 7.6 0 0-3 2.3-6.8 5.9-9 8.5-14.3 25 4.4 15.4l31.7-18.3c3.2-1.7 10.6-5.2 10.6-5.2 1.7-7.8 8.9-10.8 15.8-11.9-6.8 2.7-13 6.8-13.8 13.5l-2 19.1c-.1 3.6 2.8 4.4 4.6 2.3l26.3-30.5c1-1 1.7-1.6 1.7 0l.4 14.4c.1.3.4.3.9.3 1.1-.1 2-.8 2.5-1.7l13-21.2c5.9-2.8 10.6-5.7 13.3-8.3 14-13.4 14-35.5.3-49.1z" 
-        fill="#F06D6E" 
+      <path
+        d="M286.2 1447.7c-9.5-9.5-23.3-12.4-35.3-8.7l-43.3 9.9c-2 .3-4.7 2-5.1 4-.2 1-.3 2.8 3.1 4.7l13.3 5.1c5.6 2.7 4.9 7.3 3.9 10.9-4.1 10.4-7.9 22-10.9 31.8-1.1 3.4-4.9 3.3-6.8 3l-1.3-.3-14.4-3.3c-5.2-1.4-9.5-1-6.1 6.3l1.6 4.3c.7 2.8.4 5.4-1.6 7.6 0 0-3 2.3-6.8 5.9-9 8.5-14.3 25 4.4 15.4l31.7-18.3c3.2-1.7 10.6-5.2 10.6-5.2 1.7-7.8 8.9-10.8 15.8-11.9-6.8 2.7-13 6.8-13.8 13.5l-2 19.1c-.1 3.6 2.8 4.4 4.6 2.3l26.3-30.5c1-1 1.7-1.6 1.7 0l.4 14.4c.1.3.4.3.9.3 1.1-.1 2-.8 2.5-1.7l13-21.2c5.9-2.8 10.6-5.7 13.3-8.3 14-13.4 14-35.5.3-49.1z"
+        fill="#F06D6E"
       />
-      <path 
-        d="M273 1460.2c2 7-2.1 14.3-9.2 16.3s-14.4-2.1-16.4-9.2c-2-7.1 2.1-14.3 9.2-16.3 7.2-2 14.4 2.2 16.4 9.2z" 
-        fill="#FFFFFF" 
+      <path
+        d="M273 1460.2c2 7-2.1 14.3-9.2 16.3s-14.4-2.1-16.4-9.2c-2-7.1 2.1-14.3 9.2-16.3 7.2-2 14.4 2.2 16.4 9.2z"
+        fill="#FFFFFF"
       />
-      <path 
-        d="M268.6 1464.2c-.3 4.5-4.2 7.9-8.8 7.6s-7.9-4.2-7.6-8.7c.3-4.5 4.2-7.9 8.8-7.6 4.5.3 7.9 4.2 7.6 8.7z" 
-        fill="#6C83B3" 
+      <path
+        d="M268.6 1464.2c-.3 4.5-4.2 7.9-8.8 7.6s-7.9-4.2-7.6-8.7c.3-4.5 4.2-7.9 8.8-7.6 4.5.3 7.9 4.2 7.6 8.7z"
+        fill="#6C83B3"
       />
-      <path 
-        d="M264.7 1465.8c-1 2.5-3.9 3.6-6.3 2.5s-3.6-3.9-2.5-6.3c1-2.5 3.9-3.6 6.3-2.5 2.4 1 3.5 3.9 2.5 6.3z" 
-        fill="#6C83B3" 
+      <path
+        d="M264.7 1465.8c-1 2.5-3.9 3.6-6.3 2.5s-3.6-3.9-2.5-6.3c1-2.5 3.9-3.6 6.3-2.5 2.4 1 3.5 3.9 2.5 6.3z"
+        fill="#6C83B3"
       />
-      <path 
-        d="M266.7 1460.1c-.8 1.8-2.8 2.5-4.5 1.8-1.8-.8-2.5-2.8-1.8-4.5.8-1.8 2.8-2.5 4.5-1.8 1.7.7 2.5 2.7 1.8 4.5zM285 1450.6c.9-2 3.5.1 6 4.4 2.5 4.4 3.8 9.5 3 11.4-.9 2-3.5-.1-6-4.4-2.5-4.4-3.8-9.5-3-11.4z" 
-        fill="#FFFFFF" 
+      <path
+        d="M266.7 1460.1c-.8 1.8-2.8 2.5-4.5 1.8-1.8-.8-2.5-2.8-1.8-4.5.8-1.8 2.8-2.5 4.5-1.8 1.7.7 2.5 2.7 1.8 4.5zM285 1450.6c.9-2 3.5.1 6 4.4 2.5 4.4 3.8 9.5 3 11.4-.9 2-3.5-.1-6-4.4-2.5-4.4-3.8-9.5-3-11.4z"
+        fill="#FFFFFF"
       />
-      <path 
-        d="M287.7 1453.3c1-.3 2.9 2 4.2 5.1s1.5 5.6.5 5.8c-1 .3-2.9-2-4.2-5.1-1.3-2.9-1.5-5.6-.5-5.8z" 
-        fill="#6C83B3" 
+      <path
+        d="M287.7 1453.3c1-.3 2.9 2 4.2 5.1s1.5 5.6.5 5.8c-1 .3-2.9-2-4.2-5.1-1.3-2.9-1.5-5.6-.5-5.8z"
+        fill="#6C83B3"
       />
-      <path 
-        d="M289.2 1455.7c.8.4 1.9 2.2 2.4 3.9.5 1.7.3 2.7-.6 2.2-.8-.5-1.9-2.2-2.4-3.9-.4-1.6-.2-2.6.6-2.2z" 
-        fill="#6C83B3" 
+      <path
+        d="M289.2 1455.7c.8.4 1.9 2.2 2.4 3.9.5 1.7.3 2.7-.6 2.2-.8-.5-1.9-2.2-2.4-3.9-.4-1.6-.2-2.6.6-2.2z"
+        fill="#6C83B3"
       />
-      <path 
-        d="M287.4 1455c.6.3 1.4 1.6 1.7 2.8.4 1.2.2 2-.4 1.6-.6-.3-1.4-1.6-1.7-2.8-.3-1.2-.1-2 .4-1.6z" 
-        fill="#FFFFFF" 
+      <path
+        d="M287.4 1455c.6.3 1.4 1.6 1.7 2.8.4 1.2.2 2-.4 1.6-.6-.3-1.4-1.6-1.7-2.8-.3-1.2-.1-2 .4-1.6z"
+        fill="#FFFFFF"
       />
-      <path 
-        d="M161.5 1503.2c3.5 1.3 9.4 8.3 12.8 12.6.4.1.6.1.6.1s-3.2-17.1-6.9-20.8c-3.8-3.8-9.9-3.9-13.7-.1-2.8 2.7-3.5 6.6-2.3 10 2.5-2.2 6.1-3.1 9.5-1.8zM214.2 1549.2c-.9-2.3.1-8.4.8-12.1-1.8 2.3-6.8 9.2-7.1 12.3-.3 3.7 2.5 6.9 6.2 7.1 2.5.2 4.8-1 6.1-3-2.6-.1-5.1-1.7-6-4.3zM147.1 1544.3c1.2-5.6 10.3-16.1 16.6-22.7v-.3s-24.1 10.9-28.4 17.9c-4.2 6.9-2.1 16 4.9 20.2 4.1 2.5 9 2.8 13.2 1.1-5-3.5-7.7-9.8-6.3-16.2z" 
-        fill="#ABD7F2" 
+      <path
+        d="M161.5 1503.2c3.5 1.3 9.4 8.3 12.8 12.6.4.1.6.1.6.1s-3.2-17.1-6.9-20.8c-3.8-3.8-9.9-3.9-13.7-.1-2.8 2.7-3.5 6.6-2.3 10 2.5-2.2 6.1-3.1 9.5-1.8zM214.2 1549.2c-.9-2.3.1-8.4.8-12.1-1.8 2.3-6.8 9.2-7.1 12.3-.3 3.7 2.5 6.9 6.2 7.1 2.5.2 4.8-1 6.1-3-2.6-.1-5.1-1.7-6-4.3zM147.1 1544.3c1.2-5.6 10.3-16.1 16.6-22.7v-.3s-24.1 10.9-28.4 17.9c-4.2 6.9-2.1 16 4.9 20.2 4.1 2.5 9 2.8 13.2 1.1-5-3.5-7.7-9.8-6.3-16.2z"
+        fill="#ABD7F2"
       />
-      <path 
-        d="M290.4 1482.1l-2.5 1.2c-.1.1-.6 0-.7 0l-4-.6c-1-.2-1.7-.6-1.7-1.7v-.3c0-.9.9-1.5 1.7-1.2l4.1.4h.3l2.8-1c.9-.3 1.7.2 1.7 1.1v.4c.1.9-.7 1.3-1.7 1.7zM229.5 1482.5l2.4 8.8c.5.9 7.6 6 7.6 6 1 .7.2 2.2-.9 1.8l-9.8-4.7c-.4-.1-.6-.5-.6-.9l-.6-10.7c-.2-1.1 1.5-1.4 1.9-.3z" 
-        fill="#6C83B3" 
+      <path
+        d="M290.4 1482.1l-2.5 1.2c-.1.1-.6 0-.7 0l-4-.6c-1-.2-1.7-.6-1.7-1.7v-.3c0-.9.9-1.5 1.7-1.2l4.1.4h.3l2.8-1c.9-.3 1.7.2 1.7 1.1v.4c.1.9-.7 1.3-1.7 1.7zM229.5 1482.5l2.4 8.8c.5.9 7.6 6 7.6 6 1 .7.2 2.2-.9 1.8l-9.8-4.7c-.4-.1-.6-.5-.6-.9l-.6-10.7c-.2-1.1 1.5-1.4 1.9-.3z"
+        fill="#6C83B3"
       />
     </g>
   </svg>
-);
\ No newline at end of file
+);
diff --git a/src/components/organisms/Notification/NotificationHeader/NotificationHeader.stories.tsx b/src/components/organisms/Notification/NotificationHeader/NotificationHeader.stories.tsx
index f9c566393..e13217301 100644
--- a/src/components/organisms/Notification/NotificationHeader/NotificationHeader.stories.tsx
+++ b/src/components/organisms/Notification/NotificationHeader/NotificationHeader.stories.tsx
@@ -1,30 +1,30 @@
-import React from "react";
-import { MemoryRouter as Router } from "react-router-dom";
-import { storiesOf } from "@storybook/react";
-import { action } from "@storybook/addon-actions";
-import NotificationHeader from ".";
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import NotificationHeader from '.';
 
-storiesOf("molecules/NotificationHeader", module)
-  .add("normal", () => (
+storiesOf('molecules/NotificationHeader', module)
+  .add('normal', () => (
     <Router>
-      <NotificationHeader close={action("close")} />
+      <NotificationHeader close={action('close')} />
     </Router>
   ))
-  .add("with title", () => (
+  .add('with title', () => (
     <Router>
-      <NotificationHeader title="title" close={action("close")} />
+      <NotificationHeader title="title" close={action('close')} />
     </Router>
   ))
-  .add("with long title", () => (
+  .add('with long title', () => (
     <Router>
       <NotificationHeader
         title="Very long notification title, it should breaktitle"
-        close={action("close")}
+        close={action('close')}
       />
     </Router>
   ))
-  .add("with nav history", () => (
-    <Router initialIndex={2} initialEntries={["/path", "/pass"]}>
-      <NotificationHeader title="title" close={action("close")} />
+  .add('with nav history', () => (
+    <Router initialIndex={2} initialEntries={['/path', '/pass']}>
+      <NotificationHeader title="title" close={action('close')} />
     </Router>
   ));
diff --git a/src/components/organisms/Notification/NotificationHeader/index.tsx b/src/components/organisms/Notification/NotificationHeader/index.tsx
index c325d8b12..c41efa3dd 100644
--- a/src/components/organisms/Notification/NotificationHeader/index.tsx
+++ b/src/components/organisms/Notification/NotificationHeader/index.tsx
@@ -1,14 +1,14 @@
-import React from "react";
-import { MemoryHistory } from "history";
-import { RouteComponentProps, withRouter } from "react-router";
-import { truncateButPreserveWords } from "app/utils/truncate";
-import { stripHtml } from "app/utils/stripHtml";
-import Container from "./Container";
-import LogoContainer from "./LogoContainer";
-import LogoImg from "./LogoImg";
-import BackButton from "./BackButton";
-import CloseButton from "./CloseButton";
-import Title from "./Title";
+import React from 'react';
+import { MemoryHistory } from 'history';
+import { RouteComponentProps, withRouter } from 'react-router';
+import { truncateButPreserveWords } from 'app/utils/truncate';
+import { stripHtml } from 'app/utils/stripHtml';
+import Container from './Container';
+import LogoContainer from './LogoContainer';
+import LogoImg from './LogoImg';
+import BackButton from './BackButton';
+import CloseButton from './CloseButton';
+import Title from './Title';
 
 interface OwnProps {
   title?: string;
diff --git a/src/components/organisms/Notification/index.tsx b/src/components/organisms/Notification/index.tsx
index 000d0b5e9..eb0e805b3 100644
--- a/src/components/organisms/Notification/index.tsx
+++ b/src/components/organisms/Notification/index.tsx
@@ -1,9 +1,9 @@
-import React, { ReactNode } from "react";
-import ContentTitleTop from "./ContentTitleTop";
-import NotificationContainer from "./Container";
-import NotificationHeader from "./NotificationHeader";
-import NotificationFooter from "./NotificationFooter";
-import Main from "./Main";
+import React, { ReactNode } from 'react';
+import ContentTitleTop from './ContentTitleTop';
+import NotificationContainer from './Container';
+import NotificationHeader from './NotificationHeader';
+import NotificationFooter from './NotificationFooter';
+import Main from './Main';
 
 interface Props {
   title?: string;
diff --git a/tslint.json b/tslint.json
index 6ef41d0f3..dd556125f 100644
--- a/tslint.json
+++ b/tslint.json
@@ -5,11 +5,11 @@
     "tslint-react",
     "tslint-config-prettier"
   ],
-  "jsRules": {},
   "rules": {
-    "quotemark": [true, "single"],
+    "quotemark": [true, "single", "jsx-double"],
     "jsx-boolean-value": false,
     "no-unused-expression": false
   },
+  "jsRules": true,
   "rulesDirectory": []
 }

From 0a95294b196db65f9c5ee83438dddd4cb9538235 Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Mon, 15 Apr 2019 14:34:39 +0200
Subject: [PATCH 034/100] style: change icon to delete Notice

---
 .../organisms/Notice/DeleteButton.js          | 17 ++---------
 src/components/organisms/Notice/DeleteIcon.js | 30 +++++++++++++++++--
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/components/organisms/Notice/DeleteButton.js b/src/components/organisms/Notice/DeleteButton.js
index b5ca7618e..9816ede4f 100644
--- a/src/components/organisms/Notice/DeleteButton.js
+++ b/src/components/organisms/Notice/DeleteButton.js
@@ -7,20 +7,7 @@ export default styled(Button).attrs({ children: <DeleteIcon /> })`
   box-sizing: border-box;
   display: flex;
   align-items: center;
-  width: 17px;
-  height: 17px;
-  padding: 0 4px;
+  width: 18px;
+  height: 23px;
   margin-left: 16px;
-  background: ${props => props.theme.navInactive};
-  border-radius: 50%;
-
-  & > svg {
-      fill: #fff;
-      width: 9px;
-      height: 9px;
-  }
-
-  &:hover {
-    background-color: ${props => props.theme.formError}
-  }
 `;
diff --git a/src/components/organisms/Notice/DeleteIcon.js b/src/components/organisms/Notice/DeleteIcon.js
index 918dd9003..ffc6be69f 100644
--- a/src/components/organisms/Notice/DeleteIcon.js
+++ b/src/components/organisms/Notice/DeleteIcon.js
@@ -2,7 +2,33 @@
 import React from 'react';
 
 export default () => (
-  <svg viewBox="0 0 13.233 13.203">
-    <path d="M1.007 0A1.006 1.006 0 0 0 .3 1.718L5.191 6.6.319 11.462a1.006 1.006 0 0 0 .712 1.717 1 1 0 0 0 .712-.294l4.874-4.862 4.9 4.885a1.007 1.007 0 1 0 1.424-1.423L8.042 6.6l4.872-4.86A1.007 1.007 0 0 0 11.491.318L6.617 5.18 1.719.294A1 1 0 0 0 1.007 0z" />
+  <svg width="18.18" height="23">
+    <g transform="translate(-1513.166 -229.894)">
+      <path
+        d="M1529.778 232.602h-3.071v-2a.714.714 0 0 0-.726-.708.108.108 0 0 0-.078.026.1.1 0 0 0-.051-.026h-7.319a.713.713 0 0 0-.713.713v2h-3.087a1.568 1.568 0 0 0-1.568 1.568v1.606a.955.955 0 0 0 .955.955h.406v14.6a1.555 1.555 0 0 0 1.556 1.558h12.361a1.555 1.555 0 0 0 1.555-1.555v-14.603h.393a.955.955 0 0 0 .955-.955v-1.611a1.568 1.568 0 0 0-1.568-1.568zm-10.535-1.283h6.025v1.283h-6.025zm9.317 20.02c0 .091-.039.13-.13.13h-12.348c-.091 0-.13-.039-.13-.13v-14.603h12.608zm1.347-16.029h-15.3v-1.14c0-.091.039-.143.13-.143h15.041c.091 0 .13.052.13.143v1.14z"
+        fill="#5f656c"
+      />
+      <rect
+        width="1.438"
+        height="11.791"
+        fill="#5f656c"
+        rx=".719"
+        transform="translate(1524.867 238.407)"
+      />
+      <rect
+        width="1.438"
+        height="11.791"
+        fill="#5f656c"
+        rx=".719"
+        transform="translate(1521.55 238.407)"
+      />
+      <rect
+        width="1.438"
+        height="11.791"
+        fill="#5f656c"
+        rx=".719"
+        transform="translate(1518.233 238.407)"
+      />
+    </g>
   </svg>
 );

From 9bf38cdaabc448e8b39f011a801e94a3a28e2644 Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Mon, 15 Apr 2019 14:53:02 +0200
Subject: [PATCH 035/100] style: added hover effet to delete button

---
 src/components/organisms/Notice/DeleteButton.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/organisms/Notice/DeleteButton.js b/src/components/organisms/Notice/DeleteButton.js
index 9816ede4f..6956bee4b 100644
--- a/src/components/organisms/Notice/DeleteButton.js
+++ b/src/components/organisms/Notice/DeleteButton.js
@@ -10,4 +10,9 @@ export default styled(Button).attrs({ children: <DeleteIcon /> })`
   width: 18px;
   height: 23px;
   margin-left: 16px;
+
+  &:hover svg path,
+  &:hover svg rect {
+    fill: ${props => props.theme.formError};
+  }
 `;

From d2c93de5a3c9a4b896471371df1db451e0ed651e Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Mon, 15 Apr 2019 15:23:24 +0200
Subject: [PATCH 036/100] style: edit NoNotice display

---
 .../Notice/List/NoNotice/ButtonContainer.js   | 13 ++++
 .../App/Notice/List/NoNotice/Illustration.js  | 65 ++++---------------
 .../List/NoNotice/IllustrationContainer.js    | 11 ----
 .../content/App/Notice/List/NoNotice/Title.js | 12 ++--
 .../content/App/Notice/List/NoNotice/index.js | 14 ----
 .../App/Notice/List/NoNotice/index.tsx        | 15 +++++
 6 files changed, 46 insertions(+), 84 deletions(-)
 create mode 100644 src/app/content/App/Notice/List/NoNotice/ButtonContainer.js
 delete mode 100644 src/app/content/App/Notice/List/NoNotice/IllustrationContainer.js
 delete mode 100644 src/app/content/App/Notice/List/NoNotice/index.js
 create mode 100644 src/app/content/App/Notice/List/NoNotice/index.tsx

diff --git a/src/app/content/App/Notice/List/NoNotice/ButtonContainer.js b/src/app/content/App/Notice/List/NoNotice/ButtonContainer.js
new file mode 100644
index 000000000..ef8953d9f
--- /dev/null
+++ b/src/app/content/App/Notice/List/NoNotice/ButtonContainer.js
@@ -0,0 +1,13 @@
+import styled from 'styled-components';
+
+export default styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 93px;
+
+  & > button {
+    margin-top: -10px;
+    margin-left: 16px;
+  }
+`;
diff --git a/src/app/content/App/Notice/List/NoNotice/Illustration.js b/src/app/content/App/Notice/List/NoNotice/Illustration.js
index 7225f4ee0..9b8b5783d 100644
--- a/src/app/content/App/Notice/List/NoNotice/Illustration.js
+++ b/src/app/content/App/Notice/List/NoNotice/Illustration.js
@@ -1,64 +1,23 @@
 import React from 'react';
 
 export default () => (
-  <svg viewBox="0 0 103.662 87.93" width="103.66" height="87.93">
-    <defs />
+  <svg width="56.831" height="58.039">
     <path
-      d="M96.795 54.792a1.8 1.8 0 1 1-1.8-1.8 1.8 1.8 0 0 1 1.8 1.8z"
-      fill="#1785bc"
+      fill="#1eccb5"
+      d="M50.542 0H6.289A6.289 6.289 0 0 0 0 6.289v32.05a6.289 6.289 0 0 0 6.289 6.289h9.923v11.911a1.5 1.5 0 0 0 2.589 1.026l12.037-12.8a.439.439 0 0 1 .32-.138h19.384a6.289 6.289 0 0 0 6.289-6.289V6.288A6.289 6.289 0 0 0 50.542 0z"
     />
     <path
-      d="M54.3.669C18.492 6.89-.847 37.413 4.136 59.015 8.526 78.04 36.2 77.459 36.2 77.459s1.3 
-      3.513-2.213 10.471c5.79-3.316 8.39-10.6 8.39-10.6s28.95-.147 44.5-20.639C107.822 29.105 88.227-5.23 54.3.669z"
-      fill="#07c4ef"
+      fill="#fff5f5"
+      d="M37.657 19.32h-6.911v-6.911a2.225 2.225 0 0 0-2.217-2.218 2.225 2.225 0 0 0-2.218 2.218v6.911H19.4a2.225 2.225 0 0 0-2.218 2.218 2.225 2.225 0 0 0 2.218 2.218h6.911v6.91a2.224 2.224 0 0 0 2.218 2.219 2.225 2.225 0 0 0 2.218-2.218v-6.91h6.911a2.225 2.225 0 0 0 2.218-2.218 2.225 2.225 0 0 0-2.219-2.219z"
     />
     <path
-      fill="#273868"
-      d="M34.08 7.45C11.472 19.26.194 41.926 4.135 59.014 8.525 78.039 36.199 77.46 36.199 
-      77.46s1.3 3.513-2.213 10.471c5.79-3.316 8.39-10.6 8.39-10.6s20.994-.109 36.832-12.8c-16.8 
-      10.685-48.289 9.353-60.4-2.509C9.729 53.119 10.888 22.36 34.08 7.45z"
-      opacity=".49"
+      fill="#e5e3e3"
+      d="M29.58 31.773a2.225 2.225 0 0 1-2.218-2.218v-6.91h-6.911a2.225 2.225 0 0 1-2.218-2.218 2.2 2.2 0 0 1 .177-.866 2.225 2.225 0 0 0-1.228 1.983 2.225 2.225 0 0 0 2.218 2.218h6.911v6.91a2.224 2.224 0 0 0 2.218 2.213 2.225 2.225 0 0 0 2.041-1.352 2.2 2.2 0 0 1-.99.24z"
+    />
+    <path
+      fill="#20baa5"
+      d="M17.566 40.176h-6.828a6.289 6.289 0 0 1-6.289-6.289V1.837A6.294 6.294 0 0 1 4.662.212 6.291 6.291 0 0 0-.001 
+      6.287v32.05a6.289 6.289 0 0 0 6.289 6.289h9.923v11.911a1.5 1.5 0 0 0 2.589 1.026l1.861-1.979V43.276a3.1 3.1 0 0 0-3.095-3.1z"
     />
-    <g transform="translate(0 3.858)">
-      <circle
-        cx="2.559"
-        cy="2.559"
-        r="2.559"
-        fill="#07c4ef"
-        transform="rotate(-76.64 60.569 -52.338)"
-      />
-      <circle
-        cx="5.632"
-        cy="5.632"
-        r="5.632"
-        fill="#1785bc"
-        transform="rotate(-22.18 14.306 2.8)"
-      />
-      <path
-        d="M3.64 21.851a1.792 1.792 0 1 1-1.79-1.793 1.793 1.793 0 0 1 1.79 1.793z"
-        fill="#07c4ef"
-      />
-      <circle
-        cx="6.911"
-        cy="6.911"
-        r="6.911"
-        fill="#07c4ef"
-        transform="rotate(-22.842 189.838 -175.879)"
-      />
-      <circle
-        cx="1.793"
-        cy="1.793"
-        r="1.793"
-        fill="#07c4ef"
-        transform="translate(22.527 2.703)"
-      />
-      <circle
-        cx="1.793"
-        cy="1.793"
-        r="1.793"
-        fill="#1785bc"
-        transform="translate(88.371)"
-      />
-    </g>
   </svg>
 );
diff --git a/src/app/content/App/Notice/List/NoNotice/IllustrationContainer.js b/src/app/content/App/Notice/List/NoNotice/IllustrationContainer.js
deleted file mode 100644
index 5127e4e1d..000000000
--- a/src/app/content/App/Notice/List/NoNotice/IllustrationContainer.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.div`
-    margin-top: 28px;
-    text-align: center;
-
-    & > svg {
-        width: 103px;
-        height: 97px;
-    }
-`;
\ No newline at end of file
diff --git a/src/app/content/App/Notice/List/NoNotice/Title.js b/src/app/content/App/Notice/List/NoNotice/Title.js
index 42c74d0bc..4377b2ba8 100644
--- a/src/app/content/App/Notice/List/NoNotice/Title.js
+++ b/src/app/content/App/Notice/List/NoNotice/Title.js
@@ -1,9 +1,9 @@
 import styled from 'styled-components';
 
 export default styled.h2`
-    margin: 12px 0 26px;
-    font-size: 22px;
-    font-weight: bold;
-    color: ${props => props.theme.secondaryColor};
-    text-align: center;
-`;
\ No newline at end of file
+  margin: 22px 0 0;
+  font-size: 22px;
+  font-weight: bold;
+  color: ${props => props.theme.secondaryColor};
+  text-align: center;
+`;
diff --git a/src/app/content/App/Notice/List/NoNotice/index.js b/src/app/content/App/Notice/List/NoNotice/index.js
deleted file mode 100644
index 5a42ae7b9..000000000
--- a/src/app/content/App/Notice/List/NoNotice/index.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import React, { Fragment } from 'react';
-import IllustrationContainer from './IllustrationContainer';
-import Illustration from './Illustration';
-import Title from './Title';
-
-export default () => (
-  <Fragment>
-    <IllustrationContainer>
-      <Illustration />
-    </IllustrationContainer>
-
-    <Title>Il n’y a plus de recommandation ici</Title>
-  </Fragment>
-);
diff --git a/src/app/content/App/Notice/List/NoNotice/index.tsx b/src/app/content/App/Notice/List/NoNotice/index.tsx
new file mode 100644
index 000000000..4deac1be9
--- /dev/null
+++ b/src/app/content/App/Notice/List/NoNotice/index.tsx
@@ -0,0 +1,15 @@
+import React, { Fragment } from 'react';
+import Title from './Title';
+import ButtonContainer from './ButtonContainer';
+import Illustration from './Illustration';
+import BorderButton from 'components/atoms/Buttons/BorderButton';
+
+export default () => (
+  <Fragment>
+    <Title>Pas de Bulle ici</Title>
+    <ButtonContainer>
+      <Illustration />
+      <BorderButton>Créer une Bulle</BorderButton>
+    </ButtonContainer>
+  </Fragment>
+);

From e709fe0639d41ec7289a7d1d62c539895ce49e64 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Thu, 18 Apr 2019 12:14:29 +0200
Subject: [PATCH 037/100] feat(list): remove 'Add a recommendation' button when
 empty list

---
 src/app/content/App/Notice/List/index.tsx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/app/content/App/Notice/List/index.tsx b/src/app/content/App/Notice/List/index.tsx
index 347dc2e38..3f9282405 100644
--- a/src/app/content/App/Notice/List/index.tsx
+++ b/src/app/content/App/Notice/List/index.tsx
@@ -41,12 +41,14 @@ export const List = ({ notices, dismiss, undismiss, close }: Props) => (
         )
       )}
     {notices.length === 0 && <NoNotice />}
-    <AddNotice
-      as="a"
-      href="https://form.jotformeu.com/82702852284358"
-      target="_blank"
-      rel="noopener noreferrer"
-    />
+    {notices.length > 0 && (
+      <AddNotice
+        as="a"
+        href="https://form.jotformeu.com/82702852284358"
+        target="_blank"
+        rel="noopener noreferrer"
+      />
+    )}
   </Notification>
 );
 

From 78d639a75286a0da7b913edf9ca9f6cf12b8d483 Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Mon, 15 Apr 2019 15:32:31 +0200
Subject: [PATCH 038/100] changed LMEM logo to Bulle

---
 .../NotificationHeader/LogoContainer.js       | 11 ++--
 .../NotificationHeader/LogoImg.js             | 52 ++-----------------
 2 files changed, 8 insertions(+), 55 deletions(-)

diff --git a/src/components/organisms/Notification/NotificationHeader/LogoContainer.js b/src/components/organisms/Notification/NotificationHeader/LogoContainer.js
index 78d4fadb3..1085bf221 100644
--- a/src/components/organisms/Notification/NotificationHeader/LogoContainer.js
+++ b/src/components/organisms/Notification/NotificationHeader/LogoContainer.js
@@ -3,10 +3,9 @@ import styled from 'styled-components';
 import Logo from './LogoImg';
 
 export default styled.h1.attrs({ children: <Logo /> })`
-    margin: 0 0 0 auto;
+  margin: 0 0 0 auto;
 
-   & svg {
-        width: 170px;
-        vertical-align: middle;
-    }
-`;
\ No newline at end of file
+  & svg {
+    vertical-align: middle;
+  }
+`;
diff --git a/src/components/organisms/Notification/NotificationHeader/LogoImg.js b/src/components/organisms/Notification/NotificationHeader/LogoImg.js
index 76840f66d..087b5cf6b 100644
--- a/src/components/organisms/Notification/NotificationHeader/LogoImg.js
+++ b/src/components/organisms/Notification/NotificationHeader/LogoImg.js
@@ -2,56 +2,10 @@
 import React from 'react';
 
 export default () => (
-  <svg id="Calque_1" viewBox="133.1 1436 1063.3 129" width="200">
+  <svg width="61.098" height="23.789">
     <path
-      d="M1192.5 1547.9c-96.6 18-175.4 24.5-298.8 5.9-2.7-.4-4.5-3-4.1-5.6.4-2.6 2.8-4.6 5.4-4.3 98.6 13.2 198.3 11.2 295.8-5.8 2.6-.5 5.1 1.5 5.6 4 .4 2.7-1.3 5.3-3.9 5.8z"
-      fill="#F06D6E"
+      fill="#0c52b4"
+      d="M59.554 15.507c-1.022 2.317-2.624 4.976-5.555 4.976a2.694 2.694 0 0 1-2.863-1.7c2.011.2 6.919-2.965 7.191-7.293.1-2.216-1.193-3.988-3.476-3.988-2.876 0-6.7 3.263-7.38 8.578-.614 1.3-1.761 3.453-3.424 3.453-1.431 0-2.113-.92-2.113-2.522v-.068c4.534-4.164 6.817-10.164 6.817-13.876 0-1.568-.749-3.068-2.079-3.068-3.469 0-7.462 8.737-8.22 16.051-.61 1.3-1.762 3.478-3.435 3.478-1.431 0-2.113-.92-2.113-2.522v-.068c4.533-4.159 6.816-10.159 6.816-13.871 0-1.568-.75-3.068-2.079-3.068-3.483 0-7.494 8.807-8.23 16.138-.593 1.31-1.681 3.391-3.152 3.391-.579 0-.886-.511-.886-1.261 0-2.726 2.181-6.918 2.181-8.043a2.038 2.038 0 0 0-2.045-1.978c-.545 0-1.023.546-1.363 1.3a32.443 32.443 0 0 0-1.802 5.654c-.443 1.4-1.4 4.328-3.033 4.328-.58 0-.886-.511-.886-1.261 0-2.726 2.181-6.918 2.181-8.043a2.037 2.037 0 0 0-2.045-1.978c-.545 0-1.022.546-1.363 1.3a33.255 33.255 0 0 0-1.79 5.607 3.933 3.933 0 0 0-1.905-2.439.191.191 0 0 1-.032-.318 5.589 5.589 0 0 0 1.884-4.453c0-2.59-2.147-4.6-5.624-4.6a15.316 15.316 0 0 0-4.805.749c-1.67.58-1.431 3.818-.477 3.272q.473-.255.9-.458a.193.193 0 0 1 .273.208 111.639 111.639 0 0 1-3.447 12.915 3.7 3.7 0 0 0-.988.113 1.866 1.866 0 0 0-1.081 2.37c.167.47.784.715 1.535.78.277.027.8.051 1.469.053v-.005c.029 0 .051.008.08.008.891 0 4-.068 5.18-.068a7.862 7.862 0 0 0 6.474-3.682c.045 2.082 1.1 3.713 3.1 3.713a5.016 5.016 0 0 0 3.988-2.624 2.98 2.98 0 0 0 2.965 2.624c1.775 0 3.484-1.421 4.633-3.031a3.852 3.852 0 0 0 3.92 3.031c2.018 0 3.874-1.464 5.091-3.1a3.86 3.86 0 0 0 3.94 3.1c2.109 0 4.04-1.6 5.25-3.327a5.623 5.623 0 0 0 5.28 3.805c4.772 0 6.953-3.681 8.078-6.885.136-.443-1.33-1.875-1.535-1.397zm-5.01-4.5c.307 0 .443.238.409.579-.1 1.7-2.488 3.749-3.715 3.749.716-2.896 2.625-4.327 3.306-4.327zm-8.009-7.6c.784 0-.92 5.793-4.192 10.258.921-4.566 3.136-10.257 4.193-10.257zm-9.031 0c.784 0-.92 5.793-4.192 10.258.921-4.566 3.132-10.257 4.193-10.257zM11.43 16.29c-.481 4.194-4.873 3.9-5.215 3.719a.284.284 0 0 1-.134-.33c.329-1.2 1.056-3.183 1.385-4.673a.824.824 0 0 1 .44-.559 3.018 3.018 0 0 1 1.338-.338 1.958 1.958 0 0 1 2.186 2.181zm-2.834-4.465a.279.279 0 0 1-.358-.329A34.819 34.819 0 0 1 9.48 6.479a.282.282 0 0 1 .361-.185c.581.219 1.9.842 1.828 2.086-.133 2.199-2.139 3.129-3.073 3.446z"
     />
-    <path
-      d="M333.3 1437.3c.9-.9 2-1.3 3.3-1.3 1.3 0 2.4.4 3.3 1.3.9.9 1.3 2 1.3 3.3v65.2c0 1.3-.4 2.3-1.3 3.2s-2 1.3-3.3 1.3c-1.3 0-2.4-.4-3.3-1.3-.9-.9-1.3-1.9-1.3-3.2v-65.2c-.1-1.4.4-2.5 1.3-3.3zM370.1 1498.2c2.9 2.7 6.9 4 12.1 4 5.2 0 9.5-.9 13-2.6 1.2-.6 2.2-.9 3.1-.9s1.7.4 2.5 1.1c.8.7 1.2 1.6 1.2 2.5 0 1.7-.7 3-2.2 3.8-1.4.8-2.7 1.4-3.9 2-1.1.5-2.4 1-3.7 1.4-3 .9-6.5 1.3-10.4 1.3-8.2 0-14.6-2.3-19.2-6.9-4.6-4.6-6.8-11.2-6.8-19.7 0-7.4 1.9-13.5 5.7-18.4 4.3-5.5 10.4-8.2 18.3-8.2 7.5 0 13.4 2.5 17.8 7.6 4.1 4.8 6.1 10.6 6.1 17.7 0 1.3-.4 2.3-1.3 3.2-.8.9-2 1.3-3.4 1.3h-34c.5 4.5 2.2 8.2 5.1 10.8zm9.7-32.9c-6 0-10.3 2.6-13.1 7.9-1 1.9-1.6 4.1-1.7 6.7h29.6c-.3-4.8-2-8.5-5.2-11.2-2.7-2.3-5.9-3.4-9.6-3.4zM453.3 1466.8c4.1-6.2 9.8-9.2 17.1-9.2 3.6 0 6.9 1.1 9.8 3.2 2.4 1.7 4.3 4.1 5.5 7.1 1.9-2.9 3.7-5 5.5-6.2 3.8-2.7 8.1-4.1 13-4.1 5.4 0 9.7 2.1 12.8 6.2 2.7 3.5 4 7.9 4 13.1v28.9c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3-1.3 0-2.3-.4-3.2-1.3-.9-.9-1.3-1.9-1.3-3.2v-27.2c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3-1.3 0-2.3-.4-3.2-1.3-.9-.9-1.3-1.9-1.3-3.2v-27c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3-1.3 0-2.3-.4-3.2-1.3-.9-.9-1.3-1.9-1.3-3.2v-42.9c0-1.3.4-2.4 1.3-3.3s1.9-1.4 3.2-1.4c1.3 0 2.4.5 3.3 1.4s1.4 2 1.4 3.3v4.1h.3zM548.8 1498.2c2.9 2.7 6.9 4 12.1 4 5.2 0 9.5-.9 13-2.6 1.2-.6 2.2-.9 3.1-.9s1.7.4 2.5 1.1c.8.7 1.2 1.6 1.2 2.5 0 1.7-.7 3-2.2 3.8-1.4.8-2.7 1.4-3.9 2-1.1.5-2.4 1-3.7 1.4-3 .9-6.5 1.3-10.4 1.3-8.2 0-14.6-2.3-19.2-6.9-4.6-4.6-6.8-11.2-6.8-19.7 0-7.4 1.9-13.5 5.7-18.4 4.3-5.5 10.4-8.2 18.3-8.2 7.5 0 13.4 2.5 17.8 7.6 4.1 4.8 6.1 10.6 6.1 17.7 0 1.3-.4 2.3-1.3 3.2-.8.9-2 1.3-3.4 1.3h-34.1c.6 4.5 2.3 8.2 5.2 10.8zm9.7-32.9c-6 0-10.3 2.6-13.1 7.9-1 1.9-1.6 4.1-1.7 6.7h29.6c-.3-4.8-2-8.5-5.2-11.2-2.7-2.3-5.9-3.4-9.6-3.4zm12.6-17.3c.5.5.8 1.2.8 2s-.3 1.5-.9 2.1-1.3.9-2.1.9-1.4-.2-1.9-.7l-8.7-7.4-8.7 7.4c-.5.5-1.1.7-1.9.7s-1.5-.3-2.1-.9c-.6-.6-.9-1.1-.9-1.5v-1.2c0-.4.3-.9.8-1.4l6.8-7c1.3-1.3 2.7-2 4-2h3.8c1.3 0 2.7.7 4 2l7 7zM604.9 1466.8c4.1-6.2 9.8-9.2 17.1-9.2 3.6 0 6.9 1.1 9.8 3.2 2.4 1.7 4.3 4.1 5.5 7.1 1.9-2.9 3.7-5 5.5-6.2 3.8-2.7 8.1-4.1 13-4.1 5.4 0 9.7 2.1 12.8 6.2 2.7 3.5 4 7.9 4 13.1v28.9c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-27.2c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-27c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-42.9c0-1.3.4-2.4 1.3-3.3.9-.9 1.9-1.4 3.2-1.4 1.3 0 2.4.5 3.3 1.4.9.9 1.4 2 1.4 3.3v4.1h.3zM700.4 1498.2c2.9 2.7 6.9 4 12.1 4s9.5-.9 13-2.6c1.2-.6 2.2-.9 3.1-.9.9 0 1.7.4 2.5 1.1.8.7 1.2 1.6 1.2 2.5 0 1.7-.7 3-2.2 3.8-1.4.8-2.7 1.4-3.9 2-1.1.5-2.4 1-3.7 1.4-3 .9-6.5 1.3-10.4 1.3-8.2 0-14.6-2.3-19.2-6.9-4.6-4.6-6.8-11.2-6.8-19.7 0-7.4 1.9-13.5 5.7-18.4 4.3-5.5 10.4-8.2 18.3-8.2 7.5 0 13.4 2.5 17.8 7.6 4.1 4.8 6.1 10.6 6.1 17.7 0 1.3-.4 2.3-1.3 3.2-.8.9-2 1.3-3.4 1.3h-34.1c.6 4.5 2.3 8.2 5.2 10.8zm9.6-32.9c-6 0-10.3 2.6-13.1 7.9-1 1.9-1.6 4.1-1.7 6.7h29.6c-.3-4.8-2-8.5-5.2-11.2-2.6-2.3-5.8-3.4-9.6-3.4zM788.3 1498.1c2.9 2.7 6.9 4 12.1 4s9.5-.9 13-2.6c1.2-.6 2.2-.9 3.1-.9.9 0 1.7.4 2.5 1.1.8.7 1.2 1.6 1.2 2.5 0 1.7-.7 3-2.2 3.8-1.4.8-2.7 1.4-3.9 2-1.1.5-2.4 1-3.7 1.4-3 .9-6.5 1.3-10.4 1.3-8.2 0-14.6-2.3-19.2-6.9-4.6-4.6-6.8-11.2-6.8-19.7 0-7.4 1.9-13.5 5.7-18.4 4.3-5.5 10.4-8.2 18.3-8.2 7.5 0 13.4 2.5 17.8 7.6 4.1 4.8 6.1 10.6 6.1 17.7 0 1.3-.4 2.3-1.3 3.2-.8.9-2 1.3-3.4 1.3h-34.1c.6 4.5 2.3 8.1 5.2 10.8zm9.6-33c-6 0-10.3 2.6-13.1 7.9-1 1.9-1.6 4.1-1.7 6.7h29.7c-.3-4.8-2-8.5-5.2-11.2-2.7-2.2-5.9-3.4-9.7-3.4zM857.3 1465.8c-5.9 0-11.4 3.2-16.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-43.1c0-1.3.4-2.4 1.3-3.3.9-.9 1.9-1.3 3.2-1.3 1.3 0 2.4.4 3.3 1.3.9.9 1.4 2 1.4 3.3v4.1c2.7-2.8 5-4.8 6.9-5.9 3.8-2.2 7.4-3.3 10.9-3.3 3.4 0 6.3.5 8.5 1.6 2.2 1 4.1 2.5 5.6 4.3 3.1 3.7 4.7 8.3 4.7 13.9v28.5c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-27.5c0-3.8-.9-6.8-2.6-9-1.5-2.2-4.4-3.3-8.3-3.3zM923.1 1466.6c4.1-6.2 9.8-9.2 17.1-9.2 3.6 0 6.9 1.1 9.8 3.2 2.4 1.7 4.3 4.1 5.5 7.1 1.9-2.9 3.7-5 5.5-6.2 3.8-2.7 8.1-4.1 13-4.1 5.4 0 9.7 2.1 12.8 6.2 2.7 3.5 4 7.9 4 13.1v28.9c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-27.1c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2-.9.9-2 1.3-3.3 1.3s-2.3-.4-3.2-1.3c-.9-.9-1.3-1.9-1.3-3.2v-27.1c0-4.2-.8-7.4-2.3-9.5s-4.2-3.2-8-3.2c-5.9 0-10.7 3.2-14.5 9.6v30.1c0 1.3-.5 2.3-1.4 3.2s-2 1.3-3.3 1.3-2.3-.4-3.2-1.3-1.3-1.9-1.3-3.2v-43.1c0-1.3.4-2.4 1.3-3.3.9-.9 1.9-1.4 3.2-1.4s2.4.5 3.3 1.4c.9.9 1.4 2 1.4 3.3v4.3h.3zM1014.2 1442.8c0 1.4-.5 2.6-1.5 3.6s-2.2 1.5-3.6 1.5h-.6c-1.4 0-2.6-.5-3.6-1.5s-1.5-2.2-1.5-3.6v-.4c0-1.4.5-2.6 1.5-3.6s2.2-1.5 3.6-1.5h.6c1.4 0 2.6.5 3.6 1.5s1.5 2.2 1.5 3.6v.4zm-8.7 16.4c.9-.9 2-1.3 3.3-1.3s2.4.4 3.3 1.3c.9.9 1.3 2 1.3 3.3v43.1c0 1.3-.4 2.3-1.3 3.2-.9.9-2 1.3-3.3 1.3s-2.4-.4-3.3-1.3c-.9-.9-1.3-1.9-1.3-3.2v-43.1c0-1.3.4-2.4 1.3-3.3zM1038.4 1498.1c2.9 2.7 6.9 4 12.1 4s9.5-.9 13-2.6c1.2-.6 2.2-.9 3.1-.9s1.7.4 2.5 1.1c.8.7 1.2 1.6 1.2 2.5 0 1.7-.7 3-2.2 3.8-1.4.8-2.7 1.4-3.9 2-1.1.5-2.4 1-3.7 1.4-3 .9-6.5 1.3-10.4 1.3-8.2 0-14.6-2.3-19.2-6.9-4.6-4.6-6.8-11.2-6.8-19.7 0-7.4 1.9-13.5 5.7-18.4 4.3-5.5 10.4-8.2 18.3-8.2 7.5 0 13.4 2.5 17.8 7.6 4.1 4.8 6.1 10.6 6.1 17.7 0 1.3-.4 2.3-1.3 3.2-.8.9-2 1.3-3.4 1.3h-34.1c.6 4.5 2.3 8.1 5.2 10.8zm9.6-33c-6 0-10.3 2.6-13.1 7.9-1 1.9-1.6 4.1-1.7 6.7h29.6c-.3-4.8-2-8.5-5.2-11.2-2.6-2.2-5.8-3.4-9.6-3.4zM1101.6 1502.2c5.9 0 11.4-3.2 16.5-9.6v-30.1c0-1.3.5-2.3 1.4-3.2.9-.9 2-1.3 3.3-1.3 1.3 0 2.3.4 3.2 1.3.9.9 1.3 1.9 1.3 3.2v43.1c0 1.3-.4 2.4-1.3 3.3-.9.9-1.9 1.3-3.2 1.3-1.3 0-2.4-.4-3.3-1.3-.9-.9-1.4-2-1.4-3.3v-4.1c-2.7 2.8-5 4.8-6.9 5.9-3.8 2.2-7.5 3.3-10.9 3.3s-6.3-.5-8.5-1.6c-2.2-1-4.1-2.5-5.6-4.3-3.1-3.7-4.7-8.3-4.7-13.9v-28.5c0-1.3.5-2.3 1.4-3.2.9-.9 2-1.3 3.3-1.3 1.3 0 2.3.4 3.2 1.3.9.9 1.3 1.9 1.3 3.2v27.5c0 3.8.9 6.8 2.6 9 1.5 2.2 4.3 3.3 8.3 3.3zM1180.8 1502.6c.7.9 1.1 1.9 1.1 3s-.4 2.1-1.2 3.1c-.8 1-1.9 1.5-3.4 1.5s-2.7-.6-3.6-1.8l-14.3-17.1-13.3 16.8c-1 1.3-2.2 2-3.7 2s-2.6-.4-3.4-1.3c-.8-.8-1.2-1.9-1.2-3.1 0-1.2.3-2.2 1-3.1l15.6-18.4-15.6-19c-.7-.9-1.1-2-1.1-3.2s.4-2.2 1.3-3c.9-.8 2-1.2 3.5-1.2 1.4 0 2.6.6 3.4 1.7l14.1 17.4 14-17.4c.8-1.1 1.9-1.7 3.4-1.7 1.4 0 2.6.4 3.5 1.3.9.8 1.3 1.8 1.3 2.9s-.3 2.1-1 3l-15.9 18.7 15.5 18.9z"
-      fill="#0C52B4"
-    />
-    <g>
-      <path
-        d="M286.2 1447.7c-9.5-9.5-23.3-12.4-35.3-8.7l-43.3 9.9c-2 .3-4.7 2-5.1 4-.2 1-.3 2.8 3.1 4.7l13.3 5.1c5.6 2.7 4.9 7.3 3.9 10.9-4.1 10.4-7.9 22-10.9 31.8-1.1 3.4-4.9 3.3-6.8 3l-1.3-.3-14.4-3.3c-5.2-1.4-9.5-1-6.1 6.3l1.6 4.3c.7 2.8.4 5.4-1.6 7.6 0 0-3 2.3-6.8 5.9-9 8.5-14.3 25 4.4 15.4l31.7-18.3c3.2-1.7 10.6-5.2 10.6-5.2 1.7-7.8 8.9-10.8 15.8-11.9-6.8 2.7-13 6.8-13.8 13.5l-2 19.1c-.1 3.6 2.8 4.4 4.6 2.3l26.3-30.5c1-1 1.7-1.6 1.7 0l.4 14.4c.1.3.4.3.9.3 1.1-.1 2-.8 2.5-1.7l13-21.2c5.9-2.8 10.6-5.7 13.3-8.3 14-13.4 14-35.5.3-49.1z"
-        fill="#F06D6E"
-      />
-      <path
-        d="M273 1460.2c2 7-2.1 14.3-9.2 16.3s-14.4-2.1-16.4-9.2c-2-7.1 2.1-14.3 9.2-16.3 7.2-2 14.4 2.2 16.4 9.2z"
-        fill="#FFFFFF"
-      />
-      <path
-        d="M268.6 1464.2c-.3 4.5-4.2 7.9-8.8 7.6s-7.9-4.2-7.6-8.7c.3-4.5 4.2-7.9 8.8-7.6 4.5.3 7.9 4.2 7.6 8.7z"
-        fill="#6C83B3"
-      />
-      <path
-        d="M264.7 1465.8c-1 2.5-3.9 3.6-6.3 2.5s-3.6-3.9-2.5-6.3c1-2.5 3.9-3.6 6.3-2.5 2.4 1 3.5 3.9 2.5 6.3z"
-        fill="#6C83B3"
-      />
-      <path
-        d="M266.7 1460.1c-.8 1.8-2.8 2.5-4.5 1.8-1.8-.8-2.5-2.8-1.8-4.5.8-1.8 2.8-2.5 4.5-1.8 1.7.7 2.5 2.7 1.8 4.5zM285 1450.6c.9-2 3.5.1 6 4.4 2.5 4.4 3.8 9.5 3 11.4-.9 2-3.5-.1-6-4.4-2.5-4.4-3.8-9.5-3-11.4z"
-        fill="#FFFFFF"
-      />
-      <path
-        d="M287.7 1453.3c1-.3 2.9 2 4.2 5.1s1.5 5.6.5 5.8c-1 .3-2.9-2-4.2-5.1-1.3-2.9-1.5-5.6-.5-5.8z"
-        fill="#6C83B3"
-      />
-      <path
-        d="M289.2 1455.7c.8.4 1.9 2.2 2.4 3.9.5 1.7.3 2.7-.6 2.2-.8-.5-1.9-2.2-2.4-3.9-.4-1.6-.2-2.6.6-2.2z"
-        fill="#6C83B3"
-      />
-      <path
-        d="M287.4 1455c.6.3 1.4 1.6 1.7 2.8.4 1.2.2 2-.4 1.6-.6-.3-1.4-1.6-1.7-2.8-.3-1.2-.1-2 .4-1.6z"
-        fill="#FFFFFF"
-      />
-      <path
-        d="M161.5 1503.2c3.5 1.3 9.4 8.3 12.8 12.6.4.1.6.1.6.1s-3.2-17.1-6.9-20.8c-3.8-3.8-9.9-3.9-13.7-.1-2.8 2.7-3.5 6.6-2.3 10 2.5-2.2 6.1-3.1 9.5-1.8zM214.2 1549.2c-.9-2.3.1-8.4.8-12.1-1.8 2.3-6.8 9.2-7.1 12.3-.3 3.7 2.5 6.9 6.2 7.1 2.5.2 4.8-1 6.1-3-2.6-.1-5.1-1.7-6-4.3zM147.1 1544.3c1.2-5.6 10.3-16.1 16.6-22.7v-.3s-24.1 10.9-28.4 17.9c-4.2 6.9-2.1 16 4.9 20.2 4.1 2.5 9 2.8 13.2 1.1-5-3.5-7.7-9.8-6.3-16.2z"
-        fill="#ABD7F2"
-      />
-      <path
-        d="M290.4 1482.1l-2.5 1.2c-.1.1-.6 0-.7 0l-4-.6c-1-.2-1.7-.6-1.7-1.7v-.3c0-.9.9-1.5 1.7-1.2l4.1.4h.3l2.8-1c.9-.3 1.7.2 1.7 1.1v.4c.1.9-.7 1.3-1.7 1.7zM229.5 1482.5l2.4 8.8c.5.9 7.6 6 7.6 6 1 .7.2 2.2-.9 1.8l-9.8-4.7c-.4-.1-.6-.5-.6-.9l-.6-10.7c-.2-1.1 1.5-1.4 1.9-.3z"
-        fill="#6C83B3"
-      />
-    </g>
   </svg>
 );

From e5cfc35ae731ed35d4d10b40851dce795412393d Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Wed, 24 Apr 2019 15:01:21 +0200
Subject: [PATCH 039/100] fix(ContentTitle): don't show empty tag if the title
 is empty, fix #262

---
 src/components/organisms/Notification/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/organisms/Notification/index.tsx b/src/components/organisms/Notification/index.tsx
index eb0e805b3..43d71eaf6 100644
--- a/src/components/organisms/Notification/index.tsx
+++ b/src/components/organisms/Notification/index.tsx
@@ -28,7 +28,7 @@ export const Notification = ({
     <NotificationContainer>
       <NotificationHeader title={title} close={close} goBack={onBack} />
       <Main hasNotices={hasNotices}>
-        <ContentTitleTop>{contentTitle}</ContentTitleTop>
+        {contentTitle && <ContentTitleTop>{contentTitle}</ContentTitleTop>}
         {children}
       </Main>
       <NotificationFooter />

From 59838cf2a078ee18e9a2aefa8b9c2f9df590912a Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Wed, 24 Apr 2019 15:41:00 +0200
Subject: [PATCH 040/100] chore(test): fix CS and filenames in app/test

---
 test/app/actions.ts                           |  74 ++--
 test/app/analytics/eventsMapper.ts            |  42 +--
 test/app/content/actions.ts                   |  46 +--
 ...indMatchingOffersAccordingToPreferences.ts | 101 +++---
 test/app/lmem/isNoticeValid.ts                | 319 ++++++++++++++++++
 test/app/lmem/recommendationIsValid.ts        | 319 ------------------
 test/app/middlewares/analytics.ts             |  25 +-
 test/app/reducers.ts                          |  44 +--
 test/app/utils.ts                             |  17 +-
 9 files changed, 494 insertions(+), 493 deletions(-)
 create mode 100644 test/app/lmem/isNoticeValid.ts
 delete mode 100644 test/app/lmem/recommendationIsValid.ts

diff --git a/test/app/actions.ts b/test/app/actions.ts
index 9b14454a7..e8dfa6c42 100644
--- a/test/app/actions.ts
+++ b/test/app/actions.ts
@@ -1,35 +1,35 @@
-import chai from "chai";
-import sinon from "sinon";
-import sinonChai from "sinon-chai";
+import chai from 'chai';
+import sinon from 'sinon';
+import sinonChai from 'sinon-chai';
 
 import {
   receivedMatchingContexts,
   refreshMatchingContextsEvery
-} from "../../src/app/actions/kraftBackend";
+} from '../../src/app/actions/kraftBackend';
 
 import {
   contextTriggered,
   noticeDisplayed,
   noticeIgnored
-} from "../../src/app/actions/tabs";
-import { MatchingContext } from "../../src/app/lmem/matchingContext";
-import { EnhancedNotice } from "../../src/app/lmem/notice";
+} from '../../src/app/actions/tabs';
+import { MatchingContext } from '../../src/app/lmem/matchingContext';
+import { EnhancedNotice } from '../../src/app/lmem/notice';
 
 const expect = chai.expect;
 chai.use(sinonChai);
 
 const notice: EnhancedNotice = {
   id: 1,
-  title: "This is a title",
-  description: "This is a notice",
+  title: 'This is a title',
+  description: 'This is a notice',
   resource: {
-    author: "Jalil",
-    label: "Jalil's feed",
-    url: "http://jalil",
-    editor: { id: 1, label: "editor", url: "http://editor" }
+    author: 'Jalil',
+    label: 'Jalil\'s feed',
+    url: 'http://jalil',
+    editor: { id: 1, label: 'editor', url: 'http://editor' }
   },
-  contributor: { organization: "LMEM", name: "Jalil", image: "" },
-  visibility: "public",
+  contributor: { organization: 'LMEM', name: 'Jalil', image: '' },
+  visibility: 'public',
   valid: true,
   alternatives: [],
   criteria: [],
@@ -41,70 +41,70 @@ const notice: EnhancedNotice = {
   liked: false
 };
 
-describe("background actions", function() {
-  it("receivedMatchingContexts", () => {
+describe('background actions', function() {
+  it('receivedMatchingContexts', () => {
     const matchingContexts: MatchingContext[] = [
-      { recommendation_url: "http://1", url_regex: "/1/" },
-      { recommendation_url: "http://2", url_regex: "/2/" }
+      { recommendation_url: 'http://1', url_regex: '/1/' },
+      { recommendation_url: 'http://2', url_regex: '/2/' }
     ];
     const action = receivedMatchingContexts(matchingContexts);
 
     expect(action.type)
-      .to.be.a("string")
+      .to.be.a('string')
       .of.length.above(5);
     expect(action.payload.matchingContexts).to.equal(matchingContexts);
   });
 
-  it("contextTriggered", () => {
-    const trigger = "";
+  it('contextTriggered', () => {
+    const trigger = '';
     const triggeredContexts: MatchingContext[] = [];
     const action = contextTriggered(1, trigger, triggeredContexts);
 
     expect(action.type)
-      .to.be.a("string")
+      .to.be.a('string')
       .of.length.above(5);
     expect(action.payload.url).to.equal(trigger);
     expect(action.payload.triggeredContexts).to.equal(triggeredContexts);
   });
 
-  it("noticeDisplayed", () => {
-    const trigger = "http://trigger";
+  it('noticeDisplayed', () => {
+    const trigger = 'http://trigger';
     const action = noticeDisplayed(notice, trigger);
 
     expect(action.type)
-      .to.be.a("string")
+      .to.be.a('string')
       .of.length.above(5);
     expect(action.payload.url).to.equal(trigger);
     expect(action.payload.notice).to.equal(notice);
   });
 
-  it("noticeIgnored when notice dismissed", () => {
-    const trigger = "http://trigger";
+  it('noticeIgnored when notice dismissed', () => {
+    const trigger = 'http://trigger';
     const dismissedNotice = { ...notice, dismissed: true };
     const action = noticeIgnored(dismissedNotice, trigger);
 
     expect(action.type)
-      .to.be.a("string")
+      .to.be.a('string')
       .of.length.above(5);
     expect(action.payload.url).to.equal(trigger);
     expect(action.payload.notice).to.equal(dismissedNotice);
-    expect(action.payload.reason).to.equal("dismiss");
+    expect(action.payload.reason).to.equal('dismiss');
   });
 
-  it("noticeIgnored when notice disliked", () => {
-    const trigger = "http://trigger";
+  it('noticeIgnored when notice disliked', () => {
+    const trigger = 'http://trigger';
     const dislikedNotice = { ...notice, disliked: true };
     const action = noticeIgnored(dislikedNotice, trigger);
 
     expect(action.type)
-      .to.be.a("string")
+      .to.be.a('string')
       .of.length.above(5);
     expect(action.payload.url).to.equal(trigger);
     expect(action.payload.notice).to.equal(dislikedNotice);
-    expect(action.payload.reason).to.equal("dislike");
+    expect(action.payload.reason).to.equal('dislike');
   });
 
-  describe("auto refresh matching contexts", () => {
+  describe('auto refresh matching contexts', () => {
     interface SuiteWithClock extends Mocha.Suite {
       clock: { next: () => void; restore: () => void };
     }
@@ -112,7 +112,7 @@ describe("background actions", function() {
       (this as SuiteWithClock).clock = sinon.useFakeTimers();
     });
 
-    it("every x minutes", () => {
+    it('every x minutes', () => {
       const self = this as SuiteWithClock;
       const recursiveFn = refreshMatchingContextsEvery(10000);
       const dispatch = sinon.fake();
@@ -124,7 +124,7 @@ describe("background actions", function() {
       self.clock.next();
       expect(dispatch).to.have.been.calledTwice;
       expect(dispatch.lastCall.lastArg.type)
-        .to.be.a("string")
+        .to.be.a('string')
         .of.length.above(5);
     });
 
diff --git a/test/app/analytics/eventsMapper.ts b/test/app/analytics/eventsMapper.ts
index 1ac5dcd68..389ec1254 100644
--- a/test/app/analytics/eventsMapper.ts
+++ b/test/app/analytics/eventsMapper.ts
@@ -1,11 +1,11 @@
-import chai from "chai";
+import chai from 'chai';
 
-import mapEventsFromAction from "../../../src/app/analytics/eventsMapper";
+import mapEventsFromAction from '../../../src/app/analytics/eventsMapper';
 
 const expect = chai.expect;
 
 const fakeAction = Object.freeze({
-  type: "FAKE_ACTION_TYPE"
+  type: 'FAKE_ACTION_TYPE'
 });
 
 function makeFakeAction(obj: {
@@ -14,36 +14,36 @@ function makeFakeAction(obj: {
   return Object.assign({}, fakeAction, obj);
 }
 
-describe("Analytics eventsMapper", () => {
-  it("removes type property", () => {
-    const mappedEvent = mapEventsFromAction(makeFakeAction({ foo: "bar" }));
+describe('Analytics eventsMapper', () => {
+  it('removes type property', () => {
+    const mappedEvent = mapEventsFromAction(makeFakeAction({ foo: 'bar' }));
 
-    expect(mappedEvent).to.not.have.any.keys("type");
+    expect(mappedEvent).to.not.have.any.keys('type');
   });
 
-  it("flattens action object", () => {
+  it('flattens action object', () => {
     const action = makeFakeAction({
-      foo: "first level",
-      bar: { bbaarr: "second level" },
-      too: { ttoo: { tttooo: "third level" } }
+      foo: 'first level',
+      bar: { bbaarr: 'second level' },
+      too: { ttoo: { tttooo: 'third level' } }
     });
     const mappedEvent = mapEventsFromAction(action);
 
-    expect(mappedEvent).to.not.have.any.keys("bar", "too");
-    expect(mappedEvent).to.have.keys("too.ttoo", "bar.bbaarr", "foo");
-    expect(mappedEvent.foo).to.equal("first level");
-    expect(mappedEvent["bar.bbaarr"]).to.equal("second level");
-    expect(mappedEvent["too.ttoo"]).to.include({ tttooo: "third level" });
+    expect(mappedEvent).to.not.have.any.keys('bar', 'too');
+    expect(mappedEvent).to.have.keys('too.ttoo', 'bar.bbaarr', 'foo');
+    expect(mappedEvent.foo).to.equal('first level');
+    expect(mappedEvent['bar.bbaarr']).to.equal('second level');
+    expect(mappedEvent['too.ttoo']).to.include({ tttooo: 'third level' });
   });
 
-  it("copies action object", () => {
-    let mutableObj = makeFakeAction({ foobar: "original" });
+  it('copies action object', () => {
+    let mutableObj = makeFakeAction({ foobar: 'original' });
     let mappedEvent = mapEventsFromAction(mutableObj);
 
-    mutableObj.foobar = "changed";
+    mutableObj.foobar = 'changed';
 
-    expect(mappedEvent).to.include({ foobar: "original" });
-    expect(mutableObj).to.include({ foobar: "changed" });
+    expect(mappedEvent).to.include({ foobar: 'original' });
+    expect(mutableObj).to.include({ foobar: 'changed' });
     expect(mutableObj).to.include(fakeAction);
   });
 });
diff --git a/test/app/content/actions.ts b/test/app/content/actions.ts
index c5fabad0d..bf6f42697 100644
--- a/test/app/content/actions.ts
+++ b/test/app/content/actions.ts
@@ -1,27 +1,27 @@
-import chai from "chai";
+import chai from 'chai';
 
 import {
   noticesFound,
   dismissNotice,
   likeNotice
-} from "../../../src/app/actions/recommendations";
-import { init } from "../../../src/app/actions/tabs";
-import { EnhancedNotice } from "../../../src/app/lmem/notice";
+} from '../../../src/app/actions/recommendations';
+import { init } from '../../../src/app/actions/tabs';
+import { EnhancedNotice } from '../../../src/app/lmem/notice';
 
 const expect = chai.expect;
 
 const notice1: EnhancedNotice = {
   id: 1,
-  title: "This is a title",
-  description: "This is a notice",
+  title: 'This is a title',
+  description: 'This is a notice',
   resource: {
-    author: "Jalil",
-    label: "Jalil's feed",
-    url: "http://jalil",
-    editor: { id: 1, label: "editor", url: "http://editor" }
+    author: 'Jalil',
+    label: 'Jalil\'s feed',
+    url: 'http://jalil',
+    editor: { id: 1, label: 'editor', url: 'http://editor' }
   },
-  contributor: { organization: "LMEM", name: "Jalil", image: "" },
-  visibility: "public",
+  contributor: { organization: 'LMEM', name: 'Jalil', image: '' },
+  visibility: 'public',
   valid: true,
   alternatives: [],
   criteria: [],
@@ -33,39 +33,39 @@ const notice1: EnhancedNotice = {
   liked: false
 };
 
-describe("content actions", function() {
-  it("init", () => {
-    const action = init(1, { version: "0.1" });
+describe('content actions', function() {
+  it('init', () => {
+    const action = init(1, { version: '0.1' });
     expect(action.payload)
-      .to.be.an("object")
-      .to.include.all.keys("installationDetails", "tab");
+      .to.be.an('object')
+      .to.include.all.keys('installationDetails', 'tab');
   });
 
-  it("noticesFound", () => {
+  it('noticesFound', () => {
     const action = noticesFound([notice1], 1);
 
     expect(action.type)
-      .to.be.a("string")
+      .to.be.a('string')
       .of.length.above(5);
     expect(action.payload.notices).to.deep.equal([notice1]);
   });
 
-  it("dismiss reco", () => {
+  it('dismiss reco', () => {
     const id = 0;
     const action = dismissNotice(id);
 
     expect(action.type)
-      .to.be.a("string")
+      .to.be.a('string')
       .of.length.above(5);
     expect(action.payload.id).to.equal(id);
   });
 
-  it("likes notice", () => {
+  it('likes notice', () => {
     const id = 0;
     const action = likeNotice(id);
 
     expect(action.type)
-      .to.be.a("string")
+      .to.be.a('string')
       .of.length.above(5);
     expect(action.payload.id).to.equal(id);
   });
diff --git a/test/app/lmem/findMatchingOffersAccordingToPreferences.ts b/test/app/lmem/findMatchingOffersAccordingToPreferences.ts
index eb68d6d42..a7d5d7c75 100644
--- a/test/app/lmem/findMatchingOffersAccordingToPreferences.ts
+++ b/test/app/lmem/findMatchingOffersAccordingToPreferences.ts
@@ -1,28 +1,29 @@
-import chai from "chai";
+import chai from 'chai';
 import {
   findMatchingOffersAccordingToPreferences,
   MatchingContext
-} from "../../../src/app/lmem/matchingContext";
+} from '../../../src/app/lmem/matchingContext';
+
 const expect = chai.expect;
 
 const offers: MatchingContext[] = [
-  { url_regex: "www.samsung.com", recommendation_url: "http://b" },
-  { url_regex: "arrested.com", recommendation_url: "http://b" }
+  { url_regex: 'www.samsung.com', recommendation_url: 'http://b' },
+  { url_regex: 'arrested.com', recommendation_url: 'http://b' }
 ];
 const draftRecommendations = [
-  { url_regex: "www.wordpress.com", recommendation_url: "http://b" }
+  { url_regex: 'www.wordpress.com', recommendation_url: 'http://b' }
 ];
 
-const matchingURL = "https://www.samsung.com/blabla";
-const matchingDraftURL = "https://www.wordpress.com/lol";
-const nonMatchingURL = "https://soundcloud.com/capt-lovelace/meteo-marine";
+const matchingURL = 'https://www.samsung.com/blabla';
+const matchingDraftURL = 'https://www.wordpress.com/lol';
+const nonMatchingURL = 'https://soundcloud.com/capt-lovelace/meteo-marine';
 
-describe("findMatchingOffersAccordingToPreferences", function() {
-  it("should be case insensitive", () => {
+describe('findMatchingOffersAccordingToPreferences', function() {
+  it('should be case insensitive', () => {
     const offersWithWeirdCase: MatchingContext[] = [
-      { url_regex: "s.*", recommendation_url: "http://s" },
-      { url_regex: "SamSung", recommendation_url: "http://S" },
-      { url_regex: "doesNotMatch", recommendation_url: "http://d" }
+      { url_regex: 's.*', recommendation_url: 'http://s' },
+      { url_regex: 'SamSung', recommendation_url: 'http://S' },
+      { url_regex: 'doesNotMatch', recommendation_url: 'http://d' }
     ];
 
     const matches = findMatchingOffersAccordingToPreferences(
@@ -31,19 +32,19 @@ describe("findMatchingOffersAccordingToPreferences", function() {
       []
     );
 
-    expect(matches).to.be.an("array");
+    expect(matches).to.be.an('array');
     expect(matches).to.be.of.length(2);
     expect(matches[0]).to.equal(offersWithWeirdCase[0]);
     expect(matches[1]).to.equal(offersWithWeirdCase[1]);
   });
 
-  describe("exclusion", () => {
-    it("should exclude matching exclusion of otherwise matching url", () => {
+  describe('exclusion', () => {
+    it('should exclude matching exclusion of otherwise matching url', () => {
       const offersWithExclusion: MatchingContext[] = [
         {
-          url_regex: "samsung",
-          exclude_url_regex: "blabla",
-          recommendation_url: "http://b"
+          url_regex: 'samsung',
+          exclude_url_regex: 'blabla',
+          recommendation_url: 'http://b'
         }
       ];
 
@@ -53,16 +54,16 @@ describe("findMatchingOffersAccordingToPreferences", function() {
         []
       );
 
-      expect(matches).to.be.an("array");
+      expect(matches).to.be.an('array');
       expect(matches).to.be.of.length(0);
     });
 
-    it("should not exclude non matching exclusion of matching url", () => {
+    it('should not exclude non matching exclusion of matching url', () => {
       const offersWithExclusion = [
         {
-          url_regex: "samsung",
-          exclude_url_regex: "nono",
-          recommendation_url: "http://b"
+          url_regex: 'samsung',
+          exclude_url_regex: 'nono',
+          recommendation_url: 'http://b'
         }
       ];
 
@@ -72,17 +73,17 @@ describe("findMatchingOffersAccordingToPreferences", function() {
         []
       );
 
-      expect(matches).to.be.an("array");
+      expect(matches).to.be.an('array');
       expect(matches).to.be.of.length(1);
       expect(matches[0]).to.equal(offersWithExclusion[0]);
     });
 
-    it("should exclude its matching context if regex is invalid", () => {
+    it('should exclude its matching context if regex is invalid', () => {
       const offersWithExclusion: MatchingContext[] = [
         {
-          url_regex: "samsung",
-          exclude_url_regex: "isNasty)",
-          recommendation_url: "http://b"
+          url_regex: 'samsung',
+          exclude_url_regex: 'isNasty)',
+          recommendation_url: 'http://b'
         }, // SyntaxError: Invalid RegExp: Unmatched ')',
         ...offers
       ];
@@ -93,18 +94,18 @@ describe("findMatchingOffersAccordingToPreferences", function() {
         []
       );
 
-      expect(matches).to.be.an("array");
+      expect(matches).to.be.an('array');
       expect(matches).to.be.of.length(1);
       expect(matches[0]).to.equal(offersWithExclusion[1]);
     });
   });
 
-  describe("invalid regex", () => {
+  describe('invalid regex', () => {
     const nastyOffers = [
-      { url_regex: "isNasty)", recommendation_url: "http://b" }
+      { url_regex: 'isNasty)', recommendation_url: 'http://b' }
     ].concat(offers); // SyntaxError: Invalid RegExp: Unmatched ')'
 
-    it("should not screw up the matching engine", () => {
+    it('should not screw up the matching engine', () => {
       const matches = findMatchingOffersAccordingToPreferences(
         matchingURL,
         nastyOffers,
@@ -115,63 +116,63 @@ describe("findMatchingOffersAccordingToPreferences", function() {
         SyntaxError
       );
 
-      expect(matches).to.be.an("array");
+      expect(matches).to.be.an('array');
       expect(matches).to.be.of.length(1);
       expect(matches[0]).to.equal(nastyOffers[1]);
     });
   });
 
-  describe("empty prefs, no draft", () => {
-    it("should match when the url matches an offer", () => {
+  describe('empty prefs, no draft', () => {
+    it('should match when the url matches an offer', () => {
       const matching = findMatchingOffersAccordingToPreferences(
         matchingURL,
         offers,
         []
       );
 
-      expect(matching).to.be.an("array");
+      expect(matching).to.be.an('array');
       expect(matching).to.be.of.length(1);
       expect(matching[0]).to.equal(offers[0]);
     });
 
-    it("should not match when the url does not match any offer", () => {
+    it('should not match when the url does not match any offer', () => {
       const matching = findMatchingOffersAccordingToPreferences(
         nonMatchingURL,
         offers,
         []
       );
 
-      expect(matching).to.be.an("array");
+      expect(matching).to.be.an('array');
       expect(matching).to.be.of.length(0);
     });
   });
 
-  describe("draft recommendations", () => {
-    it("should match a draft recommendation", () => {
+  describe('draft recommendations', () => {
+    it('should match a draft recommendation', () => {
       const matching = findMatchingOffersAccordingToPreferences(
         matchingDraftURL,
         offers,
         draftRecommendations
       );
 
-      expect(matching).to.be.an("array");
+      expect(matching).to.be.an('array');
       expect(matching).to.be.of.length(1);
       expect(matching[0]).to.equal(draftRecommendations[0]);
     });
 
-    it("should favor draft previews over public offers", () => {
+    it('should favor draft previews over public offers', () => {
       const draftRec = {
-        url_regex: "www.wordpress.com",
-        recommendation_url: "http://b",
+        url_regex: 'www.wordpress.com',
+        recommendation_url: 'http://b',
         recommendation: {
-          visibility: "private"
+          visibility: 'private'
         }
       };
       const publicRec = {
-        url_regex: "www.wordpress.com",
-        recommendation_url: "http://b",
+        url_regex: 'www.wordpress.com',
+        recommendation_url: 'http://b',
         recommendation: {
-          visibility: "public"
+          visibility: 'public'
         }
       };
 
@@ -181,7 +182,7 @@ describe("findMatchingOffersAccordingToPreferences", function() {
         [draftRec]
       );
 
-      expect(matching).to.be.an("array");
+      expect(matching).to.be.an('array');
       expect(matching).to.be.of.length(1);
       expect(matching[0]).to.equal(draftRec);
     });
diff --git a/test/app/lmem/isNoticeValid.ts b/test/app/lmem/isNoticeValid.ts
new file mode 100644
index 000000000..5b4b87c28
--- /dev/null
+++ b/test/app/lmem/isNoticeValid.ts
@@ -0,0 +1,319 @@
+import chai from 'chai';
+import { isNoticeValid } from '../../../src/app/lmem/notice';
+
+const expect = chai.expect;
+
+describe('isNoticeValid', function() {
+  it('Object with missing contributor is not valid', () => {
+    const reco = {
+      title: 'Il y a mieux que le Samsung Galaxy S6',
+      description:
+        'Que vous ayez un usage basique, avancé, professionnel [...]',
+      // contributor: {
+      //   name: 'Maarten Samson',
+      // },
+      criteria: [
+        {
+          slug: 'health',
+          label: 'Santé'
+        }
+      ],
+      resource: {
+        author: 'Boby',
+        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
+        label: 'Lire le comparatif',
+        editor: {
+          label: 'Le Gorafi',
+          url: 'http://legorafi.fr'
+        }
+      },
+      alternatives: [
+        {
+          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
+          label: 'Voir l’alternative'
+        }
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.false;
+  });
+
+  it('Object with missing title is not valid', () => {
+    const reco = {
+      // title: 'Il y a mieux que le Samsung Galaxy S6',
+      description:
+        'Que vous ayez un usage basique, avancé, professionnel [...]',
+      contributor: {
+        name: 'Maarten Samson'
+      },
+      criteria: [
+        {
+          slug: 'health',
+          label: 'Santé'
+        }
+      ],
+      resource: {
+        author: 'Boby',
+        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
+        label: 'Lire le comparatif',
+        editor: {
+          label: 'Le Gorafi',
+          url: 'http://legorafi.fr'
+        }
+      },
+      alternatives: [
+        {
+          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
+          label: 'Voir l’alternative'
+        }
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.false;
+  });
+
+  it('Object with missing description is not valid', () => {
+    const reco = {
+      title: 'Il y a mieux que le Samsung Galaxy S6',
+      // description: 'Que vous ayez un usage basique, avancé, professionnel [...]',
+      contributor: {
+        name: 'Maarten Samson'
+      },
+      criteria: [
+        {
+          slug: 'health',
+          label: 'Santé'
+        }
+      ],
+      resource: {
+        author: 'Boby',
+        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
+        label: 'Lire le comparatif',
+        editor: {
+          label: 'Le Gorafi',
+          url: 'http://legorafi.fr'
+        }
+      },
+      alternatives: [
+        {
+          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
+          label: 'Voir l’alternative'
+        }
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.false;
+  });
+
+  it('Object with missing resource is not valid', () => {
+    const reco = {
+      title: 'Il y a mieux que le Samsung Galaxy S6',
+      description:
+        'Que vous ayez un usage basique, avancé, professionnel [...]',
+      contributor: {
+        name: 'Maarten Samson'
+      },
+      criteria: [
+        {
+          slug: 'health',
+          label: 'Santé'
+        }
+      ],
+      resource: {
+        author: 'Boby',
+        // url: 'http://choisir.lmem.net/samsung-galaxy-s6',
+        // label: 'Lire le comparatif',
+        editor: {
+          label: 'Le Gorafi',
+          url: 'http://legorafi.fr'
+        }
+      },
+      alternatives: [
+        {
+          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
+          label: 'Voir l’alternative'
+        }
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.false;
+  });
+
+  it('Object with missing editor is not valid', () => {
+    const reco = {
+      title: 'Il y a mieux que le Samsung Galaxy S6',
+      description:
+        'Que vous ayez un usage basique, avancé, professionnel [...]',
+      contributor: {
+        name: 'Maarten Samson'
+      },
+      criteria: [
+        {
+          slug: 'health',
+          label: 'Santé'
+        }
+      ],
+      resource: {
+        author: 'Boby',
+        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
+        label: 'Lire le comparatif'
+        // editor: {
+        //   label: 'Le Gorafi',
+        //   url: 'http://legorafi.fr',
+        // },
+      },
+      alternatives: [
+        {
+          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
+          label: 'Voir l’alternative'
+        }
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.false;
+  });
+
+  it('Object with wrong criterion is not valid', () => {
+    const reco = {
+      title: 'Il y a mieux que le Samsung Galaxy S6',
+      description:
+        'Que vous ayez un usage basique, avancé, professionnel [...]',
+      contributor: {
+        name: 'Maarten Samson'
+      },
+      criteria: [
+        {
+          slug: 'health',
+          label: 'Santé'
+        },
+        {
+          // label: 'health',
+          // description: 'Santé',
+        }
+      ],
+      resource: {
+        author: 'Boby',
+        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
+        label: 'Lire le comparatif',
+        editor: {
+          label: 'Le Gorafi',
+          url: 'http://legorafi.fr'
+        }
+      },
+      alternatives: [
+        {
+          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
+          label: 'Voir l’alternative'
+        }
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.false;
+  });
+
+  it('Object with wrong alternative is not valid', () => {
+    const reco = {
+      title: 'Il y a mieux que le Samsung Galaxy S6',
+      description:
+        'Que vous ayez un usage basique, avancé, professionnel [...]',
+      contributor: {
+        name: 'Maarten Samson'
+      },
+      criteria: [
+        {
+          slug: 'health',
+          label: 'Santé'
+        }
+      ],
+      resource: {
+        author: 'Boby',
+        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
+        label: 'Lire le comparatif',
+        editor: {
+          label: 'Le Gorafi',
+          url: 'http://legorafi.fr'
+        }
+      },
+      alternatives: [
+        {
+          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
+          label: 'Voir l’alternative'
+        },
+        {
+          // url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
+          // label: 'Voir l’alternative',
+        }
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.false;
+  });
+
+  it('Object with all props is valid', () => {
+    const reco = {
+      title: 'Il y a mieux que le Samsung Galaxy S6',
+      description:
+        'Que vous ayez un usage basique, avancé, professionnel [...]',
+      contributor: {
+        name: 'Maarten Samson'
+      },
+      criteria: [
+        {
+          slug: 'health',
+          label: 'Santé'
+        }
+      ],
+      resource: {
+        author: 'Boby',
+        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
+        label: 'Lire le comparatif',
+        editor: {
+          label: 'Le Gorafi',
+          url: 'http://legorafi.fr'
+        }
+      },
+      alternatives: [
+        {
+          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
+          label: 'Voir l’alternative'
+        }
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.true;
+  });
+
+  it('Object with all props but optional is valid', () => {
+    const reco = {
+      title: 'Il y a mieux que le Samsung Galaxy S6',
+      description:
+        'Que vous ayez un usage basique, avancé, professionnel [...]',
+      contributor: {
+        name: 'Maarten Samson'
+      },
+      // criteria: [
+      //   {
+      //     slug: 'health',
+      //     label: 'Santé',
+      //   },
+      // ],
+      resource: {
+        // author: 'Boby',
+        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
+        label: 'Lire le comparatif',
+        editor: {
+          label: 'Le Gorafi',
+          url: 'http://legorafi.fr'
+        }
+      },
+      alternatives: [
+        //   {
+        //     url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
+        //     label: 'Voir l’alternative',
+        //   },
+      ]
+    };
+
+    expect(isNoticeValid(reco)).to.be.true;
+  });
+});
diff --git a/test/app/lmem/recommendationIsValid.ts b/test/app/lmem/recommendationIsValid.ts
deleted file mode 100644
index eef234144..000000000
--- a/test/app/lmem/recommendationIsValid.ts
+++ /dev/null
@@ -1,319 +0,0 @@
-import chai from "chai";
-import { isNoticeValid } from "../../../src/app/lmem/notice";
-
-const expect = chai.expect;
-
-describe("isNoticeValid", function() {
-  it("Object with missing contributor is not valid", () => {
-    const reco = {
-      title: "Il y a mieux que le Samsung Galaxy S6",
-      description:
-        "Que vous ayez un usage basique, avancé, professionnel [...]",
-      // contributor: {
-      //   name: 'Maarten Samson',
-      // },
-      criteria: [
-        {
-          slug: "health",
-          label: "Santé"
-        }
-      ],
-      resource: {
-        author: "Boby",
-        url: "http://choisir.lmem.net/samsung-galaxy-s6",
-        label: "Lire le comparatif",
-        editor: {
-          label: "Le Gorafi",
-          url: "http://legorafi.fr"
-        }
-      },
-      alternatives: [
-        {
-          url_to_redirect: "http://choisir.lmem.net/samsung-galaxy-s6",
-          label: "Voir l’alternative"
-        }
-      ]
-    };
-
-    expect(isNoticeValid(reco)).to.be.false;
-  });
-
-  it("Object with missing title is not valid", () => {
-    const reco = {
-      // title: 'Il y a mieux que le Samsung Galaxy S6',
-      description:
-        "Que vous ayez un usage basique, avancé, professionnel [...]",
-      contributor: {
-        name: "Maarten Samson"
-      },
-      criteria: [
-        {
-          slug: "health",
-          label: "Santé"
-        }
-      ],
-      resource: {
-        author: "Boby",
-        url: "http://choisir.lmem.net/samsung-galaxy-s6",
-        label: "Lire le comparatif",
-        editor: {
-          label: "Le Gorafi",
-          url: "http://legorafi.fr"
-        }
-      },
-      alternatives: [
-        {
-          url_to_redirect: "http://choisir.lmem.net/samsung-galaxy-s6",
-          label: "Voir l’alternative"
-        }
-      ]
-    };
-
-    expect(isNoticeValid(reco)).to.be.false;
-  });
-
-  it("Object with missing description is not valid", () => {
-    const reco = {
-      title: "Il y a mieux que le Samsung Galaxy S6",
-      // description: 'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        name: "Maarten Samson"
-      },
-      criteria: [
-        {
-          slug: "health",
-          label: "Santé"
-        }
-      ],
-      resource: {
-        author: "Boby",
-        url: "http://choisir.lmem.net/samsung-galaxy-s6",
-        label: "Lire le comparatif",
-        editor: {
-          label: "Le Gorafi",
-          url: "http://legorafi.fr"
-        }
-      },
-      alternatives: [
-        {
-          url_to_redirect: "http://choisir.lmem.net/samsung-galaxy-s6",
-          label: "Voir l’alternative"
-        }
-      ]
-    };
-
-    expect(isNoticeValid(reco)).to.be.false;
-  });
-
-  it("Object with missing resource is not valid", () => {
-    const reco = {
-      title: "Il y a mieux que le Samsung Galaxy S6",
-      description:
-        "Que vous ayez un usage basique, avancé, professionnel [...]",
-      contributor: {
-        name: "Maarten Samson"
-      },
-      criteria: [
-        {
-          slug: "health",
-          label: "Santé"
-        }
-      ],
-      resource: {
-        author: "Boby",
-        // url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        // label: 'Lire le comparatif',
-        editor: {
-          label: "Le Gorafi",
-          url: "http://legorafi.fr"
-        }
-      },
-      alternatives: [
-        {
-          url_to_redirect: "http://choisir.lmem.net/samsung-galaxy-s6",
-          label: "Voir l’alternative"
-        }
-      ]
-    };
-
-    expect(isNoticeValid(reco)).to.be.false;
-  });
-
-  it("Object with missing editor is not valid", () => {
-    const reco = {
-      title: "Il y a mieux que le Samsung Galaxy S6",
-      description:
-        "Que vous ayez un usage basique, avancé, professionnel [...]",
-      contributor: {
-        name: "Maarten Samson"
-      },
-      criteria: [
-        {
-          slug: "health",
-          label: "Santé"
-        }
-      ],
-      resource: {
-        author: "Boby",
-        url: "http://choisir.lmem.net/samsung-galaxy-s6",
-        label: "Lire le comparatif"
-        // editor: {
-        //   label: 'Le Gorafi',
-        //   url: 'http://legorafi.fr',
-        // },
-      },
-      alternatives: [
-        {
-          url_to_redirect: "http://choisir.lmem.net/samsung-galaxy-s6",
-          label: "Voir l’alternative"
-        }
-      ]
-    };
-
-    expect(isNoticeValid(reco)).to.be.false;
-  });
-
-  it("Object with wrong criterion is not valid", () => {
-    const reco = {
-      title: "Il y a mieux que le Samsung Galaxy S6",
-      description:
-        "Que vous ayez un usage basique, avancé, professionnel [...]",
-      contributor: {
-        name: "Maarten Samson"
-      },
-      criteria: [
-        {
-          slug: "health",
-          label: "Santé"
-        },
-        {
-          // label: 'health',
-          // description: 'Santé',
-        }
-      ],
-      resource: {
-        author: "Boby",
-        url: "http://choisir.lmem.net/samsung-galaxy-s6",
-        label: "Lire le comparatif",
-        editor: {
-          label: "Le Gorafi",
-          url: "http://legorafi.fr"
-        }
-      },
-      alternatives: [
-        {
-          url_to_redirect: "http://choisir.lmem.net/samsung-galaxy-s6",
-          label: "Voir l’alternative"
-        }
-      ]
-    };
-
-    expect(isNoticeValid(reco)).to.be.false;
-  });
-
-  it("Object with wrong alternative is not valid", () => {
-    const reco = {
-      title: "Il y a mieux que le Samsung Galaxy S6",
-      description:
-        "Que vous ayez un usage basique, avancé, professionnel [...]",
-      contributor: {
-        name: "Maarten Samson"
-      },
-      criteria: [
-        {
-          slug: "health",
-          label: "Santé"
-        }
-      ],
-      resource: {
-        author: "Boby",
-        url: "http://choisir.lmem.net/samsung-galaxy-s6",
-        label: "Lire le comparatif",
-        editor: {
-          label: "Le Gorafi",
-          url: "http://legorafi.fr"
-        }
-      },
-      alternatives: [
-        {
-          url_to_redirect: "http://choisir.lmem.net/samsung-galaxy-s6",
-          label: "Voir l’alternative"
-        },
-        {
-          // url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          // label: 'Voir l’alternative',
-        }
-      ]
-    };
-
-    expect(isNoticeValid(reco)).to.be.false;
-  });
-
-  it("Object with all props is valid", () => {
-    const reco = {
-      title: "Il y a mieux que le Samsung Galaxy S6",
-      description:
-        "Que vous ayez un usage basique, avancé, professionnel [...]",
-      contributor: {
-        name: "Maarten Samson"
-      },
-      criteria: [
-        {
-          slug: "health",
-          label: "Santé"
-        }
-      ],
-      resource: {
-        author: "Boby",
-        url: "http://choisir.lmem.net/samsung-galaxy-s6",
-        label: "Lire le comparatif",
-        editor: {
-          label: "Le Gorafi",
-          url: "http://legorafi.fr"
-        }
-      },
-      alternatives: [
-        {
-          url_to_redirect: "http://choisir.lmem.net/samsung-galaxy-s6",
-          label: "Voir l’alternative"
-        }
-      ]
-    };
-
-    expect(isNoticeValid(reco)).to.be.true;
-  });
-
-  it("Object with all props but optional is valid", () => {
-    const reco = {
-      title: "Il y a mieux que le Samsung Galaxy S6",
-      description:
-        "Que vous ayez un usage basique, avancé, professionnel [...]",
-      contributor: {
-        name: "Maarten Samson"
-      },
-      // criteria: [
-      //   {
-      //     slug: 'health',
-      //     label: 'Santé',
-      //   },
-      // ],
-      resource: {
-        // author: 'Boby',
-        url: "http://choisir.lmem.net/samsung-galaxy-s6",
-        label: "Lire le comparatif",
-        editor: {
-          label: "Le Gorafi",
-          url: "http://legorafi.fr"
-        }
-      },
-      alternatives: [
-        //   {
-        //     url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        //     label: 'Voir l’alternative',
-        //   },
-      ]
-    };
-
-    expect(isNoticeValid(reco)).to.be.true;
-  });
-});
diff --git a/test/app/middlewares/analytics.ts b/test/app/middlewares/analytics.ts
index b5d1f23c3..f51a2faf9 100644
--- a/test/app/middlewares/analytics.ts
+++ b/test/app/middlewares/analytics.ts
@@ -1,10 +1,9 @@
-import chai from "chai";
-import sinon from "sinon";
-import sinonChai from "sinon-chai";
+import chai from 'chai';
+import sinon from 'sinon';
+import sinonChai from 'sinon-chai';
+import { Action } from 'redux';
 
-import middleware from "../../../src/app/background/middlewares/analytics";
-import { POPUP_CLICK } from "../../../src/app/constants/ActionTypes";
-import { Action } from "redux";
+import middleware from '../../../src/app/background/middlewares/analytics';
 
 const expect = chai.expect;
 chai.use(sinonChai);
@@ -18,24 +17,24 @@ function create() {
   return { next, track, invoke };
 }
 
-describe("Analytics middleware", () => {
-  it("passes through api actions", () => {
+describe('Analytics middleware', () => {
+  it('passes through api actions', () => {
     const { next, invoke } = create();
-    const action = { type: "api/bypass" };
+    const action = { type: 'api/bypass' };
     invoke(action);
     expect(next).to.have.been.calledWith(action);
   });
 
-  it("passes through persist actions", () => {
+  it('passes through persist actions', () => {
     const { next, invoke } = create();
-    const action = { type: "persist/bypass" };
+    const action = { type: 'persist/bypass' };
     invoke(action);
     expect(next).to.have.been.calledWith(action);
   });
 
-  it("tracks actions", () => {
+  it('tracks actions', () => {
     const { track, invoke } = create();
-    const action = { type: "gothroughthisone" };
+    const action = { type: 'gothroughthisone' };
     invoke(action);
     expect(track).to.have.been.calledWith(action);
   });
diff --git a/test/app/reducers.ts b/test/app/reducers.ts
index 4c2cecb98..62c5cf9fc 100644
--- a/test/app/reducers.ts
+++ b/test/app/reducers.ts
@@ -1,8 +1,8 @@
-import chai from "chai";
-import prefsReducer from "../../src/app/background/reducers/prefs";
-import resourcesReducer from "../../src/app/background/reducers/resources";
-import { receivedMatchingContexts } from "../../src/app/actions/kraftBackend";
+import chai from 'chai';
 
+import prefsReducer from '../../src/app/background/reducers/prefs';
+import resourcesReducer from '../../src/app/background/reducers/resources';
+import { receivedMatchingContexts } from '../../src/app/actions/kraftBackend';
 import {
   dismissNotice,
   likeNotice,
@@ -10,16 +10,16 @@ import {
   dislikeNotice,
   undislikeNotice,
   undismissNotice
-} from "../../src/app/actions/recommendations";
-import { MatchingContext } from "../../src/app/lmem/matchingContext";
+} from '../../src/app/actions/recommendations';
+import { MatchingContext } from '../../src/app/lmem/matchingContext';
 
 const expect = chai.expect;
 
-describe("background reducer", function() {
-  it("initial state + receivedMatchingContexts => state with offers", () => {
+describe('background reducer', function() {
+  it('initial state + receivedMatchingContexts => state with offers', () => {
     const matchingContexts: MatchingContext[] = [
-      { recommendation_url: "http://1", url_regex: "/1/" },
-      { recommendation_url: "http://2", url_regex: "/2/" }
+      { recommendation_url: 'http://1', url_regex: '/1/' },
+      { recommendation_url: 'http://2', url_regex: '/2/' }
     ];
     const action = receivedMatchingContexts(matchingContexts);
 
@@ -30,7 +30,7 @@ describe("background reducer", function() {
     );
   });
 
-  it("dismiss notice", () => {
+  it('dismiss notice', () => {
     const action = dismissNotice(1);
 
     const nextState = prefsReducer(
@@ -38,7 +38,7 @@ describe("background reducer", function() {
         dismissedNotices: [],
         likedNotices: [],
         dislikedNotices: [],
-        installationDetails: { version: "0.1" }
+        installationDetails: { version: '0.1' }
       },
       action
     );
@@ -46,7 +46,7 @@ describe("background reducer", function() {
     expect(nextState.dismissedNotices).to.have.lengthOf(1);
   });
 
-  it("like notice", () => {
+  it('like notice', () => {
     const action = likeNotice(1);
 
     const nextState = prefsReducer(
@@ -54,7 +54,7 @@ describe("background reducer", function() {
         dismissedNotices: [],
         likedNotices: [],
         dislikedNotices: [],
-        installationDetails: { version: "0.1" }
+        installationDetails: { version: '0.1' }
       },
       action
     );
@@ -62,7 +62,7 @@ describe("background reducer", function() {
     expect(nextState.likedNotices).to.have.lengthOf(1);
   });
 
-  it("dislike notice", () => {
+  it('dislike notice', () => {
     const action = dislikeNotice(1);
 
     const nextState = prefsReducer(
@@ -70,7 +70,7 @@ describe("background reducer", function() {
         dismissedNotices: [],
         likedNotices: [],
         dislikedNotices: [],
-        installationDetails: { version: "0.1" }
+        installationDetails: { version: '0.1' }
       },
       action
     );
@@ -78,7 +78,7 @@ describe("background reducer", function() {
     expect(nextState.dislikedNotices).to.have.lengthOf(1);
   });
 
-  it("undismiss notice", () => {
+  it('undismiss notice', () => {
     const action = undismissNotice(42);
 
     const nextState = prefsReducer(
@@ -86,7 +86,7 @@ describe("background reducer", function() {
         dismissedNotices: [42],
         likedNotices: [],
         dislikedNotices: [],
-        installationDetails: { version: "0.1" }
+        installationDetails: { version: '0.1' }
       },
       action
     );
@@ -94,7 +94,7 @@ describe("background reducer", function() {
     expect(nextState.dismissedNotices).to.have.lengthOf(0);
   });
 
-  it("unlike notice", () => {
+  it('unlike notice', () => {
     const action = unlikeNotice(42);
 
     const nextState = prefsReducer(
@@ -102,7 +102,7 @@ describe("background reducer", function() {
         dismissedNotices: [],
         likedNotices: [42],
         dislikedNotices: [],
-        installationDetails: { version: "0.1" }
+        installationDetails: { version: '0.1' }
       },
       action
     );
@@ -110,7 +110,7 @@ describe("background reducer", function() {
     expect(nextState.likedNotices).to.have.lengthOf(0);
   });
 
-  it("undislike notice", () => {
+  it('undislike notice', () => {
     const action = undislikeNotice(42);
 
     const nextState = prefsReducer(
@@ -118,7 +118,7 @@ describe("background reducer", function() {
         dismissedNotices: [],
         likedNotices: [],
         dislikedNotices: [42],
-        installationDetails: { version: "0.1" }
+        installationDetails: { version: '0.1' }
       },
       action
     );
diff --git a/test/app/utils.ts b/test/app/utils.ts
index b015a02b2..7036483d4 100644
--- a/test/app/utils.ts
+++ b/test/app/utils.ts
@@ -1,18 +1,19 @@
-import chai from "chai";
-import { makeRecoFeedback } from "../../src/app/background/middlewares/sendFeedback";
+import chai from 'chai';
+
+import { makeRecoFeedback } from '../../src/app/background/middlewares/sendFeedback';
 
 const expect = chai.expect;
 
-describe("background makeRecoFeedback", function() {
-  it("should have right feedback and contexts", () => {
-    const type = "like";
-    const url = "myUrl";
+describe('background makeRecoFeedback', function() {
+  it('should have right feedback and contexts', () => {
+    const type = 'like';
+    const url = 'myUrl';
 
     const output = makeRecoFeedback(type, url);
 
-    expect(output.feedback).to.equal("like");
+    expect(output.feedback).to.equal('like');
     expect(output.contexts.datetime)
-      .to.be.a("string")
+      .to.be.a('string')
       .of.length(24);
     expect(output.contexts.url).to.equal(url);
   });

From 3e30985928059e2f41395e578c23988f954152cc Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Wed, 24 Apr 2019 15:54:16 +0200
Subject: [PATCH 041/100] fix(NoticeDetails): make notice source optional, fix
 #246

---
 src/app/lmem/notice.ts                        |  1 -
 .../NoticeDetails/NoticeDetails.stories.tsx   | 13 ++++++++++
 .../organisms/NoticeDetails/NoticeDetails.tsx | 11 +++++----
 test/app/lmem/isNoticeValid.ts                | 24 ++++++++++++++++++-
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/app/lmem/notice.ts b/src/app/lmem/notice.ts
index ce9408806..bdd944f73 100644
--- a/src/app/lmem/notice.ts
+++ b/src/app/lmem/notice.ts
@@ -106,7 +106,6 @@ export const isNoticeValid = (notice: {
     typeof description === 'string' &&
     Object(resource) === resource &&
     typeof resource.label === 'string' &&
-    typeof resource.url === 'string' &&
     (!resource.author || typeof resource.author === 'string') &&
     Object(resource.editor) === resource.editor &&
     typeof resource.editor.label === 'string' &&
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
index bfe121b0a..2fbc4d805 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
@@ -54,4 +54,17 @@ storiesOf('organisms/NoticeDetails', module)
       dislike={action('dislike')}
       undislike={action('undislike')}
     />
+  ))
+  .add('No source', () => (
+    <NoticeDetails
+      type="Approval"
+      contributor="Lutangar"
+      id={123}
+      message={message}
+      date="12/12/2042"
+      like={action('like')}
+      unlike={action('unlike')}
+      dislike={action('dislike')}
+      undislike={action('undislike')}
+    />
   ));
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
index 8ed9e5304..388dbccdd 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
@@ -21,7 +21,7 @@ interface Props {
   type: NoticeType;
   date: string;
   message: string;
-  source: string;
+  source?: string;
   contributor: string;
   like: (id: number) => void;
   unlike: (id: number) => void;
@@ -71,10 +71,11 @@ class NoticeDetails extends PureComponent<Props & RouteComponentProps> {
             <Type type={type} />
           </DetailsMeta>
           <Message>{message}</Message>
-          <Source>
-            <Anchor /> En savoir plus : <SourceURL>{source}</SourceURL>
-          </Source>
-
+          {source && (
+            <Source>
+              <Anchor /> En savoir plus : <SourceURL>{source}</SourceURL>
+            </Source>
+          )}
           <Feedbacks>
             <Button onClick={this.handleLikeClick}>
               <Like active={liked} />
diff --git a/test/app/lmem/isNoticeValid.ts b/test/app/lmem/isNoticeValid.ts
index 5b4b87c28..d090d741e 100644
--- a/test/app/lmem/isNoticeValid.ts
+++ b/test/app/lmem/isNoticeValid.ts
@@ -299,7 +299,7 @@ describe('isNoticeValid', function() {
       // ],
       resource: {
         // author: 'Boby',
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
+        // url: 'http://choisir.lmem.net/samsung-galaxy-s6',
         label: 'Lire le comparatif',
         editor: {
           label: 'Le Gorafi',
@@ -316,4 +316,26 @@ describe('isNoticeValid', function() {
 
     expect(isNoticeValid(reco)).to.be.true;
   });
+
+  it('A notice with no source is valid', () => {
+    const notice = {
+      title: 'Il y a mieux que le Samsung Galaxy S6',
+      description: 'Que vous ayez un usage basique, avancé, professionnel [...]',
+      contributor: {
+        name: 'Maarten Samson',
+      },
+      resource: {
+        author: 'Boby',
+        // url: 'http://choisir.lmem.net/samsung-galaxy-s6',
+        label: 'Lire le comparatif',
+        editor: {
+          label: 'Le Gorafi',
+          url: 'http://legorafi.fr',
+        },
+      },
+      alternatives: [],
+    };
+
+    expect(isNoticeValid(notice)).to.be.true;
+  });
 });

From 9c0c09714f4e1b3ac010edc874d934f41fe6b607 Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Thu, 25 Apr 2019 14:24:43 +0200
Subject: [PATCH 042/100] fix: change iFrame position

---
 src/app/theme.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/theme.ts b/src/app/theme.ts
index a369d8614..f72e85690 100644
--- a/src/app/theme.ts
+++ b/src/app/theme.ts
@@ -55,8 +55,8 @@ export interface Theme {
       'min-height': string;
       'max-height': string;
       position: string;
-      top: number;
-      right: number;
+      top: string;
+      right: string;
       'z-index': number; // Max z-index value (signed 32bits integer)
       border: string;
       transition: string;
@@ -124,8 +124,8 @@ export const theme = {
       'min-height': 'initial',
       'max-height': 'initial',
       position: 'fixed',
-      top: 0,
-      right: 0,
+      top: '20px',
+      right: '20px',
       'z-index': 2147483647, // Max z-index value (signed 32bits integer)
       border: 'none',
       transition: 'height .1s',

From 97aa115e99efa00d8553802ed952ccde7afdedd2 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Sat, 11 May 2019 22:33:33 +0200
Subject: [PATCH 043/100] chore(typing): remove unused TabInfo type

---
 src/types/TabInfo.ts | 36 ------------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 src/types/TabInfo.ts

diff --git a/src/types/TabInfo.ts b/src/types/TabInfo.ts
deleted file mode 100644
index c38252a58..000000000
--- a/src/types/TabInfo.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// From https://developer.chrome.com/extensions/tabs#type-Tab
-
-type MutedInfoReason =
-  | 'user' // A user input action set the muted state.
-  | 'capture' // Tab capture was started, forcing a muted state change.
-  | 'extension'; // An extension, identified by the extensionId field, set the muted state.
-
-interface MutedInfo {
-  muted: boolean; // Whether the tab is muted (prevented from playing sound). The tab may be muted even if it has not played or is not currently playing sound. Equivalent to whether the 'muted' audio indicator is showing.
-  reason?: MutedInfoReason; // The reason the tab was muted or unmuted. Not set if the tab's mute state has never been changed.
-  extensionId?: string; // The ID of the extension that changed the muted state. Not set if an extension was not the reason the muted state last changed.
-}
-
-export interface TabInfo {
-  id?: number; // The ID of the tab. Tab IDs are unique within a browser session. Under some circumstances a tab may not be assigned an ID; for example, when querying foreign tabs using the sessions API, in which case a session ID may be present. Tab ID can also be set to chrome.tabs.TAB_ID_NONE for apps and devtools windows.
-  index: number; // The zero-based index of the tab within its window.
-  windowId: number; // The ID of the window that contains the tab.
-  openerTabId?: number; // The ID of the tab that opened this tab, if any. This property is only present if the opener tab still exists.
-  highlighted: boolean; // Whether the tab is highlighted.
-  active: boolean; // Whether the tab is active in its window. Does not necessarily mean the window is focused.
-  pinned: boolean; // Whether the tab is pinned.
-  audible?: boolean; // Since Chrome 45. Whether the tab has produced sound over the past couple of seconds (but it might not be heard if also muted). Equivalent to whether the 'speaker audio' indicator is showing.
-  discarded: boolean; // Since Chrome 54. Whether the tab is discarded. A discarded tab is one whose content has been unloaded from memory, but is still visible in the tab strip. Its content is reloaded the next time it is activated.
-  autoDiscardable: boolean; // Since Chrome 54. Whether the tab can be discarded automatically by the browser when resources are low.
-  mutedInfo?: MutedInfo; // Since Chrome 46. The tab's muted state and the reason for the last state change.
-  url?: string; // The URL the tab is displaying. This property is only present if the extension's manifest includes the "tabs" permission.
-  title?: string; // The title of the tab. This property is only present if the extension's manifest includes the "tabs" permission.
-  favIconUrl?: string; // The URL of the tab's favicon. This property is only present if the extension's manifest includes the "tabs" permission. It may also be an empty string if the tab is loading.
-  status?: 'loading' | 'complete'; // Either loading or complete.
-  incognito: boolean; // Whether the tab is in an incognito window.
-  width?: number; // Since Chrome 31. The width of the tab in pixels.
-  height?: number; // Since Chrome 31. The height of the tab in pixels.
-  sessionId?: string; // Since Chrome 31. The session ID used to uniquely identify a tab obtained from the sessions API.
-}
-
-export default TabInfo;

From 620d678e3b1d540e4d493362da73b80955f78b21 Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Fri, 12 Apr 2019 11:39:27 +0200
Subject: [PATCH 044/100] chore(redux): upgrade react-redux to get rid of
 mismatch types warnings

---
 package.json |   2 +-
 yarn.lock    | 309 +++++++--------------------------------------------
 2 files changed, 42 insertions(+), 269 deletions(-)

diff --git a/package.json b/package.json
index ac9d7d81c..5294b1039 100644
--- a/package.json
+++ b/package.json
@@ -182,7 +182,7 @@
     "react": "^16.6.0",
     "react-dom": "^16.6.0",
     "react-hot-loader": "^4.3.11",
-    "react-redux": "^6.0.0",
+    "react-redux": "^6.0.1",
     "react-router": "^4.3.1",
     "react-router-dom": "^4.3.1",
     "redux": "^4.0.1",
diff --git a/yarn.lock b/yarn.lock
index 1d8d997c9..e0ecc8bc3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1090,7 +1090,7 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.2.0":
+"@babel/runtime@^7.0.0":
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.1.tgz#574b03e8e8a9898eaf4a872a92ea20b7846f6f2a"
   dependencies:
@@ -1102,6 +1102,12 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
+"@babel/runtime@^7.3.1":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.3.tgz#79888e452034223ad9609187a0ad1fe0d2ad4bdc"
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@babel/template@^7.1.0", "@babel/template@^7.1.2":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
@@ -1165,7 +1171,6 @@
 "@emmetio/extract-abbreviation@0.1.6":
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/@emmetio/extract-abbreviation/-/extract-abbreviation-0.1.6.tgz#e4a9856c1057f0aff7d443b8536477c243abe28c"
-  integrity sha512-Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw==
 
 "@emotion/cache@^0.8.8":
   version "0.8.8"
@@ -1263,7 +1268,6 @@
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
-  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
   dependencies:
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
@@ -1271,7 +1275,6 @@
 "@nodelib/fs.stat@^1.1.2":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
-  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
 "@octokit/rest@^15.2.0":
   version "15.9.4"
@@ -1289,7 +1292,6 @@
 "@redux-saga/core@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.0.2.tgz#4336a5bb4253e5ca69681c25a863fbbc03ea6d88"
-  integrity sha512-AsJYcpuYfM1cmxJvfhXs9HAFSZVEG17TMsLPlXH7+Hq5a5ZP4GqcbtijEmS2AC7NR5lLJHy8csxpqz22PeW5dw==
   dependencies:
     "@babel/runtime" "^7.0.0"
     "@redux-saga/deferred" "^1.0.1"
@@ -1303,19 +1305,16 @@
 "@redux-saga/deferred@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@redux-saga/deferred/-/deferred-1.0.1.tgz#c895445e486bded90acf0b873b4e978fbfe458c2"
-  integrity sha512-+gW5xQ93QXOOmRLAmX8x2Hx1HpbTG6CM6+HcdTSbJovh4uMWaGyeDECnqXSt8QqA/ja3s2nqYXLqXFKepIQ1hw==
 
 "@redux-saga/delay-p@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@redux-saga/delay-p/-/delay-p-1.0.1.tgz#d69fc6103c7509ae80faa144ea17bbc69e51e029"
-  integrity sha512-0SnNDyDLUyB4NThtptAwiprNOnbCNhoed/Rp5JwS7SB+a/AdWynVgg/E6BmjsggLFNr07KW0bzn05tsPRBuU7Q==
   dependencies:
     "@redux-saga/symbols" "^1.0.1"
 
 "@redux-saga/is@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@redux-saga/is/-/is-1.0.2.tgz#7f4be014c97061898d7efb11d6c9de31e943ed38"
-  integrity sha512-WnaUOwYvPK2waWjzebT4uhL8zY76XNkzzpJ2EQJe8bN1tByvAjvT7MuJZTSshOhdHL5PsRO0MsH224XIXBJidQ==
   dependencies:
     "@redux-saga/symbols" "^1.0.1"
     "@redux-saga/types" "^1.0.2"
@@ -1323,17 +1322,14 @@
 "@redux-saga/symbols@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@redux-saga/symbols/-/symbols-1.0.1.tgz#46512ae1275f88df061c42168d0f600ddb170c1e"
-  integrity sha512-akKkzcVnb1RzJaZV2LQFbi51abvdICMuAKwwLoCjjxLbLAGIw9EJxk5ucNnWSSCEsoEQMeol5tkAcK+Xzuv1Bg==
 
 "@redux-saga/types@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.0.2.tgz#1d94f02800b094753f9271c206a26c2a06ca14ee"
-  integrity sha512-8/qcMh15507AnXJ3lBeuhsdFwnWQqnp68EpUuHlYPixJ5vjVmls7/Jq48cnUlrZI8Jd9U1jkhfCl0gaT5KMgVw==
 
 "@samverschueren/stream-to-observable@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
-  integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==
   dependencies:
     any-observable "^0.3.0"
 
@@ -1444,7 +1440,6 @@
 "@sinonjs/commons@^1", "@sinonjs/commons@^1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.4.0.tgz#7b3ec2d96af481d7a0321252e7b1c94724ec5a78"
-  integrity sha512-9jHK3YF/8HtJ9wCAbG+j8cD0i0+ATS9A7gXFqS36TblLPNy6rEEc+SB0imo91eCboGaBYGV/MT1/br/J+EE7Tw==
   dependencies:
     type-detect "4.0.8"
 
@@ -1457,7 +1452,6 @@
 "@sinonjs/formatio@^3.1.0", "@sinonjs/formatio@^3.2.1":
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-3.2.1.tgz#52310f2f9bcbc67bdac18c94ad4901b95fde267e"
-  integrity sha512-tsHvOB24rvyvV2+zKMmPkZ7dXX6LSLKZ7aOtXY6Edklp0uRcgGpOsQTTGTcWViFyx4uhWc6GV8QdnALbIbIdeQ==
   dependencies:
     "@sinonjs/commons" "^1"
     "@sinonjs/samsam" "^3.1.0"
@@ -1465,7 +1459,6 @@
 "@sinonjs/samsam@^3.1.0", "@sinonjs/samsam@^3.3.0":
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-3.3.1.tgz#e88c53fbd9d91ad9f0f2b0140c16c7c107fe0d07"
-  integrity sha512-wRSfmyd81swH0hA1bxJZJ57xr22kC07a1N4zuIL47yTS04bDk6AoCkczcqHEjcRPmJ+FruGJ9WBQiJwMtIElFw==
   dependencies:
     "@sinonjs/commons" "^1.0.2"
     array-from "^2.1.1"
@@ -1474,7 +1467,6 @@
 "@sinonjs/text-encoding@^0.7.1":
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
-  integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
 
 "@storybook/addon-actions@^4.1.11":
   version "4.1.11"
@@ -1865,70 +1857,58 @@
 "@types/chai@*", "@types/chai@^4.1.7":
   version "4.1.7"
   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.7.tgz#1b8e33b61a8c09cbe1f85133071baa0dbf9fa71a"
-  integrity sha512-2Y8uPt0/jwjhQ6EiluT0XCri1Dbplr0ZxfFXUz+ye13gaqE8u5gL5ppao1JrUYr9cIip5S6MvQzBS7Kke7U9VA==
 
 "@types/chrome@^0.0.81":
   version "0.0.81"
   resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.81.tgz#4fbf34c370a60235be4f97f32429e701fb644d10"
-  integrity sha512-NKkQGMJSppFwUwMbEbYcq8/p/ACVHmQCUpWaqJVdHn81tU3by+YXnxw86KFa0tUSLamu35wtzFaMyY4TFaMceQ==
   dependencies:
     "@types/filesystem" "*"
 
 "@types/filesystem@*":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.29.tgz#ee3748eb5be140dcf980c3bd35f11aec5f7a3748"
-  integrity sha512-85/1KfRedmfPGsbK8YzeaQUyV1FQAvMPMTuWFQ5EkLd2w7szhNO96bk3Rh/SKmOfd9co2rCLf0Voy4o7ECBOvw==
   dependencies:
     "@types/filewriter" "*"
 
 "@types/filewriter@*":
   version "0.0.28"
   resolved "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.28.tgz#c054e8af4d9dd75db4e63abc76f885168714d4b3"
-  integrity sha1-wFTor02d11205jq8dviFFocU1LM=
 
 "@types/flat@^0.0.28":
   version "0.0.28"
   resolved "https://registry.yarnpkg.com/@types/flat/-/flat-0.0.28.tgz#5c788149d85a6cf8ff5f5f000acdd912cdea4274"
-  integrity sha1-XHiBSdhabPj/X18ACs3ZEs3qQnQ=
 
 "@types/history@*", "@types/history@^4.7.2":
   version "4.7.2"
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.2.tgz#0e670ea254d559241b6eeb3894f8754991e73220"
-  integrity sha512-ui3WwXmjTaY73fOQ3/m3nnajU/Orhi6cEu5rzX+BrAAJxa3eITXZ5ch9suPqtM03OWhAHhPSyBGCN4UKoxO20Q==
 
 "@types/hoist-non-react-statics@*":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#a59c0c995cc885bef1b8ec2241b114f9b35b517b"
-  integrity sha512-O2OGyW9wlO2bbDmZRH17MecArQfsIa1g//ve2IJk6BnmwEglFz5kdhP1BlgeqjVNH5IHIhsc83DWFo8StCe8+Q==
   dependencies:
     "@types/react" "*"
 
 "@types/isomorphic-fetch@^0.0.35":
   version "0.0.35"
   resolved "https://registry.yarnpkg.com/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.35.tgz#c1c0d402daac324582b6186b91f8905340ea3361"
-  integrity sha512-DaZNUvLDCAnCTjgwxgiL1eQdxIKEpNLOlTNtAgnZc50bG2copGhRrFN9/PxPBuJe+tZVLCbQ7ls0xveXVRPkvw==
 
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
 "@types/lodash-es@^4.17.3":
   version "4.17.3"
   resolved "https://registry.yarnpkg.com/@types/lodash-es/-/lodash-es-4.17.3.tgz#87eb0b3673b076b8ee655f1890260a136af09a2d"
-  integrity sha512-iHI0i7ZAL1qepz1Y7f3EKg/zUMDwDfTzitx+AlHhJJvXwenP682ZyGbgPSc5Ej3eEAKVbNWKFuwOadCj5vBbYQ==
   dependencies:
     "@types/lodash" "*"
 
 "@types/lodash@*":
   version "4.14.123"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.123.tgz#39be5d211478c8dd3bdae98ee75bb7efe4abfe4d"
-  integrity sha512-pQvPkc4Nltyx7G1Ww45OjVqUsJP4UsZm+GWJpigXgkikZqJgRm4c48g027o6tdgubWHwFRF15iFd+Y4Pmqv6+Q==
 
 "@types/mocha@^5.2.6":
   version "5.2.6"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.6.tgz#b8622d50557dd155e9f2f634b7d68fd38de5e94b"
-  integrity sha512-1axi39YdtBI7z957vdqXI4Ac25e7YihYQtJa+Clnxg1zTJEaIRbndt71O3sP4GAMgiAm0pY26/b9BrY4MR/PMw==
 
 "@types/node@*":
   version "10.12.0"
@@ -1937,7 +1917,6 @@
 "@types/prop-types@*":
   version "15.7.0"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.0.tgz#4c48fed958d6dcf9487195a0ef6456d5f6e0163a"
-  integrity sha512-eItQyV43bj4rR3JPV0Skpl1SncRCdziTEK9/v8VwXmV6d/qOUO8/EuWeHBbCZcsfSHfzI5UyMJLCSXtxxznyZg==
 
 "@types/q@^1.5.1":
   version "1.5.1"
@@ -1946,19 +1925,16 @@
 "@types/ramda@^0.26.3":
   version "0.26.3"
   resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.26.3.tgz#e6c35cb0a75843c9cfe58e0be294ffbc4480f33e"
-  integrity sha512-ZTepXW1dgQySkTUbxb2JC61vJxnLqofq4S43rFWpobRRsDh9HgNQxjEWhjQcjoYAMhkyV8JsE9mhE7Pgo3AYbg==
 
 "@types/react-dom@^16.8.2":
   version "16.8.2"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.8.2.tgz#9bd7d33f908b243ff0692846ef36c81d4941ad12"
-  integrity sha512-MX7n1wq3G/De15RGAAqnmidzhr2Y9O/ClxPxyqaNg96pGyeXUYPSvujgzEVpLo9oIP4Wn1UETl+rxTN02KEpBw==
   dependencies:
     "@types/react" "*"
 
 "@types/react-native@*":
   version "0.57.38"
   resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.57.38.tgz#2ff6ed1a7cc207afbfd87bf496513d96931d1446"
-  integrity sha512-bmY2ad/vQgP0HMT7Q7EQzirDBt5ibp+kBHclTnY7/i5MrdqE1oY+3b9NkDg3ohXlumr7p5stAG6I55nhfeUV6Q==
   dependencies:
     "@types/prop-types" "*"
     "@types/react" "*"
@@ -1966,7 +1942,6 @@
 "@types/react-redux@^7.0.3":
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.0.3.tgz#b8dc3faa954b7f28e4b0209bcf9209b45251ed6b"
-  integrity sha512-6qsIHHNwF41viooUgR2lXHL81v3uyeJsugq9YCMYE4g2bDyG710G/I/w5nbn7AQ9XfuOLUwrWfm3edV7gDJ9AQ==
   dependencies:
     "@types/hoist-non-react-statics" "*"
     "@types/react" "*"
@@ -1975,7 +1950,6 @@
 "@types/react-router-dom@^4.3.1":
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-4.3.1.tgz#71fe2918f8f60474a891520def40a63997dafe04"
-  integrity sha512-GbztJAScOmQ/7RsQfO4cd55RuH1W4g6V1gDW3j4riLlt+8yxYLqqsiMzmyuXBLzdFmDtX/uU2Bpcm0cmudv44A==
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
@@ -1984,7 +1958,6 @@
 "@types/react-router@*", "@types/react-router@^4.4.4":
   version "4.4.4"
   resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-4.4.4.tgz#4dbd5588ea6024e0c04519bd8aabe74c0a2b77e5"
-  integrity sha512-TZVfpT6nvUv/lbho/nRtckEtgkhspOQr3qxrnpXixwgQRKKyg5PvDfNKc8Uend/p/Pi70614VCmC0NPAKWF+0g==
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
@@ -1992,7 +1965,6 @@
 "@types/react@*", "@types/react@^16.8.7":
   version "16.8.7"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.8.7.tgz#7b1c0223dd5494f9b4501ad2a69aa6acb350a29b"
-  integrity sha512-0xbkIyrDNKUn4IJVf8JaCn+ucao/cq6ZB8O6kSzhrJub1cVSqgTArtG0qCfdERWKMEIvUbrwLXeQMqWEsyr9dA==
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"
@@ -2000,28 +1972,24 @@
 "@types/redux-immutable-state-invariant@^2.1.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@types/redux-immutable-state-invariant/-/redux-immutable-state-invariant-2.1.0.tgz#b88d3f49c8187aba691313bd8263f2dd5a41f45c"
-  integrity sha512-QmzPRr4YVC4S7XRORufWopi6B+8c0v/xevSK58iEpwUNIiTKG6RUyZPHtTlUdNQ6S/wHoeNHYRGPh8ryv3b/1Q==
   dependencies:
     redux "^3.6.0 || ^4.0.0"
 
 "@types/redux-logger@^3.0.7":
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/@types/redux-logger/-/redux-logger-3.0.7.tgz#163f6f6865c69c21d56f9356dc8d741718ec0db0"
-  integrity sha512-oV9qiCuowhVR/ehqUobWWkXJjohontbDGLV88Be/7T4bqMQ3kjXwkFNL7doIIqlbg3X2PC5WPziZ8/j/QHNQ4A==
   dependencies:
     redux "^3.6.0"
 
 "@types/remote-redux-devtools@^0.5.3":
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/@types/remote-redux-devtools/-/remote-redux-devtools-0.5.3.tgz#04a1ed04566bfd0115be14dc933d5c47a6e59676"
-  integrity sha512-BiYLbXBzN4HA/pSgwlebtAwd35L+PD4lkUPPxzHqFQCZDP5bHTuRp8xCUQDKiU2iRWBgtI9cZRgQQR0Pv1LF3w==
   dependencies:
     redux "^4.0.0"
 
 "@types/sinon-chai@^3.2.2":
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/@types/sinon-chai/-/sinon-chai-3.2.2.tgz#5cfdbda70bae30f79a9423334af9e490e4cce793"
-  integrity sha512-5zSs2AslzyPZdOsbm2NRtuSNAI2aTWzNKOHa/GRecKo7a5efYD7qGcPxMZXQDayVXT2Vnd5waXxBvV31eCZqiA==
   dependencies:
     "@types/chai" "*"
     "@types/sinon" "*"
@@ -2029,17 +1997,14 @@
 "@types/sinon@*", "@types/sinon@^7.0.10":
   version "7.0.10"
   resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.0.10.tgz#1f921f0c347b19f754e61dbc671c088df73fe1ff"
-  integrity sha512-4w7SvsiUOtd4mUfund9QROPSJ5At/GQskDpqd87pJIRI6ULWSJqHI3GIZE337wQuN3aznroJGr94+o8fwvL37Q==
 
 "@types/storybook__addon-actions@^3.4.2":
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/@types/storybook__addon-actions/-/storybook__addon-actions-3.4.2.tgz#1d08689cc3259269ddb3479a2307c9d16944309e"
-  integrity sha512-CWxGz2pXav9PHcwrtXmkuH+xJL7sAu2AmIGEbkdT3Xs5jzBPZUEDEN//ZF7o6IOPP/tdXU37K1hrVMt9TDO0Bw==
 
 "@types/storybook__addon-knobs@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/storybook__addon-knobs/-/storybook__addon-knobs-4.0.1.tgz#fcd7ba4875130b7dddf688a77b95d8f28e35e6f0"
-  integrity sha512-7T1Oaw8ojdGGwVNspbBjpZioxtY9ySmMXvRzf3fCJhpexizNw49uzBD6MwhHUdboP1A/pDFWKVfv9ZDKeNXIHQ==
   dependencies:
     "@types/react" "*"
     "@types/storybook__react" "*"
@@ -2047,7 +2012,6 @@
 "@types/storybook__react@*", "@types/storybook__react@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/storybook__react/-/storybook__react-4.0.1.tgz#b6320c9d027b8ee7ef1445fef8b4cba196d48ace"
-  integrity sha512-knkZErqv8Iy2QbebqBa5tsy2itIMKdO6bcQ7C19nmgTc+j1pnQhXCGcVyARzAQ1/NAuSYudSWQAKG+plgK7hyQ==
   dependencies:
     "@types/react" "*"
     "@types/webpack-env" "*"
@@ -2055,7 +2019,6 @@
 "@types/styled-components@^4.1.12":
   version "4.1.12"
   resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-4.1.12.tgz#62c19bd1aa37b1a904d36c179a0fec66c24ac99c"
-  integrity sha512-Du0bltHm5sWkDnXzYi6cMNhnSKWHQW6//at359DtRJNfjeG1SdtqQPX6jiVtrUkBJ1JsjxqT18DssYBLJ/fg/A==
   dependencies:
     "@types/react" "*"
     "@types/react-native" "*"
@@ -2083,7 +2046,6 @@
 "@types/webpack-env@*":
   version "1.13.8"
   resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.8.tgz#859e35ab1811eccd35e6b8d692a622b0fa7b31ec"
-  integrity sha512-PWkdsHTGMQHbiZwCJrFRhookFnOBw5gboW7cLcx+QyTMpwCVEr3SxzVO3L52krDnuoq50S02IiMLGIt6AmhFug==
 
 "@webassemblyjs/ast@1.7.10":
   version "1.7.10"
@@ -2292,7 +2254,6 @@ acorn@^6.0.2:
 add-asset-webpack-plugin@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/add-asset-webpack-plugin/-/add-asset-webpack-plugin-0.1.0.tgz#2d2b16538b44f5ef0e17d60ee3c688978a6f9d82"
-  integrity sha1-LSsWU4tE9e8OF9YO48aIl4pvnYI=
 
 address@1.0.3, address@^1.0.1:
   version "1.0.3"
@@ -2401,7 +2362,6 @@ ansi-align@^3.0.0:
 ansi-colors@3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
-  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
 
 ansi-colors@^3.0.0:
   version "3.2.1"
@@ -2422,7 +2382,6 @@ ansi-html@0.0.7:
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
   version "3.0.0"
@@ -2435,7 +2394,6 @@ ansi-regex@^4.0.0:
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
 ansi-styles@^3.2.1:
   version "3.2.1"
@@ -2458,7 +2416,6 @@ ansistyles@~0.1.3:
 any-observable@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
-  integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
 
 anymatch@^2.0.0:
   version "2.0.0"
@@ -2534,7 +2491,6 @@ aria-query@^3.0.0:
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
   dependencies:
     arr-flatten "^1.0.1"
 
@@ -2606,7 +2562,6 @@ array-uniq@^1.0.0, array-uniq@^1.0.1:
 array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
 
 array-unique@^0.3.2:
   version "0.3.2"
@@ -2639,7 +2594,6 @@ asap@^2.0.0:
 asap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/asap/-/asap-1.0.0.tgz#b2a45da5fdfa20b0496fc3768cc27c12fa916a7d"
-  integrity sha1-sqRdpf36ILBJb8N2jMJ8EvqRan0=
 
 asap@~2.0.3:
   version "2.0.5"
@@ -2676,7 +2630,6 @@ assert@^1.1.1:
 assertion-error@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
-  integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
 
 assign-symbols@^1.0.0:
   version "1.0.0"
@@ -2719,7 +2672,6 @@ async@^2.0.0, async@^2.1.4:
 async@^2.5.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
-  integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
   dependencies:
     lodash "^4.17.11"
 
@@ -2756,7 +2708,6 @@ autoprefixer@^9.3.1:
 awesome-typescript-loader@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-5.2.1.tgz#a41daf7847515f4925cdbaa3075d61f289e913fc"
-  integrity sha512-slv66OAJB8orL+UUaTI3pKlLorwIvS4ARZzYR9iJJyGsEgOqueMfOMdKySWzZ73vIkEe3fcwFgsKMg4d8zyb1g==
   dependencies:
     chalk "^2.4.1"
     enhanced-resolve "^4.0.0"
@@ -2926,7 +2877,6 @@ babel-plugin-minify-type-constructors@^0.4.3:
 babel-plugin-module-resolver@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz#ddfa5e301e3b9aa12d852a9979f18b37881ff5a7"
-  integrity sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==
   dependencies:
     find-babel-config "^1.1.0"
     glob "^7.1.2"
@@ -3088,7 +3038,6 @@ bail@^1.0.0:
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base-64@0.1.0:
   version "0.1.0"
@@ -3241,7 +3190,6 @@ brace-expansion@^1.1.7:
 braces@^1.8.2:
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
   dependencies:
     expand-range "^1.8.1"
     preserve "^0.2.0"
@@ -3469,7 +3417,6 @@ cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
 cacache@^11.3.1:
   version "11.3.2"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
-  integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
   dependencies:
     bluebird "^3.5.3"
     chownr "^1.1.1"
@@ -3507,7 +3454,6 @@ call-limit@~1.1.0:
 call-me-maybe@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
-  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
 
 caller-callsite@^2.0.0:
   version "2.0.0"
@@ -3622,14 +3568,12 @@ center-align@^0.1.1:
 chai-as-promised@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0"
-  integrity sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==
   dependencies:
     check-error "^1.0.2"
 
 chai@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/chai/-/chai-4.2.0.tgz#760aa72cf20e3795e84b12877ce0e83737aa29e5"
-  integrity sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==
   dependencies:
     assertion-error "^1.1.0"
     check-error "^1.0.2"
@@ -3693,7 +3637,6 @@ chardet@^0.7.0:
 check-error@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
-  integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
 
 cheerio@^1.0.0-rc.2:
   version "1.0.0-rc.2"
@@ -3774,7 +3717,6 @@ ci-info@^1.4.0, ci-info@^1.5.0:
 ci-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
 cidr-regex@^2.0.10:
   version "2.0.10"
@@ -3819,7 +3761,6 @@ clean-stack@^1.0.0:
 clean-webpack-plugin@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-2.0.1.tgz#2241526b0030aa0249e78714471298f867fc2829"
-  integrity sha512-vway5pXGVd91bicwjaf8j188Al6VMf9R9Ekl6q0qeiaWStRsOOXuh4qtjX1UrUvmz5XevQVCdjBuzr4Tzsnpog==
   dependencies:
     del "^4.0.0"
 
@@ -3858,7 +3799,6 @@ cli-table@^0.3.1:
 cli-truncate@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
-  integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=
   dependencies:
     slice-ansi "0.0.4"
     string-width "^1.0.1"
@@ -3915,7 +3855,6 @@ clone@2.1.1:
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
 cmd-shim@^2.0.2, cmd-shim@~2.0.2:
   version "2.0.2"
@@ -4057,7 +3996,6 @@ compression@^1.5.2:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 concat-stream@1.6.0:
   version "1.6.0"
@@ -4225,7 +4163,6 @@ copy-to-clipboard@^3.0.8:
 copy-webpack-plugin@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.0.tgz#db3269ab83e8a2c3316c1bc9cba54019bbcf5c17"
-  integrity sha512-iiDj+8nnZeW/i8vYJ3+ABSZkOefJnDYIGLojiZKKFDvf1wcEInABXH1+hN7axQMn04qvJxKjgVOee0e14XPtCg==
   dependencies:
     cacache "^11.3.1"
     find-cache-dir "^2.0.0"
@@ -4253,7 +4190,6 @@ core-js@^2.5.7:
 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"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 cosmiconfig@^4.0.0:
   version "4.0.0"
@@ -4284,7 +4220,6 @@ cosmiconfig@^5.0.1:
 cosmiconfig@^5.0.2:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
-  integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
   dependencies:
     import-fresh "^2.0.0"
     is-directory "^0.3.1"
@@ -4539,7 +4474,6 @@ cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
 csstype@^2.2.0:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.3.tgz#b701e5968245bf9b08d54ac83d00b624e622a9fa"
-  integrity sha512-rINUZXOkcBmoHWEyu7JdHu5JMzkGRoMX4ov9830WNgxf5UYxcBUO0QTKAqeJ5EZfSdlrcJYkC8WwfVW7JYi4yg==
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
@@ -4554,7 +4488,6 @@ cyclist@~0.2.2:
 d@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
-  integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
   dependencies:
     es5-ext "^0.10.9"
 
@@ -4575,7 +4508,6 @@ dashify@^0.2.0:
 date-fns@^1.27.2:
   version "1.30.1"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
-  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
 
 date-now@^0.1.4:
   version "0.1.4"
@@ -4649,7 +4581,6 @@ decode-uri-component@^0.2.0:
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
-  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
 
 deep-diff@^0.3.5:
   version "0.3.8"
@@ -4658,7 +4589,6 @@ deep-diff@^0.3.5:
 deep-eql@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
-  integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==
   dependencies:
     type-detect "^4.0.0"
 
@@ -4677,7 +4607,6 @@ deep-is@~0.1.3:
 deepmerge@^2.0.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
-  integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
 
 default-gateway@^2.6.0:
   version "2.7.2"
@@ -4750,7 +4679,6 @@ del@^3.0.0:
 del@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/del/-/del-4.0.0.tgz#4fa27e92c366cb45b9bdaa56a9b8703dced17437"
-  integrity sha512-/BnSJ+SuZyLu7xMn48kZY0nMXDi+5KNmR4g8n21Wivsl8+B9njV6/5kcTNE9juSprp0zRWBU28JuHUq0FqK1Nw==
   dependencies:
     globby "^6.1.0"
     is-path-cwd "^2.0.0"
@@ -4785,7 +4713,6 @@ destroy@~1.0.4:
 detect-file@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
 detect-indent@^5.0.0, detect-indent@~5.0.0:
   version "5.0.0"
@@ -4867,7 +4794,6 @@ dns-txt@^2.0.2:
 doctrine@0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-0.7.2.tgz#7cb860359ba3be90e040b26b729ce4bfa654c523"
-  integrity sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=
   dependencies:
     esutils "^1.1.6"
     isarray "0.0.1"
@@ -5053,7 +4979,6 @@ electron-to-chromium@^1.3.82:
 elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
-  integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
 
 elliptic@^6.0.0:
   version "6.4.1"
@@ -5215,7 +5140,6 @@ es-to-primitive@^1.2.0:
 es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
   version "0.10.48"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.48.tgz#9a0b31eeded39e64453bcedf6f9d50bbbfb43850"
-  integrity sha512-CdRvPlX/24Mj5L4NVxTs4804sxiS2CjVprgCmrgoDkdmjdY4D+ySHa7K3jJf8R40dFg0tIm3z/dk326LrnuSGw==
   dependencies:
     es6-iterator "~2.0.3"
     es6-symbol "~3.1.1"
@@ -5228,7 +5152,6 @@ es5-shim@^4.5.10:
 es6-iterator@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
-  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
   dependencies:
     d "1"
     es5-ext "^0.10.35"
@@ -5255,7 +5178,6 @@ es6-shim@^0.35.3:
 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"
-  integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -5298,7 +5220,6 @@ eslint-config-airbnb@^17.1.0:
 eslint-import-resolver-babel-module@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-babel-module/-/eslint-import-resolver-babel-module-5.0.1.tgz#02e36fbefa7aaf8ff0d298ed2651ea48ad26dd1e"
-  integrity sha512-q1IDVrpXAKz90t4x/S9RUeQgSK5wfH1AF/tR3iUAmLeCiAEVep/tNtX9EhQjut8DLgloUfUHoJWd8QCAJXhv+A==
   dependencies:
     pkg-up "^2.0.0"
     resolve "^1.10.0"
@@ -5306,7 +5227,6 @@ eslint-import-resolver-babel-module@^5.0.1:
 eslint-import-resolver-node@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
-  integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==
   dependencies:
     debug "^2.6.9"
     resolve "^1.5.0"
@@ -5324,7 +5244,6 @@ eslint-loader@^2.1.1:
 eslint-module-utils@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz#546178dab5e046c8b562bbb50705e2456d7bda49"
-  integrity sha512-lmDJgeOOjk8hObTysjqH7wyMi+nsHwwvfBykwfhjR1LNdd7C2uFJBvx4OpWYpXOw4df1yE1cDEVd1yLHitk34w==
   dependencies:
     debug "^2.6.8"
     pkg-dir "^2.0.0"
@@ -5332,7 +5251,6 @@ eslint-module-utils@^2.3.0:
 eslint-plugin-import@^2.16.0:
   version "2.16.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.16.0.tgz#97ac3e75d0791c4fac0e15ef388510217be7f66f"
-  integrity sha512-z6oqWlf1x5GkHIFgrSvtmudnqM6Q60KM4KvpWi5ubonMjycLjndvd5+8VAZIsTlHC03djdgJuyKG6XO577px6A==
   dependencies:
     contains-path "^0.1.0"
     debug "^2.6.9"
@@ -5361,7 +5279,6 @@ eslint-plugin-jsx-a11y@^6.1.2:
 eslint-plugin-module-resolver@^0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-module-resolver/-/eslint-plugin-module-resolver-0.8.0.tgz#5d8802d2787d512f88eb335f04b8e3add99d9f5f"
-  integrity sha512-5zGjva7/n9kDq8CENVIQAkPr4hHOl+T2049UvKjK3TlFUb3ukzll8CWQowJcE08twG+dfOnQblG6Ok4sScWwzg==
   dependencies:
     find-babel-config "^1.1.0"
 
@@ -5492,7 +5409,6 @@ estraverse@~4.1.0:
 esutils@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375"
-  integrity sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U=
 
 esutils@^2.0.0, esutils@^2.0.2:
   version "2.0.2"
@@ -5556,7 +5472,6 @@ execa@^0.7.0:
 execa@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
   dependencies:
     cross-spawn "^6.0.0"
     get-stream "^4.0.0"
@@ -5579,7 +5494,6 @@ exenv@^1.2.0:
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
   dependencies:
     is-posix-bracket "^0.1.0"
 
@@ -5598,7 +5512,6 @@ expand-brackets@^2.1.4:
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
   dependencies:
     fill-range "^2.1.0"
 
@@ -5671,7 +5584,6 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
 extend@^3.0.0, extend@~3.0.0, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 external-editor@^3.0.0, external-editor@^3.0.3:
   version "3.0.3"
@@ -5684,7 +5596,6 @@ external-editor@^3.0.0, external-editor@^3.0.3:
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
   dependencies:
     is-extglob "^1.0.0"
 
@@ -5729,7 +5640,6 @@ fast-deep-equal@^2.0.1:
 fast-glob@^2.0.2:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295"
-  integrity sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==
   dependencies:
     "@mrmlnc/readdir-enhanced" "^2.2.1"
     "@nodelib/fs.stat" "^1.1.2"
@@ -5759,7 +5669,6 @@ faye-websocket@^0.10.0:
 faye-websocket@~0.11.0, faye-websocket@~0.11.1:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
-  integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
   dependencies:
     websocket-driver ">=0.5.1"
 
@@ -5800,7 +5709,6 @@ figgy-pudding@^3.0.0, figgy-pudding@^3.1.0, figgy-pudding@^3.4.1, figgy-pudding@
 figures@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
   dependencies:
     escape-string-regexp "^1.0.5"
     object-assign "^4.1.0"
@@ -5843,7 +5751,6 @@ file-system-cache@^1.0.5:
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
 
 filesize@3.6.1:
   version "3.6.1"
@@ -5852,7 +5759,6 @@ filesize@3.6.1:
 fill-range@^2.1.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
@@ -5884,7 +5790,6 @@ finalhandler@1.1.1:
 find-babel-config@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.1.0.tgz#acc01043a6749fec34429be6b64f542ebb5d6355"
-  integrity sha1-rMAQQ6Z0n+w0Qpvmtk9ULrtdY1U=
   dependencies:
     json5 "^0.5.1"
     path-exists "^3.0.0"
@@ -5920,7 +5825,6 @@ find-npm-prefix@^1.0.2:
 find-parent-dir@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
-  integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=
 
 find-up@3.0.0, find-up@^3.0.0:
   version "3.0.0"
@@ -5951,7 +5855,6 @@ find-versions@^2.0.0:
 findup-sync@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
-  integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
   dependencies:
     detect-file "^1.0.0"
     is-glob "^3.1.0"
@@ -5983,7 +5886,6 @@ flush-write-stream@^1.0.0:
 fn-name@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
-  integrity sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=
 
 follow-redirects@^1.0.0:
   version "1.5.9"
@@ -6161,7 +6063,6 @@ fuse.js@^3.0.1, fuse.js@^3.3.0:
 g-status@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/g-status/-/g-status-2.0.2.tgz#270fd32119e8fc9496f066fe5fe88e0a6bc78b97"
-  integrity sha512-kQoE9qH+T1AHKgSSD0Hkv98bobE90ILQcXAF4wvGgsr7uFqNvwmh8j+Lq3l0RVt3E3HjSbv2B9biEGcEtpHLCA==
   dependencies:
     arrify "^1.0.1"
     matcher "^1.0.0"
@@ -6210,12 +6111,10 @@ get-caller-file@^1.0.1:
 get-func-name@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
-  integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
 
 get-own-enumerable-property-symbols@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203"
-  integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==
 
 get-params@^0.1.2:
   version "0.1.2"
@@ -6236,7 +6135,6 @@ get-stream@^3.0.0:
 get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
   dependencies:
     pump "^3.0.0"
 
@@ -6277,7 +6175,6 @@ git-url-parse@^10.0.1:
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
   dependencies:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
@@ -6285,7 +6182,6 @@ glob-base@^0.3.0:
 glob-parent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
   dependencies:
     is-glob "^2.0.0"
 
@@ -6299,7 +6195,6 @@ glob-parent@^3.1.0:
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
-  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
 glob@7.1.3, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.3, glob@~7.1.2:
   version "7.1.3"
@@ -6398,7 +6293,6 @@ globby@^6.1.0:
 globby@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
-  integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
   dependencies:
     array-union "^1.0.1"
     dir-glob "^2.0.0"
@@ -6499,7 +6393,6 @@ har-validator@~5.1.0:
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
   dependencies:
     ansi-regex "^2.0.0"
 
@@ -6634,7 +6527,7 @@ hoist-non-react-statics@^2.5.0:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
 
-hoist-non-react-statics@^3.2.1:
+hoist-non-react-statics@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
   dependencies:
@@ -6822,7 +6715,6 @@ humanize-ms@^1.2.1:
 husky@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0"
-  integrity sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==
   dependencies:
     cosmiconfig "^5.0.7"
     execa "^1.0.0"
@@ -6888,7 +6780,6 @@ ignore-walk@^3.0.1:
 ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
-  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
 
 ignore@^4.0.0, ignore@^4.0.6:
   version "4.0.6"
@@ -6965,7 +6856,6 @@ indexof@0.0.1:
 inflight@^1.0.4, inflight@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -7133,7 +7023,6 @@ is-boolean-object@^1.0.0:
 is-buffer@^1.0.2, 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"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-buffer@^2.0.0, is-buffer@~2.0.3:
   version "2.0.3"
@@ -7162,7 +7051,6 @@ is-ci@^1.0.10:
 is-ci@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
-  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
   dependencies:
     ci-info "^2.0.0"
 
@@ -7219,12 +7107,10 @@ is-dom@^1.0.9:
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
   dependencies:
     is-primitive "^2.0.0"
 
@@ -7264,7 +7150,6 @@ is-extendable@^1.0.1:
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
@@ -7293,7 +7178,6 @@ is-generator-function@^1.0.6:
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
   dependencies:
     is-extglob "^1.0.0"
 
@@ -7331,7 +7215,6 @@ is-number-object@^1.0.3:
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
   dependencies:
     kind-of "^3.0.2"
 
@@ -7344,7 +7227,6 @@ is-number@^3.0.0:
 is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
 is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
@@ -7353,7 +7235,6 @@ is-obj@^1.0.0, is-obj@^1.0.1:
 is-observable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
-  integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==
   dependencies:
     symbol-observable "^1.1.0"
 
@@ -7364,7 +7245,6 @@ is-path-cwd@^1.0.0:
 is-path-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.0.0.tgz#d4777a8e227a00096a31f030db3770f84b116c02"
-  integrity sha512-m5dHHzpOXEiv18JEORttBO64UgTEypx99vCxQLjbBvGhOJxnTNglYoFXxwo6AbsQb79sqqycQEHv2hWkHZAijA==
 
 is-path-in-cwd@^1.0.0:
   version "1.0.0"
@@ -7375,7 +7255,6 @@ is-path-in-cwd@^1.0.0:
 is-path-in-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.0.0.tgz#68e452a6eec260500cec21e029c0a44cc0dcd2ea"
-  integrity sha512-6Vz5Gc9s/sDA3JBVu0FzWufm8xaBsqy1zn8Q6gmvGP6nSDMw78aS4poBNeatWjaRpTpxxLn1WOndAiOlk+qY8A==
   dependencies:
     is-path-inside "^1.0.0"
 
@@ -7398,12 +7277,10 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
 
 is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
 
 is-promise@^2.0.0, is-promise@^2.1.0:
   version "2.1.0"
@@ -7480,7 +7357,6 @@ is-typedarray@~1.0.0:
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
 is-whitespace-character@^1.0.0:
   version "1.0.2"
@@ -7501,22 +7377,18 @@ is-wsl@^1.1.0:
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
@@ -7560,18 +7432,13 @@ js-stringify@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
 
-js-tokens@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
+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-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-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.12.0, js-yaml@^3.12.0, js-yaml@^3.9.0:
   version "3.12.0"
@@ -7583,7 +7450,6 @@ js-yaml@3.12.0, js-yaml@^3.12.0, js-yaml@^3.9.0:
 js-yaml@^3.13.0:
   version "3.13.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.0.tgz#38ee7178ac0eea2c97ff6d96fff4b18c7d8cf98e"
-  integrity sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -7591,7 +7457,6 @@ js-yaml@^3.13.0:
 js-yaml@^3.7.0:
   version "3.12.2"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz#ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc"
-  integrity sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -7675,7 +7540,6 @@ json5@^0.5.0, json5@^0.5.1:
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
   dependencies:
     minimist "^1.2.0"
 
@@ -7688,7 +7552,6 @@ json5@^2.1.0:
 jsonc-parser@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.3.tgz#1d53d7160e401a783dbceabaad82473f80e6ad7e"
-  integrity sha512-hk/69oAeaIzchq/v3lS50PXuzn5O2ynldopMC+SWBql7J2WtdptfB9dy8Y7+Og5rPkTCpn83zTiO8FMcqlXJ/g==
 
 jsonfile@^2.1.0:
   version "2.4.0"
@@ -7735,7 +7598,6 @@ jsx-ast-utils@^2.0.1:
 just-extend@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.0.2.tgz#f3f47f7dfca0f989c55410a7ebc8854b07108afc"
-  integrity sha512-FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw==
 
 kew@^0.7.0:
   version "0.7.0"
@@ -7888,7 +7750,6 @@ linked-list@0.1.0:
 lint-staged@^8.1.5:
   version "8.1.5"
   resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.1.5.tgz#372476fe1a58b8834eb562ed4c99126bd60bdd79"
-  integrity sha512-e5ZavfnSLcBJE1BTzRTqw6ly8OkqVyO3GL2M6teSmTBYQ/2BuueD5GIt2RPsP31u/vjKdexUyDCxSyK75q4BDA==
   dependencies:
     chalk "^2.3.1"
     commander "^2.14.1"
@@ -7919,12 +7780,10 @@ lint-staged@^8.1.5:
 listr-silent-renderer@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
-  integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=
 
 listr-update-renderer@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"
-  integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==
   dependencies:
     chalk "^1.1.3"
     cli-truncate "^0.2.1"
@@ -7938,7 +7797,6 @@ listr-update-renderer@^0.5.0:
 listr-verbose-renderer@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db"
-  integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==
   dependencies:
     chalk "^2.4.1"
     cli-cursor "^2.1.0"
@@ -7948,7 +7806,6 @@ listr-verbose-renderer@^0.5.0:
 listr@^0.14.2:
   version "0.14.3"
   resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586"
-  integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==
   dependencies:
     "@samverschueren/stream-to-observable" "^0.3.0"
     is-observable "^1.1.0"
@@ -8061,7 +7918,6 @@ lodash._createset@~4.0.0:
 lodash._root@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
-  integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
 
 lodash.assign@^4.2.0:
   version "4.2.0"
@@ -8102,7 +7958,6 @@ lodash.isplainobject@^4.0.6:
 lodash.isstring@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-  integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
 
 lodash.mergewith@^4.6.0:
   version "4.6.1"
@@ -8149,14 +8004,12 @@ log-symbols@2.2.0, log-symbols@^2.0.0, log-symbols@^2.1.0, log-symbols@^2.2.0:
 log-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
-  integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=
   dependencies:
     chalk "^1.0.0"
 
 log-update@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
-  integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg=
   dependencies:
     ansi-escapes "^3.0.0"
     cli-cursor "^2.0.0"
@@ -8169,7 +8022,6 @@ loglevel@^1.4.1:
 loglevelnext@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.5.tgz#36fc4f5996d6640f539ff203ba819641680d75a2"
-  integrity sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==
   dependencies:
     es6-symbol "^3.1.1"
     object.assign "^4.1.0"
@@ -8181,7 +8033,6 @@ lolex@^2.3.2:
 lolex@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-3.1.0.tgz#1a7feb2fefd75b3e3a7f79f0e110d9476e294434"
-  integrity sha512-zFo5MgCJ0rZ7gQg69S4pqBsLURbFw11X68C18OcJjJQbqaXm2NoTrGl1IMM3TIz0/BnN1tIs2tzmmqvCsOMMjw==
 
 longest-streak@^2.0.1:
   version "2.0.2"
@@ -8191,18 +8042,18 @@ longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
-  dependencies:
-    js-tokens "^3.0.0"
-
-loose-envify@^1.2.0, loose-envify@^1.4.0:
+loose-envify@^1.0.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
+loose-envify@^1.1.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  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"
@@ -8235,7 +8086,6 @@ lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
-  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
   dependencies:
     yallist "^3.0.2"
 
@@ -8330,7 +8180,6 @@ marked@^0.4.0:
 matcher@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/matcher/-/matcher-1.1.1.tgz#51d8301e138f840982b338b116bb0c09af62c1c2"
-  integrity sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==
   dependencies:
     escape-string-regexp "^1.0.4"
 
@@ -8341,7 +8190,6 @@ material-colors@^1.2.1:
 math-random@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
-  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
 
 mathml-tag-names@^2.0.1:
   version "2.1.0"
@@ -8456,7 +8304,6 @@ merge-descriptors@1.0.1:
 merge2@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
-  integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
 
 methods@~1.1.2:
   version "1.1.2"
@@ -8565,7 +8412,6 @@ minimist-options@^3.0.1:
 minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
 minimist@1.1.x:
   version "1.1.3"
@@ -8651,7 +8497,6 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi
 mocha@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.0.2.tgz#cdc1a6fdf66472c079b5605bac59d29807702d2c"
-  integrity sha512-RtTJsmmToGyeTznSOMoM6TPEk1A84FQaHIciKrRqARZx+B5ccJ5tXlmJzEKGBxZdqk9UjpRsesZTUkZmR5YnuQ==
   dependencies:
     ansi-colors "3.2.3"
     browser-stdout "1.3.1"
@@ -8784,17 +8629,14 @@ nerf-dart@^1.0.0:
 next-tick@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
-  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
 
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 nise@^1.4.10:
   version "1.4.10"
   resolved "https://registry.yarnpkg.com/nise/-/nise-1.4.10.tgz#ae46a09a26436fae91a38a60919356ae6db143b6"
-  integrity sha512-sa0RRbj53dovjc7wombHmVli9ZihXbXCQ2uH3TNm03DyvOSIQbxg+pbqDKrk2oxMK1rtLGVlKxcB9rrc6X5YjA==
   dependencies:
     "@sinonjs/formatio" "^3.1.0"
     "@sinonjs/text-encoding" "^0.7.1"
@@ -8823,7 +8665,6 @@ node-emoji@^1.4.1:
 node-environment-flags@1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.4.tgz#0b784a6551426bfc16d3b2208424dcbc2b2ff038"
-  integrity sha512-M9rwCnWVLW7PX+NUWe3ejEdiLYinRpsEre9hMkU/6NS4h+EEulYaDH1gCEZ2gyXsmw+RXYDaV2JkkTNcsPDJ0Q==
   dependencies:
     object.getownpropertydescriptors "^2.0.3"
 
@@ -9011,7 +8852,6 @@ normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
 normalize-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
 normalize-range@^0.1.2:
   version "0.1.2"
@@ -9082,7 +8922,6 @@ npm-packlist@^1.1.10, npm-packlist@^1.1.11, npm-packlist@^1.1.6:
 npm-path@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64"
-  integrity sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==
   dependencies:
     which "^1.2.10"
 
@@ -9153,7 +8992,6 @@ npm-user-validate@~1.0.0:
 npm-which@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa"
-  integrity sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=
   dependencies:
     commander "^2.9.0"
     npm-path "^2.0.2"
@@ -9410,7 +9248,6 @@ object.getownpropertydescriptors@^2.0.3:
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
   dependencies:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
@@ -9447,7 +9284,6 @@ on-headers@~1.0.1:
 once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0, once@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
@@ -9492,7 +9328,6 @@ options@>=0.0.5:
 original@>=0.0.5, original@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
-  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
   dependencies:
     url-parse "^1.4.3"
 
@@ -9503,7 +9338,6 @@ os-browserify@^0.3.0:
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^1.4.0:
   version "1.4.0"
@@ -9579,7 +9413,6 @@ p-limit@^2.0.0:
 p-limit@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
-  integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
   dependencies:
     p-try "^2.0.0"
 
@@ -9602,7 +9435,6 @@ p-map@^1.0.0, p-map@^1.1.1:
 p-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.0.0.tgz#be18c5a5adeb8e156460651421aceca56c213a50"
-  integrity sha512-GO107XdrSUmtHxVoi60qc9tUl/KkNKm+X2CF4P9amalpGxv5YqVPJNfSb0wcA+syCopkZvYYIzW8OVTQW59x/w==
 
 p-reduce@^1.0.0:
   version "1.0.0"
@@ -9707,7 +9539,6 @@ parse-github-url@^1.0.1:
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
   dependencies:
     glob-base "^0.3.0"
     is-dotfile "^1.0.0"
@@ -9730,7 +9561,6 @@ parse-json@^4.0.0:
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
 parse-url@^1.3.0:
   version "1.3.11"
@@ -9794,7 +9624,6 @@ path-key@^2.0.0, path-key@^2.0.1:
 path-parse@^1.0.5, path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
 path-to-regexp@0.1.7:
   version "0.1.7"
@@ -9829,7 +9658,6 @@ path-type@^3.0.0:
 pathval@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
-  integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA=
 
 pbkdf2@^3.0.3:
   version "3.0.17"
@@ -9908,7 +9736,6 @@ pkg-up@2.0.0, pkg-up@^2.0.0:
 please-upgrade-node@^3.0.2, please-upgrade-node@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
-  integrity sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==
   dependencies:
     semver-compare "^1.0.0"
 
@@ -10131,12 +9958,10 @@ prepend-http@^1.0.1:
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
 prettier@^1.16.4:
   version "1.16.4"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
-  integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
 
 pretty-error@^2.0.2, pretty-error@^2.1.1:
   version "2.1.1"
@@ -10226,17 +10051,24 @@ prop-types@^15.5.4:
     fbjs "^0.8.9"
     loose-envify "^1.3.1"
 
-prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
+prop-types@^15.6.0, prop-types@^15.6.1:
   version "15.6.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
   dependencies:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
+prop-types@^15.6.2, prop-types@^15.7.2:
+  version "15.7.2"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
+  dependencies:
+    loose-envify "^1.4.0"
+    object-assign "^4.1.1"
+    react-is "^16.8.1"
+
 property-expr@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-1.5.1.tgz#22e8706894a0c8e28d58735804f6ba3a3673314f"
-  integrity sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g==
 
 property-information@^5.0.0, property-information@^5.0.1:
   version "5.0.1"
@@ -10487,7 +10319,6 @@ ramda@^0.21.0:
 ramda@^0.26.1:
   version "0.26.1"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06"
-  integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==
 
 randexp@0.4.6:
   version "0.4.6"
@@ -10499,7 +10330,6 @@ randexp@0.4.6:
 randomatic@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
-  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
   dependencies:
     is-number "^4.0.0"
     kind-of "^6.0.0"
@@ -10650,9 +10480,9 @@ react-is@^16.6.0:
   version "16.6.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.6.1.tgz#f77b1c3d901be300abe8d58645b7a59e794e5982"
 
-react-is@^16.6.3, react-is@^16.7.0, react-is@^16.8.1:
-  version "16.8.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.1.tgz#a80141e246eb894824fb4f2901c0c50ef31d4cdb"
+react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.2:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
 
 react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4:
   version "3.0.4"
@@ -10667,16 +10497,16 @@ react-modal@^3.6.1:
     react-lifecycles-compat "^3.0.0"
     warning "^3.0.0"
 
-react-redux@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-6.0.0.tgz#09e86eeed5febb98e9442458ad2970c8f1a173ef"
+react-redux@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-6.0.1.tgz#0d423e2c1cb10ada87293d47e7de7c329623ba4d"
   dependencies:
-    "@babel/runtime" "^7.2.0"
-    hoist-non-react-statics "^3.2.1"
+    "@babel/runtime" "^7.3.1"
+    hoist-non-react-statics "^3.3.0"
     invariant "^2.2.4"
     loose-envify "^1.4.0"
-    prop-types "^15.6.2"
-    react-is "^16.6.3"
+    prop-types "^15.7.2"
+    react-is "^16.8.2"
 
 react-router-dom@^4.3.1:
   version "4.3.1"
@@ -10907,7 +10737,6 @@ readable-stream@^3.0.6:
 readable-stream@~1.1.10:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -10952,7 +10781,6 @@ recast@^0.16.0:
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
   dependencies:
     resolve "^1.1.6"
 
@@ -11001,7 +10829,6 @@ redux-devtools-instrument@^1.9.0:
 redux-immutable-state-invariant@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/redux-immutable-state-invariant/-/redux-immutable-state-invariant-2.1.0.tgz#308fd3cc7415a0e7f11f51ec997b6379c7055ce1"
-  integrity sha512-3czbDKs35FwiBRsx/3KabUk5zSOoTXC+cgVofGkpBNv3jQcqIe5JrHcF5AmVt7B/4hyJ8MijBIpCJ8cife6yJg==
   dependencies:
     invariant "^2.1.0"
     json-stringify-safe "^5.0.1"
@@ -11015,24 +10842,20 @@ redux-logger@^3.0.6:
 redux-persist@^5.10.0:
   version "5.10.0"
   resolved "https://registry.yarnpkg.com/redux-persist/-/redux-persist-5.10.0.tgz#5d8d802c5571e55924efc1c3a9b23575283be62b"
-  integrity sha512-sSJAzNq7zka3qVHKce1hbvqf0Vf5DuTVm7dr4GtsqQVOexnrvbV47RWFiPxQ8fscnyiuWyD2O92DOxPl0tGCRg==
 
 redux-saga@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.0.2.tgz#0599703f975438f1b2f9d2b9a965ec58f0fdfcd7"
-  integrity sha512-dHV256by3eF2AnBPx1l3HqazQFkErZ82HDXgh4jSRpT72OrX31wyg8DA1q8+0HvENRfJAyhT/4qT5yH/vVqFfw==
   dependencies:
     "@redux-saga/core" "^1.0.2"
 
 redux-thunk@^2.0.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
-  integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==
 
 "redux@>=0.10 <5", "redux@^3.6.0 || ^4.0.0", redux@^4.0.0, redux@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5"
-  integrity sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==
   dependencies:
     loose-envify "^1.4.0"
     symbol-observable "^1.2.0"
@@ -11040,7 +10863,6 @@ redux-thunk@^2.0.1:
 redux@^3.6.0:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
-  integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==
   dependencies:
     lodash "^4.2.1"
     lodash-es "^4.2.1"
@@ -11069,6 +10891,10 @@ regenerator-runtime@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.1.tgz#522ea2aafd9200a00eee143dc14219a35a0f3991"
 
+regenerator-runtime@^0.13.2:
+  version "0.13.2"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
+
 regenerator-transform@^0.13.3:
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"
@@ -11078,7 +10904,6 @@ regenerator-transform@^0.13.3:
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
   dependencies:
     is-equal-shallow "^0.1.3"
 
@@ -11248,7 +11073,6 @@ remotedev-utils@^0.1.1:
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 render-fragment@^0.1.1:
   version "0.1.1"
@@ -11267,7 +11091,6 @@ renderkid@^2.0.1:
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
 repeat-string@^1.5.2, repeat-string@^1.5.4, repeat-string@^1.6.1:
   version "1.6.1"
@@ -11365,7 +11188,6 @@ requires-port@^1.0.0:
 reselect@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
-  integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
 
 resolve-cwd@^2.0.0:
   version "2.0.0"
@@ -11403,7 +11225,6 @@ resolve-url@^0.2.1:
 resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.4.0, resolve@^1.9.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
-  integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
   dependencies:
     path-parse "^1.0.6"
 
@@ -11477,7 +11298,6 @@ run-async@^2.2.0:
 run-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
-  integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
@@ -11654,7 +11474,6 @@ semantic-release@^15.8.1:
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
-  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
 
 semver-diff@^2.0.0:
   version "2.1.0"
@@ -11828,19 +11647,16 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
 simple-git@^1.85.0:
   version "1.110.0"
   resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.110.0.tgz#54eb179089d055a7783d32399246cebc9d9933e9"
-  integrity sha512-UYY0rQkknk0P5eb+KW+03F4TevZ9ou0H+LoGaj7iiVgpnZH4wdj/HTViy/1tNNkmIPcmtxuBqXWiYt2YwlRKOQ==
   dependencies:
     debug "^4.0.1"
 
 sinon-chai@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/sinon-chai/-/sinon-chai-3.3.0.tgz#8084ff99451064910fbe2c2cb8ab540c00b740ea"
-  integrity sha512-r2JhDY7gbbmh5z3Q62pNbrjxZdOAjpsqW/8yxAZRSqLZqowmfGZPGUZPFf3UX36NLis0cv8VEM5IJh9HgkSOAA==
 
 sinon@^7.3.0:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/sinon/-/sinon-7.3.0.tgz#fd409432bf2ef8ee6a302cf47ca1b0c95fd4de38"
-  integrity sha512-0pYvgRv46fODzT/PByqb79MVNpyxsxf38WEiXTABOF8RfIMcIARfZ+1ORuxwAmHkreZ/jST3UDBdKCRhUy/e1A==
   dependencies:
     "@sinonjs/commons" "^1.4.0"
     "@sinonjs/formatio" "^3.2.1"
@@ -11861,7 +11677,6 @@ slash@^2.0.0:
 slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-  integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
 
 slice-ansi@1.0.0:
   version "1.0.0"
@@ -12004,7 +11819,6 @@ source-list-map@^2.0.0:
 source-map-loader@^0.2.4:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271"
-  integrity sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==
   dependencies:
     async "^2.5.0"
     loader-utils "^1.1.0"
@@ -12029,7 +11843,6 @@ source-map-support@^0.5.3, source-map-support@~0.5.9:
 source-map-support@^0.5.6:
   version "0.5.11"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
-  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -12205,7 +12018,6 @@ stackframe@^0.3.1:
 staged-git-files@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.2.tgz#4326d33886dc9ecfa29a6193bf511ba90a46454b"
-  integrity sha512-0Eyrk6uXW6tg9PYkhi/V/J4zHp33aNyi2hOCmhFLqLTIhbgqWn5jlSzI+IU0VqrZq6+DbHcabQl/WP6P3BG0QA==
 
 state-toggle@^1.0.0:
   version "1.0.1"
@@ -12281,7 +12093,6 @@ strict-uri-encode@^2.0.0:
 string-argv@^0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736"
-  integrity sha1-2sMECGkMIfPDYwo/86BYd73L1zY=
 
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
@@ -12356,7 +12167,6 @@ string_decoder@^1.0.0, string_decoder@^1.1.1, string_decoder@~1.1.1:
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
 stringify-entities@^1.0.1:
   version "1.3.2"
@@ -12370,7 +12180,6 @@ stringify-entities@^1.0.1:
 stringify-object@^3.2.2:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
-  integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
   dependencies:
     get-own-enumerable-property-symbols "^3.0.0"
     is-obj "^1.0.1"
@@ -12546,14 +12355,12 @@ sugarss@^2.0.0:
 supports-color@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
-  integrity sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==
   dependencies:
     has-flag "^3.0.0"
 
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
 supports-color@^5.1.0, supports-color@^5.4.0, supports-color@^5.5.0:
   version "5.5.0"
@@ -12620,7 +12427,6 @@ symbol.prototype.description@^1.0.0:
 synchronous-promise@^2.0.5:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.7.tgz#3574b3d2fae86b145356a4b89103e1577f646fe3"
-  integrity sha512-16GbgwTmFMYFyQMLvtQjvNWh30dsFe1cAW5Fg1wm5+dg84L9Pe36mftsIRU95/W2YsISxsz/xq4VB23sqpgb/A==
 
 table@^5.0.0, table@^5.0.2:
   version "5.1.0"
@@ -12705,7 +12511,6 @@ text-table@0.2.0, text-table@^0.2.0, text-table@~0.2.0:
 through2@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
   dependencies:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
@@ -12810,7 +12615,6 @@ toposort@^1.0.0:
 toposort@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
-  integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
 
 tough-cookie@^2.2.0:
   version "2.3.2"
@@ -12876,7 +12680,6 @@ trough@^1.0.0:
 ts-mocha@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/ts-mocha/-/ts-mocha-6.0.0.tgz#40b8c5462ffce6f5dcee5ff729655b2958f26e50"
-  integrity sha512-ZCtJK8WXxHNbFNjvUKQIXZby/+ybQQkaBcM/3QhBQUfwjpdGFE9F6iWsHhF5ifQNFV/lWiOODi2VMD5AyPcQyg==
   dependencies:
     ts-node "7.0.1"
   optionalDependencies:
@@ -12885,7 +12688,6 @@ ts-mocha@^6.0.0:
 ts-node@7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-7.0.1.tgz#9562dc2d1e6d248d24bc55f773e3f614337d9baf"
-  integrity sha512-BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw==
   dependencies:
     arrify "^1.0.0"
     buffer-from "^1.1.0"
@@ -12899,7 +12701,6 @@ ts-node@7.0.1:
 tsconfig-paths@^3.5.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.8.0.tgz#4e34202d5b41958f269cf56b01ed95b853d59f72"
-  integrity sha512-zZEYFo4sjORK8W58ENkRn9s+HmQFkkwydDG7My5s/fnfr2YYCaiyXe/HBUcIgU8epEKOXwiahOO+KZYjiXlWyQ==
   dependencies:
     "@types/json5" "^0.0.29"
     deepmerge "^2.0.1"
@@ -12910,7 +12711,6 @@ tsconfig-paths@^3.5.0:
 tslib@1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
-  integrity sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==
 
 tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
@@ -12919,19 +12719,16 @@ tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
 tslint-config-prettier@^1.18.0:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37"
-  integrity sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==
 
 tslint-config-standard@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/tslint-config-standard/-/tslint-config-standard-8.0.1.tgz#e4dd3128e84b0e34b51990b68715a641f2b417e4"
-  integrity sha512-OWG+NblgjQlVuUS/Dmq3ax2v5QDZwRx4L0kEuDi7qFY9UI6RJhhNfoCV1qI4el8Fw1c5a5BTrjQJP0/jhGXY/Q==
   dependencies:
     tslint-eslint-rules "^5.3.1"
 
 tslint-eslint-rules@^5.3.1:
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-5.4.0.tgz#e488cc9181bf193fe5cd7bfca213a7695f1737b5"
-  integrity sha512-WlSXE+J2vY/VPgIcqQuijMQiel+UtmXS+4nvK4ZzlDiqBfXse8FAvkNnTcYhnQyOTW5KFM+uRRGXxYhFpuBc6w==
   dependencies:
     doctrine "0.7.2"
     tslib "1.9.0"
@@ -12940,14 +12737,12 @@ tslint-eslint-rules@^5.3.1:
 tslint-react@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/tslint-react/-/tslint-react-3.6.0.tgz#7f462c95c4a0afaae82507f06517ff02942196a1"
-  integrity sha512-AIv1QcsSnj7e9pFir6cJ6vIncTqxfqeFF3Lzh8SuuBljueYzEAtByuB6zMaD27BL0xhMEqsZ9s5eHuCONydjBw==
   dependencies:
     tsutils "^2.13.1"
 
 tslint@^5.13.1:
   version "5.13.1"
   resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.13.1.tgz#fbc0541c425647a33cd9108ce4fd4cd18d7904ed"
-  integrity sha512-fplQqb2miLbcPhyHoMV4FU9PtNRbgmm/zI5d3SZwwmJQM6V0eodju+hplpyfhLWpmwrDNfNYU57uYRb8s0zZoQ==
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
@@ -12966,14 +12761,12 @@ tslint@^5.13.1:
 tsutils@^2.13.1, tsutils@^2.27.2:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
-  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
   dependencies:
     tslib "^1.8.1"
 
 tsutils@^3.0.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.8.0.tgz#7a3dbadc88e465596440622b65c04edc8e187ae5"
-  integrity sha512-XQdPhgcoTbCD8baXC38PQ0vpTZ8T3YrE+vR66YIj/xvDt1//8iAhafpIT/4DmvzzC1QFapEImERu48Pa01dIUA==
   dependencies:
     tslib "^1.8.1"
 
@@ -13000,7 +12793,6 @@ type-check@~0.3.2:
 type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
-  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
 type-is@~1.6.16:
   version "1.6.16"
@@ -13024,19 +12816,16 @@ typeface-sedgwick-ave@^0.0.54:
 typescript-compare@^0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/typescript-compare/-/typescript-compare-0.0.2.tgz#7ee40a400a406c2ea0a7e551efd3309021d5f425"
-  integrity sha512-8ja4j7pMHkfLJQO2/8tut7ub+J3Lw2S3061eJLFQcvs3tsmJKp8KG5NtpLn7KcY2w08edF74BSVN7qJS0U6oHA==
   dependencies:
     typescript-logic "^0.0.0"
 
 typescript-logic@^0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/typescript-logic/-/typescript-logic-0.0.0.tgz#66ebd82a2548f2b444a43667bec120b496890196"
-  integrity sha512-zXFars5LUkI3zP492ls0VskH3TtdeHCqu0i7/duGt60i5IGPIpAHE/DWo5FqJ6EjQ15YKXrt+AETjv60Dat34Q==
 
 typescript-styled-plugin@^0.14.0:
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/typescript-styled-plugin/-/typescript-styled-plugin-0.14.0.tgz#6691a8e673ed9eacee52c38fecd87d428eff0f71"
-  integrity sha512-RGa+tDPr7OFd+vCEvCYwtNhQSfTFaQebHXiiSABOnjwVE/M0q3vxZcB+Ppp9UGE1PDuLJ9EQRUc7VdqTZtk+oQ==
   dependencies:
     typescript-template-language-service-decorator "^2.2.0"
     vscode-css-languageservice "^3.0.13-next.12"
@@ -13046,19 +12835,16 @@ typescript-styled-plugin@^0.14.0:
 typescript-template-language-service-decorator@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/typescript-template-language-service-decorator/-/typescript-template-language-service-decorator-2.2.0.tgz#4ee6d580f307fb9239978e69626f2775b8a59b2a"
-  integrity sha512-xiolqt1i7e22rpqMaprPgSFVgU64u3b9n6EJlAaUYE61jumipKAdI1+O5khPlWslpTUj80YzjUKjJ2jxT0D74w==
 
 typescript-tuple@^2.1.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/typescript-tuple/-/typescript-tuple-2.2.1.tgz#7d9813fb4b355f69ac55032e0363e8bb0f04dad2"
-  integrity sha512-Zcr0lbt8z5ZdEzERHAMAniTiIKerFCMgd7yjq1fPnDJ43et/k9twIFQMUYff9k5oXcsQ0WpvFcgzK2ZKASoW6Q==
   dependencies:
     typescript-compare "^0.0.2"
 
 typescript@^3.3.3333:
   version "3.3.3333"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3333.tgz#171b2c5af66c59e9431199117a3bcadc66fdcfd6"
-  integrity sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==
 
 ua-parser-js@^0.7.18:
   version "0.7.19"
@@ -13343,7 +13129,6 @@ use@^3.1.0:
 util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 util-extend@^1.0.1:
   version "1.0.3"
@@ -13477,7 +13262,6 @@ void-elements@^2.0.1:
 vscode-css-languageservice@^3.0.13-next.12:
   version "3.0.13"
   resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.13.tgz#1788735b65fde54181ea458e6a52cc2bd6dd9126"
-  integrity sha512-RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg==
   dependencies:
     vscode-languageserver-types "^3.13.0"
     vscode-nls "^4.0.0"
@@ -13485,7 +13269,6 @@ vscode-css-languageservice@^3.0.13-next.12:
 vscode-emmet-helper@1.2.11:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.11.tgz#4de78223666bf917eb6dc4b225b6c40f6901950c"
-  integrity sha512-ms6/Z9TfNbjXS8r/KgbGxrNrFlu4RcIfVJxTZ2yFi0K4gn+Ka9X1+8cXvb5+5IOBGUrOsPjR0BuefdDkG+CKbQ==
   dependencies:
     "@emmetio/extract-abbreviation" "0.1.6"
     jsonc-parser "^1.0.0"
@@ -13494,12 +13277,10 @@ vscode-emmet-helper@1.2.11:
 vscode-languageserver-types@^3.13.0, vscode-languageserver-types@^3.6.0-next.1:
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
-  integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
 
 vscode-nls@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
-  integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw==
 
 warning@^3.0.0:
   version "3.0.0"
@@ -13619,7 +13400,6 @@ webpack-hot-middleware@^2.10.0, webpack-hot-middleware@^2.24.3:
 webpack-log@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-1.2.0.tgz#a4b34cda6b22b518dbb0ab32e567962d5c72a43d"
-  integrity sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==
   dependencies:
     chalk "^2.1.0"
     log-symbols "^2.1.0"
@@ -13769,7 +13549,6 @@ wrap-ansi@^2.0.0:
 wrap-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
-  integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=
   dependencies:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
@@ -13777,7 +13556,6 @@ wrap-ansi@^3.0.1:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
   version "2.3.0"
@@ -13881,7 +13659,6 @@ yargs-parser@^9.0.2:
 yargs-unparser@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.5.0.tgz#f2bb2a7e83cbc87bb95c8e572828a06c9add6e0d"
-  integrity sha512-HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw==
   dependencies:
     flat "^4.1.0"
     lodash "^4.17.11"
@@ -13991,19 +13768,16 @@ yauzl@2.4.1:
 yazl@^2.4.3:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.5.1.tgz#a3d65d3dd659a5b0937850e8609f22fffa2b5c35"
-  integrity sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==
   dependencies:
     buffer-crc32 "~0.2.3"
 
 yn@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
-  integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
 yup@^0.26.10:
   version "0.26.10"
   resolved "https://registry.yarnpkg.com/yup/-/yup-0.26.10.tgz#3545839663289038faf25facfc07e11fd67c0cb1"
-  integrity sha512-keuNEbNSnsOTOuGCt3UJW69jDE3O4P+UHAakO7vSeFMnjaitcmlbij/a3oNb9g1Y1KvSKH/7O1R2PQ4m4TRylw==
   dependencies:
     "@babel/runtime" "7.0.0"
     fn-name "~2.0.1"
@@ -14024,7 +13798,6 @@ zip-stream@^1.2.0:
 zip-webpack-plugin@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/zip-webpack-plugin/-/zip-webpack-plugin-3.0.0.tgz#63b3c173f1a87a006915cd7328a3c40b44dc8e32"
-  integrity sha512-5kNvPv+TUP3JqKWQUXj0vTgXHIRQpYw5YyBUVXQ0pumTAK+a4OZ+eXDHnh44nyr9B1XJQZq9WtSSm5j6NQhjWQ==
   dependencies:
     webpack-sources "^1.1.0"
     yazl "^2.4.3"

From f0fae627865b37e6975c3c7edfc61fb1c46ae663 Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Fri, 12 Apr 2019 11:50:21 +0200
Subject: [PATCH 045/100] chore(identity): ensure input type is the same as
 output type

---
 src/app/utils/identity.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/utils/identity.ts b/src/app/utils/identity.ts
index 2db0f6923..84e6b2e7a 100644
--- a/src/app/utils/identity.ts
+++ b/src/app/utils/identity.ts
@@ -1 +1 @@
-export default (me: any) => me;
+export default <T>(arg: T): T => arg;

From c128fc48f9137e5118845c87c819fb016f051089 Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Tue, 16 Apr 2019 11:07:21 +0200
Subject: [PATCH 046/100] feat(tab): add `tabId` state slice to get `tabId`
 from content context

---
 src/app/content/reducers/index.ts  |  2 ++
 src/app/content/reducers/tabId.ts  | 15 +++++++++++++++
 src/app/content/selectors/index.ts |  2 ++
 src/app/content/store.ts           |  2 ++
 4 files changed, 21 insertions(+)
 create mode 100644 src/app/content/reducers/tabId.ts

diff --git a/src/app/content/reducers/index.ts b/src/app/content/reducers/index.ts
index ab8d3217d..e490a413b 100644
--- a/src/app/content/reducers/index.ts
+++ b/src/app/content/reducers/index.ts
@@ -5,11 +5,13 @@ import { MemoryHistory } from 'history';
 import installationDetails from './installationDetails';
 import open from './open';
 import recommendations from './recommendations';
+import tabId from './tabId';
 
 export default (history: MemoryHistory) =>
   combineReducers({
     installationDetails,
     open,
     recommendations,
+    tabId,
     router: connectRouter(history)
   });
diff --git a/src/app/content/reducers/tabId.ts b/src/app/content/reducers/tabId.ts
new file mode 100644
index 000000000..bd63e6ed1
--- /dev/null
+++ b/src/app/content/reducers/tabId.ts
@@ -0,0 +1,15 @@
+import { AppAction } from 'app/actions';
+
+export type TabIdState = number | null;
+export const initialState: TabIdState = null;
+
+export default (
+  state: TabIdState = initialState,
+  action: AppAction
+): TabIdState => {
+  if (action.type === 'NOTICES_FOUND') {
+    return action.meta.tab;
+  }
+
+  return state;
+};
diff --git a/src/app/content/selectors/index.ts b/src/app/content/selectors/index.ts
index da94ca2ec..bbd9bfc21 100644
--- a/src/app/content/selectors/index.ts
+++ b/src/app/content/selectors/index.ts
@@ -31,3 +31,5 @@ export const getExtensionInstallationDate = createSelector(
   (details: InstallationDetails) =>
     details.datetime ? new Date(details.datetime) : undefined
 );
+
+export const getTabId = (state: State) => state.tabId;
diff --git a/src/app/content/store.ts b/src/app/content/store.ts
index 697640707..44845dc8f 100644
--- a/src/app/content/store.ts
+++ b/src/app/content/store.ts
@@ -8,12 +8,14 @@ import { InstallationDetailsState } from './reducers/installationDetails';
 import { OpenState } from './reducers/open';
 import { NoticesState } from './reducers/recommendations';
 import { PersistedState } from 'redux-persist/es/types';
+import { TabIdState } from './reducers/tabId';
 export const history = createMemoryHistory();
 
 export interface State extends PersistedState {
   installationDetails: InstallationDetailsState;
   open: OpenState;
   recommendations: NoticesState;
+  tabId: TabIdState;
   router: RouterState;
 }
 

From 10b0d6455b11ae0a24b131297c018ced914690ba Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Tue, 16 Apr 2019 14:01:37 +0200
Subject: [PATCH 047/100] feat(badge): add badge on browser action button

introduce a simple `readNotice` action and add `read` flag on notice
show number of notices on badge
handle different badge backgrounds depending on `read` flag
---
 src/app/actions/index.ts                      | 15 ++++++---
 src/app/actions/recommendations.ts            | 26 ++++++++++++++-
 src/app/background/sagas/badge.ts             | 32 +++++++++++++++++++
 src/app/background/sagas/index.js             |  7 ++--
 src/app/background/sagas/tab.ts               | 21 ++++++++++--
 src/app/content/App/Notice/Details/index.tsx  |  4 ++-
 src/app/content/App/Notice/Details/types.ts   |  6 +++-
 .../content/App/Notice/Details/withConnect.ts |  6 ++--
 src/app/content/reducers/recommendations.ts   |  5 +++
 src/app/content/sagas/index.js                |  7 ++--
 src/app/content/sagas/notices.ts              | 13 ++++++++
 src/app/lmem/notice.ts                        |  1 +
 src/app/theme.ts                              | 16 ++++++++++
 .../NoticeDetails/NoticeDetails.stories.tsx   |  3 ++
 .../organisms/NoticeDetails/NoticeDetails.tsx | 15 +++++++--
 tslint.json                                   |  3 +-
 16 files changed, 157 insertions(+), 23 deletions(-)
 create mode 100644 src/app/background/sagas/badge.ts
 create mode 100644 src/app/content/sagas/notices.ts

diff --git a/src/app/actions/index.ts b/src/app/actions/index.ts
index ef079e9f2..aa0a62987 100644
--- a/src/app/actions/index.ts
+++ b/src/app/actions/index.ts
@@ -21,7 +21,11 @@ import {
 } from './tabs';
 import { InstalledDetailsAction } from './filters';
 import { CloseAction, ClosedAction, OpenAction, OpenedAction } from './ui';
-import { FeedbackOnNoticeAction, NoticesFoundAction } from './recommendations';
+import {
+  FeedbackOnNoticeAction,
+  NoticesFoundAction,
+  ReadNoticeAction
+} from './recommendations';
 import { Action } from 'redux';
 
 export interface BaseAction extends Action {
@@ -29,10 +33,12 @@ export interface BaseAction extends Action {
   meta?: ActionMeta;
 }
 
+export interface TabMeta extends ActionMeta {
+  tab: number;
+}
+
 export type TabAction = BaseAction & {
-  meta: ActionMeta & {
-    tab: number;
-  };
+  meta: TabMeta;
 };
 
 export interface ActionMeta {
@@ -63,4 +69,5 @@ export type AppAction =
   | ClosedAction
   | NoticesFoundAction
   | FeedbackOnNoticeAction
+  | ReadNoticeAction
   | (LocationChangeAction & { meta?: ActionMeta });
diff --git a/src/app/actions/recommendations.ts b/src/app/actions/recommendations.ts
index c337b43dd..e54357798 100644
--- a/src/app/actions/recommendations.ts
+++ b/src/app/actions/recommendations.ts
@@ -1,5 +1,5 @@
 import { EnhancedNotice } from 'app/lmem/notice';
-import { BaseAction, TabAction } from '.';
+import { BaseAction, TabAction, TabMeta } from '.';
 
 export interface NoticesFoundAction extends TabAction {
   type: 'NOTICES_FOUND';
@@ -70,3 +70,27 @@ export const undislikeNotice = (id: number): FeedbackOnNoticeAction => ({
   payload: { id, feedback: 'undislike' },
   meta: { sendToBackground: true }
 });
+
+export interface ReadNoticeAction extends BaseAction {
+  type: 'READ_NOTICE';
+  payload: number;
+}
+
+export const readNotice = (id: number): ReadNoticeAction => ({
+  type: 'READ_NOTICE',
+  payload: id
+});
+
+export interface NoticesUpdatedAction extends TabAction {
+  type: 'NOTICES_UPDATED';
+  payload: EnhancedNotice[];
+}
+
+export const noticesUpdated = (
+  payload: EnhancedNotice[],
+  meta: TabMeta
+): NoticesUpdatedAction => ({
+  type: 'NOTICES_UPDATED',
+  payload,
+  meta
+});
diff --git a/src/app/background/sagas/badge.ts b/src/app/background/sagas/badge.ts
new file mode 100644
index 000000000..8428d1517
--- /dev/null
+++ b/src/app/background/sagas/badge.ts
@@ -0,0 +1,32 @@
+import { takeLatest } from 'redux-saga/effects';
+import { NoticesUpdatedAction } from '../../actions/recommendations';
+import { Theme } from '../../theme';
+
+export const updateBadgeSaga = (theme: Theme) =>
+  function*({
+    payload: notices,
+    meta: { tab: tabId }
+  }: NoticesUpdatedAction): IterableIterator<any> {
+    const unreadNotices = notices.filter(notice => !notice.read);
+    const { backgroundColor } = theme.badge;
+
+    chrome.browserAction.setBadgeText({
+      text:
+        unreadNotices.length > 0
+          ? unreadNotices.length.toString()
+          : notices.length.toString(),
+      tabId
+    });
+    chrome.browserAction.setBadgeBackgroundColor({
+      color:
+        unreadNotices.length > 0
+          ? backgroundColor.unread
+          : backgroundColor.read,
+      tabId
+    });
+  };
+
+export default (theme: Theme) =>
+  function* tabRootSaga() {
+    yield takeLatest('NOTICES_UPDATED', updateBadgeSaga(theme));
+  };
diff --git a/src/app/background/sagas/index.js b/src/app/background/sagas/index.js
index 9b7d4cff8..8d850e0c9 100644
--- a/src/app/background/sagas/index.js
+++ b/src/app/background/sagas/index.js
@@ -1,10 +1,9 @@
 import { fork, all } from 'redux-saga/effects';
 import matchingContexts from './matchingContexts';
 import tab from './tab';
+import badge from './badge';
+import theme from '../../theme';
 
 export default function* rootSaga() {
-  yield all([
-    fork(matchingContexts),
-    fork(tab),
-  ]);
+  yield all([fork(matchingContexts), fork(tab), fork(badge(theme))]);
 }
diff --git a/src/app/background/sagas/tab.ts b/src/app/background/sagas/tab.ts
index ed6744506..1e08d18af 100644
--- a/src/app/background/sagas/tab.ts
+++ b/src/app/background/sagas/tab.ts
@@ -14,7 +14,11 @@ import {
   getIgnoredNotices
 } from '../selectors/prefs';
 import { TAB_CREATED, TAB_UPDATED } from '../../constants/browser/tabs';
-import { CONTEXT_TRIGGERED, MATCH_CONTEXT } from '../../constants/ActionTypes';
+import {
+  CONTEXT_TRIGGERED,
+  MATCH_CONTEXT,
+  NOTICES_FOUND
+} from '../../constants/ActionTypes';
 import {
   init,
   contextTriggered,
@@ -26,7 +30,11 @@ import {
   MatchContextAction,
   ContextTriggeredAction
 } from 'app/actions/tabs';
-import { noticesFound } from 'app/actions/recommendations';
+import {
+  noticesFound,
+  NoticesFoundAction,
+  noticesUpdated
+} from 'app/actions/recommendations';
 import watchSingleMessageSaga from '../../utils/watchSingleMessageSaga';
 import { TabAction } from '../../actions';
 import fetchContentScript from '../services/fetchContentScript';
@@ -132,6 +140,13 @@ export function* watchBrowserActionSaga() {
   }
 }
 
+export function* updateNoticesSaga({
+  payload: { notices },
+  meta: { tab }
+}: NoticesFoundAction) {
+  yield put(noticesUpdated(notices, { tab }));
+}
+
 export default function* tabRootSaga() {
   yield fork(watchSingleMessageSaga);
   yield fork(watchBrowserActionSaga);
@@ -151,4 +166,6 @@ export default function* tabRootSaga() {
     (action: AppAction) => Boolean(action.meta && action.meta.sendToTab),
     publishToTabSaga
   );
+
+  yield takeLatest(NOTICES_FOUND, updateNoticesSaga);
 }
diff --git a/src/app/content/App/Notice/Details/index.tsx b/src/app/content/App/Notice/Details/index.tsx
index 0fa4251cf..78a9d6998 100644
--- a/src/app/content/App/Notice/Details/index.tsx
+++ b/src/app/content/App/Notice/Details/index.tsx
@@ -11,7 +11,8 @@ export const Details = ({
   unlike,
   dislike,
   undislike,
-  close
+  close,
+  view
 }: DetailsProps) =>
   notice ? (
     <Notification title="Détail de la bulle" hasNotices close={close}>
@@ -29,6 +30,7 @@ export const Details = ({
         liked={notice.liked}
         disliked={notice.disliked}
         dismissed={notice.dismissed}
+        view={view}
       />
     </Notification>
   ) : null;
diff --git a/src/app/content/App/Notice/Details/types.ts b/src/app/content/App/Notice/Details/types.ts
index 2ff7d2c7f..ed29f32d1 100644
--- a/src/app/content/App/Notice/Details/types.ts
+++ b/src/app/content/App/Notice/Details/types.ts
@@ -1,6 +1,9 @@
 import { RouteComponentProps } from 'react-router';
 import { EnhancedNotice } from 'app/lmem/notice';
-import { FeedbackOnNoticeAction } from 'app/actions/recommendations';
+import {
+  FeedbackOnNoticeAction,
+  ReadNoticeAction
+} from 'app/actions/recommendations';
 
 interface OwnProps {
   notice?: EnhancedNotice;
@@ -9,6 +12,7 @@ interface OwnProps {
   dislike: (id: number) => FeedbackOnNoticeAction;
   undislike: (id: number) => FeedbackOnNoticeAction;
   close?: () => void;
+  view: (id: number) => ReadNoticeAction;
 }
 
 export type DetailsProps = OwnProps & RouteComponentProps;
diff --git a/src/app/content/App/Notice/Details/withConnect.ts b/src/app/content/App/Notice/Details/withConnect.ts
index 748850fb5..ab84b0b50 100644
--- a/src/app/content/App/Notice/Details/withConnect.ts
+++ b/src/app/content/App/Notice/Details/withConnect.ts
@@ -4,7 +4,8 @@ import {
   likeNotice,
   unlikeNotice,
   dislikeNotice,
-  undislikeNotice
+  undislikeNotice,
+  readNotice
 } from 'app/actions/recommendations';
 import { close } from 'app/actions/ui';
 import { State } from '../../../store';
@@ -19,7 +20,8 @@ const mapDispatchToProps = {
   unlike: unlikeNotice,
   dislike: dislikeNotice,
   undislike: undislikeNotice,
-  close
+  close,
+  view: readNotice
 };
 
 export default connect(
diff --git a/src/app/content/reducers/recommendations.ts b/src/app/content/reducers/recommendations.ts
index 966ae3c09..de95944dc 100644
--- a/src/app/content/reducers/recommendations.ts
+++ b/src/app/content/reducers/recommendations.ts
@@ -17,6 +17,11 @@ export default (state: NoticesState = [], action: AppAction): NoticesState => {
     case 'NOTICES_FOUND':
       return action.payload.notices;
 
+    case 'READ_NOTICE':
+      return state.map(notice =>
+        notice.id === action.payload ? { ...notice, read: true } : notice
+      );
+
     case 'FEEDBACK_ON_NOTICE':
       switch (action.payload.feedback) {
         case 'dismiss':
diff --git a/src/app/content/sagas/index.js b/src/app/content/sagas/index.js
index 875c5a01a..57dad0b5a 100644
--- a/src/app/content/sagas/index.js
+++ b/src/app/content/sagas/index.js
@@ -1,12 +1,9 @@
 import { fork, all } from 'redux-saga/effects';
 import background from './background';
 import browserAction from './browserAction';
+import notices from './notices';
 import ui from './ui';
 
 export default function* rootSaga() {
-  yield all([
-    fork(ui),
-    fork(background),
-    fork(browserAction),
-  ]);
+  yield all([fork(background), fork(browserAction), fork(notices), fork(ui)]);
 }
diff --git a/src/app/content/sagas/notices.ts b/src/app/content/sagas/notices.ts
new file mode 100644
index 000000000..ec3629883
--- /dev/null
+++ b/src/app/content/sagas/notices.ts
@@ -0,0 +1,13 @@
+import { put, takeLatest, select } from 'redux-saga/effects';
+import { getNotices, getTabId } from '../selectors';
+import { noticesUpdated } from '../../actions/recommendations';
+
+export function* updateNoticesSaga() {
+  const notices = yield select(getNotices);
+  const tab = yield select(getTabId);
+  yield put(noticesUpdated(notices, { tab, sendToBackground: true }));
+}
+
+export default function* noticesRootSaga() {
+  yield takeLatest('READ_NOTICE', updateNoticesSaga);
+}
diff --git a/src/app/lmem/notice.ts b/src/app/lmem/notice.ts
index bdd944f73..ff4eb621a 100644
--- a/src/app/lmem/notice.ts
+++ b/src/app/lmem/notice.ts
@@ -42,6 +42,7 @@ export interface EnhancedNotice extends Notice {
   justDisliked?: boolean;
   dismissed: boolean;
   justDismissed?: boolean;
+  read?: boolean;
 }
 
 /* eslint-disable no-nested-ternary */
diff --git a/src/app/theme.ts b/src/app/theme.ts
index f72e85690..98a6250c4 100644
--- a/src/app/theme.ts
+++ b/src/app/theme.ts
@@ -22,6 +22,14 @@ export interface Theme {
   formError: string;
   button: string;
 
+  // badge background colors
+  badge: {
+    backgroundColor: {
+      read: string;
+      unread: string;
+    };
+  };
+
   // new types:
   approval: string;
   disapproval: string;
@@ -91,6 +99,14 @@ export const theme = {
   formError: '#DB0D0D',
   button: '#1ECCB5',
 
+  // badge background colors
+  badge: {
+    backgroundColor: {
+      read: '#9DA1A7',
+      unread: '#DB0D0D'
+    }
+  },
+
   // new types:
   approval: '#34C16C',
   disapproval: '#F70B7B',
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
index 2fbc4d805..017f00b4b 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
@@ -23,6 +23,7 @@ storiesOf('organisms/NoticeDetails', module)
       unlike={action('unlike')}
       dislike={action('dislike')}
       undislike={action('undislike')}
+      view={action('view')}
     />
   ))
   .add('Dismissed', () => (
@@ -38,6 +39,7 @@ storiesOf('organisms/NoticeDetails', module)
       unlike={action('unlike')}
       dislike={action('dislike')}
       undislike={action('undislike')}
+      view={action('view')}
     />
   ))
   .add('Disliked', () => (
@@ -53,6 +55,7 @@ storiesOf('organisms/NoticeDetails', module)
       unlike={action('unlike')}
       dislike={action('dislike')}
       undislike={action('undislike')}
+      view={action('view')}
     />
   ))
   .add('No source', () => (
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
index 388dbccdd..eaa6e6bc7 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
@@ -16,7 +16,7 @@ import Feedbacks from './Feedbacks';
 import Date from './Date';
 import { NoticeType } from '../../../app/lmem/noticeType';
 
-interface Props {
+interface NoticeDetailsProps {
   id: number;
   type: NoticeType;
   date: string;
@@ -30,8 +30,12 @@ interface Props {
   undislike: (id: number) => void;
   disliked?: boolean;
   dismissed?: boolean;
+  view?: (id: number) => void;
 }
-class NoticeDetails extends PureComponent<Props & RouteComponentProps> {
+class NoticeDetails extends PureComponent<
+  NoticeDetailsProps & RouteComponentProps,
+  {}
+> {
   handleLikeClick = () => {
     const { liked, like, unlike, id } = this.props;
     if (liked) {
@@ -50,6 +54,13 @@ class NoticeDetails extends PureComponent<Props & RouteComponentProps> {
     }
   };
 
+  componentDidMount(): void {
+    const { view, id } = this.props;
+    if (view) {
+      view(id);
+    }
+  }
+
   render() {
     const {
       type,
diff --git a/tslint.json b/tslint.json
index dd556125f..c3dbc6a53 100644
--- a/tslint.json
+++ b/tslint.json
@@ -8,7 +8,8 @@
   "rules": {
     "quotemark": [true, "single", "jsx-double"],
     "jsx-boolean-value": false,
-    "no-unused-expression": false
+    "no-unused-expression": false,
+    "no-empty": [true, "allow-empty-functions"]
   },
   "jsRules": true,
   "rulesDirectory": []

From 245fde7ee875176c5008e44415594bd1c70483e7 Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Tue, 16 Apr 2019 14:49:29 +0200
Subject: [PATCH 048/100] chore(ui): move functions to dedicated files

---
 src/app/content/extensionIframe.ts |  7 +++++++
 src/app/content/sagas/ui.tsx       | 21 ++++++++-------------
 src/app/content/selectors/index.ts |  3 +++
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/app/content/extensionIframe.ts b/src/app/content/extensionIframe.ts
index f4fcb636b..8ac27ea0d 100644
--- a/src/app/content/extensionIframe.ts
+++ b/src/app/content/extensionIframe.ts
@@ -31,3 +31,10 @@ export const remove = (): void => {
     iframe.remove();
   }
 };
+
+export const setImportant = () => {
+  const frame = document.querySelector('#lmemFrame');
+  if (frame) {
+    (frame as HTMLIFrameElement).style.setProperty('display', '', 'important');
+  }
+};
diff --git a/src/app/content/sagas/ui.tsx b/src/app/content/sagas/ui.tsx
index 2ad5029a0..fa631409f 100644
--- a/src/app/content/sagas/ui.tsx
+++ b/src/app/content/sagas/ui.tsx
@@ -5,31 +5,26 @@ import { push } from 'connected-react-router';
 import { open, opened, closed } from 'app/actions/ui';
 import {
   isOpen as isNotificationOpen,
-  isMounted as isNotificationMounted
+  isMounted as isNotificationMounted,
+  getPathname
 } from '../selectors';
 import { CLOSE, OPEN, NOTICES_FOUND } from '../../constants/ActionTypes';
-import { append, create } from '../extensionIframe';
+import {
+  append,
+  create,
+  setImportant as setFrameImportant
+} from '../extensionIframe';
 import theme from '../../theme';
 import App from '../App';
-import { State } from '../store';
 
 const iframe = create(theme.iframe.style);
 
-const getLocation = (state: State) => state.router.location.pathname;
-
-const setFrameImportant = () => {
-  const frame = document.querySelector('#lmemFrame');
-  if (frame) {
-    (frame as HTMLIFrameElement).style.setProperty('display', '', 'important');
-  }
-};
-
 export function* openSaga() {
   const isOpen = yield select(isNotificationOpen);
   const isMounted = yield select(isNotificationMounted);
 
   if (!isOpen) {
-    const location = yield select(getLocation);
+    const location = yield select(getPathname);
     if (location) {
       yield put(push('/'));
     }
diff --git a/src/app/content/selectors/index.ts b/src/app/content/selectors/index.ts
index bbd9bfc21..2d2267bf0 100644
--- a/src/app/content/selectors/index.ts
+++ b/src/app/content/selectors/index.ts
@@ -1,5 +1,6 @@
 import { createSelector } from 'reselect';
 import { RouteComponentProps } from 'react-router';
+import { getLocation } from 'connected-react-router';
 import { getNotice, shouldNoticeBeShown } from 'app/lmem/notice';
 import { InstallationDetails } from 'app/lmem/installation';
 import { State } from '../store';
@@ -33,3 +34,5 @@ export const getExtensionInstallationDate = createSelector(
 );
 
 export const getTabId = (state: State) => state.tabId;
+
+export const getPathname = (state: State) => getLocation(state).pathname;

From 212f205123d4ed0f3a4b14e115c8fbd0fc2a4f6a Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Tue, 16 Apr 2019 15:03:08 +0200
Subject: [PATCH 049/100] feat(ui): show UI only if there ares unread notices

---
 src/app/background/sagas/badge.ts  |  3 ++-
 src/app/content/sagas/ui.tsx       | 12 ++++++++----
 src/app/content/selectors/index.ts | 16 +++++++++++++++-
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/app/background/sagas/badge.ts b/src/app/background/sagas/badge.ts
index 8428d1517..037586f2f 100644
--- a/src/app/background/sagas/badge.ts
+++ b/src/app/background/sagas/badge.ts
@@ -1,13 +1,14 @@
 import { takeLatest } from 'redux-saga/effects';
 import { NoticesUpdatedAction } from '../../actions/recommendations';
 import { Theme } from '../../theme';
+import { isUnread } from '../../content/selectors';
 
 export const updateBadgeSaga = (theme: Theme) =>
   function*({
     payload: notices,
     meta: { tab: tabId }
   }: NoticesUpdatedAction): IterableIterator<any> {
-    const unreadNotices = notices.filter(notice => !notice.read);
+    const unreadNotices = notices.filter(isUnread);
     const { backgroundColor } = theme.badge;
 
     chrome.browserAction.setBadgeText({
diff --git a/src/app/content/sagas/ui.tsx b/src/app/content/sagas/ui.tsx
index fa631409f..c0f300009 100644
--- a/src/app/content/sagas/ui.tsx
+++ b/src/app/content/sagas/ui.tsx
@@ -6,7 +6,8 @@ import { open, opened, closed } from 'app/actions/ui';
 import {
   isOpen as isNotificationOpen,
   isMounted as isNotificationMounted,
-  getPathname
+  getPathname,
+  hasUnreadNotices
 } from '../selectors';
 import { CLOSE, OPEN, NOTICES_FOUND } from '../../constants/ActionTypes';
 import {
@@ -52,12 +53,15 @@ export function* closeSaga() {
   }
 }
 
-export function* recommendationFoundSaga() {
-  yield put(open());
+export function* noticesFoundSaga() {
+  const shouldOpen = yield select(hasUnreadNotices);
+  if (shouldOpen) {
+    yield put(open());
+  }
 }
 
 export default function* backgroundRootSaga() {
   yield takeLatest(OPEN, openSaga);
   yield takeLatest(CLOSE, closeSaga);
-  yield takeLatest(NOTICES_FOUND, recommendationFoundSaga);
+  yield takeLatest(NOTICES_FOUND, noticesFoundSaga);
 }
diff --git a/src/app/content/selectors/index.ts b/src/app/content/selectors/index.ts
index 2d2267bf0..64cb08103 100644
--- a/src/app/content/selectors/index.ts
+++ b/src/app/content/selectors/index.ts
@@ -1,12 +1,26 @@
 import { createSelector } from 'reselect';
 import { RouteComponentProps } from 'react-router';
 import { getLocation } from 'connected-react-router';
-import { getNotice, shouldNoticeBeShown } from 'app/lmem/notice';
+import {
+  EnhancedNotice,
+  getNotice,
+  shouldNoticeBeShown
+} from 'app/lmem/notice';
 import { InstallationDetails } from 'app/lmem/installation';
 import { State } from '../store';
 
 export const getNotices = (state: State) => state.recommendations;
 
+export const isRead = (notice: EnhancedNotice) => notice.read === true;
+
+export const isUnread = (notice: EnhancedNotice) => !isRead(notice);
+
+export const getUnreadNotices = (state: State) =>
+  getNotices(state).filter(isUnread);
+
+export const hasUnreadNotices = (state: State) =>
+  getUnreadNotices(state).length > 0;
+
 export const getNoticeById = (
   state: State,
   {

From 55818ac78c59909207089c593d28d3fba7ed26f9 Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Tue, 16 Apr 2019 16:41:36 +0200
Subject: [PATCH 050/100] feat(badge): store read notice in user `prefs` state
 slice

---
 src/app/actions/recommendations.ts    |  3 ++-
 src/app/background/reducers/prefs.ts  | 11 ++++++++++-
 src/app/background/sagas/badge.ts     |  2 +-
 src/app/background/selectors/prefs.ts |  5 ++++-
 src/app/content/selectors/index.ts    | 10 +---------
 src/app/lmem/notice.ts                |  4 ++++
 6 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/app/actions/recommendations.ts b/src/app/actions/recommendations.ts
index e54357798..1e3f37b7e 100644
--- a/src/app/actions/recommendations.ts
+++ b/src/app/actions/recommendations.ts
@@ -78,7 +78,8 @@ export interface ReadNoticeAction extends BaseAction {
 
 export const readNotice = (id: number): ReadNoticeAction => ({
   type: 'READ_NOTICE',
-  payload: id
+  payload: id,
+  meta: { sendToBackground: true }
 });
 
 export interface NoticesUpdatedAction extends TabAction {
diff --git a/src/app/background/reducers/prefs.ts b/src/app/background/reducers/prefs.ts
index c298d7e50..d06d36976 100644
--- a/src/app/background/reducers/prefs.ts
+++ b/src/app/background/reducers/prefs.ts
@@ -8,13 +8,15 @@ export interface PrefsState {
   dismissedNotices: number[];
   likedNotices: number[];
   dislikedNotices: number[];
+  readNotices: number[];
 }
 
 const initialPrefs: PrefsState = {
   installationDetails: { version },
   dismissedNotices: [],
   likedNotices: [],
-  dislikedNotices: []
+  dislikedNotices: [],
+  readNotices: []
 };
 
 export function prefs(state: PrefsState = initialPrefs, action: AppAction) {
@@ -68,6 +70,13 @@ export function prefs(state: PrefsState = initialPrefs, action: AppAction) {
           };
       }
       return state;
+
+    case 'READ_NOTICE':
+      return {
+        ...state,
+        readNotices: R.uniq(R.concat(state.readNotices, [action.payload]))
+      };
+
     default:
       return state;
   }
diff --git a/src/app/background/sagas/badge.ts b/src/app/background/sagas/badge.ts
index 037586f2f..515cbf76d 100644
--- a/src/app/background/sagas/badge.ts
+++ b/src/app/background/sagas/badge.ts
@@ -1,7 +1,7 @@
 import { takeLatest } from 'redux-saga/effects';
 import { NoticesUpdatedAction } from '../../actions/recommendations';
 import { Theme } from '../../theme';
-import { isUnread } from '../../content/selectors';
+import { isUnread } from '../../lmem/notice';
 
 export const updateBadgeSaga = (theme: Theme) =>
   function*({
diff --git a/src/app/background/selectors/prefs.ts b/src/app/background/selectors/prefs.ts
index 3f5b1d347..08f58de08 100644
--- a/src/app/background/selectors/prefs.ts
+++ b/src/app/background/selectors/prefs.ts
@@ -17,6 +17,7 @@ export const getLiked = (state: BackgroundState) =>
   getPrefs(state).likedNotices;
 export const getDisliked = (state: BackgroundState) =>
   getPrefs(state).dislikedNotices;
+export const getRead = (state: BackgroundState) => getPrefs(state).readNotices;
 
 export const getInitialContent = (state: BackgroundState) => ({
   installationDetails: getInstallationDetails(state)
@@ -26,13 +27,15 @@ export const getNoticeEnhancer = (state: BackgroundState) => {
   const dismissed = getDismissed(state);
   const liked = getLiked(state);
   const disliked = getDisliked(state);
+  const read = getRead(state);
 
   return (notice: Notice) => ({
     ...notice,
     dismissed: dismissed.includes(notice.id),
     liked: liked.includes(notice.id),
     disliked: disliked.includes(notice.id),
-    valid: warnIfNoticeInvalid(notice)
+    valid: warnIfNoticeInvalid(notice),
+    read: read.includes(notice.id)
   });
 };
 
diff --git a/src/app/content/selectors/index.ts b/src/app/content/selectors/index.ts
index 64cb08103..3d45fd649 100644
--- a/src/app/content/selectors/index.ts
+++ b/src/app/content/selectors/index.ts
@@ -1,20 +1,12 @@
 import { createSelector } from 'reselect';
 import { RouteComponentProps } from 'react-router';
 import { getLocation } from 'connected-react-router';
-import {
-  EnhancedNotice,
-  getNotice,
-  shouldNoticeBeShown
-} from 'app/lmem/notice';
+import { getNotice, isUnread, shouldNoticeBeShown } from 'app/lmem/notice';
 import { InstallationDetails } from 'app/lmem/installation';
 import { State } from '../store';
 
 export const getNotices = (state: State) => state.recommendations;
 
-export const isRead = (notice: EnhancedNotice) => notice.read === true;
-
-export const isUnread = (notice: EnhancedNotice) => !isRead(notice);
-
 export const getUnreadNotices = (state: State) =>
   getNotices(state).filter(isUnread);
 
diff --git a/src/app/lmem/notice.ts b/src/app/lmem/notice.ts
index ff4eb621a..004cbe65f 100644
--- a/src/app/lmem/notice.ts
+++ b/src/app/lmem/notice.ts
@@ -147,3 +147,7 @@ export const shouldNoticeBeShown = (notice: EnhancedNotice): boolean =>
     (!notice.dismissed || notice.justDismissed) &&
     (!notice.disliked || notice.justDisliked)) ||
   false;
+
+export const isRead = (notice: EnhancedNotice) => notice.read === true;
+
+export const isUnread = (notice: EnhancedNotice) => !isRead(notice);

From c94f735052e157e96db19c74148f5505382f717c Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Wed, 17 Apr 2019 12:14:37 +0200
Subject: [PATCH 051/100] chore(git): Add storybook generated files to git
 ignore list

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index ef4ac1cb2..90a19d111 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ platforms/
 .floo
 .flooignore
 .ftppass
+storybook-static/*

From 3e8df3484684aa5a03f951ae14603e050c342e5e Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Wed, 17 Apr 2019 12:16:25 +0200
Subject: [PATCH 052/100] feat(read): Handle read status visually on a `Notice`

---
 src/app/content/App/Notice/List/index.tsx     |  4 +++-
 src/components/organisms/Notice/Content.tsx   |  4 +++-
 .../organisms/Notice/Notice.stories.tsx       | 13 +++++++++++--
 src/components/organisms/Notice/Notice.tsx    | 19 ++++++++++++++++---
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/app/content/App/Notice/List/index.tsx b/src/app/content/App/Notice/List/index.tsx
index 3f9282405..c84acf543 100644
--- a/src/app/content/App/Notice/List/index.tsx
+++ b/src/app/content/App/Notice/List/index.tsx
@@ -25,7 +25,8 @@ export const List = ({ notices, dismiss, undismiss, close }: Props) => (
           resource: { url },
           criteria,
           dismissed,
-          disliked
+          disliked,
+          read
         }) => (
           <NoticeItem
             key={id}
@@ -37,6 +38,7 @@ export const List = ({ notices, dismiss, undismiss, close }: Props) => (
             undismiss={undismiss}
             dismissed={dismissed}
             disliked={disliked}
+            read={read}
           />
         )
       )}
diff --git a/src/components/organisms/Notice/Content.tsx b/src/components/organisms/Notice/Content.tsx
index 308446783..7645f72ea 100644
--- a/src/components/organisms/Notice/Content.tsx
+++ b/src/components/organisms/Notice/Content.tsx
@@ -6,8 +6,9 @@ import { LocationDescriptor } from 'history';
 interface ContentProps {
   to?: LocationDescriptor;
   children: ReactNode;
+  read: boolean;
 }
-const Content = ({ to, ...props }: ContentProps) => {
+const Content = ({ to, read, ...props }: ContentProps) => {
   if (to) {
     return <Link to={to} {...props} />;
   }
@@ -30,6 +31,7 @@ export default styled(Content)`
   border-radius: 15px;
   border: 2px solid transparent;
   transition: all 0.2s ease-in-out;
+  opacity: ${props => (props.read ? '0.6' : '1')};
 
   &[href]:hover {
     border-color: ${props => props.theme.activeColor};
diff --git a/src/components/organisms/Notice/Notice.stories.tsx b/src/components/organisms/Notice/Notice.stories.tsx
index 403897a19..0a37bcdb2 100644
--- a/src/components/organisms/Notice/Notice.stories.tsx
+++ b/src/components/organisms/Notice/Notice.stories.tsx
@@ -99,7 +99,16 @@ storiesOf('organisms/Notice', module)
       }
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
-      dismissed={false}
-      disliked={false}
+    />
+  ))
+  .add('Read', () => (
+    <Notice
+      type="Approval"
+      contributor="Lutangar"
+      id={123}
+      message={message}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
+      read
     />
   ));
diff --git a/src/components/organisms/Notice/Notice.tsx b/src/components/organisms/Notice/Notice.tsx
index 117c532f9..095d1a86f 100644
--- a/src/components/organisms/Notice/Notice.tsx
+++ b/src/components/organisms/Notice/Notice.tsx
@@ -18,12 +18,14 @@ interface Props {
   undismiss: (id: number) => void;
   dismissed: boolean;
   disliked: boolean;
+  read: boolean;
 }
 
 export default class Notice extends PureComponent<Props> {
   static defaultProps = {
     type: 'Other',
-    dismissed: false
+    dismissed: false,
+    read: false
   };
 
   onDismiss = () => {
@@ -35,11 +37,22 @@ export default class Notice extends PureComponent<Props> {
   };
 
   render() {
-    const { id, type, message, contributor, dismissed, disliked } = this.props;
+    const {
+      id,
+      type,
+      message,
+      contributor,
+      dismissed,
+      disliked,
+      read
+    } = this.props;
     return (
       <Container>
         {!dismissed && !disliked && <DeleteButton onClick={this.onDismiss} />}
-        <Content to={dismissed ? undefined : `notices/details/${id}`}>
+        <Content
+          to={dismissed ? undefined : `notices/details/${id}`}
+          read={read}
+        >
           {dismissed || disliked ? (
             <Fragment>
               <Deleted>Cette bulle ne s’affichera plus !</Deleted>

From 513987001a6836375e6b4b852c8c2700edd35263 Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Wed, 17 Apr 2019 12:19:48 +0200
Subject: [PATCH 053/100] chore(Notice): clean `Notice` story

---
 .../organisms/Notice/Notice.stories.tsx       | 21 ++++---------------
 src/components/organisms/Notice/Notice.tsx    |  1 +
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/components/organisms/Notice/Notice.stories.tsx b/src/components/organisms/Notice/Notice.stories.tsx
index 0a37bcdb2..579a56d6a 100644
--- a/src/components/organisms/Notice/Notice.stories.tsx
+++ b/src/components/organisms/Notice/Notice.stories.tsx
@@ -8,7 +8,7 @@ const message = '<p>Description with a <a href="http://some.url">link</a></p>';
 
 storiesOf('organisms/Notice', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add('Approval', () => (
+  .add('Approved', () => (
     <Notice
       type="Approval"
       contributor="Jalil"
@@ -16,11 +16,9 @@ storiesOf('organisms/Notice', module)
       message={message}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
-      dismissed={false}
-      disliked={false}
     />
   ))
-  .add('Disapproval', () => (
+  .add('Disapproved', () => (
     <Notice
       type="Disapproval"
       contributor="Jalil"
@@ -28,8 +26,6 @@ storiesOf('organisms/Notice', module)
       message={message}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
-      dismissed={false}
-      disliked={false}
     />
   ))
   .add('Tip', () => (
@@ -40,8 +36,6 @@ storiesOf('organisms/Notice', module)
       message={message}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
-      dismissed={false}
-      disliked={false}
     />
   ))
   .add('Other', () => (
@@ -52,8 +46,6 @@ storiesOf('organisms/Notice', module)
       message={message}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
-      dismissed={false}
-      disliked={false}
     />
   ))
   .add('No type', () => (
@@ -63,8 +55,6 @@ storiesOf('organisms/Notice', module)
       message={message}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
-      dismissed={false}
-      disliked={false}
     />
   ))
   .add('Undefined type', () => (
@@ -75,11 +65,9 @@ storiesOf('organisms/Notice', module)
       message={message}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
-      dismissed={false}
-      disliked={false}
     />
   ))
-  .add('dismissed', () => (
+  .add('Dismissed', () => (
     <Notice
       contributor="Jalil"
       id={123}
@@ -87,10 +75,9 @@ storiesOf('organisms/Notice', module)
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
       dismissed
-      disliked={false}
     />
   ))
-  .add('with long title', () => (
+  .add('Long title', () => (
     <Notice
       contributor="Jalil"
       id={123}
diff --git a/src/components/organisms/Notice/Notice.tsx b/src/components/organisms/Notice/Notice.tsx
index 095d1a86f..f2c9d2e63 100644
--- a/src/components/organisms/Notice/Notice.tsx
+++ b/src/components/organisms/Notice/Notice.tsx
@@ -25,6 +25,7 @@ export default class Notice extends PureComponent<Props> {
   static defaultProps = {
     type: 'Other',
     dismissed: false,
+    disliked: false,
     read: false
   };
 

From 3f04d8998f1cc5e7702df1bf387183e72480032c Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Thu, 25 Apr 2019 14:36:16 +0200
Subject: [PATCH 054/100] fix: changed opacity for read Bulle according to the
 design

---
 src/components/organisms/Notice/Content.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/organisms/Notice/Content.tsx b/src/components/organisms/Notice/Content.tsx
index 7645f72ea..e886e54fb 100644
--- a/src/components/organisms/Notice/Content.tsx
+++ b/src/components/organisms/Notice/Content.tsx
@@ -31,7 +31,7 @@ export default styled(Content)`
   border-radius: 15px;
   border: 2px solid transparent;
   transition: all 0.2s ease-in-out;
-  opacity: ${props => (props.read ? '0.6' : '1')};
+  opacity: ${props => (props.read ? '0.5' : '1')};
 
   &[href]:hover {
     border-color: ${props => props.theme.activeColor};

From 6660a312979bb73c1f901e7a895b3fbe631ee711 Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Thu, 25 Apr 2019 15:00:28 +0200
Subject: [PATCH 055/100] chore(story): add *notice read* case to Notice/List
 story

---
 .../content/App/Notice/List/List.stories.tsx  | 76 +++++++++++--------
 1 file changed, 45 insertions(+), 31 deletions(-)

diff --git a/src/app/content/App/Notice/List/List.stories.tsx b/src/app/content/App/Notice/List/List.stories.tsx
index 92e70da08..23ef2fc82 100644
--- a/src/app/content/App/Notice/List/List.stories.tsx
+++ b/src/app/content/App/Notice/List/List.stories.tsx
@@ -5,46 +5,60 @@ import { action } from '@storybook/addon-actions';
 import { List } from '.';
 import { EnhancedNotice } from '../../../../lmem/notice';
 
-const notices: EnhancedNotice[] = [
-  {
-    id: 123,
-    title: 'title is going to be removed',
-    description: '<p>Description with a <a href="http://some.url">link</a></p>',
-    contributor: { name: 'John Doe', image: 'image', organization: 'org' },
-    criteria: [{ label: 'label', slug: 'slug' }],
-    resource: {
-      author: 'Jack Daniels',
-      editor: { id: 42, label: 'LMEM', url: 'url' },
-      label: 'label',
-      url: 'url'
-    },
-    alternatives: [
-      {
-        label: 'some alternative',
-        url_to_redirect: 'url'
-      }
-    ],
-    dismissed: false,
-    disliked: false,
-    liked: false,
-    dislikes: 0,
-    likes: 0,
-    valid: true,
-    visibility: 'public'
-  }
-];
+const notice: EnhancedNotice = {
+  id: 123,
+  title: 'title is going to be removed',
+  description: '<p>Description with a <a href="http://some.url">link</a></p>',
+  contributor: { name: 'John Doe', image: 'image', organization: 'org' },
+  criteria: [{ label: 'label', slug: 'slug' }],
+  resource: {
+    author: 'Jack Daniels',
+    editor: { id: 42, label: 'LMEM', url: 'url' },
+    label: 'label',
+    url: 'url'
+  },
+  alternatives: [
+    {
+      label: 'some alternative',
+      url_to_redirect: 'url'
+    }
+  ],
+  dismissed: false,
+  disliked: false,
+  liked: false,
+  dislikes: 0,
+  likes: 0,
+  valid: true,
+  visibility: 'public'
+};
 
 storiesOf('screens/Notice/List', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add('with 1 notification', () => (
+  .add('1 notice', () => (
     <List
       close={action('close')}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
-      notices={notices}
+      notices={[notice]}
     />
   ))
-  .add('empty list', () => (
+  .add('2 notices', () => (
+    <List
+      close={action('close')}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
+      notices={[notice, notice]}
+    />
+  ))
+  .add('1 read', () => (
+    <List
+      close={action('close')}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
+      notices={[notice, { ...notice, read: true }]}
+    />
+  ))
+  .add('empty', () => (
     <List
       close={action('close')}
       dismiss={action('dismiss')}

From b6551f50b96e26832bb9e22cd15cee6860bac53c Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Mon, 13 May 2019 14:42:20 +0200
Subject: [PATCH 056/100] fix(badge): reset badge when a tab is created or
 updated

---
 src/app/background/sagas/badge.ts | 38 +++++++++++-------------
 src/app/background/sagas/index.js |  2 +-
 src/app/lmem/badge.ts             | 48 +++++++++++++++++++++++++++++++
 src/app/theme.ts                  | 10 ++-----
 4 files changed, 68 insertions(+), 30 deletions(-)
 create mode 100644 src/app/lmem/badge.ts

diff --git a/src/app/background/sagas/badge.ts b/src/app/background/sagas/badge.ts
index 515cbf76d..4e08ca179 100644
--- a/src/app/background/sagas/badge.ts
+++ b/src/app/background/sagas/badge.ts
@@ -1,33 +1,27 @@
 import { takeLatest } from 'redux-saga/effects';
 import { NoticesUpdatedAction } from '../../actions/recommendations';
-import { Theme } from '../../theme';
-import { isUnread } from '../../lmem/notice';
+import { BadgeTheme, updateBadge, resetBadge } from '../../lmem/badge';
+import { TabAction } from '../../actions';
 
-export const updateBadgeSaga = (theme: Theme) =>
+export const updateBadgeSaga = (badgeTheme: BadgeTheme) =>
   function*({
     payload: notices,
     meta: { tab: tabId }
   }: NoticesUpdatedAction): IterableIterator<any> {
-    const unreadNotices = notices.filter(isUnread);
-    const { backgroundColor } = theme.badge;
-
-    chrome.browserAction.setBadgeText({
-      text:
-        unreadNotices.length > 0
-          ? unreadNotices.length.toString()
-          : notices.length.toString(),
-      tabId
-    });
-    chrome.browserAction.setBadgeBackgroundColor({
-      color:
-        unreadNotices.length > 0
-          ? backgroundColor.unread
-          : backgroundColor.read,
-      tabId
-    });
+    updateBadge(notices, badgeTheme, tabId);
   };
 
-export default (theme: Theme) =>
+export function* resetBadgeSaga({
+  meta: { tab: tabId }
+}: TabAction): IterableIterator<any> {
+  resetBadge(tabId);
+}
+
+export default (badgeTheme: BadgeTheme) =>
   function* tabRootSaga() {
-    yield takeLatest('NOTICES_UPDATED', updateBadgeSaga(theme));
+    yield takeLatest('NOTICES_UPDATED', updateBadgeSaga(badgeTheme));
+    yield takeLatest(
+      ['BROWSER/TAB_CREATED', 'BROWSER/TAB_UPDATED'],
+      resetBadgeSaga
+    );
   };
diff --git a/src/app/background/sagas/index.js b/src/app/background/sagas/index.js
index 8d850e0c9..2bbbe02e6 100644
--- a/src/app/background/sagas/index.js
+++ b/src/app/background/sagas/index.js
@@ -5,5 +5,5 @@ import badge from './badge';
 import theme from '../../theme';
 
 export default function* rootSaga() {
-  yield all([fork(matchingContexts), fork(tab), fork(badge(theme))]);
+  yield all([fork(matchingContexts), fork(tab), fork(badge(theme.badge))]);
 }
diff --git a/src/app/lmem/badge.ts b/src/app/lmem/badge.ts
new file mode 100644
index 000000000..e7756d2cd
--- /dev/null
+++ b/src/app/lmem/badge.ts
@@ -0,0 +1,48 @@
+import { EnhancedNotice, isUnread } from './notice';
+
+export interface BadgeTheme {
+  backgroundColor: {
+    read: string;
+    unread: string;
+  };
+}
+
+/**
+ * Update text and background color of the badge based on the number of notices.
+ *
+ * @param {EnhancedNotice[]} notices
+ * @param {BadgeTheme} badgeTheme
+ * @param {number} tabId Limits the change to when a particular tab is selected.
+ *
+ * @return {void}
+ */
+export const updateBadge = (
+  notices: EnhancedNotice[],
+  badgeTheme: BadgeTheme,
+  tabId?: number
+): void => {
+  if (notices.length > 0) {
+    const unreadNotices = notices.filter(isUnread);
+    const { backgroundColor } = badgeTheme;
+
+    chrome.browserAction.setBadgeText({
+      text:
+        unreadNotices.length > 0
+          ? unreadNotices.length.toString()
+          : notices.length.toString(),
+      tabId
+    });
+    chrome.browserAction.setBadgeBackgroundColor({
+      color:
+        unreadNotices.length > 0
+          ? backgroundColor.unread
+          : backgroundColor.read,
+      tabId
+    });
+  } else {
+    resetBadge(tabId);
+  }
+};
+
+export const resetBadge = (tabId?: number) =>
+  chrome.browserAction.setBadgeText({ text: '', tabId });
diff --git a/src/app/theme.ts b/src/app/theme.ts
index 98a6250c4..7e9571eb2 100644
--- a/src/app/theme.ts
+++ b/src/app/theme.ts
@@ -1,3 +1,5 @@
+import { BadgeTheme } from './lmem/badge';
+
 export interface Theme {
   main: string;
   // colors
@@ -22,13 +24,7 @@ export interface Theme {
   formError: string;
   button: string;
 
-  // badge background colors
-  badge: {
-    backgroundColor: {
-      read: string;
-      unread: string;
-    };
-  };
+  badge: BadgeTheme;
 
   // new types:
   approval: string;

From dbe5ca9ef7a44884d111653e39a8981b680bb19c Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Wed, 24 Apr 2019 17:55:23 +0200
Subject: [PATCH 057/100] chore(Content): create dedicated file for "content"
 component

---
 src/app/content/App/Content.tsx | 41 ++++++++++++++++++++++++++++++++
 src/app/content/App/index.tsx   | 42 +++------------------------------
 2 files changed, 44 insertions(+), 39 deletions(-)
 create mode 100644 src/app/content/App/Content.tsx

diff --git a/src/app/content/App/Content.tsx b/src/app/content/App/Content.tsx
new file mode 100644
index 000000000..e4c93c274
--- /dev/null
+++ b/src/app/content/App/Content.tsx
@@ -0,0 +1,41 @@
+import { State } from '../store';
+import { isOpen } from '../selectors';
+import { connect } from 'react-redux';
+import React from 'react';
+import { Redirect, Route, Switch } from 'react-router';
+import GlobalStyle from '../GlobalStyle';
+import Notice from './Notice';
+import Subscriptions from './Subscriptions';
+import Help from './Help';
+import Account from './Account';
+import Loading from './Loading';
+import Error from './Error';
+
+const mapStateToProps = (state: State) => ({
+  open: isOpen(state)
+});
+
+interface ContentProps {
+  loaded: boolean;
+  open: boolean;
+}
+
+export default connect(mapStateToProps)(({ loaded, open }: ContentProps) =>
+  open ? (
+    <React.Fragment>
+      <GlobalStyle />
+      {loaded ? (
+        <Switch>
+          <Redirect exact path="/" to="/notices" />
+          <Route path="/notices" component={Notice} />
+          <Route path="/subscriptions" component={Subscriptions} />
+          <Route path="/help" component={Help} />
+          <Route path="/account" component={Account} />
+          <Route component={Error} />
+        </Switch>
+      ) : (
+        <Loading />
+      )}
+    </React.Fragment>
+  ) : null
+);
diff --git a/src/app/content/App/index.tsx b/src/app/content/App/index.tsx
index 633fe19fc..f0f281c53 100644
--- a/src/app/content/App/index.tsx
+++ b/src/app/content/App/index.tsx
@@ -1,49 +1,13 @@
 import React from 'react';
-import { Provider, connect } from 'react-redux';
-import { Redirect, Route, Switch } from 'react-router-dom';
+import { Provider } from 'react-redux';
 import { ConnectedRouter } from 'connected-react-router/immutable';
 import { ThemeProvider, StyleSheetManager } from 'styled-components';
 import theme from '../../theme';
-import store, { history, State } from '../store';
-import GlobalStyle from '../GlobalStyle';
-import Account from './Account';
-import Error from './Error';
-import Loading from './Loading';
-import Notice from './Notice';
-import Subscriptions from './Subscriptions';
-import Help from './Help';
-import { isOpen } from '../selectors';
+import store, { history } from '../store';
+import Content from './Content';
 
 const DELAY_BEFORE_SHOWING = process.env.NODE_ENV === 'production' ? 4000 : 10;
 
-const mapStateToProps = (state: State) => ({
-  open: isOpen(state)
-});
-
-interface ContentProps {
-  loaded: boolean;
-  open: boolean;
-}
-const Content = connect(mapStateToProps)(({ loaded, open }: ContentProps) =>
-  open ? (
-    <React.Fragment>
-      <GlobalStyle />
-      {loaded ? (
-        <Switch>
-          <Redirect exact path="/" to="/notices" />
-          <Route path="/notices" component={Notice} />
-          <Route path="/subscriptions" component={Subscriptions} />
-          <Route path="/help" component={Help} />
-          <Route path="/account" component={Account} />
-          <Route component={Error} />
-        </Switch>
-      ) : (
-        <Loading />
-      )}
-    </React.Fragment>
-  ) : null
-);
-
 interface AppProps {
   contentDocument: Document;
 }

From 7f1e109a2f1b430c9a3af9e9f2d7ba64721efe7b Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Thu, 25 Apr 2019 14:13:10 +0200
Subject: [PATCH 058/100] feat(UI): close the UI when clicking outside of the
 UI

---
 src/app/content/externalClickHandler.ts | 11 +++++++++++
 src/app/content/index.ts                | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 src/app/content/externalClickHandler.ts

diff --git a/src/app/content/externalClickHandler.ts b/src/app/content/externalClickHandler.ts
new file mode 100644
index 000000000..19e7d7196
--- /dev/null
+++ b/src/app/content/externalClickHandler.ts
@@ -0,0 +1,11 @@
+import { Store } from 'redux';
+import { close } from 'app/actions/ui';
+import { isOpen } from './selectors';
+
+export default (store: Store) => () => {
+  const state = store.getState();
+
+  if (isOpen(state)) {
+    store.dispatch(close());
+  }
+};
diff --git a/src/app/content/index.ts b/src/app/content/index.ts
index 1286fff65..0b43066c3 100644
--- a/src/app/content/index.ts
+++ b/src/app/content/index.ts
@@ -1,7 +1,17 @@
-/* eslint-disable global-require */
 if (!(window as CustomWindow).__LMEM__CONTENT_SCRIPT_INJECTED__) {
   require('typeface-lato');
   require('typeface-sedgwick-ave');
-  require('./store');
+  const store = require('./store');
+  const externalClickHandler = require('./externalClickHandler');
+  const handleExternalClick = externalClickHandler(store);
+
+  window.addEventListener('load', () => {
+    document.addEventListener('click', handleExternalClick);
+  });
+
+  window.addEventListener('unload', () => {
+    document.removeEventListener('click', handleExternalClick);
+  });
+
   (window as CustomWindow).__LMEM__CONTENT_SCRIPT_INJECTED__ = true;
 }

From 71d94bf769ff59e1ac2cc9271189532d106f66f1 Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Thu, 25 Apr 2019 16:31:28 +0200
Subject: [PATCH 059/100] fix(excerpt): fix notice excerpt which could take 3
 lines instead of 2

---
 src/app/content/App/Notice/List/List.stories.tsx | 14 ++++++++++++++
 src/app/utils/truncate.js                        | 13 ++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/app/content/App/Notice/List/List.stories.tsx b/src/app/content/App/Notice/List/List.stories.tsx
index 23ef2fc82..1a60a2979 100644
--- a/src/app/content/App/Notice/List/List.stories.tsx
+++ b/src/app/content/App/Notice/List/List.stories.tsx
@@ -65,4 +65,18 @@ storiesOf('screens/Notice/List', module)
       undismiss={action('undismiss')}
       notices={[]}
     />
+  ))
+  .add('2 lines excerpt', () => (
+    <List
+      close={action('close')}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
+      notices={[
+        {
+          ...notice,
+          description:
+            'dazd zazaddd dddddd ddddd dddd dddddd ddd ddddd dddddddd dd'
+        }
+      ]}
+    />
   ));
diff --git a/src/app/utils/truncate.js b/src/app/utils/truncate.js
index e25155c62..fdaf156bb 100644
--- a/src/app/utils/truncate.js
+++ b/src/app/utils/truncate.js
@@ -1,11 +1,15 @@
-export const truncateButPreserveWords = (text = '', limit = 50, after = '…') => {
+export const truncateButPreserveWords = (
+  text = '',
+  limit = 50,
+  after = '…'
+) => {
   if (text.length < limit) {
     return text;
   }
 
   const words = text.trim().split(' ');
 
-  while (words.join(' ').length > limit) {
+  while (words.join(' ').length >= limit) {
     words.pop();
   }
 
@@ -20,8 +24,7 @@ export const simpleTruncate = (text = '', limit = 50, after = '…') => {
   return `${text.trim().substring(0, limit)}${after}`;
 };
 
-export default (text = '', limit = 50, preserveWords = true, after = '…') => (
+export default (text = '', limit = 50, preserveWords = true, after = '…') =>
   preserveWords
     ? truncateButPreserveWords(text, limit - after.length, after)
-    : simpleTruncate(text, limit - after.length, after)
-);
+    : simpleTruncate(text, limit - after.length, after);

From acaf212d71c97384fc6dced60c3fe5629a0015f1 Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Mon, 13 May 2019 10:55:08 +0200
Subject: [PATCH 060/100] chore(List): add `notices` knob to `List` story

---
 .../content/App/Notice/List/List.stories.tsx  | 116 +++++++++++-------
 1 file changed, 69 insertions(+), 47 deletions(-)

diff --git a/src/app/content/App/Notice/List/List.stories.tsx b/src/app/content/App/Notice/List/List.stories.tsx
index 1a60a2979..0324dd863 100644
--- a/src/app/content/App/Notice/List/List.stories.tsx
+++ b/src/app/content/App/Notice/List/List.stories.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
+import { withKnobs, object } from '@storybook/addon-knobs/react';
 import { List } from '.';
 import { EnhancedNotice } from '../../../../lmem/notice';
 
@@ -29,54 +30,75 @@ const notice: EnhancedNotice = {
   dislikes: 0,
   likes: 0,
   valid: true,
-  visibility: 'public'
+  visibility: 'public' as 'public'
 };
 
 storiesOf('screens/Notice/List', module)
+  .addDecorator(withKnobs)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add('1 notice', () => (
-    <List
-      close={action('close')}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-      notices={[notice]}
-    />
-  ))
-  .add('2 notices', () => (
-    <List
-      close={action('close')}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-      notices={[notice, notice]}
-    />
-  ))
-  .add('1 read', () => (
-    <List
-      close={action('close')}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-      notices={[notice, { ...notice, read: true }]}
-    />
-  ))
-  .add('empty', () => (
-    <List
-      close={action('close')}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-      notices={[]}
-    />
-  ))
-  .add('2 lines excerpt', () => (
-    <List
-      close={action('close')}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-      notices={[
-        {
-          ...notice,
-          description:
-            'dazd zazaddd dddddd ddddd dddd dddddd ddd ddddd dddddddd dd'
-        }
-      ]}
-    />
-  ));
+  .add('1 notice', () => {
+    const notices = object('Notices', [notice]);
+
+    return (
+      <List
+        close={action('close')}
+        dismiss={action('dismiss')}
+        undismiss={action('undismiss')}
+        notices={notices}
+      />
+    );
+  })
+  .add('2 notices', () => {
+    const notices = object('Notices', [notice, notice]);
+
+    return (
+      <List
+        close={action('close')}
+        dismiss={action('dismiss')}
+        undismiss={action('undismiss')}
+        notices={notices}
+      />
+    );
+  })
+  .add('1 read', () => {
+    const notices = object('Notices', [notice, { ...notice, read: true }]);
+
+    return (
+      <List
+        close={action('close')}
+        dismiss={action('dismiss')}
+        undismiss={action('undismiss')}
+        notices={notices}
+      />
+    );
+  })
+  .add('empty', () => {
+    const notices = object('Notices', []);
+
+    return (
+      <List
+        close={action('close')}
+        dismiss={action('dismiss')}
+        undismiss={action('undismiss')}
+        notices={notices}
+      />
+    );
+  })
+  .add('2 lines excerpt', () => {
+    const notices = object('Notices', [
+      {
+        ...notice,
+        description:
+          'dazd zazaddd dddddd ddddd dddd dddddd ddd ddddd dddddddd dd'
+      }
+    ]);
+
+    return (
+      <List
+        close={action('close')}
+        dismiss={action('dismiss')}
+        undismiss={action('undismiss')}
+        notices={notices}
+      />
+    );
+  });

From 7e3cc637aeb536ad7a9a3044459d19dddbe9fede Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Sat, 11 May 2019 22:29:19 +0200
Subject: [PATCH 061/100] doc: update README to reflect new TypeScript setup
 changes

---
 README.md | 73 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 47 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index abb0b3668..ab910f11a 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-# Le Même en Mieux - Recommendations
+# Bulle.io - Web Extension
 
 [![Build Status](https://semaphoreci.com/api/v1/projects/02861938-a833-4f0e-938d-9bb2cd5ae49f/965710/shields_badge.svg)](https://semaphoreci.com/bmenant_lmem/extension)
 
 At its early stages, this software was a fork of [Crossbuilder](https://github.com/zalmoxisus/crossbuilder).
-However, the software has evolved to better embrace our project needs and specificities. 
+However, the software has evolved to better embrace our project needs and specificities.
 As a result, the upstream codebase haven’t be merged for a while and it is unlikely to happen ever again.
 
 ## Structure
@@ -28,21 +28,32 @@ yarn
 ## Development
 
 ```bash
-# build files to './build/dev/'
 # watch files change (do not reload the extension though)
-# start WebpackDevServer
+# start Webpack Dev Server
 yarn start
 ```
 
 - [Load unpacked extension's `./build/dev/` folder to Chrome.](https://developer.chrome.com/extensions/getstarted#unpacked)
 
-## Sandbox
-There is a sandbox for components testing and integration, it's hot reloaded and js and css are linted.
-The sandbox may be run with the following command:
+## Storybook
+
+There is a Storybook for components design, exploration, testing and documentation. It's hot reloaded.
+Storybook may be run with the following command:
+
+```bash
+yarn storybook
 ```
-yarn sandbox
+
+It also possible to build a static version, the one you can see here : https://storybook.lmem.net.
+
+You can do this with:
+
+```bash
+yarn build-storybook
 ```
 
+It is automatically deployed to https://storybook.lmem.net on every `develop` branch update.
+
 ### Conventional Commits
 
 We follow [conventional commits](https://conventionalcommits.org/) since version 1.0.0 and
@@ -50,7 +61,7 @@ we use [Semantic Release](https://github.com/semantic-release/semantic-release)
 
 ### Redux DevTools
 
-We use [Redux DevTools](https://extension.remotedev.io/) to inspect Redux actions and state changes. 
+We use [Redux DevTools](https://extension.remotedev.io/) to inspect Redux actions and state changes.
 Once installed, from the Redux DevTools extension’s context menu, choose “Open Remote DevTools” for remote monitoring.
 
 ## Build Web extension
@@ -89,19 +100,29 @@ yarn test
 
 ## Lint
 
-### Javascript
-Code style rules are available in `.eslintrc`.
+You can lint both TypeScript and CSS by running:
 
-You can manually lint .js files running the following command:
-```
+```bash
 npm run lint
 ```
 
+### TypeScript
+
+Code style rules are available in `tslint.json`.
+
+You can manually lint .ts files running the following command:
+
+```bash
+npm run lint:ts
+```
+
 ### Styles
+
 Styling rules are available in `.stylelintrc`.
 
 You can manually the styled components running the following command:
-```
+
+```bash
 npm run lint:css
 ```
 
@@ -113,18 +134,18 @@ Inspect the extension _background_ to get its console and run `window.integratio
 
 [GNU GPL v3](LICENSE)
 
->    Le Même en Mieux est un assistant d’achat indépendant des vendeurs et des marques.
->    Copyright (C) 2016  INSITU SAS
+> Le Même en Mieux est un assistant d’achat indépendant des vendeurs et des marques.
+> Copyright (C) 2016 INSITU SAS
 >
->    This program is free software: you can redistribute it and/or modify
->    it under the terms of the GNU General Public License as published by
->    the Free Software Foundation, either version 3 of the License, or
->    (at your option) any later version.
+> This program is free software: you can redistribute it and/or modify
+> it under the terms of the GNU General Public License as published by
+> the Free Software Foundation, either version 3 of the License, or
+> (at your option) any later version.
 >
->    This program is distributed in the hope that it will be useful,
->    but WITHOUT ANY WARRANTY; without even the implied warranty of
->    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
->    GNU General Public License for more details.
+> This program is distributed in the hope that it will be useful,
+> but WITHOUT ANY WARRANTY; without even the implied warranty of
+> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+> GNU General Public License for more details.
 >
->    You should have received a copy of the GNU General Public License
->    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+> You should have received a copy of the GNU General Public License
+> along with this program. If not, see <http://www.gnu.org/licenses/>.

From bcb15d0da4eb512444d1393aa38aa08b09d89ed4 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Thu, 16 May 2019 15:38:38 +0200
Subject: [PATCH 062/100] doc(readme): replace npm mentions by yarn

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ab910f11a..7326d0afa 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ yarn test
 You can lint both TypeScript and CSS by running:
 
 ```bash
-npm run lint
+yarn lint
 ```
 
 ### TypeScript
@@ -113,7 +113,7 @@ Code style rules are available in `tslint.json`.
 You can manually lint .ts files running the following command:
 
 ```bash
-npm run lint:ts
+yarn lint:ts
 ```
 
 ### Styles
@@ -123,7 +123,7 @@ Styling rules are available in `.stylelintrc`.
 You can manually the styled components running the following command:
 
 ```bash
-npm run lint:css
+yarn lint:css
 ```
 
 ### Integration tests

From 1208e90251ed2885b88bc45778cb98fde5fffded Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Fri, 10 May 2019 23:57:59 +0200
Subject: [PATCH 063/100] refactor: rename all forgotten .js files to .ts or
 .tsx

---
 .../middlewares/{index.js => index.ts}        |  0
 .../middlewares/{saga.js => saga.ts}          |  0
 .../background/sagas/{index.js => index.ts}   |  0
 ...atchingContexts.js => matchingContexts.ts} |  0
 .../{ActionTypes.js => ActionTypes.ts}        |  1 -
 src/app/constants/assetsUrls.js               |  4 --
 .../browser/{action.js => action.ts}          |  2 +-
 .../constants/browser/{tabs.js => tabs.ts}    |  0
 src/app/constants/websites.js                 |  2 -
 .../content/App/Account/About/Container.js    | 11 ------
 .../content/App/Account/About/Container.ts    | 11 ++++++
 src/app/content/App/Account/About/Content.js  |  7 ----
 src/app/content/App/Account/About/Content.ts  |  7 ++++
 .../About/Title.ts}                           |  4 +-
 src/app/content/App/Account/Menu/Account.js   | 39 -------------------
 src/app/content/App/Account/Menu/Account.ts   | 38 ++++++++++++++++++
 .../content/App/Error/Container.ts}           |  4 +-
 .../App/Error/{Content.js => Content.ts}      |  6 +--
 src/app/content/App/Error/ContentTitle.js     |  9 -----
 src/app/content/App/Error/ContentTitle.ts     |  9 +++++
 .../{Illustration.js => Illustration.tsx}     |  0
 .../App/Error/{index.jsx => index.tsx}        |  7 ++--
 src/app/content/App/Help/Container.js         |  8 ----
 src/app/content/App/Help/Container.ts         |  8 ++++
 .../About/Title.js => Help/ContentTitle.ts}   |  4 +-
 src/app/content/App/Loading/Container.js      | 27 -------------
 src/app/content/App/Loading/Container.ts      | 27 +++++++++++++
 .../{Illustration.js => Illustration.tsx}     |  0
 .../{withConnect.js => withConnect.ts}        |  0
 ...{ButtonContainer.js => ButtonContainer.ts} |  0
 .../{Illustration.js => Illustration.tsx}     |  0
 .../List/NoNotice/{Title.js => Title.ts}      |  0
 .../content/App/Subscriptions/Container.js    | 13 -------
 .../content/App/Subscriptions/Container.ts    | 13 +++++++
 .../{Illustration.js => Illustration.tsx}     |  0
 .../App/Subscriptions/SubscriptionsData.js    | 21 ----------
 .../App/Subscriptions/SubscriptionsData.ts    | 21 ++++++++++
 .../{GlobalStyle.js => GlobalStyle.ts}        |  2 +-
 .../middlewares/{index.js => index.ts}        |  0
 .../content/middlewares/{saga.js => saga.ts}  |  0
 .../{browserAction.js => browserAction.ts}    |  0
 src/app/content/sagas/{index.js => index.ts}  |  0
 src/app/utils/{truncate.js => truncate.ts}    |  0
 src/components/atoms/Button.js                | 24 ------------
 src/components/atoms/Button.ts                | 24 ++++++++++++
 .../AddNoticeLink/{AddIcon.js => AddIcon.tsx} |  0
 .../{AddNoticeLink.js => AddNoticeLink.tsx}   |  0
 .../AddNoticeLink/{index.js => index.ts}      |  0
 .../Buttons/BorderButton/BorderButton.js      | 18 ---------
 .../Buttons/BorderButton/BorderButton.ts      | 17 ++++++++
 .../BorderButton/{index.js => index.ts}       |  0
 .../atoms/Buttons/OpenButton/OpenButton.js    | 15 -------
 .../atoms/Buttons/OpenButton/OpenButton.tsx   | 14 +++++++
 ...{CenterContainer.js => CenterContainer.ts} |  6 +--
 src/components/atoms/ContentTitle/index.js    |  9 -----
 src/components/atoms/ContentTitle/index.ts    |  9 +++++
 src/components/atoms/Contributor.js           |  8 ----
 src/components/atoms/Contributor.ts           |  8 ++++
 src/components/atoms/ExternalLink.js          | 12 ------
 src/components/atoms/ExternalLink.ts          | 12 ++++++
 .../atoms/Forms/Textarea/Textarea.js          | 14 -------
 .../atoms/Forms/Textarea/Textarea.ts          | 14 +++++++
 .../atoms/Forms/{index.js => index.ts}        |  1 -
 src/components/atoms/List.js                  | 13 -------
 src/components/atoms/List.ts                  | 13 +++++++
 .../atoms/icons/{Arrow.js => Arrow.tsx}       |  0
 .../atoms/icons/{Close.js => Close.tsx}       |  0
 .../atoms/icons/{index.js => index.ts}        |  2 +-
 src/components/atoms/{index.js => index.ts}   |  0
 .../molecules/{AddNotice.js => AddNotice.tsx} |  0
 .../{DeleteButton.js => DeleteButton.tsx}     |  0
 .../Notice/{DeleteIcon.js => DeleteIcon.tsx}  |  0
 src/components/organisms/Notice/Deleted.js    | 11 ------
 src/components/organisms/Notice/Deleted.ts    |  9 +++++
 .../organisms/Notice/NoNoticeImg.js           | 17 --------
 .../organisms/Notice/NoNoticeImg.ts           | 17 ++++++++
 .../organisms/Notice/{index.js => index.ts}   |  0
 .../organisms/NoticeDetails/Date.js           |  6 ---
 .../organisms/NoticeDetails/Date.ts           |  6 +++
 .../NoticeDetails/DetailsContainer.ts}        |  4 +-
 .../organisms/NoticeDetails/DetailsContent.js | 13 -------
 .../organisms/NoticeDetails/DetailsContent.ts | 13 +++++++
 .../organisms/NoticeDetails/DetailsDislike.js | 31 ---------------
 .../organisms/NoticeDetails/DetailsDislike.ts | 31 +++++++++++++++
 .../{DetailsMeta.js => DetailsMeta.ts}        |  2 +-
 .../organisms/NoticeDetails/Feedbacks.js      | 35 -----------------
 .../organisms/NoticeDetails/Feedbacks.ts      | 35 +++++++++++++++++
 .../Source/{AnchorIcon.js => AnchorIcon.tsx}  |  0
 .../NoticeDetails/Source/Container.js         | 11 ------
 .../NoticeDetails/Source/Container.ts         | 11 ++++++
 .../organisms/Notification/Container.js       | 16 --------
 .../organisms/Notification/Container.ts       | 16 ++++++++
 ...{ContentTitleTop.js => ContentTitleTop.ts} |  2 +-
 .../{AccountIcon.js => AccountIcon.tsx}       |  0
 .../{BubbleIcon.js => BubbleIcon.tsx}         |  0
 .../{CheckListIcon.js => CheckListIcon.tsx}   |  0
 .../NotificationFooter/FooterContainer.js     | 16 --------
 .../NotificationFooter/FooterContainer.ts     | 16 ++++++++
 .../{HelpIcon.js => HelpIcon.tsx}             |  0
 .../NotificationFooter/NavLink.js             | 28 -------------
 .../NotificationFooter/NavLink.ts             | 30 ++++++++++++++
 ...cationFooter.js => NotificationFooter.tsx} |  0
 .../NotificationFooter/{index.js => index.ts} |  2 +-
 .../{BackButton.js => BackButton.tsx}         |  6 +--
 .../{CloseButton.js => CloseButton.tsx}       |  9 ++---
 .../NotificationHeader/Container.js           | 13 -------
 .../NotificationHeader/Container.ts           | 13 +++++++
 .../{LogoContainer.js => LogoContainer.tsx}   |  0
 .../{LogoImg.js => LogoImg.tsx}               |  0
 109 files changed, 472 insertions(+), 485 deletions(-)
 rename src/app/background/middlewares/{index.js => index.ts} (100%)
 rename src/app/background/middlewares/{saga.js => saga.ts} (100%)
 rename src/app/background/sagas/{index.js => index.ts} (100%)
 rename src/app/background/sagas/{matchingContexts.js => matchingContexts.ts} (100%)
 rename src/app/constants/{ActionTypes.js => ActionTypes.ts} (99%)
 delete mode 100644 src/app/constants/assetsUrls.js
 rename src/app/constants/browser/{action.js => action.ts} (88%)
 rename src/app/constants/browser/{tabs.js => tabs.ts} (100%)
 delete mode 100644 src/app/constants/websites.js
 delete mode 100644 src/app/content/App/Account/About/Container.js
 create mode 100644 src/app/content/App/Account/About/Container.ts
 delete mode 100644 src/app/content/App/Account/About/Content.js
 create mode 100644 src/app/content/App/Account/About/Content.ts
 rename src/app/content/App/{Help/ContentTitle.js => Account/About/Title.ts} (75%)
 delete mode 100644 src/app/content/App/Account/Menu/Account.js
 create mode 100644 src/app/content/App/Account/Menu/Account.ts
 rename src/{components/organisms/NoticeDetails/DetailsContainer.js => app/content/App/Error/Container.ts} (60%)
 rename src/app/content/App/Error/{Content.js => Content.ts} (58%)
 delete mode 100644 src/app/content/App/Error/ContentTitle.js
 create mode 100644 src/app/content/App/Error/ContentTitle.ts
 rename src/app/content/App/Error/{Illustration.js => Illustration.tsx} (100%)
 rename src/app/content/App/Error/{index.jsx => index.tsx} (86%)
 delete mode 100644 src/app/content/App/Help/Container.js
 create mode 100644 src/app/content/App/Help/Container.ts
 rename src/app/content/App/{Account/About/Title.js => Help/ContentTitle.ts} (75%)
 delete mode 100644 src/app/content/App/Loading/Container.js
 create mode 100644 src/app/content/App/Loading/Container.ts
 rename src/app/content/App/Loading/{Illustration.js => Illustration.tsx} (100%)
 rename src/app/content/App/Loading/{withConnect.js => withConnect.ts} (100%)
 rename src/app/content/App/Notice/List/NoNotice/{ButtonContainer.js => ButtonContainer.ts} (100%)
 rename src/app/content/App/Notice/List/NoNotice/{Illustration.js => Illustration.tsx} (100%)
 rename src/app/content/App/Notice/List/NoNotice/{Title.js => Title.ts} (100%)
 delete mode 100644 src/app/content/App/Subscriptions/Container.js
 create mode 100644 src/app/content/App/Subscriptions/Container.ts
 rename src/app/content/App/Subscriptions/{Illustration.js => Illustration.tsx} (100%)
 delete mode 100644 src/app/content/App/Subscriptions/SubscriptionsData.js
 create mode 100644 src/app/content/App/Subscriptions/SubscriptionsData.ts
 rename src/app/content/{GlobalStyle.js => GlobalStyle.ts} (97%)
 rename src/app/content/middlewares/{index.js => index.ts} (100%)
 rename src/app/content/middlewares/{saga.js => saga.ts} (100%)
 rename src/app/content/sagas/{browserAction.js => browserAction.ts} (100%)
 rename src/app/content/sagas/{index.js => index.ts} (100%)
 rename src/app/utils/{truncate.js => truncate.ts} (100%)
 delete mode 100644 src/components/atoms/Button.js
 create mode 100644 src/components/atoms/Button.ts
 rename src/components/atoms/Buttons/AddNoticeLink/{AddIcon.js => AddIcon.tsx} (100%)
 rename src/components/atoms/Buttons/AddNoticeLink/{AddNoticeLink.js => AddNoticeLink.tsx} (100%)
 rename src/components/atoms/Buttons/AddNoticeLink/{index.js => index.ts} (100%)
 delete mode 100644 src/components/atoms/Buttons/BorderButton/BorderButton.js
 create mode 100644 src/components/atoms/Buttons/BorderButton/BorderButton.ts
 rename src/components/atoms/Buttons/BorderButton/{index.js => index.ts} (100%)
 delete mode 100644 src/components/atoms/Buttons/OpenButton/OpenButton.js
 create mode 100644 src/components/atoms/Buttons/OpenButton/OpenButton.tsx
 rename src/components/atoms/{CenterContainer.js => CenterContainer.ts} (57%)
 delete mode 100644 src/components/atoms/ContentTitle/index.js
 create mode 100644 src/components/atoms/ContentTitle/index.ts
 delete mode 100644 src/components/atoms/Contributor.js
 create mode 100644 src/components/atoms/Contributor.ts
 delete mode 100644 src/components/atoms/ExternalLink.js
 create mode 100644 src/components/atoms/ExternalLink.ts
 delete mode 100644 src/components/atoms/Forms/Textarea/Textarea.js
 create mode 100644 src/components/atoms/Forms/Textarea/Textarea.ts
 rename src/components/atoms/Forms/{index.js => index.ts} (98%)
 delete mode 100644 src/components/atoms/List.js
 create mode 100644 src/components/atoms/List.ts
 rename src/components/atoms/icons/{Arrow.js => Arrow.tsx} (100%)
 rename src/components/atoms/icons/{Close.js => Close.tsx} (100%)
 rename src/components/atoms/icons/{index.js => index.ts} (50%)
 rename src/components/atoms/{index.js => index.ts} (100%)
 rename src/components/molecules/{AddNotice.js => AddNotice.tsx} (100%)
 rename src/components/organisms/Notice/{DeleteButton.js => DeleteButton.tsx} (100%)
 rename src/components/organisms/Notice/{DeleteIcon.js => DeleteIcon.tsx} (100%)
 delete mode 100644 src/components/organisms/Notice/Deleted.js
 create mode 100644 src/components/organisms/Notice/Deleted.ts
 delete mode 100644 src/components/organisms/Notice/NoNoticeImg.js
 create mode 100644 src/components/organisms/Notice/NoNoticeImg.ts
 rename src/components/organisms/Notice/{index.js => index.ts} (100%)
 delete mode 100644 src/components/organisms/NoticeDetails/Date.js
 create mode 100644 src/components/organisms/NoticeDetails/Date.ts
 rename src/{app/content/App/Error/Container.js => components/organisms/NoticeDetails/DetailsContainer.ts} (58%)
 delete mode 100644 src/components/organisms/NoticeDetails/DetailsContent.js
 create mode 100644 src/components/organisms/NoticeDetails/DetailsContent.ts
 delete mode 100644 src/components/organisms/NoticeDetails/DetailsDislike.js
 create mode 100644 src/components/organisms/NoticeDetails/DetailsDislike.ts
 rename src/components/organisms/NoticeDetails/{DetailsMeta.js => DetailsMeta.ts} (99%)
 delete mode 100644 src/components/organisms/NoticeDetails/Feedbacks.js
 create mode 100644 src/components/organisms/NoticeDetails/Feedbacks.ts
 rename src/components/organisms/NoticeDetails/Source/{AnchorIcon.js => AnchorIcon.tsx} (100%)
 delete mode 100644 src/components/organisms/NoticeDetails/Source/Container.js
 create mode 100644 src/components/organisms/NoticeDetails/Source/Container.ts
 delete mode 100644 src/components/organisms/Notification/Container.js
 create mode 100644 src/components/organisms/Notification/Container.ts
 rename src/components/organisms/Notification/{ContentTitleTop.js => ContentTitleTop.ts} (86%)
 rename src/components/organisms/Notification/NotificationFooter/{AccountIcon.js => AccountIcon.tsx} (100%)
 rename src/components/organisms/Notification/NotificationFooter/{BubbleIcon.js => BubbleIcon.tsx} (100%)
 rename src/components/organisms/Notification/NotificationFooter/{CheckListIcon.js => CheckListIcon.tsx} (100%)
 delete mode 100644 src/components/organisms/Notification/NotificationFooter/FooterContainer.js
 create mode 100644 src/components/organisms/Notification/NotificationFooter/FooterContainer.ts
 rename src/components/organisms/Notification/NotificationFooter/{HelpIcon.js => HelpIcon.tsx} (100%)
 delete mode 100644 src/components/organisms/Notification/NotificationFooter/NavLink.js
 create mode 100644 src/components/organisms/Notification/NotificationFooter/NavLink.ts
 rename src/components/organisms/Notification/NotificationFooter/{NotificationFooter.js => NotificationFooter.tsx} (100%)
 rename src/components/organisms/Notification/NotificationFooter/{index.js => index.ts} (61%)
 rename src/components/organisms/Notification/NotificationHeader/{BackButton.js => BackButton.tsx} (72%)
 rename src/components/organisms/Notification/NotificationHeader/{CloseButton.js => CloseButton.tsx} (69%)
 delete mode 100644 src/components/organisms/Notification/NotificationHeader/Container.js
 create mode 100644 src/components/organisms/Notification/NotificationHeader/Container.ts
 rename src/components/organisms/Notification/NotificationHeader/{LogoContainer.js => LogoContainer.tsx} (100%)
 rename src/components/organisms/Notification/NotificationHeader/{LogoImg.js => LogoImg.tsx} (100%)

diff --git a/src/app/background/middlewares/index.js b/src/app/background/middlewares/index.ts
similarity index 100%
rename from src/app/background/middlewares/index.js
rename to src/app/background/middlewares/index.ts
diff --git a/src/app/background/middlewares/saga.js b/src/app/background/middlewares/saga.ts
similarity index 100%
rename from src/app/background/middlewares/saga.js
rename to src/app/background/middlewares/saga.ts
diff --git a/src/app/background/sagas/index.js b/src/app/background/sagas/index.ts
similarity index 100%
rename from src/app/background/sagas/index.js
rename to src/app/background/sagas/index.ts
diff --git a/src/app/background/sagas/matchingContexts.js b/src/app/background/sagas/matchingContexts.ts
similarity index 100%
rename from src/app/background/sagas/matchingContexts.js
rename to src/app/background/sagas/matchingContexts.ts
diff --git a/src/app/constants/ActionTypes.js b/src/app/constants/ActionTypes.ts
similarity index 99%
rename from src/app/constants/ActionTypes.js
rename to src/app/constants/ActionTypes.ts
index 424866805..997f25f73 100644
--- a/src/app/constants/ActionTypes.js
+++ b/src/app/constants/ActionTypes.ts
@@ -1,4 +1,3 @@
-
 // background actions
 
 export const INIT = 'INIT';
diff --git a/src/app/constants/assetsUrls.js b/src/app/constants/assetsUrls.js
deleted file mode 100644
index 7d6f11a78..000000000
--- a/src/app/constants/assetsUrls.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export const IMAGES_URL = chrome.extension.getURL('img/');
-export const CONTRIBUTOR_IMAGES_URL = 'https://lmem-craft-backend.cleverapps.io/uploads/avatars/';
-
-export const FONTS_URL = chrome.extension.getURL('fonts/');
diff --git a/src/app/constants/browser/action.js b/src/app/constants/browser/action.ts
similarity index 88%
rename from src/app/constants/browser/action.js
rename to src/app/constants/browser/action.ts
index 6c93b2850..bf0e495b7 100644
--- a/src/app/constants/browser/action.js
+++ b/src/app/constants/browser/action.ts
@@ -1 +1 @@
-export const BROWSER_ACTION_CLICKED = 'BROWSER/BROWSER_ACTION_CLICKED';
\ No newline at end of file
+export const BROWSER_ACTION_CLICKED = 'BROWSER/BROWSER_ACTION_CLICKED';
diff --git a/src/app/constants/browser/tabs.js b/src/app/constants/browser/tabs.ts
similarity index 100%
rename from src/app/constants/browser/tabs.js
rename to src/app/constants/browser/tabs.ts
diff --git a/src/app/constants/websites.js b/src/app/constants/websites.js
deleted file mode 100644
index 1309edd07..000000000
--- a/src/app/constants/websites.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export const DEACTIVATE_EVERYWHERE = '/@EVERYWHERE';
-export const SESSION_DEACTIVATE_DELAY = 60 * 60 * 1000; // ms
\ No newline at end of file
diff --git a/src/app/content/App/Account/About/Container.js b/src/app/content/App/Account/About/Container.js
deleted file mode 100644
index 8bfd32fa9..000000000
--- a/src/app/content/App/Account/About/Container.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.article`
-    padding: 38px 30px 20px;
-    text-align: left;
-
-    nav {
-        margin-top: 56px;
-        font-size: 16px;
-    }
-`;
diff --git a/src/app/content/App/Account/About/Container.ts b/src/app/content/App/Account/About/Container.ts
new file mode 100644
index 000000000..09f68caa4
--- /dev/null
+++ b/src/app/content/App/Account/About/Container.ts
@@ -0,0 +1,11 @@
+import styled from 'styled-components';
+
+export default styled.article`
+  padding: 38px 30px 20px;
+  text-align: left;
+
+  nav {
+    margin-top: 56px;
+    font-size: 16px;
+  }
+`;
diff --git a/src/app/content/App/Account/About/Content.js b/src/app/content/App/Account/About/Content.js
deleted file mode 100644
index d2e21b5fb..000000000
--- a/src/app/content/App/Account/About/Content.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.p`
-    margin: 5px 0 20px;
-    font-size: 13px;
-    line-height: 1.7;
-`;
\ No newline at end of file
diff --git a/src/app/content/App/Account/About/Content.ts b/src/app/content/App/Account/About/Content.ts
new file mode 100644
index 000000000..6d00f6b9c
--- /dev/null
+++ b/src/app/content/App/Account/About/Content.ts
@@ -0,0 +1,7 @@
+import styled from 'styled-components';
+
+export default styled.p`
+  margin: 5px 0 20px;
+  font-size: 13px;
+  line-height: 1.7;
+`;
diff --git a/src/app/content/App/Help/ContentTitle.js b/src/app/content/App/Account/About/Title.ts
similarity index 75%
rename from src/app/content/App/Help/ContentTitle.js
rename to src/app/content/App/Account/About/Title.ts
index d853c7f23..78c4e9ec4 100644
--- a/src/app/content/App/Help/ContentTitle.js
+++ b/src/app/content/App/Account/About/Title.ts
@@ -2,6 +2,6 @@ import styled from 'styled-components';
 import ContentTitle from 'components/atoms/ContentTitle';
 
 export default styled(ContentTitle)`
-    margin: 0 0 10px;
-    text-align: left;
+  margin: 0 0 18px;
+  text-align: left;
 `;
diff --git a/src/app/content/App/Account/Menu/Account.js b/src/app/content/App/Account/Menu/Account.js
deleted file mode 100644
index a76b1ec16..000000000
--- a/src/app/content/App/Account/Menu/Account.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.nav`
-    
-    & a {
-        box-sizing: border-box;
-        display: flex;
-        width: 100%;
-        padding: 21px 14px 20px 23px;
-        font-size: 16px;
-        font-weight: bold;
-        color: ${props => props.theme.secondaryColor};
-        text-decoration: none;
-        border:2px solid transparent;
-        transition: all .2s ease-in-out;
-
-        &:hover {
-            color: ${props => props.theme.activeColor};
-            border-color: ${props => props.theme.activeColor};
-        }
-
-        &:nth-child(odd) {
-            background-color: #fafafa;
-        }
-
-        &:last-child:not(:nth-child(odd)) {
-            border-bottom: 2px solid #fafafa;
-
-            &:hover {
-                border-color: ${props => props.theme.activeColor};
-            }
-        }
-
-        & [class^="OpenButton"] {
-            height: auto;
-            transform: rotate(180deg)
-        }
-    }
-`;
\ No newline at end of file
diff --git a/src/app/content/App/Account/Menu/Account.ts b/src/app/content/App/Account/Menu/Account.ts
new file mode 100644
index 000000000..7b0b4230a
--- /dev/null
+++ b/src/app/content/App/Account/Menu/Account.ts
@@ -0,0 +1,38 @@
+import styled from 'styled-components';
+
+export default styled.nav`
+  & a {
+    box-sizing: border-box;
+    display: flex;
+    width: 100%;
+    padding: 21px 14px 20px 23px;
+    font-size: 16px;
+    font-weight: bold;
+    color: ${props => props.theme.secondaryColor};
+    text-decoration: none;
+    border: 2px solid transparent;
+    transition: all 0.2s ease-in-out;
+
+    &:hover {
+      color: ${props => props.theme.activeColor};
+      border-color: ${props => props.theme.activeColor};
+    }
+
+    &:nth-child(odd) {
+      background-color: #fafafa;
+    }
+
+    &:last-child:not(:nth-child(odd)) {
+      border-bottom: 2px solid #fafafa;
+
+      &:hover {
+        border-color: ${props => props.theme.activeColor};
+      }
+    }
+
+    & [class^='OpenButton'] {
+      height: auto;
+      transform: rotate(180deg);
+    }
+  }
+`;
diff --git a/src/components/organisms/NoticeDetails/DetailsContainer.js b/src/app/content/App/Error/Container.ts
similarity index 60%
rename from src/components/organisms/NoticeDetails/DetailsContainer.js
rename to src/app/content/App/Error/Container.ts
index acb195606..6b11ee360 100644
--- a/src/components/organisms/NoticeDetails/DetailsContainer.js
+++ b/src/app/content/App/Error/Container.ts
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
 export default styled.article`
-    box-sizing: border-box;
-    font-size: 16px;
+  padding: 29px 24px 26px;
+  text-align: center;
 `;
diff --git a/src/app/content/App/Error/Content.js b/src/app/content/App/Error/Content.ts
similarity index 58%
rename from src/app/content/App/Error/Content.js
rename to src/app/content/App/Error/Content.ts
index b11443e5d..d3993af61 100644
--- a/src/app/content/App/Error/Content.js
+++ b/src/app/content/App/Error/Content.ts
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
 export default styled.p`
-    margin: 5px 0 20px;
-    font-size: 18px;
-`;
\ No newline at end of file
+  margin: 5px 0 20px;
+  font-size: 18px;
+`;
diff --git a/src/app/content/App/Error/ContentTitle.js b/src/app/content/App/Error/ContentTitle.js
deleted file mode 100644
index ce1d969aa..000000000
--- a/src/app/content/App/Error/ContentTitle.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.h2`
-    margin: 15px 0 0;
-    font-size: 38px;
-    font-family: 'Sedgwick Ave', cursive;
-    font-weight: normal;
-    color: ${props => props.theme.error};
-`;
\ No newline at end of file
diff --git a/src/app/content/App/Error/ContentTitle.ts b/src/app/content/App/Error/ContentTitle.ts
new file mode 100644
index 000000000..0f2b8a171
--- /dev/null
+++ b/src/app/content/App/Error/ContentTitle.ts
@@ -0,0 +1,9 @@
+import styled from 'styled-components';
+
+export default styled.h2`
+  margin: 15px 0 0;
+  font-size: 38px;
+  font-family: 'Sedgwick Ave', cursive;
+  font-weight: normal;
+  color: ${props => props.theme.error};
+`;
diff --git a/src/app/content/App/Error/Illustration.js b/src/app/content/App/Error/Illustration.tsx
similarity index 100%
rename from src/app/content/App/Error/Illustration.js
rename to src/app/content/App/Error/Illustration.tsx
diff --git a/src/app/content/App/Error/index.jsx b/src/app/content/App/Error/index.tsx
similarity index 86%
rename from src/app/content/App/Error/index.jsx
rename to src/app/content/App/Error/index.tsx
index 1e67f9d66..fccaf0826 100644
--- a/src/app/content/App/Error/index.jsx
+++ b/src/app/content/App/Error/index.tsx
@@ -10,11 +10,10 @@ export default () => (
   <Notification>
     <Container>
       <Illustration />
-      <ContentTitle>
-        Oops !
-      </ContentTitle>
+      <ContentTitle>Oops !</ContentTitle>
       <Content>
-        Quelque chose s’est mal passé. Veuillez actualiser le plugin ou réessayer plus tard.
+        Quelque chose s’est mal passé. Veuillez actualiser le plugin ou
+        réessayer plus tard.
       </Content>
       <BorderButton>Actualiser</BorderButton>
     </Container>
diff --git a/src/app/content/App/Help/Container.js b/src/app/content/App/Help/Container.js
deleted file mode 100644
index 634468211..000000000
--- a/src/app/content/App/Help/Container.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.article`
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    padding: 36px 19px 0;
-`;
diff --git a/src/app/content/App/Help/Container.ts b/src/app/content/App/Help/Container.ts
new file mode 100644
index 000000000..46c0ad668
--- /dev/null
+++ b/src/app/content/App/Help/Container.ts
@@ -0,0 +1,8 @@
+import styled from 'styled-components';
+
+export default styled.article`
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding: 36px 19px 0;
+`;
diff --git a/src/app/content/App/Account/About/Title.js b/src/app/content/App/Help/ContentTitle.ts
similarity index 75%
rename from src/app/content/App/Account/About/Title.js
rename to src/app/content/App/Help/ContentTitle.ts
index 5532d90fc..f54e4496e 100644
--- a/src/app/content/App/Account/About/Title.js
+++ b/src/app/content/App/Help/ContentTitle.ts
@@ -2,6 +2,6 @@ import styled from 'styled-components';
 import ContentTitle from 'components/atoms/ContentTitle';
 
 export default styled(ContentTitle)`
-    margin: 0 0 18px;
-    text-align: left;
+  margin: 0 0 10px;
+  text-align: left;
 `;
diff --git a/src/app/content/App/Loading/Container.js b/src/app/content/App/Loading/Container.js
deleted file mode 100644
index 86bcd7992..000000000
--- a/src/app/content/App/Loading/Container.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.section`
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    flex-direction: column;
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    font-size: 14px;
-    font-weight: bold;
-    text-transform: uppercase;
-
-    & svg {
-        margin-bottom: 15px;
-        animation: rotation 2s linear infinite;
-    }
-
-    @keyframes rotation {
-        100% {
-            transform: rotate(360deg)
-        }
-    }
-`;
\ No newline at end of file
diff --git a/src/app/content/App/Loading/Container.ts b/src/app/content/App/Loading/Container.ts
new file mode 100644
index 000000000..43060c368
--- /dev/null
+++ b/src/app/content/App/Loading/Container.ts
@@ -0,0 +1,27 @@
+import styled from 'styled-components';
+
+export default styled.section`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  font-size: 14px;
+  font-weight: bold;
+  text-transform: uppercase;
+
+  & svg {
+    margin-bottom: 15px;
+    animation: rotation 2s linear infinite;
+  }
+
+  @keyframes rotation {
+    100% {
+      transform: rotate(360deg);
+    }
+  }
+`;
diff --git a/src/app/content/App/Loading/Illustration.js b/src/app/content/App/Loading/Illustration.tsx
similarity index 100%
rename from src/app/content/App/Loading/Illustration.js
rename to src/app/content/App/Loading/Illustration.tsx
diff --git a/src/app/content/App/Loading/withConnect.js b/src/app/content/App/Loading/withConnect.ts
similarity index 100%
rename from src/app/content/App/Loading/withConnect.js
rename to src/app/content/App/Loading/withConnect.ts
diff --git a/src/app/content/App/Notice/List/NoNotice/ButtonContainer.js b/src/app/content/App/Notice/List/NoNotice/ButtonContainer.ts
similarity index 100%
rename from src/app/content/App/Notice/List/NoNotice/ButtonContainer.js
rename to src/app/content/App/Notice/List/NoNotice/ButtonContainer.ts
diff --git a/src/app/content/App/Notice/List/NoNotice/Illustration.js b/src/app/content/App/Notice/List/NoNotice/Illustration.tsx
similarity index 100%
rename from src/app/content/App/Notice/List/NoNotice/Illustration.js
rename to src/app/content/App/Notice/List/NoNotice/Illustration.tsx
diff --git a/src/app/content/App/Notice/List/NoNotice/Title.js b/src/app/content/App/Notice/List/NoNotice/Title.ts
similarity index 100%
rename from src/app/content/App/Notice/List/NoNotice/Title.js
rename to src/app/content/App/Notice/List/NoNotice/Title.ts
diff --git a/src/app/content/App/Subscriptions/Container.js b/src/app/content/App/Subscriptions/Container.js
deleted file mode 100644
index 03f6daf57..000000000
--- a/src/app/content/App/Subscriptions/Container.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.article`
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 22px 37px 40px;
-    text-align: center;
-
-    & svg {
-        margin-bottom: 35px;
-    }
-`;
diff --git a/src/app/content/App/Subscriptions/Container.ts b/src/app/content/App/Subscriptions/Container.ts
new file mode 100644
index 000000000..d98c0a215
--- /dev/null
+++ b/src/app/content/App/Subscriptions/Container.ts
@@ -0,0 +1,13 @@
+import styled from 'styled-components';
+
+export default styled.article`
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 22px 37px 40px;
+  text-align: center;
+
+  & svg {
+    margin-bottom: 35px;
+  }
+`;
diff --git a/src/app/content/App/Subscriptions/Illustration.js b/src/app/content/App/Subscriptions/Illustration.tsx
similarity index 100%
rename from src/app/content/App/Subscriptions/Illustration.js
rename to src/app/content/App/Subscriptions/Illustration.tsx
diff --git a/src/app/content/App/Subscriptions/SubscriptionsData.js b/src/app/content/App/Subscriptions/SubscriptionsData.js
deleted file mode 100644
index 47cc4a824..000000000
--- a/src/app/content/App/Subscriptions/SubscriptionsData.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.div`
-    display: flex;
-    justify-content: space-between;
-    width: 100%;
-    margin-bottom: 50px;
-
-    div {
-        flex-basis: 33.3333%;
-    }
-
-    span {
-        display: block;
-        font-size: 15px;
-
-        &:first-child {
-            font-size: 30px;
-        }
-    }
-`;
diff --git a/src/app/content/App/Subscriptions/SubscriptionsData.ts b/src/app/content/App/Subscriptions/SubscriptionsData.ts
new file mode 100644
index 000000000..187437642
--- /dev/null
+++ b/src/app/content/App/Subscriptions/SubscriptionsData.ts
@@ -0,0 +1,21 @@
+import styled from 'styled-components';
+
+export default styled.div`
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  margin-bottom: 50px;
+
+  div {
+    flex-basis: 33.3333%;
+  }
+
+  span {
+    display: block;
+    font-size: 15px;
+
+    &:first-child {
+      font-size: 30px;
+    }
+  }
+`;
diff --git a/src/app/content/GlobalStyle.js b/src/app/content/GlobalStyle.ts
similarity index 97%
rename from src/app/content/GlobalStyle.js
rename to src/app/content/GlobalStyle.ts
index f4d0c0cd3..b9878a3d4 100644
--- a/src/app/content/GlobalStyle.js
+++ b/src/app/content/GlobalStyle.ts
@@ -4,4 +4,4 @@ export default createGlobalStyle`
   body {
     margin: 3px 3px 6px 3px;
   }
-`;
\ No newline at end of file
+`;
diff --git a/src/app/content/middlewares/index.js b/src/app/content/middlewares/index.ts
similarity index 100%
rename from src/app/content/middlewares/index.js
rename to src/app/content/middlewares/index.ts
diff --git a/src/app/content/middlewares/saga.js b/src/app/content/middlewares/saga.ts
similarity index 100%
rename from src/app/content/middlewares/saga.js
rename to src/app/content/middlewares/saga.ts
diff --git a/src/app/content/sagas/browserAction.js b/src/app/content/sagas/browserAction.ts
similarity index 100%
rename from src/app/content/sagas/browserAction.js
rename to src/app/content/sagas/browserAction.ts
diff --git a/src/app/content/sagas/index.js b/src/app/content/sagas/index.ts
similarity index 100%
rename from src/app/content/sagas/index.js
rename to src/app/content/sagas/index.ts
diff --git a/src/app/utils/truncate.js b/src/app/utils/truncate.ts
similarity index 100%
rename from src/app/utils/truncate.js
rename to src/app/utils/truncate.ts
diff --git a/src/components/atoms/Button.js b/src/components/atoms/Button.js
deleted file mode 100644
index 7e1b05297..000000000
--- a/src/components/atoms/Button.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.button`
-    box-sizing: border-box;
-    padding:0;
-    font-weight: bold;
-    line-height: 1;
-    color: ${props => props.theme.secondaryColor};
-    text-transform: uppercase;
-    text-decoration: underline;
-    background: none;
-    border: none;
-    border-radius: 5px;
-    cursor: pointer;
-    transition: all 0.2s ease-in-out;
-
-    &:hover {
-        color: ${props => props.theme.activeColor}
-    }
-    
-    &:focus {
-        outline: 1px dotted ${props => props.theme.activeColor};
-    }
-`;
diff --git a/src/components/atoms/Button.ts b/src/components/atoms/Button.ts
new file mode 100644
index 000000000..c68dbdf74
--- /dev/null
+++ b/src/components/atoms/Button.ts
@@ -0,0 +1,24 @@
+import styled from 'styled-components';
+
+export default styled.button`
+  box-sizing: border-box;
+  padding: 0;
+  font-weight: bold;
+  line-height: 1;
+  color: ${props => props.theme.secondaryColor};
+  text-transform: uppercase;
+  text-decoration: underline;
+  background: none;
+  border: none;
+  border-radius: 5px;
+  cursor: pointer;
+  transition: all 0.2s ease-in-out;
+
+  &:hover {
+    color: ${props => props.theme.activeColor};
+  }
+
+  &:focus {
+    outline: 1px dotted ${props => props.theme.activeColor};
+  }
+`;
diff --git a/src/components/atoms/Buttons/AddNoticeLink/AddIcon.js b/src/components/atoms/Buttons/AddNoticeLink/AddIcon.tsx
similarity index 100%
rename from src/components/atoms/Buttons/AddNoticeLink/AddIcon.js
rename to src/components/atoms/Buttons/AddNoticeLink/AddIcon.tsx
diff --git a/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.js b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.tsx
similarity index 100%
rename from src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.js
rename to src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.tsx
diff --git a/src/components/atoms/Buttons/AddNoticeLink/index.js b/src/components/atoms/Buttons/AddNoticeLink/index.ts
similarity index 100%
rename from src/components/atoms/Buttons/AddNoticeLink/index.js
rename to src/components/atoms/Buttons/AddNoticeLink/index.ts
diff --git a/src/components/atoms/Buttons/BorderButton/BorderButton.js b/src/components/atoms/Buttons/BorderButton/BorderButton.js
deleted file mode 100644
index 8b5f41956..000000000
--- a/src/components/atoms/Buttons/BorderButton/BorderButton.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import styled from 'styled-components';
-import Button from '../../Button';
-
-export default styled(Button)`
-   height: 28px;
-   padding: 0 12px;
-   font-size: 15px;
-   color: ${props => props.theme.button};
-   text-decoration: none;
-   background-color: #fff;
-   border: 2px solid ${props => props.theme.button};
-
-   &:hover {
-      color: #fff;
-      background-color: ${props => props.theme.button};
-    }
-`;
-
diff --git a/src/components/atoms/Buttons/BorderButton/BorderButton.ts b/src/components/atoms/Buttons/BorderButton/BorderButton.ts
new file mode 100644
index 000000000..90e802942
--- /dev/null
+++ b/src/components/atoms/Buttons/BorderButton/BorderButton.ts
@@ -0,0 +1,17 @@
+import styled from 'styled-components';
+import Button from '../../Button';
+
+export default styled(Button)`
+  height: 28px;
+  padding: 0 12px;
+  font-size: 15px;
+  color: ${props => props.theme.button};
+  text-decoration: none;
+  background-color: #fff;
+  border: 2px solid ${props => props.theme.button};
+
+  &:hover {
+    color: #fff;
+    background-color: ${props => props.theme.button};
+  }
+`;
diff --git a/src/components/atoms/Buttons/BorderButton/index.js b/src/components/atoms/Buttons/BorderButton/index.ts
similarity index 100%
rename from src/components/atoms/Buttons/BorderButton/index.js
rename to src/components/atoms/Buttons/BorderButton/index.ts
diff --git a/src/components/atoms/Buttons/OpenButton/OpenButton.js b/src/components/atoms/Buttons/OpenButton/OpenButton.js
deleted file mode 100644
index d2370a9b5..000000000
--- a/src/components/atoms/Buttons/OpenButton/OpenButton.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-import OpenIcon from '../../icons/Arrow';
-
-export default styled.div.attrs({ children: <OpenIcon /> })`
-   padding:0;
-   margin-left: auto;
-   border: none;
-   cursor: pointer;
-   width: auto;
-   height: 13px;
-   stroke: ${props => props.theme.activeColor};
-   transform: rotate(180deg);
-`;
-
diff --git a/src/components/atoms/Buttons/OpenButton/OpenButton.tsx b/src/components/atoms/Buttons/OpenButton/OpenButton.tsx
new file mode 100644
index 000000000..d69e7f52d
--- /dev/null
+++ b/src/components/atoms/Buttons/OpenButton/OpenButton.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import styled from 'styled-components';
+import OpenIcon from '../../icons/Arrow';
+
+export default styled.div.attrs({ children: <OpenIcon /> })`
+  padding: 0;
+  margin-left: auto;
+  border: none;
+  cursor: pointer;
+  width: auto;
+  height: 13px;
+  stroke: ${props => props.theme.activeColor};
+  transform: rotate(180deg);
+`;
diff --git a/src/components/atoms/CenterContainer.js b/src/components/atoms/CenterContainer.ts
similarity index 57%
rename from src/components/atoms/CenterContainer.js
rename to src/components/atoms/CenterContainer.ts
index cf4c789e2..0cad23f1c 100644
--- a/src/components/atoms/CenterContainer.js
+++ b/src/components/atoms/CenterContainer.ts
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
 export default styled.div`
-    display: flex;
-    justify-content: center;
-`;
\ No newline at end of file
+  display: flex;
+  justify-content: center;
+`;
diff --git a/src/components/atoms/ContentTitle/index.js b/src/components/atoms/ContentTitle/index.js
deleted file mode 100644
index 7dd73cfc7..000000000
--- a/src/components/atoms/ContentTitle/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.h2`
-    font-size: 14px;
-    font-weight: bold;
-    color: ${props => props.theme.secondaryColor};
-    text-transform: uppercase;
-    text-align: center;
-`;
\ No newline at end of file
diff --git a/src/components/atoms/ContentTitle/index.ts b/src/components/atoms/ContentTitle/index.ts
new file mode 100644
index 000000000..0a9714328
--- /dev/null
+++ b/src/components/atoms/ContentTitle/index.ts
@@ -0,0 +1,9 @@
+import styled from 'styled-components';
+
+export default styled.h2`
+  font-size: 14px;
+  font-weight: bold;
+  color: ${props => props.theme.secondaryColor};
+  text-transform: uppercase;
+  text-align: center;
+`;
diff --git a/src/components/atoms/Contributor.js b/src/components/atoms/Contributor.js
deleted file mode 100644
index 44360f573..000000000
--- a/src/components/atoms/Contributor.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.div`
-    font-size: 14px;
-    line-height: 1.45;
-    font-weight: bold;
-    color: ${props => props.theme.primaryColor};
-`;
diff --git a/src/components/atoms/Contributor.ts b/src/components/atoms/Contributor.ts
new file mode 100644
index 000000000..549962651
--- /dev/null
+++ b/src/components/atoms/Contributor.ts
@@ -0,0 +1,8 @@
+import styled from 'styled-components';
+
+export default styled.div`
+  font-size: 14px;
+  line-height: 1.45;
+  font-weight: bold;
+  color: ${props => props.theme.primaryColor};
+`;
diff --git a/src/components/atoms/ExternalLink.js b/src/components/atoms/ExternalLink.js
deleted file mode 100644
index 0b6bdf299..000000000
--- a/src/components/atoms/ExternalLink.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.a.attrs({ target: '_blank', rel: 'noopener noreferrer' })`
-    color: ${props => props.theme.activeColor};
-    text-decoration: underline;
-    cursor: pointer;
-    transition: all 0.2s ease-in-out;
-
-    &:hover {
-        color: ${props => props.theme.secondaryColor}
-    }
-`;
diff --git a/src/components/atoms/ExternalLink.ts b/src/components/atoms/ExternalLink.ts
new file mode 100644
index 000000000..6b16aa073
--- /dev/null
+++ b/src/components/atoms/ExternalLink.ts
@@ -0,0 +1,12 @@
+import styled from 'styled-components';
+
+export default styled.a.attrs({ target: '_blank', rel: 'noopener noreferrer' })`
+  color: ${props => props.theme.activeColor};
+  text-decoration: underline;
+  cursor: pointer;
+  transition: all 0.2s ease-in-out;
+
+  &:hover {
+    color: ${props => props.theme.secondaryColor};
+  }
+`;
diff --git a/src/components/atoms/Forms/Textarea/Textarea.js b/src/components/atoms/Forms/Textarea/Textarea.js
deleted file mode 100644
index bc9f8e770..000000000
--- a/src/components/atoms/Forms/Textarea/Textarea.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.textarea`
-    box-sizing: border-box;
-    width: 100%;
-    height: 87px;
-    margin-bottom: 10px;
-    padding: 10px;
-    font-size: 13px;
-    border-radius: 6px;
-    border: 1px solid ${props => props.theme.secondaryColor};
-    resize: none;
-    font-style: italic;
-`;
diff --git a/src/components/atoms/Forms/Textarea/Textarea.ts b/src/components/atoms/Forms/Textarea/Textarea.ts
new file mode 100644
index 000000000..99ba2658e
--- /dev/null
+++ b/src/components/atoms/Forms/Textarea/Textarea.ts
@@ -0,0 +1,14 @@
+import styled from 'styled-components';
+
+export default styled.textarea`
+  box-sizing: border-box;
+  width: 100%;
+  height: 87px;
+  margin-bottom: 10px;
+  padding: 10px;
+  font-size: 13px;
+  border-radius: 6px;
+  border: 1px solid ${props => props.theme.secondaryColor};
+  resize: none;
+  font-style: italic;
+`;
diff --git a/src/components/atoms/Forms/index.js b/src/components/atoms/Forms/index.ts
similarity index 98%
rename from src/components/atoms/Forms/index.js
rename to src/components/atoms/Forms/index.ts
index d90dddf43..e7eb57db9 100644
--- a/src/components/atoms/Forms/index.js
+++ b/src/components/atoms/Forms/index.ts
@@ -1,2 +1 @@
 export { default as Textarea } from './Textarea/Textarea';
-
diff --git a/src/components/atoms/List.js b/src/components/atoms/List.js
deleted file mode 100644
index 328f2fe32..000000000
--- a/src/components/atoms/List.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.ul`
-    margin: 0 0 20px;
-    padding: 0 0 0 19px;
-    font-size: 13px;
-    line-height: 1.45;
-
-    a {
-        font-weight: 500;
-        color: ${props => props.theme.activeColor};
-    }
-`;
\ No newline at end of file
diff --git a/src/components/atoms/List.ts b/src/components/atoms/List.ts
new file mode 100644
index 000000000..a98d94e72
--- /dev/null
+++ b/src/components/atoms/List.ts
@@ -0,0 +1,13 @@
+import styled from 'styled-components';
+
+export default styled.ul`
+  margin: 0 0 20px;
+  padding: 0 0 0 19px;
+  font-size: 13px;
+  line-height: 1.45;
+
+  a {
+    font-weight: 500;
+    color: ${props => props.theme.activeColor};
+  }
+`;
diff --git a/src/components/atoms/icons/Arrow.js b/src/components/atoms/icons/Arrow.tsx
similarity index 100%
rename from src/components/atoms/icons/Arrow.js
rename to src/components/atoms/icons/Arrow.tsx
diff --git a/src/components/atoms/icons/Close.js b/src/components/atoms/icons/Close.tsx
similarity index 100%
rename from src/components/atoms/icons/Close.js
rename to src/components/atoms/icons/Close.tsx
diff --git a/src/components/atoms/icons/index.js b/src/components/atoms/icons/index.ts
similarity index 50%
rename from src/components/atoms/icons/index.js
rename to src/components/atoms/icons/index.ts
index c171aa983..0723de541 100644
--- a/src/components/atoms/icons/index.js
+++ b/src/components/atoms/icons/index.ts
@@ -1,2 +1,2 @@
 export { default as Arrow } from './Arrow';
-export { default as Close } from './Close';
\ No newline at end of file
+export { default as Close } from './Close';
diff --git a/src/components/atoms/index.js b/src/components/atoms/index.ts
similarity index 100%
rename from src/components/atoms/index.js
rename to src/components/atoms/index.ts
diff --git a/src/components/molecules/AddNotice.js b/src/components/molecules/AddNotice.tsx
similarity index 100%
rename from src/components/molecules/AddNotice.js
rename to src/components/molecules/AddNotice.tsx
diff --git a/src/components/organisms/Notice/DeleteButton.js b/src/components/organisms/Notice/DeleteButton.tsx
similarity index 100%
rename from src/components/organisms/Notice/DeleteButton.js
rename to src/components/organisms/Notice/DeleteButton.tsx
diff --git a/src/components/organisms/Notice/DeleteIcon.js b/src/components/organisms/Notice/DeleteIcon.tsx
similarity index 100%
rename from src/components/organisms/Notice/DeleteIcon.js
rename to src/components/organisms/Notice/DeleteIcon.tsx
diff --git a/src/components/organisms/Notice/Deleted.js b/src/components/organisms/Notice/Deleted.js
deleted file mode 100644
index 2d250ebfe..000000000
--- a/src/components/organisms/Notice/Deleted.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.p`
-    flex-basis: 100%;
-    margin: 0;
-    text-align: center;
-    color: ${props => props.theme.primaryColor};
-    font-weight: bold;
-`;
-
-
diff --git a/src/components/organisms/Notice/Deleted.ts b/src/components/organisms/Notice/Deleted.ts
new file mode 100644
index 000000000..7cfa7a0c9
--- /dev/null
+++ b/src/components/organisms/Notice/Deleted.ts
@@ -0,0 +1,9 @@
+import styled from 'styled-components';
+
+export default styled.p`
+  flex-basis: 100%;
+  margin: 0;
+  text-align: center;
+  color: ${props => props.theme.primaryColor};
+  font-weight: bold;
+`;
diff --git a/src/components/organisms/Notice/NoNoticeImg.js b/src/components/organisms/Notice/NoNoticeImg.js
deleted file mode 100644
index 9faeb0550..000000000
--- a/src/components/organisms/Notice/NoNoticeImg.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.div`
-    margin-top: 37px;
-    text-align: center;
-
-    & > svg {
-        width: 103px;
-        height: 97px;
-    }
-
-    h2 {
-      font-size: 22px;
-      font-weight: bold;  
-      color: ${props => props.theme.secondaryColor};
-    }
-`;
\ No newline at end of file
diff --git a/src/components/organisms/Notice/NoNoticeImg.ts b/src/components/organisms/Notice/NoNoticeImg.ts
new file mode 100644
index 000000000..2b6dc624b
--- /dev/null
+++ b/src/components/organisms/Notice/NoNoticeImg.ts
@@ -0,0 +1,17 @@
+import styled from 'styled-components';
+
+export default styled.div`
+  margin-top: 37px;
+  text-align: center;
+
+  & > svg {
+    width: 103px;
+    height: 97px;
+  }
+
+  h2 {
+    font-size: 22px;
+    font-weight: bold;
+    color: ${props => props.theme.secondaryColor};
+  }
+`;
diff --git a/src/components/organisms/Notice/index.js b/src/components/organisms/Notice/index.ts
similarity index 100%
rename from src/components/organisms/Notice/index.js
rename to src/components/organisms/Notice/index.ts
diff --git a/src/components/organisms/NoticeDetails/Date.js b/src/components/organisms/NoticeDetails/Date.js
deleted file mode 100644
index 3127d5a5a..000000000
--- a/src/components/organisms/NoticeDetails/Date.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.time`
-    font-size: 14px;
-    color: ${props => props.theme.secondaryColor}
-`;
\ No newline at end of file
diff --git a/src/components/organisms/NoticeDetails/Date.ts b/src/components/organisms/NoticeDetails/Date.ts
new file mode 100644
index 000000000..486c4c83c
--- /dev/null
+++ b/src/components/organisms/NoticeDetails/Date.ts
@@ -0,0 +1,6 @@
+import styled from 'styled-components';
+
+export default styled.time`
+  font-size: 14px;
+  color: ${props => props.theme.secondaryColor};
+`;
diff --git a/src/app/content/App/Error/Container.js b/src/components/organisms/NoticeDetails/DetailsContainer.ts
similarity index 58%
rename from src/app/content/App/Error/Container.js
rename to src/components/organisms/NoticeDetails/DetailsContainer.ts
index d955f3d69..f90eb8c4b 100644
--- a/src/app/content/App/Error/Container.js
+++ b/src/components/organisms/NoticeDetails/DetailsContainer.ts
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
 export default styled.article`
-    padding: 29px 24px 26px;
-    text-align: center;
+  box-sizing: border-box;
+  font-size: 16px;
 `;
diff --git a/src/components/organisms/NoticeDetails/DetailsContent.js b/src/components/organisms/NoticeDetails/DetailsContent.js
deleted file mode 100644
index f8c796744..000000000
--- a/src/components/organisms/NoticeDetails/DetailsContent.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.div`
-    box-sizing: border-box;
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    height: 320px;
-    padding: 12px 16px 12px 16px;
-    margin: 10px;
-    background-color: #fff;
-    border-radius: 15px;
-`;
\ No newline at end of file
diff --git a/src/components/organisms/NoticeDetails/DetailsContent.ts b/src/components/organisms/NoticeDetails/DetailsContent.ts
new file mode 100644
index 000000000..bd0b67548
--- /dev/null
+++ b/src/components/organisms/NoticeDetails/DetailsContent.ts
@@ -0,0 +1,13 @@
+import styled from 'styled-components';
+
+export default styled.div`
+  box-sizing: border-box;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  height: 320px;
+  padding: 12px 16px 12px 16px;
+  margin: 10px;
+  background-color: #fff;
+  border-radius: 15px;
+`;
diff --git a/src/components/organisms/NoticeDetails/DetailsDislike.js b/src/components/organisms/NoticeDetails/DetailsDislike.js
deleted file mode 100644
index 036fe8972..000000000
--- a/src/components/organisms/NoticeDetails/DetailsDislike.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.div`
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    padding-right: 29px;
-    padding-left: 29px;
-    font-size: 22px;
-    font-weight: bold;
-    color: ${props => props.theme.secondaryColor};
-    text-align: center;
-    background-color: rgba(255, 255, 255, 0.95);
-    border-radius: 15px;
-
-    & > div {
-        margin-top: 32px;
-    }
-    
-    & button {
-        &:not(:first-of-type) {
-            margin-left: 17px;
-        }
-    }
-`;
diff --git a/src/components/organisms/NoticeDetails/DetailsDislike.ts b/src/components/organisms/NoticeDetails/DetailsDislike.ts
new file mode 100644
index 000000000..e58033ddd
--- /dev/null
+++ b/src/components/organisms/NoticeDetails/DetailsDislike.ts
@@ -0,0 +1,31 @@
+import styled from 'styled-components';
+
+export default styled.div`
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding-right: 29px;
+  padding-left: 29px;
+  font-size: 22px;
+  font-weight: bold;
+  color: ${props => props.theme.secondaryColor};
+  text-align: center;
+  background-color: rgba(255, 255, 255, 0.95);
+  border-radius: 15px;
+
+  & > div {
+    margin-top: 32px;
+  }
+
+  & button {
+    &:not(:first-of-type) {
+      margin-left: 17px;
+    }
+  }
+`;
diff --git a/src/components/organisms/NoticeDetails/DetailsMeta.js b/src/components/organisms/NoticeDetails/DetailsMeta.ts
similarity index 99%
rename from src/components/organisms/NoticeDetails/DetailsMeta.js
rename to src/components/organisms/NoticeDetails/DetailsMeta.ts
index fe96510b5..6691fbd40 100644
--- a/src/components/organisms/NoticeDetails/DetailsMeta.js
+++ b/src/components/organisms/NoticeDetails/DetailsMeta.ts
@@ -25,4 +25,4 @@ export default styled.div`
             }
         }
     }
-`;
\ No newline at end of file
+`;
diff --git a/src/components/organisms/NoticeDetails/Feedbacks.js b/src/components/organisms/NoticeDetails/Feedbacks.js
deleted file mode 100644
index 1d2b92db9..000000000
--- a/src/components/organisms/NoticeDetails/Feedbacks.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import styled from 'styled-components';
-import Button from '../../atoms/Button';
-
-export default styled.div`
-    display: flex;
-    justify-content: flex-end;
-    margin-top: auto;
-    font-size: 14px;
-
-    & ${Button} {
-        color: ${props => props.theme.navInactive};
-        text-decoration: none;
-
-        svg {
-            transition: all 0.2s ease-in-out;
-            margin-right: 3px;
-            stroke: ${props => props.theme.secondaryColor};
-            fill: #fff;
-            vertical-align: middle;
-            transform: scale(-1, 1)
-        }
-
-        & + ${Button} {
-            margin-left: 20px;
-        }
-        
-        &:hover {
-            svg {
-                stroke: #fff;
-                stroke-width: .5px;
-                fill: ${props => props.theme.secondaryColor};
-            }
-        }
-    }
-`;
diff --git a/src/components/organisms/NoticeDetails/Feedbacks.ts b/src/components/organisms/NoticeDetails/Feedbacks.ts
new file mode 100644
index 000000000..a40e09210
--- /dev/null
+++ b/src/components/organisms/NoticeDetails/Feedbacks.ts
@@ -0,0 +1,35 @@
+import styled from 'styled-components';
+import Button from '../../atoms/Button';
+
+export default styled.div`
+  display: flex;
+  justify-content: flex-end;
+  margin-top: auto;
+  font-size: 14px;
+
+  & ${Button} {
+    color: ${props => props.theme.navInactive};
+    text-decoration: none;
+
+    svg {
+      transition: all 0.2s ease-in-out;
+      margin-right: 3px;
+      stroke: ${props => props.theme.secondaryColor};
+      fill: #fff;
+      vertical-align: middle;
+      transform: scale(-1, 1);
+    }
+
+    & + ${Button} {
+      margin-left: 20px;
+    }
+
+    &:hover {
+      svg {
+        stroke: #fff;
+        stroke-width: 0.5px;
+        fill: ${props => props.theme.secondaryColor};
+      }
+    }
+  }
+`;
diff --git a/src/components/organisms/NoticeDetails/Source/AnchorIcon.js b/src/components/organisms/NoticeDetails/Source/AnchorIcon.tsx
similarity index 100%
rename from src/components/organisms/NoticeDetails/Source/AnchorIcon.js
rename to src/components/organisms/NoticeDetails/Source/AnchorIcon.tsx
diff --git a/src/components/organisms/NoticeDetails/Source/Container.js b/src/components/organisms/NoticeDetails/Source/Container.js
deleted file mode 100644
index 348c2dd5f..000000000
--- a/src/components/organisms/NoticeDetails/Source/Container.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import styled from 'styled-components';
-import ExternalLink from '../../../atoms/ExternalLink';
-
-export default styled(ExternalLink)`
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    width: 66%;
-    display: inline-block;
-    vertical-align: bottom;
-`;
diff --git a/src/components/organisms/NoticeDetails/Source/Container.ts b/src/components/organisms/NoticeDetails/Source/Container.ts
new file mode 100644
index 000000000..ac83339b6
--- /dev/null
+++ b/src/components/organisms/NoticeDetails/Source/Container.ts
@@ -0,0 +1,11 @@
+import styled from 'styled-components';
+import ExternalLink from '../../../atoms/ExternalLink';
+
+export default styled(ExternalLink)`
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 66%;
+  display: inline-block;
+  vertical-align: bottom;
+`;
diff --git a/src/components/organisms/Notification/Container.js b/src/components/organisms/Notification/Container.js
deleted file mode 100644
index 625135e9e..000000000
--- a/src/components/organisms/Notification/Container.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import styled from 'styled-components';
-
-export const Section = styled.section`
-    display: flex;
-    flex-direction: column;
-    max-width: 384px;
-    height: 414px;
-    font-size: 10px;
-    font-family: 'Lato', sans-serif;
-    color: ${props => props.theme.primaryColor};
-    background-color: #fff;
-    border-radius: 7px;
-    box-shadow: 0 3px 6px 0 rgba(0,0,0,.58);
-`;
-
-export default Section;
diff --git a/src/components/organisms/Notification/Container.ts b/src/components/organisms/Notification/Container.ts
new file mode 100644
index 000000000..91062dfc1
--- /dev/null
+++ b/src/components/organisms/Notification/Container.ts
@@ -0,0 +1,16 @@
+import styled from 'styled-components';
+
+export const Section = styled.section`
+  display: flex;
+  flex-direction: column;
+  max-width: 384px;
+  height: 414px;
+  font-size: 10px;
+  font-family: 'Lato', sans-serif;
+  color: ${props => props.theme.primaryColor};
+  background-color: #fff;
+  border-radius: 7px;
+  box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.58);
+`;
+
+export default Section;
diff --git a/src/components/organisms/Notification/ContentTitleTop.js b/src/components/organisms/Notification/ContentTitleTop.ts
similarity index 86%
rename from src/components/organisms/Notification/ContentTitleTop.js
rename to src/components/organisms/Notification/ContentTitleTop.ts
index 3f2c84bd1..09aa0bbac 100644
--- a/src/components/organisms/Notification/ContentTitleTop.js
+++ b/src/components/organisms/Notification/ContentTitleTop.ts
@@ -2,5 +2,5 @@ import styled from 'styled-components';
 import ContentTitle from 'components/atoms/ContentTitle';
 
 export default styled(ContentTitle)`
-    margin: 12px 0 0;
+  margin: 12px 0 0;
 `;
diff --git a/src/components/organisms/Notification/NotificationFooter/AccountIcon.js b/src/components/organisms/Notification/NotificationFooter/AccountIcon.tsx
similarity index 100%
rename from src/components/organisms/Notification/NotificationFooter/AccountIcon.js
rename to src/components/organisms/Notification/NotificationFooter/AccountIcon.tsx
diff --git a/src/components/organisms/Notification/NotificationFooter/BubbleIcon.js b/src/components/organisms/Notification/NotificationFooter/BubbleIcon.tsx
similarity index 100%
rename from src/components/organisms/Notification/NotificationFooter/BubbleIcon.js
rename to src/components/organisms/Notification/NotificationFooter/BubbleIcon.tsx
diff --git a/src/components/organisms/Notification/NotificationFooter/CheckListIcon.js b/src/components/organisms/Notification/NotificationFooter/CheckListIcon.tsx
similarity index 100%
rename from src/components/organisms/Notification/NotificationFooter/CheckListIcon.js
rename to src/components/organisms/Notification/NotificationFooter/CheckListIcon.tsx
diff --git a/src/components/organisms/Notification/NotificationFooter/FooterContainer.js b/src/components/organisms/Notification/NotificationFooter/FooterContainer.js
deleted file mode 100644
index 1e3e947bc..000000000
--- a/src/components/organisms/Notification/NotificationFooter/FooterContainer.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.nav`
-    box-sizing: border-box;
-    display: flex;
-    justify-content: space-between;
-    max-height: 40px;
-    min-height: 40px;
-    padding-right: 38px;
-    padding-bottom: 5px;
-    padding-left: 38px;
-    margin-top: auto;
-    background-color: #fff;
-    border-top: 1px solid ${props => props.theme.bottomBar};
-    border-radius: 0 0 7px 7px;
-`;
\ No newline at end of file
diff --git a/src/components/organisms/Notification/NotificationFooter/FooterContainer.ts b/src/components/organisms/Notification/NotificationFooter/FooterContainer.ts
new file mode 100644
index 000000000..a2fa648f9
--- /dev/null
+++ b/src/components/organisms/Notification/NotificationFooter/FooterContainer.ts
@@ -0,0 +1,16 @@
+import styled from 'styled-components';
+
+export default styled.nav`
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  max-height: 40px;
+  min-height: 40px;
+  padding-right: 38px;
+  padding-bottom: 5px;
+  padding-left: 38px;
+  margin-top: auto;
+  background-color: #fff;
+  border-top: 1px solid ${props => props.theme.bottomBar};
+  border-radius: 0 0 7px 7px;
+`;
diff --git a/src/components/organisms/Notification/NotificationFooter/HelpIcon.js b/src/components/organisms/Notification/NotificationFooter/HelpIcon.tsx
similarity index 100%
rename from src/components/organisms/Notification/NotificationFooter/HelpIcon.js
rename to src/components/organisms/Notification/NotificationFooter/HelpIcon.tsx
diff --git a/src/components/organisms/Notification/NotificationFooter/NavLink.js b/src/components/organisms/Notification/NotificationFooter/NavLink.js
deleted file mode 100644
index e9061db37..000000000
--- a/src/components/organisms/Notification/NotificationFooter/NavLink.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import { NavLink as ReactRouterNavLink } from 'react-router-dom';
-import styled from 'styled-components';
-
-export default styled(ReactRouterNavLink).attrs({ replace: true, activeClassName: 'active' })`
-    box-sizing: border-box;
-    width: 40px;
-    padding-top: 5px;
-    padding-bottom: 6px;
-    text-align: center;
-    border-top: 2px solid transparent;
-    transition: all 0.2s ease-in-out;
-
-    & > svg {
-        transition: all 0.2s ease-in-out;
-        height: 28px;
-        fill: ${props => props.theme.navInactive};
-    }
-    
-    &.${props => props.activeClassName},
-    &:hover {
-      border-top: 2px solid ${props => props.theme.navActive};
-
-      & > svg {
-        fill: ${props => props.theme.navActive}
-      }
-    }
-`;
\ No newline at end of file
diff --git a/src/components/organisms/Notification/NotificationFooter/NavLink.ts b/src/components/organisms/Notification/NotificationFooter/NavLink.ts
new file mode 100644
index 000000000..bcf12a494
--- /dev/null
+++ b/src/components/organisms/Notification/NotificationFooter/NavLink.ts
@@ -0,0 +1,30 @@
+import React from 'react';
+import { NavLink as ReactRouterNavLink } from 'react-router-dom';
+import styled from 'styled-components';
+
+export default styled(ReactRouterNavLink).attrs({
+  replace: true,
+  activeClassName: 'active'
+})`
+  box-sizing: border-box;
+  width: 40px;
+  padding-top: 5px;
+  padding-bottom: 6px;
+  text-align: center;
+  border-top: 2px solid transparent;
+  transition: all 0.2s ease-in-out;
+
+  & > svg {
+    transition: all 0.2s ease-in-out;
+    height: 28px;
+    fill: ${props => props.theme.navInactive};
+  }
+
+  &.${props => props.activeClassName}, &:hover {
+    border-top: 2px solid ${props => props.theme.navActive};
+
+    & > svg {
+      fill: ${props => props.theme.navActive};
+    }
+  }
+`;
diff --git a/src/components/organisms/Notification/NotificationFooter/NotificationFooter.js b/src/components/organisms/Notification/NotificationFooter/NotificationFooter.tsx
similarity index 100%
rename from src/components/organisms/Notification/NotificationFooter/NotificationFooter.js
rename to src/components/organisms/Notification/NotificationFooter/NotificationFooter.tsx
diff --git a/src/components/organisms/Notification/NotificationFooter/index.js b/src/components/organisms/Notification/NotificationFooter/index.ts
similarity index 61%
rename from src/components/organisms/Notification/NotificationFooter/index.js
rename to src/components/organisms/Notification/NotificationFooter/index.ts
index ef3405306..063529202 100644
--- a/src/components/organisms/Notification/NotificationFooter/index.js
+++ b/src/components/organisms/Notification/NotificationFooter/index.ts
@@ -1,3 +1,3 @@
 import NotificationFooter from './NotificationFooter';
 
-export default NotificationFooter;
\ No newline at end of file
+export default NotificationFooter;
diff --git a/src/components/organisms/Notification/NotificationHeader/BackButton.js b/src/components/organisms/Notification/NotificationHeader/BackButton.tsx
similarity index 72%
rename from src/components/organisms/Notification/NotificationHeader/BackButton.js
rename to src/components/organisms/Notification/NotificationHeader/BackButton.tsx
index 80dcb3142..2e341a036 100644
--- a/src/components/organisms/Notification/NotificationHeader/BackButton.js
+++ b/src/components/organisms/Notification/NotificationHeader/BackButton.tsx
@@ -4,7 +4,7 @@ import Button from 'components/atoms/Button';
 import ArrowIcon from 'components/atoms/icons/Arrow';
 
 export default styled(Button).attrs({ children: <ArrowIcon /> })`
-    height: 30px;
-    padding-right: 10px;
-    stroke: ${props => props.theme.activeColor};
+  height: 30px;
+  padding-right: 10px;
+  stroke: ${props => props.theme.activeColor};
 `;
diff --git a/src/components/organisms/Notification/NotificationHeader/CloseButton.js b/src/components/organisms/Notification/NotificationHeader/CloseButton.tsx
similarity index 69%
rename from src/components/organisms/Notification/NotificationHeader/CloseButton.js
rename to src/components/organisms/Notification/NotificationHeader/CloseButton.tsx
index 469a8f6b2..bfee49725 100644
--- a/src/components/organisms/Notification/NotificationHeader/CloseButton.js
+++ b/src/components/organisms/Notification/NotificationHeader/CloseButton.tsx
@@ -4,9 +4,8 @@ import Button from 'components/atoms/Button';
 import CloseIcon from 'components/atoms/icons/Close';
 
 export default styled(Button).attrs({ children: <CloseIcon /> })`
-   margin-left: auto;
-   width: 13px;
-   height: 13px;
-   fill: ${props => props.theme.activeColor};
+  margin-left: auto;
+  width: 13px;
+  height: 13px;
+  fill: ${props => props.theme.activeColor};
 `;
-
diff --git a/src/components/organisms/Notification/NotificationHeader/Container.js b/src/components/organisms/Notification/NotificationHeader/Container.js
deleted file mode 100644
index 6b9eae6e1..000000000
--- a/src/components/organisms/Notification/NotificationHeader/Container.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import styled from 'styled-components';
-
-export default styled.div`  
-    box-sizing: border-box;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    min-height: 32px;
-    max-height: 32px;
-    padding-right: 10px;
-    padding-left: 12px;
-    border-bottom: 1px solid #A6B1C0;
-`;
\ No newline at end of file
diff --git a/src/components/organisms/Notification/NotificationHeader/Container.ts b/src/components/organisms/Notification/NotificationHeader/Container.ts
new file mode 100644
index 000000000..25804d311
--- /dev/null
+++ b/src/components/organisms/Notification/NotificationHeader/Container.ts
@@ -0,0 +1,13 @@
+import styled from 'styled-components';
+
+export default styled.div`
+  box-sizing: border-box;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  min-height: 32px;
+  max-height: 32px;
+  padding-right: 10px;
+  padding-left: 12px;
+  border-bottom: 1px solid #a6b1c0;
+`;
diff --git a/src/components/organisms/Notification/NotificationHeader/LogoContainer.js b/src/components/organisms/Notification/NotificationHeader/LogoContainer.tsx
similarity index 100%
rename from src/components/organisms/Notification/NotificationHeader/LogoContainer.js
rename to src/components/organisms/Notification/NotificationHeader/LogoContainer.tsx
diff --git a/src/components/organisms/Notification/NotificationHeader/LogoImg.js b/src/components/organisms/Notification/NotificationHeader/LogoImg.tsx
similarity index 100%
rename from src/components/organisms/Notification/NotificationHeader/LogoImg.js
rename to src/components/organisms/Notification/NotificationHeader/LogoImg.tsx

From 6f2d307fe70530379682a1c1e750e93e9529d60c Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Thu, 16 May 2019 20:02:22 +0200
Subject: [PATCH 064/100] fix(notification): fix import to require in script
 injection

---
 src/app/content/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/content/index.ts b/src/app/content/index.ts
index 0b43066c3..7df0ea1a7 100644
--- a/src/app/content/index.ts
+++ b/src/app/content/index.ts
@@ -1,8 +1,8 @@
 if (!(window as CustomWindow).__LMEM__CONTENT_SCRIPT_INJECTED__) {
   require('typeface-lato');
   require('typeface-sedgwick-ave');
-  const store = require('./store');
-  const externalClickHandler = require('./externalClickHandler');
+  const store = require('./store').default;
+  const externalClickHandler = require('./externalClickHandler').default;
   const handleExternalClick = externalClickHandler(store);
 
   window.addEventListener('load', () => {

From 63e24a9a3245b84f988544496f992a3e53ddb741 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Thu, 9 May 2019 16:18:54 +0200
Subject: [PATCH 065/100] feat: adapt to API V3

---
 httpRequests/getNotice.http                   |   5 +
 httpRequests/matchingContexts.http            |   5 +
 manifest/staging.js                           |  24 +-
 package.json                                  |   9 +-
 src/api/call.ts                               |  29 +
 src/api/fetchContributors.ts                  |   6 +
 src/api/fetchMatchingContexts.ts              |   7 +
 src/api/fetchNotice.ts                        |   8 +
 src/api/fetchRestrictedContexts.ts            |   7 +
 src/api/postRating.ts                         |  17 +
 src/app/actions/index.ts                      |   2 +-
 src/app/actions/kraftBackend.ts               |  20 +-
 .../{recommendations.ts => notices.ts}        |   0
 src/app/actions/tabs.ts                       |   2 -
 src/app/actions/updateDraftNotices.ts         |  11 +
 src/app/actions/updateDraftRecommendations.ts |  11 -
 src/app/analytics/eventsMapper.ts             |   2 +-
 src/app/background/index.ts                   |   6 +-
 .../background/middlewares/sendFeedback.ts    |  45 +-
 src/app/background/reducers/resources.ts      |   9 +-
 src/app/background/sagas/matchingContexts.ts  |  23 +-
 src/app/background/sagas/tab.ts               |  17 +-
 src/app/background/selectors/index.ts         |   4 +-
 src/app/background/selectors/prefs.ts         |  24 +-
 src/app/background/selectors/resources.ts     |   4 +-
 src/app/background/store/migrations.ts        |   9 +-
 src/app/constants/ActionTypes.ts              |  43 +-
 src/app/content/App/Notice/Details/index.tsx  |  11 +-
 src/app/content/App/Notice/Details/types.ts   |   7 +-
 .../content/App/Notice/Details/withConnect.ts |   2 +-
 .../content/App/Notice/List/List.stories.tsx  | 132 +--
 src/app/content/App/Notice/List/index.tsx     |  36 +-
 .../content/App/Notice/List/withConnect.ts    |   2 +-
 src/app/content/reducers/index.ts             |   4 +-
 .../{recommendations.ts => notices.ts}        |   0
 src/app/content/selectors/index.ts            |   2 +-
 src/app/content/store.ts                      |   7 +-
 src/app/lmem/contributor.ts                   |   5 +
 .../lmem/draft-preview/grabDraftNotices.js    |  23 +
 .../draft-preview/grabDraftRecommendations.js |  30 -
 src/app/lmem/draft-preview/main.ts            |  18 +-
 src/app/lmem/draft.ts                         |   3 +
 src/app/lmem/editors.ts                       |  15 -
 src/app/lmem/fetchMatchingNotices.ts          |   7 -
 src/app/lmem/intention.ts                     |  23 +
 src/app/lmem/matchingContext.ts               |  28 +-
 src/app/lmem/notice.ts                        | 151 ++--
 src/app/lmem/noticeType.ts                    |  30 -
 src/app/lmem/rating.ts                        |  17 +
 src/app/lmem/source.ts                        |   4 +
 src/app/theme.ts                              |  26 +-
 .../Buttons/AddNoticeLink/AddNoticeLink.tsx   |   2 +-
 src/components/atoms/icons/types/index.ts     |  14 +-
 .../molecules/Type/IntentionIcon.tsx          |  26 +
 .../molecules/Type/Type.stories.tsx           |  14 +-
 src/components/molecules/Type/Type.tsx        |  26 -
 .../organisms/Notice/Notice.stories.tsx       |  89 +-
 src/components/organisms/Notice/Notice.tsx    |  34 +-
 .../NoticeDetails/NoticeDetails.stories.tsx   |  63 +-
 .../organisms/NoticeDetails/NoticeDetails.tsx |  66 +-
 test/app/actions.ts                           |  56 +-
 test/app/content/actions.ts                   |  31 +-
 ...indMatchingOffersAccordingToPreferences.ts |  59 +-
 test/app/lmem/noticeIsValid.ts                |  78 ++
 test/app/middlewares/analytics.ts             |   1 -
 test/app/reducers.ts                          |   7 +-
 test/app/utils.ts                             |  20 -
 tsconfig.json                                 |   4 +-
 tslint.json                                   |   5 +-
 webpack/config.plugins.js                     |  10 +-
 yarn.lock                                     | 837 +++++++++++-------
 71 files changed, 1226 insertions(+), 1148 deletions(-)
 create mode 100644 httpRequests/getNotice.http
 create mode 100644 httpRequests/matchingContexts.http
 create mode 100644 src/api/call.ts
 create mode 100644 src/api/fetchContributors.ts
 create mode 100644 src/api/fetchMatchingContexts.ts
 create mode 100644 src/api/fetchNotice.ts
 create mode 100644 src/api/fetchRestrictedContexts.ts
 create mode 100644 src/api/postRating.ts
 rename src/app/actions/{recommendations.ts => notices.ts} (100%)
 create mode 100644 src/app/actions/updateDraftNotices.ts
 delete mode 100644 src/app/actions/updateDraftRecommendations.ts
 rename src/app/content/reducers/{recommendations.ts => notices.ts} (100%)
 create mode 100644 src/app/lmem/contributor.ts
 create mode 100644 src/app/lmem/draft-preview/grabDraftNotices.js
 delete mode 100644 src/app/lmem/draft-preview/grabDraftRecommendations.js
 create mode 100644 src/app/lmem/draft.ts
 delete mode 100644 src/app/lmem/editors.ts
 delete mode 100644 src/app/lmem/fetchMatchingNotices.ts
 create mode 100644 src/app/lmem/intention.ts
 delete mode 100644 src/app/lmem/noticeType.ts
 create mode 100644 src/app/lmem/rating.ts
 create mode 100644 src/app/lmem/source.ts
 create mode 100644 src/components/molecules/Type/IntentionIcon.tsx
 delete mode 100644 src/components/molecules/Type/Type.tsx
 create mode 100644 test/app/lmem/noticeIsValid.ts
 delete mode 100644 test/app/utils.ts

diff --git a/httpRequests/getNotice.http b/httpRequests/getNotice.http
new file mode 100644
index 000000000..20e4147c2
--- /dev/null
+++ b/httpRequests/getNotice.http
@@ -0,0 +1,5 @@
+### Get Notice 1
+GET https://staging-notices.lmem.net/api/v3/notices/15
+Accept: application/json
+
+###
diff --git a/httpRequests/matchingContexts.http b/httpRequests/matchingContexts.http
new file mode 100644
index 000000000..5f7baba8d
--- /dev/null
+++ b/httpRequests/matchingContexts.http
@@ -0,0 +1,5 @@
+### Get all matching contexts
+GET https://staging-notices.lmem.net/api/v3/matching-contexts
+Accept: application/json
+
+###
diff --git a/manifest/staging.js b/manifest/staging.js
index 144b76598..5e950248f 100644
--- a/manifest/staging.js
+++ b/manifest/staging.js
@@ -3,30 +3,24 @@ const base = require('./base');
 
 module.exports = {
   ...base,
-  'name': 'LMEM - STAGING',
-  'content_security_policy': csp({
-    'directives': {
-      'default-src': [
-        'https://staging-recommendations.lmem.net',
-      ],
+  name: 'LMEM - STAGING',
+  content_security_policy: csp({
+    directives: {
+      'default-src': ['https://staging-notices.lmem.net'],
       'script-src': [
-        '\'self\'',
-        '\'unsafe-eval\'',
+        "'self'",
+        "'unsafe-eval'",
         'https://heapanalytics.com',
         'https://cdn.heapanalytics.com'
       ],
-      'object-src': [
-        '\'self\''
-      ],
+      'object-src': ["'self'"],
       'img-src': [
-        '\'self\'',
+        "'self'",
         'https://heapanalytics.com',
         'https://cdn.heapanalytics.com',
         'data:'
       ],
-      'style-src': [
-        '\'unsafe-inline\''
-      ]
+      'style-src': ["'unsafe-inline'"]
     }
   })
 };
diff --git a/package.json b/package.json
index 5294b1039..d66e4999a 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "build": "yarn build:staging && yarn build:production",
     "clean": "rm -rf build",
     "test": "LMEM_BACKEND_ORIGIN='' NODE_ENV=test ts-mocha --paths test/app/*.ts test/app/**/*.ts",
+    "typecheck": "tsc --noEmit",
     "lint": "yarn lint:ts && yarn lint:css",
     "lint:ts": "tslint -p .",
     "lint:css": "stylelint './src/**/*.js'",
@@ -136,14 +137,14 @@
     "sinon-chai": "^3.3.0",
     "source-map-loader": "^0.2.4",
     "style-loader": "^0.23.1",
-    "stylelint": "^9.7.1",
+    "stylelint": "^10.0.1",
     "stylelint-config-recommended": "^2.1.0",
     "stylelint-config-styled-components": "^0.1.1",
     "stylelint-custom-processor-loader": "^0.5.0",
     "stylelint-processor-styled-components": "^1.5.0",
     "svg-url-loader": "^2.0.2",
     "ts-mocha": "^6.0.0",
-    "tslint": "^5.13.1",
+    "tslint": "^5.16.0",
     "tslint-config-prettier": "^1.18.0",
     "tslint-config-standard": "^8.0.1",
     "tslint-react": "^3.6.0",
@@ -157,6 +158,7 @@
   },
   "dependencies": {
     "@babel/polyfill": "^7.2.5",
+    "@types/date-fns": "^2.6.0",
     "@types/flat": "^0.0.28",
     "@types/history": "^4.7.2",
     "@types/isomorphic-fetch": "^0.0.35",
@@ -168,11 +170,14 @@
     "@types/react-router": "^4.4.4",
     "@types/react-router-dom": "^4.3.1",
     "@types/styled-components": "^4.1.12",
+    "browserslist": "^4.5.6",
+    "caniuse-lite": "^1.0.30000967",
     "chrome-storage-local": "^0.1.5",
     "classnames": "^2.2.5",
     "connected-react-router": "^6.3.1",
     "content-security-policy-builder": "^1.1.0",
     "crossmessaging": "^0.2.0",
+    "date-fns": "^1.30.1",
     "dompurify": "^0.8.4",
     "es6-promise": "^3.2.1",
     "flat": "^4.1.0",
diff --git a/src/api/call.ts b/src/api/call.ts
new file mode 100644
index 000000000..5af388c69
--- /dev/null
+++ b/src/api/call.ts
@@ -0,0 +1,29 @@
+import fetch from 'isomorphic-fetch';
+import { LMEM_BACKEND_ORIGIN } from 'app/constants/origins';
+
+export const get = (path: string) =>
+  fetch(path.startsWith('http') ? path : LMEM_BACKEND_ORIGIN + path).then(
+    response => {
+      if (response.status >= 400) {
+        throw new Error('Bad response from server');
+      }
+      return response.json();
+    }
+  );
+
+export const post = (path: string, data: {} | []) =>
+  fetch(path.startsWith('http') ? path : LMEM_BACKEND_ORIGIN + path, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify(data)
+  }).then(response => {
+    if (response.status >= 400) {
+      throw new Error('Bad response from server');
+    }
+    if (response.status === 204) {
+      return true;
+    }
+    return response.json();
+  });
diff --git a/src/api/fetchContributors.ts b/src/api/fetchContributors.ts
new file mode 100644
index 000000000..38a7c84d8
--- /dev/null
+++ b/src/api/fetchContributors.ts
@@ -0,0 +1,6 @@
+import { get } from './call';
+import { Contributor } from '../app/lmem/contributor';
+
+const fetchContributors = (): Promise<Contributor[]> => get('contributors');
+
+export default fetchContributors;
diff --git a/src/api/fetchMatchingContexts.ts b/src/api/fetchMatchingContexts.ts
new file mode 100644
index 000000000..29aee3b01
--- /dev/null
+++ b/src/api/fetchMatchingContexts.ts
@@ -0,0 +1,7 @@
+import { MatchingContext } from '../app/lmem/matchingContext';
+import { get } from './call';
+
+const fetchMatchingContexts = (): Promise<MatchingContext[]> =>
+  get('matching-contexts');
+
+export default fetchMatchingContexts;
diff --git a/src/api/fetchNotice.ts b/src/api/fetchNotice.ts
new file mode 100644
index 000000000..23029a174
--- /dev/null
+++ b/src/api/fetchNotice.ts
@@ -0,0 +1,8 @@
+import { Notice } from '../app/lmem/notice';
+import { get } from './call';
+
+export const fetchNotice = (noticeUrl: string): Promise<Notice> =>
+  get(noticeUrl);
+
+export const fetchNotices = (noticeUrls: string[]): Promise<Notice[]> =>
+  Promise.all(noticeUrls.map(fetchNotice));
diff --git a/src/api/fetchRestrictedContexts.ts b/src/api/fetchRestrictedContexts.ts
new file mode 100644
index 000000000..ddb229727
--- /dev/null
+++ b/src/api/fetchRestrictedContexts.ts
@@ -0,0 +1,7 @@
+import { RestrictedContext } from '../app/lmem/matchingContext';
+import { get } from './call';
+
+const fetchRestrictedContexts = (): Promise<RestrictedContext[]> =>
+  get('restricted-contexts');
+
+export default fetchRestrictedContexts;
diff --git a/src/api/postRating.ts b/src/api/postRating.ts
new file mode 100644
index 000000000..16e398eb0
--- /dev/null
+++ b/src/api/postRating.ts
@@ -0,0 +1,17 @@
+import { RatingType } from '../app/lmem/rating';
+import { post } from './call';
+
+const postRating = (
+  noticeId: number,
+  url: string,
+  rating: RatingType
+): Promise<void> =>
+  post(`notices/${noticeId}/ratings`, {
+    ratingType: rating,
+    context: {
+      url,
+      geolocation: ''
+    }
+  });
+
+export default postRating;
diff --git a/src/app/actions/index.ts b/src/app/actions/index.ts
index aa0a62987..2d42ba1bb 100644
--- a/src/app/actions/index.ts
+++ b/src/app/actions/index.ts
@@ -25,7 +25,7 @@ import {
   FeedbackOnNoticeAction,
   NoticesFoundAction,
   ReadNoticeAction
-} from './recommendations';
+} from './notices';
 import { Action } from 'redux';
 
 export interface BaseAction extends Action {
diff --git a/src/app/actions/kraftBackend.ts b/src/app/actions/kraftBackend.ts
index 1558950da..7d522aebe 100644
--- a/src/app/actions/kraftBackend.ts
+++ b/src/app/actions/kraftBackend.ts
@@ -1,25 +1,7 @@
-import fetch from 'isomorphic-fetch';
-import { LMEM_BACKEND_ORIGIN } from 'app/constants/origins';
 import { MatchingContext } from 'app/lmem/matchingContext';
 import { Dispatch } from 'redux';
 import { BaseAction } from '.';
-
-function fetchJson(url: string) {
-  return fetch(url).then(response => {
-    if (response.status >= 400) {
-      throw new Error('Bad response from server');
-    }
-    return response.json();
-  });
-}
-
-export function makeUrlFromFilters() {
-  return LMEM_BACKEND_ORIGIN + '/api/v2/matchingcontexts';
-}
-
-export function fetchMatchingContexts(): Promise<MatchingContext[]> {
-  return fetchJson(makeUrlFromFilters());
-}
+import fetchMatchingContexts from '../../api/fetchMatchingContexts';
 
 export interface ReceivedMatchingContextsAction extends BaseAction {
   type: 'api/UPDATE_MATCHING_CONTEXTS';
diff --git a/src/app/actions/recommendations.ts b/src/app/actions/notices.ts
similarity index 100%
rename from src/app/actions/recommendations.ts
rename to src/app/actions/notices.ts
diff --git a/src/app/actions/tabs.ts b/src/app/actions/tabs.ts
index 4e47bd7cb..f77b9623e 100644
--- a/src/app/actions/tabs.ts
+++ b/src/app/actions/tabs.ts
@@ -1,4 +1,3 @@
-import { Criteria } from 'app/lmem/criterion';
 import {
   ignoringReason,
   EnhancedNotice,
@@ -6,7 +5,6 @@ import {
   Notice
 } from 'app/lmem/notice';
 import { InstallationDetails } from 'app/lmem/installation';
-import { Editor } from 'app/lmem/editors';
 import { MatchingContext } from 'app/lmem/matchingContext';
 import { BaseAction, TabAction } from '.';
 
diff --git a/src/app/actions/updateDraftNotices.ts b/src/app/actions/updateDraftNotices.ts
new file mode 100644
index 000000000..6dddca38f
--- /dev/null
+++ b/src/app/actions/updateDraftNotices.ts
@@ -0,0 +1,11 @@
+import { BaseAction } from '.';
+
+interface UpdateDraftNoticesAction extends BaseAction {
+  type: 'UPDATE_DRAFT_NOTICES';
+  payload: { drafts: {} };
+}
+export const updateDraftNotices = (drafts: {}): UpdateDraftNoticesAction => ({
+  type: 'UPDATE_DRAFT_NOTICES',
+  payload: { drafts }
+});
+export default updateDraftNotices;
diff --git a/src/app/actions/updateDraftRecommendations.ts b/src/app/actions/updateDraftRecommendations.ts
deleted file mode 100644
index ac8cdb348..000000000
--- a/src/app/actions/updateDraftRecommendations.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { BaseAction } from '.';
-
-interface UpdateDraftRecommendationsAction extends BaseAction {
-  type: 'UPDATE_DRAFT_RECOMMENDATIONS';
-  payload: { draftRecommendations: {} };
-}
-export const updateDraftRecommendations = (draftRecommendations: {}): UpdateDraftRecommendationsAction => ({
-  type: 'UPDATE_DRAFT_RECOMMENDATIONS',
-  payload: { draftRecommendations }
-});
-export default updateDraftRecommendations;
diff --git a/src/app/analytics/eventsMapper.ts b/src/app/analytics/eventsMapper.ts
index bf321ad72..47327769d 100644
--- a/src/app/analytics/eventsMapper.ts
+++ b/src/app/analytics/eventsMapper.ts
@@ -13,7 +13,7 @@ export default function mapEventFromAction(action: Action) {
   // Drop useless properties in order to reduce objects size
   // Note: HEAP client sdk already drops object-like properties
   delete event.type;
-  delete event['recommendation.description'];
+  delete event['notice.message'];
 
   return event;
 }
diff --git a/src/app/background/index.ts b/src/app/background/index.ts
index 2ce4ba4a1..27e4b2698 100644
--- a/src/app/background/index.ts
+++ b/src/app/background/index.ts
@@ -7,7 +7,7 @@ import {
   refreshMatchingContextsEvery
 } from 'app/actions/kraftBackend';
 import onInstalled from 'app/actions/install';
-import updateDraftRecommendations from 'app/actions/updateDraftRecommendations';
+import updateDraftNotices from 'app/actions/updateDraftNotices';
 import { getInstallationDetails } from './selectors/prefs';
 import { store } from './store';
 import fetchContentScript from './services/fetchContentScript';
@@ -47,9 +47,9 @@ if (typeof heapAppId === 'string') {
 }
 
 // Load content code when the extension is loaded
-fetchContentScript('/js/grabDraftRecommendations.js').then(contentCode =>
+fetchContentScript('/js/grabDraftNotices.js').then(contentCode =>
   prepareDraftPreview(chrome.tabs, contentCode, (draftOffers: {}) =>
-    store.dispatch(updateDraftRecommendations(draftOffers))
+    store.dispatch(updateDraftNotices(draftOffers))
   )
 );
 
diff --git a/src/app/background/middlewares/sendFeedback.ts b/src/app/background/middlewares/sendFeedback.ts
index a887ab6ce..9bf4b1c63 100644
--- a/src/app/background/middlewares/sendFeedback.ts
+++ b/src/app/background/middlewares/sendFeedback.ts
@@ -1,22 +1,8 @@
 import { LMEM_BACKEND_ORIGIN } from '../../constants/origins';
 import { AppAction } from '../../actions';
 import { Dispatch } from 'redux';
-import {
-  FeedbackOnNoticeAction,
-  feedbackType
-} from '../../actions/recommendations';
-
-export function makeRecoFeedback(feedback: feedbackType, url: string) {
-  const datetime = new Date().toISOString();
-
-  return {
-    feedback,
-    contexts: {
-      datetime,
-      url
-    }
-  };
-}
+import { FeedbackOnNoticeAction, feedbackType } from '../../actions/notices';
+import postRating from '../../../api/postRating';
 
 /* eslint-disable indent, implicit-arrow-linebreak, no-multi-spaces */
 const isUserToNoticeAction = (
@@ -27,25 +13,14 @@ export default function() {
   return (next: Dispatch) => (action: AppAction) => {
     if (isUserToNoticeAction(action)) {
       const { id } = action.payload;
-      const reqUrl =
-        LMEM_BACKEND_ORIGIN + '/api/v2/recommendations/' + id + '/feedbacks';
-      new Promise<string>(resolve => {
-        chrome.tabs.query(
-          {
-            active: true,
-            currentWindow: true
-          },
-          ([selectedTab]) => resolve(selectedTab.url)
-        );
-      }).then((tabUrl: string) => {
-        const body = JSON.stringify(
-          makeRecoFeedback(action.payload.feedback, tabUrl)
-        );
-
-        fetch(reqUrl, { method: 'POST', body })
-          .then(response => console.log('RESPONSE', response))
-          .catch(error => console.error(`Error in ${reqUrl}`, error));
-      });
+      chrome.tabs.query(
+        { active: true, currentWindow: true },
+        ([selectedTab]) => {
+          if (selectedTab && selectedTab.url) {
+            postRating(id, selectedTab.url, action.payload.feedback);
+          }
+        }
+      );
     }
 
     return next(action);
diff --git a/src/app/background/reducers/resources.ts b/src/app/background/reducers/resources.ts
index 466c0ebc3..5e95d78bd 100644
--- a/src/app/background/reducers/resources.ts
+++ b/src/app/background/reducers/resources.ts
@@ -1,14 +1,15 @@
 import { MatchingContext } from 'app/lmem/matchingContext';
 import { AppAction } from 'app/actions';
+import { Draft } from '../../lmem/draft';
 
 export interface ResourcesState {
   matchingContexts: MatchingContext[];
-  draftRecommendations: MatchingContext[];
+  drafts: Draft[];
 }
 
 const initialResources: ResourcesState = {
   matchingContexts: [],
-  draftRecommendations: []
+  drafts: []
 };
 
 export default function(
@@ -20,10 +21,10 @@ export default function(
       return { ...state, matchingContexts: action.payload.matchingContexts };
 
     /* Action is not existing yet, but will come soon.
-    case 'UPDATE_DRAFT_RECOMMENDATIONS': {
+    case 'UPDATE_DRAFT_NOTICES': {
       return {
         ...state,
-        draftRecommendations: action.payload.draftRecommendations
+        drafts: action.payload.drafts
       };
     }
     */
diff --git a/src/app/background/sagas/matchingContexts.ts b/src/app/background/sagas/matchingContexts.ts
index b619f0544..f49b46714 100644
--- a/src/app/background/sagas/matchingContexts.ts
+++ b/src/app/background/sagas/matchingContexts.ts
@@ -1,17 +1,8 @@
 import { put, takeLatest, call } from 'redux-saga/effects';
-import {
-  REFRESH_MATCHING_CONTEXTS,
-  EXCLUDE_EDITOR,
-  INCLUDE_EDITOR,
-  SELECT_CRITERION,
-  UNSELECT_CRITERION
-} from '../../constants/ActionTypes';
+import fetchMatchingContexts from '../../../api/fetchMatchingContexts';
+import { REFRESH_MATCHING_CONTEXTS } from '../../constants/ActionTypes';
 
-import {
-  fetchMatchingContexts,
-  receivedMatchingContexts,
-  refreshMatchingContexts
-} from 'app/actions/kraftBackend';
+import { receivedMatchingContexts } from 'app/actions/kraftBackend';
 
 export function* refreshMatchingContextsSaga() {
   const matchingContexts = yield call(fetchMatchingContexts);
@@ -19,14 +10,6 @@ export function* refreshMatchingContextsSaga() {
   yield put(receivedMatchingContexts(matchingContexts));
 }
 
-export function* scheduleRefreshAfterwardSaga() {
-  yield put(refreshMatchingContexts());
-}
-
 export default function* tabRootSaga() {
   yield takeLatest(REFRESH_MATCHING_CONTEXTS, refreshMatchingContextsSaga);
-  yield takeLatest(
-    [EXCLUDE_EDITOR, INCLUDE_EDITOR, SELECT_CRITERION, UNSELECT_CRITERION],
-    scheduleRefreshAfterwardSaga
-  );
 }
diff --git a/src/app/background/sagas/tab.ts b/src/app/background/sagas/tab.ts
index 1e08d18af..3483104fb 100644
--- a/src/app/background/sagas/tab.ts
+++ b/src/app/background/sagas/tab.ts
@@ -34,7 +34,7 @@ import {
   noticesFound,
   NoticesFoundAction,
   noticesUpdated
-} from 'app/actions/recommendations';
+} from 'app/actions/notices';
 import watchSingleMessageSaga from '../../utils/watchSingleMessageSaga';
 import { TabAction } from '../../actions';
 import fetchContentScript from '../services/fetchContentScript';
@@ -48,10 +48,10 @@ import {
 } from '../../actions/tabsLifecycle';
 import * as R from 'ramda';
 import { MatchingContext } from '../../lmem/matchingContext';
-import { EnhancedNotice } from '../../lmem/notice';
+import { EnhancedNotice, Notice, warnIfNoticeInvalid } from '../../lmem/notice';
 import sendToTab from '../services/sendToTab';
 import { AppAction } from '../../actions/';
-import { fetchMatchingNotices } from '../../lmem/fetchMatchingNotices';
+import { fetchNotices } from '../../../api/fetchNotice';
 
 export const tabSaga = (executeContentScript: ExecuteContentScript) =>
   function*({ payload: { tab, url } }: TabCreatedAction | TabUpdatedAction) {
@@ -87,20 +87,21 @@ export const contextTriggeredSaga = function*({
 
     const toFetch = R.compose<MatchingContext[], string[], string[]>(
       R.uniq,
-      R.map(tc => tc.recommendation_url)
+      R.map(tc => tc.noticeUrl)
     )(triggeredContexts);
 
-    const notices = yield call(fetchMatchingNotices, toFetch);
+    const notices = yield call(fetchNotices, toFetch);
+    const validNotices: Notice[] = notices.filter(warnIfNoticeInvalid);
 
     const noticesToShow: EnhancedNotice[] = yield select(
-      getNoticesToDisplay(notices)
+      getNoticesToDisplay(validNotices)
     );
     yield all(
       noticesToShow.map(notice => put(noticeDisplayed(notice, trigger)))
     );
 
     const ignoredNotices: EnhancedNotice[] = yield select(
-      getIgnoredNotices(notices)
+      getIgnoredNotices(validNotices)
     );
     yield all(
       ignoredNotices.map(notice => put(noticeIgnored(notice, trigger)))
@@ -110,7 +111,7 @@ export const contextTriggeredSaga = function*({
       yield put(noticesFound(noticesToShow, tab));
     } else {
       // Will throw here when we will be able to not trigger context on dismissed/disliked notices
-      // throw new Error('Context was triggered but they were no recommendations left to display.');
+      // throw new Error('Context was triggered but they were no notices left to display.');
     }
   } catch (e) {
     yield put(contextTriggerFailure(tab, trigger, e));
diff --git a/src/app/background/selectors/index.ts b/src/app/background/selectors/index.ts
index 9f2018d68..acc3e3b80 100644
--- a/src/app/background/selectors/index.ts
+++ b/src/app/background/selectors/index.ts
@@ -1,5 +1,5 @@
 import { findMatchingOffersAccordingToPreferences } from '../../lmem/matchingContext';
-import { getDrafRecommendations, getMatchingContexts } from './resources';
+import { getDraftNotices, getMatchingContexts } from './resources';
 import { BackgroundState } from '../reducers';
 
 export const findTriggeredContexts = (state: BackgroundState) => (
@@ -8,5 +8,5 @@ export const findTriggeredContexts = (state: BackgroundState) => (
   findMatchingOffersAccordingToPreferences(
     url,
     getMatchingContexts(state),
-    getDrafRecommendations(state)
+    getDraftNotices(state)
   );
diff --git a/src/app/background/selectors/prefs.ts b/src/app/background/selectors/prefs.ts
index 08f58de08..201617ce2 100644
--- a/src/app/background/selectors/prefs.ts
+++ b/src/app/background/selectors/prefs.ts
@@ -2,7 +2,6 @@ import {
   Notice,
   EnhancedNotice,
   isIgnored,
-  warnIfNoticeInvalid,
   shouldNoticeBeShown
 } from '../../lmem/notice';
 import { BackgroundState } from '../reducers';
@@ -29,26 +28,29 @@ export const getNoticeEnhancer = (state: BackgroundState) => {
   const disliked = getDisliked(state);
   const read = getRead(state);
 
-  return (notice: Notice) => ({
+  return (notice: Notice): EnhancedNotice => ({
     ...notice,
-    dismissed: dismissed.includes(notice.id),
-    liked: liked.includes(notice.id),
-    disliked: disliked.includes(notice.id),
-    valid: warnIfNoticeInvalid(notice),
-    read: read.includes(notice.id)
+    status: {
+      dismissed: dismissed.includes(notice.id),
+      liked: liked.includes(notice.id),
+      disliked: disliked.includes(notice.id),
+      read: read.includes(notice.id)
+    }
   });
 };
 
-export const getNoticesToDisplay = (notices: EnhancedNotice[]) => (
+export const getNoticesToDisplay = (notices: Notice[]) => (
   state: BackgroundState
 ): EnhancedNotice[] =>
   notices.map(getNoticeEnhancer(state)).filter(shouldNoticeBeShown);
 
-export const getDismissedNotices = (notices: EnhancedNotice[]) => (
+export const getDismissedNotices = (notices: Notice[]) => (
   state: BackgroundState
 ): EnhancedNotice[] =>
-  notices.map(getNoticeEnhancer(state)).filter(notice => notice.dismissed);
+  notices
+    .map(getNoticeEnhancer(state))
+    .filter(notice => notice.status.dismissed);
 
-export const getIgnoredNotices = (notices: EnhancedNotice[]) => (
+export const getIgnoredNotices = (notices: Notice[]) => (
   state: BackgroundState
 ): EnhancedNotice[] => notices.map(getNoticeEnhancer(state)).filter(isIgnored);
diff --git a/src/app/background/selectors/resources.ts b/src/app/background/selectors/resources.ts
index 48428eb2b..e1716538f 100644
--- a/src/app/background/selectors/resources.ts
+++ b/src/app/background/selectors/resources.ts
@@ -3,5 +3,5 @@ import { BackgroundState } from '../reducers';
 export const getMatchingContexts = (state: BackgroundState) =>
   state.resources.matchingContexts;
 
-export const getDrafRecommendations = (state: BackgroundState) =>
-  state.resources.draftRecommendations;
+export const getDraftNotices = (state: BackgroundState) =>
+  state.resources.drafts;
diff --git a/src/app/background/store/migrations.ts b/src/app/background/store/migrations.ts
index 5debf85c2..e5b66d2d0 100644
--- a/src/app/background/store/migrations.ts
+++ b/src/app/background/store/migrations.ts
@@ -2,7 +2,6 @@ import { createMigrate } from 'redux-persist';
 import { MigrationManifest, PersistedState } from 'redux-persist/es/types';
 import * as R from 'ramda';
 import { Criteria } from '../../lmem/criterion';
-import { Editor } from '../../lmem/editors';
 import { InstallationDetails } from '../../lmem/installation';
 import { State } from '../../content/store';
 
@@ -10,14 +9,14 @@ interface StateV0V1orV2 extends PersistedState {
   prefs?: {
     websites: any;
     criteria: Criteria;
-    editors: { [id: number]: Editor };
+    editors: { [id: number]: any };
     dismissedRecos: number[];
     approvedRecos: number[];
     onInstalledDetails: InstallationDetails;
   };
   websites?: any;
   criteria?: Criteria;
-  editors?: { [id: number]: Editor };
+  editors?: { [id: number]: any };
   dismissedRecos?: number[];
   approvedRecos?: number[];
   dismissedNotices?: number[];
@@ -29,7 +28,7 @@ interface StateV0V1orV2 extends PersistedState {
 interface StateV1Prefs {
   websites: any;
   criteria: Criteria;
-  editors: { [id: number]: Editor };
+  editors: { [id: number]: any };
   dismissedRecos?: number[];
   approvedRecos?: number[];
   dismissedNotices?: number[];
@@ -44,7 +43,7 @@ interface StateV1orV2 extends PersistedState {
 interface StateV2Prefs {
   websites: any;
   criteria: Criteria;
-  editors: { [id: number]: Editor };
+  editors: { [id: number]: any };
   dismissedNotices: number[];
   likedNotices: number[];
   dislikedNotices: number[];
diff --git a/src/app/constants/ActionTypes.ts b/src/app/constants/ActionTypes.ts
index 997f25f73..0ef98b6ec 100644
--- a/src/app/constants/ActionTypes.ts
+++ b/src/app/constants/ActionTypes.ts
@@ -1,27 +1,15 @@
-// background actions
-
 export const INIT = 'INIT';
-
 export const MATCHING_OFFERS_FOUND = 'matching_offers/FOUND';
-
 export const RECEIVED_MATCHING_CONTEXTS = 'api/UPDATE_MATCHING_CONTEXTS';
-export const RECEIVED_CRITERIA = 'api/UPDATE_CRITERIA';
-export const RECEIVED_EDITORS = 'api/UPDATE_EDITORS';
-
-export const UPDATE_DRAFT_RECOMMENDATIONS = 'UPDATE_DRAFT_RECOMMENDATIONS';
-
+export const UPDATE_DRAFT_NOTICES = 'UPDATE_DRAFT_NOTICES';
 export const REFRESH_MATCHING_CONTEXTS = 'REFRESH_MATCHING_CONTEXTS';
-
 export const INSTALLED = 'INSTALLED';
-
 export const MATCH_CONTEXT = 'LMEM/MATCH_CONTEXT';
 export const MATCH_CONTEXT_FAILURE = 'LMEM/MATCH_CONTEXT_FAILURE';
 export const CONTEXT_TRIGGERED = 'LMEM/CONTEXT_TRIGGERED';
 export const CONTEXT_TRIGGER_FAILURE = 'LMEM/CONTEXT_TRIGGER_FAILURE';
 export const RECO_DISPLAYED = 'RECO_DISPLAYED';
 export const NOTICE_IGNORED = 'NOTICE_IGNORED';
-
-// content actions
 export const NOTICES_FOUND = 'NOTICES_FOUND';
 export const DISMISS_NOTICE = 'DISMISS_NOTICE';
 export const UNDISMISS_NOTICE = 'UNDISMISS_NOTICE';
@@ -29,37 +17,8 @@ export const LIKE_NOTICE = 'LIKE_NOTICE';
 export const UNLIKE_NOTICE = 'UNLIKE_NOTICE';
 export const DISLIKE_NOTICE = 'DISLIKE_NOTICE';
 export const UNDISLIKE_NOTICE = 'UNDISLIKE_NOTICE';
-export const REPORT_NOTICE = 'REPORT_NOTICE';
-
 export const INSTALLED_DETAILS = 'INSTALLED_DETAILS';
-
-export const REDUCE_RECOMMENDATION_IFRAME = 'REDUCE_RECOMMENDATION_IFRAME';
-export const EXTEND_RECOMMENDATION_IFRAME = 'EXTEND_RECOMMENDATION_IFRAME';
-
 export const OPEN = 'OPEN';
 export const OPENED = 'OPENED';
 export const CLOSE = 'CLOSE';
 export const CLOSED = 'CLOSED';
-
-export const OPEN_PREFERENCE_PANEL = 'OPEN_PREFERENCE_PANEL';
-export const CLOSE_PREFERENCE_PANEL = 'CLOSE_PREFERENCE_PANEL';
-
-export const DEACTIVATED_WEBSITES = 'DEACTIVATED_WEBSITES';
-
-export const DEACTIVATE = 'DEACTIVATE';
-
-export const UNINSTALL = 'UNINSTALL';
-
-export const CHECKOUT_RECO_RESOURCE_BUTTON = 'CHECKOUT_RECO_RESOURCE_BUTTON';
-export const CHECKOUT_RECO_RESOURCE_LINK = 'CHECKOUT_RECO_RESOURCE_LINK';
-export const CHECKOUT_RECO_ALTERNATIVE = 'CHECKOUT_RECO_ALTERNATIVE';
-export const CHECKOUT_RECO_EDITOR = 'CHECKOUT_RECO_EDITOR';
-
-export const POPUP_CLICK = 'POPUP_CLICK';
-
-export const CRITERIA = 'CRITERIA';
-export const SELECT_CRITERION = 'SELECT_CRITERION';
-export const UNSELECT_CRITERION = 'UNSELECT_CRITERION';
-export const EDITORS = 'EDITORS';
-export const EXCLUDE_EDITOR = 'EXCLUDE_EDITOR';
-export const INCLUDE_EDITOR = 'INCLUDE_EDITOR';
diff --git a/src/app/content/App/Notice/Details/index.tsx b/src/app/content/App/Notice/Details/index.tsx
index 78a9d6998..d3dea32a9 100644
--- a/src/app/content/App/Notice/Details/index.tsx
+++ b/src/app/content/App/Notice/Details/index.tsx
@@ -3,7 +3,6 @@ import Notification from '../../../../../components/organisms/Notification';
 import NoticeDetails from '../../../../../components/organisms/NoticeDetails/NoticeDetails';
 import withConnect from './withConnect';
 import { DetailsProps } from './types';
-import { findType } from 'app/lmem/noticeType';
 
 export const Details = ({
   notice,
@@ -17,19 +16,11 @@ export const Details = ({
   notice ? (
     <Notification title="Détail de la bulle" hasNotices close={close}>
       <NoticeDetails
-        id={notice.id}
-        type={findType(notice.criteria)}
-        date="03 déc. 2018"
-        message={notice.description}
-        contributor={notice.contributor.name}
-        source={notice.resource.url}
+        notice={notice}
         like={like}
         unlike={unlike}
         dislike={dislike}
         undislike={undislike}
-        liked={notice.liked}
-        disliked={notice.disliked}
-        dismissed={notice.dismissed}
         view={view}
       />
     </Notification>
diff --git a/src/app/content/App/Notice/Details/types.ts b/src/app/content/App/Notice/Details/types.ts
index ed29f32d1..b97626e07 100644
--- a/src/app/content/App/Notice/Details/types.ts
+++ b/src/app/content/App/Notice/Details/types.ts
@@ -1,9 +1,6 @@
 import { RouteComponentProps } from 'react-router';
 import { EnhancedNotice } from 'app/lmem/notice';
-import {
-  FeedbackOnNoticeAction,
-  ReadNoticeAction
-} from 'app/actions/recommendations';
+import { FeedbackOnNoticeAction, ReadNoticeAction } from 'app/actions/notices';
 
 interface OwnProps {
   notice?: EnhancedNotice;
@@ -11,8 +8,8 @@ interface OwnProps {
   unlike: (id: number) => FeedbackOnNoticeAction;
   dislike: (id: number) => FeedbackOnNoticeAction;
   undislike: (id: number) => FeedbackOnNoticeAction;
-  close?: () => void;
   view: (id: number) => ReadNoticeAction;
+  close?: () => void;
 }
 
 export type DetailsProps = OwnProps & RouteComponentProps;
diff --git a/src/app/content/App/Notice/Details/withConnect.ts b/src/app/content/App/Notice/Details/withConnect.ts
index ab84b0b50..0f291d228 100644
--- a/src/app/content/App/Notice/Details/withConnect.ts
+++ b/src/app/content/App/Notice/Details/withConnect.ts
@@ -6,7 +6,7 @@ import {
   dislikeNotice,
   undislikeNotice,
   readNotice
-} from 'app/actions/recommendations';
+} from 'app/actions/notices';
 import { close } from 'app/actions/ui';
 import { State } from '../../../store';
 import { DetailsProps } from './types';
diff --git a/src/app/content/App/Notice/List/List.stories.tsx b/src/app/content/App/Notice/List/List.stories.tsx
index 0324dd863..73d14081b 100644
--- a/src/app/content/App/Notice/List/List.stories.tsx
+++ b/src/app/content/App/Notice/List/List.stories.tsx
@@ -5,100 +5,56 @@ import { action } from '@storybook/addon-actions';
 import { withKnobs, object } from '@storybook/addon-knobs/react';
 import { List } from '.';
 import { EnhancedNotice } from '../../../../lmem/notice';
+import { subMonths, subWeeks } from 'date-fns';
 
 const notice: EnhancedNotice = {
   id: 123,
-  title: 'title is going to be removed',
-  description: '<p>Description with a <a href="http://some.url">link</a></p>',
-  contributor: { name: 'John Doe', image: 'image', organization: 'org' },
-  criteria: [{ label: 'label', slug: 'slug' }],
-  resource: {
-    author: 'Jack Daniels',
-    editor: { id: 42, label: 'LMEM', url: 'url' },
-    label: 'label',
-    url: 'url'
+  intention: 'disapproval',
+  created: subMonths(new Date(), 1),
+  modified: subWeeks(new Date(), 1),
+  message: '<p>Description with a <a href="http://some.url">link</a></p>',
+  contributor: { id: 1, name: 'John Doe', image: 'image' },
+  source: {
+    label: 'LMEM',
+    url: 'http://www.lmem.net'
   },
-  alternatives: [
-    {
-      label: 'some alternative',
-      url_to_redirect: 'url'
-    }
-  ],
-  dismissed: false,
-  disliked: false,
-  liked: false,
-  dislikes: 0,
-  likes: 0,
-  valid: true,
-  visibility: 'public' as 'public'
+  visibility: 'public',
+  ratings: { dislikes: 0, likes: 0 },
+  status: {
+    dismissed: false,
+    disliked: false,
+    liked: false,
+    read: false
+  }
 };
 
 storiesOf('screens/Notice/List', module)
   .addDecorator(withKnobs)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add('1 notice', () => {
-    const notices = object('Notices', [notice]);
-
-    return (
-      <List
-        close={action('close')}
-        dismiss={action('dismiss')}
-        undismiss={action('undismiss')}
-        notices={notices}
-      />
-    );
-  })
-  .add('2 notices', () => {
-    const notices = object('Notices', [notice, notice]);
-
-    return (
-      <List
-        close={action('close')}
-        dismiss={action('dismiss')}
-        undismiss={action('undismiss')}
-        notices={notices}
-      />
-    );
-  })
-  .add('1 read', () => {
-    const notices = object('Notices', [notice, { ...notice, read: true }]);
-
-    return (
-      <List
-        close={action('close')}
-        dismiss={action('dismiss')}
-        undismiss={action('undismiss')}
-        notices={notices}
-      />
-    );
-  })
-  .add('empty', () => {
-    const notices = object('Notices', []);
-
-    return (
-      <List
-        close={action('close')}
-        dismiss={action('dismiss')}
-        undismiss={action('undismiss')}
-        notices={notices}
-      />
-    );
-  })
-  .add('2 lines excerpt', () => {
-    const notices = object('Notices', [
-      {
-        ...notice,
-        description:
-          'dazd zazaddd dddddd ddddd dddd dddddd ddd ddddd dddddddd dd'
-      }
-    ]);
-
-    return (
-      <List
-        close={action('close')}
-        dismiss={action('dismiss')}
-        undismiss={action('undismiss')}
-        notices={notices}
-      />
-    );
-  });
+  .add('2 notices', () => (
+    <List
+      close={action('close')}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
+      notices={[notice, notice]}
+    />
+  ))
+  .add('1 read', () => (
+    <List
+      close={action('close')}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
+      notices={[
+        notice,
+        { ...notice, status: { ...notice.status, read: true } }
+      ]}
+    />
+  ))
+  .add('empty', () => (
+    <List
+      close={action('close')}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
+      notices={[]}
+    />
+  ));
diff --git a/src/app/content/App/Notice/List/index.tsx b/src/app/content/App/Notice/List/index.tsx
index c84acf543..c133b8152 100644
--- a/src/app/content/App/Notice/List/index.tsx
+++ b/src/app/content/App/Notice/List/index.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import Notification from 'components/organisms/Notification';
 import NoticeItem from 'components/organisms/Notice/Notice';
 import AddNotice from 'components/molecules/AddNotice';
-import { findType } from 'app/lmem/noticeType';
 import NoNotice from './NoNotice';
 import withConnect from './withConnect';
 import { EnhancedNotice } from '../../../../lmem/notice';
@@ -15,33 +14,14 @@ export interface Props {
 }
 export const List = ({ notices, dismiss, undismiss, close }: Props) => (
   <Notification title="Bulles pour cette page" hasNotices close={close}>
-    {notices
-      .slice(0, 2)
-      .map(
-        ({
-          id,
-          description,
-          contributor: { name },
-          resource: { url },
-          criteria,
-          dismissed,
-          disliked,
-          read
-        }) => (
-          <NoticeItem
-            key={id}
-            id={id}
-            type={findType(criteria)}
-            message={description}
-            contributor={name}
-            dismiss={dismiss}
-            undismiss={undismiss}
-            dismissed={dismissed}
-            disliked={disliked}
-            read={read}
-          />
-        )
-      )}
+    {notices.slice(0, 2).map((notice: EnhancedNotice) => (
+      <NoticeItem
+        key={notice.id}
+        notice={notice}
+        dismiss={dismiss}
+        undismiss={undismiss}
+      />
+    ))}
     {notices.length === 0 && <NoNotice />}
     {notices.length > 0 && (
       <AddNotice
diff --git a/src/app/content/App/Notice/List/withConnect.ts b/src/app/content/App/Notice/List/withConnect.ts
index b78762967..5c4f85b5e 100644
--- a/src/app/content/App/Notice/List/withConnect.ts
+++ b/src/app/content/App/Notice/List/withConnect.ts
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { dismissNotice, undismissNotice } from 'app/actions/recommendations';
+import { dismissNotice, undismissNotice } from 'app/actions/notices';
 import { close } from 'app/actions/ui';
 import { getFilteredNotices } from '../../../selectors';
 import { State } from '../../../store';
diff --git a/src/app/content/reducers/index.ts b/src/app/content/reducers/index.ts
index e490a413b..2d2237c26 100644
--- a/src/app/content/reducers/index.ts
+++ b/src/app/content/reducers/index.ts
@@ -4,14 +4,14 @@ import { MemoryHistory } from 'history';
 
 import installationDetails from './installationDetails';
 import open from './open';
-import recommendations from './recommendations';
+import notices from './notices';
 import tabId from './tabId';
 
 export default (history: MemoryHistory) =>
   combineReducers({
     installationDetails,
     open,
-    recommendations,
+    notices,
     tabId,
     router: connectRouter(history)
   });
diff --git a/src/app/content/reducers/recommendations.ts b/src/app/content/reducers/notices.ts
similarity index 100%
rename from src/app/content/reducers/recommendations.ts
rename to src/app/content/reducers/notices.ts
diff --git a/src/app/content/selectors/index.ts b/src/app/content/selectors/index.ts
index 3d45fd649..e6bd6bf07 100644
--- a/src/app/content/selectors/index.ts
+++ b/src/app/content/selectors/index.ts
@@ -5,7 +5,7 @@ import { getNotice, isUnread, shouldNoticeBeShown } from 'app/lmem/notice';
 import { InstallationDetails } from 'app/lmem/installation';
 import { State } from '../store';
 
-export const getNotices = (state: State) => state.recommendations;
+export const getNotices = (state: State) => state.notices;
 
 export const getUnreadNotices = (state: State) =>
   getNotices(state).filter(isUnread);
diff --git a/src/app/content/store.ts b/src/app/content/store.ts
index 44845dc8f..77d5d8e6d 100644
--- a/src/app/content/store.ts
+++ b/src/app/content/store.ts
@@ -6,7 +6,7 @@ import middlewares, { sagaMiddleware } from './middlewares';
 import rootSaga from './sagas';
 import { InstallationDetailsState } from './reducers/installationDetails';
 import { OpenState } from './reducers/open';
-import { NoticesState } from './reducers/recommendations';
+import { NoticesState } from './reducers/notices';
 import { PersistedState } from 'redux-persist/es/types';
 import { TabIdState } from './reducers/tabId';
 export const history = createMemoryHistory();
@@ -14,7 +14,7 @@ export const history = createMemoryHistory();
 export interface State extends PersistedState {
   installationDetails: InstallationDetailsState;
   open: OpenState;
-  recommendations: NoticesState;
+  notices: NoticesState;
   tabId: TabIdState;
   router: RouterState;
 }
@@ -24,9 +24,8 @@ const enhancer =
     ? applyMiddleware(
         routerMiddleware(history),
         ...middlewares.concat([
-          require('redux-immutable-state-invariant').default(), // eslint-disable-line
+          require('redux-immutable-state-invariant').default(),
           require('redux-logger').createLogger({
-            // eslint-disable-line
             level: 'info',
             collapsed: true
           })
diff --git a/src/app/lmem/contributor.ts b/src/app/lmem/contributor.ts
new file mode 100644
index 000000000..2bc96d0ee
--- /dev/null
+++ b/src/app/lmem/contributor.ts
@@ -0,0 +1,5 @@
+export interface Contributor {
+  id: number;
+  name: string;
+  image?: string;
+}
diff --git a/src/app/lmem/draft-preview/grabDraftNotices.js b/src/app/lmem/draft-preview/grabDraftNotices.js
new file mode 100644
index 000000000..e527497b3
--- /dev/null
+++ b/src/app/lmem/draft-preview/grabDraftNotices.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+'use strict';
+
+/*
+  This is a relative URL as the request is intended to be same-origin.
+*/
+const PRIVATE_RECOS_ENDPOINT = '/api/v3/admin/matchingcontexts/private'; //TODO V3 matching-contexts/private ?
+
+chrome.runtime.onConnect.addListener(function listener(portToBackground) {
+  fetch(PRIVATE_RECOS_ENDPOINT, {
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    credentials: 'include'
+  })
+    .then(resp => {
+      if (resp.status >= 400) throw new Error('HTTP status ' + resp.status);
+
+      return resp.json();
+    })
+    .then(privateRecos => portToBackground.postMessage(privateRecos))
+    .catch(err => console.error('Private reco error', err));
+});
diff --git a/src/app/lmem/draft-preview/grabDraftRecommendations.js b/src/app/lmem/draft-preview/grabDraftRecommendations.js
deleted file mode 100644
index 6275054a6..000000000
--- a/src/app/lmem/draft-preview/grabDraftRecommendations.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* eslint-disable */
-'use strict';
-
-/*
-  This is a relative URL as the request is intended to be same-origin.
-*/
-const PRIVATE_RECOS_ENDPOINT = '/api/v2/admin/matchingcontexts/private';
-
-
-chrome.runtime.onConnect.addListener(function listener(portToBackground) {
-
-  fetch(PRIVATE_RECOS_ENDPOINT, {
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    credentials: 'include'
-  })
-  .then(resp => {
-    if(resp.status >= 400)
-      throw new Error('HTTP status '+resp.status)
-
-    return resp.json();
-  })
-  .then(privateRecos => portToBackground.postMessage(privateRecos))
-  .catch(err => console.error('Private reco error', err));
-
-});
-
-
-
diff --git a/src/app/lmem/draft-preview/main.ts b/src/app/lmem/draft-preview/main.ts
index e1534cb83..3cf4bd3bf 100644
--- a/src/app/lmem/draft-preview/main.ts
+++ b/src/app/lmem/draft-preview/main.ts
@@ -3,25 +3,25 @@ import { LMEM_BACKEND_ORIGIN } from '../../constants/origins';
 import TabChangeInfo = chrome.tabs.TabChangeInfo;
 import Tab = chrome.tabs.Tab;
 
-function isRecommendationBackendURL(url: string) {
+function isNoticeBackendURL(url: string) {
   const { origin, pathname, search } = new URL(url);
 
   return (
     origin === LMEM_BACKEND_ORIGIN &&
     pathname.includes('/admin') &&
     search.includes('action=list') &&
-    search.includes('entity=Recommendation')
+    search.includes('entity=Notice')
   );
 }
 
 export default function(
   tabs: any,
   contentCode: string,
-  updateDraftRecommendations: (msg: any) => void
+  updateDraftNotices: (msg: any) => void
 ) {
   // The onCreated and onUpdated events lead to too many calls by default
   // Let's debounce 2secs
-  const grabDraftRecommendations = debounce(
+  const grabDraftNotices = debounce(
     function(tabId: number) {
       tabs.executeScript(
         tabId,
@@ -36,7 +36,7 @@ export default function(
           tabPort.onMessage.addListener((msg: any) => {
             console.log('message from draft grabing content script', msg);
 
-            updateDraftRecommendations(msg);
+            updateDraftNotices(msg);
           });
         }
       );
@@ -46,16 +46,16 @@ export default function(
   );
 
   tabs.onCreated.addListener(({ id, url }: Tab) => {
-    if (url && id && isRecommendationBackendURL(url)) {
-      grabDraftRecommendations(id);
+    if (url && id && isNoticeBackendURL(url)) {
+      grabDraftNotices(id);
     }
   });
 
   tabs.onUpdated.addListener(
     (id: number, { status, url: newUrl }: TabChangeInfo, { url }: Tab) => {
       const u = newUrl || url;
-      if (status === 'loading' && u && isRecommendationBackendURL(u)) {
-        grabDraftRecommendations(id);
+      if (status === 'loading' && u && isNoticeBackendURL(u)) {
+        grabDraftNotices(id);
       }
     }
   );
diff --git a/src/app/lmem/draft.ts b/src/app/lmem/draft.ts
new file mode 100644
index 000000000..d2c439f58
--- /dev/null
+++ b/src/app/lmem/draft.ts
@@ -0,0 +1,3 @@
+import { MatchingContext } from './matchingContext';
+
+export interface Draft extends MatchingContext {}
diff --git a/src/app/lmem/editors.ts b/src/app/lmem/editors.ts
deleted file mode 100644
index 490b0fcbb..000000000
--- a/src/app/lmem/editors.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export interface Editor {
-  id: number;
-  isExcluded?: boolean;
-  label: string;
-  url: string;
-}
-
-export const excludeEditor = (editor: Editor): Editor => ({
-  ...editor,
-  isExcluded: true
-});
-export const includeEditor = (editor: Editor): Editor => ({
-  ...editor,
-  isExcluded: false
-});
diff --git a/src/app/lmem/fetchMatchingNotices.ts b/src/app/lmem/fetchMatchingNotices.ts
deleted file mode 100644
index 5d1bb2123..000000000
--- a/src/app/lmem/fetchMatchingNotices.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Notice } from './notice';
-
-const fetchNotice = (url: string): Promise<Notice> =>
-  fetch(url).then((response: Response) => response.json());
-
-export const fetchMatchingNotices = (urls: string[]) =>
-  Promise.all(urls.map(fetchNotice));
diff --git a/src/app/lmem/intention.ts b/src/app/lmem/intention.ts
new file mode 100644
index 000000000..c1c285a36
--- /dev/null
+++ b/src/app/lmem/intention.ts
@@ -0,0 +1,23 @@
+export type Intention =
+  | 'approval'
+  | 'disapproval'
+  | 'tip'
+  | 'alternative'
+  | 'other';
+
+export const intentions: Intention[] = [
+  'approval',
+  'disapproval',
+  'tip',
+  'alternative',
+  'other'
+];
+
+type Referential<T> = { [key in Intention]: T };
+
+export const getTypeOrFallback = <T extends any>(
+  referential: Referential<T>
+) => (intention?: Intention): T =>
+  intention && intention in referential
+    ? referential[intention]
+    : referential.other;
diff --git a/src/app/lmem/matchingContext.ts b/src/app/lmem/matchingContext.ts
index d3d2f781b..990160bfa 100644
--- a/src/app/lmem/matchingContext.ts
+++ b/src/app/lmem/matchingContext.ts
@@ -1,17 +1,25 @@
+import { Draft } from './draft';
+
 export interface MatchingContext {
-  recommendation_url: string;
-  url_regex: string;
-  exclude_url_regex?: string;
+  noticeId: number;
+  noticeUrl: string;
+  urlRegex: string;
+  excludeUrlRegex?: string;
+  querySelector?: string;
+}
+
+export interface RestrictedContext {
+  urlRegex: string;
 }
 
 export const urlMatchesContext = (
   url: string,
-  { url_regex, exclude_url_regex }: MatchingContext
+  { urlRegex, excludeUrlRegex }: MatchingContext | Draft
 ): boolean => {
   try {
     return (
-      new RegExp(url_regex, 'i').test(url) &&
-      !(exclude_url_regex && new RegExp(exclude_url_regex, 'i').test(url))
+      new RegExp(urlRegex, 'i').test(url) &&
+      !(excludeUrlRegex && new RegExp(excludeUrlRegex, 'i').test(url))
     );
   } catch (err) {
     if (process.env.NODE_ENV !== 'test') {
@@ -23,20 +31,20 @@ export const urlMatchesContext = (
 
 export const findMatchingMatchingContexts = (
   url: string,
-  allMatchingContexts: MatchingContext[]
+  allMatchingContexts: MatchingContext[] | Draft[]
 ): MatchingContext[] =>
-  allMatchingContexts.filter((context: MatchingContext) =>
+  allMatchingContexts.filter((context: MatchingContext | Draft) =>
     urlMatchesContext(url, context)
   );
 
 export function findMatchingOffersAccordingToPreferences(
   url: string,
   matchingContexts: MatchingContext[],
-  draftMatchingContexts: MatchingContext[]
+  drafts: Draft[]
 ) {
   const matchingDraftMatchingContexts = findMatchingMatchingContexts(
     url,
-    draftMatchingContexts
+    drafts
   );
 
   // prioritize previews over public offers
diff --git a/src/app/lmem/notice.ts b/src/app/lmem/notice.ts
index 004cbe65f..be636245e 100644
--- a/src/app/lmem/notice.ts
+++ b/src/app/lmem/notice.ts
@@ -1,86 +1,91 @@
 import { find } from 'ramda';
-import { Criterion } from './criterion';
-import { Editor } from './editors';
-
-export interface Alternative {
-  label: string;
-  url_to_redirect: string;
-}
-
-export interface Contributor {
-  image: string;
-  name: string;
-  organization: string;
-}
-
-export interface Resource {
-  author?: string;
-  editor: Editor;
-  label: string;
-  url: string;
-}
+import { Source } from './source';
+import { intentions, Intention } from './intention';
+import { Ratings } from './rating';
+import { Contributor } from './contributor';
 
 export interface Notice {
   id: number;
-  title: string;
-  description: string;
+  created: Date;
+  modified: Date;
+  intention: Intention;
   contributor: Contributor;
-  resource: Resource;
-  alternatives: Alternative[];
-  criteria: Criterion[];
-  filters?: Criterion[];
-  likes: number;
-  dislikes: number;
-  valid: boolean;
-  visibility: 'public';
+  message: string;
+  source?: Source;
+  ratings: Ratings;
+  visibility: 'public' | 'private';
 }
 
 export interface EnhancedNotice extends Notice {
-  liked: boolean;
-  justLiked?: boolean;
-  disliked: boolean;
-  justDisliked?: boolean;
-  dismissed: boolean;
-  justDismissed?: boolean;
-  read?: boolean;
+  status: {
+    read: boolean;
+    liked: boolean;
+    justLiked?: boolean;
+    disliked: boolean;
+    justDisliked?: boolean;
+    dismissed: boolean;
+    justDismissed?: boolean;
+  };
 }
 
 /* eslint-disable no-nested-ternary */
 export type IgnoringReason = 'dislike' | 'dismiss' | 'other';
 export const isIgnored = (notice: EnhancedNotice): boolean =>
-  notice.dismissed || notice.disliked;
+  notice.status.dismissed || notice.status.disliked;
 export const ignoringReason = (notice: EnhancedNotice): IgnoringReason =>
-  notice.dismissed ? 'dismiss' : notice.disliked ? 'dislike' : 'other';
+  notice.status.dismissed
+    ? 'dismiss'
+    : notice.status.disliked
+    ? 'dislike'
+    : 'other';
 
 export const dismissNotice = (notice: EnhancedNotice): EnhancedNotice => ({
   ...notice,
-  dismissed: true,
-  justDismissed: true
+  status: {
+    ...notice.status,
+    dismissed: true,
+    justDismissed: true
+  }
 });
 export const undismissNotice = (notice: EnhancedNotice): EnhancedNotice => ({
   ...notice,
-  dismissed: false,
-  justDismissed: false
+  status: {
+    ...notice.status,
+    dismissed: false,
+    justDismissed: false
+  }
 });
 export const likeNotice = (notice: EnhancedNotice): EnhancedNotice => ({
   ...notice,
-  liked: true,
-  justLiked: true
+  status: {
+    ...notice.status,
+    liked: true,
+    justLiked: true
+  }
 });
 export const unlikeNotice = (notice: EnhancedNotice): EnhancedNotice => ({
   ...notice,
-  liked: false,
-  justLiked: false
+  status: {
+    ...notice.status,
+    liked: false,
+    justLiked: false
+  }
 });
 export const dislikeNotice = (notice: EnhancedNotice): EnhancedNotice => ({
   ...notice,
-  disliked: true,
-  justDisliked: true
+  status: {
+    ...notice.status,
+    disliked: true,
+    justDisliked: true
+  }
 });
 export const undislikeNotice = (notice: EnhancedNotice): EnhancedNotice => ({
   ...notice,
-  disliked: false,
-  justDisliked: false
+  status: {
+    ...notice.status,
+    disliked: false,
+    justDisliked: false
+  }
 });
 
 export const getNotice = <N extends Notice>(
@@ -93,42 +98,14 @@ export const isNoticeValid = (notice: {
 }): notice is Notice => {
   if (Object(notice) !== notice) return false;
 
-  const {
-    contributor,
-    title,
-    description,
-    resource,
-    criteria,
-    alternatives
-  } = notice;
+  const { contributor, message, intention } = notice;
 
   return (
-    typeof title === 'string' &&
-    typeof description === 'string' &&
-    Object(resource) === resource &&
-    typeof resource.label === 'string' &&
-    (!resource.author || typeof resource.author === 'string') &&
-    Object(resource.editor) === resource.editor &&
-    typeof resource.editor.label === 'string' &&
-    typeof resource.editor.url === 'string' &&
+    typeof message === 'string' &&
     Object(contributor) === contributor &&
     typeof contributor.name === 'string' &&
-    (!criteria ||
-      (Array.isArray(criteria) &&
-        criteria.every(
-          criterion =>
-            Object(criterion) === criterion &&
-            typeof criterion.label === 'string' &&
-            typeof criterion.slug === 'string'
-        ))) &&
-    (!alternatives ||
-      (Array.isArray(alternatives) &&
-        alternatives.every(
-          alternative =>
-            Object(alternative) === alternative &&
-            typeof alternative.label === 'string' &&
-            typeof alternative.url_to_redirect === 'string'
-        )))
+    typeof intention === 'string' &&
+    intentions.includes(intention as Intention)
   );
 };
 
@@ -143,11 +120,11 @@ export const warnIfNoticeInvalid = (notice: Notice): boolean => {
 };
 
 export const shouldNoticeBeShown = (notice: EnhancedNotice): boolean =>
-  (notice.valid &&
-    (!notice.dismissed || notice.justDismissed) &&
-    (!notice.disliked || notice.justDisliked)) ||
+  (isNoticeValid(notice) &&
+    (!notice.status.dismissed || notice.status.justDismissed) &&
+    (!notice.status.disliked || notice.status.justDisliked)) ||
   false;
 
-export const isRead = (notice: EnhancedNotice) => notice.read === true;
+export const isRead = (notice: EnhancedNotice) => notice.status.read;
 
 export const isUnread = (notice: EnhancedNotice) => !isRead(notice);
diff --git a/src/app/lmem/noticeType.ts b/src/app/lmem/noticeType.ts
deleted file mode 100644
index 2c98a9371..000000000
--- a/src/app/lmem/noticeType.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Criterion } from './criterion';
-
-export type NoticeType =
-  | 'Approval'
-  | 'Disapproval'
-  | 'Tip'
-  | 'Alternative'
-  | 'Other';
-
-export function findType(criteria: Criterion[]): NoticeType {
-  return criteria.reduce((acc: NoticeType, { slug }: Criterion): NoticeType => {
-    switch (slug) {
-      case 'go':
-        return 'Approval';
-      case 'no-go':
-        return 'Disapproval';
-      case 'alert':
-        return 'Tip';
-      default:
-        return acc;
-    }
-  }, 'Other');
-}
-
-type Referential<T> = { [key in NoticeType]: T };
-
-export const getTypeOrFallback = <T extends any>(
-  referential: Referential<T>
-) => (type?: NoticeType): T =>
-  type && type in referential ? referential[type] : referential.Other;
diff --git a/src/app/lmem/rating.ts b/src/app/lmem/rating.ts
new file mode 100644
index 000000000..d2606ce5e
--- /dev/null
+++ b/src/app/lmem/rating.ts
@@ -0,0 +1,17 @@
+export type RatingType =
+  | 'like'
+  | 'unlike'
+  | 'dislike'
+  | 'undislike'
+  | 'dismiss'
+  | 'undismiss'
+  | 'display'
+  | 'unfold'
+  | 'click-message'
+  | 'click-source'
+  | 'report';
+
+export interface Ratings {
+  likes?: number;
+  dislikes?: number;
+}
diff --git a/src/app/lmem/source.ts b/src/app/lmem/source.ts
new file mode 100644
index 000000000..a1bba2e15
--- /dev/null
+++ b/src/app/lmem/source.ts
@@ -0,0 +1,4 @@
+export interface Source {
+  label: string;
+  url: string;
+}
diff --git a/src/app/theme.ts b/src/app/theme.ts
index 7e9571eb2..652f78ce4 100644
--- a/src/app/theme.ts
+++ b/src/app/theme.ts
@@ -34,20 +34,20 @@ export interface Theme {
   other: string;
 
   // notice type colors
-  noticeTypes: {
-    Disapproval: {
+  intentions: {
+    disapproval: {
       background: string;
     };
-    Alternative: {
+    alternative: {
       background: string;
     };
-    Approval: {
+    approval: {
       background: string;
     };
-    Tip: {
+    tip: {
       background: string;
     };
-    Other: {
+    other: {
       background: string;
     };
   };
@@ -71,7 +71,7 @@ export interface Theme {
   };
 }
 
-export const theme = {
+export const theme: Theme = {
   main: 'purple',
   // colors
   primaryColor: '#404348',
@@ -111,20 +111,20 @@ export const theme = {
   other: '#EB950C',
 
   // notice type colors
-  noticeTypes: {
-    Disapproval: {
+  intentions: {
+    disapproval: {
       background: '#F70B7B'
     },
-    Alternative: {
+    alternative: {
       background: '#49B6D6'
     },
-    Approval: {
+    approval: {
       background: '#34C16C'
     },
-    Tip: {
+    tip: {
       background: '#E3C51F'
     },
-    Other: {
+    other: {
       background: '#EB950C'
     }
   },
diff --git a/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.tsx b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.tsx
index 7519ffb91..45fade8db 100644
--- a/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.tsx
+++ b/src/components/atoms/Buttons/AddNoticeLink/AddNoticeLink.tsx
@@ -30,6 +30,6 @@ const Button = styled(BorderButton)`
 export default ({ ...props }) => (
   <Button {...props}>
     <AddIcon />
-    Créer votre recommandation
+    Créer votre bulle
   </Button>
 );
diff --git a/src/components/atoms/icons/types/index.ts b/src/components/atoms/icons/types/index.ts
index b88cf9db6..15b755d66 100644
--- a/src/components/atoms/icons/types/index.ts
+++ b/src/components/atoms/icons/types/index.ts
@@ -1,5 +1,5 @@
 import { ComponentType } from 'react';
-import { NoticeType } from 'app/lmem/noticeType';
+import { Intention } from 'app/lmem/intention';
 // import Like from "./Like";
 import Approval from './Like';
 // import Dislike from "./Dislike";
@@ -11,12 +11,12 @@ import Other from './Other';
 interface Props {
   active?: boolean;
 }
-const TypesIcons: { [key in NoticeType]: ComponentType<Props> } = {
-  Approval,
-  Disapproval,
-  Tip,
-  Alternative,
-  Other
+const TypesIcons: { [key in Intention]: ComponentType<Props> } = {
+  approval: Approval,
+  disapproval: Disapproval,
+  tip: Tip,
+  alternative: Alternative,
+  other: Other
 };
 
 export default TypesIcons;
diff --git a/src/components/molecules/Type/IntentionIcon.tsx b/src/components/molecules/Type/IntentionIcon.tsx
new file mode 100644
index 000000000..e1f9c99c3
--- /dev/null
+++ b/src/components/molecules/Type/IntentionIcon.tsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { withTheme } from 'styled-components';
+import Background from './Background';
+import intentionIcons from '../../atoms/icons/types';
+import { Theme } from 'app/theme';
+import { getTypeOrFallback, Intention } from 'app/lmem/intention';
+
+interface Style {
+  background: string;
+}
+interface Props {
+  intention?: Intention;
+  theme: Theme;
+}
+const IntentionIcon = ({ intention, theme }: Props) => {
+  const Icon = getTypeOrFallback(intentionIcons)(intention);
+  const style = getTypeOrFallback<Style>(theme.intentions)(intention);
+
+  return (
+    <Background color={style && style.background}>
+      {Icon && <Icon />}
+    </Background>
+  );
+};
+
+export default withTheme(IntentionIcon);
diff --git a/src/components/molecules/Type/Type.stories.tsx b/src/components/molecules/Type/Type.stories.tsx
index 11696b687..e9480df1c 100644
--- a/src/components/molecules/Type/Type.stories.tsx
+++ b/src/components/molecules/Type/Type.stories.tsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
-import Type from './Type';
+import Intention from './IntentionIcon';
 
 storiesOf('molecules/Type', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add('approval', () => <Type type="Approval" />)
-  .add('disapproval', () => <Type type="Disapproval" />)
-  .add('alternative', () => <Type type="Alternative" />)
-  .add('tip', () => <Type type="Tip" />)
-  .add('other', () => <Type type="Other" />)
-  .add('undefined / unknown ', () => <Type />);
+  .add('approval', () => <Intention intention="approval" />)
+  .add('disapproval', () => <Intention intention="disapproval" />)
+  .add('alternative', () => <Intention intention="alternative" />)
+  .add('tip', () => <Intention intention="tip" />)
+  .add('other', () => <Intention intention="other" />)
+  .add('undefined / unknown ', () => <Intention />);
diff --git a/src/components/molecules/Type/Type.tsx b/src/components/molecules/Type/Type.tsx
deleted file mode 100644
index 0ff3c42b7..000000000
--- a/src/components/molecules/Type/Type.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-import { withTheme } from 'styled-components';
-import Background from './Background';
-import noticeTypeIcons from '../../atoms/icons/types';
-import { Theme } from 'app/theme';
-import { getTypeOrFallback, NoticeType } from 'app/lmem/noticeType';
-
-interface Style {
-  background: string;
-}
-interface Props {
-  type?: NoticeType;
-  theme: Theme;
-}
-const NoticeTypeIcon = ({ type, theme }: Props) => {
-  const NoticeTypeIcon = getTypeOrFallback(noticeTypeIcons)(type);
-  const style = getTypeOrFallback<Style>(theme.noticeTypes)(type);
-
-  return (
-    <Background color={style && style.background}>
-      {NoticeTypeIcon && <NoticeTypeIcon />}
-    </Background>
-  );
-};
-
-export default withTheme(NoticeTypeIcon);
diff --git a/src/components/organisms/Notice/Notice.stories.tsx b/src/components/organisms/Notice/Notice.stories.tsx
index 579a56d6a..ee83c9535 100644
--- a/src/components/organisms/Notice/Notice.stories.tsx
+++ b/src/components/organisms/Notice/Notice.stories.tsx
@@ -3,99 +3,84 @@ import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import Notice from './Notice';
+import { EnhancedNotice } from '../../../app/lmem/notice';
+import { subWeeks, subMonths } from 'date-fns';
 
-const message = '<p>Description with a <a href="http://some.url">link</a></p>';
+const baseNotice: EnhancedNotice = {
+  id: 123,
+  intention: 'approval',
+  created: subMonths(new Date(), 1),
+  modified: subWeeks(new Date(), 1),
+  message: '<p>Description with a <a href="http://some.url">link</a></p>',
+  ratings: { likes: 42, dislikes: 2 },
+  contributor: { id: 1, name: 'Jalil' },
+  visibility: 'public',
+  status: {
+    liked: false,
+    dismissed: false,
+    disliked: false,
+    read: false
+  }
+};
 
 storiesOf('organisms/Notice', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
   .add('Approved', () => (
     <Notice
-      type="Approval"
-      contributor="Jalil"
-      id={123}
-      message={message}
+      notice={baseNotice}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
     />
   ))
   .add('Disapproved', () => (
     <Notice
-      type="Disapproval"
-      contributor="Jalil"
-      id={123}
-      message={message}
+      notice={{ ...baseNotice, type: 'Disapproval' }}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
     />
   ))
   .add('Tip', () => (
     <Notice
-      type="Tip"
-      contributor="Jalil"
-      id={123}
-      message={message}
+      notice={{ ...baseNotice, type: 'Tip' }}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
     />
   ))
   .add('Other', () => (
     <Notice
-      type="Other"
-      contributor="Jalil"
-      id={123}
-      message={message}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-    />
-  ))
-  .add('No type', () => (
-    <Notice
-      contributor="Jalil"
-      id={123}
-      message={message}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-    />
-  ))
-  .add('Undefined type', () => (
-    <Notice
-      type={undefined}
-      contributor="Jalil"
-      id={123}
-      message={message}
+      notice={{ ...baseNotice, type: 'Other' }}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
     />
   ))
   .add('Dismissed', () => (
     <Notice
-      contributor="Jalil"
-      id={123}
-      message={message}
+      notice={{
+        ...baseNotice,
+        status: { ...baseNotice.status, dismissed: true }
+      }}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
-      dismissed
     />
   ))
-  .add('Long title', () => (
+  .add('Read', () => (
     <Notice
-      contributor="Jalil"
-      id={123}
-      message={
-        '<p>This is very long title for a notification with a <a href="http://some.url">link</a> that you may want to read some time in the future</p>'
-      }
+      notice={{
+        ...baseNotice,
+        status: { ...baseNotice.status, read: true }
+      }}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
     />
   ))
-  .add('Read', () => (
+  .add('Long title', () => (
     <Notice
-      type="Approval"
-      contributor="Lutangar"
-      id={123}
-      message={message}
+      notice={{
+        ...baseNotice,
+        message:
+          '<p>This is very long title for a notification with a <a href="http://some.url">link</a> that you may want to read some time in the future</p>'
+      }}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
-      read
     />
   ));
diff --git a/src/components/organisms/Notice/Notice.tsx b/src/components/organisms/Notice/Notice.tsx
index f2c9d2e63..c2b573164 100644
--- a/src/components/organisms/Notice/Notice.tsx
+++ b/src/components/organisms/Notice/Notice.tsx
@@ -1,24 +1,18 @@
 import React, { Fragment, PureComponent } from 'react';
-import { NoticeType } from 'app/lmem/noticeType';
 import { stripHtml } from 'app/utils/stripHtml';
 import { Contributor, OpenButton, Button } from '../../atoms';
-import Type from '../../molecules/Type/Type';
 import Container from './Container';
 import Content from './Content';
 import Deleted from './Deleted';
 import DeleteButton from './DeleteButton';
 import Title from './Title';
+import { EnhancedNotice } from '../../../app/lmem/notice';
+import IntentionIcon from '../../molecules/Type/IntentionIcon';
 
 interface Props {
-  id: number;
-  type: NoticeType;
-  message: string;
-  contributor: string;
+  notice: EnhancedNotice;
   dismiss: (id: number) => void;
   undismiss: (id: number) => void;
-  dismissed: boolean;
-  disliked: boolean;
-  read: boolean;
 }
 
 export default class Notice extends PureComponent<Props> {
@@ -30,22 +24,22 @@ export default class Notice extends PureComponent<Props> {
   };
 
   onDismiss = () => {
-    this.props.dismiss(this.props.id);
+    this.props.dismiss(this.props.notice.id);
   };
 
   onUndismiss = () => {
-    this.props.undismiss(this.props.id);
+    this.props.undismiss(this.props.notice.id);
   };
 
   render() {
     const {
-      id,
-      type,
-      message,
-      contributor,
-      dismissed,
-      disliked,
-      read
+      notice: {
+        id,
+        intention,
+        message,
+        contributor,
+        status: { dismissed, disliked, read }
+      }
     } = this.props;
     return (
       <Container>
@@ -61,10 +55,10 @@ export default class Notice extends PureComponent<Props> {
             </Fragment>
           ) : (
             <Fragment>
-              <Type type={type} />
+              <IntentionIcon intention={intention} />
               <div>
                 <Title>{stripHtml(message)}</Title>
-                <Contributor>Par : {contributor}</Contributor>
+                <Contributor>Par : {contributor.name}</Contributor>
               </div>
               <OpenButton />
             </Fragment>
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
index 017f00b4b..d941c576b 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
@@ -3,22 +3,34 @@ import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import NoticeDetails from './NoticeDetails';
+import { EnhancedNotice } from '../../../app/lmem/notice';
+import { subMonths, subWeeks } from 'date-fns';
 
-const message = `
-<p> Un message qui décrit <a href="http://www.lmem.net">quelque chose</a> et donc ça prend beaucoup de mots. </p>
+const baseNotice: EnhancedNotice = {
+  id: 123,
+  intention: 'approval',
+  created: subMonths(new Date(), 1),
+  modified: subWeeks(new Date(), 1),
+  message: `
+<p>Un message qui décrit <a href="http://www.lmem.net">quelque chose</a> et donc ça prend beaucoup de mots. </p>
 <p>Il peut aussi y avoir plusieurs paragraphes, <a href="http://www.lmem.net">avec encore des liens</a></p>
-`;
+`,
+  ratings: { likes: 42, dislikes: 2 },
+  contributor: { id: 1, name: 'Jalil' },
+  visibility: 'public',
+  source: { label: 'LMEM', url: 'http://www.lmem.net' },
+  status: {
+    liked: false,
+    dismissed: false,
+    disliked: false
+  }
+};
 
-storiesOf('organisms/NoticeDetails', module)
+const message = storiesOf('organisms/NoticeDetails', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
   .add('Approval', () => (
     <NoticeDetails
-      type="Approval"
-      contributor="Jalil"
-      id={123}
-      message={message}
-      date="12/12/2042"
-      source="http://www.lmem.net"
+      notice={baseNotice}
       like={action('like')}
       unlike={action('unlike')}
       dislike={action('dislike')}
@@ -28,13 +40,10 @@ storiesOf('organisms/NoticeDetails', module)
   ))
   .add('Dismissed', () => (
     <NoticeDetails
-      type="Approval"
-      dismissed
-      contributor="Jalil"
-      id={123}
-      message={message}
-      date="12/12/2042"
-      source="http://www.lmem.net"
+      notice={{
+        ...baseNotice,
+        status: { ...baseNotice.status, dismissed: true }
+      }}
       like={action('like')}
       unlike={action('unlike')}
       dislike={action('dislike')}
@@ -44,13 +53,10 @@ storiesOf('organisms/NoticeDetails', module)
   ))
   .add('Disliked', () => (
     <NoticeDetails
-      type="Approval"
-      disliked
-      contributor="Jalil"
-      id={123}
-      message={message}
-      date="12/12/2042"
-      source="http://www.lmem.net"
+      notice={{
+        ...baseNotice,
+        status: { ...baseNotice.status, disliked: true }
+      }}
       like={action('like')}
       unlike={action('unlike')}
       dislike={action('dislike')}
@@ -60,11 +66,10 @@ storiesOf('organisms/NoticeDetails', module)
   ))
   .add('No source', () => (
     <NoticeDetails
-      type="Approval"
-      contributor="Lutangar"
-      id={123}
-      message={message}
-      date="12/12/2042"
+      notice={{
+        ...baseNotice,
+        source: undefined
+      }}
       like={action('like')}
       unlike={action('unlike')}
       dislike={action('dislike')}
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
index eaa6e6bc7..d381b6991 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
@@ -3,7 +3,6 @@ import { RouteComponentProps, withRouter } from 'react-router';
 import { Contributor, Button, BorderButton } from '../../atoms';
 import Like from '../../atoms/icons/types/Like';
 import Dislike from '../../atoms/icons/types/Dislike';
-import Type from '../../molecules/Type/Type';
 import Source from './Source/Source';
 import Anchor from './Source/AnchorIcon';
 import SourceURL from './Source/SourceURL';
@@ -14,39 +13,39 @@ import DetailsDislike from './DetailsDislike';
 import Message from './Message';
 import Feedbacks from './Feedbacks';
 import Date from './Date';
-import { NoticeType } from '../../../app/lmem/noticeType';
+import { EnhancedNotice } from '../../../app/lmem/notice';
+import { format } from 'date-fns';
+import IntentionIcon from '../../molecules/Type/IntentionIcon';
 
 interface NoticeDetailsProps {
-  id: number;
-  type: NoticeType;
-  date: string;
-  message: string;
-  source?: string;
-  contributor: string;
+  notice: EnhancedNotice;
   like: (id: number) => void;
   unlike: (id: number) => void;
-  liked?: boolean;
   dislike: (id: number) => void;
   undislike: (id: number) => void;
-  disliked?: boolean;
-  dismissed?: boolean;
   view?: (id: number) => void;
 }
 class NoticeDetails extends PureComponent<
-  NoticeDetailsProps & RouteComponentProps,
-  {}
+  NoticeDetailsProps & RouteComponentProps
 > {
   handleLikeClick = () => {
-    const { liked, like, unlike, id } = this.props;
-    if (liked) {
-      unlike(id);
+    const { notice, like, unlike } = this.props;
+    if (notice.status.liked) {
+      unlike(notice.id);
     } else {
-      like(id);
+      like(notice.id);
     }
   };
 
   handleDislikeClick = () => {
-    const { disliked, dislike, undislike, id } = this.props;
+    const {
+      notice: {
+        id,
+        status: { disliked }
+      },
+      dislike,
+      undislike
+    } = this.props;
     if (disliked) {
       undislike(id);
     } else {
@@ -55,7 +54,10 @@ class NoticeDetails extends PureComponent<
   };
 
   componentDidMount(): void {
-    const { view, id } = this.props;
+    const {
+      view,
+      notice: { id }
+    } = this.props;
     if (view) {
       view(id);
     }
@@ -63,30 +65,32 @@ class NoticeDetails extends PureComponent<
 
   render() {
     const {
-      type,
-      date,
-      message,
-      contributor,
-      source,
-      liked,
-      disliked,
-      dismissed
+      notice: {
+        intention,
+        message,
+        created,
+        contributor,
+        source,
+        status: { liked, disliked, dismissed }
+      }
     } = this.props;
 
     return (
       <DetailsContainer>
         <DetailsContent>
           <DetailsMeta>
-            <Date>Le {date}</Date>
-            <Contributor>{contributor} :</Contributor>
-            <Type type={type} />
+            <Date>Le {format(created, 'DD/MM/YYYY')}</Date>
+            <Contributor>{contributor.name} :</Contributor>
+            <IntentionIcon intention={intention} />
           </DetailsMeta>
+
           <Message>{message}</Message>
           {source && (
             <Source>
-              <Anchor /> En savoir plus : <SourceURL>{source}</SourceURL>
+              <Anchor /> En savoir plus : <SourceURL>{source.url}</SourceURL>
             </Source>
           )}
+
           <Feedbacks>
             <Button onClick={this.handleLikeClick}>
               <Like active={liked} />
diff --git a/test/app/actions.ts b/test/app/actions.ts
index e8dfa6c42..eb6cf03ab 100644
--- a/test/app/actions.ts
+++ b/test/app/actions.ts
@@ -20,32 +20,32 @@ chai.use(sinonChai);
 
 const notice: EnhancedNotice = {
   id: 1,
-  title: 'This is a title',
-  description: 'This is a notice',
-  resource: {
-    author: 'Jalil',
-    label: 'Jalil\'s feed',
-    url: 'http://jalil',
-    editor: { id: 1, label: 'editor', url: 'http://editor' }
+  intention: 'approval',
+  message: 'This is a notice',
+  source: {
+    label: 'Jalil',
+    url: 'http://jalil'
   },
-  contributor: { organization: 'LMEM', name: 'Jalil', image: '' },
+  contributor: { id: 1, name: 'Jalil', image: '' },
   visibility: 'public',
-  valid: true,
-  alternatives: [],
-  criteria: [],
-  dislikes: 0,
-  filters: [],
-  likes: 0,
-  disliked: false,
-  dismissed: false,
-  liked: false
+  ratings: {
+    dislikes: 0,
+    likes: 0
+  },
+  status: {
+    liked: false,
+    disliked: false,
+    dismissed: false
+  },
+  created: new Date(),
+  modified: new Date()
 };
 
 describe('background actions', function() {
   it('receivedMatchingContexts', () => {
     const matchingContexts: MatchingContext[] = [
-      { recommendation_url: 'http://1', url_regex: '/1/' },
-      { recommendation_url: 'http://2', url_regex: '/2/' }
+      { noticeUrl: 'http://1', urlRegex: '/1/', noticeId: 42 },
+      { noticeUrl: 'http://2', urlRegex: '/2/', noticeId: 42 }
     ];
     const action = receivedMatchingContexts(matchingContexts);
 
@@ -80,12 +80,13 @@ describe('background actions', function() {
 
   it('noticeIgnored when notice dismissed', () => {
     const trigger = 'http://trigger';
-    const dismissedNotice = { ...notice, dismissed: true };
+    const dismissedNotice: EnhancedNotice = {
+      ...notice,
+      status: { dismissed: true, liked: false, disliked: false }
+    };
     const action = noticeIgnored(dismissedNotice, trigger);
 
-    expect(action.type)
-      .to.be.a('string')
-      .of.length.above(5);
+    expect(action.type).to.equal('NOTICE_IGNORED');
     expect(action.payload.url).to.equal(trigger);
     expect(action.payload.notice).to.equal(dismissedNotice);
     expect(action.payload.reason).to.equal('dismiss');
@@ -93,12 +94,13 @@ describe('background actions', function() {
 
   it('noticeIgnored when notice disliked', () => {
     const trigger = 'http://trigger';
-    const dislikedNotice = { ...notice, disliked: true };
+    const dislikedNotice = {
+      ...notice,
+      status: { dismissed: false, liked: false, disliked: true }
+    };
     const action = noticeIgnored(dislikedNotice, trigger);
 
-    expect(action.type)
-      .to.be.a('string')
-      .of.length.above(5);
+    expect(action.type).to.equal('NOTICE_IGNORED');
     expect(action.payload.url).to.equal(trigger);
     expect(action.payload.notice).to.equal(dislikedNotice);
     expect(action.payload.reason).to.equal('dislike');
diff --git a/test/app/content/actions.ts b/test/app/content/actions.ts
index bf6f42697..40aec75d4 100644
--- a/test/app/content/actions.ts
+++ b/test/app/content/actions.ts
@@ -4,7 +4,7 @@ import {
   noticesFound,
   dismissNotice,
   likeNotice
-} from '../../../src/app/actions/recommendations';
+} from '../../../src/app/actions/notices';
 import { init } from '../../../src/app/actions/tabs';
 import { EnhancedNotice } from '../../../src/app/lmem/notice';
 
@@ -12,25 +12,18 @@ const expect = chai.expect;
 
 const notice1: EnhancedNotice = {
   id: 1,
-  title: 'This is a title',
-  description: 'This is a notice',
-  resource: {
-    author: 'Jalil',
-    label: 'Jalil\'s feed',
-    url: 'http://jalil',
-    editor: { id: 1, label: 'editor', url: 'http://editor' }
+  intention: 'approval',
+  message: 'This is a notice',
+  source: {
+    label: 'Jalil',
+    url: 'http://jalil'
   },
-  contributor: { organization: 'LMEM', name: 'Jalil', image: '' },
+  contributor: { id: 1, name: 'Jalil', image: '' },
   visibility: 'public',
-  valid: true,
-  alternatives: [],
-  criteria: [],
-  dislikes: 0,
-  filters: [],
-  likes: 0,
-  disliked: false,
-  dismissed: false,
-  liked: false
+  ratings: { dislikes: 0, likes: 0 },
+  status: { disliked: false, dismissed: false, liked: false },
+  created: new Date(),
+  modified: new Date()
 };
 
 describe('content actions', function() {
@@ -50,7 +43,7 @@ describe('content actions', function() {
     expect(action.payload.notices).to.deep.equal([notice1]);
   });
 
-  it('dismiss reco', () => {
+  it('dismiss notice', () => {
     const id = 0;
     const action = dismissNotice(id);
 
diff --git a/test/app/lmem/findMatchingOffersAccordingToPreferences.ts b/test/app/lmem/findMatchingOffersAccordingToPreferences.ts
index a7d5d7c75..6f7623a25 100644
--- a/test/app/lmem/findMatchingOffersAccordingToPreferences.ts
+++ b/test/app/lmem/findMatchingOffersAccordingToPreferences.ts
@@ -7,11 +7,11 @@ import {
 const expect = chai.expect;
 
 const offers: MatchingContext[] = [
-  { url_regex: 'www.samsung.com', recommendation_url: 'http://b' },
-  { url_regex: 'arrested.com', recommendation_url: 'http://b' }
+  { urlRegex: 'www.samsung.com', noticeUrl: 'http://b', noticeId: 42 },
+  { urlRegex: 'arrested.com', noticeUrl: 'http://b', noticeId: 42 }
 ];
-const draftRecommendations = [
-  { url_regex: 'www.wordpress.com', recommendation_url: 'http://b' }
+const draftNotices = [
+  { urlRegex: 'www.wordpress.com', noticeUrl: 'http://b', noticeId: 42 }
 ];
 
 const matchingURL = 'https://www.samsung.com/blabla';
@@ -21,9 +21,9 @@ const nonMatchingURL = 'https://soundcloud.com/capt-lovelace/meteo-marine';
 describe('findMatchingOffersAccordingToPreferences', function() {
   it('should be case insensitive', () => {
     const offersWithWeirdCase: MatchingContext[] = [
-      { url_regex: 's.*', recommendation_url: 'http://s' },
-      { url_regex: 'SamSung', recommendation_url: 'http://S' },
-      { url_regex: 'doesNotMatch', recommendation_url: 'http://d' }
+      { urlRegex: 's.*', noticeUrl: 'http://s', noticeId: 42 },
+      { urlRegex: 'SamSung', noticeUrl: 'http://S', noticeId: 42 },
+      { urlRegex: 'doesNotMatch', noticeUrl: 'http://d', noticeId: 42 }
     ];
 
     const matches = findMatchingOffersAccordingToPreferences(
@@ -42,9 +42,10 @@ describe('findMatchingOffersAccordingToPreferences', function() {
     it('should exclude matching exclusion of otherwise matching url', () => {
       const offersWithExclusion: MatchingContext[] = [
         {
-          url_regex: 'samsung',
-          exclude_url_regex: 'blabla',
-          recommendation_url: 'http://b'
+          urlRegex: 'samsung',
+          excludeUrlRegex: 'blabla',
+          noticeUrl: 'http://b',
+          noticeId: 42
         }
       ];
 
@@ -61,9 +62,10 @@ describe('findMatchingOffersAccordingToPreferences', function() {
     it('should not exclude non matching exclusion of matching url', () => {
       const offersWithExclusion = [
         {
-          url_regex: 'samsung',
-          exclude_url_regex: 'nono',
-          recommendation_url: 'http://b'
+          urlRegex: 'samsung',
+          excludeUrlRegex: 'nono',
+          noticeUrl: 'http://b',
+          noticeId: 42
         }
       ];
 
@@ -81,9 +83,10 @@ describe('findMatchingOffersAccordingToPreferences', function() {
     it('should exclude its matching context if regex is invalid', () => {
       const offersWithExclusion: MatchingContext[] = [
         {
-          url_regex: 'samsung',
-          exclude_url_regex: 'isNasty)',
-          recommendation_url: 'http://b'
+          urlRegex: 'samsung',
+          excludeUrlRegex: 'isNasty)',
+          noticeUrl: 'http://b',
+          noticeId: 42
         }, // SyntaxError: Invalid RegExp: Unmatched ')',
         ...offers
       ];
@@ -102,7 +105,7 @@ describe('findMatchingOffersAccordingToPreferences', function() {
 
   describe('invalid regex', () => {
     const nastyOffers = [
-      { url_regex: 'isNasty)', recommendation_url: 'http://b' }
+      { urlRegex: 'isNasty)', noticeUrl: 'http://b', noticeId: 42 }
     ].concat(offers); // SyntaxError: Invalid RegExp: Unmatched ')'
 
     it('should not screw up the matching engine', () => {
@@ -147,31 +150,33 @@ describe('findMatchingOffersAccordingToPreferences', function() {
     });
   });
 
-  describe('draft recommendations', () => {
-    it('should match a draft recommendation', () => {
+  describe('draft notices', () => {
+    it('should match a draft notice', () => {
       const matching = findMatchingOffersAccordingToPreferences(
         matchingDraftURL,
         offers,
-        draftRecommendations
+        draftNotices
       );
 
       expect(matching).to.be.an('array');
       expect(matching).to.be.of.length(1);
-      expect(matching[0]).to.equal(draftRecommendations[0]);
+      expect(matching[0]).to.equal(draftNotices[0]);
     });
 
     it('should favor draft previews over public offers', () => {
       const draftRec = {
-        url_regex: 'www.wordpress.com',
-        recommendation_url: 'http://b',
-        recommendation: {
+        urlRegex: 'www.wordpress.com',
+        noticeUrl: 'http://b',
+        noticeId: 42,
+        notice: {
           visibility: 'private'
         }
       };
       const publicRec = {
-        url_regex: 'www.wordpress.com',
-        recommendation_url: 'http://b',
-        recommendation: {
+        urlRegex: 'www.wordpress.com',
+        noticeUrl: 'http://b',
+        noticeId: 42,
+        notice: {
           visibility: 'public'
         }
       };
diff --git a/test/app/lmem/noticeIsValid.ts b/test/app/lmem/noticeIsValid.ts
new file mode 100644
index 000000000..a965fc1a2
--- /dev/null
+++ b/test/app/lmem/noticeIsValid.ts
@@ -0,0 +1,78 @@
+import chai from 'chai';
+import { isNoticeValid } from '../../../src/app/lmem/notice';
+
+const expect = chai.expect;
+
+describe('isNoticeValid', function() {
+  it('Object with missing contributor is not valid', () => {
+    const notice = {
+      message: 'Que vous ayez un usage basique, avancé, professionnel [...]',
+      intention: 'approval',
+      source: {
+        url: 'http://choisir.lmem.net/samsung-galaxy-s6'
+      }
+    };
+
+    expect(isNoticeValid(notice)).to.be.false;
+  });
+
+  it('Object with missing message is not valid', () => {
+    const notice = {
+      contributor: {
+        id: 1,
+        name: 'Maarten Samson'
+      },
+      intention: 'approval',
+      source: {
+        url: 'http://choisir.lmem.net/samsung-galaxy-s6'
+      }
+    };
+
+    expect(isNoticeValid(notice)).to.be.false;
+  });
+
+  it('Object with wrong criterion is not valid', () => {
+    const notice = {
+      message: 'Que vous ayez un usage basique, avancé, professionnel [...]',
+      contributor: {
+        id: 1,
+        name: 'Maarten Samson'
+      },
+      intention: 'health',
+      source: {
+        url: 'http://choisir.lmem.net/samsung-galaxy-s6'
+      }
+    };
+
+    expect(isNoticeValid(notice)).to.be.false;
+  });
+
+  it('Object with all props is valid', () => {
+    const notice = {
+      message: 'Que vous ayez un usage basique, avancé, professionnel [...]',
+      contributor: {
+        id: 1,
+        name: 'Maarten Samson'
+      },
+      intention: 'approval',
+      source: {
+        url: 'http://choisir.lmem.net/samsung-galaxy-s6'
+      }
+    };
+
+    expect(isNoticeValid(notice)).to.be.true;
+  });
+
+  it('Object with all props but optional is valid', () => {
+    const notice = {
+      message: 'Que vous ayez un usage basique, avancé, professionnel [...]',
+      contributor: {
+        id: 1,
+        name: 'Maarten Samson'
+      },
+      intention: 'approval'
+    };
+
+    expect(isNoticeValid(notice)).to.be.true;
+  });
+});
diff --git a/test/app/middlewares/analytics.ts b/test/app/middlewares/analytics.ts
index f51a2faf9..d37b82aad 100644
--- a/test/app/middlewares/analytics.ts
+++ b/test/app/middlewares/analytics.ts
@@ -2,7 +2,6 @@ import chai from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import { Action } from 'redux';
-
 import middleware from '../../../src/app/background/middlewares/analytics';
 
 const expect = chai.expect;
diff --git a/test/app/reducers.ts b/test/app/reducers.ts
index 62c5cf9fc..09f9464cc 100644
--- a/test/app/reducers.ts
+++ b/test/app/reducers.ts
@@ -1,5 +1,4 @@
 import chai from 'chai';
-
 import prefsReducer from '../../src/app/background/reducers/prefs';
 import resourcesReducer from '../../src/app/background/reducers/resources';
 import { receivedMatchingContexts } from '../../src/app/actions/kraftBackend';
@@ -10,7 +9,7 @@ import {
   dislikeNotice,
   undislikeNotice,
   undismissNotice
-} from '../../src/app/actions/recommendations';
+} from '../../src/app/actions/notices';
 import { MatchingContext } from '../../src/app/lmem/matchingContext';
 
 const expect = chai.expect;
@@ -18,8 +17,8 @@ const expect = chai.expect;
 describe('background reducer', function() {
   it('initial state + receivedMatchingContexts => state with offers', () => {
     const matchingContexts: MatchingContext[] = [
-      { recommendation_url: 'http://1', url_regex: '/1/' },
-      { recommendation_url: 'http://2', url_regex: '/2/' }
+      { noticeUrl: 'http://1', urlRegex: '/1/', noticeId: 42 },
+      { noticeUrl: 'http://2', urlRegex: '/2/', noticeId: 42 }
     ];
     const action = receivedMatchingContexts(matchingContexts);
 
diff --git a/test/app/utils.ts b/test/app/utils.ts
deleted file mode 100644
index 7036483d4..000000000
--- a/test/app/utils.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import chai from 'chai';
-
-import { makeRecoFeedback } from '../../src/app/background/middlewares/sendFeedback';
-
-const expect = chai.expect;
-
-describe('background makeRecoFeedback', function() {
-  it('should have right feedback and contexts', () => {
-    const type = 'like';
-    const url = 'myUrl';
-
-    const output = makeRecoFeedback(type, url);
-
-    expect(output.feedback).to.equal('like');
-    expect(output.contexts.datetime)
-      .to.be.a('string')
-      .of.length(24);
-    expect(output.contexts.url).to.equal(url);
-  });
-});
diff --git a/tsconfig.json b/tsconfig.json
index dbb3648d9..9792578fa 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -65,8 +65,8 @@
     // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
   },
-  "include": ["./src/**/*"],
-  "exclude": ["./src/app/lmem/draft-preview/grabDraftRecommendations.js"],
+  "include": ["./src/**/*", "./test/app/**/*"],
+  "exclude": ["./src/app/lmem/draft-preview/grabDraftNotices.js"],
   "awesomeTypescriptLoaderOptions": {
     "transpileOnly": false,
     "useCache": false
diff --git a/tslint.json b/tslint.json
index c3dbc6a53..330300561 100644
--- a/tslint.json
+++ b/tslint.json
@@ -6,10 +6,11 @@
     "tslint-config-prettier"
   ],
   "rules": {
-    "quotemark": [true, "single", "jsx-double"],
+    "quotemark": [true, "single", "avoid-escape", "jsx-double"],
     "jsx-boolean-value": false,
     "no-unused-expression": false,
-    "no-empty": [true, "allow-empty-functions"]
+    "no-empty": [true, "allow-empty-functions"],
+    "no-floating-promises": false
   },
   "jsRules": true,
   "rulesDirectory": []
diff --git a/webpack/config.plugins.js b/webpack/config.plugins.js
index ba7454890..8ad1c5ec6 100644
--- a/webpack/config.plugins.js
+++ b/webpack/config.plugins.js
@@ -11,23 +11,23 @@ const { version } = require('../package.json');
 
 const ENV = {
   dev: {
-    LMEM_BACKEND_ORIGIN: '"https://recommendations.lmem.net"'
+    LMEM_BACKEND_ORIGIN: '"https://staging-notices.lmem.net/api/v3/"'
   },
   staging: {
-    LMEM_BACKEND_ORIGIN: '"https://staging-recommendations.lmem.net"',
+    LMEM_BACKEND_ORIGIN: '"https://staging-notices.lmem.net/api/v3/"',
     UNINSTALL_ORIGIN: "'https://www.lmem.net/desinstallation'",
     HEAP_APPID: '"234457910"', // testing
     REFRESH_MC_INTERVAL: '5*60*1000'
   },
   chromium: {
-    LMEM_BACKEND_ORIGIN: '"https://reco2bulle.lmem.net"',
+    LMEM_BACKEND_ORIGIN: '"https://notices.lmem.net/api/v3/"',
     UNINSTALL_ORIGIN: "'https://www.lmem.net/desinstallation'",
     REFRESH_MC_INTERVAL: '30*60*1000',
     ONBOARDING_ORIGIN: '"https://bienvenue.lmem.net?extensionInstalled"',
     HEAP_APPID: '"3705584166"' // production
   },
   firefox: {
-    LMEM_BACKEND_ORIGIN: '"https://reco2bulle.lmem.net"',
+    LMEM_BACKEND_ORIGIN: '"https://notices.lmem.net/api/v3/"',
     ONBOARDING_ORIGIN: '"https://bienvenue.lmem.net?extensionInstalled"',
     REFRESH_MC_INTERVAL: '30*60*1000'
     // No analytics with Firefox // HEAP_APPID: '"3705584166"',
@@ -40,7 +40,7 @@ module.exports = (env = {}, argv = {}, outputPath) => {
   const copyConfig = [
     { from: 'src/assets', to: buildPath },
     {
-      from: 'src/app/lmem/draft-preview/grabDraftRecommendations.js',
+      from: 'src/app/lmem/draft-preview/grabDraftNotices.js',
       to: path.join(buildPath, 'js')
     }
   ];
diff --git a/yarn.lock b/yarn.lock
index e0ecc8bc3..8e3ee76ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -43,6 +43,26 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
+"@babel/core@>=7.1.0":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.4.tgz#84055750b05fcd50f9915a826b44fa347a825250"
+  integrity sha512-lQgGX3FPRgbz2SKmhMtYgJvVzGZrmjaF4apZ2bLwofAKiSjxU0drPh4S/VasyYXwaTs+A1gvQ45BN8SQJzHsQQ==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.4.4"
+    "@babel/helpers" "^7.4.4"
+    "@babel/parser" "^7.4.4"
+    "@babel/template" "^7.4.4"
+    "@babel/traverse" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    convert-source-map "^1.1.0"
+    debug "^4.1.0"
+    json5 "^2.1.0"
+    lodash "^4.17.11"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
 "@babel/core@^7.1.2":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.2.tgz#f8d2a9ceb6832887329a7b60f9d035791400ba4e"
@@ -101,6 +121,17 @@
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
+"@babel/generator@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.4.tgz#174a215eb843fc392c7edcaabeaa873de6e8f041"
+  integrity sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==
+  dependencies:
+    "@babel/types" "^7.4.4"
+    jsesc "^2.5.1"
+    lodash "^4.17.11"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
 "@babel/helper-annotate-as-pure@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
@@ -254,6 +285,13 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
+"@babel/helper-split-export-declaration@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677"
+  integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==
+  dependencies:
+    "@babel/types" "^7.4.4"
+
 "@babel/helper-wrap-function@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.1.0.tgz#8cf54e9190706067f016af8f75cb3df829cc8c66"
@@ -279,6 +317,15 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.1.2"
 
+"@babel/helpers@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.4.tgz#868b0ef59c1dd4e78744562d5ce1b59c89f2f2a5"
+  integrity sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==
+  dependencies:
+    "@babel/template" "^7.4.4"
+    "@babel/traverse" "^7.4.4"
+    "@babel/types" "^7.4.4"
+
 "@babel/highlight@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
@@ -307,6 +354,11 @@
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.2.tgz#95cdeddfc3992a6ca2a1315191c1679ca32c55cd"
 
+"@babel/parser@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.4.tgz#5977129431b8fe33471730d255ce8654ae1250b6"
+  integrity sha512-5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w==
+
 "@babel/plugin-proposal-async-generator-functions@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.1.0.tgz#41c1a702e10081456e23a7b74d891922dd1bb6ce"
@@ -1124,6 +1176,15 @@
     "@babel/parser" "^7.2.2"
     "@babel/types" "^7.2.2"
 
+"@babel/template@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
+  integrity sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.4.4"
+    "@babel/types" "^7.4.4"
+
 "@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0":
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.4.tgz#f4f83b93d649b4b2c91121a9087fa2fa949ec2b4"
@@ -1152,6 +1213,21 @@
     globals "^11.1.0"
     lodash "^4.17.10"
 
+"@babel/traverse@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.4.tgz#0776f038f6d78361860b6823887d4f3937133fe8"
+  integrity sha512-Gw6qqkw/e6AGzlyj9KnkabJX7VcubqPtkUQVAwkc0wUMldr3A/hezNB3Rc5eIvId95iSGkGIOe5hh1kMKf951A==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.4.4"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.4.4"
+    "@babel/parser" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.11"
+
 "@babel/types@^7.0.0", "@babel/types@^7.1.2", "@babel/types@^7.1.3":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.1.3.tgz#3a767004567060c2f40fca49a304712c525ee37d"
@@ -1168,6 +1244,15 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.4.tgz#8db9e9a629bb7c29370009b4b779ed93fe57d5f0"
+  integrity sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.11"
+    to-fast-properties "^2.0.0"
+
 "@emmetio/extract-abbreviation@0.1.6":
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/@emmetio/extract-abbreviation/-/extract-abbreviation-0.1.6.tgz#e4a9856c1057f0aff7d443b8536477c243abe28c"
@@ -1864,6 +1949,18 @@
   dependencies:
     "@types/filesystem" "*"
 
+"@types/date-fns@^2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@types/date-fns/-/date-fns-2.6.0.tgz#b062ca46562002909be0c63a6467ed173136acc1"
+  integrity sha1-sGLKRlYgApCb4MY6ZGftFzE2rME=
+  dependencies:
+    date-fns "*"
+
+"@types/events@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
+
 "@types/filesystem@*":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.29.tgz#ee3748eb5be140dcf980c3bd35f11aec5f7a3748"
@@ -1878,6 +1975,15 @@
   version "0.0.28"
   resolved "https://registry.yarnpkg.com/@types/flat/-/flat-0.0.28.tgz#5c788149d85a6cf8ff5f5f000acdd912cdea4274"
 
+"@types/glob@^7.1.1":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
+  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
+  dependencies:
+    "@types/events" "*"
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
 "@types/history@*", "@types/history@^4.7.2":
   version "4.7.2"
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.2.tgz#0e670ea254d559241b6eeb3894f8754991e73220"
@@ -1906,6 +2012,11 @@
   version "4.14.123"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.123.tgz#39be5d211478c8dd3bdae98ee75bb7efe4abfe4d"
 
+"@types/minimatch@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+
 "@types/mocha@^5.2.6":
   version "5.2.6"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.6.tgz#b8622d50557dd155e9f2f634b7d68fd38de5e94b"
@@ -2335,6 +2446,16 @@ ajv@^6.1.0, ajv@^6.5.3:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^6.9.1:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -2391,11 +2512,16 @@ ansi-regex@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
 
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.2.1:
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   dependencies:
@@ -2488,17 +2614,11 @@ aria-query@^3.0.0:
     ast-types-flow "0.0.7"
     commander "^2.11.0"
 
-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-flatten@^1.0.1, arr-flatten@^1.1.0:
+arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
 
@@ -2549,7 +2669,7 @@ array-reduce@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
 
-array-union@^1.0.1:
+array-union@^1.0.1, array-union@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
   dependencies:
@@ -2559,10 +2679,6 @@ array-uniq@^1.0.0, array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
 
-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"
@@ -2647,6 +2763,11 @@ ast-types@0.11.7:
   version "0.11.7"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.7.tgz#f318bf44e339db6a320be0009ded64ec1471f46c"
 
+astral-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -2683,17 +2804,6 @@ atob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
 
-autoprefixer@^9.0.0:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.3.1.tgz#71b622174de2b783d5fd99f9ad617b7a3c78443e"
-  dependencies:
-    browserslist "^4.3.3"
-    caniuse-lite "^1.0.30000898"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^7.0.5"
-    postcss-value-parser "^3.3.1"
-
 autoprefixer@^9.3.1:
   version "9.4.7"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.7.tgz#f997994f9a810eae47b38fa6d8a119772051c4ff"
@@ -2705,6 +2815,18 @@ autoprefixer@^9.3.1:
     postcss "^7.0.14"
     postcss-value-parser "^3.3.1"
 
+autoprefixer@^9.5.1:
+  version "9.5.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
+  integrity sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==
+  dependencies:
+    browserslist "^4.5.4"
+    caniuse-lite "^1.0.30000957"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^7.0.14"
+    postcss-value-parser "^3.3.1"
+
 awesome-typescript-loader@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-5.2.1.tgz#a41daf7847515f4925cdbaa3075d61f289e913fc"
@@ -2736,7 +2858,7 @@ axobject-query@^2.0.1:
   dependencies:
     ast-types-flow "0.0.7"
 
-babel-code-frame@^6.22.0, babel-code-frame@^6.26.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"
   dependencies:
@@ -3187,14 +3309,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
 braces@^2.3.0, braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -3210,6 +3324,13 @@ braces@^2.3.0, braces@^2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+braces@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -3287,14 +3408,6 @@ browserslist@^4.1.0:
     electron-to-chromium "^1.3.81"
     node-releases "^1.0.0-alpha.15"
 
-browserslist@^4.3.3:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.4.tgz#4477b737db6a1b07077275b24791e680d4300425"
-  dependencies:
-    caniuse-lite "^1.0.30000899"
-    electron-to-chromium "^1.3.82"
-    node-releases "^1.0.1"
-
 browserslist@^4.3.4, browserslist@^4.4.1:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.1.tgz#42e828954b6b29a7a53e352277be429478a69062"
@@ -3303,6 +3416,15 @@ browserslist@^4.3.4, browserslist@^4.4.1:
     electron-to-chromium "^1.3.103"
     node-releases "^1.1.3"
 
+browserslist@^4.5.4, browserslist@^4.5.6:
+  version "4.5.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.6.tgz#ea42e8581ca2513fa7f371d4dd66da763938163d"
+  integrity sha512-o/hPOtbU9oX507lIqon+UvPYqpx3mHc8cV3QemSBTXwkG8gSQSK6UKvXcE/DcleU3+A59XTUHyCvZ5qGy8xVAg==
+  dependencies:
+    caniuse-lite "^1.0.30000963"
+    electron-to-chromium "^1.3.127"
+    node-releases "^1.1.17"
+
 btoa-lite@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337"
@@ -3531,9 +3653,10 @@ caniuse-lite@^1.0.30000898:
   version "1.0.30000899"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000899.tgz#6febdbbc388a7982f620ee0e3d09aab0c061389e"
 
-caniuse-lite@^1.0.30000899:
-  version "1.0.30000907"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000907.tgz#0b9899bde53fb1c30e214fb12402361e02ff5c42"
+caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.30000963, caniuse-lite@^1.0.30000967:
+  version "1.0.30000967"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz#a5039577806fccee80a04aaafb2c0890b1ee2f73"
+  integrity sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ==
 
 capture-stack-trace@^1.0.0:
   version "1.0.1"
@@ -4200,15 +4323,6 @@ cosmiconfig@^4.0.0:
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
-cosmiconfig@^5.0.0, cosmiconfig@^5.0.7:
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
-  dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-
 cosmiconfig@^5.0.1:
   version "5.0.5"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.5.tgz#a809e3c2306891ce17ab70359dc8bdf661fe2cd0"
@@ -4217,7 +4331,7 @@ cosmiconfig@^5.0.1:
     js-yaml "^3.9.0"
     parse-json "^4.0.0"
 
-cosmiconfig@^5.0.2:
+cosmiconfig@^5.0.2, cosmiconfig@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
   dependencies:
@@ -4234,6 +4348,15 @@ cosmiconfig@^5.0.5:
     js-yaml "^3.9.0"
     parse-json "^4.0.0"
 
+cosmiconfig@^5.0.7:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
+  dependencies:
+    import-fresh "^2.0.0"
+    is-directory "^0.3.1"
+    js-yaml "^3.9.0"
+    parse-json "^4.0.0"
+
 crc32-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
@@ -4505,7 +4628,7 @@ dashify@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/dashify/-/dashify-0.2.2.tgz#6a07415a01c91faf4a32e38d9dfba71f61cb20fe"
 
-date-fns@^1.27.2:
+date-fns@*, date-fns@^1.27.2, date-fns@^1.30.1:
   version "1.30.1"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
 
@@ -4541,13 +4664,13 @@ debug@3.2.6, debug@^3.2.5:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.0, debug@^4.0.1:
+debug@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0:
+debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   dependencies:
@@ -4770,6 +4893,13 @@ dir-glob@^2.0.0:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
+dir-glob@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
+  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
+  dependencies:
+    path-type "^3.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"
@@ -4846,6 +4976,11 @@ domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
 
+domelementtype@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
+
 domelementtype@~1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
@@ -4968,14 +5103,15 @@ electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.62:
   version "1.3.113"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9"
 
+electron-to-chromium@^1.3.127:
+  version "1.3.133"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.133.tgz#c47639c19b91feee3e22fad69f5556142007008c"
+  integrity sha512-lyoC8aoqbbDqsprb6aPdt9n3DpOZZzdz/T4IZKsR0/dkZIxnJVUjjcpOSwA66jPRIOyDAamCTAUqweU05kKNSg==
+
 electron-to-chromium@^1.3.81:
   version "1.3.82"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.82.tgz#7d13ae4437d2a783de3f4efba96b186c540b67b1"
 
-electron-to-chromium@^1.3.82:
-  version "1.3.84"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.84.tgz#2e55df59e818f150a9f61b53471ebf4f0feecc65"
-
 elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
@@ -5000,6 +5136,11 @@ emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
 
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -5491,12 +5632,6 @@ exenv@^1.2.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d"
 
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  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"
@@ -5509,12 +5644,6 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  dependencies:
-    fill-range "^2.1.0"
-
 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"
@@ -5593,12 +5722,6 @@ external-editor@^3.0.0, external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  dependencies:
-    is-extglob "^1.0.0"
-
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -5637,7 +5760,7 @@ fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
 
-fast-glob@^2.0.2:
+fast-glob@^2.0.2, fast-glob@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295"
   dependencies:
@@ -5726,6 +5849,13 @@ file-entry-cache@^2.0.0:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
+file-entry-cache@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
+  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+  dependencies:
+    flat-cache "^2.0.1"
+
 file-loader@1.1.11:
   version "1.1.11"
   resolved "http://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8"
@@ -5748,24 +5878,10 @@ file-system-cache@^1.0.5:
     fs-extra "^0.30.0"
     ramda "^0.21.0"
 
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-
 filesize@3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
 
-fill-range@^2.1.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^3.0.0"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -5775,6 +5891,13 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 finalhandler@1.1.1:
   version "1.1.1"
   resolved "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
@@ -5870,12 +5993,26 @@ flat-cache@^1.2.1:
     graceful-fs "^4.1.2"
     write "^0.2.1"
 
+flat-cache@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
+  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+  dependencies:
+    flatted "^2.0.0"
+    rimraf "2.6.3"
+    write "1.0.3"
+
 flat@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
   dependencies:
     is-buffer "~2.0.3"
 
+flatted@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
+  integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
+
 flush-write-stream@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
@@ -5901,7 +6038,7 @@ 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"
 
-for-own@^0.1.3, for-own@^0.1.4:
+for-own@^0.1.3:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
   dependencies:
@@ -6128,6 +6265,11 @@ get-stdin@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
 
+get-stdin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
+  integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
+
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -6172,19 +6314,6 @@ git-url-parse@^10.0.1:
   dependencies:
     git-up "^2.0.0"
 
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  dependencies:
-    is-glob "^2.0.0"
-
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@@ -6236,6 +6365,13 @@ global-modules@1.0.0, global-modules@^1.0.0:
     is-windows "^1.0.1"
     resolve-dir "^1.0.0"
 
+global-modules@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
+  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
+  dependencies:
+    global-prefix "^3.0.0"
+
 global-prefix@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
@@ -6246,6 +6382,15 @@ global-prefix@^1.0.1:
     is-windows "^1.0.1"
     which "^1.2.14"
 
+global-prefix@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
+  integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==
+  dependencies:
+    ini "^1.3.5"
+    kind-of "^6.0.2"
+    which "^1.3.1"
+
 global@^4.3.0, global@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
@@ -6301,6 +6446,20 @@ globby@^7.1.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
+globby@^9.2.0:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
+  integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
+  dependencies:
+    "@types/glob" "^7.1.1"
+    array-union "^1.0.2"
+    dir-glob "^2.2.2"
+    fast-glob "^2.2.6"
+    glob "^7.1.3"
+    ignore "^4.0.3"
+    pify "^4.0.1"
+    slash "^2.0.0"
+
 globjoin@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
@@ -6603,27 +6762,28 @@ html-webpack-plugin@^4.0.0-beta.2:
     tapable "^1.1.0"
     util.promisify "1.0.0"
 
-htmlparser2@^3.9.1:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
+htmlparser2@^3.10.0:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
   dependencies:
-    domelementtype "^1.3.0"
+    domelementtype "^1.3.1"
     domhandler "^2.3.0"
     domutils "^1.5.1"
     entities "^1.1.1"
     inherits "^2.0.1"
-    readable-stream "^2.0.2"
+    readable-stream "^3.1.1"
 
-htmlparser2@^3.9.2:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.0.tgz#5f5e422dcf6119c0d983ed36260ce9ded0bee464"
+htmlparser2@^3.9.1:
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
   dependencies:
     domelementtype "^1.3.0"
     domhandler "^2.3.0"
     domutils "^1.5.1"
     entities "^1.1.1"
     inherits "^2.0.1"
-    readable-stream "^3.0.6"
+    readable-stream "^2.0.2"
 
 htmlparser2@~3.3.0:
   version "3.3.0"
@@ -6781,10 +6941,15 @@ ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
 
-ignore@^4.0.0, ignore@^4.0.6:
+ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
 
+ignore@^5.0.6:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.1.tgz#2fc6b8f518aff48fef65a7f348ed85632448e4a5"
+  integrity sha512-DWjnQIFLenVrwyRCKZT+7a7/U4Cqgar4WG8V++K3hw+lrW1hc/SIwdiGmtxKCVACmHULTuGeBbHJmbwW7/sAvA==
+
 immer@1.7.2:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/immer/-/immer-1.7.2.tgz#a51e9723c50b27e132f6566facbec1c85fc69547"
@@ -7020,7 +7185,7 @@ 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.0.2, is-buffer@^1.1.4, is-buffer@^1.1.5:
+is-buffer@^1.0.2, is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
@@ -7104,16 +7269,6 @@ is-dom@^1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/is-dom/-/is-dom-1.0.9.tgz#483832d52972073de12b9fe3f60320870da8370d"
 
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  dependencies:
-    is-primitive "^2.0.0"
-
 is-equal@^1.5.1:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/is-equal/-/is-equal-1.5.5.tgz#5e85f1957e052883247feb386965a3bba15fbb3d"
@@ -7147,10 +7302,6 @@ is-extendable@^1.0.1:
   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"
-
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -7171,16 +7322,15 @@ is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-generator-function@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.6.tgz#9e71653cd15fff341c79c4151460a131d31e9fc4"
 
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  dependencies:
-    is-extglob "^1.0.0"
-
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -7212,21 +7362,16 @@ 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@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  dependencies:
-    kind-of "^3.0.2"
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
   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-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
 is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
@@ -7274,14 +7419,6 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-
 is-promise@^2.0.0, is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
@@ -7454,13 +7591,6 @@ js-yaml@^3.13.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.7.0:
-  version "3.12.2"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz#ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 jsan@^3.1.5, jsan@^3.1.9:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/jsan/-/jsan-3.1.10.tgz#ba9917b864defff567e0c990a34ae7a8d5eb1d90"
@@ -7643,9 +7773,10 @@ klaw@^1.0.0:
   optionalDependencies:
     graceful-fs "^4.1.9"
 
-known-css-properties@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.9.0.tgz#28f8a7134cfa3b0aa08b1e5edf64a57f64fc23af"
+known-css-properties@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.13.0.tgz#2750fde566cbf542a9876d4acd6bb0257ebadd2c"
+  integrity sha512-6VWDxNr7cQXPDtMdCWLZMK3E8hdLrpyPPRdx6RbyvqklqgM6/XNFsVopv8QOZ+hRB6iHG/urEDwzlWbmMCv/kw==
 
 latest-version@^3.0.0:
   version "3.1.0"
@@ -7693,9 +7824,10 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
-leven@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+leven@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
@@ -7995,7 +8127,7 @@ lodash@^4.17.10, lodash@^4.8.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
-log-symbols@2.2.0, log-symbols@^2.0.0, log-symbols@^2.1.0, log-symbols@^2.2.0:
+log-symbols@2.2.0, log-symbols@^2.1.0, log-symbols@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
   dependencies:
@@ -8187,13 +8319,10 @@ material-colors@^1.2.1:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
 
-math-random@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
-
-mathml-tag-names@^2.0.1:
+mathml-tag-names@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.0.tgz#490b70e062ee24636536e3d9481e333733d00f2c"
+  integrity sha512-3Zs9P/0zzwTob2pdgT0CHZuMbnSUSp8MB1bddfm+HDmnFWHGT4jvEZRf+2RuPoa+cjdn/z25SEt5gFTqdhvJAg==
 
 md5.js@^1.3.4:
   version "1.3.5"
@@ -8309,24 +8438,6 @@ methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
-micromatch@^2.3.11:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -8345,6 +8456,14 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, mic
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -8771,9 +8890,10 @@ node-releases@^1.0.0-alpha.15:
   dependencies:
     semver "^5.3.0"
 
-node-releases@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.3.tgz#3414ed84595096459c251699bfcb47d88324a9e4"
+node-releases@^1.1.17:
+  version "1.1.18"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.18.tgz#cc98fd75598a324a77188ebddf6650e9cbd8b1d5"
+  integrity sha512-/mnVgm6u/8OwlIsoyRXtTI0RfQcxZoAZbdwyXap0EeWwcOpDDymyCHM2/aR9XKmHXrvizHoPAOs0pcbiJ6RUaA==
   dependencies:
     semver "^5.3.0"
 
@@ -8843,7 +8963,7 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
+normalize-path@^2.0.0, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
@@ -9245,13 +9365,6 @@ object.getownpropertydescriptors@^2.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.5.1"
 
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -9536,15 +9649,6 @@ parse-github-url@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/parse-github-url/-/parse-github-url-1.0.2.tgz#242d3b65cbcdda14bb50439e3242acf6971db395"
 
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
@@ -9681,6 +9785,11 @@ performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
 
+picomatch@^2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.6.tgz#f39cfedd26213982733ae6b819d3da0e736598d5"
+  integrity sha512-Btng9qVvFsW6FkXYQQK5nEI5i8xdXFDmlKxC7Q8S2Bu5HGWnbQf7ts2kOoxJIrZn5hmw61RZIayAg2zBuJDtyQ==
+
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -9689,7 +9798,7 @@ pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
 
-pify@^4.0.0, pify@^4.0.1:
+pify@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
 
@@ -9761,25 +9870,26 @@ postcss-flexbugs-fixes@^4.1.0:
   dependencies:
     postcss "^7.0.0"
 
-postcss-html@^0.34.0:
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.34.0.tgz#9bfd637ad8c3d3a43625b5ef844dc804b3370868"
+postcss-html@^0.36.0:
+  version "0.36.0"
+  resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.36.0.tgz#b40913f94eaacc2453fd30a1327ad6ee1f88b204"
+  integrity sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==
   dependencies:
-    htmlparser2 "^3.9.2"
+    htmlparser2 "^3.10.0"
 
-postcss-jsx@^0.35.0:
-  version "0.35.0"
-  resolved "https://registry.yarnpkg.com/postcss-jsx/-/postcss-jsx-0.35.0.tgz#1d6cb82393994cdc7e9aa421648e3f0f3f98209b"
+postcss-jsx@^0.36.0:
+  version "0.36.0"
+  resolved "https://registry.yarnpkg.com/postcss-jsx/-/postcss-jsx-0.36.0.tgz#b7685ed3d070a175ef0aa48f83d9015bd772c82d"
+  integrity sha512-/lWOSXSX5jlITCKFkuYU2WLFdrncZmjSVyNpHAunEgirZXLwI8RjU556e3Uz4mv0WVHnJA9d3JWb36lK9Yx99g==
   dependencies:
-    "@babel/core" "^7.1.2"
-  optionalDependencies:
-    postcss-styled ">=0.34.0"
+    "@babel/core" ">=7.1.0"
 
-postcss-less@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.0.2.tgz#9cf94e2cc90f8566858939e278fb9f0b713908df"
+postcss-less@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.4.tgz#369f58642b5928ef898ffbc1a6e93c958304c5ad"
+  integrity sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==
   dependencies:
-    postcss "^7.0.3"
+    postcss "^7.0.14"
 
 postcss-load-config@^2.0.0:
   version "2.0.0"
@@ -9797,11 +9907,12 @@ postcss-loader@^3.0.0:
     postcss-load-config "^2.0.0"
     schema-utils "^1.0.0"
 
-postcss-markdown@^0.34.0:
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/postcss-markdown/-/postcss-markdown-0.34.0.tgz#7a043e6eee3ab846a4cefe3ab43d141038e2da79"
+postcss-markdown@^0.36.0:
+  version "0.36.0"
+  resolved "https://registry.yarnpkg.com/postcss-markdown/-/postcss-markdown-0.36.0.tgz#7f22849ae0e3db18820b7b0d5e7833f13a447560"
+  integrity sha512-rl7fs1r/LNSB2bWRhyZ+lM/0bwKv9fhl38/06gF6mKMo/NPnp55+K1dSTosSVjFZc0e1ppBlu+WT91ba0PMBfQ==
   dependencies:
-    remark "^9.0.0"
+    remark "^10.0.1"
     unist-util-find-all-after "^1.0.2"
 
 postcss-media-query-parser@^0.2.3:
@@ -9863,28 +9974,31 @@ postcss-modules-values@^2.0.0:
     icss-replace-symbols "^1.1.0"
     postcss "^7.0.6"
 
-postcss-reporter@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-6.0.0.tgz#44c873129d8c029a430b6d2186210d79c8de88b8"
+postcss-reporter@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-6.0.1.tgz#7c055120060a97c8837b4e48215661aafb74245f"
+  integrity sha512-LpmQjfRWyabc+fRygxZjpRxfhRf9u/fdlKf4VHG4TSPbV2XNsuISzYW1KL+1aQzx53CAppa1bKG4APIB/DOXXw==
   dependencies:
-    chalk "^2.0.1"
-    lodash "^4.17.4"
-    log-symbols "^2.0.0"
-    postcss "^7.0.2"
+    chalk "^2.4.1"
+    lodash "^4.17.11"
+    log-symbols "^2.2.0"
+    postcss "^7.0.7"
 
 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@^4.0.0:
+postcss-safe-parser@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.1.tgz#8756d9e4c36fdce2c72b091bbc8ca176ab1fcdea"
+  integrity sha512-xZsFA3uX8MO3yAda03QrG3/Eg1LN3EPfjjf07vke/46HERLZyHrTsQ9E1r1w1W//fWEhtYNndo2hQplN2cVpCQ==
   dependencies:
     postcss "^7.0.0"
 
-postcss-sass@^0.3.0:
+postcss-sass@^0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.3.5.tgz#6d3e39f101a53d2efa091f953493116d32beb68c"
+  integrity sha512-B5z2Kob4xBxFjcufFnhQ2HqJQ2y/Zs/ic5EZbCywCkxKd756Q40cIQ/veRDwSrw1BF6+4wUgmpm0sBASqVi65A==
   dependencies:
     gonzales-pe "^4.2.3"
     postcss "^7.0.1"
@@ -9903,13 +10017,10 @@ postcss-selector-parser@^3.1.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-styled@>=0.34.0, postcss-styled@^0.34.0:
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/postcss-styled/-/postcss-styled-0.34.0.tgz#07d47bcb13707289782aa058605fd9feaf84391d"
-
-postcss-syntax@^0.34.0:
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.34.0.tgz#4a85c022f1cdecea72102775c91af1e7f506d83a"
+postcss-syntax@^0.36.2:
+  version "0.36.2"
+  resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c"
+  integrity sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==
 
 postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1:
   version "3.3.1"
@@ -9923,7 +10034,7 @@ postcss@^6.0.1, postcss@^6.0.14, postcss@^6.0.23:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.3, postcss@^7.0.5:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
   version "7.0.5"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
   dependencies:
@@ -9947,6 +10058,15 @@ postcss@^7.0.6:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
+postcss@^7.0.7:
+  version "7.0.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz#48f64f1b4b558cb8b52c88987724359acb010da2"
+  integrity sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -9955,10 +10075,6 @@ prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
 
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-
 prettier@^1.16.4:
   version "1.16.4"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
@@ -10327,14 +10443,6 @@ randexp@0.4.6:
     discontinuous-range "1.0.0"
     ret "~0.1.10"
 
-randomatic@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
-  dependencies:
-    is-number "^4.0.0"
-    kind-of "^6.0.0"
-    math-random "^1.0.1"
-
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
@@ -10726,9 +10834,10 @@ readable-stream@1.0:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.0.6.tgz#351302e4c68b5abd6a2ed55376a7f9a25be3057a"
+readable-stream@^3.1.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9"
+  integrity sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -10901,12 +11010,6 @@ regenerator-transform@^0.13.3:
   dependencies:
     private "^0.1.6"
 
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  dependencies:
-    is-equal-shallow "^0.1.3"
-
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -10996,9 +11099,10 @@ relateurl@0.2.x:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
 
-remark-parse@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz#4c077f9e499044d1d5c13f80d7a98cf7b9285d95"
+remark-parse@^6.0.0:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-6.0.3.tgz#c99131052809da482108413f87b0ee7f52180a3a"
+  integrity sha512-QbDXWN4HfKTUC0hHa4teU463KclLAnwpn/FBn87j9cKYJWWawbiLgMfP2Q4XwhxxuuuOxHlw+pSN0OKuJwyVvg==
   dependencies:
     collapse-white-space "^1.0.2"
     is-alphabetical "^1.0.0"
@@ -11016,9 +11120,10 @@ remark-parse@^5.0.0:
     vfile-location "^2.0.0"
     xtend "^4.0.1"
 
-remark-stringify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-5.0.0.tgz#336d3a4d4a6a3390d933eeba62e8de4bd280afba"
+remark-stringify@^6.0.0:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-6.0.4.tgz#16ac229d4d1593249018663c7bddf28aafc4e088"
+  integrity sha512-eRWGdEPMVudijE/psbIDNcnJLRVx3xhfuEsTDGgH4GsFF91dVhw5nhmnBppafJ7+NWINW6C7ZwWbi30ImJzqWg==
   dependencies:
     ccount "^1.0.0"
     is-alphanumeric "^1.0.0"
@@ -11035,13 +11140,14 @@ remark-stringify@^5.0.0:
     unherit "^1.0.4"
     xtend "^4.0.1"
 
-remark@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz#c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60"
+remark@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/remark/-/remark-10.0.1.tgz#3058076dc41781bf505d8978c291485fe47667df"
+  integrity sha512-E6lMuoLIy2TyiokHprMjcWNJ5UxfGQjaMSMhV+f4idM625UjjK4j798+gPs5mfjzDE6vL0oFKVeZM6gZVSVrzQ==
   dependencies:
-    remark-parse "^5.0.0"
-    remark-stringify "^5.0.0"
-    unified "^6.0.0"
+    remark-parse "^6.0.0"
+    remark-stringify "^6.0.0"
+    unified "^7.0.0"
 
 remote-redux-devtools@^0.5.13:
   version "0.5.13"
@@ -11214,6 +11320,11 @@ resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
 
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
 resolve-pathname@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"
@@ -11265,6 +11376,13 @@ rimraf@2, rimraf@^2.5.2, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
   dependencies:
     glob "^7.0.5"
 
+rimraf@2.6.3:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@^2.2.8, rimraf@^2.5.4:
   version "2.5.4"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
@@ -11684,6 +11802,15 @@ slice-ansi@1.0.0:
   dependencies:
     is-fullwidth-code-point "^2.0.0"
 
+slice-ansi@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
+  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
+  dependencies:
+    ansi-styles "^3.2.0"
+    astral-regex "^1.0.0"
+    is-fullwidth-code-point "^2.0.0"
+
 slide@^1.1.3, slide@^1.1.6, slide@~1.1.3, slide@~1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
@@ -12124,6 +12251,15 @@ string-width@^3.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.0.0"
 
+string-width@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz#ba846d1daa97c3c596155308063e075ed1c99aff"
+  integrity sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^5.2.0"
+
 string.prototype.matchall@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-3.0.1.tgz#5a9e0b64bcbeb336aa4814820237c2006985646d"
@@ -12211,6 +12347,13 @@ strip-ansi@^5.0.0:
   dependencies:
     ansi-regex "^4.0.0"
 
+strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -12286,57 +12429,58 @@ stylelint-processor-styled-components@^1.5.0:
     "@babel/traverse" "^7.0.0"
     postcss "^6.0.14"
 
-stylelint@^9.7.1:
-  version "9.7.1"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-9.7.1.tgz#522f8795832a9f7e062e5e4105c0e05fb53f827f"
+stylelint@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-10.0.1.tgz#f85cd9755e905d826023d67df62b32716fa6dfb4"
+  integrity sha512-NbpD9BvQRmPe7QfaLB2OqhhDr5g6SAn43AAH2XLyqtQ9ZcioQECgadkIbormfhzxLhccAQWBZbVNiZz1oqEf8g==
   dependencies:
-    autoprefixer "^9.0.0"
+    autoprefixer "^9.5.1"
     balanced-match "^1.0.0"
-    chalk "^2.4.1"
-    cosmiconfig "^5.0.0"
-    debug "^4.0.0"
+    chalk "^2.4.2"
+    cosmiconfig "^5.2.0"
+    debug "^4.1.1"
     execall "^1.0.0"
-    file-entry-cache "^2.0.0"
-    get-stdin "^6.0.0"
-    global-modules "^1.0.0"
-    globby "^8.0.0"
+    file-entry-cache "^5.0.1"
+    get-stdin "^7.0.0"
+    global-modules "^2.0.0"
+    globby "^9.2.0"
     globjoin "^0.1.4"
     html-tags "^2.0.0"
-    ignore "^4.0.0"
+    ignore "^5.0.6"
     import-lazy "^3.1.0"
     imurmurhash "^0.1.4"
-    known-css-properties "^0.9.0"
-    leven "^2.1.0"
-    lodash "^4.17.4"
-    log-symbols "^2.0.0"
-    mathml-tag-names "^2.0.1"
+    known-css-properties "^0.13.0"
+    leven "^3.1.0"
+    lodash "^4.17.11"
+    log-symbols "^2.2.0"
+    mathml-tag-names "^2.1.0"
     meow "^5.0.0"
-    micromatch "^2.3.11"
+    micromatch "^4.0.0"
     normalize-selector "^0.2.0"
-    pify "^4.0.0"
-    postcss "^7.0.0"
-    postcss-html "^0.34.0"
-    postcss-jsx "^0.35.0"
-    postcss-less "^3.0.1"
-    postcss-markdown "^0.34.0"
+    pify "^4.0.1"
+    postcss "^7.0.14"
+    postcss-html "^0.36.0"
+    postcss-jsx "^0.36.0"
+    postcss-less "^3.1.4"
+    postcss-markdown "^0.36.0"
     postcss-media-query-parser "^0.2.3"
-    postcss-reporter "^6.0.0"
+    postcss-reporter "^6.0.1"
     postcss-resolve-nested-selector "^0.1.1"
-    postcss-safe-parser "^4.0.0"
-    postcss-sass "^0.3.0"
+    postcss-safe-parser "^4.0.1"
+    postcss-sass "^0.3.5"
     postcss-scss "^2.0.0"
     postcss-selector-parser "^3.1.0"
-    postcss-styled "^0.34.0"
-    postcss-syntax "^0.34.0"
-    postcss-value-parser "^3.3.0"
-    resolve-from "^4.0.0"
+    postcss-syntax "^0.36.2"
+    postcss-value-parser "^3.3.1"
+    resolve-from "^5.0.0"
     signal-exit "^3.0.2"
+    slash "^2.0.0"
     specificity "^0.4.1"
-    string-width "^2.1.0"
+    string-width "^4.1.0"
     style-search "^0.1.0"
     sugarss "^2.0.0"
     svg-tags "^1.0.0"
-    table "^5.0.0"
+    table "^5.2.3"
 
 stylis-rule-sheet@^0.0.10:
   version "0.0.10"
@@ -12428,7 +12572,7 @@ synchronous-promise@^2.0.5:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.7.tgz#3574b3d2fae86b145356a4b89103e1577f646fe3"
 
-table@^5.0.0, table@^5.0.2:
+table@^5.0.2:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/table/-/table-5.1.0.tgz#69a54644f6f01ad1628f8178715b408dc6bf11f7"
   dependencies:
@@ -12437,6 +12581,16 @@ table@^5.0.0, table@^5.0.2:
     slice-ansi "1.0.0"
     string-width "^2.1.1"
 
+table@^5.2.3:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/table/-/table-5.3.0.tgz#8a2c3354dc87312328c68732039b38b6a41c86c9"
+  integrity sha512-6V2qlZHIbbZQGzoP3Ghcj/IQDPhBvQYjZE4W4JEyFMkbzHziIzG6jxmAD87BZ1ZXgwPwgu3MzvCUGMOFRN7wlw==
+  dependencies:
+    ajv "^6.9.1"
+    lodash "^4.17.11"
+    slice-ansi "^2.1.0"
+    string-width "^3.0.0"
+
 tapable@^1.0.0, tapable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
@@ -12591,6 +12745,13 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
@@ -12740,25 +12901,26 @@ tslint-react@^3.6.0:
   dependencies:
     tsutils "^2.13.1"
 
-tslint@^5.13.1:
-  version "5.13.1"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.13.1.tgz#fbc0541c425647a33cd9108ce4fd4cd18d7904ed"
+tslint@^5.16.0:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.16.0.tgz#ae61f9c5a98d295b9a4f4553b1b1e831c1984d67"
+  integrity sha512-UxG2yNxJ5pgGwmMzPMYh/CCnCnh0HfPgtlVRDs1ykZklufFBL1ZoTlWFRz2NQjcoEiDoRp+JyT0lhBbbH/obyA==
   dependencies:
-    babel-code-frame "^6.22.0"
+    "@babel/code-frame" "^7.0.0"
     builtin-modules "^1.1.1"
     chalk "^2.3.0"
     commander "^2.12.1"
     diff "^3.2.0"
     glob "^7.1.1"
-    js-yaml "^3.7.0"
+    js-yaml "^3.13.0"
     minimatch "^3.0.4"
     mkdirp "^0.5.1"
     resolve "^1.3.2"
     semver "^5.3.0"
     tslib "^1.8.0"
-    tsutils "^2.27.2"
+    tsutils "^2.29.0"
 
-tsutils@^2.13.1, tsutils@^2.27.2:
+tsutils@^2.13.1, tsutils@^2.29.0:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
   dependencies:
@@ -12936,18 +13098,7 @@ unicode-property-aliases-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
 
-unified@^6.0.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz#7fbd630f719126d67d40c644b7e3f617035f6dba"
-  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-string "^0.1.0"
-
-unified@^7.0.2:
+unified@^7.0.0, unified@^7.0.2:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/unified/-/unified-7.1.0.tgz#5032f1c1ee3364bd09da12e27fdd4a7553c7be13"
   dependencies:
@@ -13231,15 +13382,6 @@ vfile-message@^1.0.0:
   dependencies:
     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"
-
 vfile@^3.0.0, vfile@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/vfile/-/vfile-3.0.1.tgz#47331d2abe3282424f4a4bb6acd20a44c4121803"
@@ -13565,6 +13707,13 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
+write@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
+  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
+  dependencies:
+    mkdirp "^0.5.1"
+
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"

From f7b263855f606a683f9cdb4c68ccd4c8cf73d46a Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Thu, 9 May 2019 21:57:40 +0200
Subject: [PATCH 066/100] feat(notices): change intention 'tip' to
 'information'

---
 src/app/lmem/intention.ts                         |  4 ++--
 src/app/theme.ts                                  |  8 ++++----
 .../icons/types/{Tip.tsx => Information.tsx}      |  0
 src/components/atoms/icons/types/index.ts         |  4 ++--
 src/components/molecules/Type/Type.stories.tsx    |  2 +-
 .../organisms/Notice/Notice.stories.tsx           | 15 +++++++++++----
 6 files changed, 20 insertions(+), 13 deletions(-)
 rename src/components/atoms/icons/types/{Tip.tsx => Information.tsx} (100%)

diff --git a/src/app/lmem/intention.ts b/src/app/lmem/intention.ts
index c1c285a36..cd5ca2f3e 100644
--- a/src/app/lmem/intention.ts
+++ b/src/app/lmem/intention.ts
@@ -1,14 +1,14 @@
 export type Intention =
   | 'approval'
   | 'disapproval'
-  | 'tip'
+  | 'information'
   | 'alternative'
   | 'other';
 
 export const intentions: Intention[] = [
   'approval',
   'disapproval',
-  'tip',
+  'information',
   'alternative',
   'other'
 ];
diff --git a/src/app/theme.ts b/src/app/theme.ts
index 652f78ce4..ad31cedbf 100644
--- a/src/app/theme.ts
+++ b/src/app/theme.ts
@@ -29,7 +29,7 @@ export interface Theme {
   // new types:
   approval: string;
   disapproval: string;
-  tip: string;
+  information: string;
   alternative: string;
   other: string;
 
@@ -44,7 +44,7 @@ export interface Theme {
     approval: {
       background: string;
     };
-    tip: {
+    information: {
       background: string;
     };
     other: {
@@ -106,7 +106,7 @@ export const theme: Theme = {
   // new types:
   approval: '#34C16C',
   disapproval: '#F70B7B',
-  tip: '#E3C51F',
+  information: '#E3C51F',
   alternative: '#49B6D6',
   other: '#EB950C',
 
@@ -121,7 +121,7 @@ export const theme: Theme = {
     approval: {
       background: '#34C16C'
     },
-    tip: {
+    information: {
       background: '#E3C51F'
     },
     other: {
diff --git a/src/components/atoms/icons/types/Tip.tsx b/src/components/atoms/icons/types/Information.tsx
similarity index 100%
rename from src/components/atoms/icons/types/Tip.tsx
rename to src/components/atoms/icons/types/Information.tsx
diff --git a/src/components/atoms/icons/types/index.ts b/src/components/atoms/icons/types/index.ts
index 15b755d66..880f29948 100644
--- a/src/components/atoms/icons/types/index.ts
+++ b/src/components/atoms/icons/types/index.ts
@@ -4,7 +4,7 @@ import { Intention } from 'app/lmem/intention';
 import Approval from './Like';
 // import Dislike from "./Dislike";
 import Disapproval from './Dislike';
-import Tip from './Tip';
+import Information from './Information';
 import Alternative from './Alternative';
 import Other from './Other';
 
@@ -14,7 +14,7 @@ interface Props {
 const TypesIcons: { [key in Intention]: ComponentType<Props> } = {
   approval: Approval,
   disapproval: Disapproval,
-  tip: Tip,
+  information: Information,
   alternative: Alternative,
   other: Other
 };
diff --git a/src/components/molecules/Type/Type.stories.tsx b/src/components/molecules/Type/Type.stories.tsx
index e9480df1c..3842d770f 100644
--- a/src/components/molecules/Type/Type.stories.tsx
+++ b/src/components/molecules/Type/Type.stories.tsx
@@ -8,6 +8,6 @@ storiesOf('molecules/Type', module)
   .add('approval', () => <Intention intention="approval" />)
   .add('disapproval', () => <Intention intention="disapproval" />)
   .add('alternative', () => <Intention intention="alternative" />)
-  .add('tip', () => <Intention intention="tip" />)
+  .add('information', () => <Intention intention="information" />)
   .add('other', () => <Intention intention="other" />)
   .add('undefined / unknown ', () => <Intention />);
diff --git a/src/components/organisms/Notice/Notice.stories.tsx b/src/components/organisms/Notice/Notice.stories.tsx
index ee83c9535..3bb8d1fdd 100644
--- a/src/components/organisms/Notice/Notice.stories.tsx
+++ b/src/components/organisms/Notice/Notice.stories.tsx
@@ -34,21 +34,28 @@ storiesOf('organisms/Notice', module)
   ))
   .add('Disapproved', () => (
     <Notice
-      notice={{ ...baseNotice, type: 'Disapproval' }}
+      notice={{ ...baseNotice, intention: 'disapproval' }}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
     />
   ))
-  .add('Tip', () => (
+  .add('Alternative', () => (
     <Notice
-      notice={{ ...baseNotice, type: 'Tip' }}
+      notice={{ ...baseNotice, intention: 'alternative' }}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
+    />
+  ))
+  .add('Information', () => (
+    <Notice
+      notice={{ ...baseNotice, intention: 'information' }}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
     />
   ))
   .add('Other', () => (
     <Notice
-      notice={{ ...baseNotice, type: 'Other' }}
+      notice={{ ...baseNotice, intention: 'other' }}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
     />

From ce44dda6e0aded478126150fce65c7a0acf698e2 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Thu, 9 May 2019 22:19:48 +0200
Subject: [PATCH 067/100] refactor(notices): clarify `ignoringReason`

---
 src/app/lmem/notice.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/app/lmem/notice.ts b/src/app/lmem/notice.ts
index be636245e..78f0c9740 100644
--- a/src/app/lmem/notice.ts
+++ b/src/app/lmem/notice.ts
@@ -33,11 +33,7 @@ export type IgnoringReason = 'dislike' | 'dismiss' | 'other';
 export const isIgnored = (notice: EnhancedNotice): boolean =>
   notice.status.dismissed || notice.status.disliked;
 export const ignoringReason = (notice: EnhancedNotice): IgnoringReason =>
-  notice.status.dismissed
-    ? 'dismiss'
-    : notice.status.disliked
-    ? 'dislike'
-    : 'other';
+  notice.status.dismissed ? 'dismiss' : 'dislike';
 
 export const dismissNotice = (notice: EnhancedNotice): EnhancedNotice => ({
   ...notice,

From ea064e370a5d17274adb41490d04f869a97feb1e Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Thu, 9 May 2019 22:21:30 +0200
Subject: [PATCH 068/100] fix(notices): revert REPORT_NOTICE action type
 deletion

---
 src/app/constants/ActionTypes.ts |   1 +
 test/app/lmem/isNoticeValid.ts   | 333 ++++---------------------------
 2 files changed, 36 insertions(+), 298 deletions(-)

diff --git a/src/app/constants/ActionTypes.ts b/src/app/constants/ActionTypes.ts
index 0ef98b6ec..b586ee099 100644
--- a/src/app/constants/ActionTypes.ts
+++ b/src/app/constants/ActionTypes.ts
@@ -17,6 +17,7 @@ export const LIKE_NOTICE = 'LIKE_NOTICE';
 export const UNLIKE_NOTICE = 'UNLIKE_NOTICE';
 export const DISLIKE_NOTICE = 'DISLIKE_NOTICE';
 export const UNDISLIKE_NOTICE = 'UNDISLIKE_NOTICE';
+export const REPORT_NOTICE = 'REPORT_NOTICE';
 export const INSTALLED_DETAILS = 'INSTALLED_DETAILS';
 export const OPEN = 'OPEN';
 export const OPENED = 'OPENED';
diff --git a/test/app/lmem/isNoticeValid.ts b/test/app/lmem/isNoticeValid.ts
index d090d741e..a965fc1a2 100644
--- a/test/app/lmem/isNoticeValid.ts
+++ b/test/app/lmem/isNoticeValid.ts
@@ -5,335 +5,72 @@ const expect = chai.expect;
 
 describe('isNoticeValid', function() {
   it('Object with missing contributor is not valid', () => {
-    const reco = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      description:
-        'Que vous ayez un usage basique, avancé, professionnel [...]',
-      // contributor: {
-      //   name: 'Maarten Samson',
-      // },
-      criteria: [
-        {
-          slug: 'health',
-          label: 'Santé'
-        }
-      ],
-      resource: {
-        author: 'Boby',
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr'
-        }
-      },
-      alternatives: [
-        {
-          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          label: 'Voir l’alternative'
-        }
-      ]
-    };
-
-    expect(isNoticeValid(reco)).to.be.false;
-  });
-
-  it('Object with missing title is not valid', () => {
-    const reco = {
-      // title: 'Il y a mieux que le Samsung Galaxy S6',
-      description:
-        'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        name: 'Maarten Samson'
-      },
-      criteria: [
-        {
-          slug: 'health',
-          label: 'Santé'
-        }
-      ],
-      resource: {
-        author: 'Boby',
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr'
-        }
-      },
-      alternatives: [
-        {
-          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          label: 'Voir l’alternative'
-        }
-      ]
-    };
-
-    expect(isNoticeValid(reco)).to.be.false;
-  });
-
-  it('Object with missing description is not valid', () => {
-    const reco = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      // description: 'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        name: 'Maarten Samson'
-      },
-      criteria: [
-        {
-          slug: 'health',
-          label: 'Santé'
-        }
-      ],
-      resource: {
-        author: 'Boby',
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr'
-        }
-      },
-      alternatives: [
-        {
-          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          label: 'Voir l’alternative'
-        }
-      ]
-    };
-
-    expect(isNoticeValid(reco)).to.be.false;
-  });
-
-  it('Object with missing resource is not valid', () => {
-    const reco = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      description:
-        'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        name: 'Maarten Samson'
-      },
-      criteria: [
-        {
-          slug: 'health',
-          label: 'Santé'
-        }
-      ],
-      resource: {
-        author: 'Boby',
-        // url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        // label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr'
-        }
-      },
-      alternatives: [
-        {
-          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          label: 'Voir l’alternative'
-        }
-      ]
+    const notice = {
+      message: 'Que vous ayez un usage basique, avancé, professionnel [...]',
+      intention: 'approval',
+      source: {
+        url: 'http://choisir.lmem.net/samsung-galaxy-s6'
+      }
     };
 
-    expect(isNoticeValid(reco)).to.be.false;
+    expect(isNoticeValid(notice)).to.be.false;
   });
 
-  it('Object with missing editor is not valid', () => {
-    const reco = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      description:
-        'Que vous ayez un usage basique, avancé, professionnel [...]',
+  it('Object with missing message is not valid', () => {
+    const notice = {
       contributor: {
+        id: 1,
         name: 'Maarten Samson'
       },
-      criteria: [
-        {
-          slug: 'health',
-          label: 'Santé'
-        }
-      ],
-      resource: {
-        author: 'Boby',
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif'
-        // editor: {
-        //   label: 'Le Gorafi',
-        //   url: 'http://legorafi.fr',
-        // },
-      },
-      alternatives: [
-        {
-          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          label: 'Voir l’alternative'
-        }
-      ]
+      intention: 'approval',
+      source: {
+        url: 'http://choisir.lmem.net/samsung-galaxy-s6'
+      }
     };
 
-    expect(isNoticeValid(reco)).to.be.false;
+    expect(isNoticeValid(notice)).to.be.false;
   });
 
   it('Object with wrong criterion is not valid', () => {
-    const reco = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      description:
-        'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        name: 'Maarten Samson'
-      },
-      criteria: [
-        {
-          slug: 'health',
-          label: 'Santé'
-        },
-        {
-          // label: 'health',
-          // description: 'Santé',
-        }
-      ],
-      resource: {
-        author: 'Boby',
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr'
-        }
-      },
-      alternatives: [
-        {
-          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          label: 'Voir l’alternative'
-        }
-      ]
-    };
-
-    expect(isNoticeValid(reco)).to.be.false;
-  });
-
-  it('Object with wrong alternative is not valid', () => {
-    const reco = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      description:
-        'Que vous ayez un usage basique, avancé, professionnel [...]',
+    const notice = {
+      message: 'Que vous ayez un usage basique, avancé, professionnel [...]',
       contributor: {
+        id: 1,
         name: 'Maarten Samson'
       },
-      criteria: [
-        {
-          slug: 'health',
-          label: 'Santé'
-        }
-      ],
-      resource: {
-        author: 'Boby',
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr'
-        }
-      },
-      alternatives: [
-        {
-          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          label: 'Voir l’alternative'
-        },
-        {
-          // url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          // label: 'Voir l’alternative',
-        }
-      ]
+      intention: 'health',
+      source: {
+        url: 'http://choisir.lmem.net/samsung-galaxy-s6'
+      }
     };
 
-    expect(isNoticeValid(reco)).to.be.false;
+    expect(isNoticeValid(notice)).to.be.false;
   });
 
   it('Object with all props is valid', () => {
-    const reco = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      description:
-        'Que vous ayez un usage basique, avancé, professionnel [...]',
+    const notice = {
+      message: 'Que vous ayez un usage basique, avancé, professionnel [...]',
       contributor: {
+        id: 1,
         name: 'Maarten Samson'
       },
-      criteria: [
-        {
-          slug: 'health',
-          label: 'Santé'
-        }
-      ],
-      resource: {
-        author: 'Boby',
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr'
-        }
-      },
-      alternatives: [
-        {
-          url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-          label: 'Voir l’alternative'
-        }
-      ]
+      intention: 'approval',
+      source: {
+        url: 'http://choisir.lmem.net/samsung-galaxy-s6'
+      }
     };
 
-    expect(isNoticeValid(reco)).to.be.true;
+    expect(isNoticeValid(notice)).to.be.true;
   });
 
   it('Object with all props but optional is valid', () => {
-    const reco = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      description:
-        'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        name: 'Maarten Samson'
-      },
-      // criteria: [
-      //   {
-      //     slug: 'health',
-      //     label: 'Santé',
-      //   },
-      // ],
-      resource: {
-        // author: 'Boby',
-        // url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr'
-        }
-      },
-      alternatives: [
-        //   {
-        //     url_to_redirect: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        //     label: 'Voir l’alternative',
-        //   },
-      ]
-    };
-
-    expect(isNoticeValid(reco)).to.be.true;
-  });
-
-  it('A notice with no source is valid', () => {
     const notice = {
-      title: 'Il y a mieux que le Samsung Galaxy S6',
-      description: 'Que vous ayez un usage basique, avancé, professionnel [...]',
+      message: 'Que vous ayez un usage basique, avancé, professionnel [...]',
       contributor: {
-        name: 'Maarten Samson',
-      },
-      resource: {
-        author: 'Boby',
-        // url: 'http://choisir.lmem.net/samsung-galaxy-s6',
-        label: 'Lire le comparatif',
-        editor: {
-          label: 'Le Gorafi',
-          url: 'http://legorafi.fr',
-        },
+        id: 1,
+        name: 'Maarten Samson'
       },
-      alternatives: [],
+      intention: 'approval'
     };
 
     expect(isNoticeValid(notice)).to.be.true;

From 34a1aeff833a4f815d2ea803dac10d79a3a32e74 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Fri, 10 May 2019 21:34:37 +0200
Subject: [PATCH 069/100] fix(feedback): fix notice still shown on list after
 dismiss from details

---
 src/app/content/reducers/notices.ts        | 9 ++++++---
 src/components/organisms/Notice/Notice.tsx | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/app/content/reducers/notices.ts b/src/app/content/reducers/notices.ts
index de95944dc..173ba5af6 100644
--- a/src/app/content/reducers/notices.ts
+++ b/src/app/content/reducers/notices.ts
@@ -59,9 +59,12 @@ export default (state: NoticesState = [], action: AppAction): NoticesState => {
     case LOCATION_CHANGE:
       return state.map(notice => ({
         ...notice,
-        justDisliked: false,
-        justLiked: false,
-        justDismissed: false
+        status: {
+          ...notice.status,
+          justDisliked: false,
+          justLiked: false,
+          justDismissed: false
+        }
       }));
 
     default:
diff --git a/src/components/organisms/Notice/Notice.tsx b/src/components/organisms/Notice/Notice.tsx
index c2b573164..fc096ea56 100644
--- a/src/components/organisms/Notice/Notice.tsx
+++ b/src/components/organisms/Notice/Notice.tsx
@@ -38,7 +38,7 @@ export default class Notice extends PureComponent<Props> {
         intention,
         message,
         contributor,
-        status: { dismissed, disliked, read }
+        status: { dismissed, justDismissed, disliked, justDisliked, read }
       }
     } = this.props;
     return (
@@ -48,7 +48,7 @@ export default class Notice extends PureComponent<Props> {
           to={dismissed ? undefined : `notices/details/${id}`}
           read={read}
         >
-          {dismissed || disliked ? (
+          {(dismissed && justDismissed) || (disliked && justDisliked) ? (
             <Fragment>
               <Deleted>Cette bulle ne s’affichera plus !</Deleted>
               <Button onClick={this.onUndismiss}>Annuler</Button>

From cf7809651bc6168385290d05222fbe76fc019903 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Thu, 16 May 2019 19:11:23 +0200
Subject: [PATCH 070/100] fix: fix bad rebase

---
 src/app/background/sagas/badge.ts             |  2 +-
 src/app/content/sagas/notices.ts              |  2 +-
 .../NoticeDetails/NoticeDetails.stories.tsx   |  3 ++-
 test/app/actions.ts                           |  7 ++---
 test/app/content/actions.ts                   |  2 +-
 test/app/reducers.ts                          | 27 ++++++++++++++++++-
 6 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/app/background/sagas/badge.ts b/src/app/background/sagas/badge.ts
index 4e08ca179..d3d38a665 100644
--- a/src/app/background/sagas/badge.ts
+++ b/src/app/background/sagas/badge.ts
@@ -1,5 +1,5 @@
 import { takeLatest } from 'redux-saga/effects';
-import { NoticesUpdatedAction } from '../../actions/recommendations';
+import { NoticesUpdatedAction } from '../../actions/notices';
 import { BadgeTheme, updateBadge, resetBadge } from '../../lmem/badge';
 import { TabAction } from '../../actions';
 
diff --git a/src/app/content/sagas/notices.ts b/src/app/content/sagas/notices.ts
index ec3629883..6739a792e 100644
--- a/src/app/content/sagas/notices.ts
+++ b/src/app/content/sagas/notices.ts
@@ -1,6 +1,6 @@
 import { put, takeLatest, select } from 'redux-saga/effects';
 import { getNotices, getTabId } from '../selectors';
-import { noticesUpdated } from '../../actions/recommendations';
+import { noticesUpdated } from '../../actions/notices';
 
 export function* updateNoticesSaga() {
   const notices = yield select(getNotices);
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
index d941c576b..89ed3f0bc 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
@@ -22,7 +22,8 @@ const baseNotice: EnhancedNotice = {
   status: {
     liked: false,
     dismissed: false,
-    disliked: false
+    disliked: false,
+    read: false
   }
 };
 
diff --git a/test/app/actions.ts b/test/app/actions.ts
index eb6cf03ab..4e0f1a829 100644
--- a/test/app/actions.ts
+++ b/test/app/actions.ts
@@ -35,7 +35,8 @@ const notice: EnhancedNotice = {
   status: {
     liked: false,
     disliked: false,
-    dismissed: false
+    dismissed: false,
+    read: false
   },
   created: new Date(),
   modified: new Date()
@@ -82,7 +83,7 @@ describe('background actions', function() {
     const trigger = 'http://trigger';
     const dismissedNotice: EnhancedNotice = {
       ...notice,
-      status: { dismissed: true, liked: false, disliked: false }
+      status: { dismissed: true, liked: false, disliked: false, read: false }
     };
     const action = noticeIgnored(dismissedNotice, trigger);
 
@@ -96,7 +97,7 @@ describe('background actions', function() {
     const trigger = 'http://trigger';
     const dislikedNotice = {
       ...notice,
-      status: { dismissed: false, liked: false, disliked: true }
+      status: { dismissed: false, liked: false, disliked: true, read: false }
     };
     const action = noticeIgnored(dislikedNotice, trigger);
 
diff --git a/test/app/content/actions.ts b/test/app/content/actions.ts
index 40aec75d4..7ff8c2114 100644
--- a/test/app/content/actions.ts
+++ b/test/app/content/actions.ts
@@ -21,7 +21,7 @@ const notice1: EnhancedNotice = {
   contributor: { id: 1, name: 'Jalil', image: '' },
   visibility: 'public',
   ratings: { dislikes: 0, likes: 0 },
-  status: { disliked: false, dismissed: false, liked: false },
+  status: { disliked: false, dismissed: false, liked: false, read: false },
   created: new Date(),
   modified: new Date()
 };
diff --git a/test/app/reducers.ts b/test/app/reducers.ts
index 09f9464cc..ece233c00 100644
--- a/test/app/reducers.ts
+++ b/test/app/reducers.ts
@@ -8,7 +8,8 @@ import {
   unlikeNotice,
   dislikeNotice,
   undislikeNotice,
-  undismissNotice
+  undismissNotice,
+  readNotice
 } from '../../src/app/actions/notices';
 import { MatchingContext } from '../../src/app/lmem/matchingContext';
 
@@ -37,6 +38,7 @@ describe('background reducer', function() {
         dismissedNotices: [],
         likedNotices: [],
         dislikedNotices: [],
+        readNotices: [],
         installationDetails: { version: '0.1' }
       },
       action
@@ -53,6 +55,7 @@ describe('background reducer', function() {
         dismissedNotices: [],
         likedNotices: [],
         dislikedNotices: [],
+        readNotices: [],
         installationDetails: { version: '0.1' }
       },
       action
@@ -69,6 +72,7 @@ describe('background reducer', function() {
         dismissedNotices: [],
         likedNotices: [],
         dislikedNotices: [],
+        readNotices: [],
         installationDetails: { version: '0.1' }
       },
       action
@@ -85,6 +89,7 @@ describe('background reducer', function() {
         dismissedNotices: [42],
         likedNotices: [],
         dislikedNotices: [],
+        readNotices: [],
         installationDetails: { version: '0.1' }
       },
       action
@@ -101,6 +106,7 @@ describe('background reducer', function() {
         dismissedNotices: [],
         likedNotices: [42],
         dislikedNotices: [],
+        readNotices: [],
         installationDetails: { version: '0.1' }
       },
       action
@@ -117,6 +123,7 @@ describe('background reducer', function() {
         dismissedNotices: [],
         likedNotices: [],
         dislikedNotices: [42],
+        readNotices: [],
         installationDetails: { version: '0.1' }
       },
       action
@@ -124,4 +131,22 @@ describe('background reducer', function() {
 
     expect(nextState.dislikedNotices).to.have.lengthOf(0);
   });
+
+  it('read notice', () => {
+    const action = readNotice(42);
+
+    const nextState = prefsReducer(
+      {
+        dismissedNotices: [],
+        likedNotices: [],
+        dislikedNotices: [],
+        readNotices: [],
+        installationDetails: { version: '0.1' }
+      },
+      action
+    );
+
+    expect(nextState.readNotices).to.have.lengthOf(1);
+    expect(nextState.readNotices[0]).to.equal(42);
+  });
 });

From a3de138238d69992a2691573a4c95a096e87d24b Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Thu, 16 May 2019 19:59:51 +0200
Subject: [PATCH 071/100] fix(read): fix read behavior

---
 src/app/content/reducers/notices.ts | 5 +++--
 src/app/lmem/notice.ts              | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/app/content/reducers/notices.ts b/src/app/content/reducers/notices.ts
index 173ba5af6..30d4f6546 100644
--- a/src/app/content/reducers/notices.ts
+++ b/src/app/content/reducers/notices.ts
@@ -6,7 +6,8 @@ import {
   undislikeNotice,
   undismissNotice,
   unlikeNotice,
-  EnhancedNotice
+  EnhancedNotice,
+  readNotice
 } from '../../lmem/notice';
 import { AppAction } from 'app/actions';
 
@@ -19,7 +20,7 @@ export default (state: NoticesState = [], action: AppAction): NoticesState => {
 
     case 'READ_NOTICE':
       return state.map(notice =>
-        notice.id === action.payload ? { ...notice, read: true } : notice
+        notice.id === action.payload ? readNotice(notice) : notice
       );
 
     case 'FEEDBACK_ON_NOTICE':
diff --git a/src/app/lmem/notice.ts b/src/app/lmem/notice.ts
index 78f0c9740..c9813bc50 100644
--- a/src/app/lmem/notice.ts
+++ b/src/app/lmem/notice.ts
@@ -83,6 +83,13 @@ export const undislikeNotice = (notice: EnhancedNotice): EnhancedNotice => ({
     justDisliked: false
   }
 });
+export const readNotice = (notice: EnhancedNotice): EnhancedNotice => ({
+  ...notice,
+  status: {
+    ...notice.status,
+    read: true
+  }
+});
 
 export const getNotice = <N extends Notice>(
   id: number,

From 46148fcbb280fd102d3b6908ff299a4d01a063c5 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Fri, 17 May 2019 12:04:35 +0200
Subject: [PATCH 072/100] style: remove unused export const

---
 src/app/actions/updateDraftNotices.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/actions/updateDraftNotices.ts b/src/app/actions/updateDraftNotices.ts
index 6dddca38f..1ee16d400 100644
--- a/src/app/actions/updateDraftNotices.ts
+++ b/src/app/actions/updateDraftNotices.ts
@@ -4,8 +4,10 @@ interface UpdateDraftNoticesAction extends BaseAction {
   type: 'UPDATE_DRAFT_NOTICES';
   payload: { drafts: {} };
 }
-export const updateDraftNotices = (drafts: {}): UpdateDraftNoticesAction => ({
+
+const updateDraftNotices = (drafts: {}): UpdateDraftNoticesAction => ({
   type: 'UPDATE_DRAFT_NOTICES',
   payload: { drafts }
 });
+
 export default updateDraftNotices;

From 3746af02580dde0b0a679efec264883f7ad80d94 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Fri, 17 May 2019 12:06:15 +0200
Subject: [PATCH 073/100] chore: remove unused duplicate test for noticeIsValid

---
 test/app/lmem/noticeIsValid.ts | 78 ----------------------------------
 1 file changed, 78 deletions(-)
 delete mode 100644 test/app/lmem/noticeIsValid.ts

diff --git a/test/app/lmem/noticeIsValid.ts b/test/app/lmem/noticeIsValid.ts
deleted file mode 100644
index a965fc1a2..000000000
--- a/test/app/lmem/noticeIsValid.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import chai from 'chai';
-import { isNoticeValid } from '../../../src/app/lmem/notice';
-
-const expect = chai.expect;
-
-describe('isNoticeValid', function() {
-  it('Object with missing contributor is not valid', () => {
-    const notice = {
-      message: 'Que vous ayez un usage basique, avancé, professionnel [...]',
-      intention: 'approval',
-      source: {
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6'
-      }
-    };
-
-    expect(isNoticeValid(notice)).to.be.false;
-  });
-
-  it('Object with missing message is not valid', () => {
-    const notice = {
-      contributor: {
-        id: 1,
-        name: 'Maarten Samson'
-      },
-      intention: 'approval',
-      source: {
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6'
-      }
-    };
-
-    expect(isNoticeValid(notice)).to.be.false;
-  });
-
-  it('Object with wrong criterion is not valid', () => {
-    const notice = {
-      message: 'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        id: 1,
-        name: 'Maarten Samson'
-      },
-      intention: 'health',
-      source: {
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6'
-      }
-    };
-
-    expect(isNoticeValid(notice)).to.be.false;
-  });
-
-  it('Object with all props is valid', () => {
-    const notice = {
-      message: 'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        id: 1,
-        name: 'Maarten Samson'
-      },
-      intention: 'approval',
-      source: {
-        url: 'http://choisir.lmem.net/samsung-galaxy-s6'
-      }
-    };
-
-    expect(isNoticeValid(notice)).to.be.true;
-  });
-
-  it('Object with all props but optional is valid', () => {
-    const notice = {
-      message: 'Que vous ayez un usage basique, avancé, professionnel [...]',
-      contributor: {
-        id: 1,
-        name: 'Maarten Samson'
-      },
-      intention: 'approval'
-    };
-
-    expect(isNoticeValid(notice)).to.be.true;
-  });
-});

From e5fae03b02e06af6895122fef54bccd79863593d Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Fri, 17 May 2019 17:15:11 +0200
Subject: [PATCH 074/100] refactor: change EnhancedNotice to StatefulNotice

---
 src/app/actions/notices.ts                    | 10 +--
 src/app/actions/tabs.ts                       |  4 +-
 src/app/background/sagas/tab.ts               |  6 +-
 src/app/background/selectors/prefs.ts         | 21 ++---
 src/app/content/App/Notice/Details/types.ts   |  4 +-
 .../content/App/Notice/List/List.stories.tsx  | 11 +--
 src/app/content/App/Notice/List/index.tsx     |  6 +-
 src/app/content/reducers/notices.ts           |  8 +-
 src/app/lmem/badge.ts                         |  6 +-
 src/app/lmem/notice.ts                        | 82 ++++++++++---------
 .../organisms/Notice/Notice.stories.tsx       | 10 +--
 src/components/organisms/Notice/Notice.tsx    |  6 +-
 .../NoticeDetails/NoticeDetails.stories.tsx   | 10 +--
 .../organisms/NoticeDetails/NoticeDetails.tsx | 10 +--
 test/app/actions.ts                           | 10 +--
 test/app/content/actions.ts                   |  6 +-
 16 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/src/app/actions/notices.ts b/src/app/actions/notices.ts
index 1e3f37b7e..7e2b5671b 100644
--- a/src/app/actions/notices.ts
+++ b/src/app/actions/notices.ts
@@ -1,15 +1,15 @@
-import { EnhancedNotice } from 'app/lmem/notice';
+import { StatefulNotice } from 'app/lmem/notice';
 import { BaseAction, TabAction, TabMeta } from '.';
 
 export interface NoticesFoundAction extends TabAction {
   type: 'NOTICES_FOUND';
   payload: {
-    notices: EnhancedNotice[];
+    notices: StatefulNotice[];
   };
 }
 
 export const noticesFound = (
-  notices: EnhancedNotice[],
+  notices: StatefulNotice[],
   tab: number
 ): NoticesFoundAction => ({
   type: 'NOTICES_FOUND',
@@ -84,11 +84,11 @@ export const readNotice = (id: number): ReadNoticeAction => ({
 
 export interface NoticesUpdatedAction extends TabAction {
   type: 'NOTICES_UPDATED';
-  payload: EnhancedNotice[];
+  payload: StatefulNotice[];
 }
 
 export const noticesUpdated = (
-  payload: EnhancedNotice[],
+  payload: StatefulNotice[],
   meta: TabMeta
 ): NoticesUpdatedAction => ({
   type: 'NOTICES_UPDATED',
diff --git a/src/app/actions/tabs.ts b/src/app/actions/tabs.ts
index f77b9623e..172894d40 100644
--- a/src/app/actions/tabs.ts
+++ b/src/app/actions/tabs.ts
@@ -1,6 +1,6 @@
 import {
   ignoringReason,
-  EnhancedNotice,
+  StatefulNotice,
   IgnoringReason,
   Notice
 } from 'app/lmem/notice';
@@ -108,7 +108,7 @@ export interface NoticeIgnoredAction extends BaseAction {
   payload: { notice: Notice; reason: IgnoringReason; url: string };
 }
 export const noticeIgnored = (
-  notice: EnhancedNotice,
+  notice: StatefulNotice,
   url: string
 ): NoticeIgnoredAction => ({
   type: 'NOTICE_IGNORED',
diff --git a/src/app/background/sagas/tab.ts b/src/app/background/sagas/tab.ts
index 3483104fb..4443e1d03 100644
--- a/src/app/background/sagas/tab.ts
+++ b/src/app/background/sagas/tab.ts
@@ -48,7 +48,7 @@ import {
 } from '../../actions/tabsLifecycle';
 import * as R from 'ramda';
 import { MatchingContext } from '../../lmem/matchingContext';
-import { EnhancedNotice, Notice, warnIfNoticeInvalid } from '../../lmem/notice';
+import { StatefulNotice, Notice, warnIfNoticeInvalid } from '../../lmem/notice';
 import sendToTab from '../services/sendToTab';
 import { AppAction } from '../../actions/';
 import { fetchNotices } from '../../../api/fetchNotice';
@@ -93,14 +93,14 @@ export const contextTriggeredSaga = function*({
     const notices = yield call(fetchNotices, toFetch);
     const validNotices: Notice[] = notices.filter(warnIfNoticeInvalid);
 
-    const noticesToShow: EnhancedNotice[] = yield select(
+    const noticesToShow: StatefulNotice[] = yield select(
       getNoticesToDisplay(validNotices)
     );
     yield all(
       noticesToShow.map(notice => put(noticeDisplayed(notice, trigger)))
     );
 
-    const ignoredNotices: EnhancedNotice[] = yield select(
+    const ignoredNotices: StatefulNotice[] = yield select(
       getIgnoredNotices(validNotices)
     );
     yield all(
diff --git a/src/app/background/selectors/prefs.ts b/src/app/background/selectors/prefs.ts
index 201617ce2..2bfc37e19 100644
--- a/src/app/background/selectors/prefs.ts
+++ b/src/app/background/selectors/prefs.ts
@@ -1,6 +1,6 @@
 import {
   Notice,
-  EnhancedNotice,
+  StatefulNotice,
   isIgnored,
   shouldNoticeBeShown
 } from '../../lmem/notice';
@@ -22,15 +22,15 @@ export const getInitialContent = (state: BackgroundState) => ({
   installationDetails: getInstallationDetails(state)
 });
 
-export const getNoticeEnhancer = (state: BackgroundState) => {
+export const getAddStateToNotice = (state: BackgroundState) => {
   const dismissed = getDismissed(state);
   const liked = getLiked(state);
   const disliked = getDisliked(state);
   const read = getRead(state);
 
-  return (notice: Notice): EnhancedNotice => ({
+  return (notice: Notice): StatefulNotice => ({
     ...notice,
-    status: {
+    state: {
       dismissed: dismissed.includes(notice.id),
       liked: liked.includes(notice.id),
       disliked: disliked.includes(notice.id),
@@ -41,16 +41,17 @@ export const getNoticeEnhancer = (state: BackgroundState) => {
 
 export const getNoticesToDisplay = (notices: Notice[]) => (
   state: BackgroundState
-): EnhancedNotice[] =>
-  notices.map(getNoticeEnhancer(state)).filter(shouldNoticeBeShown);
+): StatefulNotice[] =>
+  notices.map(getAddStateToNotice(state)).filter(shouldNoticeBeShown);
 
 export const getDismissedNotices = (notices: Notice[]) => (
   state: BackgroundState
-): EnhancedNotice[] =>
+): StatefulNotice[] =>
   notices
-    .map(getNoticeEnhancer(state))
-    .filter(notice => notice.status.dismissed);
+    .map(getAddStateToNotice(state))
+    .filter(notice => notice.state.dismissed);
 
 export const getIgnoredNotices = (notices: Notice[]) => (
   state: BackgroundState
-): EnhancedNotice[] => notices.map(getNoticeEnhancer(state)).filter(isIgnored);
+): StatefulNotice[] =>
+  notices.map(getAddStateToNotice(state)).filter(isIgnored);
diff --git a/src/app/content/App/Notice/Details/types.ts b/src/app/content/App/Notice/Details/types.ts
index b97626e07..487bf23dc 100644
--- a/src/app/content/App/Notice/Details/types.ts
+++ b/src/app/content/App/Notice/Details/types.ts
@@ -1,9 +1,9 @@
 import { RouteComponentProps } from 'react-router';
-import { EnhancedNotice } from 'app/lmem/notice';
+import { StatefulNotice } from 'app/lmem/notice';
 import { FeedbackOnNoticeAction, ReadNoticeAction } from 'app/actions/notices';
 
 interface OwnProps {
-  notice?: EnhancedNotice;
+  notice?: StatefulNotice;
   like: (id: number) => FeedbackOnNoticeAction;
   unlike: (id: number) => FeedbackOnNoticeAction;
   dislike: (id: number) => FeedbackOnNoticeAction;
diff --git a/src/app/content/App/Notice/List/List.stories.tsx b/src/app/content/App/Notice/List/List.stories.tsx
index 73d14081b..c31057a7d 100644
--- a/src/app/content/App/Notice/List/List.stories.tsx
+++ b/src/app/content/App/Notice/List/List.stories.tsx
@@ -4,10 +4,10 @@ import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import { withKnobs, object } from '@storybook/addon-knobs/react';
 import { List } from '.';
-import { EnhancedNotice } from '../../../../lmem/notice';
+import { StatefulNotice } from '../../../../lmem/notice';
 import { subMonths, subWeeks } from 'date-fns';
 
-const notice: EnhancedNotice = {
+const notice: StatefulNotice = {
   id: 123,
   intention: 'disapproval',
   created: subMonths(new Date(), 1),
@@ -20,7 +20,7 @@ const notice: EnhancedNotice = {
   },
   visibility: 'public',
   ratings: { dislikes: 0, likes: 0 },
-  status: {
+  state: {
     dismissed: false,
     disliked: false,
     liked: false,
@@ -44,10 +44,7 @@ storiesOf('screens/Notice/List', module)
       close={action('close')}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
-      notices={[
-        notice,
-        { ...notice, status: { ...notice.status, read: true } }
-      ]}
+      notices={[notice, { ...notice, state: { ...notice.state, read: true } }]}
     />
   ))
   .add('empty', () => (
diff --git a/src/app/content/App/Notice/List/index.tsx b/src/app/content/App/Notice/List/index.tsx
index c133b8152..8140501b7 100644
--- a/src/app/content/App/Notice/List/index.tsx
+++ b/src/app/content/App/Notice/List/index.tsx
@@ -4,17 +4,17 @@ import NoticeItem from 'components/organisms/Notice/Notice';
 import AddNotice from 'components/molecules/AddNotice';
 import NoNotice from './NoNotice';
 import withConnect from './withConnect';
-import { EnhancedNotice } from '../../../../lmem/notice';
+import { StatefulNotice } from '../../../../lmem/notice';
 
 export interface Props {
-  notices: EnhancedNotice[];
+  notices: StatefulNotice[];
   dismiss: (id: number) => void;
   undismiss: (id: number) => void;
   close?: () => void;
 }
 export const List = ({ notices, dismiss, undismiss, close }: Props) => (
   <Notification title="Bulles pour cette page" hasNotices close={close}>
-    {notices.slice(0, 2).map((notice: EnhancedNotice) => (
+    {notices.slice(0, 2).map((notice: StatefulNotice) => (
       <NoticeItem
         key={notice.id}
         notice={notice}
diff --git a/src/app/content/reducers/notices.ts b/src/app/content/reducers/notices.ts
index 30d4f6546..a4675ef37 100644
--- a/src/app/content/reducers/notices.ts
+++ b/src/app/content/reducers/notices.ts
@@ -6,12 +6,12 @@ import {
   undislikeNotice,
   undismissNotice,
   unlikeNotice,
-  EnhancedNotice,
+  StatefulNotice,
   readNotice
 } from '../../lmem/notice';
 import { AppAction } from 'app/actions';
 
-export type NoticesState = EnhancedNotice[];
+export type NoticesState = StatefulNotice[];
 
 export default (state: NoticesState = [], action: AppAction): NoticesState => {
   switch (action.type) {
@@ -60,8 +60,8 @@ export default (state: NoticesState = [], action: AppAction): NoticesState => {
     case LOCATION_CHANGE:
       return state.map(notice => ({
         ...notice,
-        status: {
-          ...notice.status,
+        state: {
+          ...notice.state,
           justDisliked: false,
           justLiked: false,
           justDismissed: false
diff --git a/src/app/lmem/badge.ts b/src/app/lmem/badge.ts
index e7756d2cd..7a1ec9cbb 100644
--- a/src/app/lmem/badge.ts
+++ b/src/app/lmem/badge.ts
@@ -1,4 +1,4 @@
-import { EnhancedNotice, isUnread } from './notice';
+import { StatefulNotice, isUnread } from './notice';
 
 export interface BadgeTheme {
   backgroundColor: {
@@ -10,14 +10,14 @@ export interface BadgeTheme {
 /**
  * Update text and background color of the badge based on the number of notices.
  *
- * @param {EnhancedNotice[]} notices
+ * @param {StatefulNotice[]} notices
  * @param {BadgeTheme} badgeTheme
  * @param {number} tabId Limits the change to when a particular tab is selected.
  *
  * @return {void}
  */
 export const updateBadge = (
-  notices: EnhancedNotice[],
+  notices: StatefulNotice[],
   badgeTheme: BadgeTheme,
   tabId?: number
 ): void => {
diff --git a/src/app/lmem/notice.ts b/src/app/lmem/notice.ts
index c9813bc50..387586b2e 100644
--- a/src/app/lmem/notice.ts
+++ b/src/app/lmem/notice.ts
@@ -16,77 +16,79 @@ export interface Notice {
   visibility: 'public' | 'private';
 }
 
-export interface EnhancedNotice extends Notice {
-  status: {
-    read: boolean;
-    liked: boolean;
-    justLiked?: boolean;
-    disliked: boolean;
-    justDisliked?: boolean;
-    dismissed: boolean;
-    justDismissed?: boolean;
-  };
+export interface NoticeState {
+  read: boolean;
+  liked: boolean;
+  justLiked?: boolean;
+  disliked: boolean;
+  justDisliked?: boolean;
+  dismissed: boolean;
+  justDismissed?: boolean;
+}
+
+export interface StatefulNotice extends Notice {
+  state: NoticeState;
 }
 
 /* eslint-disable no-nested-ternary */
 export type IgnoringReason = 'dislike' | 'dismiss' | 'other';
-export const isIgnored = (notice: EnhancedNotice): boolean =>
-  notice.status.dismissed || notice.status.disliked;
-export const ignoringReason = (notice: EnhancedNotice): IgnoringReason =>
-  notice.status.dismissed ? 'dismiss' : 'dislike';
+export const isIgnored = (notice: StatefulNotice): boolean =>
+  notice.state.dismissed || notice.state.disliked;
+export const ignoringReason = (notice: StatefulNotice): IgnoringReason =>
+  notice.state.dismissed ? 'dismiss' : 'dislike';
 
-export const dismissNotice = (notice: EnhancedNotice): EnhancedNotice => ({
+export const dismissNotice = (notice: StatefulNotice): StatefulNotice => ({
   ...notice,
-  status: {
-    ...notice.status,
+  state: {
+    ...notice.state,
     dismissed: true,
     justDismissed: true
   }
 });
-export const undismissNotice = (notice: EnhancedNotice): EnhancedNotice => ({
+export const undismissNotice = (notice: StatefulNotice): StatefulNotice => ({
   ...notice,
-  status: {
-    ...notice.status,
+  state: {
+    ...notice.state,
     dismissed: false,
     justDismissed: false
   }
 });
-export const likeNotice = (notice: EnhancedNotice): EnhancedNotice => ({
+export const likeNotice = (notice: StatefulNotice): StatefulNotice => ({
   ...notice,
-  status: {
-    ...notice.status,
+  state: {
+    ...notice.state,
     liked: true,
     justLiked: true
   }
 });
-export const unlikeNotice = (notice: EnhancedNotice): EnhancedNotice => ({
+export const unlikeNotice = (notice: StatefulNotice): StatefulNotice => ({
   ...notice,
-  status: {
-    ...notice.status,
+  state: {
+    ...notice.state,
     liked: false,
     justLiked: false
   }
 });
-export const dislikeNotice = (notice: EnhancedNotice): EnhancedNotice => ({
+export const dislikeNotice = (notice: StatefulNotice): StatefulNotice => ({
   ...notice,
-  status: {
-    ...notice.status,
+  state: {
+    ...notice.state,
     disliked: true,
     justDisliked: true
   }
 });
-export const undislikeNotice = (notice: EnhancedNotice): EnhancedNotice => ({
+export const undislikeNotice = (notice: StatefulNotice): StatefulNotice => ({
   ...notice,
-  status: {
-    ...notice.status,
+  state: {
+    ...notice.state,
     disliked: false,
     justDisliked: false
   }
 });
-export const readNotice = (notice: EnhancedNotice): EnhancedNotice => ({
+export const readNotice = (notice: StatefulNotice): StatefulNotice => ({
   ...notice,
-  status: {
-    ...notice.status,
+  state: {
+    ...notice.state,
     read: true
   }
 });
@@ -122,12 +124,12 @@ export const warnIfNoticeInvalid = (notice: Notice): boolean => {
   return valid;
 };
 
-export const shouldNoticeBeShown = (notice: EnhancedNotice): boolean =>
+export const shouldNoticeBeShown = (notice: StatefulNotice): boolean =>
   (isNoticeValid(notice) &&
-    (!notice.status.dismissed || notice.status.justDismissed) &&
-    (!notice.status.disliked || notice.status.justDisliked)) ||
+    (!notice.state.dismissed || notice.state.justDismissed) &&
+    (!notice.state.disliked || notice.state.justDisliked)) ||
   false;
 
-export const isRead = (notice: EnhancedNotice) => notice.status.read;
+export const isRead = (notice: StatefulNotice) => notice.state.read;
 
-export const isUnread = (notice: EnhancedNotice) => !isRead(notice);
+export const isUnread = (notice: StatefulNotice) => !isRead(notice);
diff --git a/src/components/organisms/Notice/Notice.stories.tsx b/src/components/organisms/Notice/Notice.stories.tsx
index 3bb8d1fdd..2b3639220 100644
--- a/src/components/organisms/Notice/Notice.stories.tsx
+++ b/src/components/organisms/Notice/Notice.stories.tsx
@@ -3,10 +3,10 @@ import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import Notice from './Notice';
-import { EnhancedNotice } from '../../../app/lmem/notice';
+import { StatefulNotice } from '../../../app/lmem/notice';
 import { subWeeks, subMonths } from 'date-fns';
 
-const baseNotice: EnhancedNotice = {
+const baseNotice: StatefulNotice = {
   id: 123,
   intention: 'approval',
   created: subMonths(new Date(), 1),
@@ -15,7 +15,7 @@ const baseNotice: EnhancedNotice = {
   ratings: { likes: 42, dislikes: 2 },
   contributor: { id: 1, name: 'Jalil' },
   visibility: 'public',
-  status: {
+  state: {
     liked: false,
     dismissed: false,
     disliked: false,
@@ -64,7 +64,7 @@ storiesOf('organisms/Notice', module)
     <Notice
       notice={{
         ...baseNotice,
-        status: { ...baseNotice.status, dismissed: true }
+        state: { ...baseNotice.state, dismissed: true }
       }}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
@@ -74,7 +74,7 @@ storiesOf('organisms/Notice', module)
     <Notice
       notice={{
         ...baseNotice,
-        status: { ...baseNotice.status, read: true }
+        state: { ...baseNotice.state, read: true }
       }}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
diff --git a/src/components/organisms/Notice/Notice.tsx b/src/components/organisms/Notice/Notice.tsx
index fc096ea56..92c731055 100644
--- a/src/components/organisms/Notice/Notice.tsx
+++ b/src/components/organisms/Notice/Notice.tsx
@@ -6,11 +6,11 @@ import Content from './Content';
 import Deleted from './Deleted';
 import DeleteButton from './DeleteButton';
 import Title from './Title';
-import { EnhancedNotice } from '../../../app/lmem/notice';
+import { StatefulNotice } from '../../../app/lmem/notice';
 import IntentionIcon from '../../molecules/Type/IntentionIcon';
 
 interface Props {
-  notice: EnhancedNotice;
+  notice: StatefulNotice;
   dismiss: (id: number) => void;
   undismiss: (id: number) => void;
 }
@@ -38,7 +38,7 @@ export default class Notice extends PureComponent<Props> {
         intention,
         message,
         contributor,
-        status: { dismissed, justDismissed, disliked, justDisliked, read }
+        state: { dismissed, justDismissed, disliked, justDisliked, read }
       }
     } = this.props;
     return (
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
index 89ed3f0bc..76c4a9a8f 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
@@ -3,10 +3,10 @@ import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import NoticeDetails from './NoticeDetails';
-import { EnhancedNotice } from '../../../app/lmem/notice';
+import { StatefulNotice } from '../../../app/lmem/notice';
 import { subMonths, subWeeks } from 'date-fns';
 
-const baseNotice: EnhancedNotice = {
+const baseNotice: StatefulNotice = {
   id: 123,
   intention: 'approval',
   created: subMonths(new Date(), 1),
@@ -19,7 +19,7 @@ const baseNotice: EnhancedNotice = {
   contributor: { id: 1, name: 'Jalil' },
   visibility: 'public',
   source: { label: 'LMEM', url: 'http://www.lmem.net' },
-  status: {
+  state: {
     liked: false,
     dismissed: false,
     disliked: false,
@@ -43,7 +43,7 @@ const message = storiesOf('organisms/NoticeDetails', module)
     <NoticeDetails
       notice={{
         ...baseNotice,
-        status: { ...baseNotice.status, dismissed: true }
+        state: { ...baseNotice.state, dismissed: true }
       }}
       like={action('like')}
       unlike={action('unlike')}
@@ -56,7 +56,7 @@ const message = storiesOf('organisms/NoticeDetails', module)
     <NoticeDetails
       notice={{
         ...baseNotice,
-        status: { ...baseNotice.status, disliked: true }
+        state: { ...baseNotice.state, disliked: true }
       }}
       like={action('like')}
       unlike={action('unlike')}
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
index d381b6991..a262eb7ed 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
@@ -13,12 +13,12 @@ import DetailsDislike from './DetailsDislike';
 import Message from './Message';
 import Feedbacks from './Feedbacks';
 import Date from './Date';
-import { EnhancedNotice } from '../../../app/lmem/notice';
+import { StatefulNotice } from '../../../app/lmem/notice';
 import { format } from 'date-fns';
 import IntentionIcon from '../../molecules/Type/IntentionIcon';
 
 interface NoticeDetailsProps {
-  notice: EnhancedNotice;
+  notice: StatefulNotice;
   like: (id: number) => void;
   unlike: (id: number) => void;
   dislike: (id: number) => void;
@@ -30,7 +30,7 @@ class NoticeDetails extends PureComponent<
 > {
   handleLikeClick = () => {
     const { notice, like, unlike } = this.props;
-    if (notice.status.liked) {
+    if (notice.state.liked) {
       unlike(notice.id);
     } else {
       like(notice.id);
@@ -41,7 +41,7 @@ class NoticeDetails extends PureComponent<
     const {
       notice: {
         id,
-        status: { disliked }
+        state: { disliked }
       },
       dislike,
       undislike
@@ -71,7 +71,7 @@ class NoticeDetails extends PureComponent<
         created,
         contributor,
         source,
-        status: { liked, disliked, dismissed }
+        state: { liked, disliked, dismissed }
       }
     } = this.props;
 
diff --git a/test/app/actions.ts b/test/app/actions.ts
index 4e0f1a829..5d53434b3 100644
--- a/test/app/actions.ts
+++ b/test/app/actions.ts
@@ -13,12 +13,12 @@ import {
   noticeIgnored
 } from '../../src/app/actions/tabs';
 import { MatchingContext } from '../../src/app/lmem/matchingContext';
-import { EnhancedNotice } from '../../src/app/lmem/notice';
+import { StatefulNotice } from '../../src/app/lmem/notice';
 
 const expect = chai.expect;
 chai.use(sinonChai);
 
-const notice: EnhancedNotice = {
+const notice: StatefulNotice = {
   id: 1,
   intention: 'approval',
   message: 'This is a notice',
@@ -32,7 +32,7 @@ const notice: EnhancedNotice = {
     dislikes: 0,
     likes: 0
   },
-  status: {
+  state: {
     liked: false,
     disliked: false,
     dismissed: false,
@@ -81,9 +81,9 @@ describe('background actions', function() {
 
   it('noticeIgnored when notice dismissed', () => {
     const trigger = 'http://trigger';
-    const dismissedNotice: EnhancedNotice = {
+    const dismissedNotice: StatefulNotice = {
       ...notice,
-      status: { dismissed: true, liked: false, disliked: false, read: false }
+      state: { dismissed: true, liked: false, disliked: false, read: false }
     };
     const action = noticeIgnored(dismissedNotice, trigger);
 
diff --git a/test/app/content/actions.ts b/test/app/content/actions.ts
index 7ff8c2114..9ff2af1d5 100644
--- a/test/app/content/actions.ts
+++ b/test/app/content/actions.ts
@@ -6,11 +6,11 @@ import {
   likeNotice
 } from '../../../src/app/actions/notices';
 import { init } from '../../../src/app/actions/tabs';
-import { EnhancedNotice } from '../../../src/app/lmem/notice';
+import { StatefulNotice } from '../../../src/app/lmem/notice';
 
 const expect = chai.expect;
 
-const notice1: EnhancedNotice = {
+const notice1: StatefulNotice = {
   id: 1,
   intention: 'approval',
   message: 'This is a notice',
@@ -21,7 +21,7 @@ const notice1: EnhancedNotice = {
   contributor: { id: 1, name: 'Jalil', image: '' },
   visibility: 'public',
   ratings: { dislikes: 0, likes: 0 },
-  status: { disliked: false, dismissed: false, liked: false, read: false },
+  state: { disliked: false, dismissed: false, liked: false, read: false },
   created: new Date(),
   modified: new Date()
 };

From ff049583ebec08bff26444e358593a036d65ebb4 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Fri, 17 May 2019 18:24:24 +0200
Subject: [PATCH 075/100] doc(storybook): rollback knobs removal in
 List.stories

---
 .../content/App/Notice/List/List.stories.tsx  | 90 ++++++++++++++-----
 1 file changed, 66 insertions(+), 24 deletions(-)

diff --git a/src/app/content/App/Notice/List/List.stories.tsx b/src/app/content/App/Notice/List/List.stories.tsx
index c31057a7d..856c81c2a 100644
--- a/src/app/content/App/Notice/List/List.stories.tsx
+++ b/src/app/content/App/Notice/List/List.stories.tsx
@@ -31,27 +31,69 @@ const notice: StatefulNotice = {
 storiesOf('screens/Notice/List', module)
   .addDecorator(withKnobs)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add('2 notices', () => (
-    <List
-      close={action('close')}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-      notices={[notice, notice]}
-    />
-  ))
-  .add('1 read', () => (
-    <List
-      close={action('close')}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-      notices={[notice, { ...notice, state: { ...notice.state, read: true } }]}
-    />
-  ))
-  .add('empty', () => (
-    <List
-      close={action('close')}
-      dismiss={action('dismiss')}
-      undismiss={action('undismiss')}
-      notices={[]}
-    />
-  ));
+  .add('1 notice', () => {
+    const notices = object('Notices', [notice]);
+
+    return (
+      <List
+        close={action('close')}
+        dismiss={action('dismiss')}
+        undismiss={action('undismiss')}
+        notices={notices}
+      />
+    );
+  })
+  .add('2 notices', () => {
+    const notices = object('Notices', [notice, notice]);
+
+    return (
+      <List
+        close={action('close')}
+        dismiss={action('dismiss')}
+        undismiss={action('undismiss')}
+        notices={notices}
+      />
+    );
+  })
+  .add('1 read', () => {
+    const notices = object('Notices', [notice, { ...notice, read: true }]);
+
+    return (
+      <List
+        close={action('close')}
+        dismiss={action('dismiss')}
+        undismiss={action('undismiss')}
+        notices={notices}
+      />
+    );
+  })
+  .add('empty', () => {
+    const notices = object('Notices', []);
+
+    return (
+      <List
+        close={action('close')}
+        dismiss={action('dismiss')}
+        undismiss={action('undismiss')}
+        notices={notices}
+      />
+    );
+  })
+  .add('2 lines excerpt', () => {
+    const notices = object('Notices', [
+      {
+        ...notice,
+        description:
+          'dazd zazaddd dddddd ddddd dddd dddddd ddd ddddd dddddddd dd'
+      }
+    ]);
+
+    return (
+      <List
+        close={action('close')}
+        dismiss={action('dismiss')}
+        undismiss={action('undismiss')}
+        notices={notices}
+      />
+    );
+  });

From 132fa7781272ddcc9416593d01e7a56ebbcb8e20 Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Fri, 26 Apr 2019 14:45:35 +0200
Subject: [PATCH 076/100] feat(error-reporting): add Sentry integration

Configure Sentry for each context: background, content (and iframe)
Add the webpack plugin to upload source maps to Sentry (better stacktrace)
Set a release name based on the package version and the type of build
---
 .gitignore                    |  1 +
 README.md                     | 18 ++++++++
 package.json                  |  2 +
 src/app/background/index.ts   | 20 ++++++++-
 src/app/content/App/index.tsx |  4 ++
 src/app/content/index.ts      | 10 +++++
 tsconfig.json                 |  4 +-
 webpack/config.plugins.js     | 22 ++++++++--
 yarn.lock                     | 81 ++++++++++++++++++++++++++++++++++-
 9 files changed, 153 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 90a19d111..5e20720d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ platforms/
 .flooignore
 .ftppass
 storybook-static/*
+.sentryclirc
diff --git a/README.md b/README.md
index 7326d0afa..d49274cf3 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,24 @@ nvm use lts/carbon
 yarn
 ```
 
+### Sentry
+
+To configure Sentry error reporting, you should create a `.sentryclirc` file at the root of the project directory:
+```
+[defaults]
+project=lmem
+org=insitu
+
+[auth]
+token=4d786d88c7d9436282c35b4eb82ae2dfeaff5ee296e3404ba3654ab62c151b73
+```
+> **Note 1:** You'll find your token here https://sentry.io/settings/account/api/auth-tokens/
+
+> **Note 2:** If you ever need to change the Sentry DSN go to `./webpack/config.plugins.js`.
+
+## Environments
+You'll find a bunch of env variables defined in `./webpack/config.plugins.js`.
+
 ## Development
 
 ```bash
diff --git a/package.json b/package.json
index d66e4999a..a42f07494 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
     "@semantic-release/exec": "^2.3.0",
     "@semantic-release/git": "^7.0.1",
     "@semantic-release/github": "^5.0.1",
+    "@sentry/webpack-plugin": "^1.6.2",
     "@storybook/addon-actions": "^4.1.11",
     "@storybook/addon-knobs": "^4.1.12",
     "@storybook/addons": "^4.1.11",
@@ -158,6 +159,7 @@
   },
   "dependencies": {
     "@babel/polyfill": "^7.2.5",
+    "@sentry/browser": "^5.1.1",
     "@types/date-fns": "^2.6.0",
     "@types/flat": "^0.0.28",
     "@types/history": "^4.7.2",
diff --git a/src/app/background/index.ts b/src/app/background/index.ts
index 27e4b2698..584371b7a 100644
--- a/src/app/background/index.ts
+++ b/src/app/background/index.ts
@@ -8,10 +8,22 @@ import {
 } from 'app/actions/kraftBackend';
 import onInstalled from 'app/actions/install';
 import updateDraftNotices from 'app/actions/updateDraftNotices';
+import { init, configureScope } from '@sentry/browser';
 import { getInstallationDetails } from './selectors/prefs';
 import { store } from './store';
 import fetchContentScript from './services/fetchContentScript';
 import { BackgroundState } from './reducers';
+import { version } from 'app/../../package.json';
+
+init({
+  dsn: process.env.SENTRY_DSN,
+  environment: process.env.NODE_ENV,
+  release: `${version}-${process.env.BUILD}`,
+});
+
+configureScope((scope) => {
+  scope.setTag('context', 'background');
+});
 
 if (process.env.NODE_ENV !== 'production') {
   console.info('NODE_ENV', process.env.NODE_ENV);
@@ -35,7 +47,13 @@ if (typeof heapAppId === 'string') {
       console.warn('Could not load Heap Analytics', error);
     })
     .then(heap => {
-      if (heap) setUninstallURL(heap.userId);
+      if (heap) {
+        setUninstallURL(heap.userId);
+
+        configureScope((scope) => {
+          scope.setUser({ id: heap.userId });
+        });
+      }
     })
     .catch(error => {
       console.warn('Could not load set uninstall URL', error);
diff --git a/src/app/content/App/index.tsx b/src/app/content/App/index.tsx
index f0f281c53..8e577fb36 100644
--- a/src/app/content/App/index.tsx
+++ b/src/app/content/App/index.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { ConnectedRouter } from 'connected-react-router/immutable';
 import { ThemeProvider, StyleSheetManager } from 'styled-components';
+import { configureScope } from '@sentry/browser';
 import theme from '../../theme';
 import store, { history } from '../store';
 import Content from './Content';
@@ -22,6 +23,9 @@ export default class App extends React.PureComponent<AppProps, AppState> {
 
   componentDidMount() {
     setTimeout(this.setLoaded, DELAY_BEFORE_SHOWING);
+    configureScope((scope) => {
+      scope.setTag('context', 'iframe');
+    });
   }
 
   setLoaded = () => {
diff --git a/src/app/content/index.ts b/src/app/content/index.ts
index 7df0ea1a7..dd5e4124a 100644
--- a/src/app/content/index.ts
+++ b/src/app/content/index.ts
@@ -14,4 +14,14 @@ if (!(window as CustomWindow).__LMEM__CONTENT_SCRIPT_INJECTED__) {
   });
 
   (window as CustomWindow).__LMEM__CONTENT_SCRIPT_INJECTED__ = true;
+
+  init({
+    dsn: process.env.SENTRY_DSN,
+    environment: process.env.NODE_ENV,
+    release: `${version}-${process.env.BUILD}`
+  });
+
+  configureScope((scope: any) => {
+    scope.setTag('context', 'content');
+  });
 }
diff --git a/tsconfig.json b/tsconfig.json
index 9792578fa..1f991b63a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -52,11 +52,11 @@
       "mocha"
     ] /* Type declaration files to be included in compilation. */,
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
 
     /* Source Map Options */
-    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    "sourceRoot": "./src"                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
     // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
     // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
     // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
diff --git a/webpack/config.plugins.js b/webpack/config.plugins.js
index 8ad1c5ec6..c1148a2e8 100644
--- a/webpack/config.plugins.js
+++ b/webpack/config.plugins.js
@@ -5,6 +5,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const AddAssetWebpackPlugin = require('add-asset-webpack-plugin');
 const ZipPlugin = require('zip-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
+const SentryWebpackPlugin = require('@sentry/webpack-plugin');
 
 const manifests = require('../manifest');
 const { version } = require('../package.json');
@@ -17,20 +18,23 @@ const ENV = {
     LMEM_BACKEND_ORIGIN: '"https://staging-notices.lmem.net/api/v3/"',
     UNINSTALL_ORIGIN: "'https://www.lmem.net/desinstallation'",
     HEAP_APPID: '"234457910"', // testing
-    REFRESH_MC_INTERVAL: '5*60*1000'
+    REFRESH_MC_INTERVAL: '5*60*1000',
+    SENTRY_DSN: '"https://12ed31b41955443480dbfcb5da3e3a33@sentry.io/1404898"',
   },
   chromium: {
     LMEM_BACKEND_ORIGIN: '"https://notices.lmem.net/api/v3/"',
     UNINSTALL_ORIGIN: "'https://www.lmem.net/desinstallation'",
     REFRESH_MC_INTERVAL: '30*60*1000',
     ONBOARDING_ORIGIN: '"https://bienvenue.lmem.net?extensionInstalled"',
-    HEAP_APPID: '"3705584166"' // production
+    HEAP_APPID: '"3705584166"', // production
+    SENTRY_DSN: '"https://12ed31b41955443480dbfcb5da3e3a33@sentry.io/1404898"',
   },
   firefox: {
     LMEM_BACKEND_ORIGIN: '"https://notices.lmem.net/api/v3/"',
     ONBOARDING_ORIGIN: '"https://bienvenue.lmem.net?extensionInstalled"',
-    REFRESH_MC_INTERVAL: '30*60*1000'
+    REFRESH_MC_INTERVAL: '30*60*1000',
     // No analytics with Firefox // HEAP_APPID: '"3705584166"',
+    SENTRY_DSN: '"https://12ed31b41955443480dbfcb5da3e3a33@sentry.io/1404898"',
   }
 };
 
@@ -53,7 +57,7 @@ module.exports = (env = {}, argv = {}, outputPath) => {
 
   const plugins = [
     new webpack.DefinePlugin({
-      'process.env': ENV[env.build]
+      'process.env': { ...ENV[env.build], BUILD: JSON.stringify(env.build) }
     }),
     new HtmlWebpackPlugin({
       template: './views/background.pug',
@@ -67,6 +71,16 @@ module.exports = (env = {}, argv = {}, outputPath) => {
     new CopyWebpackPlugin(copyConfig)
   ];
 
+  if (env.build !== 'dev') {
+    plugins.push(
+      new SentryWebpackPlugin({
+        include: `./build/${env.build}/js`,
+        ignore: ['test.*.js*'],
+        release: `${version}-${env.build}`,
+      })
+    )
+  }
+
   if (!env.hmr) {
     plugins.push(
       new CleanWebpackPlugin(),
diff --git a/yarn.lock b/yarn.lock
index 8e3ee76ac..ad5edb89d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1522,6 +1522,71 @@
     into-stream "^3.1.0"
     lodash "^4.17.4"
 
+"@sentry/browser@^5.1.1":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.1.1.tgz#f2bd3ac3d242c7aa670e4f02293d6808d60ff481"
+  integrity sha512-a8RCE+Ej7cHP+1BLlxMaa5BofILlojXdjBvA0bwbXsr5ZCVLLL6d0UB1FCW1oUg32NriZpCxD06iolUa+iRG8Q==
+  dependencies:
+    "@sentry/core" "5.1.0"
+    "@sentry/types" "5.1.0"
+    "@sentry/utils" "5.1.0"
+    tslib "^1.9.3"
+
+"@sentry/cli@^1.35.5":
+  version "1.41.2"
+  resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.41.2.tgz#4d3e14a9b9cc069a23146de933396d0ce9375d08"
+  dependencies:
+    fs-copy-file-sync "^1.1.1"
+    https-proxy-agent "^2.2.1"
+    mkdirp "^0.5.1"
+    node-fetch "^2.1.2"
+    progress "2.0.0"
+    proxy-from-env "^1.0.0"
+
+"@sentry/core@5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.1.0.tgz#c2a5522593cf8fe07c1da8d6af8d5fbaff3300df"
+  dependencies:
+    "@sentry/hub" "5.1.0"
+    "@sentry/minimal" "5.1.0"
+    "@sentry/types" "5.1.0"
+    "@sentry/utils" "5.1.0"
+    tslib "^1.9.3"
+
+"@sentry/hub@5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.1.0.tgz#edcff4b85c10e6f44c603202da23776af36aeca0"
+  dependencies:
+    "@sentry/types" "5.1.0"
+    "@sentry/utils" "5.1.0"
+    tslib "^1.9.3"
+
+"@sentry/minimal@5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.1.0.tgz#7892908c70d4f9f85b79eb861e561b82a170bfc2"
+  dependencies:
+    "@sentry/hub" "5.1.0"
+    "@sentry/types" "5.1.0"
+    tslib "^1.9.3"
+
+"@sentry/types@5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.1.0.tgz#2acda336c73c996b42ca03887679599c78751f10"
+
+"@sentry/utils@5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.1.0.tgz#15067fe64248948379518c23fe9949aae430cf78"
+  dependencies:
+    "@sentry/types" "5.1.0"
+    tslib "^1.9.3"
+
+"@sentry/webpack-plugin@^1.6.2":
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-1.6.2.tgz#47b1a43f7e691c1c8dc45677f7380c5e1aa6596d"
+  integrity sha512-OZ4ISH0xAP6dTHpQ3xFnIa35o+rVKZxcoCn0a41rfgM+XFdXMtw3yc+nsRHkuRpbzWzXUIisBqbBm5KcEark4A==
+  dependencies:
+    "@sentry/cli" "^1.35.5"
+
 "@sinonjs/commons@^1", "@sinonjs/commons@^1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.4.0.tgz#7b3ec2d96af481d7a0321252e7b1c94724ec5a78"
@@ -6100,6 +6165,10 @@ fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
 
+fs-copy-file-sync@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/fs-copy-file-sync/-/fs-copy-file-sync-1.1.1.tgz#11bf32c096c10d126e5f6b36d06eece776062918"
+
 fs-extra@^0.30.0:
   version "0.30.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
@@ -8806,7 +8875,7 @@ node-fetch@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.2.0.tgz#4ee79bde909262f9775f731e3656d0db55ced5b5"
 
-node-fetch@^2.2.0:
+node-fetch@^2.1.2, node-fetch@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.3.0.tgz#1a1d940bbfb916a1d3e0219f037e89e71f8c5fa5"
 
@@ -10106,6 +10175,10 @@ process@~0.5.1:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
 
+progress@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
+
 progress@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31"
@@ -10213,6 +10286,10 @@ proxy-addr@~2.0.4:
     forwarded "~0.1.2"
     ipaddr.js "1.8.0"
 
+proxy-from-env@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -12873,7 +12950,7 @@ tslib@1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
 
-tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
+tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
 

From 20dfab51aead915e934137f42406b86c809e3b7d Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Fri, 17 May 2019 11:37:20 +0200
Subject: [PATCH 077/100] feat(sentry): condition Sentry logging and version
 declaring to yarn release

---
 package.json                  |  3 +++
 src/app/background/index.ts   | 14 ++++----------
 src/app/content/App/index.tsx |  6 +++---
 src/app/content/index.ts      | 21 +++++++++------------
 src/app/utils/sentry.ts       | 19 +++++++++++++++++++
 webpack/config.plugins.js     | 18 +++++++++++-------
 6 files changed, 49 insertions(+), 32 deletions(-)
 create mode 100644 src/app/utils/sentry.ts

diff --git a/package.json b/package.json
index a42f07494..d6ca6a375 100644
--- a/package.json
+++ b/package.json
@@ -8,10 +8,13 @@
   "scripts": {
     "start": "webpack --watch --progress --hot --env.hmr --mode=development --env.build=dev",
     "build:staging": "webpack --mode=production --env.build=staging",
+    "release:staging": "webpack --mode=production --env.build=staging --env.sentry",
     "build:firefox": "webpack --mode=production --env.build=firefox",
     "build:chromium": "webpack --mode=production --env.build=chromium",
     "build:production": "yarn build:chromium && yarn build:firefox",
+    "release:production": "yarn build:chromium --env.sentry && yarn build:firefox --env.sentry",
     "build": "yarn build:staging && yarn build:production",
+    "release": "yarn release:staging && yarn release:production",
     "clean": "rm -rf build",
     "test": "LMEM_BACKEND_ORIGIN='' NODE_ENV=test ts-mocha --paths test/app/*.ts test/app/**/*.ts",
     "typecheck": "tsc --noEmit",
diff --git a/src/app/background/index.ts b/src/app/background/index.ts
index 584371b7a..501025174 100644
--- a/src/app/background/index.ts
+++ b/src/app/background/index.ts
@@ -8,20 +8,14 @@ import {
 } from 'app/actions/kraftBackend';
 import onInstalled from 'app/actions/install';
 import updateDraftNotices from 'app/actions/updateDraftNotices';
-import { init, configureScope } from '@sentry/browser';
+import { configureSentryScope, initSentry } from '../utils/sentry';
 import { getInstallationDetails } from './selectors/prefs';
 import { store } from './store';
 import fetchContentScript from './services/fetchContentScript';
 import { BackgroundState } from './reducers';
-import { version } from 'app/../../package.json';
 
-init({
-  dsn: process.env.SENTRY_DSN,
-  environment: process.env.NODE_ENV,
-  release: `${version}-${process.env.BUILD}`,
-});
-
-configureScope((scope) => {
+initSentry();
+configureSentryScope(scope => {
   scope.setTag('context', 'background');
 });
 
@@ -50,7 +44,7 @@ if (typeof heapAppId === 'string') {
       if (heap) {
         setUninstallURL(heap.userId);
 
-        configureScope((scope) => {
+        configureSentryScope(scope => {
           scope.setUser({ id: heap.userId });
         });
       }
diff --git a/src/app/content/App/index.tsx b/src/app/content/App/index.tsx
index 8e577fb36..9b1600e51 100644
--- a/src/app/content/App/index.tsx
+++ b/src/app/content/App/index.tsx
@@ -2,10 +2,10 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { ConnectedRouter } from 'connected-react-router/immutable';
 import { ThemeProvider, StyleSheetManager } from 'styled-components';
-import { configureScope } from '@sentry/browser';
 import theme from '../../theme';
-import store, { history } from '../store';
 import Content from './Content';
+import store, { history } from '../store';
+import { configureSentryScope } from '../../utils/sentry';
 
 const DELAY_BEFORE_SHOWING = process.env.NODE_ENV === 'production' ? 4000 : 10;
 
@@ -23,7 +23,7 @@ export default class App extends React.PureComponent<AppProps, AppState> {
 
   componentDidMount() {
     setTimeout(this.setLoaded, DELAY_BEFORE_SHOWING);
-    configureScope((scope) => {
+    configureSentryScope(scope => {
       scope.setTag('context', 'iframe');
     });
   }
diff --git a/src/app/content/index.ts b/src/app/content/index.ts
index dd5e4124a..3800e3a7b 100644
--- a/src/app/content/index.ts
+++ b/src/app/content/index.ts
@@ -1,10 +1,19 @@
 if (!(window as CustomWindow).__LMEM__CONTENT_SCRIPT_INJECTED__) {
+  const { configureSentryScope, initSentry } = require('../utils/sentry');
+
+  initSentry();
+  configureSentryScope((scope: any) => {
+    scope.setTag('context', 'content');
+  });
+
   require('typeface-lato');
   require('typeface-sedgwick-ave');
   const store = require('./store').default;
   const externalClickHandler = require('./externalClickHandler').default;
   const handleExternalClick = externalClickHandler(store);
 
+  (window as CustomWindow).__LMEM__CONTENT_SCRIPT_INJECTED__ = true;
+
   window.addEventListener('load', () => {
     document.addEventListener('click', handleExternalClick);
   });
@@ -12,16 +21,4 @@ if (!(window as CustomWindow).__LMEM__CONTENT_SCRIPT_INJECTED__) {
   window.addEventListener('unload', () => {
     document.removeEventListener('click', handleExternalClick);
   });
-
-  (window as CustomWindow).__LMEM__CONTENT_SCRIPT_INJECTED__ = true;
-
-  init({
-    dsn: process.env.SENTRY_DSN,
-    environment: process.env.NODE_ENV,
-    release: `${version}-${process.env.BUILD}`
-  });
-
-  configureScope((scope: any) => {
-    scope.setTag('context', 'content');
-  });
 }
diff --git a/src/app/utils/sentry.ts b/src/app/utils/sentry.ts
new file mode 100644
index 000000000..6fafb39e8
--- /dev/null
+++ b/src/app/utils/sentry.ts
@@ -0,0 +1,19 @@
+import { init, configureScope, Scope } from '@sentry/browser';
+import { version } from '../../../package.json';
+
+export const initSentry = () => {
+  if (process.env.SENTRY_ENABLE) {
+    init({
+      dsn: process.env.SENTRY_DSN,
+      environment: process.env.NODE_ENV,
+      release: `${version}-${process.env.BUILD}`
+    });
+  }
+};
+
+type ScopeCallback = (scope: Scope) => void;
+export const configureSentryScope = (scopeCallback: ScopeCallback) => {
+  if (process.env.SENTRY_ENABLE) {
+    configureScope(scopeCallback);
+  }
+};
diff --git a/webpack/config.plugins.js b/webpack/config.plugins.js
index c1148a2e8..db379e4f6 100644
--- a/webpack/config.plugins.js
+++ b/webpack/config.plugins.js
@@ -19,7 +19,7 @@ const ENV = {
     UNINSTALL_ORIGIN: "'https://www.lmem.net/desinstallation'",
     HEAP_APPID: '"234457910"', // testing
     REFRESH_MC_INTERVAL: '5*60*1000',
-    SENTRY_DSN: '"https://12ed31b41955443480dbfcb5da3e3a33@sentry.io/1404898"',
+    SENTRY_DSN: '"https://12ed31b41955443480dbfcb5da3e3a33@sentry.io/1404898"'
   },
   chromium: {
     LMEM_BACKEND_ORIGIN: '"https://notices.lmem.net/api/v3/"',
@@ -27,14 +27,14 @@ const ENV = {
     REFRESH_MC_INTERVAL: '30*60*1000',
     ONBOARDING_ORIGIN: '"https://bienvenue.lmem.net?extensionInstalled"',
     HEAP_APPID: '"3705584166"', // production
-    SENTRY_DSN: '"https://12ed31b41955443480dbfcb5da3e3a33@sentry.io/1404898"',
+    SENTRY_DSN: '"https://12ed31b41955443480dbfcb5da3e3a33@sentry.io/1404898"'
   },
   firefox: {
     LMEM_BACKEND_ORIGIN: '"https://notices.lmem.net/api/v3/"',
     ONBOARDING_ORIGIN: '"https://bienvenue.lmem.net?extensionInstalled"',
     REFRESH_MC_INTERVAL: '30*60*1000',
     // No analytics with Firefox // HEAP_APPID: '"3705584166"',
-    SENTRY_DSN: '"https://12ed31b41955443480dbfcb5da3e3a33@sentry.io/1404898"',
+    SENTRY_DSN: '"https://12ed31b41955443480dbfcb5da3e3a33@sentry.io/1404898"'
   }
 };
 
@@ -57,7 +57,11 @@ module.exports = (env = {}, argv = {}, outputPath) => {
 
   const plugins = [
     new webpack.DefinePlugin({
-      'process.env': { ...ENV[env.build], BUILD: JSON.stringify(env.build) }
+      'process.env': {
+        ...ENV[env.build],
+        BUILD: JSON.stringify(env.build),
+        SENTRY_ENABLE: env.sentry ? 'true' : 'false'
+      }
     }),
     new HtmlWebpackPlugin({
       template: './views/background.pug',
@@ -71,14 +75,14 @@ module.exports = (env = {}, argv = {}, outputPath) => {
     new CopyWebpackPlugin(copyConfig)
   ];
 
-  if (env.build !== 'dev') {
+  if (env.sentry) {
     plugins.push(
       new SentryWebpackPlugin({
         include: `./build/${env.build}/js`,
         ignore: ['test.*.js*'],
-        release: `${version}-${env.build}`,
+        release: `${version}-${env.build}`
       })
-    )
+    );
   }
 
   if (!env.hmr) {

From caae4a1b12978dc3212b68c0292fbf85a711883d Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Sat, 18 May 2019 13:35:39 +0200
Subject: [PATCH 078/100] doc(readme): better default values for sentry

---
 README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d49274cf3..7fb89db39 100644
--- a/README.md
+++ b/README.md
@@ -28,19 +28,22 @@ yarn
 ### Sentry
 
 To configure Sentry error reporting, you should create a `.sentryclirc` file at the root of the project directory:
+
 ```
 [defaults]
-project=lmem
-org=insitu
+project=web-extension
+org=lmem
 
 [auth]
 token=4d786d88c7d9436282c35b4eb82ae2dfeaff5ee296e3404ba3654ab62c151b73
 ```
+
 > **Note 1:** You'll find your token here https://sentry.io/settings/account/api/auth-tokens/
 
 > **Note 2:** If you ever need to change the Sentry DSN go to `./webpack/config.plugins.js`.
 
 ## Environments
+
 You'll find a bunch of env variables defined in `./webpack/config.plugins.js`.
 
 ## Development

From dba68b1886cb1f31d5f7fb5a8a26975610aad249 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Sat, 18 May 2019 13:36:03 +0200
Subject: [PATCH 079/100] chore(version): version 2.1.0

---
 manifest/chromium.js | 1 +
 manifest/staging.js  | 1 +
 package.json         | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/manifest/chromium.js b/manifest/chromium.js
index fb707da11..e0d1e9fae 100644
--- a/manifest/chromium.js
+++ b/manifest/chromium.js
@@ -6,6 +6,7 @@ module.exports = {
   content_security_policy: csp({
     directives: {
       'default-src': ['https://reco2bulle.lmem.net'],
+      'connect-src': ['https://sentry.io/api'],
       'script-src': [
         "'self'",
         'https://heapanalytics.com',
diff --git a/manifest/staging.js b/manifest/staging.js
index 5e950248f..cc457c23b 100644
--- a/manifest/staging.js
+++ b/manifest/staging.js
@@ -7,6 +7,7 @@ module.exports = {
   content_security_policy: csp({
     directives: {
       'default-src': ['https://staging-notices.lmem.net'],
+      'connect-src': ['https://sentry.io/api'],
       'script-src': [
         "'self'",
         "'unsafe-eval'",
diff --git a/package.json b/package.json
index d6ca6a375..7935c18b0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lmem-recommendations",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "LMEM Recommendations web extensions using React+Redux.",
   "engines": {
     "node": ">=8"

From fd027409a21d8c44c0671df146b6ebe089e27df4 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Sat, 18 May 2019 13:38:13 +0200
Subject: [PATCH 080/100] fix(heap): fix heap declaration

---
 src/lib/heap.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/lib/heap.ts b/src/lib/heap.ts
index 30b7f9f53..cf39f9458 100644
--- a/src/lib/heap.ts
+++ b/src/lib/heap.ts
@@ -3,12 +3,17 @@ export const loadHeap = (appId: string): Promise<Heap> => {
   // heap lib injection in window object
   /* tslint:disable */
   // @ts-ignore
-  window.heap=window.heap||[],heap.load=function(e,t){window.heap.appid=e,window.heap.config=t=t||{};var r=t.forceSSL||"https:"===document.location.protocol,a=document.createElement("script");a.type="text/javascript",a.async=!0,a.src=(r?"https:":"http:")+"//cdn.heapanalytics.com/js/heap-"+e+".js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(a,n);for(var o=function(e){return function(){heap.push([e].concat(Array.prototype.slice.call(arguments,0)))}},p=["addEventProperties","addUserProperties","clearEventProperties","identify","removeEventProperty","setEventProperties","track","unsetEventProperty"],c=0;c<p.length;c++)heap[p[c]]=o(p[c])};
+  window.heap = window.heap||[];
+  // @ts-ignore
+  window.heap.load=function(e,t) {
+    // @ts-ignore
+    window.heap.appid=e,window.heap.config=t=t||{};var r=t.forceSSL||"https:"===document.location.protocol,a=document.createElement("script");a.type="text/javascript",a.async=!0,a.src=(r?"https:":"http:")+"//cdn.heapanalytics.com/js/heap-"+e+".js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(a,n);for(var o=function(e){return function(){heap.push([e].concat(Array.prototype.slice.call(arguments,0)))}},p=["addEventProperties","addUserProperties","clearEventProperties","identify","removeEventProperty","setEventProperties","track","unsetEventProperty"],c=0;c<p.length;c++)heap[p[c]]=o(p[c])
+  };
   /* tslint:enable */
 
-  const heap = (window as CustomWindow).heap;
-  if (heap) {
-    heap.load(appId, { forceSSL: true });
+  const win = window as CustomWindow;
+  if (win.heap) {
+    win.heap.load(appId, { forceSSL: true });
   }
 
   return new Promise(resolve => {

From b68b0f27bfbac8de9d66e7dc5e1447b89fab9424 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Mon, 20 May 2019 13:09:35 +0200
Subject: [PATCH 081/100] chore(version): 2.1.2 - Fix manifest permission for
 Sentry

---
 manifest/chromium.js | 5 ++++-
 manifest/staging.js  | 5 ++++-
 package.json         | 2 +-
 src/lib/heap.ts      | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/manifest/chromium.js b/manifest/chromium.js
index e0d1e9fae..df3ad9e34 100644
--- a/manifest/chromium.js
+++ b/manifest/chromium.js
@@ -6,7 +6,10 @@ module.exports = {
   content_security_policy: csp({
     directives: {
       'default-src': ['https://reco2bulle.lmem.net'],
-      'connect-src': ['https://sentry.io/api'],
+      'connect-src': [
+        'https://staging-notices.lmem.net',
+        'https://sentry.io/api/*'
+      ],
       'script-src': [
         "'self'",
         'https://heapanalytics.com',
diff --git a/manifest/staging.js b/manifest/staging.js
index cc457c23b..c045af7e6 100644
--- a/manifest/staging.js
+++ b/manifest/staging.js
@@ -7,7 +7,10 @@ module.exports = {
   content_security_policy: csp({
     directives: {
       'default-src': ['https://staging-notices.lmem.net'],
-      'connect-src': ['https://sentry.io/api'],
+      'connect-src': [
+        'https://staging-notices.lmem.net',
+        'https://sentry.io/api/*'
+      ],
       'script-src': [
         "'self'",
         "'unsafe-eval'",
diff --git a/package.json b/package.json
index 7935c18b0..20f8b5313 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lmem-recommendations",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "LMEM Recommendations web extensions using React+Redux.",
   "engines": {
     "node": ">=8"
diff --git a/src/lib/heap.ts b/src/lib/heap.ts
index cf39f9458..f529c5b78 100644
--- a/src/lib/heap.ts
+++ b/src/lib/heap.ts
@@ -18,7 +18,7 @@ export const loadHeap = (appId: string): Promise<Heap> => {
 
   return new Promise(resolve => {
     (function heapLoader() {
-      if (heap && heap.loaded && heap.userId) resolve(heap);
+      if (win.heap && win.heap.loaded && win.heap.userId) resolve(win.heap);
       else setTimeout(heapLoader, 100);
     })();
   });

From 501cac12e862ea21d43fbcc2991160f8fe94206d Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Mon, 20 May 2019 14:41:52 +0200
Subject: [PATCH 082/100] feat(ratings): restore (dis)likes count on
 NoticeDetails

---
 src/components/organisms/NoticeDetails/NoticeDetails.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
index a262eb7ed..975f07f4e 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
@@ -71,6 +71,7 @@ class NoticeDetails extends PureComponent<
         created,
         contributor,
         source,
+        ratings: { likes, dislikes },
         state: { liked, disliked, dismissed }
       }
     } = this.props;
@@ -94,9 +95,11 @@ class NoticeDetails extends PureComponent<
           <Feedbacks>
             <Button onClick={this.handleLikeClick}>
               <Like active={liked} />
+              {likes}
             </Button>
             <Button onClick={this.handleDislikeClick}>
               <Dislike active={disliked} />
+              {dislikes}
             </Button>
           </Feedbacks>
 

From a8216d379add0fad629462ae08020c8a9711bad9 Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Wed, 22 May 2019 11:40:43 +0200
Subject: [PATCH 083/100] fix(badge): only count notices to display and handle
 feedbacks on notice

fix #285
---
 src/app/background/sagas/badge.ts | 6 ++++--
 src/app/content/sagas/notices.ts  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/background/sagas/badge.ts b/src/app/background/sagas/badge.ts
index d3d38a665..171d3f4f3 100644
--- a/src/app/background/sagas/badge.ts
+++ b/src/app/background/sagas/badge.ts
@@ -1,14 +1,16 @@
-import { takeLatest } from 'redux-saga/effects';
+import { takeLatest, call, select } from 'redux-saga/effects';
 import { NoticesUpdatedAction } from '../../actions/notices';
 import { BadgeTheme, updateBadge, resetBadge } from '../../lmem/badge';
 import { TabAction } from '../../actions';
+import { getNoticesToDisplay } from '../selectors/prefs';
 
 export const updateBadgeSaga = (badgeTheme: BadgeTheme) =>
   function*({
     payload: notices,
     meta: { tab: tabId }
   }: NoticesUpdatedAction): IterableIterator<any> {
-    updateBadge(notices, badgeTheme, tabId);
+    const noticesToDisplay = yield select(getNoticesToDisplay(notices));
+    yield call(updateBadge, noticesToDisplay, badgeTheme, tabId);
   };
 
 export function* resetBadgeSaga({
diff --git a/src/app/content/sagas/notices.ts b/src/app/content/sagas/notices.ts
index 6739a792e..acdd75d42 100644
--- a/src/app/content/sagas/notices.ts
+++ b/src/app/content/sagas/notices.ts
@@ -9,5 +9,5 @@ export function* updateNoticesSaga() {
 }
 
 export default function* noticesRootSaga() {
-  yield takeLatest('READ_NOTICE', updateNoticesSaga);
+  yield takeLatest(['READ_NOTICE', 'FEEDBACK_ON_NOTICE'], updateNoticesSaga);
 }

From 6e68f3578e77558b67769fbae184ed2ec9e89303 Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Fri, 24 May 2019 11:05:15 +0200
Subject: [PATCH 084/100] chore(env): check if ONBOARDING_ORIGIN is defined
 before using it

---
 src/app/background/index.ts | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/app/background/index.ts b/src/app/background/index.ts
index 501025174..cebff5e8e 100644
--- a/src/app/background/index.ts
+++ b/src/app/background/index.ts
@@ -19,13 +19,21 @@ configureSentryScope(scope => {
   scope.setTag('context', 'background');
 });
 
-if (process.env.NODE_ENV !== 'production') {
-  console.info('NODE_ENV', process.env.NODE_ENV);
+const {
+  NODE_ENV,
+  UNINSTALL_ORIGIN,
+  HEAP_APPID,
+  ONBOARDING_ORIGIN,
+  REFRESH_MC_INTERVAL
+} = process.env;
+
+if (NODE_ENV !== 'production') {
+  console.info('NODE_ENV', NODE_ENV);
 }
 console.info(`LMEM_BACKEND_ORIGIN "${LMEM_BACKEND_ORIGIN}"`);
 
 const setUninstallURL = (heapUserId: string) => {
-  const uninstallOrigin = process.env.UNINSTALL_ORIGIN;
+  const uninstallOrigin = UNINSTALL_ORIGIN;
   if (typeof uninstallOrigin === 'string') {
     chrome.runtime.setUninstallURL(
       uninstallOrigin + '?u=' + encodeURIComponent(heapUserId || '-1')
@@ -33,7 +41,7 @@ const setUninstallURL = (heapUserId: string) => {
   }
 };
 
-const heapAppId = process.env.HEAP_APPID;
+const heapAppId = HEAP_APPID;
 if (typeof heapAppId === 'string') {
   console.info(`Heap loading with appId "${heapAppId}"`);
   loadHeap(heapAppId)
@@ -65,15 +73,21 @@ fetchContentScript('/js/grabDraftNotices.js').then(contentCode =>
   )
 );
 
-const state: BackgroundState = store.getState();
-if (!getInstallationDetails(state).datetime) {
-  onInstalled(process.env.ONBOARDING_ORIGIN)(store.dispatch);
+if (ONBOARDING_ORIGIN) {
+  const state: BackgroundState = store.getState();
+  if (!getInstallationDetails(state).datetime) {
+    onInstalled(ONBOARDING_ORIGIN)(store.dispatch);
+  }
+} else {
+  console.warn(
+    'No installation details: assuming "process.env.ONBOARDING_ORIGIN" is deliberately not defined.'
+  );
 }
 
 dispatchInitialStateFromBackend()(store.dispatch);
 // store initialization from the kraft server
 
-const refreshInterval = Number(process.env.REFRESH_MC_INTERVAL);
+const refreshInterval = Number(REFRESH_MC_INTERVAL);
 if (refreshInterval > 0) {
   console.info(
     `Matching contexts will be refreshed every ${refreshInterval /

From c376687e787dbae9c696ecf32f29debc17a0b13a Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Mon, 6 May 2019 11:01:41 +0200
Subject: [PATCH 085/100] fix(UI): changed read more link design

---
 .../organisms/NoticeDetails/Message.tsx       |  4 ++++
 .../organisms/NoticeDetails/NoticeDetails.tsx |  3 +--
 .../NoticeDetails/Source/AnchorIcon.tsx       | 23 -------------------
 .../organisms/NoticeDetails/Source/Source.ts  |  7 +-----
 4 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 src/components/organisms/NoticeDetails/Source/AnchorIcon.tsx

diff --git a/src/components/organisms/NoticeDetails/Message.tsx b/src/components/organisms/NoticeDetails/Message.tsx
index 5e7b4b041..c846921a5 100644
--- a/src/components/organisms/NoticeDetails/Message.tsx
+++ b/src/components/organisms/NoticeDetails/Message.tsx
@@ -7,6 +7,10 @@ const MessageBlock = styled.div`
     font-size: 15px;
     line-height: 1.4;
     color: ${props => props.theme.primaryColor};
+
+    &:last-of-type {
+      margin-bottom: 0;
+    }
   }
 `;
 
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
index 975f07f4e..8239b4245 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
@@ -4,7 +4,6 @@ import { Contributor, Button, BorderButton } from '../../atoms';
 import Like from '../../atoms/icons/types/Like';
 import Dislike from '../../atoms/icons/types/Dislike';
 import Source from './Source/Source';
-import Anchor from './Source/AnchorIcon';
 import SourceURL from './Source/SourceURL';
 import DetailsContainer from './DetailsContainer';
 import DetailsContent from './DetailsContent';
@@ -88,7 +87,7 @@ class NoticeDetails extends PureComponent<
           <Message>{message}</Message>
           {source && (
             <Source>
-              <Anchor /> En savoir plus : <SourceURL>{source.url}</SourceURL>
+              En savoir plus : <SourceURL>{source.url}</SourceURL>
             </Source>
           )}
 
diff --git a/src/components/organisms/NoticeDetails/Source/AnchorIcon.tsx b/src/components/organisms/NoticeDetails/Source/AnchorIcon.tsx
deleted file mode 100644
index 0b6834a09..000000000
--- a/src/components/organisms/NoticeDetails/Source/AnchorIcon.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-
-export default () => (
-  <svg width="20.757" height="20.761">
-    <path
-      fill="#404348"
-      d="M4.84 20.761a4.843 4.843 0 0 1-3.425-8.265l4.4-4.4a4.844 4.844 0 0 1 6.037-.654 4.707 
-      4.707 0 0 1 .813.654 1.37 1.37 0 0 1 0 1.944 1.418 1.418 0 0 1-1.944 0 2.076 2.076 0 
-      0 0-2.934 0l-4.418 4.414a2.077 2.077 0 1 0 2.937 2.937l2.612-2.615a.346.346 0 0 1 .377-.076 
-      5.823 5.823 0 0 0 2.214.429h.138a.346.346 0 0 1 .246.592l-3.632 3.632a4.812 4.812 0 0 1-3.421 1.408z"
-    />
-    <path
-      fill="#404348"
-      d="M11.531 14.087h-.263a4.8 4.8 0 0 1-.515-.048 5.867 5.867 0 0 
-      1-.419-.086l-.2-.055c-.073-.021-.149-.045-.221-.073s-.149-.052-.221-.083-.145-.059-.218-.093a4.8 
-      4.8 0 0 1-1.384-.969 1.379 1.379 0 0 1 0-1.951 1.418 1.418 0 0 1 1.944 0 2.076 2.076 
-      0 0 0 2.934 0l1.135-1.128.028-.031 3.245-3.242a2.077 2.077 0 0 0-2.937-2.937l-2.6 2.6a.346.346 
-      0 0 1-.377.076 5.812 5.812 0 0 0-2.211-.432h-.128a.347.347 0 0 1-.253-.592l3.629-3.626a4.844 
-      4.844 0 0 1 6.85 6.85l-4.4 4.4a4.844 4.844 0 0 1-2.245 
-      1.273h-.053l-.2.041-.111.021-.239.035h-.118c-.09 0-.17.017-.246.021z"
-    />
-  </svg>
-);
diff --git a/src/components/organisms/NoticeDetails/Source/Source.ts b/src/components/organisms/NoticeDetails/Source/Source.ts
index 45305dd3f..9c01f5531 100644
--- a/src/components/organisms/NoticeDetails/Source/Source.ts
+++ b/src/components/organisms/NoticeDetails/Source/Source.ts
@@ -1,11 +1,6 @@
 import styled from 'styled-components';
 
 export default styled.div`
-  font-size: 12px;
+  font-size: 15px;
   font-weight: bold;
-
-  & > svg {
-    margin-right: 5px;
-    vertical-align: bottom;
-  }
 `;

From 8b4ec0b0fe22858f0c5a3cdef8e3b2841f050047 Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Thu, 9 May 2019 10:06:10 +0200
Subject: [PATCH 086/100] tried to add Bulle Details to storybook

---
 src/app/content/App/Notice/Details/Details.stories.tsx | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 src/app/content/App/Notice/Details/Details.stories.tsx

diff --git a/src/app/content/App/Notice/Details/Details.stories.tsx b/src/app/content/App/Notice/Details/Details.stories.tsx
new file mode 100644
index 000000000..a56f2838e
--- /dev/null
+++ b/src/app/content/App/Notice/Details/Details.stories.tsx
@@ -0,0 +1,8 @@
+import React from 'react';
+import { MemoryRouter as Router } from 'react-router-dom';
+import { storiesOf } from '@storybook/react';
+import Details from '.';
+
+storiesOf('screens/Notice/Details', module)
+  .addDecorator(getStory => <Router>{getStory()}</Router>)
+  .add('default', () => <Details />);

From 269af49772e08b226a878a702aedcd0dd8c7af14 Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Mon, 6 May 2019 11:01:41 +0200
Subject: [PATCH 087/100] fix(UI): changed read more link design

---
 .../organisms/NoticeDetails/NoticeDetails.stories.tsx      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
index 76c4a9a8f..7e4e5e0b7 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
@@ -12,13 +12,12 @@ const baseNotice: StatefulNotice = {
   created: subMonths(new Date(), 1),
   modified: subWeeks(new Date(), 1),
   message: `
-<p>Un message qui décrit <a href="http://www.lmem.net">quelque chose</a> et donc ça prend beaucoup de mots. </p>
-<p>Il peut aussi y avoir plusieurs paragraphes, <a href="http://www.lmem.net">avec encore des liens</a></p>
+<p>L’économie est (vraiment) un sport de combat : “La boule puante de MM. Cahuc et Zylberberg contre le “négationnisme” des économistes critiques le confirme : le combat idéologique tombe parfois dans le caniveau. Depuis vingt ans pourtant, s’est construit en France une contre-expertise économique crédible qui veut fournir aux dominés des outils pour penser (et résister à) la pseudo” construit en France une contre-expertise</p>
 `,
   ratings: { likes: 42, dislikes: 2 },
   contributor: { id: 1, name: 'Jalil' },
   visibility: 'public',
-  source: { label: 'LMEM', url: 'http://www.lmem.net' },
+  source: { label: 'LMEM', url: 'https://blogs.mediapart.fr/thomas-coutrot/blog/040916/leconomie-est-vraiment-un-sport-de-combat' },
   state: {
     liked: false,
     dismissed: false,
@@ -27,7 +26,7 @@ const baseNotice: StatefulNotice = {
   }
 };
 
-const message = storiesOf('organisms/NoticeDetails', module)
+storiesOf('organisms/NoticeDetails', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
   .add('Approval', () => (
     <NoticeDetails

From 6da174b99142863de13e55ef1386ffc38511b874 Mon Sep 17 00:00:00 2001
From: newick <erick@entre-quote.com>
Date: Mon, 6 May 2019 11:27:10 +0200
Subject: [PATCH 088/100] fix(Details): changed read more url width

---
 src/components/organisms/NoticeDetails/Source/Container.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/organisms/NoticeDetails/Source/Container.ts b/src/components/organisms/NoticeDetails/Source/Container.ts
index ac83339b6..ac1b6699e 100644
--- a/src/components/organisms/NoticeDetails/Source/Container.ts
+++ b/src/components/organisms/NoticeDetails/Source/Container.ts
@@ -5,7 +5,7 @@ export default styled(ExternalLink)`
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  width: 66%;
+  width: 65%;
   display: inline-block;
   vertical-align: bottom;
 `;

From db4d9607924335808ba2a3bb559646dc7cc435dd Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Thu, 9 May 2019 22:48:02 +0200
Subject: [PATCH 089/100] fix(notices): correct <Notice/Details> props typing

---
 .../App/Notice/Details/Details.stories.tsx    | 33 +++++++++++++++++--
 src/app/content/App/Notice/Details/types.ts   | 12 +------
 .../content/App/Notice/Details/withConnect.ts | 12 ++++---
 3 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/src/app/content/App/Notice/Details/Details.stories.tsx b/src/app/content/App/Notice/Details/Details.stories.tsx
index a56f2838e..876ca1824 100644
--- a/src/app/content/App/Notice/Details/Details.stories.tsx
+++ b/src/app/content/App/Notice/Details/Details.stories.tsx
@@ -1,8 +1,37 @@
 import React from 'react';
 import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
-import Details from '.';
+import { Details } from '.';
+import { action } from '@storybook/addon-actions';
 
 storiesOf('screens/Notice/Details', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add('default', () => <Details />);
+  .add('default', () => (
+    <Details
+      notice={{
+        id: 42,
+        title: 'Title will be removed',
+        description: "This is the notice's message. It can be short or long.",
+        visibility: 'public',
+        alternatives: [],
+        contributor: { name: 'John Doe', organization: 'ORG', image: 'image' },
+        resource: {
+          author: 'author',
+          label: 'resource',
+          url: 'http://w',
+          editor: { id: 1, label: 'editor', url: 'http://x' }
+        },
+        criteria: [],
+        liked: false,
+        likes: 12,
+        disliked: false,
+        dislikes: 1,
+        dismissed: false,
+        valid: true
+      }}
+      like={action('like')}
+      unlike={action('unlike')}
+      dislike={action('dislike')}
+      undislike={action('undislike')}
+    />
+  ));
diff --git a/src/app/content/App/Notice/Details/types.ts b/src/app/content/App/Notice/Details/types.ts
index 487bf23dc..00433da8c 100644
--- a/src/app/content/App/Notice/Details/types.ts
+++ b/src/app/content/App/Notice/Details/types.ts
@@ -1,15 +1,5 @@
-import { RouteComponentProps } from 'react-router';
 import { StatefulNotice } from 'app/lmem/notice';
-import { FeedbackOnNoticeAction, ReadNoticeAction } from 'app/actions/notices';
 
-interface OwnProps {
+export interface DetailsProps {
   notice?: StatefulNotice;
-  like: (id: number) => FeedbackOnNoticeAction;
-  unlike: (id: number) => FeedbackOnNoticeAction;
-  dislike: (id: number) => FeedbackOnNoticeAction;
-  undislike: (id: number) => FeedbackOnNoticeAction;
-  view: (id: number) => ReadNoticeAction;
-  close?: () => void;
 }
-
-export type DetailsProps = OwnProps & RouteComponentProps;
diff --git a/src/app/content/App/Notice/Details/withConnect.ts b/src/app/content/App/Notice/Details/withConnect.ts
index 0f291d228..c8d1aa70e 100644
--- a/src/app/content/App/Notice/Details/withConnect.ts
+++ b/src/app/content/App/Notice/Details/withConnect.ts
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { getNoticeById } from '../../../selectors';
+import { RouteComponentProps } from 'react-router';
 import {
   likeNotice,
   unlikeNotice,
@@ -9,9 +9,13 @@ import {
 } from 'app/actions/notices';
 import { close } from 'app/actions/ui';
 import { State } from '../../../store';
+import { getNoticeById } from '../../../selectors';
 import { DetailsProps } from './types';
 
-const mapStateToProps = (state: State, props: DetailsProps) => ({
+const mapStateToProps = (
+  state: State,
+  props: DetailsProps & RouteComponentProps
+) => ({
   notice: getNoticeById(state, props)
 });
 
@@ -20,8 +24,8 @@ const mapDispatchToProps = {
   unlike: unlikeNotice,
   dislike: dislikeNotice,
   undislike: undislikeNotice,
-  close,
-  view: readNotice
+  view: readNotice,
+  close
 };
 
 export default connect(

From 41b6967f6437c969fadaf4b04be91f1557f1274d Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Mon, 20 May 2019 17:12:54 +0200
Subject: [PATCH 090/100] doc(storybook): add knobs to NoticeDetails

---
 package.json                                  |  2 +
 .../App/Notice/Details/Details.stories.tsx    | 56 +++++++++++-------
 src/app/content/App/Notice/Details/index.tsx  |  8 ++-
 .../content/App/Notice/Details/withConnect.ts | 19 +++++-
 .../NoticeDetails/NoticeDetails.stories.tsx   |  6 +-
 .../organisms/NoticeDetails/NoticeDetails.tsx |  1 +
 test/fakers/generateNotice.ts                 | 59 +++++++++++++++++++
 yarn.lock                                     | 10 ++++
 8 files changed, 133 insertions(+), 28 deletions(-)
 create mode 100644 test/fakers/generateNotice.ts

diff --git a/package.json b/package.json
index 20f8b5313..7a02ba406 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,7 @@
     "@storybook/react": "^4.1.11",
     "@types/chai": "^4.1.7",
     "@types/chrome": "^0.0.81",
+    "@types/faker": "^4.1.5",
     "@types/mocha": "^5.2.6",
     "@types/redux-immutable-state-invariant": "^2.1.0",
     "@types/redux-logger": "^3.0.7",
@@ -117,6 +118,7 @@
     "eslint-plugin-module-resolver": "^0.8.0",
     "eslint-plugin-react": "^7.11.1",
     "expect": "^1.15.2",
+    "faker": "^4.1.0",
     "file-loader": "^2.0.0",
     "html-webpack-plugin": "^3.2.0",
     "husky": "^1.3.1",
diff --git a/src/app/content/App/Notice/Details/Details.stories.tsx b/src/app/content/App/Notice/Details/Details.stories.tsx
index 876ca1824..49acdb93b 100644
--- a/src/app/content/App/Notice/Details/Details.stories.tsx
+++ b/src/app/content/App/Notice/Details/Details.stories.tsx
@@ -1,37 +1,49 @@
 import React from 'react';
 import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
-import { Details } from '.';
 import { action } from '@storybook/addon-actions';
+import {
+  withKnobs,
+  text,
+  select,
+  date,
+  number,
+  boolean
+} from '@storybook/addon-knobs';
+import Faker from 'faker';
+import {
+  defaultSourceUrl,
+  generateStatefulNotice
+} from '../../../../../../test/fakers/generateNotice';
+import { Details } from '.';
+import { intentions } from '../../../../lmem/intention';
+import { subMonths } from 'date-fns';
+
+const defaultContributorName = Faker.name.findName();
+const defaultMessage = Faker.lorem.paragraph(3);
+const defaultDate = subMonths(new Date(), 1);
 
 storiesOf('screens/Notice/Details', module)
+  .addDecorator(withKnobs)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
   .add('default', () => (
     <Details
-      notice={{
-        id: 42,
-        title: 'Title will be removed',
-        description: "This is the notice's message. It can be short or long.",
-        visibility: 'public',
-        alternatives: [],
-        contributor: { name: 'John Doe', organization: 'ORG', image: 'image' },
-        resource: {
-          author: 'author',
-          label: 'resource',
-          url: 'http://w',
-          editor: { id: 1, label: 'editor', url: 'http://x' }
-        },
-        criteria: [],
-        liked: false,
-        likes: 12,
-        disliked: false,
-        dislikes: 1,
-        dismissed: false,
-        valid: true
-      }}
+      notice={generateStatefulNotice({
+        contributor: text('contributor', defaultContributorName),
+        intention: select('intention', intentions, 'approval'),
+        message: `<p>${text('message', defaultMessage)}</p>`,
+        sourceUrl: text('source', defaultSourceUrl),
+        created: date('created', defaultDate),
+        likes: number('likes', 42),
+        dislikes: number('dislikes', 2),
+        liked: boolean('liked', false),
+        disliked: boolean('disliked', false)
+      })}
       like={action('like')}
       unlike={action('unlike')}
       dislike={action('dislike')}
       undislike={action('undislike')}
+      view={action('view')}
+      close={action('close')}
     />
   ));
diff --git a/src/app/content/App/Notice/Details/index.tsx b/src/app/content/App/Notice/Details/index.tsx
index d3dea32a9..effd5d6e5 100644
--- a/src/app/content/App/Notice/Details/index.tsx
+++ b/src/app/content/App/Notice/Details/index.tsx
@@ -1,8 +1,10 @@
 import React from 'react';
 import Notification from '../../../../../components/organisms/Notification';
 import NoticeDetails from '../../../../../components/organisms/NoticeDetails/NoticeDetails';
-import withConnect from './withConnect';
-import { DetailsProps } from './types';
+import withConnect, {
+  DetailsDispatchProps,
+  DetailsStateProps
+} from './withConnect';
 
 export const Details = ({
   notice,
@@ -12,7 +14,7 @@ export const Details = ({
   undislike,
   close,
   view
-}: DetailsProps) =>
+}: DetailsDispatchProps & DetailsStateProps) =>
   notice ? (
     <Notification title="Détail de la bulle" hasNotices close={close}>
       <NoticeDetails
diff --git a/src/app/content/App/Notice/Details/withConnect.ts b/src/app/content/App/Notice/Details/withConnect.ts
index c8d1aa70e..b3a9b4c8d 100644
--- a/src/app/content/App/Notice/Details/withConnect.ts
+++ b/src/app/content/App/Notice/Details/withConnect.ts
@@ -5,20 +5,35 @@ import {
   unlikeNotice,
   dislikeNotice,
   undislikeNotice,
-  readNotice
+  readNotice,
+  FeedbackOnNoticeAction
 } from 'app/actions/notices';
 import { close } from 'app/actions/ui';
 import { State } from '../../../store';
 import { getNoticeById } from '../../../selectors';
 import { DetailsProps } from './types';
+import { StatefulNotice } from '../../../../lmem/notice';
+
+export interface DetailsStateProps {
+  notice?: StatefulNotice;
+}
 
 const mapStateToProps = (
   state: State,
   props: DetailsProps & RouteComponentProps
-) => ({
+): DetailsStateProps | undefined => ({
   notice: getNoticeById(state, props)
 });
 
+export interface DetailsDispatchProps {
+  like: (id: number) => void;
+  unlike: (id: number) => void;
+  dislike: (id: number) => void;
+  undislike: (id: number) => void;
+  view: (id: number) => void;
+  close: () => void;
+}
+
 const mapDispatchToProps = {
   like: likeNotice,
   unlike: unlikeNotice,
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
index 7e4e5e0b7..16b1f7e24 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
@@ -17,7 +17,11 @@ const baseNotice: StatefulNotice = {
   ratings: { likes: 42, dislikes: 2 },
   contributor: { id: 1, name: 'Jalil' },
   visibility: 'public',
-  source: { label: 'LMEM', url: 'https://blogs.mediapart.fr/thomas-coutrot/blog/040916/leconomie-est-vraiment-un-sport-de-combat' },
+  source: {
+    label: 'LMEM',
+    url:
+      'https://blogs.mediapart.fr/thomas-coutrot/blog/040916/leconomie-est-vraiment-un-sport-de-combat'
+  },
   state: {
     liked: false,
     dismissed: false,
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
index 8239b4245..dcd8c450d 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
@@ -15,6 +15,7 @@ import Date from './Date';
 import { StatefulNotice } from '../../../app/lmem/notice';
 import { format } from 'date-fns';
 import IntentionIcon from '../../molecules/Type/IntentionIcon';
+import { FeedbackOnNoticeAction } from '../../../app/actions/notices';
 
 interface NoticeDetailsProps {
   notice: StatefulNotice;
diff --git a/test/fakers/generateNotice.ts b/test/fakers/generateNotice.ts
new file mode 100644
index 000000000..3ba43d7ce
--- /dev/null
+++ b/test/fakers/generateNotice.ts
@@ -0,0 +1,59 @@
+import { subMonths, subWeeks } from 'date-fns';
+import Faker from 'faker';
+import { StatefulNotice } from '../../src/app/lmem/notice';
+import { Intention } from '../../src/app/lmem/intention';
+
+interface Options {
+  intention?: Intention;
+  message?: string | number;
+  created?: Date;
+  modified?: Date;
+  likes?: number;
+  dislikes?: number;
+  contributor?: string;
+  sourceName?: string;
+  sourceUrl?: string;
+  liked?: boolean;
+  disliked?: boolean;
+  dismissed?: boolean;
+  read?: boolean;
+}
+
+export const defaultSourceUrl =
+  'https://blogs.mediapart.fr/thomas-coutrot/blog/040916/leconomie-est-vraiment-un-sport-de-combat';
+
+export const generateStatefulNotice = ({
+  intention,
+  message,
+  created,
+  modified,
+  contributor,
+  sourceName,
+  sourceUrl,
+  likes,
+  dislikes,
+  liked,
+  disliked,
+  dismissed,
+  read
+}: Options = {}): StatefulNotice => ({
+  id: 123,
+  intention: intention || 'approval',
+  created: created || subMonths(new Date(), 1),
+  modified: modified || subWeeks(new Date(), 1),
+  message:
+    typeof message === 'string' ? message : Faker.lorem.paragraph(message || 3),
+  ratings: { likes: likes || 42, dislikes: dislikes || 2 },
+  contributor: { id: 1, name: contributor || Faker.name.findName() },
+  visibility: 'public',
+  source: {
+    label: sourceName || Faker.company.companyName(),
+    url: sourceUrl || defaultSourceUrl
+  },
+  state: {
+    liked: Boolean(liked),
+    dismissed: Boolean(dismissed),
+    disliked: Boolean(disliked),
+    read: Boolean(read)
+  }
+});
diff --git a/yarn.lock b/yarn.lock
index ad5edb89d..8159682f1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2026,6 +2026,11 @@
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
   integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
+"@types/faker@^4.1.5":
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/@types/faker/-/faker-4.1.5.tgz#8f620f9c9a67150aa0a32b4e8a407da43fca61d4"
+  integrity sha512-YSDqoBEWYGdNk53xSkkb6REaUaVSlIjxIAGjj/nbLzlZOit7kUU+nA2zC2qQkIVO4MQ+3zl4Sz7aw+kbpHHHUQ==
+
 "@types/filesystem@*":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.29.tgz#ee3748eb5be140dcf980c3bd35f11aec5f7a3748"
@@ -5817,6 +5822,11 @@ extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
+faker@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/faker/-/faker-4.1.0.tgz#1e45bbbecc6774b3c195fad2835109c6d748cc3f"
+  integrity sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8=
+
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"

From fcc08fe994730f9a9b9add9a80ba060709cb5713 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Tue, 21 May 2019 18:08:31 +0200
Subject: [PATCH 091/100] doc(storybook): add knobs to organism/Notice stories

---
 .../organisms/Notice/Notice.stories.tsx       | 88 ++++++++++-------
 src/components/organisms/Notice/Notice.tsx    |  2 +-
 .../NoticeDetails/NoticeDetails.stories.tsx   | 61 +++++-------
 test/fakers/generateNotice.ts                 | 95 +++++++++++++++++--
 4 files changed, 165 insertions(+), 81 deletions(-)

diff --git a/src/components/organisms/Notice/Notice.stories.tsx b/src/components/organisms/Notice/Notice.stories.tsx
index 2b3639220..dcfdb7bfd 100644
--- a/src/components/organisms/Notice/Notice.stories.tsx
+++ b/src/components/organisms/Notice/Notice.stories.tsx
@@ -2,91 +2,111 @@ import React from 'react';
 import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
+import { withKnobs, text, boolean, select } from '@storybook/addon-knobs';
 import Notice from './Notice';
-import { StatefulNotice } from '../../../app/lmem/notice';
-import { subWeeks, subMonths } from 'date-fns';
+import { generateStatefulNotice } from '../../../../test/fakers/generateNotice';
+import Faker from 'faker';
+import { intentions } from '../../../app/lmem/intention';
 
-const baseNotice: StatefulNotice = {
-  id: 123,
-  intention: 'approval',
-  created: subMonths(new Date(), 1),
-  modified: subWeeks(new Date(), 1),
-  message: '<p>Description with a <a href="http://some.url">link</a></p>',
-  ratings: { likes: 42, dislikes: 2 },
-  contributor: { id: 1, name: 'Jalil' },
-  visibility: 'public',
-  state: {
-    liked: false,
-    dismissed: false,
-    disliked: false,
-    read: false
-  }
-};
+const defaultContributorName = Faker.name.findName();
+const defaultMessage = Faker.lorem.paragraph(3);
 
 storiesOf('organisms/Notice', module)
+  .addDecorator(withKnobs)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
   .add('Approved', () => (
     <Notice
-      notice={baseNotice}
+      notice={generateStatefulNotice({
+        dismissed: boolean('dismissed', false),
+        intention: 'approval',
+        contributor: text('contributor', defaultContributorName),
+        message: `<p>${text('message', defaultMessage)}</p>`
+      })}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
     />
   ))
   .add('Disapproved', () => (
     <Notice
-      notice={{ ...baseNotice, intention: 'disapproval' }}
+      notice={generateStatefulNotice({
+        dismissed: boolean('dismissed', false),
+        intention: 'disapproval',
+        contributor: text('contributor', defaultContributorName),
+        message: `<p>${text('message', defaultMessage)}</p>`
+      })}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
     />
   ))
   .add('Alternative', () => (
     <Notice
-      notice={{ ...baseNotice, intention: 'alternative' }}
+      notice={generateStatefulNotice({
+        intention: 'alternative',
+        dismissed: boolean('dismissed', false),
+        contributor: text('contributor', defaultContributorName),
+        message: `<p>${text('message', defaultMessage)}</p>`
+      })}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
     />
   ))
   .add('Information', () => (
     <Notice
-      notice={{ ...baseNotice, intention: 'information' }}
+      notice={generateStatefulNotice({
+        intention: 'information',
+        dismissed: boolean('dismissed', false),
+        contributor: text('contributor', defaultContributorName),
+        message: `<p>${text('message', defaultMessage)}</p>`
+      })}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
     />
   ))
   .add('Other', () => (
     <Notice
-      notice={{ ...baseNotice, intention: 'other' }}
+      notice={generateStatefulNotice({
+        intention: 'other',
+        dismissed: boolean('dismissed', false),
+        contributor: text('contributor', defaultContributorName),
+        message: `<p>${text('message', defaultMessage)}</p>`
+      })}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
     />
   ))
   .add('Dismissed', () => (
     <Notice
-      notice={{
-        ...baseNotice,
-        state: { ...baseNotice.state, dismissed: true }
-      }}
+      notice={generateStatefulNotice({
+        dismissed: true,
+        intention: select('intention', intentions, 'approval'),
+        contributor: text('contributor', defaultContributorName),
+        message: `<p>${text('message', defaultMessage)}</p>`
+      })}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
     />
   ))
   .add('Read', () => (
     <Notice
-      notice={{
-        ...baseNotice,
-        state: { ...baseNotice.state, read: true }
-      }}
+      notice={generateStatefulNotice({
+        read: true,
+        intention: select('intention', intentions, 'approval'),
+        contributor: text('contributor', defaultContributorName),
+        message: `<p>${text('message', defaultMessage)}</p>`
+      })}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
     />
   ))
   .add('Long title', () => (
     <Notice
-      notice={{
-        ...baseNotice,
+      notice={generateStatefulNotice({
+        dismissed: true,
+        intention: select('intention', intentions, 'approval'),
+        contributor: text('contributor', defaultContributorName),
         message:
           '<p>This is very long title for a notification with a <a href="http://some.url">link</a> that you may want to read some time in the future</p>'
-      }}
+      })}
       dismiss={action('dismiss')}
       undismiss={action('undismiss')}
     />
diff --git a/src/components/organisms/Notice/Notice.tsx b/src/components/organisms/Notice/Notice.tsx
index 92c731055..df494fdf9 100644
--- a/src/components/organisms/Notice/Notice.tsx
+++ b/src/components/organisms/Notice/Notice.tsx
@@ -48,7 +48,7 @@ export default class Notice extends PureComponent<Props> {
           to={dismissed ? undefined : `notices/details/${id}`}
           read={read}
         >
-          {(dismissed && justDismissed) || (disliked && justDisliked) ? (
+          {dismissed || disliked ? (
             <Fragment>
               <Deleted>Cette bulle ne s’affichera plus !</Deleted>
               <Button onClick={this.onUndismiss}>Annuler</Button>
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
index 16b1f7e24..b5b56f106 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.stories.tsx
@@ -3,38 +3,34 @@ import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import NoticeDetails from './NoticeDetails';
-import { StatefulNotice } from '../../../app/lmem/notice';
 import { subMonths, subWeeks } from 'date-fns';
+import Faker from 'faker';
+import {
+  defaultSourceUrl,
+  generateStatefulNotice
+} from '../../../../test/fakers/generateNotice';
+import { boolean, date, number, select, text } from '@storybook/addon-knobs';
+import { intentions } from '../../../app/lmem/intention';
 
-const baseNotice: StatefulNotice = {
-  id: 123,
-  intention: 'approval',
-  created: subMonths(new Date(), 1),
-  modified: subWeeks(new Date(), 1),
-  message: `
-<p>L’économie est (vraiment) un sport de combat : “La boule puante de MM. Cahuc et Zylberberg contre le “négationnisme” des économistes critiques le confirme : le combat idéologique tombe parfois dans le caniveau. Depuis vingt ans pourtant, s’est construit en France une contre-expertise économique crédible qui veut fournir aux dominés des outils pour penser (et résister à) la pseudo” construit en France une contre-expertise</p>
-`,
-  ratings: { likes: 42, dislikes: 2 },
-  contributor: { id: 1, name: 'Jalil' },
-  visibility: 'public',
-  source: {
-    label: 'LMEM',
-    url:
-      'https://blogs.mediapart.fr/thomas-coutrot/blog/040916/leconomie-est-vraiment-un-sport-de-combat'
-  },
-  state: {
-    liked: false,
-    dismissed: false,
-    disliked: false,
-    read: false
-  }
-};
+const defaultContributorName = Faker.name.findName();
+const defaultMessage = Faker.lorem.paragraph(3);
+const defaultDate = subMonths(new Date(), 1);
 
 storiesOf('organisms/NoticeDetails', module)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
   .add('Approval', () => (
     <NoticeDetails
-      notice={baseNotice}
+      notice={generateStatefulNotice({
+        contributor: text('contributor', defaultContributorName),
+        intention: 'approval',
+        message: `<p>${text('message', defaultMessage)}</p>`,
+        sourceUrl: text('source', defaultSourceUrl),
+        created: date('created', defaultDate),
+        likes: number('likes', 42),
+        dislikes: number('dislikes', 2),
+        liked: boolean('liked', false),
+        disliked: boolean('disliked', false)
+      })}
       like={action('like')}
       unlike={action('unlike')}
       dislike={action('dislike')}
@@ -44,10 +40,7 @@ storiesOf('organisms/NoticeDetails', module)
   ))
   .add('Dismissed', () => (
     <NoticeDetails
-      notice={{
-        ...baseNotice,
-        state: { ...baseNotice.state, dismissed: true }
-      }}
+      notice={generateStatefulNotice({ dismissed: true })}
       like={action('like')}
       unlike={action('unlike')}
       dislike={action('dislike')}
@@ -57,10 +50,7 @@ storiesOf('organisms/NoticeDetails', module)
   ))
   .add('Disliked', () => (
     <NoticeDetails
-      notice={{
-        ...baseNotice,
-        state: { ...baseNotice.state, disliked: true }
-      }}
+      notice={generateStatefulNotice({ disliked: true })}
       like={action('like')}
       unlike={action('unlike')}
       dislike={action('dislike')}
@@ -70,10 +60,7 @@ storiesOf('organisms/NoticeDetails', module)
   ))
   .add('No source', () => (
     <NoticeDetails
-      notice={{
-        ...baseNotice,
-        source: undefined
-      }}
+      notice={generateStatefulNotice({ withSource: false })}
       like={action('like')}
       unlike={action('unlike')}
       dislike={action('dislike')}
diff --git a/test/fakers/generateNotice.ts b/test/fakers/generateNotice.ts
index 3ba43d7ce..5b0765779 100644
--- a/test/fakers/generateNotice.ts
+++ b/test/fakers/generateNotice.ts
@@ -1,11 +1,15 @@
 import { subMonths, subWeeks } from 'date-fns';
+import * as R from 'ramda';
 import Faker from 'faker';
-import { StatefulNotice } from '../../src/app/lmem/notice';
+import { NoticeState, StatefulNotice } from '../../src/app/lmem/notice';
 import { Intention } from '../../src/app/lmem/intention';
+import { Source } from '../../src/app/lmem/source';
+import { Contributor } from '../../src/app/lmem/contributor';
+import { Ratings } from '../../src/app/lmem/rating';
 
 interface Options {
   intention?: Intention;
-  message?: string | number;
+  message?: string;
   created?: Date;
   modified?: Date;
   likes?: number;
@@ -17,6 +21,7 @@ interface Options {
   disliked?: boolean;
   dismissed?: boolean;
   read?: boolean;
+  withSource?: boolean;
 }
 
 export const defaultSourceUrl =
@@ -35,21 +40,23 @@ export const generateStatefulNotice = ({
   liked,
   disliked,
   dismissed,
-  read
+  read,
+  withSource = true
 }: Options = {}): StatefulNotice => ({
   id: 123,
   intention: intention || 'approval',
   created: created || subMonths(new Date(), 1),
   modified: modified || subWeeks(new Date(), 1),
-  message:
-    typeof message === 'string' ? message : Faker.lorem.paragraph(message || 3),
+  message: message || Faker.lorem.paragraph(3),
   ratings: { likes: likes || 42, dislikes: dislikes || 2 },
   contributor: { id: 1, name: contributor || Faker.name.findName() },
   visibility: 'public',
-  source: {
-    label: sourceName || Faker.company.companyName(),
-    url: sourceUrl || defaultSourceUrl
-  },
+  source: withSource
+    ? {
+        label: sourceName || Faker.company.companyName(),
+        url: sourceUrl || defaultSourceUrl
+      }
+    : undefined,
   state: {
     liked: Boolean(liked),
     dismissed: Boolean(dismissed),
@@ -57,3 +64,73 @@ export const generateStatefulNotice = ({
     read: Boolean(read)
   }
 });
+
+type Transformer<T> = (obj: T) => T;
+
+const assocIfGiven = <T extends { [k: string]: any }, K extends keyof T>(
+  key: string & K,
+  value?: T[K]
+): Transformer<T> => {
+  if (value) return R.assoc<typeof value, typeof key>(key, value);
+  return R.identity;
+};
+
+export const generateStatefulNoticeVariant = (
+  notice: StatefulNotice,
+  {
+    intention,
+    message,
+    created,
+    modified,
+    contributor,
+    sourceName,
+    sourceUrl,
+    likes,
+    dislikes,
+    liked,
+    disliked,
+    dismissed,
+    read,
+    withSource = true
+  }: Options
+): StatefulNotice => {
+  const defaultSource: Source = {
+    label: Faker.company.companyName(),
+    url: defaultSourceUrl
+  };
+  const newSource: Source | undefined =
+    sourceName || sourceUrl || withSource
+      ? R.pipe(
+          assocIfGiven<Source, 'label'>('label', sourceName),
+          assocIfGiven<Source, 'url'>('url', sourceUrl)
+        )(notice.source || defaultSource)
+      : undefined;
+
+  const newContrib: Contributor = assocIfGiven<Contributor, 'name'>(
+    'name',
+    contributor
+  )(notice.contributor);
+
+  const newRatings: Ratings = R.pipe(
+    assocIfGiven<Ratings, 'likes'>('likes', likes),
+    assocIfGiven<Ratings, 'dislikes'>('dislikes', dislikes)
+  )(notice.ratings);
+
+  const newState: NoticeState = R.pipe(
+    assocIfGiven<NoticeState, 'liked'>('liked', liked),
+    assocIfGiven<NoticeState, 'disliked'>('disliked', disliked),
+    assocIfGiven<NoticeState, 'dismissed'>('dismissed', dismissed),
+    assocIfGiven<NoticeState, 'read'>('read', read)
+  )(notice.state);
+
+  return R.pipe(
+    assocIfGiven<StatefulNotice, 'intention'>('intention', intention),
+    assocIfGiven<StatefulNotice, 'message'>('message', message),
+    assocIfGiven<StatefulNotice, 'created'>('created', created),
+    assocIfGiven<StatefulNotice, 'modified'>('modified', modified),
+    assocIfGiven<StatefulNotice, 'contributor'>('contributor', newContrib),
+    assocIfGiven<StatefulNotice, 'source'>('source', newSource),
+    assocIfGiven<StatefulNotice, 'ratings'>('ratings', newRatings),
+    assocIfGiven<StatefulNotice, 'state'>('state', newState)
+  )(notice);
+};

From 89526f8008f391eaf8bb28620c55ad86cbe1f679 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Tue, 21 May 2019 18:29:05 +0200
Subject: [PATCH 092/100] doc(storybook): add knobs to Notice/List stories

---
 .../App/Notice/Details/Details.stories.tsx    |   2 +-
 .../content/App/Notice/List/List.stories.tsx  | 191 ++++++++++--------
 .../organisms/Notice/Notice.stories.tsx       |   6 +-
 test/fakers/generateNotice.ts                 |   3 +-
 4 files changed, 109 insertions(+), 93 deletions(-)

diff --git a/src/app/content/App/Notice/Details/Details.stories.tsx b/src/app/content/App/Notice/Details/Details.stories.tsx
index 49acdb93b..b1c118ca2 100644
--- a/src/app/content/App/Notice/Details/Details.stories.tsx
+++ b/src/app/content/App/Notice/Details/Details.stories.tsx
@@ -12,6 +12,7 @@ import {
 } from '@storybook/addon-knobs';
 import Faker from 'faker';
 import {
+  defaultMessage,
   defaultSourceUrl,
   generateStatefulNotice
 } from '../../../../../../test/fakers/generateNotice';
@@ -20,7 +21,6 @@ import { intentions } from '../../../../lmem/intention';
 import { subMonths } from 'date-fns';
 
 const defaultContributorName = Faker.name.findName();
-const defaultMessage = Faker.lorem.paragraph(3);
 const defaultDate = subMonths(new Date(), 1);
 
 storiesOf('screens/Notice/Details', module)
diff --git a/src/app/content/App/Notice/List/List.stories.tsx b/src/app/content/App/Notice/List/List.stories.tsx
index 856c81c2a..f0f1cdef4 100644
--- a/src/app/content/App/Notice/List/List.stories.tsx
+++ b/src/app/content/App/Notice/List/List.stories.tsx
@@ -2,98 +2,111 @@ import React from 'react';
 import { MemoryRouter as Router } from 'react-router-dom';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
-import { withKnobs, object } from '@storybook/addon-knobs/react';
+import { withKnobs, boolean, text, select } from '@storybook/addon-knobs/react';
 import { List } from '.';
-import { StatefulNotice } from '../../../../lmem/notice';
-import { subMonths, subWeeks } from 'date-fns';
+import {
+  defaultMessage,
+  generateStatefulNotice
+} from '../../../../../../test/fakers/generateNotice';
+import Faker from 'faker';
+import { intentions } from '../../../../lmem/intention';
 
-const notice: StatefulNotice = {
-  id: 123,
-  intention: 'disapproval',
-  created: subMonths(new Date(), 1),
-  modified: subWeeks(new Date(), 1),
-  message: '<p>Description with a <a href="http://some.url">link</a></p>',
-  contributor: { id: 1, name: 'John Doe', image: 'image' },
-  source: {
-    label: 'LMEM',
-    url: 'http://www.lmem.net'
-  },
-  visibility: 'public',
-  ratings: { dislikes: 0, likes: 0 },
-  state: {
-    dismissed: false,
-    disliked: false,
-    liked: false,
-    read: false
-  }
-};
+const firstContributorName = Faker.name.findName();
+const firstMessage = defaultMessage;
+const secondContributorName = Faker.name.findName();
+const secondMessage = `De nombreux clients mécontents de Pixmania et ses vendeurs s'expriment sur les réseaux sociaux depuis 2016. Les plaintes continuent en 2017, 2018 et encore en 2019 si l'on se réfère au forum Que Choisir.`;
 
 storiesOf('screens/Notice/List', module)
   .addDecorator(withKnobs)
   .addDecorator(getStory => <Router>{getStory()}</Router>)
-  .add('1 notice', () => {
-    const notices = object('Notices', [notice]);
-
-    return (
-      <List
-        close={action('close')}
-        dismiss={action('dismiss')}
-        undismiss={action('undismiss')}
-        notices={notices}
-      />
-    );
-  })
-  .add('2 notices', () => {
-    const notices = object('Notices', [notice, notice]);
-
-    return (
-      <List
-        close={action('close')}
-        dismiss={action('dismiss')}
-        undismiss={action('undismiss')}
-        notices={notices}
-      />
-    );
-  })
-  .add('1 read', () => {
-    const notices = object('Notices', [notice, { ...notice, read: true }]);
-
-    return (
-      <List
-        close={action('close')}
-        dismiss={action('dismiss')}
-        undismiss={action('undismiss')}
-        notices={notices}
-      />
-    );
-  })
-  .add('empty', () => {
-    const notices = object('Notices', []);
-
-    return (
-      <List
-        close={action('close')}
-        dismiss={action('dismiss')}
-        undismiss={action('undismiss')}
-        notices={notices}
-      />
-    );
-  })
-  .add('2 lines excerpt', () => {
-    const notices = object('Notices', [
-      {
-        ...notice,
-        description:
-          'dazd zazaddd dddddd ddddd dddd dddddd ddd ddddd dddddddd dd'
-      }
-    ]);
-
-    return (
-      <List
-        close={action('close')}
-        dismiss={action('dismiss')}
-        undismiss={action('undismiss')}
-        notices={notices}
-      />
-    );
-  });
+  .add('1 notice', () => (
+    <List
+      close={action('close')}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
+      notices={[
+        generateStatefulNotice({
+          dismissed: boolean('dismissed', false),
+          intention: select('intention', intentions, 'approval'),
+          contributor: text('contributor', firstContributorName),
+          message: `<p>${text('message', firstMessage)}</p>`
+        })
+      ]}
+    />
+  ))
+  .add('2 notices', () => (
+    <List
+      close={action('close')}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
+      notices={[
+        generateStatefulNotice({
+          dismissed: boolean('dismissed(1)', false, 'first'),
+          intention: select('intention(1)', intentions, 'approval', 'first'),
+          contributor: text('contributor(1)', firstContributorName, 'first'),
+          message: `<p>${text('message(1)', firstMessage, 'first')}</p>`
+        }),
+        generateStatefulNotice({
+          dismissed: boolean('dismissed(2)', false, 'second'),
+          intention: select(
+            'intention(2)',
+            intentions,
+            'disapproval',
+            'second'
+          ),
+          contributor: text('contributor(2)', secondContributorName, 'second'),
+          message: `<p>${text('message(2)', secondMessage, 'second')}</p>`
+        })
+      ]}
+    />
+  ))
+  .add('1 read', () => (
+    <List
+      close={action('close')}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
+      notices={[
+        generateStatefulNotice({
+          dismissed: boolean('dismissed(1)', false, 'first'),
+          intention: select('intention(1)', intentions, 'approval', 'first'),
+          contributor: text('contributor(1)', firstContributorName, 'first'),
+          message: `<p>${text('message(1)', firstMessage, 'first')}</p>`
+        }),
+        generateStatefulNotice({
+          read: true,
+          dismissed: boolean('dismissed(2)', false, 'second'),
+          intention: select(
+            'intention(2)',
+            intentions,
+            'disapproval',
+            'second'
+          ),
+          contributor: text('contributor(2)', secondContributorName, 'second'),
+          message: `<p>${text('message(2)', secondMessage, 'second')}</p>`
+        })
+      ]}
+    />
+  ))
+  .add('empty', () => (
+    <List
+      close={action('close')}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
+      notices={[]}
+    />
+  ))
+  .add('2 lines excerpt', () => (
+    <List
+      close={action('close')}
+      dismiss={action('dismiss')}
+      undismiss={action('undismiss')}
+      notices={[
+        generateStatefulNotice({
+          dismissed: boolean('dismissed', false),
+          intention: select('intention', intentions, 'approval'),
+          contributor: text('contributor', firstContributorName),
+          message: `<p>dazd zazaddd dddddd ddddd dddd dddddd ddd ddddd dddddddd dd</p>`
+        })
+      ]}
+    />
+  ));
diff --git a/src/components/organisms/Notice/Notice.stories.tsx b/src/components/organisms/Notice/Notice.stories.tsx
index dcfdb7bfd..7f1b4380d 100644
--- a/src/components/organisms/Notice/Notice.stories.tsx
+++ b/src/components/organisms/Notice/Notice.stories.tsx
@@ -4,12 +4,14 @@ import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import { withKnobs, text, boolean, select } from '@storybook/addon-knobs';
 import Notice from './Notice';
-import { generateStatefulNotice } from '../../../../test/fakers/generateNotice';
+import {
+  defaultMessage,
+  generateStatefulNotice
+} from '../../../../test/fakers/generateNotice';
 import Faker from 'faker';
 import { intentions } from '../../../app/lmem/intention';
 
 const defaultContributorName = Faker.name.findName();
-const defaultMessage = Faker.lorem.paragraph(3);
 
 storiesOf('organisms/Notice', module)
   .addDecorator(withKnobs)
diff --git a/test/fakers/generateNotice.ts b/test/fakers/generateNotice.ts
index 5b0765779..1cbb7c12f 100644
--- a/test/fakers/generateNotice.ts
+++ b/test/fakers/generateNotice.ts
@@ -26,6 +26,7 @@ interface Options {
 
 export const defaultSourceUrl =
   'https://blogs.mediapart.fr/thomas-coutrot/blog/040916/leconomie-est-vraiment-un-sport-de-combat';
+export const defaultMessage = `L’économie est (vraiment) un sport de combat : “La boule puante de MM. Cahuc et Zylberberg contre le “négationnisme” des économistes critiques le confirme : le combat idéologique tombe parfois dans le caniveau. Depuis vingt ans pourtant, s’est construit en France une contre-expertise économique crédible qui veut fournir aux dominés des outils pour penser (et résister à) la pseudo” construit en France une contre-expertise`;
 
 export const generateStatefulNotice = ({
   intention,
@@ -47,7 +48,7 @@ export const generateStatefulNotice = ({
   intention: intention || 'approval',
   created: created || subMonths(new Date(), 1),
   modified: modified || subWeeks(new Date(), 1),
-  message: message || Faker.lorem.paragraph(3),
+  message: message || defaultMessage,
   ratings: { likes: likes || 42, dislikes: dislikes || 2 },
   contributor: { id: 1, name: contributor || Faker.name.findName() },
   visibility: 'public',

From d999de628432ecfdda140d0880b289d70479a4c9 Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Thu, 23 May 2019 17:36:33 +0200
Subject: [PATCH 093/100] fix(external-click-handler): don't close the UI when
 the user click on an interactive Html element

---
 package.json                                  |   3 +-
 src/app/content/externalClickHandler.ts       |  29 +-
 test/app/content/externalClickHandler.test.ts |  21 +
 yarn.lock                                     | 460 +++++++++---------
 4 files changed, 290 insertions(+), 223 deletions(-)
 create mode 100644 test/app/content/externalClickHandler.test.ts

diff --git a/package.json b/package.json
index 7a02ba406..f25c8c8f0 100644
--- a/package.json
+++ b/package.json
@@ -83,6 +83,7 @@
     "@types/chai": "^4.1.7",
     "@types/chrome": "^0.0.81",
     "@types/faker": "^4.1.5",
+    "@types/jsdom": "^12.2.3",
     "@types/mocha": "^5.2.6",
     "@types/redux-immutable-state-invariant": "^2.1.0",
     "@types/redux-logger": "^3.0.7",
@@ -122,7 +123,7 @@
     "file-loader": "^2.0.0",
     "html-webpack-plugin": "^3.2.0",
     "husky": "^1.3.1",
-    "jsdom": "^8.1.0",
+    "jsdom": "^12.2.0",
     "lint-staged": "^8.1.5",
     "mocha": "^6.0.2",
     "node-sass": "^4.9.4",
diff --git a/src/app/content/externalClickHandler.ts b/src/app/content/externalClickHandler.ts
index 19e7d7196..62aa4b8ee 100644
--- a/src/app/content/externalClickHandler.ts
+++ b/src/app/content/externalClickHandler.ts
@@ -2,10 +2,35 @@ import { Store } from 'redux';
 import { close } from 'app/actions/ui';
 import { isOpen } from './selectors';
 
-export default (store: Store) => () => {
+export const interactiveElementsSelectors: string[] = [
+  'a',
+  'details',
+  'dialog',
+  'menu',
+  'menuitem',
+  'summary',
+  'button',
+  'datalist',
+  'input',
+  'label',
+  'meter',
+  'optgroup',
+  'option',
+  'select',
+  'textarea',
+  '[onclick]'
+];
+
+export const isHtmlElementInteractive = (element: HTMLElement) =>
+  interactiveElementsSelectors.some(selector => element.matches(selector));
+
+export default (store: Store) => (e: MouseEvent) => {
   const state = store.getState();
 
-  if (isOpen(state)) {
+  const element = e.target as HTMLElement;
+  const interactive = isHtmlElementInteractive(element);
+
+  if (!interactive && isOpen(state)) {
     store.dispatch(close());
   }
 };
diff --git a/test/app/content/externalClickHandler.test.ts b/test/app/content/externalClickHandler.test.ts
new file mode 100644
index 000000000..96fc4d632
--- /dev/null
+++ b/test/app/content/externalClickHandler.test.ts
@@ -0,0 +1,21 @@
+import chai from 'chai';
+import { JSDOM } from 'jsdom';
+import { isHtmlElementInteractive } from '../../../src/app/content/externalClickHandler';
+
+const expect = chai.expect;
+
+const dom = new JSDOM();
+const document = dom.window.document;
+
+describe('isHtmlElementInteractive', () => {
+  it('can tell if actual Html elements are interactive', () => {
+    expect(isHtmlElementInteractive(document.createElement('a'))).to.be.true;
+    expect(isHtmlElementInteractive(document.createElement('button'))).to.be
+      .true;
+
+    const element = document.createElement('div');
+    element.setAttribute('onClick', '() => {}');
+
+    expect(isHtmlElementInteractive(element)).to.be.true;
+  });
+});
diff --git a/yarn.lock b/yarn.lock
index 8159682f1..4ac0b1137 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2068,6 +2068,15 @@
   version "0.0.35"
   resolved "https://registry.yarnpkg.com/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.35.tgz#c1c0d402daac324582b6186b91f8905340ea3361"
 
+"@types/jsdom@^12.2.3":
+  version "12.2.3"
+  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-12.2.3.tgz#e5f037579d1bde5b6e52b9b74cbcb924eca9a4c6"
+  integrity sha512-CxYWGFsBs0VZ/lU9zxfWk7zYfOlQQuSs5yzk34KW/vQQJGE8OGOYxJnqj9kGHE1SBZGVJvhXs1TafIpZL8RvXw==
+  dependencies:
+    "@types/node" "*"
+    "@types/tough-cookie" "*"
+    parse5 "^4.0.0"
+
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
@@ -2205,6 +2214,11 @@
     "@types/react-native" "*"
     csstype "^2.2.0"
 
+"@types/tough-cookie@*":
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.5.tgz#9da44ed75571999b65c37b60c9b2b88db54c585d"
+  integrity sha512-SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg==
+
 "@types/unist@*", "@types/unist@^2.0.0":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.2.tgz#5dc0a7f76809b7518c0df58689cd16a19bd751c6"
@@ -2375,9 +2389,10 @@ JSONStream@^1.3.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abab@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
+abab@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
+  integrity sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==
 
 abbrev@1, abbrev@~1.1.1:
   version "1.1.1"
@@ -2396,25 +2411,28 @@ acorn-dynamic-import@^3.0.0:
   dependencies:
     acorn "^5.0.0"
 
-acorn-globals@^1.0.4:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-1.0.9.tgz#55bb5e98691507b74579d0513413217c380c54cf"
-  dependencies:
-    acorn "^2.1.0"
-
 acorn-globals@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
   dependencies:
     acorn "^4.0.4"
 
+acorn-globals@^4.3.0:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.2.tgz#4e2c2313a597fd589720395f6354b41cd5ec8006"
+  integrity sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==
+  dependencies:
+    acorn "^6.0.1"
+    acorn-walk "^6.0.1"
+
 acorn-jsx@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.0.tgz#958584ddb60990c02c97c1bd9d521fce433bb101"
 
-acorn@^2.1.0, acorn@^2.4.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
+acorn-walk@^6.0.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
+  integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
 
 acorn@^3.1.0:
   version "3.3.0"
@@ -2428,6 +2446,11 @@ acorn@^5.0.0, acorn@^5.6.2:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
 
+acorn@^6.0.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
+  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
+
 acorn@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.2.tgz#6a459041c320ab17592c6317abbfdf4bbaa98ca4"
@@ -2491,13 +2514,6 @@ ajv-keywords@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
 
-ajv@^4.9.1:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
-  dependencies:
-    co "^4.6.0"
-    json-stable-stringify "^1.0.1"
-
 ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
@@ -2803,10 +2819,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
 
-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.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
@@ -2910,15 +2922,11 @@ awesome-typescript-loader@^5.2.1:
     source-map-support "^0.5.3"
     webpack-log "^1.2.0"
 
-aws-sign2@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-
 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.8.0:
+aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
 
@@ -3338,12 +3346,6 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
 
-boom@2.x.x:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  dependencies:
-    hoek "2.x.x"
-
 bottleneck@^2.0.1:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/bottleneck/-/bottleneck-2.6.0.tgz#cbc557383fd1f63cadc87e1141b1ad766863b863"
@@ -3405,6 +3407,11 @@ brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
 
+browser-process-hrtime@^0.1.2:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
+  integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==
+
 browser-stdout@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
@@ -4116,7 +4123,7 @@ columnify@~1.5.4:
     strip-ansi "^3.0.0"
     wcwidth "^1.0.0"
 
-combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
   dependencies:
@@ -4518,12 +4525,6 @@ crossmessaging@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/crossmessaging/-/crossmessaging-0.2.2.tgz#615739131489809b5b566ec3bb22a534afaa3eeb"
 
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  dependencies:
-    boom "2.x.x"
-
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -4654,13 +4655,19 @@ csso@^3.5.0:
   dependencies:
     css-tree "1.0.0-alpha.29"
 
-cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
+cssom@0.3.x:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
-"cssstyle@>= 0.2.34 < 0.3.0":
-  version "0.2.37"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+cssom@^0.3.4:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.6.tgz#f85206cee04efa841f3c5982a74ba96ab20d65ad"
+  integrity sha512-DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A==
+
+cssstyle@^1.1.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.2.2.tgz#427ea4d585b18624f6fdbf9de7a2a1a3ba713077"
+  integrity sha512-43wY3kl1CVQSvL7wUY1qXkxVGkStjpkDmVjiIKX8R97uhajy8Bybay78uOtqvh7Q5GK75dNPfW0geWjE6qQQow==
   dependencies:
     cssom "0.3.x"
 
@@ -4698,6 +4705,15 @@ dashify@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/dashify/-/dashify-0.2.2.tgz#6a07415a01c91faf4a32e38d9dfba71f61cb20fe"
 
+data-urls@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
+  integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==
+  dependencies:
+    abab "^2.0.0"
+    whatwg-mimetype "^2.2.0"
+    whatwg-url "^7.0.0"
+
 date-fns@*, date-fns@^1.27.2, date-fns@^1.30.1:
   version "1.30.1"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
@@ -5055,6 +5071,13 @@ domelementtype@~1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
 
+domexception@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
+  dependencies:
+    webidl-conversions "^4.0.2"
+
 domhandler@2.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
@@ -5401,16 +5424,17 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, 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.6.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
+escodegen@^1.11.0:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
+  integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==
   dependencies:
-    esprima "^2.7.1"
-    estraverse "^1.9.1"
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
     esutils "^2.0.2"
     optionator "^0.8.1"
   optionalDependencies:
-    source-map "~0.2.0"
+    source-map "~0.6.1"
 
 eslint-config-airbnb-base@^13.1.0:
   version "13.1.0"
@@ -5580,9 +5604,10 @@ espree@^4.0.0:
     acorn-jsx "^5.0.0"
     eslint-visitor-keys "^1.0.0"
 
-esprima@^2.7.1:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+esprima@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
 
 esprima@^4.0.0, esprima@~4.0.0:
   version "4.0.1"
@@ -5605,11 +5630,7 @@ 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.1:
+estraverse@^4.0.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"
 
@@ -5780,7 +5801,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@~3.0.0, extend@~3.0.2:
+extend@^3.0.0, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
 
@@ -6127,14 +6148,6 @@ forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
-form-data@~2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -6606,21 +6619,10 @@ handlebars@^4.0.2:
   optionalDependencies:
     uglify-js "^2.6"
 
-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@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
-  dependencies:
-    ajv "^4.9.1"
-    har-schema "^1.0.5"
-
 har-validator@~5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
@@ -6722,15 +6724,6 @@ hastscript@^5.0.0:
     property-information "^5.0.1"
     space-separated-tokens "^1.0.0"
 
-hawk@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
 he@1.2.0, he@1.2.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -6753,10 +6746,6 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-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.x.x, hoist-non-react-statics@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
@@ -6798,6 +6787,13 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
+html-encoding-sniffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
+  dependencies:
+    whatwg-encoding "^1.0.1"
+
 html-entities@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
@@ -6918,14 +6914,6 @@ http-proxy@^1.16.2:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-signature@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
-  dependencies:
-    assert-plus "^0.2.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"
@@ -6972,16 +6960,16 @@ iconv-lite@0.4.23:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.13, iconv-lite@~0.4.13:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
-
-iconv-lite@^0.4.24, iconv-lite@^0.4.4:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@~0.4.13:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
+
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
@@ -7678,27 +7666,36 @@ jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
-jsdom@^8.1.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-8.5.0.tgz#d4d8f5dbf2768635b62a62823b947cf7071ebc98"
+jsdom@^12.2.0:
+  version "12.2.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-12.2.0.tgz#7cf3f5b5eafd47f8f09ca52315d367ff6e95de23"
+  integrity sha512-QPOggIJ8fquWPLaYYMoh+zqUmdphDtu1ju0QGTitZT1Yd8I5qenPpXM1etzUegu3MjVp8XPzgZxdn8Yj7e40ig==
   dependencies:
-    abab "^1.0.0"
-    acorn "^2.4.0"
-    acorn-globals "^1.0.4"
+    abab "^2.0.0"
+    acorn "^6.0.2"
+    acorn-globals "^4.3.0"
     array-equal "^1.0.0"
-    cssom ">= 0.3.0 < 0.4.0"
-    cssstyle ">= 0.2.34 < 0.3.0"
-    escodegen "^1.6.1"
-    iconv-lite "^0.4.13"
-    nwmatcher ">= 1.3.7 < 2.0.0"
-    parse5 "^1.5.1"
-    request "^2.55.0"
-    sax "^1.1.4"
-    symbol-tree ">= 3.1.0 < 4.0.0"
-    tough-cookie "^2.2.0"
-    webidl-conversions "^3.0.1"
-    whatwg-url "^2.0.1"
-    xml-name-validator ">= 2.0.1 < 3.0.0"
+    cssom "^0.3.4"
+    cssstyle "^1.1.1"
+    data-urls "^1.0.1"
+    domexception "^1.0.1"
+    escodegen "^1.11.0"
+    html-encoding-sniffer "^1.0.2"
+    nwsapi "^2.0.9"
+    parse5 "5.1.0"
+    pn "^1.1.0"
+    request "^2.88.0"
+    request-promise-native "^1.0.5"
+    saxes "^3.1.3"
+    symbol-tree "^3.2.2"
+    tough-cookie "^2.4.3"
+    w3c-hr-time "^1.0.1"
+    webidl-conversions "^4.0.2"
+    whatwg-encoding "^1.0.5"
+    whatwg-mimetype "^2.2.0"
+    whatwg-url "^7.0.0"
+    ws "^6.1.0"
+    xml-name-validator "^3.0.0"
 
 jsesc@^2.5.1:
   version "2.5.1"
@@ -7728,12 +7725,6 @@ 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.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
-  dependencies:
-    jsonify "~0.0.0"
-
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -8178,6 +8169,11 @@ lodash.some@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
 
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+
 lodash.toarray@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
@@ -8554,7 +8550,7 @@ miller-rabin@^4.0.0:
   version "1.37.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
 
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19, mime-types@~2.1.7:
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
   version "2.1.21"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
   dependencies:
@@ -9352,13 +9348,10 @@ 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"
 
-"nwmatcher@>= 1.3.7 < 2.0.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.0.tgz#b4389362170e7ef9798c3c7716d80ebc0106fccf"
-
-oauth-sign@~0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+nwsapi@^2.0.9:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz#e006a878db23636f8e8a67d33ca0e4edf61a842f"
+  integrity sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==
 
 oauth-sign@~0.9.0:
   version "0.9.0"
@@ -9752,9 +9745,9 @@ parse-url@^1.3.0:
     is-ssh "^1.3.0"
     protocols "^1.4.0"
 
-parse5@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
+parse5@5.1.0, parse5@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
 
 parse5@^3.0.1:
   version "3.0.3"
@@ -9762,9 +9755,10 @@ parse5@^3.0.1:
   dependencies:
     "@types/node" "*"
 
-parse5@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
+parse5@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
 parseurl@~1.3.2:
   version "1.3.2"
@@ -9856,10 +9850,6 @@ pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
 
-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"
@@ -9931,6 +9921,11 @@ pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
 
+pn@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
+  integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
+
 portfinder@^1.0.9:
   version "1.0.19"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.19.tgz#07e87914a55242dcda5b833d42f018d6875b595f"
@@ -10312,6 +10307,11 @@ psl@^1.1.24:
   version "1.1.29"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
 
+psl@^1.1.28:
+  version "1.1.31"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
+  integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
+
 public-encrypt@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
@@ -10454,7 +10454,7 @@ punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
-punycode@^2.1.0:
+punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
 
@@ -10474,10 +10474,6 @@ qs@^6.5.2:
   version "6.6.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.6.0.tgz#a99c0f69a8d26bf7ef012f871cdabb0aee4424c2"
 
-qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-
 query-string@^6.1.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.2.0.tgz#468edeb542b7e0538f9f9b1aeb26f034f19c86e1"
@@ -11299,32 +11295,21 @@ replace-ext@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
 
-request@^2.55.0:
-  version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+request-promise-core@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346"
+  integrity sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==
   dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~4.2.1"
-    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"
-    performance-now "^0.2.0"
-    qs "~6.4.0"
-    safe-buffer "^5.0.1"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
+    lodash "^4.17.11"
+
+request-promise-native@^1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz#a49868a624bdea5069f1251d0a836e0d89aa2c59"
+  integrity sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==
+  dependencies:
+    request-promise-core "1.1.2"
+    stealthy-require "^1.1.1"
+    tough-cookie "^2.3.3"
 
 request@^2.74.0, request@^2.81.0, request@^2.87.0, request@^2.88.0:
   version "2.88.0"
@@ -11553,14 +11538,17 @@ sax@0.6.x:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.6.1.tgz#563b19c7c1de892e09bfc4f2fc30e3c27f0952b9"
 
-sax@^1.1.4:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
-
 sax@^1.2.4, sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
+saxes@^3.1.3:
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.9.tgz#c1c197cd54956d88c09f960254b999e192d7058b"
+  integrity sha512-FZeKhJglhJHk7eWG5YM0z46VHmI3KJpMBAQm3xa9meDvd+wevB5GuBB0wc0exPInZiBBHqi00DbS8AcvCGCFMw==
+  dependencies:
+    xmlchars "^1.3.1"
+
 sc-channel@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/sc-channel/-/sc-channel-1.2.0.tgz#d9209f3a91e3fa694c66b011ce55c4ad8c3087d9"
@@ -11937,12 +11925,6 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.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"
-
 socketcluster-client@^13.0.0:
   version "13.0.1"
   resolved "https://registry.yarnpkg.com/socketcluster-client/-/socketcluster-client-13.0.1.tgz#920e0a2437c228555e84f8ef0c9c5eb720e6067e"
@@ -12090,12 +12072,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, 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.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"
-
 sourcemapped-stacktrace@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/sourcemapped-stacktrace/-/sourcemapped-stacktrace-1.1.6.tgz#112d8749c942c3cd3b630dfac9514577b86a3a51"
@@ -12258,6 +12234,11 @@ stdout-stream@^1.4.0:
   dependencies:
     readable-stream "^2.0.1"
 
+stealthy-require@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
+
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -12412,10 +12393,6 @@ stringify-package@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.0.tgz#e02828089333d7d45cd8c287c30aa9a13375081b"
 
-stringstream@~0.0.4:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
-
 strip-ansi@4.0.0, strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
@@ -12645,9 +12622,10 @@ symbol-observable@^1.0.2, symbol-observable@^1.0.3, symbol-observable@^1.1.0, sy
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
 
-"symbol-tree@>= 3.1.0 < 4.0.0":
+symbol-tree@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+  integrity sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=
 
 symbol.prototype.description@^1.0.0:
   version "1.0.0"
@@ -12864,17 +12842,13 @@ toposort@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
 
-tough-cookie@^2.2.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.0:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+tough-cookie@^2.3.3, tough-cookie@^2.4.3:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
   dependencies:
-    punycode "^1.4.1"
+    psl "^1.1.28"
+    punycode "^2.1.1"
 
 tough-cookie@~2.4.3:
   version "2.4.3"
@@ -12883,6 +12857,13 @@ tough-cookie@~2.4.3:
     psl "^1.1.24"
     punycode "^1.4.1"
 
+tr46@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
+  dependencies:
+    punycode "^2.1.0"
+
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -13403,7 +13384,7 @@ uuid@3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
 
-uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
+uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
 
@@ -13511,6 +13492,13 @@ vscode-nls@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
 
+w3c-hr-time@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
+  integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=
+  dependencies:
+    browser-process-hrtime "^0.1.2"
+
 warning@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
@@ -13547,10 +13535,15 @@ web-namespaces@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.2.tgz#c8dc267ab639505276bae19e129dbd6ae72b22b4"
 
-webidl-conversions@^3.0.0, webidl-conversions@^3.0.1:
+webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
 
+webidl-conversions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
+
 webpack-cli@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.1.2.tgz#17d7e01b77f89f884a2bbf9db545f0f6a648e746"
@@ -13689,16 +13682,21 @@ websocket-extensions@>=0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
 
+whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+  dependencies:
+    iconv-lite "0.4.24"
+
 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@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-2.0.1.tgz#5396b2043f020ee6f704d9c45ea8519e724de659"
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
+whatwg-mimetype@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
 whatwg-url@^3.0.0:
   version "3.1.0"
@@ -13707,6 +13705,15 @@ whatwg-url@^3.0.0:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
+whatwg-url@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
+  integrity sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
+
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
@@ -13820,6 +13827,13 @@ ws@^1.0.1:
     options ">=0.0.5"
     ultron "1.0.x"
 
+ws@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
+  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  dependencies:
+    async-limiter "~1.0.0"
+
 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"
@@ -13828,9 +13842,10 @@ xdg-basedir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
 
-"xml-name-validator@>= 2.0.1 < 3.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
+xml-name-validator@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
 xml2js@0.4.4:
   version "0.4.4"
@@ -13843,6 +13858,11 @@ xmlbuilder@>=1.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.0.tgz#a9311b3f8509345700c49a8f79be06bcc5988d18"
 
+xmlchars@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-1.3.1.tgz#1dda035f833dbb4f86a0c28eaa6ca769214793cf"
+  integrity sha512-tGkGJkN8XqCod7OT+EvGYK5Z4SfDQGD30zAa58OcnAa0RRWgzUEK72tkXhsX1FZd+rgnhRxFtmO+ihkp8LHSkw==
+
 xregexp@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"

From 92531cd61cf6cc37f4cf9b3db75dac49fd11dcaf Mon Sep 17 00:00:00 2001
From: Benjamin Menant <bmenant@lmem.net>
Date: Fri, 24 May 2019 16:41:06 +0200
Subject: [PATCH 094/100] fix(externalClickHandler): check if document is
 already ready

---
 src/app/content/index.ts       | 9 +++++----
 src/app/utils/documentReady.ts | 6 ++++++
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 src/app/utils/documentReady.ts

diff --git a/src/app/content/index.ts b/src/app/content/index.ts
index 3800e3a7b..8e12e5ce1 100644
--- a/src/app/content/index.ts
+++ b/src/app/content/index.ts
@@ -9,16 +9,17 @@ if (!(window as CustomWindow).__LMEM__CONTENT_SCRIPT_INJECTED__) {
   require('typeface-lato');
   require('typeface-sedgwick-ave');
   const store = require('./store').default;
+  const documentReady = require('../utils/documentReady').default;
   const externalClickHandler = require('./externalClickHandler').default;
   const handleExternalClick = externalClickHandler(store);
 
   (window as CustomWindow).__LMEM__CONTENT_SCRIPT_INJECTED__ = true;
 
-  window.addEventListener('load', () => {
+  documentReady.then(() => {
     document.addEventListener('click', handleExternalClick);
-  });
 
-  window.addEventListener('unload', () => {
-    document.removeEventListener('click', handleExternalClick);
+    window.addEventListener('unload', () => {
+      document.removeEventListener('click', handleExternalClick);
+    });
   });
 }
diff --git a/src/app/utils/documentReady.ts b/src/app/utils/documentReady.ts
new file mode 100644
index 000000000..9f40d25d3
--- /dev/null
+++ b/src/app/utils/documentReady.ts
@@ -0,0 +1,6 @@
+const documentReady = new Promise(resolve => {
+  if (document.readyState === 'complete') return resolve();
+  window.addEventListener('load', resolve);
+});
+
+export default documentReady;

From c63302ee7e269ab85c99a14fbbf48f06ac76142a Mon Sep 17 00:00:00 2001
From: Benjamin Menant <bmenant@lmem.net>
Date: Thu, 23 May 2019 17:44:25 +0200
Subject: [PATCH 095/100] fix(Notice): change excerpt text color

---
 src/components/atoms/Buttons/OpenButton/OpenButton.tsx | 2 +-
 src/components/atoms/Contributor.ts                    | 3 +--
 src/components/organisms/Notice/Content.tsx            | 6 +++++-
 src/components/organisms/Notice/Title.tsx              | 2 +-
 src/components/organisms/NoticeDetails/DetailsMeta.ts  | 9 +++++++--
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/components/atoms/Buttons/OpenButton/OpenButton.tsx b/src/components/atoms/Buttons/OpenButton/OpenButton.tsx
index d69e7f52d..be31e6cee 100644
--- a/src/components/atoms/Buttons/OpenButton/OpenButton.tsx
+++ b/src/components/atoms/Buttons/OpenButton/OpenButton.tsx
@@ -9,6 +9,6 @@ export default styled.div.attrs({ children: <OpenIcon /> })`
   cursor: pointer;
   width: auto;
   height: 13px;
-  stroke: ${props => props.theme.activeColor};
+  stroke: ${props => props.theme.primaryColor};
   transform: rotate(180deg);
 `;
diff --git a/src/components/atoms/Contributor.ts b/src/components/atoms/Contributor.ts
index 549962651..6ecf07276 100644
--- a/src/components/atoms/Contributor.ts
+++ b/src/components/atoms/Contributor.ts
@@ -3,6 +3,5 @@ import styled from 'styled-components';
 export default styled.div`
   font-size: 14px;
   line-height: 1.45;
-  font-weight: bold;
-  color: ${props => props.theme.primaryColor};
+  color: ${props => props.theme.secondaryColor};
 `;
diff --git a/src/components/organisms/Notice/Content.tsx b/src/components/organisms/Notice/Content.tsx
index e886e54fb..56b5d8439 100644
--- a/src/components/organisms/Notice/Content.tsx
+++ b/src/components/organisms/Notice/Content.tsx
@@ -41,10 +41,14 @@ export default styled(Content)`
     width: 245px;
   }
 
-  & [class^='OpenButton'] {
+  & > div:nth-child(3) {
     height: auto;
   }
 
+  &:hover > div:nth-child(3) {
+    stroke: ${props => props.theme.activeColor};
+  }
+
   & > button {
     margin-right: auto;
     margin-left: auto;
diff --git a/src/components/organisms/Notice/Title.tsx b/src/components/organisms/Notice/Title.tsx
index a991b6a96..b49c86ed5 100644
--- a/src/components/organisms/Notice/Title.tsx
+++ b/src/components/organisms/Notice/Title.tsx
@@ -5,7 +5,7 @@ import Truncated from '../../atoms/Truncated';
 export const TitleContainer = styled.p`
   display: inline;
   margin: 0 10px 0 0;
-  color: ${props => props.theme.activeColor};
+  color: ${props => props.theme.primaryColor};
   font-weight: bold;
   line-height: 1.3;
 `;
diff --git a/src/components/organisms/NoticeDetails/DetailsMeta.ts b/src/components/organisms/NoticeDetails/DetailsMeta.ts
index 6691fbd40..071f32045 100644
--- a/src/components/organisms/NoticeDetails/DetailsMeta.ts
+++ b/src/components/organisms/NoticeDetails/DetailsMeta.ts
@@ -5,11 +5,16 @@ export default styled.div`
     align-items: center;
 
     time,
-    div:not(:last-child) {
+    & > div:not(:last-child) {
         margin-right: 6px;
     }
+    
+    & > div:not(:last-child) {
+        font-weight: bold;
+        color: ${props => props.theme.primaryColor};
+    }
 
-    & [class^="TypeBackground"] {
+    & > div:last-child {
         width: 23px;
         height: 23px;
 

From f76118e599b78ac3beae3b751a0f5147715d91a5 Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Thu, 23 May 2019 17:55:31 +0200
Subject: [PATCH 096/100] feat(tracking): don't track action explicitly tagged
 as `tracked: false`

---
 src/app/actions/browser.ts                  | 2 +-
 src/app/actions/index.ts                    | 1 +
 src/app/actions/kraftBackend.ts             | 6 ++++--
 src/app/actions/tabs.ts                     | 4 ++--
 src/app/actions/tabsLifecycle.ts            | 6 +++---
 src/app/background/middlewares/analytics.ts | 3 ++-
 test/app/middlewares/analytics.ts           | 7 +++++++
 7 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/app/actions/browser.ts b/src/app/actions/browser.ts
index bca6ac369..d37499afd 100644
--- a/src/app/actions/browser.ts
+++ b/src/app/actions/browser.ts
@@ -12,5 +12,5 @@ export const browserActionClicked = (
 ): BrowserActionClickedAction => ({
   type: 'BROWSER/BROWSER_ACTION_CLICKED',
   payload: { tab },
-  meta: { tab, sendToTab: true }
+  meta: { tab, sendToTab: true, tracked: false }
 });
diff --git a/src/app/actions/index.ts b/src/app/actions/index.ts
index 2d42ba1bb..277e14993 100644
--- a/src/app/actions/index.ts
+++ b/src/app/actions/index.ts
@@ -45,6 +45,7 @@ export interface ActionMeta {
   tab?: number;
   sendToBackground?: boolean;
   sendToTab?: boolean;
+  tracked?: false;
 }
 
 export type AppAction =
diff --git a/src/app/actions/kraftBackend.ts b/src/app/actions/kraftBackend.ts
index 7d522aebe..a39d8852d 100644
--- a/src/app/actions/kraftBackend.ts
+++ b/src/app/actions/kraftBackend.ts
@@ -11,7 +11,8 @@ export const receivedMatchingContexts = (
   matchingContexts: MatchingContext[]
 ): ReceivedMatchingContextsAction => ({
   type: 'api/UPDATE_MATCHING_CONTEXTS',
-  payload: { matchingContexts }
+  payload: { matchingContexts },
+  meta: { tracked: false }
 });
 
 export function dispatchInitialStateFromBackend() {
@@ -25,7 +26,8 @@ export interface RefreshMatchingContextsAction extends BaseAction {
   type: 'REFRESH_MATCHING_CONTEXTS';
 }
 export const refreshMatchingContexts = (): RefreshMatchingContextsAction => ({
-  type: 'REFRESH_MATCHING_CONTEXTS'
+  type: 'REFRESH_MATCHING_CONTEXTS',
+  meta: { tracked: false }
 });
 
 export function refreshMatchingContextsEvery(milliseconds: number) {
diff --git a/src/app/actions/tabs.ts b/src/app/actions/tabs.ts
index 172894d40..1630135fd 100644
--- a/src/app/actions/tabs.ts
+++ b/src/app/actions/tabs.ts
@@ -35,7 +35,7 @@ export interface MatchContextAction extends TabAction {
 export const matchContext = (url: string, tab: number): MatchContextAction => ({
   type: 'LMEM/MATCH_CONTEXT',
   payload: { url, tab },
-  meta: { tab }
+  meta: { tab, tracked: false }
 });
 
 export interface MatchContextFailureAction extends TabAction {
@@ -49,7 +49,7 @@ export const matchContextFailure = (
 ): MatchContextFailureAction => ({
   type: 'LMEM/MATCH_CONTEXT_FAILURE',
   payload: { error, url, tab },
-  meta: { tab }
+  meta: { tab, tracked: false }
 });
 
 export interface ContextTriggeredAction extends TabAction {
diff --git a/src/app/actions/tabsLifecycle.ts b/src/app/actions/tabsLifecycle.ts
index 8644eadc3..c298e3553 100644
--- a/src/app/actions/tabsLifecycle.ts
+++ b/src/app/actions/tabsLifecycle.ts
@@ -7,7 +7,7 @@ export interface TabCreatedAction extends TabAction {
 export const tabCreated = (tab: number, url: string): TabCreatedAction => ({
   type: 'BROWSER/TAB_CREATED',
   payload: { tab, url },
-  meta: { tab }
+  meta: { tab, tracked: false }
 });
 
 export interface TabUpdatedAction extends TabAction {
@@ -17,7 +17,7 @@ export interface TabUpdatedAction extends TabAction {
 export const tabUpdated = (tab: number, url: string): TabUpdatedAction => ({
   type: 'BROWSER/TAB_UPDATED',
   payload: { tab, url },
-  meta: { tab }
+  meta: { tab, tracked: false }
 });
 
 export interface TabRemovedAction extends TabAction {
@@ -27,5 +27,5 @@ export interface TabRemovedAction extends TabAction {
 export const tabRemoved = (tab: number): TabRemovedAction => ({
   type: 'BROWSER/TAB_REMOVED',
   payload: { tab },
-  meta: { tab }
+  meta: { tab, tracked: false }
 });
diff --git a/src/app/background/middlewares/analytics.ts b/src/app/background/middlewares/analytics.ts
index ab76ec10d..4a96d4910 100644
--- a/src/app/background/middlewares/analytics.ts
+++ b/src/app/background/middlewares/analytics.ts
@@ -9,7 +9,8 @@ export const analytics = (track: Track) => () => (next: Dispatch) => (
   if (
     !action.type.startsWith('api/') &&
     !action.type.startsWith('notify/') &&
-    !action.type.startsWith('persist/')
+    !action.type.startsWith('persist/') &&
+    !(action.meta && action.meta.tracked === false)
   ) {
     track(action);
   }
diff --git a/test/app/middlewares/analytics.ts b/test/app/middlewares/analytics.ts
index d37b82aad..45722a8eb 100644
--- a/test/app/middlewares/analytics.ts
+++ b/test/app/middlewares/analytics.ts
@@ -31,6 +31,13 @@ describe('Analytics middleware', () => {
     expect(next).to.have.been.calledWith(action);
   });
 
+  it("does'nt track actions with a `tracked` meta set to `false`", () => {
+    const { next, invoke } = create();
+    const action = { type: 'doNotTrackMeEither', meta: { tracked: false } };
+    invoke(action);
+    expect(next).to.have.been.calledWith(action);
+  });
+
   it('tracks actions', () => {
     const { track, invoke } = create();
     const action = { type: 'gothroughthisone' };

From 1a8afce530d1b8ecbb44c4f2d7e2564b96c87099 Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Thu, 23 May 2019 18:17:08 +0200
Subject: [PATCH 097/100] chore(tracking): ensure `close` and `readNotice`
 actions are tracked

---
 test/app/middlewares/analytics.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/test/app/middlewares/analytics.ts b/test/app/middlewares/analytics.ts
index 45722a8eb..121a17f29 100644
--- a/test/app/middlewares/analytics.ts
+++ b/test/app/middlewares/analytics.ts
@@ -3,6 +3,8 @@ import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import { Action } from 'redux';
 import middleware from '../../../src/app/background/middlewares/analytics';
+import { close } from '../../../src/app/actions/ui';
+import { readNotice } from '../../../src/app/actions/notices';
 
 const expect = chai.expect;
 chai.use(sinonChai);
@@ -44,4 +46,18 @@ describe('Analytics middleware', () => {
     invoke(action);
     expect(track).to.have.been.calledWith(action);
   });
+
+  it('tracks close action', () => {
+    const { track, invoke } = create();
+    const action = close();
+    invoke(action);
+    expect(track).to.have.been.calledWith(action);
+  });
+
+  it('tracks read notice action', () => {
+    const { track, invoke } = create();
+    const action = readNotice(1);
+    invoke(action);
+    expect(track).to.have.been.calledWith(action);
+  });
 });

From ec8e1374aec013afd8b8c1d9e988e876acb8c82f Mon Sep 17 00:00:00 2001
From: lutangar <johan.dufour@gmail.com>
Date: Fri, 24 May 2019 11:31:06 +0200
Subject: [PATCH 098/100] feat(notice): add an action when clicking on the
 source link of a notice and track it

fix
---
 src/app/actions/notices.ts                      | 10 ++++++++++
 .../App/Notice/Details/Details.stories.tsx      |  1 +
 src/app/content/App/Notice/Details/index.tsx    |  4 +++-
 .../content/App/Notice/Details/withConnect.ts   |  4 +++-
 .../organisms/NoticeDetails/NoticeDetails.tsx   | 17 +++++++++++++++--
 .../NoticeDetails/Source/SourceURL.tsx          |  1 +
 test/app/middlewares/analytics.ts               | 12 +++++++++++-
 7 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/app/actions/notices.ts b/src/app/actions/notices.ts
index 7e2b5671b..a9f7633b6 100644
--- a/src/app/actions/notices.ts
+++ b/src/app/actions/notices.ts
@@ -95,3 +95,13 @@ export const noticesUpdated = (
   payload,
   meta
 });
+
+export interface ResourceLinkClickedAction extends BaseAction {
+  type: 'NOTICE/RESOURCE_LINK_CLICKED';
+  payload: number;
+}
+
+export const resourceLinkClicked = (id: number): ResourceLinkClickedAction => ({
+  type: 'NOTICE/RESOURCE_LINK_CLICKED',
+  payload: id
+});
diff --git a/src/app/content/App/Notice/Details/Details.stories.tsx b/src/app/content/App/Notice/Details/Details.stories.tsx
index b1c118ca2..40d437d65 100644
--- a/src/app/content/App/Notice/Details/Details.stories.tsx
+++ b/src/app/content/App/Notice/Details/Details.stories.tsx
@@ -44,6 +44,7 @@ storiesOf('screens/Notice/Details', module)
       dislike={action('dislike')}
       undislike={action('undislike')}
       view={action('view')}
+      followSource={action('followSource')}
       close={action('close')}
     />
   ));
diff --git a/src/app/content/App/Notice/Details/index.tsx b/src/app/content/App/Notice/Details/index.tsx
index effd5d6e5..717acfedf 100644
--- a/src/app/content/App/Notice/Details/index.tsx
+++ b/src/app/content/App/Notice/Details/index.tsx
@@ -13,7 +13,8 @@ export const Details = ({
   dislike,
   undislike,
   close,
-  view
+  view,
+  followSource
 }: DetailsDispatchProps & DetailsStateProps) =>
   notice ? (
     <Notification title="Détail de la bulle" hasNotices close={close}>
@@ -24,6 +25,7 @@ export const Details = ({
         dislike={dislike}
         undislike={undislike}
         view={view}
+        followSource={followSource}
       />
     </Notification>
   ) : null;
diff --git a/src/app/content/App/Notice/Details/withConnect.ts b/src/app/content/App/Notice/Details/withConnect.ts
index b3a9b4c8d..2489d241e 100644
--- a/src/app/content/App/Notice/Details/withConnect.ts
+++ b/src/app/content/App/Notice/Details/withConnect.ts
@@ -6,7 +6,7 @@ import {
   dislikeNotice,
   undislikeNotice,
   readNotice,
-  FeedbackOnNoticeAction
+  resourceLinkClicked
 } from 'app/actions/notices';
 import { close } from 'app/actions/ui';
 import { State } from '../../../store';
@@ -32,6 +32,7 @@ export interface DetailsDispatchProps {
   undislike: (id: number) => void;
   view: (id: number) => void;
   close: () => void;
+  followSource: (id: number) => void;
 }
 
 const mapDispatchToProps = {
@@ -40,6 +41,7 @@ const mapDispatchToProps = {
   dislike: dislikeNotice,
   undislike: undislikeNotice,
   view: readNotice,
+  followSource: resourceLinkClicked,
   close
 };
 
diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
index dcd8c450d..895e4fcd8 100644
--- a/src/components/organisms/NoticeDetails/NoticeDetails.tsx
+++ b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
@@ -15,7 +15,6 @@ import Date from './Date';
 import { StatefulNotice } from '../../../app/lmem/notice';
 import { format } from 'date-fns';
 import IntentionIcon from '../../molecules/Type/IntentionIcon';
-import { FeedbackOnNoticeAction } from '../../../app/actions/notices';
 
 interface NoticeDetailsProps {
   notice: StatefulNotice;
@@ -24,6 +23,7 @@ interface NoticeDetailsProps {
   dislike: (id: number) => void;
   undislike: (id: number) => void;
   view?: (id: number) => void;
+  followSource?: (id: number) => void;
 }
 class NoticeDetails extends PureComponent<
   NoticeDetailsProps & RouteComponentProps
@@ -53,6 +53,16 @@ class NoticeDetails extends PureComponent<
     }
   };
 
+  handleFollowSource = () => {
+    const {
+      followSource,
+      notice: { id }
+    } = this.props;
+    if (followSource) {
+      followSource(id);
+    }
+  };
+
   componentDidMount(): void {
     const {
       view,
@@ -88,7 +98,10 @@ class NoticeDetails extends PureComponent<
           <Message>{message}</Message>
           {source && (
             <Source>
-              En savoir plus : <SourceURL>{source.url}</SourceURL>
+              En savoir plus :{' '}
+              <SourceURL onClick={this.handleFollowSource}>
+                {source.url}
+              </SourceURL>
             </Source>
           )}
 
diff --git a/src/components/organisms/NoticeDetails/Source/SourceURL.tsx b/src/components/organisms/NoticeDetails/Source/SourceURL.tsx
index 7bf807651..e15429b6f 100644
--- a/src/components/organisms/NoticeDetails/Source/SourceURL.tsx
+++ b/src/components/organisms/NoticeDetails/Source/SourceURL.tsx
@@ -3,6 +3,7 @@ import Container from './Container';
 
 interface Props {
   children: string;
+  onClick?: (...args: any[]) => any;
 }
 export const SourceURL = ({ children, ...props }: Props) => (
   <Container {...props} href={children}>
diff --git a/test/app/middlewares/analytics.ts b/test/app/middlewares/analytics.ts
index 121a17f29..c7e0088e2 100644
--- a/test/app/middlewares/analytics.ts
+++ b/test/app/middlewares/analytics.ts
@@ -4,7 +4,10 @@ import sinonChai from 'sinon-chai';
 import { Action } from 'redux';
 import middleware from '../../../src/app/background/middlewares/analytics';
 import { close } from '../../../src/app/actions/ui';
-import { readNotice } from '../../../src/app/actions/notices';
+import {
+  readNotice,
+  resourceLinkClicked
+} from '../../../src/app/actions/notices';
 
 const expect = chai.expect;
 chai.use(sinonChai);
@@ -60,4 +63,11 @@ describe('Analytics middleware', () => {
     invoke(action);
     expect(track).to.have.been.calledWith(action);
   });
+
+  it('tracks resource link clicked action', () => {
+    const { track, invoke } = create();
+    const action = resourceLinkClicked(1);
+    invoke(action);
+    expect(track).to.have.been.calledWith(action);
+  });
 });

From f0014b6760388b1caeb525c4bd3d839f7367c348 Mon Sep 17 00:00:00 2001
From: Benjamin Menant <bmenant@lmem.net>
Date: Thu, 23 May 2019 16:12:38 +0200
Subject: [PATCH 099/100] fix(NotificationFooter): revert to uncomplete nav
 links for apiv3 partial release

---
 .../NotificationFooter/NotificationFooter.tsx       | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/organisms/Notification/NotificationFooter/NotificationFooter.tsx b/src/components/organisms/Notification/NotificationFooter/NotificationFooter.tsx
index 10ae85a48..9d93d2f8c 100644
--- a/src/components/organisms/Notification/NotificationFooter/NotificationFooter.tsx
+++ b/src/components/organisms/Notification/NotificationFooter/NotificationFooter.tsx
@@ -11,13 +11,16 @@ const NotificationFooter = () => (
     <NavLink to="/notices">
       <BubbleIcon />
     </NavLink>
-    <NavLink to="/subscriptions">
-      <CheckListIcon />
-    </NavLink>
-    <NavLink to="/help">
+    <NavLink
+      to=""
+      as="a"
+      href="https://choisir.lmem.net/questions-frequentes-aide/"
+      target="_blank"
+      rel="noopener noreferrer"
+    >
       <HelpIcon />
     </NavLink>
-    <NavLink to="/account">
+    <NavLink to="/account/about">
       <AccountIcon />
     </NavLink>
   </FooterContainer>

From c8ab6cb70c3b38cfa2e5191d30233ac95604e42b Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Fri, 31 May 2019 12:26:11 +0200
Subject: [PATCH 100/100] chore: add Sentry to Semantic-release

---
 release.config.js | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/release.config.js b/release.config.js
index 03cef21b7..7412261bc 100644
--- a/release.config.js
+++ b/release.config.js
@@ -2,32 +2,29 @@ const release = Object.freeze({
   analyzeCommits: {
     preset: 'angular',
     parserOpts: {
-      noteKeywords: ['BREAKING CHANGE', 'BREAKING CHANGES', 'MAJOR RELEASE'],
-    },
+      noteKeywords: ['BREAKING CHANGE', 'BREAKING CHANGES', 'MAJOR RELEASE']
+    }
   },
   verifyConditions: [
     '@semantic-release/changelog',
     '@semantic-release/git',
     '@semantic-release/github',
-    'semantic-release-chrome',
+    'semantic-release-chrome'
   ],
   prepare: [
     '@semantic-release/changelog',
     {
       path: '@semantic-release/exec',
-      cmd: 'sed -i \'s/"version":\\s*"${lastRelease.version}"/"version": "${nextRelease.version}"/\' package.json && ' +
-        'npm run build:production'
+      cmd:
+        'sed -i \'s/"version":\\s*"${lastRelease.version}"/"version": "${nextRelease.version}"/\' package.json && ' +
+        'yarn run release:production'
     },
     {
       path: '@semantic-release/git',
-      assets: [
-        'package.json',
-        'yarn.lock',
-        'CHANGELOG.md',
-        'manifest/base.js'
-      ],
-      message: 'chore: release ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}',
-    },
+      assets: ['package.json', 'yarn.lock', 'CHANGELOG.md', 'manifest/base.js'],
+      message:
+        'chore: release ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}'
+    }
   ],
   publish: [
     {
@@ -40,16 +37,16 @@ const release = Object.freeze({
         {
           path: 'build/lmem-v*-chromium.zip',
           label: 'Chromium Package'
-        },
-      ],
-    },
+        }
+      ]
+    }
     //FIXME: semantic-release-chrome does not take globs on assets pathnames
     //{
     //  path: 'semantic-release-chrome',
     //  asset: 'build/lmem-v*-chromium.zip',
     //  extensionId: 'fpjlnlnbacohacebkadbbjebbipcknbg',
     //},
-  ],
+  ]
 });
 
 module.exports = release;