Merge pull request #737 from seanyesmunt/redux-cleanup

Move all redux code into /redux folder

ui/js/component/app/index.js

@@ -1,10 +1,10 @@
 import React from "react";
 import { connect } from "react-redux";
-import { selectPageTitle } from "selectors/navigation";
-import { selectUser } from "selectors/user";
-import { doCheckUpgradeAvailable, doAlertError } from "actions/app";
-import { doRecordScroll } from "actions/navigation";
-import { doFetchRewardedContent } from "actions/content";
+import { selectPageTitle } from "redux/selectors/navigation";
+import { selectUser } from "redux/selectors/user";
+import { doCheckUpgradeAvailable, doAlertError } from "redux/actions/app";
+import { doRecordScroll } from "redux/actions/navigation";
+import { doFetchRewardedContent } from "redux/actions/content";
 import App from "./view";
 
 const select = (state, props) => ({

ui/js/component/cardVerify/index.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { connect } from "react-redux";
-import { selectUserEmail } from "selectors/user";
+import { selectUserEmail } from "redux/selectors/user";
 import CardVerify from "./view";
 
 const select = state => ({

ui/js/component/channelTile/index.js

@@ -1,10 +1,10 @@
 import React from "react";
 import { connect } from "react-redux";
-import { makeSelectClaimForUri } from "selectors/claims";
-import { doNavigate } from "actions/navigation";
-import { doResolveUri } from "actions/content";
-import { makeSelectTotalItemsForChannel } from "selectors/content";
-import { makeSelectIsUriResolving } from "selectors/content";
+import { makeSelectClaimForUri } from "redux/selectors/claims";
+import { doNavigate } from "redux/actions/navigation";
+import { doResolveUri } from "redux/actions/content";
+import { makeSelectTotalItemsForChannel } from "redux/selectors/content";
+import { makeSelectIsUriResolving } from "redux/selectors/content";
 import ChannelTile from "./view";
 
 const select = (state, props) => ({

ui/js/component/dateTime/index.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { connect } from "react-redux";
-import { makeSelectBlockDate } from "selectors/wallet";
-import { doFetchBlock } from "actions/wallet";
+import { makeSelectBlockDate } from "redux/selectors/wallet";
+import { doFetchBlock } from "redux/actions/wallet";
 import DateTime from "./view";
 
 const select = (state, props) => ({

ui/js/component/fileActions/index.js

@@ -1,9 +1,9 @@
 import React from "react";
 import { connect } from "react-redux";
-import { makeSelectFileInfoForUri } from "selectors/file_info";
-import { makeSelectCostInfoForUri } from "selectors/cost_info";
-import { doOpenModal } from "actions/app";
-import { makeSelectClaimIsMine } from "selectors/claims";
+import { makeSelectFileInfoForUri } from "redux/selectors/file_info";
+import { makeSelectCostInfoForUri } from "redux/selectors/cost_info";
+import { doOpenModal } from "redux/actions/app";
+import { makeSelectClaimIsMine } from "redux/selectors/claims";
 import FileActions from "./view";
 
 const select = (state, props) => ({

ui/js/component/fileCard/index.js

@@ -1,17 +1,17 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doNavigate } from "actions/navigation";
-import { doResolveUri } from "actions/content";
-import { selectShowNsfw } from "selectors/settings";
+import { doNavigate } from "redux/actions/navigation";
+import { doResolveUri } from "redux/actions/content";
+import { selectShowNsfw } from "redux/selectors/settings";
 import {
   makeSelectClaimForUri,
   makeSelectMetadataForUri,
-} from "selectors/claims";
-import { makeSelectFileInfoForUri } from "selectors/file_info";
+} from "redux/selectors/claims";
+import { makeSelectFileInfoForUri } from "redux/selectors/file_info";
 import {
   makeSelectIsUriResolving,
   selectRewardContentClaimIds,
-} from "selectors/content";
+} from "redux/selectors/content";
 import FileCard from "./view";
 
 const select = (state, props) => ({

ui/js/component/fileDetails/index.js

@@ -4,10 +4,10 @@ import {
   makeSelectClaimForUri,
   makeSelectContentTypeForUri,
   makeSelectMetadataForUri,
-} from "selectors/claims";
+} from "redux/selectors/claims";
 import FileDetails from "./view";
-import { doOpenFileInFolder } from "actions/file_info";
-import { makeSelectFileInfoForUri } from "selectors/file_info";
+import { doOpenFileInFolder } from "redux/actions/file_info";
+import { makeSelectFileInfoForUri } from "redux/selectors/file_info";
 
 const select = (state, props) => ({
   claim: makeSelectClaimForUri(props.uri)(state),

ui/js/component/fileDownloadLink/index.js

@@ -4,11 +4,11 @@ import {
   makeSelectFileInfoForUri,
   makeSelectDownloadingForUri,
   makeSelectLoadingForUri,
-} from "selectors/file_info";
-import { makeSelectCostInfoForUri } from "selectors/cost_info";
-import { doFetchAvailability } from "actions/availability";
-import { doOpenFileInShell } from "actions/file_info";
-import { doPurchaseUri, doStartDownload } from "actions/content";
+} from "redux/selectors/file_info";
+import { makeSelectCostInfoForUri } from "redux/selectors/cost_info";
+import { doFetchAvailability } from "redux/actions/availability";
+import { doOpenFileInShell } from "redux/actions/file_info";
+import { doPurchaseUri, doStartDownload } from "redux/actions/content";
 import FileDownloadLink from "./view";
 
 const select = (state, props) => ({

ui/js/component/fileListSearch/index.js

@@ -1,7 +1,10 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doSearch } from "actions/search";
-import { selectIsSearching, makeSelectSearchUris } from "selectors/search";
+import { doSearch } from "redux/actions/search";
+import {
+  selectIsSearching,
+  makeSelectSearchUris,
+} from "redux/selectors/search";
 import FileListSearch from "./view";
 
 const select = (state, props) => ({

ui/js/component/filePrice/index.js

@@ -1,11 +1,11 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doFetchCostInfoForUri } from "actions/cost_info";
+import { doFetchCostInfoForUri } from "redux/actions/cost_info";
 import {
   makeSelectCostInfoForUri,
   makeSelectFetchingCostInfoForUri,
-} from "selectors/cost_info";
-import { makeSelectClaimForUri } from "selectors/claims";
+} from "redux/selectors/cost_info";
+import { makeSelectClaimForUri } from "redux/selectors/claims";
 import FilePrice from "./view";
 
 const select = (state, props) => ({

ui/js/component/fileTile/index.js

@@ -1,17 +1,17 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doNavigate } from "actions/navigation";
-import { doResolveUri } from "actions/content";
+import { doNavigate } from "redux/actions/navigation";
+import { doResolveUri } from "redux/actions/content";
 import {
   makeSelectClaimForUri,
   makeSelectMetadataForUri,
-} from "selectors/claims";
-import { makeSelectFileInfoForUri } from "selectors/file_info";
-import { selectShowNsfw } from "selectors/settings";
+} from "redux/selectors/claims";
+import { makeSelectFileInfoForUri } from "redux/selectors/file_info";
+import { selectShowNsfw } from "redux/selectors/settings";
 import {
   makeSelectIsUriResolving,
   selectRewardContentClaimIds,
-} from "selectors/content";
+} from "redux/selectors/content";
 import FileTile from "./view";
 
 const select = (state, props) => ({

ui/js/component/header/index.js

@@ -4,13 +4,13 @@ import { connect } from "react-redux";
 import {
   selectIsBackDisabled,
   selectIsForwardDisabled,
-} from "selectors/navigation";
-import { selectBalance } from "selectors/wallet";
+} from "redux/selectors/navigation";
+import { selectBalance } from "redux/selectors/wallet";
 import {
   doNavigate,
   doHistoryBack,
   doHistoryForward,
-} from "actions/navigation";
+} from "redux/actions/navigation";
 import Header from "./view";
 
 const select = state => ({

ui/js/component/inviteList/index.js

@@ -3,7 +3,7 @@ import { connect } from "react-redux";
 import {
   selectUserInvitees,
   selectUserInviteStatusIsPending,
-} from "selectors/user";
+} from "redux/selectors/user";
 import InviteList from "./view";
 
 const select = state => ({

ui/js/component/inviteNew/index.js

@@ -5,11 +5,11 @@ import {
   selectUserInvitesRemaining,
   selectUserInviteNewIsPending,
   selectUserInviteNewErrorMessage,
-} from "selectors/user";
+} from "redux/selectors/user";
 import rewards from "rewards";
-import { makeSelectRewardAmountByType } from "selectors/rewards";
+import { makeSelectRewardAmountByType } from "redux/selectors/rewards";
 
-import { doUserInviteNew } from "actions/user";
+import { doUserInviteNew } from "redux/actions/user";
 
 const select = state => {
   const selectReward = makeSelectRewardAmountByType();

ui/js/component/link/index.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doNavigate } from "actions/navigation";
+import { doNavigate } from "redux/actions/navigation";
 import Link from "./view";
 
 const perform = dispatch => ({

ui/js/component/nsfwOverlay/index.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doNavigate } from "actions/navigation";
+import { doNavigate } from "redux/actions/navigation";
 import NsfwOverlay from "./view";
 
 const perform = dispatch => ({

ui/js/component/rewardLink/index.js

@@ -4,9 +4,12 @@ import {
   makeSelectClaimRewardError,
   makeSelectRewardByType,
   makeSelectIsRewardClaimPending,
-} from "selectors/rewards";
-import { doNavigate } from "actions/navigation";
-import { doClaimRewardType, doClaimRewardClearError } from "actions/rewards";
+} from "redux/selectors/rewards";
+import { doNavigate } from "redux/actions/navigation";
+import {
+  doClaimRewardType,
+  doClaimRewardClearError,
+} from "redux/actions/rewards";
 import RewardLink from "./view";
 
 const makeSelect = () => {

ui/js/component/rewardListClaimed/index.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { connect } from "react-redux";
-import { selectClaimedRewards } from "selectors/rewards";
+import { selectClaimedRewards } from "redux/selectors/rewards";
 import RewardListClaimed from "./view";
 
 const select = state => ({

ui/js/component/rewardSummary/index.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { connect } from "react-redux";
-import { selectUnclaimedRewardValue } from "selectors/rewards";
+import { selectUnclaimedRewardValue } from "redux/selectors/rewards";
 import RewardSummary from "./view";
 
 const select = state => ({

ui/js/component/router/index.js

@@ -4,7 +4,7 @@ import Router from "./view.jsx";
 import {
   selectCurrentPage,
   selectCurrentParams,
-} from "selectors/navigation.js";
+} from "redux/selectors/navigation.js";
 
 const select = state => ({
   params: selectCurrentParams(state),

ui/js/component/snackBar/index.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doRemoveSnackBarSnack } from "actions/app";
-import { selectSnackBarSnacks } from "selectors/app";
+import { doRemoveSnackBarSnack } from "redux/actions/app";
+import { selectSnackBarSnacks } from "redux/selectors/app";
 import SnackBar from "./view";
 
 const perform = dispatch => ({

ui/js/component/splash/index.js

@@ -1,8 +1,11 @@
 import React from "react";
 import { connect } from "react-redux";
 
-import { selectCurrentModal, selectDaemonVersionMatched } from "selectors/app";
-import { doCheckDaemonVersion } from "actions/app";
+import {
+  selectCurrentModal,
+  selectDaemonVersionMatched,
+} from "redux/selectors/app";
+import { doCheckDaemonVersion } from "redux/actions/app";
 import SplashScreen from "./view";
 
 const select = state => {

ui/js/component/subHeader/index.js

@@ -1,7 +1,10 @@
 import React from "react";
 import { connect } from "react-redux";
-import { selectCurrentPage, selectHeaderLinks } from "selectors/navigation";
-import { doNavigate } from "actions/navigation";
+import {
+  selectCurrentPage,
+  selectHeaderLinks,
+} from "redux/selectors/navigation";
+import { doNavigate } from "redux/actions/navigation";
 import SubHeader from "./view";
 
 const select = (state, props) => ({

ui/js/component/theme/index.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { connect } from "react-redux";
-import { selectThemePath } from "selectors/settings.js";
+import { selectThemePath } from "redux/selectors/settings.js";
 import Theme from "./view";
 
 const select = state => ({

ui/js/component/transactionList/index.js

@@ -1,9 +1,9 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doNavigate } from "actions/navigation";
-import { doOpenModal } from "actions/app";
-import { selectClaimedRewardsByTransactionId } from "selectors/rewards";
-import { selectAllMyClaimsByOutpoint } from "selectors/claims";
+import { doNavigate } from "redux/actions/navigation";
+import { doOpenModal } from "redux/actions/app";
+import { selectClaimedRewardsByTransactionId } from "redux/selectors/rewards";
+import { selectAllMyClaimsByOutpoint } from "redux/selectors/claims";
 import TransactionList from "./view";
 
 const select = state => ({

ui/js/component/transactionListRecent/index.js

@@ -1,12 +1,12 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doFetchTransactions } from "actions/wallet";
+import { doFetchTransactions } from "redux/actions/wallet";
 import {
   selectBalance,
   selectRecentTransactions,
   selectHasTransactions,
   selectIsFetchingTransactions,
-} from "selectors/wallet";
+} from "redux/selectors/wallet";
 
 import TransactionListRecent from "./view";
 

ui/js/component/uriIndicator/index.js

@@ -1,9 +1,9 @@
 import React from "react";
 import lbryuri from "lbryuri";
 import { connect } from "react-redux";
-import { doResolveUri } from "actions/content";
-import { makeSelectIsUriResolving } from "selectors/content";
-import { makeSelectClaimForUri } from "selectors/claims";
+import { doResolveUri } from "redux/actions/content";
+import { makeSelectIsUriResolving } from "redux/selectors/content";
+import { makeSelectClaimForUri } from "redux/selectors/claims";
 import UriIndicator from "./view";
 
 const select = (state, props) => ({

ui/js/component/userEmailNew/index.js

@@ -1,10 +1,10 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doUserEmailNew, doUserInviteNew } from "actions/user";
+import { doUserEmailNew, doUserInviteNew } from "redux/actions/user";
 import {
   selectEmailNewIsPending,
   selectEmailNewErrorMessage,
-} from "selectors/user";
+} from "redux/selectors/user";
 import UserEmailNew from "./view";
 
 const select = state => ({

ui/js/component/userEmailVerify/index.js

@@ -1,11 +1,11 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doUserEmailVerify } from "actions/user";
+import { doUserEmailVerify } from "redux/actions/user";
 import {
   selectEmailVerifyIsPending,
   selectEmailToVerify,
   selectEmailVerifyErrorMessage,
-} from "selectors/user";
+} from "redux/selectors/user";
 import UserEmailVerify from "./view";
 
 const select = state => ({

ui/js/component/userVerify/index.js

@@ -1,13 +1,13 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doNavigate } from "actions/navigation";
-import { doUserIdentityVerify } from "actions/user";
+import { doNavigate } from "redux/actions/navigation";
+import { doUserIdentityVerify } from "redux/actions/user";
 import rewards from "rewards";
-import { makeSelectRewardByType } from "selectors/rewards";
+import { makeSelectRewardByType } from "redux/selectors/rewards";
 import {
   selectIdentityVerifyIsPending,
   selectIdentityVerifyErrorMessage,
-} from "selectors/user";
+} from "redux/selectors/user";
 import UserVerify from "./view";
 
 const select = (state, props) => {

ui/js/component/video/index.js

@@ -1,21 +1,21 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doChangeVolume } from "actions/app";
-import { selectVolume } from "selectors/app";
-import { doPlayUri, doSetPlayingUri } from "actions/content";
+import { doChangeVolume } from "redux/actions/app";
+import { selectVolume } from "redux/selectors/app";
+import { doPlayUri, doSetPlayingUri } from "redux/actions/content";
 import {
   makeSelectMetadataForUri,
   makeSelectContentTypeForUri,
-} from "selectors/claims";
+} from "redux/selectors/claims";
 import {
   makeSelectFileInfoForUri,
   makeSelectLoadingForUri,
   makeSelectDownloadingForUri,
-} from "selectors/file_info";
-import { makeSelectCostInfoForUri } from "selectors/cost_info";
-import { selectShowNsfw } from "selectors/settings";
+} from "redux/selectors/file_info";
+import { makeSelectCostInfoForUri } from "redux/selectors/cost_info";
+import { selectShowNsfw } from "redux/selectors/settings";
 import Video from "./view";
-import { selectPlayingUri } from "selectors/content";
+import { selectPlayingUri } from "redux/selectors/content";
 
 const select = (state, props) => ({
   costInfo: makeSelectCostInfoForUri(props.uri)(state),

ui/js/component/walletAddress/index.js

@@ -1,10 +1,10 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doCheckAddressIsMine, doGetNewAddress } from "actions/wallet";
+import { doCheckAddressIsMine, doGetNewAddress } from "redux/actions/wallet";
 import {
   selectReceiveAddress,
   selectGettingNewAddress,
-} from "selectors/wallet";
+} from "redux/selectors/wallet";
 import WalletAddress from "./view";
 
 const select = state => ({

ui/js/component/walletBalance/index.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { connect } from "react-redux";
-import { selectBalance } from "selectors/wallet";
+import { selectBalance } from "redux/selectors/wallet";
 import WalletBalance from "./view";
 
 const select = state => ({

ui/js/component/walletSend/index.js

@@ -4,12 +4,12 @@ import {
   doSendDraftTransaction,
   doSetDraftTransactionAmount,
   doSetDraftTransactionAddress,
-} from "actions/wallet";
+} from "redux/actions/wallet";
 import {
   selectDraftTransactionAmount,
   selectDraftTransactionAddress,
   selectDraftTransactionError,
-} from "selectors/wallet";
+} from "redux/selectors/wallet";
 
 import WalletSend from "./view";
 

ui/js/component/walletSendTip/index.js

@@ -1,9 +1,9 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doSendSupport } from "actions/wallet";
+import { doSendSupport } from "redux/actions/wallet";
 import WalletSendTip from "./view";
-import { makeSelectTitleForUri } from "selectors/claims";
-import { selectIsSendingSupport } from "selectors/wallet";
+import { makeSelectTitleForUri } from "redux/selectors/claims";
+import { selectIsSendingSupport } from "redux/selectors/wallet";
 
 const select = (state, props) => ({
   isPending: selectIsSendingSupport(state),

ui/js/component/wunderbar/index.js

@@ -1,8 +1,11 @@
 import React from "react";
 import { connect } from "react-redux";
 import lbryuri from "lbryuri.js";
-import { selectWunderBarAddress, selectWunderBarIcon } from "selectors/search";
-import { doNavigate } from "actions/navigation";
+import {
+  selectWunderBarAddress,
+  selectWunderBarIcon,
+} from "redux/selectors/search";
+import { doNavigate } from "redux/actions/navigation";
 import Wunderbar from "./view";
 
 const select = state => ({

ui/js/main.js

@@ -5,9 +5,9 @@ import SnackBar from "component/snackBar";
 import { Provider } from "react-redux";
 import store from "store.js";
 import SplashScreen from "component/splash";
-import { doDaemonReady } from "actions/app";
-import { doNavigate } from "actions/navigation";
-import { doDownloadLanguages } from "actions/settings";
+import { doDaemonReady } from "redux/actions/app";
+import { doNavigate } from "redux/actions/navigation";
+import { doDownloadLanguages } from "redux/actions/settings";
 import * as types from "constants/action_types";
 
 const env = ENV;

ui/js/modal/modalAffirmPurchase/index.js

@@ -1,8 +1,8 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doCloseModal } from "actions/app";
-import { doLoadVideo, doSetPlayingUri } from "actions/content";
-import { makeSelectMetadataForUri } from "selectors/claims";
+import { doCloseModal } from "redux/actions/app";
+import { doLoadVideo, doSetPlayingUri } from "redux/actions/content";
+import { makeSelectMetadataForUri } from "redux/selectors/claims";
 import ModalAffirmPurchase from "./view";
 
 const select = (state, props) => ({

ui/js/modal/modalAuthFailure/index.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doCloseModal } from "actions/app";
+import { doCloseModal } from "redux/actions/app";
 import ModalAuthFailure from "./view";
 
 const select = state => ({});

ui/js/modal/modalCreditIntro/index.js

@@ -1,15 +1,15 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doCloseModal } from "actions/app";
-import { doAuthNavigate } from "actions/navigation";
-import { doSetClientSetting } from "actions/settings";
-import { selectUserIsRewardApproved } from "selectors/user";
-import { selectBalance } from "selectors/wallet";
+import { doCloseModal } from "redux/actions/app";
+import { doAuthNavigate } from "redux/actions/navigation";
+import { doSetClientSetting } from "redux/actions/settings";
+import { selectUserIsRewardApproved } from "redux/selectors/user";
+import { selectBalance } from "redux/selectors/wallet";
 import {
   makeSelectHasClaimedReward,
   makeSelectRewardByType,
   selectUnclaimedRewardValue,
-} from "selectors/rewards";
+} from "redux/selectors/rewards";
 import * as settings from "constants/settings";
 import ModalCreditIntro from "./view";
 

ui/js/modal/modalDownloading/index.js

@@ -1,7 +1,10 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doStartUpgrade, doCancelUpgrade } from "actions/app";
-import { selectDownloadProgress, selectDownloadComplete } from "selectors/app";
+import { doStartUpgrade, doCancelUpgrade } from "redux/actions/app";
+import {
+  selectDownloadProgress,
+  selectDownloadComplete,
+} from "redux/selectors/app";
 import ModalDownloading from "./view";
 
 const select = state => ({

ui/js/modal/modalError/index.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doCloseModal } from "actions/app";
+import { doCloseModal } from "redux/actions/app";
 import ModalError from "./view";
 
 const perform = dispatch => ({

ui/js/modal/modalFileTimeout/index.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doCloseModal } from "actions/app";
-import { makeSelectMetadataForUri } from "selectors/claims";
+import { doCloseModal } from "redux/actions/app";
+import { makeSelectMetadataForUri } from "redux/selectors/claims";
 import ModalFileTimeout from "./view";
 
 const select = state => ({

ui/js/modal/modalFirstReward/index.js

@@ -1,8 +1,8 @@
 import React from "react";
 import rewards from "rewards";
 import { connect } from "react-redux";
-import { doCloseModal } from "actions/app";
-import { makeSelectRewardByType } from "selectors/rewards";
+import { doCloseModal } from "redux/actions/app";
+import { makeSelectRewardByType } from "redux/selectors/rewards";
 import ModalFirstReward from "./view";
 
 const select = (state, props) => {

ui/js/modal/modalIncompatibleDaemon/index.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doQuit, doSkipWrongDaemonNotice } from "actions/app";
+import { doQuit, doSkipWrongDaemonNotice } from "redux/actions/app";
 import ModalIncompatibleDaemon from "./view";
 
 const select = state => ({});

ui/js/modal/modalInsufficientBalance/index.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doCloseModal } from "actions/app";
-import { doNavigate } from "actions/navigation";
+import { doCloseModal } from "redux/actions/app";
+import { doNavigate } from "redux/actions/navigation";
 import ModalInsufficientBalance from "./view";
 
 const select = state => ({});

ui/js/modal/modalInsufficientCredits/index.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doCloseModal } from "actions/app";
-import { doNavigate } from "actions/navigation";
+import { doCloseModal } from "redux/actions/app";
+import { doNavigate } from "redux/actions/navigation";
 import ModalInsufficientCredits from "./view";
 
 const select = state => ({});

ui/js/modal/modalRemoveFile/index.js

@@ -1,9 +1,12 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doCloseModal } from "actions/app";
-import { doDeleteFileAndGoBack } from "actions/file_info";
-import { makeSelectTitleForUri, makeSelectClaimIsMine } from "selectors/claims";
-import { makeSelectFileInfoForUri } from "selectors/file_info";
+import { doCloseModal } from "redux/actions/app";
+import { doDeleteFileAndGoBack } from "redux/actions/file_info";
+import {
+  makeSelectTitleForUri,
+  makeSelectClaimIsMine,
+} from "redux/selectors/claims";
+import { makeSelectFileInfoForUri } from "redux/selectors/file_info";
 import ModalRemoveFile from "./view";
 
 const select = (state, props) => ({

ui/js/modal/modalRevokeClaim/index.js

@@ -1,8 +1,8 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doCloseModal } from "actions/app";
-import { doAbandonClaim } from "actions/content";
-import { selectTransactionItems } from "selectors/wallet";
+import { doCloseModal } from "redux/actions/app";
+import { doAbandonClaim } from "redux/actions/content";
+import { selectTransactionItems } from "redux/selectors/wallet";
 import ModalRevokeClaim from "./view";
 
 const select = state => ({

ui/js/modal/modalRewardApprovalRequired/index.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doCloseModal } from "actions/app";
-import { doAuthNavigate } from "actions/navigation";
+import { doCloseModal } from "redux/actions/app";
+import { doAuthNavigate } from "redux/actions/navigation";
 import ModalRewardApprovalRequired from "./view";
 
 const perform = dispatch => ({

ui/js/modal/modalRouter/index.js

@@ -1,13 +1,13 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doOpenModal } from "actions/app";
+import { doOpenModal } from "redux/actions/app";
 import * as settings from "constants/settings";
-import { selectCurrentModal, selectModalProps } from "selectors/app";
-import { selectCurrentPage } from "selectors/navigation";
-import { selectCostForCurrentPageUri } from "selectors/cost_info";
-import { makeSelectClientSetting } from "selectors/settings";
-import { selectUser } from "selectors/user";
-import { selectBalance } from "selectors/wallet";
+import { selectCurrentModal, selectModalProps } from "redux/selectors/app";
+import { selectCurrentPage } from "redux/selectors/navigation";
+import { selectCostForCurrentPageUri } from "redux/selectors/cost_info";
+import { makeSelectClientSetting } from "redux/selectors/settings";
+import { selectUser } from "redux/selectors/user";
+import { selectBalance } from "redux/selectors/wallet";
 import ModalRouter from "./view";
 
 const select = (state, props) => ({

ui/js/modal/modalTransactionFailed/index.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doCloseModal } from "actions/app";
+import { doCloseModal } from "redux/actions/app";
 import ModalTransactionFailed from "./view";
 
 const select = state => ({});

ui/js/modal/modalUpgrade/index.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doDownloadUpgrade, doSkipUpgrade } from "actions/app";
+import { doDownloadUpgrade, doSkipUpgrade } from "redux/actions/app";
 import ModalUpgrade from "./view";
 
 const select = state => ({});

ui/js/modal/modalWelcome/index.js

@@ -2,8 +2,8 @@ import React from "react";
 import * as settings from "constants/settings";
 import * as modals from "constants/modal_types";
 import { connect } from "react-redux";
-import { doCloseModal, doOpenModal } from "actions/app";
-import { doSetClientSetting } from "actions/settings";
+import { doCloseModal, doOpenModal } from "redux/actions/app";
+import { doSetClientSetting } from "redux/actions/settings";
 import ModalWelcome from "./view";
 
 const perform = dispatch => () => ({

ui/js/page/auth/index.js

@@ -1,7 +1,7 @@
 import React from "react";
-import { doNavigate } from "actions/navigation";
+import { doNavigate } from "redux/actions/navigation";
 import { connect } from "react-redux";
-import { selectPathAfterAuth } from "selectors/navigation";
+import { selectPathAfterAuth } from "redux/selectors/navigation";
 import {
   selectAuthenticationIsPending,
   selectEmailToVerify,
@@ -9,7 +9,7 @@ import {
   selectUser,
   selectUserIsPending,
   selectIdentityVerifyIsPending,
-} from "selectors/user";
+} from "redux/selectors/user";
 import AuthPage from "./view";
 
 const select = state => ({

ui/js/page/backup/index.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { connect } from "react-redux";
-import { selectDaemonSettings } from "selectors/settings";
+import { selectDaemonSettings } from "redux/selectors/settings";
 import BackupPage from "./view";
 
 const select = state => ({

ui/js/page/channel/index.js

@@ -3,18 +3,18 @@ import { connect } from "react-redux";
 import {
   doFetchClaimsByChannel,
   doFetchClaimCountByChannel,
-} from "actions/content";
+} from "redux/actions/content";
 import {
   makeSelectClaimForUri,
   makeSelectClaimsInChannelForCurrentPage,
   makeSelectFetchingChannelClaims,
-} from "selectors/claims";
+} from "redux/selectors/claims";
 import {
   makeSelectCurrentParam,
   selectCurrentParams,
-} from "selectors/navigation";
-import { doNavigate } from "actions/navigation";
-import { makeSelectTotalPagesForChannel } from "selectors/content";
+} from "redux/selectors/navigation";
+import { doNavigate } from "redux/actions/navigation";
+import { makeSelectTotalPagesForChannel } from "redux/selectors/content";
 import ChannelPage from "./view";
 
 const select = (state, props) => ({

ui/js/page/discover/index.js

@@ -1,10 +1,10 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doFetchFeaturedUris } from "actions/content";
+import { doFetchFeaturedUris } from "redux/actions/content";
 import {
   selectFeaturedUris,
   selectFetchingFeaturedUris,
-} from "selectors/content";
+} from "redux/selectors/content";
 import DiscoverPage from "./view";
 
 const select = state => ({

ui/js/page/file/index.js

@@ -1,19 +1,19 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doNavigate } from "actions/navigation";
-import { doFetchFileInfo } from "actions/file_info";
-import { makeSelectFileInfoForUri } from "selectors/file_info";
-import { selectRewardContentClaimIds } from "selectors/content";
-import { doFetchCostInfoForUri } from "actions/cost_info";
+import { doNavigate } from "redux/actions/navigation";
+import { doFetchFileInfo } from "redux/actions/file_info";
+import { makeSelectFileInfoForUri } from "redux/selectors/file_info";
+import { selectRewardContentClaimIds } from "redux/selectors/content";
+import { doFetchCostInfoForUri } from "redux/actions/cost_info";
 import {
   makeSelectClaimForUri,
   makeSelectContentTypeForUri,
   makeSelectMetadataForUri,
-} from "selectors/claims";
-import { makeSelectCostInfoForUri } from "selectors/cost_info";
-import { selectShowNsfw } from "selectors/settings";
+} from "redux/selectors/claims";
+import { makeSelectCostInfoForUri } from "redux/selectors/cost_info";
+import { selectShowNsfw } from "redux/selectors/settings";
 import FilePage from "./view";
-import { makeSelectCurrentParam } from "selectors/navigation";
+import { makeSelectCurrentParam } from "redux/selectors/navigation";
 
 const select = (state, props) => ({
   claim: makeSelectClaimForUri(props.uri)(state),

ui/js/page/fileListDownloaded/index.js

@@ -1,16 +1,16 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doFetchFileInfosAndPublishedClaims } from "actions/file_info";
+import { doFetchFileInfosAndPublishedClaims } from "redux/actions/file_info";
 import {
   selectFileInfosDownloaded,
   selectIsFetchingFileListDownloadedOrPublished,
-} from "selectors/file_info";
+} from "redux/selectors/file_info";
 import {
   selectMyClaimsWithoutChannels,
   selectIsFetchingClaimListMine,
-} from "selectors/claims";
-import { doFetchClaimListMine } from "actions/content";
-import { doNavigate } from "actions/navigation";
+} from "redux/selectors/claims";
+import { doFetchClaimListMine } from "redux/actions/content";
+import { doNavigate } from "redux/actions/navigation";
 import FileListDownloaded from "./view";
 
 const select = state => ({

ui/js/page/fileListPublished/index.js

@@ -1,13 +1,13 @@
 import React from "react";
 import rewards from "rewards";
 import { connect } from "react-redux";
-import { doFetchClaimListMine } from "actions/content";
+import { doFetchClaimListMine } from "redux/actions/content";
 import {
   selectMyClaimsWithoutChannels,
   selectIsFetchingClaimListMine,
-} from "selectors/claims";
-import { doClaimRewardType } from "actions/rewards";
-import { doNavigate } from "actions/navigation";
+} from "redux/selectors/claims";
+import { doClaimRewardType } from "redux/actions/rewards";
+import { doNavigate } from "redux/actions/navigation";
 import FileListPublished from "./view";
 
 const select = state => ({

ui/js/page/help/index.js

@@ -1,8 +1,8 @@
 import React from "react";
-import { doAuthNavigate } from "actions/navigation";
+import { doAuthNavigate } from "redux/actions/navigation";
 import { connect } from "react-redux";
-import { doFetchAccessToken } from "actions/user";
-import { selectAccessToken, selectUser } from "selectors/user";
+import { doFetchAccessToken } from "redux/actions/user";
+import { selectAccessToken, selectUser } from "redux/selectors/user";
 import HelpPage from "./view";
 
 const select = state => ({

ui/js/page/invite/index.js

@@ -1,11 +1,11 @@
 import React from "react";
 import { connect } from "react-redux";
 import InvitePage from "./view";
-import { doFetchInviteStatus } from "actions/user";
+import { doFetchInviteStatus } from "redux/actions/user";
 import {
   selectUserInviteStatusFailed,
   selectUserInviteStatusIsPending,
-} from "selectors/user";
+} from "redux/selectors/user";
 
 const select = state => ({
   isFailed: selectUserInviteStatusFailed(state),

ui/js/page/publish/index.js

@@ -1,22 +1,22 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doNavigate, doHistoryBack } from "actions/navigation";
-import { doClaimRewardType } from "actions/rewards";
+import { doNavigate, doHistoryBack } from "redux/actions/navigation";
+import { doClaimRewardType } from "redux/actions/rewards";
 import {
   selectMyClaims,
   selectFetchingMyChannels,
   selectMyChannelClaims,
   selectClaimsByUri,
-} from "selectors/claims";
-import { selectResolvingUris } from "selectors/content";
+} from "redux/selectors/claims";
+import { selectResolvingUris } from "redux/selectors/content";
 import {
   doFetchClaimListMine,
   doFetchChannelListMine,
   doResolveUri,
   doCreateChannel,
   doPublish,
-} from "actions/content";
-import { selectBalance } from "selectors/wallet";
+} from "redux/actions/content";
+import { selectBalance } from "redux/selectors/wallet";
 import rewards from "rewards";
 import PublishPage from "./view";
 

ui/js/page/report.js

@@ -1,7 +1,7 @@
 import React from "react";
 import Link from "component/link";
 import { FormRow } from "component/form";
-import { doShowSnackBar } from "actions/app";
+import { doShowSnackBar } from "redux/actions/app";
 import lbry from "../lbry.js";
 
 class ReportPage extends React.Component {

ui/js/page/rewards/index.js

@@ -3,10 +3,10 @@ import { connect } from "react-redux";
 import {
   selectFetchingRewards,
   selectUnclaimedRewards,
-} from "selectors/rewards";
-import { selectUser } from "selectors/user";
-import { doAuthNavigate, doNavigate } from "actions/navigation";
-import { doRewardList } from "actions/rewards";
+} from "redux/selectors/rewards";
+import { selectUser } from "redux/selectors/user";
+import { doAuthNavigate, doNavigate } from "redux/actions/navigation";
+import { doRewardList } from "redux/actions/rewards";
 import RewardsPage from "./view";
 
 const select = (state, props) => {

ui/js/page/search/index.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { connect } from "react-redux";
-import { selectIsSearching, selectSearchQuery } from "selectors/search";
-import { doNavigate } from "actions/navigation";
+import { selectIsSearching, selectSearchQuery } from "redux/selectors/search";
+import { doNavigate } from "redux/actions/navigation";
 import SearchPage from "./view";
 
 const select = state => ({

ui/js/page/settings/index.js

@@ -1,20 +1,20 @@
 import React from "react";
 import { connect } from "react-redux";
 import * as settings from "constants/settings";
-import { doClearCache } from "actions/app";
+import { doClearCache } from "redux/actions/app";
 import {
   doSetDaemonSetting,
   doSetClientSetting,
   doGetThemes,
   doSetTheme,
   doChangeLanguage,
-} from "actions/settings";
+} from "redux/actions/settings";
 import {
   makeSelectClientSetting,
   selectDaemonSettings,
   selectLanguages,
-} from "selectors/settings";
-import { selectCurrentLanguage } from "selectors/app";
+} from "redux/selectors/settings";
+import { selectCurrentLanguage } from "redux/selectors/app";
 import SettingsPage from "./view";
 
 const select = state => ({

ui/js/page/show/index.js

@@ -1,8 +1,8 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doResolveUri } from "actions/content";
-import { makeSelectClaimForUri } from "selectors/claims";
-import { makeSelectIsUriResolving } from "selectors/content";
+import { doResolveUri } from "redux/actions/content";
+import { makeSelectClaimForUri } from "redux/selectors/claims";
+import { makeSelectIsUriResolving } from "redux/selectors/content";
 import ShowPage from "./view";
 
 const select = (state, props) => ({

ui/js/page/transactionHistory/index.js

@@ -1,10 +1,10 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doFetchTransactions } from "actions/wallet";
+import { doFetchTransactions } from "redux/actions/wallet";
 import {
   selectTransactionItems,
   selectIsFetchingTransactions,
-} from "selectors/wallet";
+} from "redux/selectors/wallet";
 import TransactionHistoryPage from "./view";
 
 const select = state => ({

ui/js/redux/actions/app.js

@@ -5,18 +5,18 @@ import {
   selectUpgradeDownloadPath,
   selectUpgradeDownloadItem,
   selectUpgradeFilename,
-} from "selectors/app";
-import { doFetchDaemonSettings } from "actions/settings";
-import { doBalanceSubscribe } from "actions/wallet";
-import { doAuthenticate } from "actions/user";
-import { doFetchFileInfosAndPublishedClaims } from "actions/file_info";
+} from "redux/selectors/app";
+import { doFetchDaemonSettings } from "redux/actions/settings";
+import { doBalanceSubscribe } from "redux/actions/wallet";
+import { doAuthenticate } from "redux/actions/user";
+import { doFetchFileInfosAndPublishedClaims } from "redux/actions/file_info";
 import * as modals from "constants/modal_types";
 
 const { remote, ipcRenderer, shell } = require("electron");
 const path = require("path");
 const { download } = remote.require("electron-dl");
 const fs = remote.require("fs");
-const { lbrySettings: config } = require("../../../app/package.json");
+const { lbrySettings: config } = require("../../../../app/package.json");
 
 export function doOpenModal(modal, modalProps = {}) {
   return {

ui/js/redux/actions/availability.js

@@ -1,6 +1,6 @@
 import * as types from "constants/action_types";
 import lbry from "lbry";
-import { selectFetchingAvailability } from "selectors/availability";
+import { selectFetchingAvailability } from "redux/selectors/availability";
 
 export function doFetchAvailability(uri) {
   return function(dispatch, getState) {

ui/js/redux/actions/content.js

@@ -3,18 +3,18 @@ import * as settings from "constants/settings";
 import lbry from "lbry";
 import lbryio from "lbryio";
 import lbryuri from "lbryuri";
-import { makeSelectClientSetting } from "selectors/settings";
-import { selectBalance, selectTransactionItems } from "selectors/wallet";
+import { makeSelectClientSetting } from "redux/selectors/settings";
+import { selectBalance, selectTransactionItems } from "redux/selectors/wallet";
 import {
   makeSelectFileInfoForUri,
   selectDownloadingByOutpoint,
-} from "selectors/file_info";
-import { selectResolvingUris } from "selectors/content";
-import { makeSelectCostInfoForUri } from "selectors/cost_info";
-import { doAlertError, doOpenModal } from "actions/app";
-import { doClaimEligiblePurchaseRewards } from "actions/rewards";
-import { selectBadgeNumber } from "selectors/app";
-import { selectTotalDownloadProgress } from "selectors/file_info";
+} from "redux/selectors/file_info";
+import { selectResolvingUris } from "redux/selectors/content";
+import { makeSelectCostInfoForUri } from "redux/selectors/cost_info";
+import { doAlertError, doOpenModal } from "redux/actions/app";
+import { doClaimEligiblePurchaseRewards } from "redux/actions/rewards";
+import { selectBadgeNumber } from "redux/selectors/app";
+import { selectTotalDownloadProgress } from "redux/selectors/file_info";
 import setBadge from "util/setBadge";
 import setProgressBar from "util/setProgressBar";
 import batchActions from "util/batchActions";

ui/js/redux/actions/cost_info.js

@@ -1,10 +1,10 @@
 import * as types from "constants/action_types";
 import lbry from "lbry";
 import lbryio from "lbryio";
-import { doResolveUri } from "actions/content";
-import { selectResolvingUris } from "selectors/content";
-import { selectClaimsByUri } from "selectors/claims";
-import { selectSettingsIsGenerous } from "selectors/settings";
+import { doResolveUri } from "redux/actions/content";
+import { selectResolvingUris } from "redux/selectors/content";
+import { selectClaimsByUri } from "redux/selectors/claims";
+import { selectSettingsIsGenerous } from "redux/selectors/settings";
 
 export function doFetchCostInfoForUri(uri) {
   return function(dispatch, getState) {

ui/js/redux/actions/file_info.js

@@ -1,19 +1,19 @@
 import * as types from "constants/action_types";
 import lbry from "lbry";
-import { doFetchClaimListMine, doAbandonClaim } from "actions/content";
+import { doFetchClaimListMine, doAbandonClaim } from "redux/actions/content";
 import {
   selectClaimsByUri,
   selectIsFetchingClaimListMine,
   selectMyClaimsOutpoints,
-} from "selectors/claims";
+} from "redux/selectors/claims";
 import {
   selectIsFetchingFileList,
   selectFileInfosByOutpoint,
   selectUrisLoading,
   selectTotalDownloadProgress,
-} from "selectors/file_info";
-import { doCloseModal } from "actions/app";
-import { doNavigate, doHistoryBack } from "actions/navigation";
+} from "redux/selectors/file_info";
+import { doCloseModal } from "redux/actions/app";
+import { doNavigate, doHistoryBack } from "redux/actions/navigation";
 import setProgressBar from "util/setProgressBar";
 import batchActions from "util/batchActions";
 

ui/js/redux/actions/navigation.js

@@ -6,8 +6,8 @@ import {
   selectCurrentParams,
   selectHistoryStack,
   selectHistoryIndex,
-} from "selectors/navigation";
-import { doSearch } from "actions/search";
+} from "redux/selectors/navigation";
+import { doSearch } from "redux/actions/search";
 import { toQueryString } from "util/query_params";
 
 export function doNavigate(path, params = {}, options = {}) {

ui/js/redux/actions/rewards.js

@@ -2,8 +2,8 @@ import * as types from "constants/action_types";
 import * as modals from "constants/modal_types";
 import lbryio from "lbryio";
 import rewards from "rewards";
-import { selectUnclaimedRewardsByType } from "selectors/rewards";
-import { selectUserIsRewardApproved } from "selectors/user";
+import { selectUnclaimedRewardsByType } from "redux/selectors/rewards";
+import { selectUserIsRewardApproved } from "redux/selectors/user";
 
 export function doRewardList() {
   return function(dispatch, getState) {

ui/js/redux/actions/search.js

@@ -1,8 +1,8 @@
 import * as types from "constants/action_types";
 import lbryuri from "lbryuri";
-import { doResolveUri } from "actions/content";
-import { doNavigate } from "actions/navigation";
-import { selectCurrentPage } from "selectors/navigation";
+import { doResolveUri } from "redux/actions/content";
+import { doNavigate } from "redux/actions/navigation";
+import { selectCurrentPage } from "redux/selectors/navigation";
 import batchActions from "util/batchActions";
 
 export function doSearch(rawQuery) {

ui/js/redux/actions/settings.js

@@ -1,6 +1,6 @@
 import * as types from "constants/action_types";
 import * as settings from "constants/settings";
-import { doAlertError } from "actions/app";
+import { doAlertError } from "redux/actions/app";
 import batchActions from "util/batchActions";
 
 import lbry from "lbry";

ui/js/redux/actions/user.js

@@ -1,9 +1,9 @@
 import * as types from "constants/action_types";
 import * as modals from "constants/modal_types";
 import lbryio from "lbryio";
-import { doOpenModal, doShowSnackBar } from "actions/app";
-import { doRewardList, doClaimRewardType } from "actions/rewards";
-import { selectEmailToVerify, selectUser } from "selectors/user";
+import { doOpenModal, doShowSnackBar } from "redux/actions/app";
+import { doRewardList, doClaimRewardType } from "redux/actions/rewards";
+import { selectEmailToVerify, selectUser } from "redux/selectors/user";
 import rewards from "rewards";
 
 export function doAuthenticate() {

ui/js/redux/actions/wallet.js

@@ -4,9 +4,9 @@ import {
   selectDraftTransaction,
   selectDraftTransactionAmount,
   selectBalance,
-} from "selectors/wallet";
-import { doOpenModal, doShowSnackBar } from "actions/app";
-import { doNavigate } from "actions/navigation";
+} from "redux/selectors/wallet";
+import { doOpenModal, doShowSnackBar } from "redux/actions/app";
+import { doNavigate } from "redux/actions/navigation";
 import * as modals from "constants/modal_types";
 
 export function doUpdateBalance() {

ui/js/redux/selectors/claims.js

@@ -1,5 +1,5 @@
 import { createSelector } from "reselect";
-import { selectCurrentParams } from "selectors/navigation";
+import { selectCurrentParams } from "redux/selectors/navigation";
 import lbryuri from "lbryuri";
 import { makeSelectCurrentParam } from "./navigation";
 

ui/js/redux/selectors/cost_info.js

@@ -1,5 +1,5 @@
 import { createSelector } from "reselect";
-import { selectCurrentParams } from "selectors/navigation";
+import { selectCurrentParams } from "redux/selectors/navigation";
 
 export const _selectState = state => state.costInfo || {};
 

ui/js/redux/selectors/file_info.js

@@ -5,7 +5,7 @@ import {
   selectIsFetchingClaimListMine,
   selectMyClaims,
   selectMyClaimsOutpoints,
-} from "selectors/claims";
+} from "redux/selectors/claims";
 
 export const _selectState = state => state.fileInfo || {};
 

ui/js/redux/selectors/navigation.js

@@ -111,7 +111,7 @@ export const selectPageTitle = createSelector(
         return params.query
           ? __("Search results for %s", params.query)
           : __("Search");
-      case "discover":  
+      case "discover":
       case false:
       case null:
       case "":