nathanwoodburn/FireWallet
nathanwoodburn/FireWallet
1
0
Fork 0
mirror of https://github.com/Nathanwoodburn/FireWallet.git synced 2024-11-24 08:08:14 +11:00
Code Issues Packages Projects Releases Wiki Activity

main: Added checks for login without HSD connected

Browse Source
This commit is contained in:
Nathan Woodburn 2023-06-11 12:45:02 +10:00
parent 91c90136c1
commit 860000bea8
Signed by: nathanwoodburn
GPG Key ID: 203B000478AD0EF1
2 changed files with 55 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
FireWallet/MainForm.cs
View File

@ -160,10 +160,10 @@ namespace FireWallet
toolStripStatusLabelNetwork.Text = "Network: Mainnet"; toolStripStatusLabelNetwork.Text = "Network: Mainnet";
break; break;
case 1: case 1:
toolStripStatusLabelNetwork.Text = "Network: Regtest"; toolStripStatusLabelNetwork.Text = "Network: Regtest (Not Fully Tested)";
break; break;
case 2: case 2:
toolStripStatusLabelNetwork.Text = "Network: Testnet"; toolStripStatusLabelNetwork.Text = "Network: Testnet (Not Implemented)";
break; break;
} }
@ -573,6 +573,17 @@ namespace FireWallet
private async void LoginClick(object sender, EventArgs e) private async void LoginClick(object sender, EventArgs e)
{ {
// If the node isn't connected show a message
try
{
if (await APIGet("", false) == "Error")
{
NotifyForm notifyForm = new NotifyForm("Node not connected");
notifyForm.ShowDialog();
notifyForm.Dispose();
return;
}
account = comboBoxaccount.Text; account = comboBoxaccount.Text;
password = textBoxaccountpassword.Text; password = textBoxaccountpassword.Text;
bool loggedin = await Login(); bool loggedin = await Login();
@ -586,6 +597,14 @@ namespace FireWallet
buttonNavPortfolio.PerformClick(); buttonNavPortfolio.PerformClick();
} }
} }
catch (Exception ex)
{
NotifyForm notifyForm = new NotifyForm("Node not connected\n" + ex.Message);
notifyForm.ShowDialog();
notifyForm.Dispose();
return;
}
}
private void PasswordEntered(object sender, KeyEventArgs e) private void PasswordEntered(object sender, KeyEventArgs e)
{ {
@ -767,7 +786,11 @@ namespace FireWallet
decimal progress = Convert.ToDecimal(chain["progress"].ToString()); decimal progress = Convert.ToDecimal(chain["progress"].ToString());
labelSyncPercent.Text = "Sync: " + decimal.Round(progress * 100, 2) + "%"; labelSyncPercent.Text = "Sync: " + decimal.Round(progress * 100, 2) + "%";
// Exit if set to 0 TXs
if (userSettings.ContainsKey("portfolio-tx"))
{
if (userSettings["portfolio-tx"] == "0") return;
}
// Get Unconfirmed TX // Get Unconfirmed TX

22
FireWalletSetup/FireWalletSetup.vdproj
View File

@ -49,6 +49,14 @@
"PrivateKeyFile" = "8:" "PrivateKeyFile" = "8:"
"TimeStampServer" = "8:" "TimeStampServer" = "8:"
"InstallerBootstrapper" = "3:2" "InstallerBootstrapper" = "3:2"
"BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
{
"Enabled" = "11:TRUE"
"PromptEnabled" = "11:TRUE"
"PrerequisitesLocation" = "2:1"
"Url" = "8:"
"ComponentsUrl" = "8:"
}
} }
"Release" "Release"
{ {
@ -65,6 +73,14 @@
"PrivateKeyFile" = "8:" "PrivateKeyFile" = "8:"
"TimeStampServer" = "8:" "TimeStampServer" = "8:"
"InstallerBootstrapper" = "3:2" "InstallerBootstrapper" = "3:2"
"BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
{
"Enabled" = "11:TRUE"
"PromptEnabled" = "11:TRUE"
"PrerequisitesLocation" = "2:1"
"Url" = "8:"
"ComponentsUrl" = "8:"
}
} }
} }
"Deployable" "Deployable"
@ -192,15 +208,15 @@
{ {
"Name" = "8:Microsoft Visual Studio" "Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:FireWallet" "ProductName" = "8:FireWallet"
"ProductCode" = "8:{F0940C69-189F-4613-8D7C-C3C6EA9CDDA4}" "ProductCode" = "8:{5CACF936-F1E6-44FC-AE41-17BD338CD047}"
"PackageCode" = "8:{B433A157-C12E-41BA-B25E-D42F91F186DC}" "PackageCode" = "8:{1B11D93A-A6AB-4F8E-A6EA-E9C14E06314B}"
"UpgradeCode" = "8:{0C86F725-6B01-4173-AA05-3F0EDF481362}" "UpgradeCode" = "8:{0C86F725-6B01-4173-AA05-3F0EDF481362}"
"AspNetVersion" = "8:" "AspNetVersion" = "8:"
"RestartWWWService" = "11:FALSE" "RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE" "InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:2.0" "ProductVersion" = "8:2.1"
"Manufacturer" = "8:Nathan.Woodburn/" "Manufacturer" = "8:Nathan.Woodburn/"
"ARPHELPTELEPHONE" = "8:" "ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:https://l.woodburn.au/discord" "ARPHELPLINK" = "8:https://l.woodburn.au/discord"