new invite route

package.json

@@ -28,6 +28,7 @@
     "dev:web": "cd ./lbrytv && yarn dev",
     "dev:web-server": "cross-env NODE_ENV=development yarn compile:web && concurrently \"cross-env NODE_ENV=development yarn compile:web --watch\" \"cd ./lbrytv && yarn dev:server\"",
     "dev:internal-apis": "LBRY_API_URL='http://localhost:8080' yarn dev:electron",
+    "dev:iatv": "LBRY_API_URL='http://localhost:15400' SDK_API_URL='http://localhost:15100' yarn dev:web",
     "run:web": "cross-env NODE_ENV=production yarn compile:web && node ./dist/web/server.js",
     "pack": "electron-builder --dir",
     "dist": "electron-builder",
@@ -158,8 +159,8 @@
     "react-modal": "^3.1.7",
     "react-paginate": "^5.2.1",
     "react-redux": "^6.0.1",
-    "react-router": "^5.0.0",
+    "react-router": "^5.1.0",
-    "react-router-dom": "^5.0.0",
+    "react-router-dom": "^5.1.0",
     "react-simplemde-editor": "^4.0.0",
     "react-spring": "^8.0.20",
     "react-sticky-box": "^0.8.0",

ui/component/app/index.js

@@ -1,16 +1,29 @@
 import * as SETTINGS from 'constants/settings';
 import { hot } from 'react-hot-loader/root';
 import { connect } from 'react-redux';
-import { selectUser, doRewardList, doFetchAccessToken, selectGetSyncErrorMessage, selectUploadCount } from 'lbryinc';
+import {
+  selectUser,
+  selectAccessToken,
+  doRewardList,
+  doFetchAccessToken,
+  selectGetSyncErrorMessage,
+  selectUploadCount,
+} from 'lbryinc';
 import { doFetchTransactions, doFetchChannelListMine } from 'lbry-redux';
 import { makeSelectClientSetting, selectLoadedLanguages, selectThemePath } from 'redux/selectors/settings';
 import { selectIsUpgradeAvailable, selectAutoUpdateDownloaded } from 'redux/selectors/app';
 import { doSetLanguage } from 'redux/actions/settings';
