Bump to 0.6.7

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.mutinywallet.mutinywallet"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 58
-        versionName "0.6.6"
+        versionCode 59
+        versionName "0.6.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

e2e/roundtrip.spec.ts

@@ -124,6 +124,9 @@ test("rountrip receive and send", async ({ page }) => {
 
     await page.click("text=Online Channels");
 
+    // Give it just a second to settle down
+    await page.waitForTimeout(2000);
+
     await page.click("text=Close");
 
     await page.click("text=Confirm");

ios/App/App.xcodeproj/project.pbxproj

@@ -360,7 +360,7 @@
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.6.6;
+				MARKETING_VERSION = 1.6.7;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mutinywallet.mutiny;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -387,7 +387,7 @@
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.6.6;
+				MARKETING_VERSION = 1.6.7;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mutinywallet.mutiny;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

package.json

@@ -1,6 +1,6 @@
 {
     "name": "mutiny-wallet",
-    "version": "0.6.6",
+    "version": "0.6.7",
     "license": "MIT",
     "packageManager": "[email protected]",
     "scripts": {

src/state/megaStore.tsx

@@ -204,20 +204,23 @@ export const Provider: ParentComponent = (props) => {
                     await setSettings(settings);
                 }
 
-                // 60 seconds to load or we bail
+                // 90 seconds to load or we bail
                 const start = Date.now();
-                const MAX_LOAD_TIME = 60000;
+                const MAX_LOAD_TIME = 90000;
                 const interval = setInterval(() => {
                     console.log("Running setup", Date.now() - start);
                     if (Date.now() - start > MAX_LOAD_TIME) {
                         clearInterval(interval);
-                        // Have to set state error here because throwing doesn't work if WASM panics
-                        setState({
-                            setup_error: new Error(
-                                "Load timed out, please try again"
-                            )
-                        });
-                        return;
+                        // Only want to do this if we're really not done loading
+                        if (state.load_stage !== "done") {
+                            // Have to set state error here because throwing doesn't work if WASM panics
+                            setState({
+                                setup_error: new Error(
+                                    "Load timed out, please try again"
+                                )
+                            });
+                            return;
+                        }
                     }
                 }, 1000);