Commit 4c4d561f authored by Akinwale Ariwodola's avatar Akinwale Ariwodola
Browse files

new_android reward

parent a5953dce
Pipeline #1795 passed with stage
......@@ -54,7 +54,9 @@ import {
} from 'lbry-redux';
import {
Lbryio,
rewards as REWARD_TYPES,
doBlackListedOutpointsSubscribe,
doClaimRewardType,
doFilteredOutpointsSubscribe,
doGetSync,
doUserCheckEmailVerified,
......@@ -372,6 +374,28 @@ class AppWithNavigationState extends React.Component {
);
};
checkNewAndroidReward = () => {
const { dispatch, doToast } = this.props;
const claimRewardCallback = err => {
if (err) {
// an error occurred, do not display anything
return;
}
// reward successfully claimed
NativeModules.UtilityModule.setNativeBooleanSetting(Constants.SETTING_NEW_ANDROID_REWARD_CLAIMED, true);
};
NativeModules.UtilityModule.getNativeBooleanSetting(Constants.SETTING_NEW_ANDROID_REWARD_CLAIMED, false).then(
rewardClaimed => {
if (!rewardClaimed) {
dispatch(
doClaimRewardType(REWARD_TYPES.TYPE_NEW_ANDROID, { notifyError: false, callback: claimRewardCallback }),
);
}
},
);
};
handleSdkReady = () => {
const { dispatch } = this.props;
dispatch(doSetSdkReady());
......@@ -398,6 +422,8 @@ class AppWithNavigationState extends React.Component {
}
});
});
this.checkNewAndroidReward();
};
handleAccountUnlockFailed() {
......
......@@ -70,7 +70,9 @@ class FileItem extends React.PureComponent {
const outpointsToHide = !blackListedOutpoints
? filteredOutpoints
: blackListedOutpoints.concat(filteredOutpoints);
shouldHide = outpointsToHide.some(outpoint => outpoint.txid === claim.txid && outpoint.nout === claim.nout);
shouldHide = outpointsToHide.some(
outpoint => outpoint && outpoint.txid === claim.txid && outpoint.nout === claim.nout,
);
}
if (shouldHide) {
// don't display blacklisted or filtered outpoints on the Your tags page
......
......@@ -45,6 +45,7 @@ const Constants = {
SETTING_REWARDS_NOT_INTERESTED: 'rewardsNotInterested',
SETTING_DEVICE_WALLET_SYNCED: 'deviceWalletSynced',
SETTING_DHT_ENABLED: 'dhtEnabled',
SETTING_NEW_ANDROID_REWARD_CLAIMED: 'newAndroidRewardClaimed',
ACTION_SDK_READY: 'SDK_READY',
......
......@@ -2,6 +2,7 @@ import { connect } from 'react-redux';
import { SETTINGS, doUpdateBlockHeight, doPopulateSharedUserState, doToast } from 'lbry-redux';
import {
doAuthenticate,
doClaimRewardType,
doInstallNewWithParams,
doFetchMySubscriptions,
doFetchRewardedContent,
......
......@@ -159,6 +159,7 @@ class SplashScreen extends React.PureComponent {
this.getUserSettings();
});
});
this.navigateToMain();
return;
}
......
......@@ -4599,9 +4599,9 @@ lbry-redux@lbryio/lbry-redux#69ffd110dbf3633e5847f61f008751edec033017:
reselect "^3.0.0"
uuid "^3.3.2"
lbryinc@lbryio/lbryinc#021ac75d9aa2db488cfff8e9be320402f038f955:
lbryinc@lbryio/lbryinc#667024ebb7cb207609273174ca422cee47469270:
version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/021ac75d9aa2db488cfff8e9be320402f038f955"
resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/667024ebb7cb207609273174ca422cee47469270"
dependencies:
reselect "^3.0.0"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment