Skip to content

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

mobile: fix Archive screen does not show correct date/time on note based on sorting

Ammar Ahmed46d802548b7d
diff --git a/apps/mobile/app/app.tsx b/apps/mobile/app/app.tsx
index 22e6e1bae..6cf5dd016 100644
--- a/apps/mobile/app/app.tsx
+++ b/apps/mobile/app/app.tsx
@@ -44,7 +44,6 @@ import { useUserStore } from "./stores/use-user-store";
import RNBootSplash from "react-native-bootsplash";
import AppLocked from "./components/app-lock";
import { useSettingStore } from "./stores/use-setting-store";
-import ScreenGuardModule from "react-native-screenguard";
I18nManager.allowRTL(false);
I18nManager.forceRTL(false);
I18nManager.swapLeftAndRightInRTL(false);
@@ -52,7 +51,6 @@ const { appLockEnabled, appLockMode } = SettingsService.get();
if (appLockEnabled || appLockMode !== "none") {
useUserStore.getState().lockApp(true);
}
-ScreenGuardModule.initSettings();
RNBootSplash.hide({
fade: true
});
diff --git a/apps/mobile/app/components/list/index.tsx b/apps/mobile/app/components/list/index.tsx
index d33a48c66..9af11a659 100644
--- a/apps/mobile/app/components/list/index.tsx
+++ b/apps/mobile/app/components/list/index.tsx
@@ -74,13 +74,15 @@ export default function List(props: ListProps) {
notebooksListMode === "compact";
const groupType =
- props.renderedInRoute === "Notes"
- ? "home"
- : props.renderedInRoute === "Favorites"
- ? "favorites"
- : props.renderedInRoute === "Trash" || props.dataType === "trash"
- ? "trash"
- : `${props.dataType}s`;
+ props.renderedInRoute === "Archive"
+ ? "archive"
+ : props.renderedInRoute === "Notes"
+ ? "home"
+ : props.renderedInRoute === "Favorites"
+ ? "favorites"
+ : props.renderedInRoute === "Trash" || props.dataType === "trash"
+ ? "trash"
+ : `${props.dataType}s`;
const groupOptions = useGroupOptions(groupType);
diff --git a/apps/mobile/app/services/settings.ts b/apps/mobile/app/services/settings.ts
index 4aa6f4db1..9938eb376 100644
--- a/apps/mobile/app/services/settings.ts
+++ b/apps/mobile/app/services/settings.ts
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-import { NativeModules, Platform } from "react-native";
+import { Platform } from "react-native";
import { MMKV } from "../common/database/mmkv";
import {
SettingStore,
@@ -29,6 +29,7 @@ import { scale, updateSize } from "../utils/size";
import { DatabaseLogger } from "../common/database";
import { useUserStore } from "../stores/use-user-store";
import ScreenGuardModule from "react-native-screenguard";
+ScreenGuardModule.initSettings();
function reset() {
const settings = get();