Skip to content

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

Merge branch 'master' into beta

Ammar Ahmed528812d69d77
diff --cc apps/mobile/app/components/sheets/publish-note/index.tsx
index 9544a3176,b96e6d3f5..3971b176f
--- a/apps/mobile/app/components/sheets/publish-note/index.tsx
+++ b/apps/mobile/app/components/sheets/publish-note/index.tsx
@@@ -86,13 -82,14 +87,26 @@@ const PublishNoteSheet = (
const [publishing, setPublishing] = useState(false);
const pwdInput = useRef<TextInput>(null);
const titleInput = useRef<TextInput>(null);
-- const monographData = useAsync(async () => {
-- return fetchMonographData(note?.id);
-- }, []);
++ const lastMonographDataResult = useRef<Awaited<
++ ReturnType<typeof db.monographs.metadata>
++ > | null>(null);
++ const monographData = useAsync(
++ async () => {
++ return fetchMonographData(note?.id);
++ },
++ [],
++ {
++ onSuccess: (r) => {
++ lastMonographDataResult.current = r.metadata;
++ }
++ }
++ );
const monograph = monographData.result?.monograph;
- const publishUrl = monograph && `${hosts.MONOGRAPH_HOST}/${monograph?.id}`;
+ const metadata = monographData.result?.metadata;
+ const publishUrl = metadata?.publishUrl || monograph?.publishUrl || "";
const isPublished = db.monographs.monograph(note?.id);
+ const appState = useAppState();
+ const previousAppState = useRef(appState);
const formRef = useRef(
createFormRef({
@@@ -174,6 -180,35 +197,29 @@@
setPublishLoading(false);
};
- const lastAnalyticsResult = useRef<Awaited<
- ReturnType<typeof db.monographs.analytics>
- > | null>(null);
-
- const analytics = useAsync(async () => {
- if (!isFeatureAvailable?.isAllowed || !monograph?.id || selfDestruct)
- return null;
- const result = await db.monographs.analytics(monograph.id);
- if (result) lastAnalyticsResult.current = result;
- return result;
- }, [monograph?.id, isFeatureAvailable?.isAllowed, selfDestruct]);
-
- const analyticsData = analytics.result ?? lastAnalyticsResult.current;
++ const monographMetadata =
++ monographData.result ?? lastMonographDataResult.current;
+
+ useEffect(() => {
+ const prevState = previousAppState.current;
+ previousAppState.current = appState;
+
+ if (
+ appState === "active" &&
+ prevState !== "active" &&
- isFeatureAvailable?.isAllowed &&
+ monograph?.id &&
+ !selfDestruct
+ ) {
- analytics.execute();
++ monographData.execute();
+ }
- }, [appState, monograph?.id, selfDestruct, isFeatureAvailable?.isAllowed]);
++ }, [
++ appState,
++ monograph?.id,
++ selfDestruct,
++ isFeatureAvailable?.isAllowed,
++ monographData
++ ]);
+
return (
<View
style={{
@@@ -383,7 -418,10 +429,10 @@@
</View>
</TouchableOpacity>
- {isFeatureAvailable?.isAllowed ? (
+ {isFeatureAvailable?.isAllowed &&
+ !selfDestruct &&
- analyticsData &&
- analyticsData?.totalViews > 0 ? (
++ monographMetadata &&
++ monographMetadata?.totalViews > 0 ? (
<View
style={{
flexDirection: "row",
@@@ -407,10 -445,10 +456,7 @@@
}}
>
<Paragraph size={AppFontSize.sm}>{strings.views()}</Paragraph>
- <Paragraph>
- {monographData?.result?.metadata?.analytics?.totalViews ||
- 0}
-
- <Paragraph size={AppFontSize.sm}>
- {analyticsData?.totalViews}
-- </Paragraph>
++ <Paragraph>{monographMetadata?.totalViews || 0}</Paragraph>
</View>
</View>
</View>
diff --cc packages/intl/locale/en.po
index 7adbdd47c,8abcecd03..7fc988b35
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@@ -1,19 -1,20 +1,13 @@@
msgid ""
msgstr ""
- "POT-Creation-Date: 2026-06-11 09:27+0500\n"
-"POT-Creation-Date: 2026-05-11 12:10+0500\n"
-"POT-Creation-Date: 2026-05-11 12:10+0500\n"
++"POT-Creation-Date: 2026-06-16 12:53+0500\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: @lingui/cli\n"
"Language: en\n"
--"Project-Id-Version: \n"
--"Report-Msgid-Bugs-To: \n"
--"PO-Revision-Date: \n"
--"Last-Translator: \n"
--"Language-Team: \n"
--"Plural-Forms: \n"
-
-#: src/strings.ts:2421
+
+#: src/strings.ts:2423
msgid " \"Notebook > Notes\""
msgstr " \"Notebook > Notes\""
@@@ -2934,7 -2783,11 +2928,11 @@@ msgstr "Expiry date cannot be more tha
msgid "Expiry date must be in the future"
msgstr "Expiry date must be in the future"
-#: src/strings.ts:2706
++#: src/strings.ts:2794
+ msgid "Expiry date removed"
+ msgstr "Expiry date removed"
+
-#: src/strings.ts:2693
+#: src/strings.ts:2778
msgid "Expiry date set"
msgstr "Expiry date set"
diff --cc packages/intl/locale/pseudo-LOCALE.po
index 9ff94ea6e,1c6b1e689..63531b09c
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@@ -1,19 -1,20 +1,13 @@@
msgid ""
msgstr ""
- "POT-Creation-Date: 2026-06-11 09:27+0500\n"
-"POT-Creation-Date: 2026-05-11 12:10+0500\n"
-"POT-Creation-Date: 2026-05-11 12:10+0500\n"
++"POT-Creation-Date: 2026-06-16 12:53+0500\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: @lingui/cli\n"
"Language: pseudo-LOCALE\n"
--"Project-Id-Version: \n"
--"Report-Msgid-Bugs-To: \n"
--"PO-Revision-Date: \n"
--"Last-Translator: \n"
--"Language-Team: \n"
--"Plural-Forms: \n"
-
-#: src/strings.ts:2421
+
+#: src/strings.ts:2423
msgid " \"Notebook > Notes\""
msgstr ""
@@@ -2923,7 -2772,11 +2917,11 @@@ msgstr "
msgid "Expiry date must be in the future"
msgstr ""
-#: src/strings.ts:2706
++#: src/strings.ts:2794
+ msgid "Expiry date removed"
+ msgstr ""
+
-#: src/strings.ts:2693
+#: src/strings.ts:2778
msgid "Expiry date set"
msgstr ""
diff --cc packages/intl/src/strings.ts
index 3c1cc9374,9e6a052e6..24d5d749a
--- a/packages/intl/src/strings.ts
+++ b/packages/intl/src/strings.ts
@@@ -2788,7 -2703,5 +2788,8 @@@ Continue without attachments?`
copyLogs: () => t`Copy logs`,
permissionRequiredToSaveQRCode: () =>
t`Permission required to save QR-Code to Gallery`,
+ setupInboxKeys: () => t`Setup inbox keys`,
+ enterPgpPublicKey: () => t`Enter your PGP public key`,
- enterPgpPrivateKey: () => t`Enter your PGP private key`
++ enterPgpPrivateKey: () => t`Enter your PGP private key`,
+ expiryDateRemoved: () => t`Expiry date removed`
};