LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Revert "bump lbry-redux/inc + bring in fix from release branch"

Browse source 
This reverts commit 70284e5dfd.
This commit is contained in:
Sean Yesmunt 2020-09-21 13:07:09 -04:00
parent 70284e5dfd
commit 2ad7088553
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -136,8 +136,8 @@
"imagesloaded": "^4.1.4", "imagesloaded": "^4.1.4",
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"lbry-format": "https://github.com/lbryio/lbry-format.git", "lbry-format": "https://github.com/lbryio/lbry-format.git",
"lbry-redux": "lbryio/lbry-redux#90012bf47c170f244039261548dab7c7597046dc", "lbry-redux": "lbryio/lbry-redux#437c54f164b4132c0d5c6ede60c7b02703f1e9d5",
"lbryinc": "lbryio/lbryinc#db0663fcc4a64cb082b6edc5798fafa67eb4300f", "lbryinc": "lbryio/lbryinc#9440717a00d2fbb2e3226aaa2388f4698f324be2",
"lint-staged": "^7.0.2", "lint-staged": "^7.0.2",
"localforage": "^1.7.1", "localforage": "^1.7.1",
"lodash-es": "^4.17.14", "lodash-es": "^4.17.14",

1
static/app-strings.json
View file

@ -1292,6 +1292,5 @@
"%comment_count% comments - %comment_count_change% this week": "%comment_count% comments - %comment_count_change% this week", "%comment_count% comments - %comment_count_change% this week": "%comment_count% comments - %comment_count_change% this week",
"Invite": "Invite", "Invite": "Invite",
"Remove File": "Remove File", "Remove File": "Remove File",
"You are currently following %followingCount% tag": "You are currently following %followingCount% tag",
"--end--": "--end--" "--end--": "--end--"
} }

4
ui/component/userChannelFollowIntro/view.jsx
View file

@ -15,9 +15,7 @@ type Props = {
channelSubscribe: (sub: Subscription) => void, channelSubscribe: (sub: Subscription) => void,
}; };
const channelsToSubscribe = AUTO_FOLLOW_CHANNELS.trim() const channelsToSubscribe = AUTO_FOLLOW_CHANNELS.trim().split(' ');
.split(' ')
.filter(x => x !== '');
function UserChannelFollowIntro(props: Props) { function UserChannelFollowIntro(props: Props) {
const { subscribedChannels, channelSubscribe, onContinue, onBack } = props; const { subscribedChannels, channelSubscribe, onContinue, onBack } = props;

8
yarn.lock
View file

@ -6411,17 +6411,17 @@ lazy-val@^1.0.4:
yargs "^13.2.2" yargs "^13.2.2"
zstd-codec "^0.1.1" zstd-codec "^0.1.1"
lbry-redux@lbryio/lbry-redux#90012bf47c170f244039261548dab7c7597046dc: lbry-redux@lbryio/lbry-redux#437c54f164b4132c0d5c6ede60c7b02703f1e9d5:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/90012bf47c170f244039261548dab7c7597046dc" resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/437c54f164b4132c0d5c6ede60c7b02703f1e9d5"
dependencies: dependencies:
proxy-polyfill "0.1.6" proxy-polyfill "0.1.6"
reselect "^3.0.0" reselect "^3.0.0"
uuid "^3.3.2" uuid "^3.3.2"
lbryinc@lbryio/lbryinc#db0663fcc4a64cb082b6edc5798fafa67eb4300f: lbryinc@lbryio/lbryinc#9440717a00d2fbb2e3226aaa2388f4698f324be2:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/db0663fcc4a64cb082b6edc5798fafa67eb4300f" resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/9440717a00d2fbb2e3226aaa2388f4698f324be2"
dependencies: dependencies:
reselect "^3.0.0" reselect "^3.0.0"