-import { doDownloadUpgradeRequested, doSignIn, doSyncWithPreferences, doGetAndPopulatePreferences } from 'redux/actions/app';
+import {
+  doDownloadUpgradeRequested,
+  doSignIn,
+  doSyncWithPreferences,
+  doGetAndPopulatePreferences,
+} from 'redux/actions/app';
 import App from './view';
 
 const select = state => ({
   user: selectUser(state),
+  accessToken: selectAccessToken(state),
   theme: selectThemePath(state),
   language: makeSelectClientSetting(SETTINGS.LANGUAGE)(state),
   languages: selectLoadedLanguages(state),

ui/component/app/view.jsx

@@ -60,6 +60,7 @@ function App(props: Props) {
     fetchRewards,
     fetchTransactions,
     user,
+    accessToken,
     fetchAccessToken,
     fetchChannelListMine,
     signIn,
@@ -186,7 +187,7 @@ function App(props: Props) {
   // Require an internal-api user on lbry.tv
   // This also prevents the site from loading in the un-authed state while we wait for internal-apis to return for the first time
   // It's not needed on desktop since there is no un-authed state
-  if (!user) {
+  if (!accessToken) {
     return null;
   }
   // @endif

ui/component/claimPreview/index.js

@@ -7,6 +7,7 @@ import {
   makeSelectClaimIsMine,
   makeSelectClaimIsPending,
   makeSelectThumbnailForUri,
+  makeSelectCoverForUri,
   makeSelectTitleForUri,
   makeSelectClaimIsNsfw,
   selectBlockedChannels,
@@ -32,6 +33,7 @@ const select = (state, props) => ({
   claimIsMine: props.uri && makeSelectClaimIsMine(props.uri)(state),
   isResolvingUri: props.uri && makeSelectIsUriResolving(props.uri)(state),
   thumbnail: props.uri && makeSelectThumbnailForUri(props.uri)(state),
+  cover: props.uri && makeSelectCoverForUri(props.uri)(state),
   title: props.uri && makeSelectTitleForUri(props.uri)(state),
   mediaType: makeSelectMediaTypeForUri(props.uri)(state),
   nsfw: props.uri && makeSelectClaimIsNsfw(props.uri)(state),

ui/component/invited/index.js

@@ -0,0 +1,28 @@
+import { connect } from 'react-redux';
+import {
+  selectUser,
+  doClaimRewardType,
+  doUserFetch,
+  doUserSetReferrer,
+  selectSetReferrerPending,
+  selectSetReferrerError,
+  rewards as REWARDS,
+} from 'lbryinc';
+import Invited from './view';
+
+const select = state => ({
+  user: selectUser(state),
+  setReferrerPending: selectSetReferrerPending(state),
+  setReferrerError: selectSetReferrerError(state),
+});
+
+const perform = dispatch => ({
+  claimReward: () => dispatch(doClaimRewardType(REWARDS.TYPE_REFEREE)),
+  fetchUser: () => dispatch(doUserFetch()),
+  setReferrer: referrer => dispatch(doUserSetReferrer(referrer)),
+});
+
+export default connect(
+  select,
+  perform
+)(Invited);

ui/component/invited/view.jsx

@@ -0,0 +1,115 @@
+// @flow
+import * as PAGES from 'constants/pages';
+import React, { useEffect } from 'react';
+import { useParams } from 'react-router';
+import Button from 'component/button';
+import ClaimPreview from 'component/claimPreview';
+import Card from 'component/common/card';
+import { parseURI } from 'lbry-redux';
+
+type Props = {
+  user: any,
+  fetchUser: () => void,
+  claimReward: () => void,
+  setReferrer: string => void,
+  setReferrerPending: boolean,
+  setReferrerError: string,
+};
+
+function Invited(props: Props) {
+  const { user, fetchUser, claimReward, setReferrer, setReferrerPending, setReferrerError } = props;
+
+  // useParams requires react-router-dom ^v5.1.0
+  const { referrer } = useParams();
+  const refUri = 'lbry://' + referrer.replace(':', '#');
+  const referrerIsChannel = parseURI(refUri).isChannel;
+  // const hasReferrer = user && user['invited_by_id'] ? true : false;
+  const rewardsApproved = user && user.is_reward_approved;
+  const hasVerifiedEmail = user && user.has_verified_email;
+
+  useEffect(() => {
+    fetchUser();
+  }, []);
+
+  useEffect(() => {
+    if (setReferrerPending && hasVerifiedEmail) {
+      claimReward();
+    }
+  }, [setReferrerPending, hasVerifiedEmail]);
+
+  //follow
+
+  // !signed in or approved
+  useEffect(() => {
+    if (referrer) {
+      setReferrer(referrer.replace(':', '#'));
+    }
+  }, [referrer, hasVerifiedEmail]);
+
+  if (setReferrerError) {
+    return (
+      <Card
+        title={__(`Welcome!`)}
+        subtitle={__(`You can visit your referrer, or discover new stuff.`)}
+        actions={
+          <>
+            <p className="error-text">{__('Not a valid referral')}</p>
+            <p className="error-text">{setReferrerError}</p>
+
+            <div className="card__actions">
+              <Button button="primary" label={__('Discover')} navigate={`/$/${PAGES.DISCOVER}`} />
+            </div>
+          </>
+        }
+      />
+    );
+  }
+
+  if (!rewardsApproved) {
+    return (
+      <Card
+        title={__(`You're invited!`)}
+        subtitle={__(`A referral reward is waiting for you. Just complete sign-in to claim it.`)}
+        actions={
+          <>
+            {referrerIsChannel && (
+              <div key={refUri} className="claim-preview--channel">
+                <ClaimPreview key={refUri} uri={refUri} actions={''} type={'small'} />
+              </div>
+            )}
+            <div className="card__actions">
+              <Button
+                button="primary"
+                label={hasVerifiedEmail ? __('Verify') : __('Sign in')}
+                navigate={`/$/${PAGES.AUTH}?redirect=/$/${PAGES.INVITE}/${referrer}`}
+              />
+              <Button button="primary" label={__('Not now')} navigate={`/$/${PAGES.DISCOVER}`} />
+            </div>
+          </>
+        }
+      />
+    );
+  }
+
+  return (
+    <Card
+      title={__(`Welcome!`)}
+      subtitle={__(`You can visit your referrer, or discover new stuff.`)}
+      actions={
+        <>
+          {referrerIsChannel && (
+            <div key={refUri} className="claim-preview--channel">
+              <ClaimPreview key={refUri} uri={refUri} actions={''} type={'small'} />
+            </div>
+          )}
+          <div className="card__actions">
+            <Button button="primary" label={__('Referrer')} navigate={`/$/${PAGES.DISCOVER}`} />
+            <Button button="primary" label={__('Discover')} navigate={`/$/${PAGES.DISCOVER}`} />
+          </div>
+        </>
+      }
+    />
+  );
+}
+
+export default Invited;

ui/component/rewardTile/index.js

@@ -5,6 +5,7 @@ import RewardTile from './view';
 
 const perform = dispatch => ({
   openRewardCodeModal: () => dispatch(doOpenModal(MODALS.REWARD_GENERATED_CODE)),
+  openSetReferrerModal: () => dispatch(doOpenModal(MODALS.SET_REFERRER)),
 });
 
 export default connect(

ui/component/rewardTile/view.jsx

@@ -37,6 +37,9 @@ const RewardTile = (props: Props) => {
           {reward.reward_type === rewards.TYPE_REFERRAL && (
             <Button button="primary" navigate="/$/invite" label={__('Go To Invites')} />
           )}
+          {reward.reward_type === rewards.TYPE_REFEREE && (
+            <Button button="primary" onClick={openRewardCodeModal} label={__('Set Referree')} />
+          )}
           {reward.reward_type !== rewards.TYPE_REFERRAL &&
             (claimed ? (
               <span>

ui/component/router/view.jsx

@@ -8,6 +8,7 @@ import ReportPage from 'page/report';
 import ShowPage from 'page/show';
 import PublishPage from 'page/publish';
 import DiscoverPage from 'page/discover';
+import InvitedPage from 'page/invited';
 // import HomePage from 'page/home';
 import RewardsPage from 'page/rewards';
 import FileListDownloaded from 'page/fileListDownloaded';
@@ -89,6 +90,7 @@ function AppRouter(props: Props) {
       <Route path={`/$/${PAGES.AUTH_VERIFY}`} exact component={SignInVerifyPage} />
       <Route path={`/$/${PAGES.SEARCH}`} exact component={SearchPage} />
       <Route path={`/$/${PAGES.SETTINGS}`} exact component={SettingsPage} />
+      <Route path={`/$/${PAGES.INVITE}/:referrer`} exact component={InvitedPage} />
 
       <PrivateRoute {...props} path={`/$/${PAGES.INVITE}`} component={InvitePage} />
       <PrivateRoute {...props} path={`/$/${PAGES.DOWNLOADED}`} component={FileListDownloaded} />

ui/constants/modal_types.js

@@ -34,3 +34,4 @@ export const WALLET_RECEIVE = 'wallet_receive';
 export const CREATE_CHANNEL = 'create_channel';
 export const YOUTUBE_WELCOME = 'youtube_welcome';
 export const MOBILE_NAVIGATION = 'mobile_navigation';
+export const SET_REFERRER = 'set_referrer';

ui/modal/modalRouter/view.jsx

@@ -33,6 +33,7 @@ import ModalWalletReceive from 'modal/modalWalletReceive';
 import ModalYoutubeWelcome from 'modal/modalYoutubeWelcome';
 import ModalCreateChannel from 'modal/modalChannelCreate';
 import ModalMobileNavigation from 'modal/modalMobileNavigation';
+import ModalSetReferrer from 'modal/modalSetReferrer';
 
 type Props = {
   modal: { id: string, modalProps: {} },
@@ -122,6 +123,8 @@ function ModalRouter(props: Props) {
       return <ModalCreateChannel {...modalProps} />;
     case MODALS.MOBILE_NAVIGATION:
       return <ModalMobileNavigation {...modalProps} />;
+    case MODALS.SET_REFERRER:
+      return <ModalSetReferrer {...modalProps} />;
     default:
       return null;
   }

ui/modal/modalSetReferrer/index.js

@@ -0,0 +1,16 @@
+import { connect } from 'react-redux';
+import { doHideModal } from 'redux/actions/app';
+import { doUserSetReferrer } from 'lbryinc';
+import ModalSetReferrer from './view';
+
+const select = state => ({});
+
+const perform = dispatch => ({
+  closeModal: () => dispatch(doHideModal()),
+  submitReferrer: referrer => dispatch(doUserSetReferrer(referrer)),
+});
+
+export default connect(
+  select,
+  perform
+)(ModalSetReferrer);

ui/modal/modalSetReferrer/view.jsx

@@ -0,0 +1,80 @@
+// @flow
+import * as React from 'react';
+import { FormField, Form } from 'component/common/form';
+import { Modal } from 'modal/modal';
+import Button from 'component/button';
+
+type Props = {
+  closeModal: () => void,
+  error: ?string,
+  rewardIsPending: boolean,
+  submitRewardCode: string => void,
+};
+
+type State = {
+  rewardCode: string,
+};
+
+class ModalSetReferrer extends React.PureComponent<Props, State> {
+  constructor() {
+    super();
+
+    this.state = {
+      rewardCode: '',
+    };
+
+    (this: any).handleSubmit = this.handleSubmit.bind(this);
+  }
+
+  handleSubmit() {
+    const { rewardCode } = this.state;
+    const { submitRewardCode } = this.props;
+    submitRewardCode(rewardCode);
+  }
+
+  render() {
+    const { closeModal, rewardIsPending, error } = this.props;
+    const { rewardCode } = this.state;
+
+    return (
+      <Modal
+        isOpen
+        title={__('Enter Referrer')}
+        contentLabel={__('Enter Referrer')}
+        type="custom"
+        onAborted={closeModal}
+      >
+        <Form onSubmit={this.handleSubmit}>
+          <p>
+            {__('Tell us who referred you and get a reward!')}
+            {'. '}
+            <Button button="link" href="https://lbry.com/faq/rewards#reward-code" label={__('Fake Help Link')} />.
+          </p>
+          <FormField
+            autoFocus
+            type="text"
+            name="referrer-code"
+            inputButton={
+              <Button
+                button="primary"
+                type="submit"
+                disabled={!rewardCode || rewardIsPending}
+                label={rewardIsPending ? __('Redeeming') : __('Redeem')}
+              />
+            }
+            label={__('Code')}
+            placeholder="0123abc"
+            error={error}
+            value={rewardCode}
+            onChange={e => this.setState({ rewardCode: e.target.value })}
+          />
+        </Form>
+        <div className="card__actions">
+          <Button button="link" label={__('Cancel')} onClick={closeModal} />
+        </div>
+      </Modal>
+    );
+  }
+}
+
+export default ModalSetReferrer;

ui/page/invited/index.js

@@ -0,0 +1,10 @@
+import { connect } from 'react-redux';
+import InvitedPage from './view';
+
+const select = () => ({});
+const perform = () => ({});
+
+export default connect(
+  select,
+  perform
+)(InvitedPage);

ui/page/invited/view.jsx

@@ -0,0 +1,12 @@
+// @flow
+import React from 'react';
+import Page from 'component/page';
+import Invited from 'component/invited';
+
+export default function ReferredPage() {
+  return (
+    <Page authPage className="main--auth-page">
+      <Invited />
+    </Page>
+  );
+}

yarn.lock

@@ -902,6 +902,13 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
+"@babel/runtime@^7.4.0":
+  version "7.7.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.7.tgz#194769ca8d6d7790ec23605af9ee3e42a0aa79cf"
+  integrity sha512-uCnC2JEVAu8AKB5do1WRIsvrdJ0flYx/A/9f/6chdacnEZ7LmavjdsDXr5ksYBegxtuTPR5Va9/+13QF/kFkCA==
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@babel/runtime@^7.6.3":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.4.tgz#b23a856751e4bf099262f867767889c0e3fe175b"
@@ -1685,11 +1692,6 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-asap@~2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
-
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
@@ -3148,11 +3150,6 @@ core-js-compat@^3.1.1:
     browserslist "^4.7.2"
     semver "^6.3.0"
 
-core-js@^1.0.0:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
-  integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
-
 core-js@^2.4.0, core-js@^2.6.5:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.8.tgz#dc3a1e633a04267944e0cb850d3880f340248139"
@@ -3239,14 +3236,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-create-react-context@^0.2.2:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.3.tgz#9ec140a6914a22ef04b8b09b7771de89567cb6f3"
-  integrity sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag==
-  dependencies:
-    fbjs "^0.8.0"
-    gud "^1.0.0"
-
 crocket@^0.9.11:
   version "0.9.11"
   resolved "https://registry.yarnpkg.com/crocket/-/crocket-0.9.11.tgz#288fca11ef0d3dd239b62c488265f30c8edfb0c5"
@@ -4301,13 +4290,6 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
-encoding@^0.1.11:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
-  dependencies:
-    iconv-lite "~0.4.13"
-
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -4984,19 +4966,6 @@ faye-websocket@~0.11.1:
   dependencies:
     websocket-driver ">=0.5.1"
 
-fbjs@^0.8.0:
-  version "0.8.17"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
-  integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
-  dependencies:
-    core-js "^1.0.0"
-    isomorphic-fetch "^2.1.1"
-    loose-envify "^1.0.0"
-    object-assign "^4.1.0"
-    promise "^7.1.1"
-    setimmediate "^1.0.5"
-    ua-parser-js "^0.7.18"
-
 fd-slicer@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
@@ -6088,7 +6057,7 @@ husky@^3.1.0:
     run-node "^1.0.0"
     slash "^3.0.0"
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -6725,7 +6694,7 @@ is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
   integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=
 
-is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
+is-stream@^1.0.0, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
@@ -6825,14 +6794,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isomorphic-fetch@^2.1.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
-  integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
-  dependencies:
-    node-fetch "^1.0.1"
-    whatwg-fetch ">=0.10.0"
-
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -7810,6 +7771,15 @@ min-document@^2.19.0:
   dependencies:
     dom-walk "^0.1.0"
 
+mini-create-react-context@^0.3.0:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz#79fc598f283dd623da8e088b05db8cddab250189"
+  integrity sha512-2v+OeetEyliMt5VHMXsBhABoJ0/M4RCe7fatd/fBy6SMiKazUSEt3gxxypfnk2SHMkdBYvorHRoQxuGoiwbzAw==
+  dependencies:
+    "@babel/runtime" "^7.4.0"
+    gud "^1.0.0"
+    tiny-warning "^1.0.2"
+
 mini-css-extract-plugin@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.7.0.tgz#5ba8290fbb4179a43dd27cca444ba150bee743a0"
@@ -8050,14 +8020,6 @@ node-emoji@^1.8.1:
   dependencies:
     lodash.toarray "^4.4.0"
 
-node-fetch@^1.0.1:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
-  integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
-  dependencies:
-    encoding "^0.1.11"
-    is-stream "^1.0.1"
-
 node-fetch@^2.1.1, node-fetch@^2.3.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
@@ -9747,13 +9709,6 @@ promise-inflight@^1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
-promise@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
-  dependencies:
-    asap "~2.0.3"
-
 prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.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"
@@ -10106,29 +10061,29 @@ react-redux@^6.0.1:
     prop-types "^15.7.2"
     react-is "^16.8.2"
 
-react-router-dom@^5.0.0:
+react-router-dom@^5.1.0:
-  version "5.0.0"
+  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.0.0.tgz#542a9b86af269a37f0b87218c4c25ea8dcf0c073"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.1.2.tgz#06701b834352f44d37fbb6311f870f84c76b9c18"
-  integrity sha512-wSpja5g9kh5dIteZT3tUoggjnsa+TPFHSMrpHXMpFsaHhQkm/JNVGh2jiF9Dkh4+duj4MKCkwO6H08u6inZYgQ==
+  integrity sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew==
   dependencies:
     "@babel/runtime" "^7.1.2"
     history "^4.9.0"
     loose-envify "^1.3.1"
     prop-types "^15.6.2"
-    react-router "5.0.0"
+    react-router "5.1.2"
     tiny-invariant "^1.0.2"
     tiny-warning "^1.0.0"
 
-react-router@5.0.0, react-router@^5.0.0:
+react-router@5.1.2, react-router@^5.1.0:
-  version "5.0.0"
+  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.0.0.tgz#349863f769ffc2fa10ee7331a4296e86bc12879d"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.1.2.tgz#6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418"
-  integrity sha512-6EQDakGdLG/it2x9EaCt9ZpEEPxnd0OCLBHQ1AcITAAx7nCnyvnzf76jKWG1s2/oJ7SSviUgfWHofdYljFexsA==
+  integrity sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A==
   dependencies:
     "@babel/runtime" "^7.1.2"
-    create-react-context "^0.2.2"
     history "^4.9.0"
     hoist-non-react-statics "^3.1.0"
     loose-envify "^1.3.1"
+    mini-create-react-context "^0.3.0"
     path-to-regexp "^1.7.0"
     prop-types "^15.6.2"
     react-is "^16.6.0"
@@ -11056,7 +11011,7 @@ set-value@^2.0.0, set-value@^2.0.1:
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
-setimmediate@^1.0.4, setimmediate@^1.0.5, setimmediate@~1.0.4:
+setimmediate@^1.0.4, setimmediate@~1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
   integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
@@ -11989,6 +11944,11 @@ tiny-warning@^1.0.0:
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.2.tgz#1dfae771ee1a04396bdfde27a3adcebc6b648b28"
   integrity sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q==
 
+tiny-warning@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
+  integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -12212,11 +12172,6 @@ typo-js@*:
   resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.0.3.tgz#54d8ebc7949f1a7810908b6002c6841526c99d5a"
   integrity sha1-VNjrx5SfGngQkItgAsaEFSbJnVo=
 
-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"
-  integrity sha512-T3PVJ6uz8i0HzPxOF9SWzWAlfN/DavlpQqepn22xgve/5QecC+XMCAtmUNnY7C9StehaV6exjUCI801lOI7QlQ==
-
 uglify-js@3.4.x:
   version "3.4.10"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
@@ -12949,11 +12904,6 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
   integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
 
-whatwg-fetch@>=0.10.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
-  integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
-
 whet.extend@~0.9.9:
   version "0.9.9"
   resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"