From 0d3415441f76e4b6e83d3a79087ebaf5b273bc9c Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Wed, 20 Mar 2019 15:37:14 +0100 Subject: [PATCH] update to use new imports from lbryinc and lbry-redux --- app/package-lock.json | 46 +++++++++++++------ app/package.json | 2 +- app/src/component/fileDownloadButton/index.js | 3 +- app/src/component/filePrice/index.js | 8 +--- app/src/index.js | 13 ++++-- app/src/page/discover/index.js | 6 +-- app/src/page/file/index.js | 10 ++-- app/src/page/splash/index.js | 3 +- app/src/redux/actions/file.js | 5 +- 9 files changed, 59 insertions(+), 37 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index 19b6c1bf..f499a132 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -2993,7 +2993,8 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true + "bundled": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -3011,11 +3012,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3028,15 +3031,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -3139,7 +3145,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -3149,6 +3156,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3161,17 +3169,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -3188,6 +3199,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -3260,7 +3272,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -3270,6 +3283,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -3345,7 +3359,8 @@ }, "safe-buffer": { "version": "5.1.1", - "bundled": true + "bundled": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -3375,6 +3390,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3392,6 +3408,7 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3430,11 +3447,13 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true + "bundled": true, + "optional": true }, "yallist": { "version": "3.0.2", - "bundled": true + "bundled": true, + "optional": true } } }, @@ -4060,8 +4079,8 @@ } }, "lbry-redux": { - "version": "github:lbryio/lbry-redux#29865c07763b3cf75e821b9972ed473b2fdbec61", - "from": "github:lbryio/lbry-redux#save-media-position", + "version": "github:lbryio/lbry-redux#0d4079f370a103110720500f83595fbdad871456", + "from": "github:lbryio/lbry-redux", "requires": { "proxy-polyfill": "0.1.6", "reselect": "^3.0.0", @@ -4080,7 +4099,6 @@ "from": "github:lbryio/lbryinc", "requires": { "bluebird": "^3.5.1", - "lbry-redux": "github:lbryio/lbry-redux#84b7d396934d57a37802aadbef71db91230a9404", "reselect": "^3.0.0" }, "dependencies": { diff --git a/app/package.json b/app/package.json index 17aa1a25..5a6a47b8 100644 --- a/app/package.json +++ b/app/package.json @@ -8,7 +8,7 @@ "dependencies": { "base-64": "^0.1.0", "@expo/vector-icons": "^8.1.0", - "lbry-redux": "lbryio/lbry-redux#save-media-position", + "lbry-redux": "lbryio/lbry-redux", "lbryinc": "lbryio/lbryinc", "lodash": ">=4.17.11", "merge": ">=1.2.1", diff --git a/app/src/component/fileDownloadButton/index.js b/app/src/component/fileDownloadButton/index.js index 89a2b8b5..869b28bb 100644 --- a/app/src/component/fileDownloadButton/index.js +++ b/app/src/component/fileDownloadButton/index.js @@ -1,11 +1,10 @@ import { connect } from 'react-redux'; import { - doFetchCostInfoForUri, makeSelectFileInfoForUri, makeSelectDownloadingForUri, makeSelectLoadingForUri, - makeSelectCostInfoForUri } from 'lbry-redux'; +import { doFetchCostInfoForUri, makeSelectCostInfoForUri } from 'lbryinc'; import { doPurchaseUri, doStartDownload } from 'redux/actions/file'; import FileDownloadButton from './view'; diff --git a/app/src/component/filePrice/index.js b/app/src/component/filePrice/index.js index 7f401c45..b7fe8349 100644 --- a/app/src/component/filePrice/index.js +++ b/app/src/component/filePrice/index.js @@ -1,10 +1,6 @@ import { connect } from 'react-redux'; -import { - doFetchCostInfoForUri, - makeSelectCostInfoForUri, - makeSelectFetchingCostInfoForUri, - makeSelectClaimForUri -} from 'lbry-redux'; +import { makeSelectClaimForUri } from 'lbry-redux'; +import { doFetchCostInfoForUri, makeSelectCostInfoForUri, makeSelectFetchingCostInfoForUri } from 'lbryinc'; import FilePrice from './view'; const select = (state, props) => ({ diff --git a/app/src/index.js b/app/src/index.js index 55421c0d..f2611024 100644 --- a/app/src/index.js +++ b/app/src/index.js @@ -11,16 +11,22 @@ import { } from 'react-native'; import { Lbry, - blacklistReducer, claimsReducer, contentReducer, - costInfoReducer, fileInfoReducer, notificationsReducer, searchReducer, walletReducer } from 'lbry-redux'; -import { authReducer, rewardsReducer, subscriptionsReducer, userReducer } from 'lbryinc'; +import { + authReducer, + blacklistReducer, + costInfoReducer, + homepageReducer, + rewardsReducer, + subscriptionsReducer, + userReducer +} from 'lbryinc'; import { createStore, applyMiddleware, compose, combineReducers } from 'redux'; import { createLogger } from 'redux-logger'; import { AppNavigator } from 'component/AppNavigator'; @@ -86,6 +92,7 @@ const reducers = combineReducers({ costInfo: costInfoReducer, drawer: drawerReducer, fileInfo: fileInfoReducer, + homepage: homepageReducer, nav: navigatorReducer, notifications: notificationsReducer, rewards: rewardsReducer, diff --git a/app/src/page/discover/index.js b/app/src/page/discover/index.js index 9fbd53a6..0e3f9cb5 100644 --- a/app/src/page/discover/index.js +++ b/app/src/page/discover/index.js @@ -1,15 +1,15 @@ import { connect } from 'react-redux'; import { - doFetchFeaturedUris, selectBalance, - selectFeaturedUris, - selectFetchingFeaturedUris, } from 'lbry-redux'; import { + doFetchFeaturedUris, doFetchRewardedContent, doFetchMySubscriptions, doRemoveUnreadSubscriptions, selectEnabledChannelNotifications, + selectFeaturedUris, + selectFetchingFeaturedUris, selectSubscriptionClaims, selectUnreadSubscriptions, } from 'lbryinc'; diff --git a/app/src/page/file/index.js b/app/src/page/file/index.js index 8f49bf17..cb42a84a 100644 --- a/app/src/page/file/index.js +++ b/app/src/page/file/index.js @@ -1,12 +1,10 @@ import { connect } from 'react-redux'; import { doFetchFileInfo, - doFetchCostInfoForUri, doResolveUri, doSendTip, doToast, makeSelectIsUriResolving, - makeSelectCostInfoForUri, makeSelectFileInfoForUri, makeSelectChannelForClaimUri, makeSelectClaimForUri, @@ -14,9 +12,13 @@ import { makeSelectContentTypeForUri, makeSelectMetadataForUri, selectBalance, - selectBlackListedOutpoints, } from 'lbry-redux'; -import { selectRewardContentClaimIds } from 'lbryinc'; +import { + doFetchCostInfoForUri, + makeSelectCostInfoForUri, + selectRewardContentClaimIds, + selectBlackListedOutpoints +} from 'lbryinc'; import { doDeleteFile, doPurchaseUri, doStopDownloadingFile } from 'redux/actions/file'; import FilePage from './view'; diff --git a/app/src/page/splash/index.js b/app/src/page/splash/index.js index 40b2d64b..6cc77a59 100644 --- a/app/src/page/splash/index.js +++ b/app/src/page/splash/index.js @@ -1,7 +1,8 @@ import { connect } from 'react-redux'; -import { doBalanceSubscribe, doBlackListedOutpointsSubscribe, doUpdateBlockHeight, doToast } from 'lbry-redux'; +import { doBalanceSubscribe, doUpdateBlockHeight, doToast } from 'lbry-redux'; import { doAuthenticate, + doBlackListedOutpointsSubscribe, doCheckSubscriptionsInit, doFetchMySubscriptions, doFetchRewardedContent, diff --git a/app/src/redux/actions/file.js b/app/src/redux/actions/file.js index d39de12d..83add242 100644 --- a/app/src/redux/actions/file.js +++ b/app/src/redux/actions/file.js @@ -4,14 +4,13 @@ import { doToast, formatCredits, selectBalance, - makeSelectCostInfoForUri, makeSelectFileInfoForUri, makeSelectMetadataForUri, selectDownloadingByOutpoint, } from 'lbry-redux'; -import { doClaimEligiblePurchaseRewards } from 'lbryinc'; +import { doClaimEligiblePurchaseRewards, makeSelectCostInfoForUri } from 'lbryinc'; import { Alert, NativeModules } from 'react-native'; -import Constants from '../../constants'; +import Constants from 'constants'; const DOWNLOAD_POLL_INTERVAL = 250;