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

Merge branch 'develop' into feature/subscription-info-in-preferences

Browse Source
This commit is contained in:
Antonella Sgarlatta
2021-09-13 12:05:23 -03:00
parent b3f2d77846 6afce84324
commit ccb80ed6da
24 changed files with 691 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,15 @@
import { Sync, SubscriptionWrapper } from '@/preferences/panes/account';
import { Sync, SubscriptionWrapper, Credentials } from '@/preferences/panes/account';
import { PreferencesPane } from '@/preferences/components';
import { observer } from 'mobx-react-lite';
import { WebApplication } from '@/ui_models/application';
export const AccountPreferences = observer(({application}: {application: WebApplication}) => {
type Props = {
application: WebApplication;
}
export const AccountPreferences = observer(({application}: Props) => {
return (
<PreferencesPane>
<Credentials application={application} />
<Sync application={application} />
<SubscriptionWrapper application={application} />
</PreferencesPane>