bump lbry-redux

This commit is contained in:
Sean Yesmunt 2019-08-27 20:01:51 -04:00
parent 45a5f8e8de
commit b603a74e95
4 changed files with 19 additions and 39 deletions

View file

@ -126,7 +126,7 @@
"husky": "^0.14.3",
"json-loader": "^0.5.4",
"lbry-format": "https://github.com/lbryio/lbry-format.git",
"lbry-redux": "lbryio/lbry-redux#18ff574d0ea5769866efa84e946e16d689283566",
"lbry-redux": "lbryio/lbry-redux#b4e8cde4e3f61711acfbe3aeb219f5ba6f5de3be",
"lbryinc": "lbryio/lbryinc#1ce266b3c52654190b955e9c869b8e302aa5c585",
"lint-staged": "^7.0.2",
"localforage": "^1.7.1",

View file

@ -1,12 +1,5 @@
import { createSelector } from 'reselect';
import {
parseURI,
selectClaimsById,
selectMyClaimsWithoutChannels,
selectResolvingUris,
buildURI,
selectClaimsByUri,
} from 'lbry-redux';
import { parseURI, selectClaimsById, selectMyClaimsWithoutChannels, selectResolvingUris, buildURI } from 'lbry-redux';
const selectState = state => state.publish || {};
@ -86,30 +79,3 @@ export const selectIsResolvingPublishUris = createSelector(
return false;
}
);
export const selectTakeOverAmount = createSelector(
selectState,
selectMyClaimForUri,
selectClaimsByUri,
({ name }, myClaimForUri, claimsByUri) => {
// We only care about the winning claim for the short uri
const shortUri = buildURI({ contentName: name });
const claimForShortUri = claimsByUri[shortUri];
if (!myClaimForUri && claimForShortUri) {
return claimForShortUri.meta.effective_amount;
} else if (myClaimForUri && claimForShortUri) {
// https://github.com/lbryio/lbry/issues/1476
// We should check the current effective_amount on my claim to see how much additional lbc
// is needed to win the claim. Currently this is not possible during a takeover.
// With this, we could say something like, "You have x lbc in support, if you bid y additional LBC you will control the claim"
// For now just ignore supports. We will just show the winning claim's bid amount
// If the top claim is your claim, no takeover is necessary so we return 0.
return claimForShortUri.claim_id === myClaimForUri.claim_id
? 0
: claimForShortUri.meta.effective_amount || claimForShortUri.amount;
}
return null;
}
);

View file

@ -657,5 +657,19 @@
"'claimId' should no longer be used. Use 'streamClaimId' or 'channelClaimId' instead": "'claimId' should no longer be used. Use 'streamClaimId' or 'channelClaimId' instead",
"View Tag": "View Tag",
"Block": "Block",
"% downloaded": "% downloaded"
"% downloaded": "% downloaded",
"'claimName' should no longer be used. Use 'streamClaimName' or 'channelClaimName' instead": "'claimName' should no longer be used. Use 'streamClaimName' or 'channelClaimName' instead",
"Portuguese": "Portuguese",
"Vietnamese": "Vietnamese",
"Thai": "Thai",
"Arabic": "Arabic",
"Czech": "Czech",
"Croatian": "Croatian",
"Cambodian": "Cambodian",
"Korean": "Korean",
"Norwegian": "Norwegian",
"Romanian": "Romanian",
"Hindi": "Hindi",
"Greek": "Greek",
"Hide": "Hide"
}

View file

@ -6889,9 +6889,9 @@ lazy-val@^1.0.3, lazy-val@^1.0.4:
yargs "^13.2.2"
zstd-codec "^0.1.1"
lbry-redux@lbryio/lbry-redux#18ff574d0ea5769866efa84e946e16d689283566:
lbry-redux@lbryio/lbry-redux#b4e8cde4e3f61711acfbe3aeb219f5ba6f5de3be:
version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/18ff574d0ea5769866efa84e946e16d689283566"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/b4e8cde4e3f61711acfbe3aeb219f5ba6f5de3be"
dependencies:
proxy-polyfill "0.1.6"
reselect "^3.0.0"