Merge branch 'develop' into zustand-state

apps/mobile/ios/Podfile.lock

@@ -349,7 +349,7 @@ PODS:
     - SDWebImageWebPCoder (~> 0.6.1)
   - RNFileViewer (2.1.4):
     - React-Core
-  - RNGestureHandler (1.9.0):
+  - RNGestureHandler (1.10.3):
     - React-Core
   - RNIap (5.2.14):
     - React-Core
@@ -680,7 +680,7 @@ SPEC CHECKSUMS:
   RNExitApp: c4e052df2568b43bec8a37c7cd61194d4cfee2c3
   RNFastImage: d4870d58f5936111c56218dbd7fcfc18e65b58ff
   RNFileViewer: 83cc066ad795b1f986791d03b56fe0ee14b6a69f
-  RNGestureHandler: 9b7e605a741412e20e13c512738a31bd1611759b
+  RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
   RNIap: f00befe6581a5953191108cb97d9b3872473337b
   RNInAppBrowser: 48b95ba7a4eaff5cc223bca338d3e319561dbd1b
   RNKeychain: 840f8e6f13be0576202aefcdffd26a4f54bfe7b5

apps/mobile/src/components/NoteItem/wrapper.js

@@ -18,9 +18,12 @@ export const NoteWrapper = React.memo(({item, index}) => {
   
   const onPress = async () => {
     let _note = db.notes.note(item.id).data;
-    if (history.selectedItemsList.length > 0 ) {
-      setSelectedItem(_note);
+
+    if (history.selectedItemsList.length > 0 && history.selectionMode) {
+      dispatch({type: Actions.SELECTED_ITEMS, item: _note});
       return;
+    } else {
+      history.selectedItemsList = [];
     }
 
     if (_note.conflicted) {

apps/mobile/src/components/NotebookItem/wrapper.js

@@ -10,9 +10,15 @@ export const NotebookWrapper = React.memo(({item, index}) => {
   const setSelectedItem = useSelectionStore(state => state.setSelectedItem)
 
   const onPress = () => {
-    if (history.selectedItemsList.length > 0) {
-      setSelectedItem(item);
+
+    if (history.selectedItemsList.length > 0 && history.selectionMode) {
+      dispatch({
+        type: Actions.SELECTED_ITEMS,
+        item: item,
+      });
       return;
+    }  else {
+      history.selectedItemsList = [];
     }
     let routeName = item.type === "topic" ? 'NotesPage' : 'Notebook';
     

apps/mobile/src/utils/index.js

@@ -91,7 +91,7 @@ export const InteractionManager = {
   runAfterInteractions: (func, time = 300) => setTimeout(func, time),
 };
 
-export const APP_VERSION = 1375;
+export const APP_VERSION = 1376;
 
 export async function setSetting(settings, name, value) {
   let s = {...settings};