From 7c4ef0aabff6aafb22d44d99a23811337fe862b1 Mon Sep 17 00:00:00 2001 From: S74nk0 Date: Tue, 21 Jun 2022 10:10:55 +0200 Subject: [PATCH] NiceHash Mining addr --- src/NHMCore/Nhmws/V3/NHWebSocketV3.cs | 2 +- src/NHMCore/Nhmws/V4/NHWebSocketV4.cs | 2 +- .../Validators/BtcWorkerValidator.cs | 2 +- .../Views/Common/EnterWalletDialog.xaml | 6 +- .../Views/Common/EnterWalletDialogDemo.xaml | 14 +- .../Views/Dashboard/Dashboard.xaml | 2 +- src/NiceHashMiner/Views/DemoBTCNotice.xaml | 7 +- .../Views/Login/LoginWindow.xaml | 2 +- src/NiceHashMiner/translations.json | 192 +----------------- 9 files changed, 21 insertions(+), 208 deletions(-) diff --git a/src/NHMCore/Nhmws/V3/NHWebSocketV3.cs b/src/NHMCore/Nhmws/V3/NHWebSocketV3.cs index 269271df4..8b32122bd 100644 --- a/src/NHMCore/Nhmws/V3/NHWebSocketV3.cs +++ b/src/NHMCore/Nhmws/V3/NHWebSocketV3.cs @@ -506,7 +506,7 @@ private static async Task miningSetUsername(string btc) return userSetResult switch { NhmwsSetResult.CHANGED => true, // we return executed - NhmwsSetResult.INVALID => throw new RpcException("Bitcoin address invalid", ErrorCode.InvalidUsername), + NhmwsSetResult.INVALID => throw new RpcException("Mining Address invalid", ErrorCode.InvalidUsername), NhmwsSetResult.NOTHING_TO_CHANGE => throw new RpcException($"Nothing to change btc \"{btc}\" already set", ErrorCode.RedundantRpc), _ => throw new RpcException($"", ErrorCode.InternalNhmError), }; diff --git a/src/NHMCore/Nhmws/V4/NHWebSocketV4.cs b/src/NHMCore/Nhmws/V4/NHWebSocketV4.cs index 092c35f0d..4a7a79bc1 100644 --- a/src/NHMCore/Nhmws/V4/NHWebSocketV4.cs +++ b/src/NHMCore/Nhmws/V4/NHWebSocketV4.cs @@ -435,7 +435,7 @@ private static async Task miningSetUsername(string btc) return userSetResult switch { NhmwsSetResult.CHANGED => true, // we return executed - NhmwsSetResult.INVALID => throw new RpcException("Bitcoin address invalid", ErrorCode.InvalidUsername), + NhmwsSetResult.INVALID => throw new RpcException("Mining address invalid", ErrorCode.InvalidUsername), NhmwsSetResult.NOTHING_TO_CHANGE => throw new RpcException($"Nothing to change btc \"{btc}\" already set", ErrorCode.RedundantRpc), _ => throw new RpcException($"", ErrorCode.InternalNhmError), }; diff --git a/src/NiceHashMiner/Validators/BtcWorkerValidator.cs b/src/NiceHashMiner/Validators/BtcWorkerValidator.cs index 10fc921f6..142a00e19 100644 --- a/src/NiceHashMiner/Validators/BtcWorkerValidator.cs +++ b/src/NiceHashMiner/Validators/BtcWorkerValidator.cs @@ -16,7 +16,7 @@ public override ValidationResult Validate(string value, CultureInfo cultureInfo) if (result == NhmwsSetResult.INVALID) { - return new ValidationResult(false, Translations.Tr("Invalid Bitcoin address! {0} will start mining in DEMO mode. In the DEMO mode, you can test run the miner and be able see how much you can earn using your computer. Would you like to continue in DEMO mode?\n\nDISCLAIMER: YOU WILL NOT EARN ANYTHING DURING DEMO MODE!", NHMProductInfo.Name)); + return new ValidationResult(false, Translations.Tr("Invalid address! {0} will start mining in DEMO mode. In the DEMO mode, you can test run the miner and be able see how much you can earn using your computer. Would you like to continue in DEMO mode?\n\nDISCLAIMER: YOU WILL NOT EARN ANYTHING DURING DEMO MODE!", NHMProductInfo.Name)); } return ValidationResult.ValidResult; diff --git a/src/NiceHashMiner/Views/Common/EnterWalletDialog.xaml b/src/NiceHashMiner/Views/Common/EnterWalletDialog.xaml index c949ccb4c..0974e5050 100644 --- a/src/NiceHashMiner/Views/Common/EnterWalletDialog.xaml +++ b/src/NiceHashMiner/Views/Common/EnterWalletDialog.xaml @@ -77,13 +77,13 @@ VerticalAlignment="Stretch" HorizontalAlignment="Left" Margin="24,0,0,0" - Text="Wallet"/> + Text="Mining Address"/> + Text="Mining Address"/> - How to create a Wallet Address? + How to create a Mining Address?