rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: show subscription info for logged in user and avoid making api call if no account

Browse Source
This commit is contained in:
Antonella Sgarlatta
2021-10-12 15:33:49 -03:00
parent 6f18664564
commit 7bed9a52f7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/preferences/panes/AccountPreferences.tsx
View File

@@ -32,6 +32,7 @@ export const AccountPreferences = observer(
<PreferencesPane> <PreferencesPane>
<Credentials application={application} /> <Credentials application={application} />
<Sync application={application} /> <Sync application={application} />
<SubscriptionWrapper application={application} />
<SignOutWrapper application={application} appState={appState} /> <SignOutWrapper application={application} appState={appState} />
</PreferencesPane> </PreferencesPane>
); );

10
app/assets/javascripts/preferences/panes/account/subscription/Subscription.tsx
View File

@@ -21,7 +21,7 @@ export const Subscription: FunctionComponent<Props> = observer(({
application, application,
subscriptionState, subscriptionState,
}: Props) => { }: Props) => {
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(false);
const [error, setError] = useState(false); const [error, setError] = useState(false);
const { userSubscription } = subscriptionState; const { userSubscription } = subscriptionState;
@@ -59,8 +59,10 @@ export const Subscription: FunctionComponent<Props> = observer(({
}, [getSubscription, getSubscriptions]); }, [getSubscription, getSubscriptions]);
useEffect(() => { useEffect(() => {
getSubscriptionInfo(); if (application.hasAccount()) {
}, [getSubscriptionInfo]); getSubscriptionInfo();
}
}, [application, getSubscriptionInfo]);
const now = new Date().getTime(); const now = new Date().getTime();
@@ -71,7 +73,7 @@ export const Subscription: FunctionComponent<Props> = observer(({
<div className="flex-grow flex flex-col"> <div className="flex-grow flex flex-col">
<Title>Subscription</Title> <Title>Subscription</Title>
{error ? ( {error ? (
<NoSubscription application={application} /> <Text>No subscription information available.</Text>
) : loading ? ( ) : loading ? (
<Text>Loading subscription information...</Text> <Text>Loading subscription information...</Text>
) : userSubscription && userSubscription.endsAt > now ? ( ) : userSubscription && userSubscription.endsAt > now ? (