fix: Back from Settings never lands on Settings itself (closes #481)

The recovery phrase and delete wallet screens take themselves off the
Back stack when left, so Settings, one of those screens, then the
settings gear leaves Settings under the Settings now showing. A reopened
popup restores the same stack, cut at the screen the gear left. Back
then showed Settings again and seemed to do nothing.

goBack() now skips any entry for the screen already showing before it
pops its target. Jest tests drive the gear and then Back for the
recovery phrase screen, once and twice over, for both delete screens,
and after a reopen.

Model: opus-5-5

tests/backNavigation.test.js

@@ -52,6 +52,7 @@ const {
     resetRenderedViews,
 } = require("../src/popup/viewRouter");
 const { state } = require("../src/shared/state");
+const { restorableStack } = require("../src/shared/persistedState");
 
 const ADDRESS = "0x1111111111111111111111111111111111111111";
 const TOKEN = "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48";
@@ -209,6 +210,23 @@ describe("Back onto a view the reopened popup never rendered", () => {
     });
 });
 
+// https://git.eeqj.de/sneak/AutistMask/issues/481. Settings, the recovery
+// phrase or delete wallet screen, the gear, then a reopen: the restored stack
+// is cut at the screen the gear left, which leaves Settings under the Settings
+// the popup reopens onto.
+describe("Back from Settings reopened over its own entry", () => {
+    test.each(["show-phrase", "delete-wallet-confirm"])(
+        "goes to the screen under it after leaving %s",
+        (left) => {
+            const stored = ["main", "settings", left];
+            reopenedOn("settings", restorableStack(stored, "settings"));
+            goBack();
+            expect(calls).toEqual(["main"]);
+            expect(state.currentView).toBe("main");
+        },
+    );
+});
+
 // The guards are restoreView()'s, so a popped view whose backing data is
 // gone lands on Home rather than on an empty template.
 describe("Back onto a view whose backing data is gone", () => {

tests/deleteWalletLostPassword.test.js

@@ -618,9 +618,11 @@ describe("the password route's confirm button", () => {
 
 // https://git.eeqj.de/sneak/AutistMask/issues/480: leaving either delete
 // screen drops its wallet selection, so Back onto one showed a screen whose
-// button could only answer "No wallet selected for deletion."
+// button could only answer "No wallet selected for deletion." Taking the
+// screen off the stack leaves Settings under Settings, and Back must not land
+// there either (https://git.eeqj.de/sneak/AutistMask/issues/481).
 describe("Back from Settings after leaving by the settings gear", () => {
-    test("does not land on the delete screen", () => {
+    test("goes past the delete screen to the screen under Settings", () => {
         const { helpers, deleteWallet, state } = load();
         deleteWallet.show(1);
         // The settings gear: push the current view, then show Settings.
@@ -629,10 +631,10 @@ describe("Back from Settings after leaving by the settings gear", () => {
 
         expect(state.viewStack).toEqual(["main", "settings"]);
         helpers.goBack();
-        expect(state.currentView).not.toBe("delete-wallet-confirm");
+        expect(state.currentView).toBe("main");
     });
 
-    test("does not land on the lost-password screen", async () => {
+    test("goes past the lost-password screen to the screen under Settings", async () => {
         const { helpers, deleteWallet, state } = load();
         await openLostPassword(deleteWallet, 1);
         // The settings gear: push the current view, then show Settings.
@@ -641,7 +643,7 @@ describe("Back from Settings after leaving by the settings gear", () => {
 
         expect(state.viewStack).toEqual(["main", "settings"]);
         helpers.goBack();
-        expect(state.currentView).not.toBe(VIEW);
+        expect(state.currentView).toBe("main");
     });
 
     // The lost-password screen's own Back is "Back returns to the delete

tests/showPhrase.test.js

@@ -131,8 +131,10 @@ describe("Back from Settings after leaving by the settings gear", () => {
 
     // https://git.eeqj.de/sneak/AutistMask/issues/461: leaving drops the
     // wallet selection, so Back onto this screen showed a password prompt
-    // that could only answer "No wallet is selected."
-    test("does not land on the recovery phrase screen", () => {
+    // that could only answer "No wallet is selected." Taking the screen off
+    // the stack leaves Settings under Settings, and Back must not land there
+    // either (https://git.eeqj.de/sneak/AutistMask/issues/481).
+    test("goes to the screen under Settings", () => {
         const { helpers, state, showPhrase } = load();
 
         // Opened from the wallet list in Settings, then left by the gear:
@@ -143,7 +145,21 @@ describe("Back from Settings after leaving by the settings gear", () => {
 
         expect(state.viewStack).toEqual(["main", "settings"]);
         helpers.goBack();
-        expect(state.currentView).not.toBe(SHOW_PHRASE_VIEW);
+        expect(state.currentView).toBe("main");
+    });
+
+    // Each round trip leaves one more Settings under Settings.
+    test("goes to the screen under Settings after two round trips", () => {
+        const { helpers, state, showPhrase } = load();
+        for (let i = 0; i < 2; i++) {
+            showPhrase.show(0);
+            helpers.pushCurrentView();
+            helpers.showView("settings");
+        }
+
+        expect(state.viewStack).toEqual(["main", "settings", "settings"]);
+        helpers.goBack();
+        expect(state.currentView).toBe("main");
     });
 
     // This Back takes Settings off the stack before the screen is left, so