beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

remove subsciption and plan state and directly read and write localstorage value

Browse source
This commit is contained in:
Abhinav-grd 2021-03-17 13:00:36 +05:30
parent a886488865
commit 489a83762a
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/pages/gallery/index.tsx
View file

@ -25,8 +25,9 @@ import {
import constants from 'utils/strings/constants';
import AlertBanner from './components/AlertBanner';
import { Alert, Button, Jumbotron } from 'react-bootstrap';
import subscriptionService, { Plan } from 'services/subscriptionService';
import subscriptionService from 'services/subscriptionService';
import PlanSelector from './components/PlanSelector';
import { planIsActive } from 'utils/billingUtil';
const DATE_CONTAINER_HEIGHT = 45;
const IMAGE_CONTAINER_HEIGHT = 200;
@ -137,8 +138,6 @@ export default function Gallery(props: Props) {
const [bannerErrorCode, setBannerErrorCode] = useState<number>(null);
const [sinceTime, setSinceTime] = useState(0);
const [isFirstLoad, setIsFirstLoad] = useState(false);
const [plans, setPlans] = useState<Plan[]>(null);
const loadingBar = useRef(null);
useEffect(() => {
const key = getKey(SESSION_KEYS.ENCRYPTION_KEY);
@ -154,8 +153,6 @@ export default function Gallery(props: Props) {
collections,
data
);
const plans = await subscriptionService.getPlans();
await subscriptionService.getUserSubscription();
const collectionAndItsLatestFile = await getCollectionAndItsLatestFile(
nonEmptyCollections,
data
@ -163,10 +160,8 @@ export default function Gallery(props: Props) {
setData(data);
setCollections(nonEmptyCollections);
setCollectionAndItsLatestFile(collectionAndItsLatestFile);
setPlans(plans);
const favItemIds = await getFavItemIds(data);
setFavItemIds(favItemIds);
await syncWithRemote();
setIsFirstLoad(false);
};
@ -184,6 +179,9 @@ export default function Gallery(props: Props) {
data
);
const favItemIds = await getFavItemIds(data);
await subscriptionService.updatePlans();
await subscriptionService.syncSubscription();
setCollections(nonEmptyCollections);
if (isUpdated) {
setData(data);
@ -355,7 +353,7 @@ export default function Gallery(props: Props) {
</div>
)}
<AlertBanner bannerErrorCode={bannerErrorCode} />
{!subscriptionService.hasActivePaidPlan() && (
{!planIsActive() && (
<Button
id="checkout"
variant="primary"
@ -367,7 +365,6 @@ export default function Gallery(props: Props) {
</Button>
)}
<PlanSelector
plans={plans}
modalView={props.planModalView}
closeModal={() => props.setPlanModalView(false)}
setBannerErrorCode={setBannerErrorCode}