Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

mobile: migrate user profile to settings

Ammar Ahmed097c6915fb3f
diff --git a/apps/mobile/app/components/side-menu/user-status.js b/apps/mobile/app/components/side-menu/user-status.js
index b93aca914..de5cc459e 100644
--- a/apps/mobile/app/components/side-menu/user-status.js
+++ b/apps/mobile/app/components/side-menu/user-status.js
@@ -34,8 +34,6 @@ import { Pressable } from "../ui/pressable";
import { TimeSince } from "../ui/time-since";
import Paragraph from "../ui/typography/paragraph";
-const PROFILE_PIC_URL = `https://picsum.photos/id/177/367/267`;
-
export const UserStatus = () => {
const { colors } = useThemeColors();
const user = useUserStore((state) => state.user);
diff --git a/apps/mobile/app/hooks/use-app-events.tsx b/apps/mobile/app/hooks/use-app-events.tsx
index bb38d651f..436a46b07 100644
--- a/apps/mobile/app/hooks/use-app-events.tsx
+++ b/apps/mobile/app/hooks/use-app-events.tsx
@@ -309,6 +309,9 @@ export const useAppEvents = () => {
initAfterSync();
setLastSynced(await db.lastSynced());
eSendEvent(eCloseSheet, "sync_progress");
+ useUserStore.setState({
+ profile: db.settings.getProfile()
+ });
}, [setLastSynced]);
useEffect(() => {
@@ -390,7 +393,7 @@ export const useAppEvents = () => {
setUser(user);
useUserStore.setState({
- profile: await db.user.getProfile()
+ profile: db.settings.getProfile()
});
if (SettingsService.get().sessionExpired) {
diff --git a/apps/mobile/app/screens/settings/settings-data.tsx b/apps/mobile/app/screens/settings/settings-data.tsx
index 45c0e82f8..97cc39884 100644
--- a/apps/mobile/app/screens/settings/settings-data.tsx
+++ b/apps/mobile/app/screens/settings/settings-data.tsx
@@ -147,13 +147,13 @@ export const settingsGroups: SettingSection[] = [
"Are you sure you want to remove your profile picture?",
positiveText: "Remove",
positivePress: async () => {
- db.user
+ db.settings
.setProfile({
profilePicture: undefined
})
.then(async () => {
useUserStore.setState({
- profile: await db.user.getProfile()
+ profile: db.settings.getProfile()
});
});
}
@@ -172,13 +172,13 @@ export const settingsGroups: SettingSection[] = [
paragraph: "Are you sure you want to remove your name?",
positiveText: "Remove",
positivePress: async () => {
- db.user
+ db.settings
.setProfile({
fullName: undefined
})
.then(async () => {
useUserStore.setState({
- profile: await db.user.getProfile()
+ profile: db.settings.getProfile()
});
});
}
diff --git a/apps/mobile/app/screens/settings/user-section.js b/apps/mobile/app/screens/settings/user-section.js
index afcea6661..648573dc9 100644
--- a/apps/mobile/app/screens/settings/user-section.js
+++ b/apps/mobile/app/screens/settings/user-section.js
@@ -75,11 +75,11 @@ const ProfilePicPlaceholder = () => {
cropperToolbarWidgetColor: theme.scopes.base.primary.icon
}).then(async (image) => {
if (!image.data) return;
- await db.user.setProfile({
+ await db.settings.setProfile({
profilePicture: "data:image/jpeg;base64," + image.data
});
useUserStore.setState({
- profile: await db.user.getProfile()
+ profile: db.settings.getProfile()
});
});
}}
@@ -181,13 +181,13 @@ const SettingsUserSection = ({ item }) => {
inputPlaceholder: "Enter your full name",
defaultValue: userProfile?.fullName,
positivePress: async (value) => {
- db.user
+ db.settings
.setProfile({
fullName: value
})
.then(async () => {
useUserStore.setState({
- profile: await db.user.getProfile()
+ profile: db.settings.getProfile()
});
});
}