Bring in lbry-redux/lbryinc code

.flowconfig

@@ -24,6 +24,7 @@ module.name_mapper='^modal\(.*\)$' -> '<PROJECT_ROOT>/ui/modal\1'
 module.name_mapper='^app\(.*\)$' -> '<PROJECT_ROOT>/ui/app\1'
 module.name_mapper='^native\(.*\)$' -> '<PROJECT_ROOT>/ui/native\1'
 module.name_mapper='^analytics\(.*\)$' -> '<PROJECT_ROOT>/ui/analytics\1'
+module.name_mapper='^rewards\(.*\)$' -> '<PROJECT_ROOT>/ui/rewards\1'
 module.name_mapper='^i18n\(.*\)$' -> '<PROJECT_ROOT>/ui/i18n\1'
 module.name_mapper='^effects\(.*\)$' -> '<PROJECT_ROOT>/ui/effects\1'
 module.name_mapper='^config\(.*\)$' -> '<PROJECT_ROOT>/config\1'

package.json

@@ -136,7 +136,7 @@
     "json-loader": "^0.5.4",
     "lbry-format": "https://github.com/lbryio/lbry-format.git",
     "lbry-redux": "lbryio/lbry-redux#f8ac5359d9d05fba2c3a536003a9d4c64b86c9f0",
-    "lbryinc": "lbryio/lbryinc#3ceb09549cb5ec22927ce3bea44ae8dbe2e4a006",
+    "lbryinc": "lbryio/lbryinc#72eee35f5181940eb4a468a27ddb2a2a4e362fb0",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",
     "lodash-es": "^4.17.14",

ui/component/app/index.js

@@ -1,16 +1,10 @@
 import * as SETTINGS from 'constants/settings';
 import { hot } from 'react-hot-loader/root';
 import { connect } from 'react-redux';
-import {
-  selectUser,
-  selectAccessToken,
-  doFetchAccessToken,
-  selectGetSyncErrorMessage,
-  selectUploadCount,
-  selectUnclaimedRewards,
-  doUserSetReferrer,
-  selectUserVerifiedEmail,
-} from 'lbryinc';
+import { selectGetSyncErrorMessage, selectUploadCount } from 'lbryinc';
+import { doFetchAccessToken, doUserSetReferrer } from 'redux/actions/user';
+import { selectUser, selectAccessToken, selectUserVerifiedEmail } from 'redux/selectors/user';
+import { selectUnclaimedRewards } from 'redux/selectors/rewards';
 import { doFetchChannelListMine } from 'lbry-redux';
 import { makeSelectClientSetting, selectLoadedLanguages, selectThemePath } from 'redux/selectors/settings';
 import { selectIsUpgradeAvailable, selectAutoUpdateDownloaded } from 'redux/selectors/app';

ui/component/app/view.jsx

@@ -14,7 +14,7 @@ import FileRenderFloating from 'component/fileRenderFloating';
 import { withRouter } from 'react-router';
 import usePrevious from 'effects/use-previous';
 import Nag from 'component/common/nag';
-import { rewards as REWARDS } from 'lbryinc';
+import REWARDS from 'rewards';
 import usePersistedState from 'effects/use-persisted-state';
 import FileDrop from 'component/fileDrop';
 // @if TARGET='web'

ui/component/blockButton/index.js

@@ -2,11 +2,11 @@ import { connect } from 'react-redux';
 import {
   selectChannelIsBlocked,
   doToggleBlockChannel,
-  doToast,
   makeSelectClaimIsMine,
   makeSelectShortUrlForUri,
   makeSelectPermanentUrlForUri,
 } from 'lbry-redux';
