Merge branch 'master' into ldk

RELEASE.md

@@ -23,6 +23,6 @@ where `76ed479` is a latest commit in this version. replace the version as well.
 * test the build on a real device. We have accounts with browserstack where you can do so.
 * its imperative that you run selftest and it gives you OK. note which build you are testing
 * go to appcenter.ms, find this exact build under `master` builds, and press `Distribute` -> `Store` -> `Production`. 
-in `Release notes` write the release, this field is to smaller than iOS, so you need to keep it bellow 500 characters.
-* now just wait till appcenter displays a message that it is succesfully distributed
+in `Release notes` write the release, this field is smaller than iOS, so you need to keep it bellow 500 characters.
+* now just wait till appcenter displays a message that it is successfully distributed
 * noice!

blue_modules/analytics.js

@@ -40,7 +40,6 @@ A.ENUM = {
   CREATED_WALLET: 'CREATED_WALLET',
   CREATED_LIGHTNING_WALLET: 'CREATED_LIGHTNING_WALLET',
   APP_UNSUSPENDED: 'APP_UNSUSPENDED',
-  NAVIGATED_TO_WALLETS_HODLHODL: 'NAVIGATED_TO_WALLETS_HODLHODL',
 };
 
 A.setOptOut = value => {

blue_modules/storage-context.js

@@ -217,15 +217,11 @@ export const BlueStorageProvider = ({ children }) => {
   const startAndDecrypt = BlueApp.startAndDecrypt;
   const encryptStorage = BlueApp.encryptStorage;
   const sleep = BlueApp.sleep;
-  const setHodlHodlApiKey = BlueApp.setHodlHodlApiKey;
-  const getHodlHodlApiKey = BlueApp.getHodlHodlApiKey;
   const createFakeStorage = BlueApp.createFakeStorage;
   const decryptStorage = BlueApp.decryptStorage;
   const isPasswordInUse = BlueApp.isPasswordInUse;
   const cachedPassword = BlueApp.cachedPassword;
   const setIsAdvancedModeEnabled = BlueApp.setIsAdvancedModeEnabled;
-  const getHodlHodlSignatureKey = BlueApp.getHodlHodlSignatureKey;
-  const addHodlHodlContract = BlueApp.addHodlHodlContract;
   const setDoNotTrack = BlueApp.setDoNotTrack;
   const isDoNotTrackEnabled = BlueApp.isDoNotTrackEnabled;
   const getItem = BlueApp.getItem;
@@ -253,20 +249,16 @@ export const BlueStorageProvider = ({ children }) => {
         fetchWalletTransactions,
         fetchAndSaveWalletTransactions,
         isStorageEncrypted,
-        getHodlHodlSignatureKey,
         encryptStorage,
         startAndDecrypt,
         cachedPassword,
-        addHodlHodlContract,
         getBalance,
         walletsInitialized,
         setWalletsInitialized,
         refreshAllWalletTransactions,
         sleep,
-        setHodlHodlApiKey,
         createFakeStorage,
         resetWallets,
-        getHodlHodlApiKey,
         decryptStorage,
         isPasswordInUse,
         setIsAdvancedModeEnabled,

class/hd-segwit-bech32-transaction.js

@@ -97,7 +97,7 @@ export class HDSegwitBech32Transaction {
   /**
    * Checks that tx belongs to a wallet and also
    * tx value is < 0, which means its a spending transaction
-   * definately initiated by us, can be RBF'ed.
+   * definitely initiated by us, can be RBF'ed.
    *
    * @returns {Promise<boolean>}
    */

class/payjoin-transaction.js

@@ -75,7 +75,7 @@ export default class PayjoinTransaction {
       if (result === '') {
         // TODO: Improve the wording of this error message
         triggerHapticFeedback(HapticFeedbackTypes.NotificationError);
-        presentAlert({ message: 'Something was wrong with the payjoin transaction, the original transaction sucessfully broadcast.' });
+        presentAlert({ message: 'Something was wrong with the payjoin transaction, the original transaction successfully broadcast.' });
       }
     });
   }

class/wallets/abstract-wallet.ts

@@ -167,10 +167,6 @@ export class AbstractWallet {
     return false;
   }
 
-  allowHodlHodlTrading(): boolean {
-    return false;
-  }
-
   allowPayJoin(): boolean {
     return false;
   }

class/wallets/hd-aezeed-wallet.ts

@@ -175,10 +175,6 @@ export class HDAezeedWallet extends AbstractHDElectrumWallet {
     return true;
   }
 
-  allowHodlHodlTrading() {
-    return true;
-  }
-
   allowRBF() {
     return true;
   }

class/wallets/hd-segwit-bech32-wallet.ts

@@ -15,10 +15,6 @@ export class HDSegwitBech32Wallet extends AbstractHDElectrumWallet {
     return true;
   }
 
-  allowHodlHodlTrading() {
-    return true;
-  }
-
   allowRBF() {
     return true;
   }

class/wallets/hd-segwit-p2sh-wallet.ts

@@ -31,10 +31,6 @@ export class HDSegwitP2SHWallet extends AbstractHDElectrumWallet {
     return true;
   }
 
-  allowHodlHodlTrading() {
-    return true;
-  }
-
   allowMasterFingerprint() {
     return true;
   }

class/wallets/watch-only-wallet.js

@@ -235,10 +235,6 @@ export class WatchOnlyWallet extends LegacyWallet {
     return this.getAddress() === address;
   }
 
-  allowHodlHodlTrading() {
-    return this.isHd();
-  }
-
   allowMasterFingerprint() {
     return this.getSecret().startsWith('zpub');
   }

ios/BlueWallet.xcodeproj/project.pbxproj

@@ -1647,7 +1647,6 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)";
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
@@ -1690,7 +1689,6 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)";
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
@@ -1734,7 +1732,6 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)";
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = WidgetsExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
@@ -1790,7 +1787,6 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)";
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = WidgetsExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
@@ -2158,7 +2154,6 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
@@ -2209,7 +2204,6 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;

