Merge pull request #1469 from onflow/develop

Merge2.4.12

Author: lmcmz

FRW.xcodeproj/project.pbxproj

@@ -9248,7 +9248,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
-				MARKETING_VERSION = 2.4.11;
+				MARKETING_VERSION = 2.4.13;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -9306,7 +9306,8 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
-				MARKETING_VERSION = 2.4.11;
+        
+				MARKETING_VERSION = 2.4.13;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;

FRW/Modules/Browser/Model/FCLScripts.swift

@@ -282,7 +282,7 @@ extension FCLScripts {
             SignatureReplacement: hex,
             KeyIDReplacement: "\(keyId)",
         ]
-        return FCLScripts.signMessageResponse.replace(by: dict)
+        return FCLScripts.signMessageResponse.replace(from: dict)
     }
 
     static func generateAuthnResponse(

FRW/Modules/Wallet/TokenDetail/TokenDetailViewModel.swift

@@ -6,10 +6,10 @@
 //
 
 import Combine
+import Factory
 import Flow
 import SwiftUI
 import SwiftUICharts
-import Factory
 
 extension TokenDetailView {
     struct Quote: Codable {
@@ -139,6 +139,7 @@ class TokenDetailViewModel: ObservableObject {
 
     @Injected(\.wallet)
     private var wallet: WalletManager
+
     // MARK: Internal
 
     @Published
@@ -179,7 +180,7 @@ class TokenDetailViewModel: ObservableObject {
     var showSheet: Bool = false
     var buttonAction: TokenDetailViewModel.Action = .none
 
-    // Only show storage info when it's flow token under flow account 
+    // Only show storage info when it's flow token under flow account
     var showStorageView: Bool { token.isFlowCoin && wallet.selectedAccount?.type == .main }
 
     var isTokenDetailsButtonEnabled: Bool { token.website.isNotNullNorEmpty }
@@ -478,7 +479,7 @@ extension TokenDetailViewModel {
                     address: WalletManager.shared.getPrimaryWalletAddress() ?? "",
                     limit: 3,
                     after: "",
-                    token: self.token.contractId
+                    token: self.token.identifier ?? self.token.contractId
                 )
                 let response: TransfersResponse = try await Network
                     .request(FRWAPI.Account.tokenTransfers(request))

FRW/Services/Network/FRW/FRWAPI+Account.swift

@@ -28,7 +28,7 @@ extension FRWAPI.Account: TargetType, AccessTokenAuthorizable {
 
     var baseURL: URL {
         switch self {
-        case .evmTransfers(let transfersRequest):
+        case .evmTransfers, .transfers, .tokenTransfers:
             return Config.get(.lilicoWeb)
         default:
             return Config.get(.lilico)
@@ -40,10 +40,10 @@ extension FRWAPI.Account: TargetType, AccessTokenAuthorizable {
         case .flowScanQuery:
             return "/v2/account/query"
         case .transfers:
-            return "/v1/account/transfers"
+            return "v1/account/transfers"
         case .tokenTransfers:
-            return "/v1/account/tokentransfers"
-        case .evmTransfers(let model):
+            return "v1/account/token-transfers"
+        case let .evmTransfers(model):
             return "v2/evm/\(model.address)/transactions"
         }
     }
@@ -222,7 +222,8 @@ extension FRWAPI.Account {
         var results = [FlowScanTransaction]()
         for edge in edges {
             if let transaction = edge?.node?.transaction, transaction.hash != nil,
-               transaction.time != nil {
+               transaction.time != nil
+            {
                 results.append(transaction)
             }
         }