Merge pull request #43 from KiraCore/fix/post_fixes

Fix/post fixes

Author: PeepoFrog

gui/dialog_connect.go

@@ -70,7 +70,6 @@ func (g *Gui) ShowConnect() {
 			} else {
 				passphraseCheck.SetChecked(false)
 			}
-			log.Println(s)
 		}
 		keyPathEntry.OnChanged = func(s string) {
 			b, err := os.ReadFile(s)
@@ -86,7 +85,6 @@ func (g *Gui) ShowConnect() {
 			} else {
 				passphraseCheck.SetChecked(false)
 			}
-			log.Println(s)
 		}
 
 		fileDialog := dialog.NewFileOpen(func(reader fyne.URIReadCloser, err error) {
@@ -216,10 +214,6 @@ func (g *Gui) ShowConnect() {
 				errorLabel.SetText(fmt.Sprintf("ERROR: %s", err.Error()))
 				g.showErrorDialog(err, binding.NewDataListener(func() {}))
 			} else {
-				// err = TryToRunSSHSessionForTerminal(g.sshClient)
-				// if err != nil {
-				// } else {
-
 				err := TryToRunSSHSessionForTerminal(g)
 				if err != nil {
 					g.showErrorDialog(fmt.Errorf("unable to create terminal instance, disabling terminal: %v", err.Error()), binding.NewDataListener(func() {}))
@@ -267,17 +261,6 @@ func (g *Gui) ShowConnect() {
 			nil, nil, nil,
 			container.NewBorder(nil, nil, nil, nil, container.NewVScroll(errorLabel)),
 		)
-		// logging := container.NewVBox(
-		// 	widget.NewLabel("IP and Port"),
-		// 	addressBoxEntry,
-		// 	widget.NewLabel("User"),
-		// 	userEntry,
-		// 	keyEntryBox,
-		// 	privKeyCheck,
-		// 	connectButton,
-		// 	container.NewBorder(nil, nil, nil, nil, container.NewVScroll(errorLabel)),
-		// 	testButton,
-		// )
 		return logging
 	}
 
@@ -296,9 +279,6 @@ func (g *Gui) sshAliveTracker() {
 	if err != nil {
 		log.Printf("SSH was interrupted: %v", err.Error())
 		g.ConnectionStatusBinding.Set(false)
-		// g.Terminal.Term.Exit()
-		// g.Terminal.SSHSessionForTerminal.Close()
-		// g.Terminal.SSHIn.Close()
 
 		g.showErrorDialog(fmt.Errorf("SSH connection was disconnected, reason: %v", err.Error()), errorDoneBinding)
 	}

gui/dialog_deploy.go

@@ -47,8 +47,6 @@ func showDeployDialog(g *Gui, doneListener binding.DataListener, shidaiInfra bin
 
 	doneMnemonicDataListener := binding.NewDataListener(func() {
 		mnemonicCheck.Set(true)
-		confirmedMnemonic, _ := mnemonicBinding.Get()
-		log.Println("Confirmed mnemonic:", confirmedMnemonic)
 	})
 	mnemonicManagerDialogButton := widget.NewButtonWithIcon("Mnemonic", theme.CancelIcon(), func() {
 		showMnemonicManagerDialog(g, mnemonicBinding, doneMnemonicDataListener)

gui/dialog_mnemoicManager.go

@@ -91,11 +91,7 @@ If you have not please press "Return" and save your mnemonic.`
 	})
 
 	copyButton := widget.NewButtonWithIcon("Copy", theme.FileIcon(), func() {
-		data, err := localMnemonicBinding.Get()
-		if err != nil {
-			log.Println(err)
-			return
-		}
+		data, _ := localMnemonicBinding.Get()
 		err = clipboard.WriteAll(data)
 		if err != nil {
 			log.Println(err)
@@ -115,14 +111,13 @@ If you have not please press "Return" and save your mnemonic.`
 			g.showErrorDialog(err, binding.NewDataListener(func() {}))
 			return
 		}
-
 		err = localMnemonicBinding.Set(masterMnemonic.String())
 		if err != nil {
 			g.showErrorDialog(err, binding.NewDataListener(func() {}))
 			return
 		}
+
 		mnemonicChanged.DataChanged()
-		log.Println(localMnemonicBinding.Get())
 	})
 
 	content = container.NewBorder(

gui/gui.go

@@ -73,8 +73,8 @@ func (g *Gui) MakeGui() fyne.CanvasObject {
 				loadWidget.SetValue(float64(percentage))
 				loadWidget.Refresh()
 			}
-			g.TxExec.TxDoneListener.DataChanged()
 			g.TxExec.TxExecutionStatusBinding.Set(false)
+			g.TxExec.TxDoneListener.DataChanged()
 			txExecLoadingWidget.Hide()
 		}
 	}))
@@ -85,7 +85,7 @@ func (g *Gui) MakeGui() fyne.CanvasObject {
 	g.ConnectionStatusBinding.AddListener(binding.NewDataListener(func() {
 		state, _ := g.ConnectionStatusBinding.Get()
 		if state {
-			g.Window.SetTitle(fmt.Sprintf("%v (connected)", appName))
+			g.Window.SetTitle(fmt.Sprintf("%v (connected) - %v", appName, g.Host.IP))
 			reconnectButton.Hide()
 			tab.Refresh()
 		} else {
@@ -104,7 +104,9 @@ func (g *Gui) MakeGui() fyne.CanvasObject {
 	}
 	versionData := binding.NewString()
 	versionData.Set(fmt.Sprintf("Version: %v", g.Version))
-	menuAndTab := container.NewHSplit(container.NewBorder(nil, widget.NewLabelWithData(versionData), nil, nil, g.makeNav(setTab)), tab)
+	versionLabel := widget.NewLabelWithData(versionData)
+	versionLabel.Alignment = fyne.TextAlignCenter
+	menuAndTab := container.NewHSplit(container.NewBorder(nil, versionLabel, nil, nil, g.makeNav(setTab)), tab)
 	menuAndTab.Offset = 0.2
 	return menuAndTab
 

gui/screen_nodeInfo.go

@@ -173,7 +173,6 @@ func makeNodeInfoTab(g *Gui) fyne.CanvasObject {
 	)
 	execFunc := func(args types.ExecSekaiCmd) {
 		g.TxExec.TxExecutionStatusBinding.Set(true)
-		// g.WaitDialog.ShowWaitDialog()
 
 		request := types.RequestTXPayload{Command: "tx", Args: args}
 		payload, err := json.Marshal(request)

gui/screen_status.go

@@ -167,13 +167,17 @@ func makeStatusScreen(_ fyne.Window, g *Gui) fyne.CanvasObject {
 		refresh()
 	})
 	defer refresh()
-	return container.NewBorder(nil, refreshButton, nil, nil,
-		container.NewVBox(
-			startButton,
+	return container.NewBorder(nil,
+		container.NewVBox(startButton,
 			deployButton,
+			widget.NewSeparator(),
+			refreshButton), nil, nil,
+		container.NewVBox(
+			widget.NewSeparator(),
 			interxInfoBox,
 			sekaiInfoBox,
 			shidaiInfoBox,
+			widget.NewSeparator(),
 		))
 
 }