chore(version-snjs): 2.14.1
This commit is contained in:
@@ -5,10 +5,6 @@ import {
|
||||
} from '@/preferences/components';
|
||||
import { WebApplication } from '@/ui_models/application';
|
||||
import { useCallback, useEffect, useState } from 'preact/hooks';
|
||||
import {
|
||||
GetSubscriptionResponse,
|
||||
GetSubscriptionsResponse,
|
||||
} from '@standardnotes/snjs/dist/@types/services/api/responses';
|
||||
import { SubscriptionState } from './subscription_state';
|
||||
import { SubscriptionInformation } from './SubscriptionInformation';
|
||||
import { NoSubscription } from './NoSubscription';
|
||||
@@ -31,10 +27,9 @@ export const Subscription = observer(({
|
||||
|
||||
const getSubscriptions = useCallback(async () => {
|
||||
try {
|
||||
const result = await application.getSubscriptions();
|
||||
if (result.data) {
|
||||
const data = (result as GetSubscriptionsResponse).data;
|
||||
subscriptionState.setAvailableSubscriptions(data!);
|
||||
const subscriptions = await application.getAvailableSubscriptions();
|
||||
if (subscriptions) {
|
||||
subscriptionState.setAvailableSubscriptions(subscriptions);
|
||||
}
|
||||
} catch (e) {
|
||||
// Error in this call will only prevent the plan name from showing
|
||||
@@ -43,13 +38,9 @@ export const Subscription = observer(({
|
||||
|
||||
const getSubscription = useCallback(async () => {
|
||||
try {
|
||||
const result = await application.getUserSubscription();
|
||||
if (!result.error && result.data) {
|
||||
const data = (result as GetSubscriptionResponse).data;
|
||||
const subscription = data!.subscription;
|
||||
const subscription = await application.getUserSubscription();
|
||||
if (subscription) {
|
||||
subscriptionState.setUserSubscription(subscription);
|
||||
} else {
|
||||
setError(true);
|
||||
}
|
||||
} catch (e) {
|
||||
setError(true);
|
||||
|
||||
@@ -9,6 +9,7 @@ type Props = {
|
||||
|
||||
const StatusText = observer(({ subscriptionState }: Props) => {
|
||||
const { userSubscription, userSubscriptionName } = subscriptionState;
|
||||
const expirationDate = new Date(userSubscription!.endsAt / 1000).toLocaleString();
|
||||
|
||||
return userSubscription!.cancelled ? (
|
||||
<Text>
|
||||
@@ -20,7 +21,7 @@ const StatusText = observer(({ subscriptionState }: Props) => {
|
||||
subscription has been{' '}
|
||||
<span className="font-bold">
|
||||
canceled but will remain valid until{' '}
|
||||
{new Date(userSubscription!.endsAt).toLocaleString()}
|
||||
{expirationDate}
|
||||
</span>
|
||||
. You may resubscribe below if you wish.
|
||||
</Text>
|
||||
@@ -33,7 +34,7 @@ const StatusText = observer(({ subscriptionState }: Props) => {
|
||||
</span>{' '}
|
||||
subscription will be{' '}
|
||||
<span className="font-bold">
|
||||
renewed on {new Date(userSubscription!.endsAt).toLocaleString()}
|
||||
renewed on {expirationDate}
|
||||
</span>
|
||||
.
|
||||
</Text>
|
||||
|
||||
@@ -25,6 +25,7 @@ import { NativeExtManager } from '@/services/nativeExtManager';
|
||||
import { StatusManager } from '@/services/statusManager';
|
||||
import { ThemeManager } from '@/services/themeManager';
|
||||
import { AppVersion } from '@/version';
|
||||
import { isDev } from '@/utils';
|
||||
|
||||
type WebServices = {
|
||||
appState: AppState;
|
||||
@@ -64,7 +65,8 @@ export class WebApplication extends SNApplication {
|
||||
identifier,
|
||||
[],
|
||||
defaultSyncServerHost,
|
||||
AppVersion
|
||||
AppVersion,
|
||||
isDev,
|
||||
);
|
||||
this.$compile = $compile;
|
||||
this.scope = scope;
|
||||
|
||||
Reference in New Issue
Block a user