Skip to content

Commit

Permalink
Merge branch 'development' into dev/feat/MOB-1956-Sending-Non-Native-…
Browse files Browse the repository at this point in the history
…Tokens

* development:
  MOB-1892 - Fixed domain profile records editing UI behaviour (#506)
  MOB-1969 Check new wallet connect (#505)
  Added Solana to the list of supported tokens copy
  MOB-1979 - Adjusted home screen copies and numbers formatting (#504)
  MOB-1961 - Send crypto fixes (#502)
  MOB-1975 - Fixed issue when hidden crypto session could disappear (#501)
  MOB-1974 - Fixed issue when empty space wasn't clickable when select crypto row (#500)
  removed Mumbai, Goerli, Rinkby (#499)
  MOB-1961 - Use only address from domain records when sending the crypto (#497)
  MOB-1791 - Fixed incorrect pull up height (#498)
  MOB-1968 - Fixed refresh badges functionality (#494)
  MOB-1891 - Updated SDKs to cover PrivacyInfo requirement (#491)
  MOB-1967 - Fixed unblock chat functionality (#493)
  MOB-1966 - Fixed issue when chat shows empty state if user has requests only (#492)
  MOB-1963 - Added empty state to activity screen (#489)
  • Loading branch information
rommex committed Apr 19, 2024
2 parents 99e2908 + 5f72acd commit b908104
Show file tree
Hide file tree
Showing 58 changed files with 471 additions and 642 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//

import Foundation
import XMTP
import XMTPiOS

struct XMTPPushNotificationsExtensionHelper {
struct NotificationDisplayInfo {
Expand All @@ -32,13 +32,13 @@ struct XMTPPushNotificationsExtensionHelper {

let conversationData = AppGroupsBridgeService.shared.getXMTPConversationDataFor(topic: topic,
userWallet: wallet)
let conversationContainer: XMTP.ConversationContainer = try decodeConversationData(from: conversationData)
let conversationContainer: XMTPiOS.ConversationContainer = try decodeConversationData(from: conversationData)
let conversation = conversationContainer.decode(with: client)
address = conversation.peerAddress

guard AppGroupsBridgeService.shared.getXMTPBlockedUsersList().first(where: { $0.userId == data.toAddress && $0.blockedAddress == conversation.peerAddress }) == nil else { return nil } // Ignore notification from blocked user

let envelope = XMTP.Envelope.with { envelope in
let envelope = XMTPiOS.Envelope.with { envelope in
envelope.message = encryptedMessageData
envelope.contentTopic = topic
}
Expand Down Expand Up @@ -82,17 +82,17 @@ private extension XMTPPushNotificationsExtensionHelper {
}

static func getClientFor(wallet: String,
env: XMTPEnvironment) async throws -> XMTP.Client {
env: XMTPEnvironment) async throws -> XMTPiOS.Client {
if let keysData = KeychainXMTPKeysStorage.instance.getKeysDataFor(identifier: wallet, env: env) {
return try await createClientUsing(keysData: keysData, env: env)
}
throw XMTPPushNotificationError.noClientKeys
}

static func createClientUsing(keysData: Data,
env: XMTPEnvironment) async throws -> XMTP.Client {
env: XMTPEnvironment) async throws -> XMTPiOS.Client {
let keys = try PrivateKeyBundle(serializedData: keysData)
let client = try await XMTP.Client.from(bundle: keys,
let client = try await XMTPiOS.Client.from(bundle: keys,
options: .init(api: .init(env: env,
appVersion: XMTPServiceSharedHelper.getXMTPVersion())))
return client
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,10 @@ extension NetworkService {
walletBalance: MockEntitiesFabric.DomainProfile.createPublicProfileWalletBalances())
}

public func refreshDomainBadges(for domain: DomainItem) async throws -> RefreshBadgesResponse {
.init(ok: true, refresh: true, next: Date())
public func refreshDomainBadges(for domain: DomainItem) async throws {

}

public func fetchBadgesInfo(for domain: DomainItem) async throws -> BadgesInfo {
try await fetchBadgesInfo(for: domain.name)
}
Expand Down
58 changes: 36 additions & 22 deletions unstoppable-ios-app/domains-manager-ios.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Loading

0 comments on commit b908104

Please sign in to comment.