Version 1.0.21 (#14)

mysteriumnetwork · Nov 23, 2021 · 3535a87 · 3535a87
1 parent 7372233
commit 3535a87
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 46 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.17
 
 
       - name: "Build"
@@ -24,7 +24,7 @@ jobs:
           git clone https://github.com/mysteriumnetwork/myst-launcher
           pushd myst-launcher
           git fetch --all --tags
-          git checkout tags/1.0.19
+          git checkout tags/1.0.21
           popd
           popd
           

diff --git a/gobridge/go.mod b/gobridge/go.mod
@@ -2,18 +2,6 @@ module github.com/mysteriumnetwork/fff
 
 go 1.16
 
-require (
-	github.com/Microsoft/go-winio v0.5.0 // indirect
-	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/containerd/containerd v1.5.7 // indirect
-	github.com/docker/docker v20.10.10+incompatible
-	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
-	github.com/mysteriumnetwork/myst-launcher v0.0.0
-	github.com/stretchr/testify v1.7.0 // indirect
-	golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
-	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
-	google.golang.org/grpc v1.40.0 // indirect
-)
+require github.com/mysteriumnetwork/myst-launcher v0.0.0
 
 replace github.com/mysteriumnetwork/myst-launcher => ../../myst-launcher
diff --git a/gobridge/go.sum b/gobridge/go.sum
diff --git a/launcher.xcodeproj/project.pbxproj b/launcher.xcodeproj/project.pbxproj
@@ -578,7 +578,7 @@
 					"$(PROJECT_DIR)/gobridge",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.0.19;
+				MARKETING_VERSION = 1.0.21;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mysterium.launcher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -606,7 +606,7 @@
 					"$(PROJECT_DIR)/gobridge",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.0.19;
+				MARKETING_VERSION = 1.0.21;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mysterium.launcher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/launcher/MainWindowDelegate.m b/launcher/MainWindowDelegate.m
@@ -65,7 +65,7 @@ - (void) refreshFrame {
             [self.statusNode setState: [Utils getStateViewStatus: mod.isContainerRunning ]];
 
             [self.labelLauncherUpdate setHidden:(![mod.launcherHasUpdate boolValue])];
-            [self.btnUpdateToMainnet setHidden:([mod.network isEqualToString:@"mainnet"])];
+            [self.btnUpdateToMainnet setHidden:([mod currentNetIsMainnet])];
         }
             break;
 

diff --git a/launcher/Model.h b/launcher/Model.h
@@ -71,6 +71,7 @@
 
 - (void)setState;
 - (void)setNetworkConfig;
+- (bool)currentNetIsMainnet;
 @end
 
 #endif /* model_h */
diff --git a/launcher/Model.m b/launcher/Model.m
@@ -56,7 +56,7 @@ - (void)notificationHandlerMode:(NSNotification *) notification
 }
 
 - (void)notificationHandlerState:(NSNotification *) notification{
-    NSLog(@"notificationHandlerState > %@", notification.userInfo);
+    //NSLog(@"notificationHandlerState > %@", notification.userInfo);
 
     self.imageName            = notification.userInfo[@"imageName"];
     self.hasUpdate            = notification.userInfo[@"hasUpdate"];
@@ -79,7 +79,7 @@ - (void)notificationHandlerState:(NSNotification *) notification{
 }
 
 - (void)notificationHandlerConfig:(NSNotification *) notification{
-    NSLog(@"notificationHandlerState > %@", notification.userInfo);
+    //NSLog(@"notificationHandlerState > %@", notification.userInfo);
 
     self.portBegin            = notification.userInfo[@"portRangeBegin"];
     self.portEnd              = notification.userInfo[@"portRangeEnd"];
@@ -155,4 +155,9 @@ - (void)setNetworkConfig {
     GoSetNetworkConfig(&s);
 }
 
+
+- (bool)currentNetIsMainnet {
+    return [self.network isEqual:@"mainnet"] || [self.network isEqual:@""];
+}
+
 @end