+import { doToast } from 'redux/actions/notifications';
 import BlockButton from './view';
 
 const select = (state, props) => ({
@@ -16,10 +16,7 @@ const select = (state, props) => ({
   permanentUrl: makeSelectPermanentUrlForUri(props.uri)(state),
 });
 
-export default connect(
-  select,
-  {
-    toggleBlockChannel: doToggleBlockChannel,
-    doToast,
-  }
-)(BlockButton);
+export default connect(select, {
+  toggleBlockChannel: doToggleBlockChannel,
+  doToast,
+})(BlockButton);

ui/component/button/index.js

@@ -1,7 +1,7 @@
 import Button from './view';
 import React, { forwardRef } from 'react';
 import { connect } from 'react-redux';
-import { selectUserVerifiedEmail } from 'lbryinc';
+import { selectUserVerifiedEmail } from 'redux/selectors/user';
 
 const mapStateToProps = state => ({
   pathname: state.router.location.pathname,

ui/component/cardVerify/index.js

@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { selectUserEmail } from 'lbryinc';
+import { selectUserEmail } from 'redux/selectors/user';
 import CardVerify from './view';
 
 const select = state => ({
@@ -8,7 +8,4 @@ const select = state => ({
 
 const perform = () => ({});
 
-export default connect(
-  select,
-  perform
-)(CardVerify);
+export default connect(select, perform)(CardVerify);

ui/component/channelContent/index.js

@@ -9,7 +9,7 @@ import {
   makeSelectClaimForUri,
 } from 'lbry-redux';
 import { withRouter } from 'react-router';
-import { selectUserVerifiedEmail } from 'lbryinc';
+import { selectUserVerifiedEmail } from 'redux/selectors/user';
 import ChannelPage from './view';
 
 const select = (state, props) => {

ui/component/channelForm/index.js

@@ -12,7 +12,7 @@ import {
   doPrepareEdit,
 } from 'lbry-redux';
 import { doPublishDesktop } from 'redux/actions/publish';
-import { selectUnclaimedRewardValue } from 'lbryinc';
+import { selectUnclaimedRewardValue } from 'redux/selectors/rewards';
 import ChannelForm from './view';
 
 const select = state => ({

ui/component/claimLink/index.js

@@ -1,9 +1,6 @@
 import { connect } from 'react-redux';
-
 import { doResolveUri, makeSelectTitleForUri, makeSelectClaimForUri, makeSelectIsUriResolving } from 'lbry-redux';
-
 import { selectBlackListedOutpoints } from 'lbryinc';
-
 import ClaimLink from './view';
 
 const select = (state, props) => {
@@ -20,7 +17,4 @@ const perform = dispatch => ({
   resolveUri: uri => dispatch(doResolveUri(uri)),
 });
 
-export default connect(
-  select,
-  perform
-)(ClaimLink);
+export default connect(select, perform)(ClaimLink);

ui/component/claimUri/index.js

@@ -1,14 +1,12 @@
 import { connect } from 'react-redux';
-import { makeSelectCanonicalUrlForUri, doToast } from 'lbry-redux';
+import { makeSelectCanonicalUrlForUri } from 'lbry-redux';
+import { doToast } from 'redux/actions/notifications';
 import ClaimUri from './view';
 
 const select = (state, props) => ({
   shortUrl: makeSelectCanonicalUrlForUri(props.uri)(state),
 });
 
-export default connect(
-  select,
-  {
-    doToast,
-  }
-)(ClaimUri);
+export default connect(select, {
+  doToast,
+})(ClaimUri);

ui/component/commentCreate/index.js

@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import { doCommentCreate, makeSelectClaimForUri, selectMyChannelClaims } from 'lbry-redux';
 import { doOpenModal } from 'redux/actions/app';
 import { CommentCreate } from './view';
-import { selectUserVerifiedEmail } from 'lbryinc';
+import { selectUserVerifiedEmail } from 'redux/selectors/user';
 
 const select = (state, props) => ({
   commentingEnabled: IS_WEB ? Boolean(selectUserVerifiedEmail(state)) : true,

ui/component/copyableText/index.js

@@ -1,10 +1,7 @@
 import { connect } from 'react-redux';
-import { doToast } from 'lbry-redux';
+import { doToast } from 'redux/actions/notifications';
 import CopyableText from './view';
 
-export default connect(
-  null,
-  {
-    doToast,
-  }
-)(CopyableText);
+export default connect(null, {
+  doToast,
+})(CopyableText);

ui/component/emailCollection/index.js

@@ -2,7 +2,7 @@ import * as SETTINGS from 'constants/settings';
 import { connect } from 'react-redux';
 import { doSetClientSetting } from 'redux/actions/settings';
 import { makeSelectClientSetting } from 'redux/selectors/settings';
-import { selectEmailToVerify, selectUser } from 'lbryinc';
+import { selectEmailToVerify, selectUser } from 'redux/selectors/user';
 import FirstRunEmailCollection from './view';
 
 const select = state => ({
@@ -17,7 +17,4 @@ const perform = dispatch => () => ({
   },
 });
 
-export default connect(
-  select,
-  perform
-)(FirstRunEmailCollection);
+export default connect(select, perform)(FirstRunEmailCollection);

ui/component/embedTextArea/index.js

@@ -1,10 +1,7 @@
 import { connect } from 'react-redux';
-import { doToast } from 'lbry-redux';
+import { doToast } from 'redux/actions/notifications';
 import EmbedTextArea from './view';
 
-export default connect(
-  null,
-  {
-    doToast,
-  }
-)(EmbedTextArea);
+export default connect(null, {
+  doToast,
+})(EmbedTextArea);

ui/component/fileDescription/index.js

@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import { makeSelectClaimForUri, makeSelectMetadataForUri, makeSelectTagsForUri } from 'lbry-redux';
-import { selectUser } from 'lbryinc';
+import { selectUser } from 'redux/selectors/user';
 import FileDescription from './view';
 
 const select = (state, props) => ({

ui/component/fileDetails/index.js

@@ -5,7 +5,7 @@ import {
   makeSelectMetadataForUri,
   makeSelectFileInfoForUri,
 } from 'lbry-redux';
-import { selectUser } from 'lbryinc';
+import { selectUser } from 'redux/selectors/user';
 import { doOpenFileInFolder } from 'redux/actions/file';
 import FileDetails from './view';
 
@@ -21,7 +21,4 @@ const perform = dispatch => ({
   openFolder: path => dispatch(doOpenFileInFolder(path)),
 });
 
-export default connect(
-  select,
-  perform
-)(FileDetails);
+export default connect(select, perform)(FileDetails);

ui/component/fileRenderInitiator/index.js

@@ -8,7 +8,8 @@ import {
   makeSelectStreamingUrlForUri,
   makeSelectClaimWasPurchased,
 } from 'lbry-redux';
-import { makeSelectCostInfoForUri, selectUserVerifiedEmail } from 'lbryinc';
+import { makeSelectCostInfoForUri } from 'lbryinc';
+import { selectUserVerifiedEmail } from 'redux/selectors/user';
 import { makeSelectClientSetting } from 'redux/selectors/settings';
 import { withRouter } from 'react-router';
 import {

ui/component/fileRenderInline/index.js

@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import { makeSelectFileInfoForUri, makeSelectStreamingUrlForUri } from 'lbry-redux';
-import { doClaimEligiblePurchaseRewards } from 'lbryinc';
+import { doClaimEligiblePurchaseRewards } from 'redux/actions/rewards';
 import { makeSelectFileRenderModeForUri, makeSelectIsPlaying } from 'redux/selectors/content';
 import { withRouter } from 'react-router';
 import { doAnalyticsView } from 'redux/actions/app';

ui/component/fileValues/index.js

@@ -7,7 +7,7 @@ import {
   makeSelectPendingAmountByUri,
   makeSelectClaimIsMine,
 } from 'lbry-redux';
-import { selectUser } from 'lbryinc';
+import { selectUser } from 'redux/selectors/user';
 import { doOpenModal } from 'redux/actions/app';
 
 import FileValues from './view';

ui/component/header/index.js

@@ -2,14 +2,9 @@ import * as SETTINGS from 'constants/settings';
 import * as MODALS from 'constants/modal_types';
 import { connect } from 'react-redux';
 import { selectBalance, formatCredits } from 'lbry-redux';
-import {
-  selectUserVerifiedEmail,
-  selectGetSyncErrorMessage,
-  selectUserEmail,
-  doClearEmailEntry,
-  doClearPasswordEntry,
-  selectEmailToVerify,
-} from 'lbryinc';
+import { selectGetSyncErrorMessage } from 'lbryinc';
+import { selectUserVerifiedEmail, selectUserEmail, selectEmailToVerify } from 'redux/selectors/user';
+import { doClearEmailEntry, doClearPasswordEntry } from 'redux/actions/user';
 import { doSetClientSetting } from 'redux/actions/settings';
 import { doSignOut, doOpenModal } from 'redux/actions/app';
 import { makeSelectClientSetting } from 'redux/selectors/settings';

ui/component/inviteList/index.js

@@ -1,5 +1,6 @@
 import { connect } from 'react-redux';
-import { selectReferralReward, selectUserInvitees, selectUserInviteStatusIsPending } from 'lbryinc';
+import { selectReferralReward } from 'redux/selectors/rewards';
+import { selectUserInvitees, selectUserInviteStatusIsPending } from 'redux/selectors/user';
 import InviteList from './view';
 
 const select = state => ({
@@ -10,7 +11,4 @@ const select = state => ({
 
 const perform = () => ({});
 
-export default connect(
-  select,
-  perform
-)(InviteList);
+export default connect(select, perform)(InviteList);

ui/component/inviteNew/index.js

@@ -5,8 +5,8 @@ import {
   selectUserInviteNewErrorMessage,
   selectUserInviteReferralLink,
   selectUserInviteReferralCode,
-  doUserInviteNew,
-} from 'lbryinc';
+} from 'redux/selectors/user';
+import { doUserInviteNew } from 'redux/actions/user';
 import { selectMyChannelClaims, selectFetchingMyChannels, doFetchChannelListMine } from 'lbry-redux';
 import InviteNew from './view';
 
@@ -25,7 +25,4 @@ const perform = dispatch => ({
   fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
 });
 
-export default connect(
-  select,
-  perform
-)(InviteNew);
+export default connect(select, perform)(InviteNew);

ui/component/invited/index.js

@@ -1,17 +1,13 @@
 import { connect } from 'react-redux';
-import {
-  selectUser,
-  doClaimRewardType,
-  doUserSetReferrer,
-  selectSetReferrerPending,
-  selectSetReferrerError,
-  rewards as REWARDS,
-  selectUnclaimedRewards,
-} from 'lbryinc';
+import { withRouter } from 'react-router';
+import REWARDS from 'rewards';
+import { selectUser, selectSetReferrerPending, selectSetReferrerError } from 'redux/selectors/user';
+import { doClaimRewardType } from 'redux/actions/rewards';
+import { selectUnclaimedRewards } from 'redux/selectors/rewards';
+import { doUserSetReferrer } from 'redux/actions/user';
 import { makeSelectIsSubscribed } from 'redux/selectors/subscriptions';
 import { doChannelSubscribe } from 'redux/actions/subscriptions';
 import Invited from './view';
-import { withRouter } from 'react-router';
 
 const select = (state, props) => {
   return {
@@ -31,9 +27,4 @@ const perform = dispatch => ({
   channelSubscribe: uri => dispatch(doChannelSubscribe(uri)),
 });
 
-export default withRouter(
-  connect(
-    select,
-    perform
-  )(Invited)
-);
+export default withRouter(connect(select, perform)(Invited));

ui/component/invited/view.jsx

@@ -5,7 +5,8 @@ import Button from 'component/button';
 import ClaimPreview from 'component/claimPreview';
 import Card from 'component/common/card';
 import { buildURI, parseURI } from 'lbry-redux';
-import { rewards as REWARDS, ERRORS } from 'lbryinc';
+import { ERRORS } from 'lbryinc';
+import REWARDS from 'rewards';
 import { formatLbryUrlForWeb } from 'util/url';
 import ChannelContent from 'component/channelContent';
 import I18nMessage from 'component/i18nMessage';

ui/component/previewLink/index.js

@@ -1,5 +1,4 @@
 import { connect } from 'react-redux';
-
 import {
   doResolveUri,
   makeSelectClaimIsMine,
@@ -9,9 +8,7 @@ import {
   makeSelectIsUriResolving,
   makeSelectMetadataItemForUri,
 } from 'lbry-redux';
-
 import { selectBlackListedOutpoints } from 'lbryinc';
-
 import PreviewLink from './view';
 
 const select = (state, props) => {
@@ -31,7 +28,4 @@ const perform = dispatch => ({
   resolveUri: uri => dispatch(doResolveUri(uri)),
 });
 
-export default connect(
-  select,
-  perform
-)(PreviewLink);
+export default connect(select, perform)(PreviewLink);