diff --git a/apps/mobile/app/components/container/container-header.tsx b/apps/mobile/app/components/container/container-header.tsx
deleted file mode 100644
index 152a49c75..000000000
--- a/apps/mobile/app/components/container/container-header.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-import React, { PropsWithChildren } from "react";
-import { View } from "react-native";
-import { useSelectionStore } from "../../stores/use-selection-store";
-import { useThemeColors } from "@notesnook/theme";
-
-export const ContainerHeader = (props: PropsWithChildren) => {
- const { colors } = useThemeColors();
- const selectionMode = useSelectionStore((state) => state.selectionMode);
-
- return !selectionMode ? (
-
- {props.children}
-
- ) : null;
-};
diff --git a/apps/mobile/app/components/container/index.tsx b/apps/mobile/app/components/container/index.tsx
index 1ca6c6f29..fc1e61f0e 100644
--- a/apps/mobile/app/components/container/index.tsx
+++ b/apps/mobile/app/components/container/index.tsx
@@ -21,14 +21,9 @@ import React, { PropsWithChildren } from "react";
import { KeyboardAvoidingView, Platform } from "react-native";
import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
import useIsFloatingKeyboard from "../../hooks/use-is-floating-keyboard";
-import { useSettingStore } from "../../stores/use-setting-store";
-import SelectionHeader from "../selection-header";
export const Container = ({ children }: PropsWithChildren) => {
const floating = useIsFloatingKeyboard();
- const introCompleted = useSettingStore(
- (state) => state.settings.introCompleted
- );
const insets = useGlobalSafeAreaInsets();
return (
@@ -42,12 +37,6 @@ export const Container = ({ children }: PropsWithChildren) => {
paddingBottom: Platform.OS === "android" ? 0 : insets.bottom
}}
>
- {!introCompleted ? null : (
- <>
-
-
- )}
-
{children}
);
diff --git a/apps/mobile/app/components/dialogs/vault/index.js b/apps/mobile/app/components/dialogs/vault/index.js
index 1faf4e395..e372382fb 100644
--- a/apps/mobile/app/components/dialogs/vault/index.js
+++ b/apps/mobile/app/components/dialogs/vault/index.js
@@ -212,7 +212,6 @@ export class VaultDialog extends Component {
this.password = null;
this.confirmPassword = null;
- SearchService.updateAndSearch();
this.setState({
visible: false,
note: {},
@@ -459,7 +458,7 @@ export class VaultDialog extends Component {
async _deleteNote() {
try {
await db.vault.remove(this.state.note.id, this.password);
- await deleteItems(this.state.note);
+ await deleteItems([this.state.note.id], "note");
this.close();
} catch (e) {
this._takeErrorAction(e);
diff --git a/apps/mobile/app/components/header/index.tsx b/apps/mobile/app/components/header/index.tsx
index 3c811a366..bb59dfe37 100644
--- a/apps/mobile/app/components/header/index.tsx
+++ b/apps/mobile/app/components/header/index.tsx
@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
+import { useThemeColors } from "@notesnook/theme";
import React, { useCallback, useEffect, useState } from "react";
import { Platform, StyleSheet, View } from "react-native";
import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
@@ -24,15 +25,14 @@ import {
eSubscribeEvent,
eUnSubscribeEvent
} from "../../services/event-manager";
+import useNavigationStore, {
+ RouteName
+} from "../../stores/use-navigation-store";
import { useSelectionStore } from "../../stores/use-selection-store";
-import { useThemeColors } from "@notesnook/theme";
import { eScrollEvent } from "../../utils/events";
import { LeftMenus } from "./left-menus";
import { RightMenus } from "./right-menus";
import { Title } from "./title";
-import useNavigationStore, {
- RouteName
-} from "../../stores/use-navigation-store";
type HeaderRightButton = {
title: string;
diff --git a/apps/mobile/app/components/header/left-menus.tsx b/apps/mobile/app/components/header/left-menus.tsx
index 58d95ecf9..bf74e8677 100644
--- a/apps/mobile/app/components/header/left-menus.tsx
+++ b/apps/mobile/app/components/header/left-menus.tsx
@@ -60,7 +60,6 @@ export const LeftMenus = ({
height: 40,
width: 40,
borderRadius: 100,
- marginLeft: -5,
marginRight: DDS.isLargeTablet() ? 10 : 7
}}
left={40}
@@ -72,9 +71,6 @@ export const LeftMenus = ({
}}
name={canGoBack ? "arrow-left" : "menu"}
color={colors.primary.paragraph}
- iconStyle={{
- marginLeft: canGoBack ? -5 : 0
- }}
/>
);
};
diff --git a/apps/mobile/app/components/list-items/note/index.tsx b/apps/mobile/app/components/list-items/note/index.tsx
index 9c135f3ed..c51eb18d9 100644
--- a/apps/mobile/app/components/list-items/note/index.tsx
+++ b/apps/mobile/app/components/list-items/note/index.tsx
@@ -105,7 +105,7 @@ const NoteItem = ({
{notebooks?.items
?.filter(
(item) =>
- item.id !== useNavigationStore.getState().currentRoute?.id
+ item.id !== useNavigationStore.getState().focusedRouteId
)
.map((item) => (