working? but still kinda buggy...

ReactNativeClient/lib/QuickActions.js

@@ -3,7 +3,7 @@ import {DeviceEventEmitter} from 'react-native';
 import QuickActions from 'react-native-quick-actions';
 const { _ } = require('lib/locale.js');
 
-export default (dispatch, folderId, state) => {
+export default (dispatch, folderId/* , state*/) => {
 	QuickActions.setShortcutItems([
 		{type: 'New note', title: _('New note'), icon: 'Compose'},
 		{type: 'New to-do', title: _('New to-do'), icon: 'Add'},
@@ -12,14 +12,23 @@ export default (dispatch, folderId, state) => {
 	]);
 
 	DeviceEventEmitter.addListener('quickActionShortcut', data => {
-		console.log('JSON.stringify(state, null, 2):');
-		console.log(JSON.stringify(state, null, 2));
+		// console.log('JSON.stringify(state, null, 2):');
+		// console.log(JSON.stringify(state, null, 2));
 
-		dispatch({ type: 'NOTE_SELECTION_END' });
-		dispatch({ type: 'SIDE_MENU_CLOSE' });
+		// dispatch({ type: 'NOTE_SELECTION_END' });
+		// dispatch({ type: 'SIDE_MENU_CLOSE' });
+
+		// Momentarily go back to `All notes` home screen to reset state
+		dispatch({
+			type: 'NAV_GO',
+			routeName: 'Notes',
+			smartFilterId: 'c3176726992c11e9ac940492261af972',
+		});
 
 		// setTimeout(() => { // This didn't work
 		if (data.type === 'New note') {
+			console.log('create new note with folderId =', folderId);
+
 			dispatch({
 				type: 'NAV_GO',
 				noteId: null,

ReactNativeClient/lib/components/screens/note.js

@@ -911,6 +911,7 @@ class NoteScreenComponent extends BaseScreenComponent {
 }
 
 const NoteScreen = connect(state => {
+	console.log('Going to 1-note screen');
 	console.log('noteId:', state.selectedNoteIds.length ? state.selectedNoteIds[0] : null);
 	return {
 		// Making this null didn't work

ReactNativeClient/lib/reducer.js

@@ -96,6 +96,7 @@ stateUtils.parentItem = function(state) {
 };
 
 stateUtils.lastSelectedNoteIds = function(state) {
+	// Commenting this out doesn't fix i
 	const parent = stateUtils.parentItem(state);
 	if (!parent) return [];
 	const output = state.lastSelectedNotesIds[parent.type][parent.id];
@@ -247,6 +248,7 @@ function recordLastSelectedNoteIds(state, noteIds) {
 	newOnes[parent.type][parent.id] = noteIds.slice();
 
 	return Object.assign({}, state, {
+		// Commenting this out doesn't fix it
 		lastSelectedNotesIds: newOnes,
 	});
 }

ReactNativeClient/pluginAssets/index.js

@@ -1,11 +1,11 @@
 module.exports = {
-	hash: '964177e31d959b03bc63f11216c61e3e', files: {
-		'highlight.js/atom-one-dark-reasonable.css': { data: require('./highlight.js/atom-one-dark-reasonable.css.base64.js'), mime: 'text/css', encoding: 'base64' },
-		'highlight.js/atom-one-light.css': { data: require('./highlight.js/atom-one-light.css.base64.js'), mime: 'text/css', encoding: 'base64' },
-		'katex/fonts/KaTeX_Main-Regular.woff2': { data: require('./katex/fonts/KaTeX_Main-Regular.woff2.base64.js'), mime: 'application/octet-stream', encoding: 'base64' },
-		'katex/fonts/KaTeX_Math-Italic.woff2': { data: require('./katex/fonts/KaTeX_Math-Italic.woff2.base64.js'), mime: 'application/octet-stream', encoding: 'base64' },
-		'katex/fonts/KaTeX_Size1-Regular.woff2': { data: require('./katex/fonts/KaTeX_Size1-Regular.woff2.base64.js'), mime: 'application/octet-stream', encoding: 'base64' },
-		'katex/fonts/KaTeX_Size2-Regular.woff2': { data: require('./katex/fonts/KaTeX_Size2-Regular.woff2.base64.js'), mime: 'application/octet-stream', encoding: 'base64' },
-		'katex/katex.css': { data: require('./katex/katex.css.base64.js'), mime: 'text/css', encoding: 'base64' },
-	},
-};
+hash:"964177e31d959b03bc63f11216c61e3e", files: {
+'highlight.js/atom-one-dark-reasonable.css': { data: require('./highlight.js/atom-one-dark-reasonable.css.base64.js'), mime: 'text/css', encoding: 'base64' },
+'highlight.js/atom-one-light.css': { data: require('./highlight.js/atom-one-light.css.base64.js'), mime: 'text/css', encoding: 'base64' },
+'katex/fonts/KaTeX_Main-Regular.woff2': { data: require('./katex/fonts/KaTeX_Main-Regular.woff2.base64.js'), mime: 'application/octet-stream', encoding: 'base64' },
+'katex/fonts/KaTeX_Math-Italic.woff2': { data: require('./katex/fonts/KaTeX_Math-Italic.woff2.base64.js'), mime: 'application/octet-stream', encoding: 'base64' },
+'katex/fonts/KaTeX_Size1-Regular.woff2': { data: require('./katex/fonts/KaTeX_Size1-Regular.woff2.base64.js'), mime: 'application/octet-stream', encoding: 'base64' },
+'katex/fonts/KaTeX_Size2-Regular.woff2': { data: require('./katex/fonts/KaTeX_Size2-Regular.woff2.base64.js'), mime: 'application/octet-stream', encoding: 'base64' },
+'katex/katex.css': { data: require('./katex/katex.css.base64.js'), mime: 'text/css', encoding: 'base64' },
+}
+};

ReactNativeClient/root.js

@@ -222,9 +222,13 @@ const appReducer = (state = appDefaultState, action) => {
 				const currentRoute = state.route;
 
 				if (!historyGoingBack && historyCanGoBackTo(currentRoute, action)) {
-				// If the route *name* is the same (even if the other parameters are different), we
-				// overwrite the last route in the history with the current one. If the route name
-				// is different, we push a new history entry.
+					console.log(JSON.stringify({
+						'currentRoute.routeName': currentRoute.routeName,
+						'action.routeName': action.routeName,
+					}, null, 2));
+					// If the route *name* is the same (even if the other parameters are different), we
+					// overwrite the last route in the history with the current one. If the route name
+					// is different, we push a new history entry.
 					if (currentRoute.routeName == action.routeName) {
 					// nothing
 					} else {
@@ -240,6 +244,10 @@ const appReducer = (state = appDefaultState, action) => {
 				// is probably not a common workflow.
 				for (let i = 0; i < navHistory.length; i++) {
 					let n = navHistory[i];
+					console.log(JSON.stringify({
+						'n.routeName': n.routeName,
+						'action.routeName': action.routeName,
+					}, null, 2));
 					if (n.routeName == action.routeName) {
 						navHistory[i] = Object.assign({}, action);
 					}
@@ -800,4 +808,4 @@ class Root extends React.Component {
 	}
 }
 
-module.exports = { Root };
+module.exports = { Root, DEFAULT_ROUTE };