From b2993c5f70d7b0e846509eb40764d0ea393407ec Mon Sep 17 00:00:00 2001 From: Kerry Washington Date: Mon, 28 Nov 2022 16:10:49 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80[Release=20v3.10.1]=20Merge=20into?= =?UTF-8?q?=20Develop=20(#162)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🚀[Release v3.10.0] Merge into Main (#136) * 🦺[Techdebt] fix firebase (#115) * Update firebase config auto clean up strings - version bump - Commented out debug FB file * Checked the version is sending FB data - bump build number * 🥳[Techdebt] relayout address view controller (#120) * Successfully placed in UIHosting Address Updated the strings file * Added event * added delay - used for animating U Domain * Added function of subviews in SendViewController Layout is updated * Adding the function to the send Cleaned up and wired up Cells - UD View/Model - Send Address View/Model Reset the amount Label in SendViewController * Refactored SendButton - Using UIHostingViewController * Successfully send LTC -WIP: fix white space * Refactored the layout of the send button * buiid bump (#125) * [Techdebt] ci cd refactor (#132) * Removed flaky tests * build bump * build bump * removed unused file - build bump * build bump * fixed scan QR (#130) * fixed scan QR * update gitignore * Feature/add bitrefill new (#134) * Added llocalView - added bitrefill - basic function is available - build bump * bump * added basic web widget * updated logo * build bump * changed the Bitrefill link - build bump * pre-bump version - to get a binary to TestFlight * build bump * build bump again * Clean up background * build bump * 🦺[Techdebt] fix firebase (#115) * Update firebase config auto clean up strings - version bump - Commented out debug FB file * Checked the version is sending FB data - bump build number * buiid bump (#125) * [Techdebt] ci cd refactor (#132) * Removed flaky tests * build bump * build bump * removed unused file - build bump * build bump * fixed scan QR (#130) * fixed scan QR * update gitignore * Feature/add bitrefill new (#134) * Added llocalView - added bitrefill - basic function is available - build bump * bump * added basic web widget * updated logo * build bump * changed the Bitrefill link - build bump * pre-bump version - to get a binary to TestFlight * 🚀[Release v3.10.0] Merge into Develop (#135) * 🦺[Techdebt] fix firebase (#115) * Update firebase config auto clean up strings - version bump - Commented out debug FB file * Checked the version is sending FB data - bump build number * 🥳[Techdebt] relayout address view controller (#120) * Successfully placed in UIHosting Address Updated the strings file * Added event * added delay - used for animating U Domain * Added function of subviews in SendViewController Layout is updated * Adding the function to the send Cleaned up and wired up Cells - UD View/Model - Send Address View/Model Reset the amount Label in SendViewController * Refactored SendButton - Using UIHostingViewController * Successfully send LTC -WIP: fix white space * Refactored the layout of the send button * buiid bump (#125) * [Techdebt] ci cd refactor (#132) * Removed flaky tests * build bump * build bump * removed unused file - build bump * build bump * fixed scan QR (#130) * fixed scan QR * update gitignore * Feature/add bitrefill new (#134) * Added llocalView - added bitrefill - basic function is available - build bump * bump * added basic web widget * updated logo * build bump * changed the Bitrefill link - build bump * pre-bump version - to get a binary to TestFlight * build bump * build bump again * Clean up background * build bump * 🚧[Techdebt] Firebase polish 121 (#139) * 🚀[Release v3.10.0] Merge into Main (#136) * 🦺[Techdebt] fix firebase (#115) * Update firebase config auto clean up strings - version bump - Commented out debug FB file * Checked the version is sending FB data - bump build number * 🥳[Techdebt] relayout address view controller (#120) * Successfully placed in UIHosting Address Updated the strings file * Added event * added delay - used for animating U Domain * Added function of subviews in SendViewController Layout is updated * Adding the function to the send Cleaned up and wired up Cells - UD View/Model - Send Address View/Model Reset the amount Label in SendViewController * Refactored SendButton - Using UIHostingViewController * Successfully send LTC -WIP: fix white space * Refactored the layout of the send button * buiid bump (#125) * [Techdebt] ci cd refactor (#132) * Removed flaky tests * build bump * build bump * removed unused file - build bump * build bump * fixed scan QR (#130) * fixed scan QR * update gitignore * Feature/add bitrefill new (#134) * Added llocalView - added bitrefill - basic function is available - build bump * bump * added basic web widget * updated logo * build bump * changed the Bitrefill link - build bump * pre-bump version - to get a binary to TestFlight * build bump * build bump again * Clean up background * build bump * 🦺[Techdebt] fix firebase (#115) * Update firebase config auto clean up strings - version bump - Commented out debug FB file * Checked the version is sending FB data - bump build number * 🥳[Techdebt] relayout address view controller (#120) * Successfully placed in UIHosting Address Updated the strings file * Added event * added delay - used for animating U Domain * Added function of subviews in SendViewController Layout is updated * Adding the function to the send Cleaned up and wired up Cells - UD View/Model - Send Address View/Model Reset the amount Label in SendViewController * Refactored SendButton - Using UIHostingViewController * Successfully send LTC -WIP: fix white space * Refactored the layout of the send button * buiid bump (#125) * [Techdebt] ci cd refactor (#132) * Removed flaky tests * build bump * build bump * removed unused file - build bump * build bump * fixed scan QR (#130) * fixed scan QR * update gitignore * Feature/add bitrefill new (#134) * Added llocalView - added bitrefill - basic function is available - build bump * bump * added basic web widget * updated logo * build bump * changed the Bitrefill link - build bump * pre-bump version - to get a binary to TestFlight * Create sync-mirror.yml * Changed the clone sig * Update sync-mirror.yml - added sync branches and tags * Update sync-mirror.yml refactor * Update sync-mirror.yml fixed uname * Update sync-mirror.yml * Update sync-mirror.yml * Create PubtoPrivate.yml * Update sync-mirror.yml * 🚀[Release v3.10.0] Merge into Develop (#135) * 🦺[Techdebt] fix firebase (#115) * Update firebase config auto clean up strings - version bump - Commented out debug FB file * Checked the version is sending FB data - bump build number * 🥳[Techdebt] relayout address view controller (#120) * Successfully placed in UIHosting Address Updated the strings file * Added event * added delay - used for animating U Domain * Added function of subviews in SendViewController Layout is updated * Adding the function to the send Cleaned up and wired up Cells - UD View/Model - Send Address View/Model Reset the amount Label in SendViewController * Refactored SendButton - Using UIHostingViewController * Successfully send LTC -WIP: fix white space * Refactored the layout of the send button * buiid bump (#125) * [Techdebt] ci cd refactor (#132) * Removed flaky tests * build bump * build bump * removed unused file - build bump * build bump * fixed scan QR (#130) * fixed scan QR * update gitignore * Feature/add bitrefill new (#134) * Added llocalView - added bitrefill - basic function is available - build bump * bump * added basic web widget * updated logo * build bump * changed the Bitrefill link - build bump * pre-bump version - to get a binary to TestFlight * build bump * build bump again * Clean up background * build bump * build bump -clean up strings file - Udpated to iOS 14.0 as a target https://www.statista.com/statistics/1118925/mobile-apple-ios-version-share-worldwide/ * Removed cruft * Updated the Firebase constants - changed it to lowercase * updated links * fixed constants -build bump * Mark unused code (#147) * Added and modified a ruby script that shows a warining if a class, function or variable is not used * Fixed static function partnersDataArray * Updated build number * build bump * clean up duplicate scripts * readded "Send.UnstoppableDomains.udSystemError" = "System lookup problem. [Error: %2$d]"; -bumped the version and build to test Bitrise * fixed today extension version and build number * fixed coding norm (space after colon) - fixed Turkish - Italian mixup - version bump --- loafwallet.xcodeproj/project.pbxproj | 52 ++++++------------- loafwallet/PartnerData.swift | 4 +- .../src/Strings/en.lproj/Localizable.strings | 2 +- .../src/Strings/it.lproj/Localizable.strings | 2 +- .../src/Strings/tr.lproj/Localizable.strings | 2 +- 5 files changed, 21 insertions(+), 41 deletions(-) diff --git a/loafwallet.xcodeproj/project.pbxproj b/loafwallet.xcodeproj/project.pbxproj index b723d17f6..02b6c7352 100644 --- a/loafwallet.xcodeproj/project.pbxproj +++ b/loafwallet.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -3735,7 +3735,6 @@ 75A2A8031DA5935F00A983D8 /* Embed App Extensions */, 22A9A9831DF63288000F0016 /* Embed Frameworks */, C3A3FFB526FE46E8000FE955 /* Mark Dev Notes */, - 58A9FE4829191E4700B75825 /* Check for unused code */, 58A9FE4C291BC37400B75825 /* Count number of swift lines */, A8B781CCE67F374858723014 /* [CP] Embed Pods Frameworks */, ); @@ -3985,25 +3984,6 @@ shellPath = /bin/sh; shellScript = "## This only notates strings that have yet to be localized. The Base Localizable file is wnere the change needs to be changed.\n\nif which bartycrouch > /dev/null; then\n bartycrouch update -x\n bartycrouch lint -x\nelse\n echo \"warning: BartyCrouch not installed, download it from https://github.com/Flinesoft/BartyCrouch\"\nfi\n"; }; - 58A9FE4829191E4700B75825 /* Check for unused code */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Check for unused code"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "file=\"unused.rb\"\nif [ -f \"$file\" ]\nthen\necho \"$file found.\"\nruby unused.rb xcode\nelse\necho \"unused.rb doesn't exist\"\nfi\n"; - }; 58A9FE4C291BC37400B75825 /* Count number of swift lines */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -4806,7 +4786,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = loafwallet/loafwallet.entitlements; - CURRENT_PROJECT_VERSION = 418; + CURRENT_PROJECT_VERSION = 423; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ZV7987N2ZC; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; @@ -4816,12 +4796,12 @@ "$(inherited)", ); INFOPLIST_FILE = "$(SRCROOT)/loafwallet/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.10.0; + MARKETING_VERSION = 3.10.2; OTHER_SWIFT_FLAGS = "-DDebug $(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.litecoin.loafwallet; PRODUCT_MODULE_NAME = loafwallet; @@ -4914,7 +4894,7 @@ CODE_SIGN_ENTITLEMENTS = TodayExtension/TodayExtension.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 401; + CURRENT_PROJECT_VERSION = 423; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ZV7987N2ZC; INFOPLIST_FILE = TodayExtension/Info.plist; @@ -4924,7 +4904,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 3.10.0; + MARKETING_VERSION = 3.10.2; PRODUCT_BUNDLE_IDENTIFIER = com.litecoin.loafwallet.TodayExtension; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -5226,7 +5206,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = loafwallet/loafwallet.entitlements; - CURRENT_PROJECT_VERSION = 418; + CURRENT_PROJECT_VERSION = 423; DEVELOPMENT_TEAM = ZV7987N2ZC; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( @@ -5235,12 +5215,12 @@ "$(inherited)", ); INFOPLIST_FILE = "$(SRCROOT)/loafwallet/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.10.0; + MARKETING_VERSION = 3.10.2; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.litecoin.loafwallet; PRODUCT_MODULE_NAME = loafwallet; @@ -5257,7 +5237,7 @@ CODE_SIGN_ENTITLEMENTS = TodayExtension/TodayExtension.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 401; + CURRENT_PROJECT_VERSION = 423; DEVELOPMENT_TEAM = ZV7987N2ZC; INFOPLIST_FILE = TodayExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -5266,7 +5246,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 3.10.0; + MARKETING_VERSION = 3.10.2; PRODUCT_BUNDLE_IDENTIFIER = com.litecoin.loafwallet.TodayExtension; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -5358,7 +5338,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = loafwallet/loafwallet.entitlements; - CURRENT_PROJECT_VERSION = 418; + CURRENT_PROJECT_VERSION = 423; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ZV7987N2ZC; FRAMEWORK_SEARCH_PATHS = ( @@ -5367,12 +5347,12 @@ "$(inherited)", ); INFOPLIST_FILE = "$(SRCROOT)/loafwallet/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.10.0; + MARKETING_VERSION = 3.10.2; OTHER_SWIFT_FLAGS = "-DDebug -DTestnet $(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.litecoin.loafwallet; PRODUCT_MODULE_NAME = loafwallet; @@ -5390,7 +5370,7 @@ CODE_SIGN_ENTITLEMENTS = TodayExtension/TodayExtension.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 401; + CURRENT_PROJECT_VERSION = 423; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ZV7987N2ZC; INFOPLIST_FILE = TodayExtension/Info.plist; @@ -5400,7 +5380,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 3.10.0; + MARKETING_VERSION = 3.10.2; PRODUCT_BUNDLE_IDENTIFIER = com.litecoin.loafwallet.TodayExtension; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/loafwallet/PartnerData.swift b/loafwallet/PartnerData.swift index a2ab31c9e..6a96ac72d 100644 --- a/loafwallet/PartnerData.swift +++ b/loafwallet/PartnerData.swift @@ -27,8 +27,8 @@ struct Partner { let bitrefill = Partner(logo: UIImage(named: "bitrefillLogo")!, headerTitle: S.BuyCenter.Cells.bitrefillTitle, details: S.BuyCenter.Cells.bitrefillFinancialDetails) let moonpay = Partner(logo: UIImage(named: "moonpay-logo")!, headerTitle: S.BuyCenter.Cells.moonpayTitle, details: S.BuyCenter.Cells.moonpayFinancialDetails) let simplex = Partner(logo: UIImage(named: "simplexLogo")!, headerTitle: S.BuyCenter.Cells.simplexTitle, details: S.BuyCenter.Cells.simplexFinancialDetails) - + return [bitrefill, moonpay, simplex] - } + } } diff --git a/loafwallet/src/Strings/en.lproj/Localizable.strings b/loafwallet/src/Strings/en.lproj/Localizable.strings index 4226e319a..6310f01bd 100644 --- a/loafwallet/src/Strings/en.lproj/Localizable.strings +++ b/loafwallet/src/Strings/en.lproj/Localizable.strings @@ -974,7 +974,7 @@ "Send.UnstoppableDomains.simpleplaceholder" = "Enter domain"; /* UDSystemError */ -"Send.UnstoppableDomains.udSystemError" = "System lookup problem. [Error:%2$d]"; +"Send.UnstoppableDomains.udSystemError" = "System lookup problem. [Error: %2$d]"; /* Adress already used alert message - first part */ "Send.UsedAddress.firstLine" = "Litecoin addresses are intended for single use only."; diff --git a/loafwallet/src/Strings/it.lproj/Localizable.strings b/loafwallet/src/Strings/it.lproj/Localizable.strings index 5015a80aa..19141060a 100755 --- a/loafwallet/src/Strings/it.lproj/Localizable.strings +++ b/loafwallet/src/Strings/it.lproj/Localizable.strings @@ -974,7 +974,7 @@ "Send.UnstoppableDomains.simpleplaceholder" = "Inserisci dominio"; /* UDSystemError */ -"Send.UnstoppableDomains.udSystemError" = "Problema di ricerca nel sistema. [Errore: %2$d]"; +"Send.UnstoppableDomains.udSystemError" = "Problema di ricerca del sistema. [Errore: %2$d]"; /* Adress already used alert message - first part */ "Send.UsedAddress.firstLine" = "Gli indirizzi Litecoin dovrebbero essere utilizzati una sola volta."; diff --git a/loafwallet/src/Strings/tr.lproj/Localizable.strings b/loafwallet/src/Strings/tr.lproj/Localizable.strings index 8352a1ada..ad9af7f7c 100644 --- a/loafwallet/src/Strings/tr.lproj/Localizable.strings +++ b/loafwallet/src/Strings/tr.lproj/Localizable.strings @@ -974,7 +974,7 @@ "Send.UnstoppableDomains.simpleplaceholder" = "Alan adını girin"; /* UDSystemError */ -"Send.UnstoppableDomains.udSystemError" = "Sistem arama sorunu. [Hata:%2$d]"; +"Send.UnstoppableDomains.udSystemError" = "Sistem arama sorunu. [Hata: %2$d]"; /* Adress already used alert message - first part */ "Send.UsedAddress.firstLine" = "Litecoin adresleri tek kullanımlıktır.";