From 7e3d6030655660aea55b3f525deb5c4911f77769 Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Mon, 11 Mar 2024 13:18:50 -0400 Subject: [PATCH 1/5] OPS: Resolve redundancy --- ios/BlueWallet.xcodeproj/project.pbxproj | 16 ++++------- ios/Podfile | 3 -- ios/Podfile.lock | 3 +- package-lock.json | 36 ++++++++++++------------ 4 files changed, 24 insertions(+), 34 deletions(-) diff --git a/ios/BlueWallet.xcodeproj/project.pbxproj b/ios/BlueWallet.xcodeproj/project.pbxproj index 8b8062d41..b2dd5577a 100644 --- a/ios/BlueWallet.xcodeproj/project.pbxproj +++ b/ios/BlueWallet.xcodeproj/project.pbxproj @@ -92,7 +92,7 @@ B4AB225E2B02AD12001F4328 /* XMLParserDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4AB225C2B02AD12001F4328 /* XMLParserDelegate.swift */; }; B4EE583C226703320003363C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B40D4E35225841ED00428FCC /* Assets.xcassets */; }; C59F90CE0D04D3E4BB39BC5D /* libPods-BlueWalletUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F02C2F7CA3591E4E0B06EBA /* libPods-BlueWalletUITests.a */; }; - C978A716948AB7DEC5B6F677 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + C978A716948AB7DEC5B6F677 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; E5D4794B26781FC0007838C1 /* fiatUnits.json in Resources */ = {isa = PBXBuildFile; fileRef = 6DD410AD266CAF1F0087DE03 /* fiatUnits.json */; }; E5D4794C26781FC1007838C1 /* fiatUnits.json in Resources */ = {isa = PBXBuildFile; fileRef = 6DD410AD266CAF1F0087DE03 /* fiatUnits.json */; }; /* End PBXBuildFile section */ @@ -407,7 +407,7 @@ files = ( 782F075B5DD048449E2DECE9 /* libz.tbd in Frameworks */, 764B49B1420D4AEB8109BF62 /* libsqlite3.0.tbd in Frameworks */, - C978A716948AB7DEC5B6F677 /* (null) in Frameworks */, + C978A716948AB7DEC5B6F677 /* BuildFile in Frameworks */, 773E382FE62E836172AAB98B /* libPods-BlueWallet.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1031,7 +1031,7 @@ ); mainGroup = 83CBB9F61A601CBA00E9B192; packageReferences = ( - 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */, + 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode.git" */, B41B76832B66B2FF002C48D5 /* XCRemoteSwiftPackageReference "bugsnag-cocoa" */, ); productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */; @@ -1714,7 +1714,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"; @@ -1757,7 +1756,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"; @@ -1801,7 +1799,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"; @@ -1857,7 +1854,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"; @@ -2225,7 +2221,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; @@ -2276,7 +2271,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; @@ -2491,7 +2485,7 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */ = { + 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode.git" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/EFPrefix/EFQRCode.git"; requirement = { @@ -2512,7 +2506,7 @@ /* Begin XCSwiftPackageProductDependency section */ 6DFC806F24EA0B6C007B8700 /* EFQRCode */ = { isa = XCSwiftPackageProductDependency; - package = 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */; + package = 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode.git" */; productName = EFQRCode; }; B41B76842B66B2FF002C48D5 /* Bugsnag */ = { diff --git a/ios/Podfile b/ios/Podfile index 26f5ee779..c65a9bb17 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -77,9 +77,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' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index d2b0260ab..e78d0adca 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -525,7 +525,6 @@ PODS: DEPENDENCIES: - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - - Bugsnag - "BugsnagReactNative (from `../node_modules/@bugsnag/react-native`)" - BVLinearGradient (from `../node_modules/react-native-linear-gradient`) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) @@ -869,6 +868,6 @@ SPEC CHECKSUMS: SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Yoga: 76b2d5677fc9694bae53c80d0cccfc55719064a3 -PODFILE CHECKSUM: e0fda52578c203cfa975067c3570c97082471d84 +PODFILE CHECKSUM: d43800c8d806b1d14ba325886c4b71fff2938408 COCOAPODS: 1.14.3 diff --git a/package-lock.json b/package-lock.json index d9f9531e6..803fb1e31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,9 +19,9 @@ "@react-native-async-storage/async-storage": "1.22.3", "@react-native-clipboard/clipboard": "1.13.2", "@react-native-community/push-notification-ios": "1.11.0", - "@react-navigation/drawer": "6.6.12", + "@react-navigation/drawer": "6.6.13", "@react-navigation/native": "6.1.15", - "@react-navigation/native-stack": "6.9.23", + "@react-navigation/native-stack": "6.9.24", "@remobile/react-native-qrcode-local-image": "https://github.com/BlueWallet/react-native-qrcode-local-image", "@spsina/bip47": "github:BlueWallet/bip47#0a2f02c90350802f2ec93afa4e6c8843be2d687c", "aezeed": "0.0.5", @@ -6364,11 +6364,11 @@ } }, "node_modules/@react-navigation/drawer": { - "version": "6.6.12", - "resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-6.6.12.tgz", - "integrity": "sha512-0V2DzoOCxI2JivejrRxlRUTdlX+JDNymJEsPJLTQ4Aum8LsPC5Ewk+ToO8NQCl4ZyaZC7mANhnN5fYvMq1gtaQ==", + "version": "6.6.13", + "resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-6.6.13.tgz", + "integrity": "sha512-fMHucgHqY+n8cOR/GgIK6sYs/L1jnaOEiDcH4lmmPJYSDwKy+Srjl32Z5v1/OG2dzgtMyKFxz2/QfMPas8PQaA==", "dependencies": { - "@react-navigation/elements": "^1.3.27", + "@react-navigation/elements": "^1.3.28", "color": "^4.2.3", "warn-once": "^0.1.0" }, @@ -6409,11 +6409,11 @@ } }, "node_modules/@react-navigation/native-stack": { - "version": "6.9.23", - "resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-6.9.23.tgz", - "integrity": "sha512-8s/DVln/da++1IGjp+3moTKPV0c6nKmCATTflwlknqoM6/yjwy3gLrnV8Tehzib+R3dvTgkqh1bZEn0l9mFQjg==", + "version": "6.9.24", + "resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-6.9.24.tgz", + "integrity": "sha512-+UpruwDcaELmd8cGk8XUDVKFrTMN0x+FbtwNQ7if/hJKbaMg6c43rPtjtiMFX/ycYW7J3owwJ8rcCmU4M7S4Aw==", "dependencies": { - "@react-navigation/elements": "^1.3.27", + "@react-navigation/elements": "^1.3.28", "warn-once": "^0.1.0" }, "peerDependencies": { @@ -27338,11 +27338,11 @@ } }, "@react-navigation/drawer": { - "version": "6.6.12", - "resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-6.6.12.tgz", - "integrity": "sha512-0V2DzoOCxI2JivejrRxlRUTdlX+JDNymJEsPJLTQ4Aum8LsPC5Ewk+ToO8NQCl4ZyaZC7mANhnN5fYvMq1gtaQ==", + "version": "6.6.13", + "resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-6.6.13.tgz", + "integrity": "sha512-fMHucgHqY+n8cOR/GgIK6sYs/L1jnaOEiDcH4lmmPJYSDwKy+Srjl32Z5v1/OG2dzgtMyKFxz2/QfMPas8PQaA==", "requires": { - "@react-navigation/elements": "^1.3.27", + "@react-navigation/elements": "^1.3.28", "color": "^4.2.3", "warn-once": "^0.1.0" } @@ -27364,11 +27364,11 @@ } }, "@react-navigation/native-stack": { - "version": "6.9.23", - "resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-6.9.23.tgz", - "integrity": "sha512-8s/DVln/da++1IGjp+3moTKPV0c6nKmCATTflwlknqoM6/yjwy3gLrnV8Tehzib+R3dvTgkqh1bZEn0l9mFQjg==", + "version": "6.9.24", + "resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-6.9.24.tgz", + "integrity": "sha512-+UpruwDcaELmd8cGk8XUDVKFrTMN0x+FbtwNQ7if/hJKbaMg6c43rPtjtiMFX/ycYW7J3owwJ8rcCmU4M7S4Aw==", "requires": { - "@react-navigation/elements": "^1.3.27", + "@react-navigation/elements": "^1.3.28", "warn-once": "^0.1.0" } }, From ac73875d6260346954356dd87aa91f9d66e5d8d1 Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Wed, 13 Mar 2024 13:36:20 -0400 Subject: [PATCH 2/5] DEL: Unused code --- blue_modules/analytics.js | 1 - blue_modules/storage-context.js | 8 -------- class/wallets/abstract-wallet.ts | 4 ---- class/wallets/hd-aezeed-wallet.ts | 4 ---- class/wallets/hd-segwit-bech32-wallet.ts | 4 ---- class/wallets/hd-segwit-p2sh-wallet.ts | 4 ---- class/wallets/watch-only-wallet.js | 4 ---- img/hodlhodl-default-avatar.png | Bin 2012 -> 0 bytes 8 files changed, 29 deletions(-) delete mode 100644 img/hodlhodl-default-avatar.png diff --git a/blue_modules/analytics.js b/blue_modules/analytics.js index 269878ef6..e130063db 100644 --- a/blue_modules/analytics.js +++ b/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 => { diff --git a/blue_modules/storage-context.js b/blue_modules/storage-context.js index 50fbec3b3..ed2304ded 100644 --- a/blue_modules/storage-context.js +++ b/blue_modules/storage-context.js @@ -211,15 +211,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; @@ -247,20 +243,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, diff --git a/class/wallets/abstract-wallet.ts b/class/wallets/abstract-wallet.ts index cc88cb734..b6ad1ca46 100644 --- a/class/wallets/abstract-wallet.ts +++ b/class/wallets/abstract-wallet.ts @@ -167,10 +167,6 @@ export class AbstractWallet { return false; } - allowHodlHodlTrading(): boolean { - return false; - } - allowPayJoin(): boolean { return false; } diff --git a/class/wallets/hd-aezeed-wallet.ts b/class/wallets/hd-aezeed-wallet.ts index 44e1fa840..04fd2adcc 100644 --- a/class/wallets/hd-aezeed-wallet.ts +++ b/class/wallets/hd-aezeed-wallet.ts @@ -175,10 +175,6 @@ export class HDAezeedWallet extends AbstractHDElectrumWallet { return true; } - allowHodlHodlTrading() { - return true; - } - allowRBF() { return true; } diff --git a/class/wallets/hd-segwit-bech32-wallet.ts b/class/wallets/hd-segwit-bech32-wallet.ts index e86d158ed..398afce80 100644 --- a/class/wallets/hd-segwit-bech32-wallet.ts +++ b/class/wallets/hd-segwit-bech32-wallet.ts @@ -15,10 +15,6 @@ export class HDSegwitBech32Wallet extends AbstractHDElectrumWallet { return true; } - allowHodlHodlTrading() { - return true; - } - allowRBF() { return true; } diff --git a/class/wallets/hd-segwit-p2sh-wallet.ts b/class/wallets/hd-segwit-p2sh-wallet.ts index 649eff9e1..99a625f82 100644 --- a/class/wallets/hd-segwit-p2sh-wallet.ts +++ b/class/wallets/hd-segwit-p2sh-wallet.ts @@ -31,10 +31,6 @@ export class HDSegwitP2SHWallet extends AbstractHDElectrumWallet { return true; } - allowHodlHodlTrading() { - return true; - } - allowMasterFingerprint() { return true; } diff --git a/class/wallets/watch-only-wallet.js b/class/wallets/watch-only-wallet.js index 60f8955ec..a30d846c2 100644 --- a/class/wallets/watch-only-wallet.js +++ b/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'); } diff --git a/img/hodlhodl-default-avatar.png b/img/hodlhodl-default-avatar.png deleted file mode 100644 index 590a2d5ecbbe30d72b331ab5b90dc8eb936d7ca0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2012 zcmV<22P622P)%->HhzJu{*QVO)0LBRLUeJmX zdi?WVJ@!s{F`P#~02YOAD*)?!1U3E@(2W5WW8lZ%gY~|pY0`thoe!YK|26~eYNW0v z=g^b?5a2JB%7;+nm&@soX>H5iLZz<=@VypfFuc7Cc1bFu-D4~ZhH_mB| z@#OdCfS42Dod93IKI}B;3+Lo&{2Kw@TCxVRw^q$Hb(KNqLjt^&v1XUhTEaG|>1zVK z-JJIdR;r#u*BJrc2)De377N%aom~>(&45$bEWLP7fH$hltOg8O1EL_nw|anK#<}l^ zngHKA6s@fXjHV{Q>$|=-a?N@7k0A;0ddn!ZK@5rjuLmq!0az>Y;9CsS4i7dh5*Y)S zp=k+V^5FG$fzuAaU<7!rS)7&tHf(#XIUdZ~0hnK)|t;ZxZ0UVD2Z|}i< ztMV}Km>Y4-^kCcaaL^~fJ424nEJ?oH*!*iWU__7X;M+Md?iHaO9_)1h&-_IX(<6=1 z+Zb7VYB*g+fWN45(POju2FFH+XX63GkHLbTxqy35&7Z; z;16D7z=k}2^qsM9j;sa@#^5~uasBmW2U6WAumLu#$5j@Y%0x{MB)~Z>BOpacXU^bgWt_qpfb&b(z z0?&7m#1Wz>gmXs)y;?LV@&)p|_&n4zAPPf-fxmjTB*1$g)m9(N{&UXJ>vb`k=V+Rb z#Y{!rAgwc`X$H@C5e5NV&xPx7XbngyQP%=hRikO-tqUtj6v6ks-#vRyfcGg`6_9_p zxPvi9qw?#I^H%$`A()+jH2zNH>B zL(~b;jbm_r|Bu7~gn^GWUjG|J&wnz0Kb8f6HN^EL%E38QUF`a=5RE`x3kcCb{n6_fgX=i( zJr{o9gYQ@;llu{ZCx3%~^c1Gmh&CIr){u)S#B2zWUO+w2Rd-5hC?x?6FwX8AU2hHA z>%cpH2Cw@VPRG16RYm}oRRNig(ahhY$=^dacCPy}*Ml3M!c9)$#Ak4V=+6mQHx-&Z zT>_ntplW+Bq}&WVfEypfO-|t^kHGy-I|1vaMpIlv7E7pdF~y%z+>hWUXK=Up)0KygA@d2eCZM~KU~t0T zGJi+M@REl)wdmfHC}f$fa_AT`PoZ0KHQm>qJ=~-(#^HqBm3N=PiBInJK6+~pR&{X` za+~=WS~djbkPglrIMLBfNOwBDt>)hw0XOq8#N;hRKDKu1(puoI2QNN@ck%*ma=IJf zrbtm<`~tbSCQDi%Cptps*^kSGmW_b5Mmab~HF`y(Ui)G=!bg8a@Z|gTgDkBz7O(#S zkqyXLRu0k>%HcVrC=fmW`^Tx+haVPi{z-6KAd$X9dG*_;fa~%9Af{JjotCH?{TCvA zw*)M!;uGSec4%?=61oxK)$p7aDcYElr9d@22N%;zvPN4&_2dnf+YCvq9a(d-Lc2wP u2{4HOlL#=00FwwXi2#!bFaajDM*j!EejrnZjcwHc0000 Date: Fri, 15 Mar 2024 11:55:43 +0000 Subject: [PATCH 3/5] Translate loc/en.json in pl 100% reviewed source file: 'loc/en.json' on 'pl'. --- loc/pl.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/loc/pl.json b/loc/pl.json index 87d8af214..b157aa25d 100644 --- a/loc/pl.json +++ b/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.", From 6a1e223464468d58c1f6e79f376ef1d3a8848286 Mon Sep 17 00:00:00 2001 From: xinhangzhou Date: Wed, 13 Mar 2024 22:13:17 +0800 Subject: [PATCH 4/5] chore: fix some comments Signed-off-by: xinhangzhou --- RELEASE.md | 4 ++-- class/hd-segwit-bech32-transaction.js | 2 +- class/payjoin-transaction.js | 2 +- screen/receive/details.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index df06d6c8e..9bb745066 100644 --- a/RELEASE.md +++ b/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! diff --git a/class/hd-segwit-bech32-transaction.js b/class/hd-segwit-bech32-transaction.js index 0527f05c6..4eb3d55ca 100644 --- a/class/hd-segwit-bech32-transaction.js +++ b/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} */ diff --git a/class/payjoin-transaction.js b/class/payjoin-transaction.js index 37ee28f93..3580d741c 100644 --- a/class/payjoin-transaction.js +++ b/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.' }); } }); } diff --git a/screen/receive/details.js b/screen/receive/details.js index 128b1af5b..cb7c1d216 100644 --- a/screen/receive/details.js +++ b/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); From 6c51c4045bdfa2b381bf013c2c3034de1593e06e Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Fri, 15 Mar 2024 13:03:45 -0400 Subject: [PATCH 5/5] Update package-lock.json --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5a044ee94..92c0e1bf9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bluewallet", - "version": "6.5.9", + "version": "6.6.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "bluewallet", - "version": "6.5.9", + "version": "6.6.0", "hasInstallScript": true, "license": "MIT", "dependencies": {