litecoin-foundation · kcw-grunt · Feb 27, 2024 · Aug 22, 2020 · Oct 14, 2020 · Oct 30, 2020
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 ## Litewallet related
-
 litewallet/partner-keys.plist
 litewallet/GoogleService-Info.plist
 

diff --git a/litewallet/Assets.xcassets/TabBar/Contents.json b/litewallet/Assets.xcassets/TabBar/Contents.json
@@ -3,4 +3,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}
diff --git a/litewallet/Assets.xcassets/TabBar/receiveArrowIcon.imageset/Contents.json b/litewallet/Assets.xcassets/TabBar/receiveArrowIcon.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "LW_RecieveV2.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/litewallet/Assets.xcassets/TabBar/receiveArrowIcon.imageset/LW_RecieveV2.png b/litewallet/Assets.xcassets/TabBar/receiveArrowIcon.imageset/LW_RecieveV2.png
diff --git a/litewallet/BRAPIClient+Features.swift b/litewallet/BRAPIClient+Features.swift
@@ -33,10 +33,4 @@ extension BRAPIClient {
 			}
 		}.resume()
 	}
-
-	static func featureEnabled(_ flag: BRFeatureFlags) -> Bool {
-		if E.isDebug || E.isTestFlight { return true }
-		let defaults = UserDefaults.standard
-		return defaults.bool(forKey: BRAPIClient.defaultsKeyForFeatureFlag(flag.description))
-	}
 }
diff --git a/litewallet/BRCore.swift b/litewallet/BRCore.swift
@@ -4,9 +4,6 @@ import Foundation
 typealias BRTxRef = UnsafeMutablePointer<BRTransaction>
 typealias BRBlockRef = UnsafeMutablePointer<BRMerkleBlock>
 
-// Used for convert byte array to LTC Address
-let characterLengthConstant = 75
-
 /// BRPeerManagerError: Error
 enum BRPeerManagerError: Error {
 	case posixError(errorCode: Int32, description: String)

diff --git a/litewallet/Constants/Constants+Events.swift b/litewallet/Constants/Constants+Events.swift
@@ -206,21 +206,6 @@ enum CustomEvent: String {
 	/// User tapped balance
 	case _20200207_DTHB = "did_tap_header_balance"
 
-	/// Ternio API Wallet details failure
-	case _20210405_TAWDF = "ternio_api_wallet_details_failure"
-
-	/// Ternio API Authenticate Enable 2FA change
-	case _20210804_TAA2FAC = "ternio_API_auth_2FA_change"
-
-	/// Ternio API Wallet details success
-	case _20210804_TAWDS = "ternio_API_wallet_details_success"
-
-	/// Ternio API Login
-	case _20210804_TAULI = "ternio_API_user_log_in"
-
-	/// Ternio API Logout
-	case _20210804_TAULO = "ternio_API_user_log_out"
-
 	/// Heartbeat check If event even happens
 	case _20210427_HCIEEH = "heartbeat_check_if_event_even_happens"
 
@@ -235,4 +220,7 @@ enum CustomEvent: String {
 
 	/// User signup
 	case _20240101_US = "user_signup"
+
+	/// Transactions info
+	case _20240214_TI = "transactions_info"
 }
diff --git a/litewallet/Constants/Functions.swift b/litewallet/Constants/Functions.swift
@@ -39,24 +39,16 @@ func strongify<Context: AnyObject, Arguments>(_ context: Context?, closure: @esc
 	}
 }
 
-/// Description: 1701029422
+/// Description: 1707828867
 func tieredOpsFee(amount: UInt64) -> UInt64 {
 	switch amount {
-	case 0 ..< 1_398_000:
-		return 69900
-	case 1_398_000 ..< 6_991_000:
-		return 111_910
-	case 6_991_000 ..< 27_965_000:
-		return 279_700
-	case 27_965_000 ..< 139_820_000:
-		return 699_540
-	case 139_820_000 ..< 279_653_600:
-		return 1_049_300
-	case 279_653_600 ..< 699_220_000:
-		return 1_398_800
-	case 699_220_000 ..< 1_398_440_000:
-		return 2_797_600
+	case 0 ..< 250_000_000:
+		return 350_000
+	case 250_000_000 ..< 1_000_000_000:
+		return 1_500_000
+	case _ where amount > 1_000_000_000:
+		return 3_500_000
 	default:
-		return 2_797_600
+		return 3_500_000
 	}
 }
diff --git a/litewallet/Constants/Strings.swift b/litewallet/Constants/Strings.swift
@@ -66,10 +66,6 @@ enum S {
 		}
 	}
 
