LBRYCommunity/lbry-redux
1
0
Fork 0
Code Issues 5 Pull requests 6 Projects Releases Packages Wiki Activity

feat: supports vs tips

Browse source 
Adds additional boolean to tell if something is a support or not. Also, fixes snackbar. Removes uri which is not used.
This commit is contained in:
Thomas Zarebczan 2019-07-19 15:20:24 -04:00
parent 755424a2a8
commit ee93a47f89
3 changed files with 37 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
dist/bundle.es.js vendored
View file

@ -1901,10 +1901,13 @@ function doSetDraftTransactionAddress(address) {
};
}
function doSendTip(amount, claimId, uri, successCallback, errorCallback) {
function doSendTip(amount, claimId, successCallback, errorCallback) {
return (dispatch, getState) => {
const state = getState();
const balance = selectBalance(state);
const myClaims = selectMyClaimsRaw(state);
const isSupport = myClaims.find(claim => claim.claim_id === claimId);
if (balance - amount <= 0) {
dispatch(doToast({
@ -1916,7 +1919,7 @@ function doSendTip(amount, claimId, uri, successCallback, errorCallback) {
const success = () => {
dispatch(doToast({
message: __(`You sent ${amount} LBC as a tip, Mahalo!`),
message: isSupport ? __(`You sent ${amount} LBC as a support!`) : __(`You sent ${amount} LBC as a tip, Mahalo!`),
linkText: __('History'),
linkTarget: __('/wallet')
}));
@ -1955,7 +1958,7 @@ function doSendTip(amount, claimId, uri, successCallback, errorCallback) {
lbryProxy.support_create({
claim_id: claimId,
amount: creditsToString(amount),
tip: true
tip: isSupport ? false : true
}).then(success, error);
};
}
@ -2188,7 +2191,7 @@ function doAbandonClaim(txid, nout) {
const errorCallback = () => {
dispatch(doToast({
message: isClaim ? 'Error abandoning your claim' : 'Error unlocking your tip',
message: isClaim ? 'Error abandoning your claim/support' : 'Error unlocking your tip',
isError: true
}));
};
@ -2199,13 +2202,22 @@ function doAbandonClaim(txid, nout) {
data
});
let abandonMessage;
if (isClaim) {
abandonMessage = 'Successfully abandoned your claim.';
} else if (supportToAbandon) {
abandonMessage = 'Successfully abandoned your support.';
} else {
abandonMessage = 'Successfully unlocked your tip!';
}
dispatch(doToast({
message: isClaim ? 'Successfully abandoned your claim' : 'Successfully unlocked your tip!'
message: abandonMessage
}));
// After abandoning, call claim_list to show the claim as abandoned
// Also fetch transactions to show the new abandon transaction
dispatch(doFetchClaimListMine());
if (isClaim) dispatch(doFetchClaimListMine());
dispatch(doFetchTransactions());
};

17
src/redux/actions/claims.js
View file

@ -142,7 +142,7 @@ export function doAbandonClaim(txid: string, nout: number) {
const errorCallback = () => {
dispatch(
doToast({
message: isClaim ? 'Error abandoning your claim' : 'Error unlocking your tip',
message: isClaim ? 'Error abandoning your claim/support' : 'Error unlocking your tip',
isError: true,
})
);
@ -154,17 +154,24 @@ export function doAbandonClaim(txid: string, nout: number) {
data,
});
let abandonMessage;
if (isClaim) {
abandonMessage = 'Successfully abandoned your claim.';
} else if (supportToAbandon) {
abandonMessage = 'Successfully abandoned your support.';
} else {
abandonMessage = 'Successfully unlocked your tip!';
}
dispatch(
doToast({
message: isClaim
? 'Successfully abandoned your claim'
: 'Successfully unlocked your tip!',
message: abandonMessage,
})
);
// After abandoning, call claim_list to show the claim as abandoned
// Also fetch transactions to show the new abandon transaction
dispatch(doFetchClaimListMine());
if (isClaim) dispatch(doFetchClaimListMine());
dispatch(doFetchTransactions());
};

10
src/redux/actions/wallet.js
View file

@ -3,6 +3,7 @@ import Lbry from 'lbry';
import { doToast } from 'redux/actions/notifications';
import { selectBalance } from 'redux/selectors/wallet';
import { creditsToString } from 'util/formatCredits';
import { selectMyClaimsRaw } from 'redux/selectors/claims';
export function doUpdateBalance() {
return (dispatch, getState) => {
@ -208,10 +209,13 @@ export function doSetDraftTransactionAddress(address) {
};
}
export function doSendTip(amount, claimId, uri, successCallback, errorCallback) {
export function doSendTip(amount, claimId, successCallback, errorCallback) {
return (dispatch, getState) => {
const state = getState();
const balance = selectBalance(state);
const myClaims: Array<Claim> = selectMyClaimsRaw(state);
const isSupport = myClaims.find(claim => claim.claim_id === claimId);
if (balance - amount <= 0) {
dispatch(
@ -226,7 +230,7 @@ export function doSendTip(amount, claimId, uri, successCallback, errorCallback)
const success = () => {
dispatch(
doToast({
message: __(`You sent ${amount} LBC as a tip, Mahalo!`),
message: isSupport ? __(`You sent ${amount} LBC as a support!`) : __(`You sent ${amount} LBC as a tip, Mahalo!`),
linkText: __('History'),
linkTarget: __('/wallet'),
})
@ -268,7 +272,7 @@ export function doSendTip(amount, claimId, uri, successCallback, errorCallback)
Lbry.support_create({
claim_id: claimId,
amount: creditsToString(amount),
tip: true,
tip: isSupport ? false : true,
}).then(success, error);
};
}