Merge branch 'main' into main

PRIVACY.md

@@ -5,7 +5,7 @@ Last modified: January 24, 2024
 Introduction
 ============
 
-	Cake Labs LLC ("Cake Labs", "Company", or "We") respect your privacy and are committed to protecting it through our compliance with this policy.
+	Cake Labs LLC ("Cake Labs", "Company", or "We") respects your privacy and are committed to protecting it through our compliance with this policy.
 
 	This policy describes the types of information we may collect from you or that you may provide when you use the App (our "App") and our practices for collecting, using, maintaining, protecting, and disclosing that information.
 
@@ -13,7 +13,7 @@ Introduction
 		- On this App.
 		- In email, text, and other electronic messages between you and this App.
 	It does not apply to information collected by:
-		- Us offline or through any other means, including on any other App operated by Company or any third party (including our affiliates and subsidiaries); or 
+		- Us offline or through any other means, including on any other App operated by the Company or any third party (including our affiliates and subsidiaries); or 
 		- Any third party (including our affiliates and subsidiaries), including through any application or content (including advertising) that may link to or be accessible from or on the App.
 	Please read this policy carefully to understand our policies and practices regarding your information and how we will treat it. If you do not agree with our policies and practices, you have the choice to not use the App. By accessing or using this App, you agree to this privacy policy. This policy may change from time to time. Your continued use of this App after we make changes is deemed to be acceptance of those changes, so please check the policy periodically for updates.
 

README.md

@@ -18,7 +18,7 @@
 
 # Cake Wallet
 
-[Cake Wallet](https://cakewallet.com) is an open source, non-custodial, and private multi-currency crypto wallet for Android, iOS, macOS, and Linux.
+[Cake Wallet](https://cakewallet.com) is an open-source, non-custodial, and private multi-currency crypto wallet for Android, iOS, macOS, and Linux.
 
 Cake Wallet includes support for several cryptocurrencies, including:
 * Monero (XMR)
@@ -44,7 +44,7 @@ Cake Wallet includes support for several cryptocurrencies, including:
 * Create several wallets
 * Select your own custom nodes/servers
 * Address book
-* Backup to external location or iCloud
+* Backup to an external location or iCloud
 * Send to OpenAlias, Unstoppable Domains, Yats, and FIO Crypto Handles
 * Set desired network fee level
 * Store local transaction notes
@@ -161,7 +161,7 @@ The only parts to be translated, if needed, are the values m and s after the var
 
 4. Add the language to `lib/entities/language_service.dart` under both `supportedLocales` and `localeCountryCode`. Use the name of the language in the local language and in English in parentheses after for `supportedLocales`. Use the [ISO 3166-1 alpha-3 code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) for `localeCountryCode`. You must choose one country, so choose the country with the most native speakers of this language or is otherwise best associated with this language.
 
-5. Add a relevant flag to `assets/images/flags/XXXX.png`, replacing XXXX with the 3 letters localeCountryCode. The image must be 42x26 pixels with a 3 pixels of transparent margin on all 4 sides. You can resize the flag with [paint.net](https://www.getpaint.net/) to 36x20 pixels, expand the canvas to 42x26 pixels with the flag anchored in the middle, and then manually delete the 3 pixels on each side to make transparent. Or you can use another program like Photoshop.
+5. Add a relevant flag to `assets/images/flags/XXXX.png`, replacing XXXX with the 3 letters localeCountryCode. The image must be 42x26 pixels with 3 pixels of transparent margin on all 4 sides. You can resize the flag with [paint.net](https://www.getpaint.net/) to 36x20 pixels, expand the canvas to 42x26 pixels with the flag anchored in the middle, and then manually delete the 3 pixels on each side to make it transparent. Or you can use another program like Photoshop.
 
 6. Add the new language code to `tool/utils/translation/translation_constants.dart`
 

SECURITY.md

@@ -9,4 +9,4 @@ If you need to report a vulnerability, please either:
 
 ## Supported Versions
 
-As we don't maintain prevoius versions of the app, only the latest release for each platform is supported and any updates will bump the version number.
+As we don't maintain previous versions of the app, only the latest release for each platform is supported and any updates will bump the version number.

build-guide-linux.md

@@ -55,7 +55,7 @@ Need to install flutter. For this please check section [How to install flutter o
 
 ### 3. Verify Installations
 
-Verify that the Flutter have been correctly installed on your system with the following command:
+Verify that the Flutter has been correctly installed on your system with the following command:
 
 `$ flutter doctor`
 
@@ -163,7 +163,7 @@ And then export bundle:
 
 `$ flatpak build-bundle export cake_wallet.flatpak com.cakewallet.CakeWallet`
 
-Result file: `cake_wallet.flatpak` should be generated in current directory.
+Result file: `cake_wallet.flatpak` should be generated in the current directory.
 
 For install generated flatpak file use:
 

cw_bitcoin/lib/electrum.dart

@@ -124,6 +124,7 @@ class ElectrumClient {
         final errorMsg = error.toString();
         print(errorMsg);
         unterminatedString = '';
+        socket = null;
       },
       onDone: () {
         print("SOCKET CLOSED!!!!!");
@@ -132,6 +133,7 @@ class ElectrumClient {
           if (host == socket?.address.host || socket == null) {
             _setConnectionStatus(ConnectionStatus.disconnected);
             socket?.destroy();
+            socket = null;
           }
         } catch (e) {
           print("onDone: $e");