-	enum Conjuction {
-		static let asOf = Localization(key: "Conjunction.asOf", value: "as of", comment: "as of a time or date")
-	}
-
 	// MARK: - Generic Button labels
 
 	enum Button {
@@ -115,7 +111,8 @@ enum S {
 		static let cameraUnavailableTitle = Localization(key: "Send.cameraUnavailableTitle", value: "Litewallet is not allowed to access the camera", comment: "Camera not allowed alert title")
 		static let cameraUnavailableMessage = Localization(key: "Send.cameraunavailableMessage", value: "Go to Settings to allow camera access.", comment: "Camera not allowed message")
 		static let balance = Localization(key: "Send.balance", value: "Balance: %1$@", comment: "Balance: $4.00")
-		static let fee = Localization(key: "Send.fees", value: "Fees: %1$@", comment: "Fees: $0.10")
+		static let networkFee = Localization(key: "Send.networkFee", value: "Network", comment: "Network")
+		static let serviceFee = Localization(key: "Send.serviceFee", value: "Service", comment: "Service")
 		static let feeBlank = Localization(key: "Send.feeBlank", value: "Fees:", comment: "Fees: ")
 		static let bareFee = Localization(key: "Send.fee", value: "Fee: %1$@", comment: "Fee: $0.01")
 		static let containsAddress = Localization(key: "Send.containsAddress", value: "The destination is your own address. You cannot send to yourself.", comment: "Warning when sending to self.")
@@ -207,7 +204,7 @@ enum S {
 		static let complete = Localization(key: "Transaction.complete", value: "Complete", comment: "Transaction complete label")
 		static let waiting = Localization(key: "Transaction.waiting", value: "Waiting to be confirmed. Some merchants require confirmation to complete a transaction. Estimated time: 1-2 hours.", comment: "Waiting to be confirmed string")
 		static let starting = Localization(key: "Transaction.starting", value: "Starting balance: %1$@", comment: "eg. Starting balance: $50.00")
-		static let fee = Localization(key: "Transaction.fee", value: "(%1$@ fee)", comment: "(b600 fee)")
+		static let fee = Localization(key: "Transaction.fee", value: "(%1$@ total fees)", comment: "(b600 fee)")
 		static let ending = Localization(key: "Transaction.ending", value: "Ending balance: %1$@", comment: "eg. Ending balance: $50.00")
 		static let exchangeOnDaySent = Localization(key: "Transaction.exchangeOnDaySent", value: "Exchange rate when sent:", comment: "Exchange rate on date header")
 		static let exchangeOnDayReceived = Localization(key: "Transaction.exchangeOnDayReceived", value: "Exchange rate when received:", comment: "Exchange rate on date header")

diff --git a/litewallet/Environment.swift b/litewallet/Environment.swift
@@ -137,18 +137,6 @@ struct E {
 		return (UIScreen.main.bounds.size.height == 812.0)
 	}
 
-	static var isIPhone8Plus: Bool {
-		return (UIScreen.main.bounds.size.height == 736.0)
-	}
-
-	static var isIPhoneXsMax: Bool {
-		return (UIScreen.main.bounds.size.height == 812.0)
-	}
-
-	static var isIPad: Bool {
-		return (UIDevice.current.userInterfaceIdiom == .pad)
-	}
-
 	static let is32Bit: Bool = {
 		MemoryLayout<Int>.size == MemoryLayout<UInt32>.size
 	}()

diff --git a/litewallet/Extensions/SafariServices+Extension.swift b/litewallet/Extensions/SafariServices+Extension.swift
@@ -23,13 +23,10 @@ struct WebView: UIViewRepresentable {
 	}
 
 	func updateUIView(_ webview: WKWebView, context _: Context) {
-		print("::: webview \(webview.frame.size)")
-
 		webview.endEditing(true)
 
 		if scrollToSignup {
 			let point = CGPoint(x: 0, y: webview.scrollView.contentSize.height - webview.frame.size.height / 2)
-			print("::: point \(point)")
 
 			webview.scrollView.setContentOffset(point, animated: true)
 			DispatchQueue.main.async {

diff --git a/litewallet/Platform/BRAPIClient.swift b/litewallet/Platform/BRAPIClient.swift
@@ -15,11 +15,6 @@ let BRAPIClientErrorDomain = "BRApiClientErrorDomain"
 	}
 }
 
-public enum BRAPIClientError: Error {
-	case malformedDataError
-	case unknownError
-}
-
 public typealias URLSessionTaskHandler = (Data?, HTTPURLResponse?, NSError?) -> Void
 public typealias URLSessionChallengeHandler = (URLSession.AuthChallengeDisposition, URLCredential?) -> Void
 

diff --git a/litewallet/Platform/BRWebViewController.swift b/litewallet/Platform/BRWebViewController.swift
@@ -8,18 +8,14 @@ import WebKit
 	var wkProcessPool: WKProcessPool
 	var webView: WKWebView?
 	var server = BRHTTPServer()
-	var debugEndpoint: String?
 	var mountPoint: String
 	var walletManager: WalletManager
 	let store: Store
 	let noAuthApiClient: BRAPIClient?
 	let partner: String?
 	let activityIndicator: UIActivityIndicatorView
 	var didLoad = false
-	var didAppear = false
-	var didLoadTimeout = 2500
-	var waitTimeout = 90
-	// we are also a socket server which sends didview/didload events to the listening client(s)
+	var didAppear = false // we are also a socket server which sends didview/didload events to the listening client(s)
 	var sockets = [String: BRWebSocket]()
 
 	// this is the data that occasionally gets sent to the above connected sockets
@@ -34,8 +30,6 @@ import WebKit
 		return URL(string: "http://127.0.0.1:\(server.port)\(mountPoint)")!
 	}
 
-	private let messageUIPresenter = MessageUIPresenter()
-
 	init(partner: String?, mountPoint: String = "/", walletManager: WalletManager, store: Store, noAuthApiClient: BRAPIClient? = nil)
 	{
 		wkProcessPool = WKProcessPool()

diff --git a/litewallet/StartView.swift b/litewallet/StartView.swift
@@ -120,14 +120,17 @@ struct StartView: View {
 							.alertMessage[startViewModel.currentLanguage.rawValue],
 							isPresented: $delayedSelect) {
 								HStack {
-									Button(S.Button.yes.localize(), role: .cancel) {
-										startViewModel.setLanguage(code: startViewModel.currentLanguage.code)
-										selectedLang = false
-									}
-									Button(S.Button.cancel.localize(), role: .destructive) {
-										// Dismisses
-										selectedLang = false
-									}
+									Button(startViewModel
+										.yesLabel[startViewModel.currentLanguage.rawValue], role: .cancel) {
+											// Changes and Dismisses
+											startViewModel.setLanguage(code: startViewModel.currentLanguage.code)
+											selectedLang = false
+										}
+									Button(startViewModel
+										.cancelLabel[startViewModel.currentLanguage.rawValue], role: .destructive) {
+											// Dismisses
+											selectedLang = false
+										}
 								}
 						}
 						Spacer()
@@ -137,7 +140,7 @@ struct StartView: View {
 							                    language: startViewModel.currentLanguage,
 							                    didTapContinue: $didContinue)
 								.environmentObject(startViewModel)
-								.navigationBarBackButtonHidden(true)
+								.navigationBarBackButtonHidden(false)
 						) {
 							ZStack {
 								RoundedRectangle(cornerRadius: bigButtonCornerRadius)
@@ -163,7 +166,7 @@ struct StartView: View {
 							                    language: startViewModel.currentLanguage,
 							                    didTapContinue: $didContinue)
 								.environmentObject(startViewModel)
-								.navigationBarBackButtonHidden(true)
+								.navigationBarBackButtonHidden(false)
 						) {
 							ZStack {
 								RoundedRectangle(cornerRadius: bigButtonCornerRadius)

diff --git a/litewallet/StartViewModel.swift b/litewallet/StartViewModel.swift
@@ -134,7 +134,7 @@ class StartViewModel: ObservableObject {
 	// MARK: - Lengthy elements
 
 	///  Set these to the bottom to make the others more readable
-
+	///   These are semi-hardcoded because the state is in flux
 	let taglines: [String] = [
 		"The most secure and easiest way to use Litecoin.",
 		"使用莱特币最安全、最简单的方式。",
@@ -168,6 +168,41 @@ class StartViewModel: ObservableObject {
 		"Dili Türkçe olarak değiştirmek istediğinizden emin misiniz?",
 		"Ви впевнені, що хочете змінити мову на українську?",
 	]
+
+	let yesLabel: [String] = [
+		"Yes",
+		"是的",
+		"是的",
+		"Oui",
+		"Ja",
+		"Ya",
+		"SÌ",
+		"はい",
+		"예",
+		"Sim",
+		"Да",
+		"Sí",
+		"Evet",
+		"Так",
+	]
+
+	let cancelLabel: [String] = [
+		"Cancel",
+		"取消",
+		"取消",
+		"Annuler",
+		"Stornieren",
+		"Membatalkan",
+		"Annulla",
+		"キャンセル",
+		"취소",
+		"Cancelar",
+		"Отмена",
+		"Cancelar",
+		"İptal etmek",
+		"Скасувати",
+	]
+
 	func stringToCurrentLanguage(languageString: String) -> LanguageSelection {
 		switch languageString {
 		case "English":

diff --git a/litewallet/Strings/Base.lproj/Localizable.strings b/litewallet/Strings/Base.lproj/Localizable.strings
@@ -460,21 +460,6 @@
 /* Upgrade PIN prompt title. */
 "Prompts.SetPin.title" = "Set PIN";
 
-/* Push notifications settings view body */
-"Notifications.body" = "Turn on notifications to receive special messages from Litewallet in the future.";
-
-/* Push notifications toggle switch label */
-"Notifications.label" = "Push Notifications";
-
-/* Push notifications are off label */
-"Notifications.off" = "Off";
-
-/* Push notifications are on label */
-"Notifications.on" = "On";
-
-/* Push notifications settings view title label */
-"Notifications.title" = "Notifications";
-
 /* Address copied message. */
 "Receive.copied" = "Copied to clipboard.";
 
@@ -1075,9 +1060,6 @@
 /* 1 of 3 */
 "WritePaperPhrase.step" = "%1$d of %2$d";
 
-/* as of a time or date */
-"Conjunction.asOf" = "as of";
-
 /* No comment provided by engineer. */
 "Copy" = "Copy";
 
@@ -1470,3 +1452,27 @@
 
 /* Fees Blank: */
 "Send.feeBlank" = "Fees:";
+
+/* Network */
+"Send.networkFee" = "Network";
+
+/* Service */
+"Send.serviceFee" = "Service";
+
+/* Signup cancel */
+"Notifications.signupCancel" = "No, thanks";
+
+/* "Email title" */
+"Notifications.emailTitle" = "Don't a miss a thing!";
+
+/* "Pitch to get user to sign up" */
+"Notifications.pitchMessage" = "Sign up to hear about updates & contests.";
+
+/* "Email address label" */
+"Notifications.emailLabel" = "Email address";
+
+/* "Email address placeholder" */
+"Notifications.emailPlaceholder" = "Enter here";
+
+/* "Language preference label" */
+"Notifications.languagePreference" = "Preferred language:";