diff --git a/FireWallet/FireWallet.csproj b/FireWallet/FireWallet.csproj
index 6fcc966..04dfcfd 100644
--- a/FireWallet/FireWallet.csproj
+++ b/FireWallet/FireWallet.csproj
@@ -12,7 +12,7 @@
HSDBatcher.png
https://github.com/Nathanwoodburn/FireWallet
git
- 3.3
+ 3.4
diff --git a/FireWallet/MainForm.cs b/FireWallet/MainForm.cs
index 34619ad..dadcd29 100644
--- a/FireWallet/MainForm.cs
+++ b/FireWallet/MainForm.cs
@@ -200,7 +200,7 @@ namespace FireWallet
await Task.Delay(1000);
AddLog("Close Failed");
}
-
+
StreamReader sr = new StreamReader(dir + "node.txt");
NodeSettings = new Dictionary();
while (!sr.EndOfStream)
@@ -237,7 +237,8 @@ namespace FireWallet
{
int timeout = Convert.ToInt32(NodeSettings["Timeout"]);
httpClient.Timeout = TimeSpan.FromSeconds(timeout);
- } else httpClient.Timeout = TimeSpan.FromSeconds(10);
+ }
+ else httpClient.Timeout = TimeSpan.FromSeconds(10);
if (NodeSettings.ContainsKey("HSD"))
{
@@ -780,8 +781,6 @@ namespace FireWallet
buttonRedeemAll.Visible = true;
buttonSendAll.Visible = true;
}
-
-
if (WatchOnly)
{
buttonAddressVerify.Visible = true;
@@ -1185,14 +1184,9 @@ namespace FireWallet
if (hideScreen)
{
HSDProcess.StartInfo.RedirectStandardError = true;
- // Log errors to AddLog
HSDProcess.ErrorDataReceived += (sender, e) => AddLog("HSD Error: " + e.Data);
-
- }
- else
- {
- HSDProcess.StartInfo.RedirectStandardError = false;
}
+ else HSDProcess.StartInfo.RedirectStandardError = false;
HSDProcess.StartInfo.RedirectStandardInput = true;
HSDProcess.StartInfo.RedirectStandardOutput = false;
@@ -1259,10 +1253,7 @@ namespace FireWallet
await Task.Delay(1000);
}
- if (splash)
- {
- ss.CloseSplash();
- }
+ if (splash) ss.CloseSplash();
this.Enabled = true;
this.Visible = true;
return true;
@@ -1282,10 +1273,7 @@ namespace FireWallet
JObject resp = JObject.Parse(APIresponse);
return resp["address"].ToString();
}
- catch
- {
- return "Error";
- }
+ catch { return "Error"; }
}
private async void GetTXHistory()
@@ -2627,6 +2615,6 @@ namespace FireWallet
}
#endregion
-
+
}
}
\ No newline at end of file
diff --git a/FireWalletSetup/FireWalletSetup.vdproj b/FireWalletSetup/FireWalletSetup.vdproj
index 51febf7..1c4b3bd 100644
--- a/FireWalletSetup/FireWalletSetup.vdproj
+++ b/FireWalletSetup/FireWalletSetup.vdproj
@@ -224,15 +224,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:FireWallet"
- "ProductCode" = "8:{C118B90C-B5A0-4015-B03A-FB226DC02F54}"
- "PackageCode" = "8:{FF49B317-BBC1-40D9-9AFF-315E3AEED79C}"
+ "ProductCode" = "8:{E636567F-DDA4-4C6E-89B0-38DC64FD5528}"
+ "PackageCode" = "8:{AEAF1ABA-01E0-4A71-A8CC-0D6DDA44E907}"
"UpgradeCode" = "8:{0C86F725-6B01-4173-AA05-3F0EDF481362}"
"AspNetVersion" = "8:"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:3.3"
+ "ProductVersion" = "8:3.4"
"Manufacturer" = "8:Nathan.Woodburn/"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:https://l.woodburn.au/discord"