mirror of
https://github.com/streetwriters/notesnook.git
synced 2025-12-23 15:09:33 +01:00
update announcement
This commit is contained in:
@@ -2,7 +2,7 @@ import {useCallback, useEffect, useState} from 'react';
|
|||||||
import {Platform} from 'react-native';
|
import {Platform} from 'react-native';
|
||||||
import {SUBSCRIPTION_STATUS} from '.';
|
import {SUBSCRIPTION_STATUS} from '.';
|
||||||
import PremiumService from '../services/PremiumService';
|
import PremiumService from '../services/PremiumService';
|
||||||
import { db } from './DB';
|
import {db} from './DB';
|
||||||
import Storage from './storage';
|
import Storage from './storage';
|
||||||
|
|
||||||
var CACHED_ANNOUNCEMENT;
|
var CACHED_ANNOUNCEMENT;
|
||||||
@@ -16,17 +16,16 @@ export default function useAnnouncement() {
|
|||||||
|
|
||||||
if (
|
if (
|
||||||
!CACHED_ANNOUNCEMENT ||
|
!CACHED_ANNOUNCEMENT ||
|
||||||
await Storage.read('removedAnnouncement') === CACHED_ANNOUNCEMENT.id ||
|
(await Storage.read('removedAnnouncement')) ===
|
||||||
|
CACHED_ANNOUNCEMENT.id ||
|
||||||
!shouldShowAnnouncement(CACHED_ANNOUNCEMENT)
|
!shouldShowAnnouncement(CACHED_ANNOUNCEMENT)
|
||||||
)
|
)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
setAnnouncement(CACHED_ANNOUNCEMENT);
|
setAnnouncement(CACHED_ANNOUNCEMENT);
|
||||||
} catch(e) {
|
} catch (e) {
|
||||||
setAnnouncement()
|
setAnnouncement();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
})();
|
})();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
@@ -40,7 +39,7 @@ export default function useAnnouncement() {
|
|||||||
const allowedPlatforms = ['all', 'mobile', Platform.OS];
|
const allowedPlatforms = ['all', 'mobile', Platform.OS];
|
||||||
function shouldShowAnnouncement(announcement) {
|
function shouldShowAnnouncement(announcement) {
|
||||||
let show = allowedPlatforms.indexOf(announcement.platform) > -1;
|
let show = allowedPlatforms.indexOf(announcement.platform) > -1;
|
||||||
console.log(show)
|
console.log(show);
|
||||||
if (!show) return;
|
if (!show) return;
|
||||||
|
|
||||||
const subStatus = PremiumService.getUser()?.subscription?.type;
|
const subStatus = PremiumService.getUser()?.subscription?.type;
|
||||||
@@ -58,6 +57,12 @@ function shouldShowAnnouncement(announcement) {
|
|||||||
case 'loggedOut':
|
case 'loggedOut':
|
||||||
show = !PremiumService.getUser();
|
show = !PremiumService.getUser();
|
||||||
break;
|
break;
|
||||||
|
case 'verified':
|
||||||
|
show = PremiumService.getUser()?.isEmailVerified;
|
||||||
|
break;
|
||||||
|
case 'loggedIn':
|
||||||
|
show = !!PremiumService.getUser();
|
||||||
|
break;
|
||||||
case 'unverified':
|
case 'unverified':
|
||||||
show = !PremiumService.getUser()?.isEmailVerified;
|
show = !PremiumService.getUser()?.isEmailVerified;
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user