ios/Podfile

@@ -71,9 +71,6 @@ post_install do |installer|
     installer,
     :mac_catalyst_enabled => true
   )
-
-  pod 'Bugsnag'
-  plugin 'cocoapods-bugsnag'
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
       config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'

loc/pl.json

@@ -4,6 +4,8 @@
     "cancel": "Anuluj",
     "continue": "Kontynuuj",
     "clipboard": "Schowek",
+    "discard_changes": "Odrzucić zmiany?",
+    "discard_changes_explain": "Masz niezapisane zmiany. Czy na pewno chcesz je porzucić i opuścić ten ekran?",
     "enter_password": "Wprowadź hasło",
     "never": "Nigdy",
     "of": "{number} z {total}",
@@ -23,7 +25,8 @@
     "pick_image": "Wybierz obrazek z biblioteki",
     "pick_file": "Wybierz plik",
     "enter_amount": "Wprowadź kwotę",
-    "qr_custom_input_button": "Tapnij 10 razy aby wprowadzić własne dane"
+    "qr_custom_input_button": "Tapnij 10 razy aby wprowadzić własne dane",
+    "unlock": "Odblokuj"
   },
   "alert": {
     "default": "Powiadomienie"
@@ -228,6 +231,7 @@
     "about_sm_twitter": "Obserwuj nas na Twitterze",
     "advanced_options": "Opcje Zaawansowane",
     "biometrics": "Biometria",
+    "biometrics_no_longer_available": "Ustawienia Twojego urządzenia zostały zmienione i nie są już zgodne z wybranymi ustawieniami bezpieczeństwa w aplikacji. Proszę ponownie włączyć biometrię lub kod dostępu, a następnie uruchomić ponownie aplikację, aby zastosować te zmiany.",
     "biom_10times": "Próbowałeś podać hasło 10 razy. Czy chcesz zresetować magazyn danych? To usunie wszystkie portfele i odszyfruje dane.",
     "biom_conf_identity": "Proszę potwierdź swoją tożsamość",
     "biom_no_passcode": "Twoje urządzenie nie ma hasła. Aby przejść dalej, skonfiguruj hasło w Ustawieniach aplikacji.",

screen/receive/details.js

@@ -161,7 +161,7 @@ const ReceiveDetails = () => {
           const balanceToShow = balance.confirmed - initialConfirmed;
 
           if (balanceToShow > 0) {
-            // address has actually more coins then initially, so we definately gained something
+            // address has actually more coins than initially, so we definitely gained something
             setShowConfirmedBalance(true);
             setShowPendingBalance(false);
             setShowAddress(false);