Skip to content

Commit 2b595da

Browse files
Merge pull request #353 from Adamant-im/trello.com/c/CWnyTDnm
[trello.com/c/CWnyTDnm] No Adelina for China
2 parents 8bba0b0 + 50c3110 commit 2b595da

File tree

2 files changed

+23
-5
lines changed

2 files changed

+23
-5
lines changed

Adamant/AppDelegate.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ extension AppDelegate {
524524
unread = true
525525
}
526526

527-
if let adelina = AdamantContacts.adelina.messages["chats.welcome_message"] {
527+
if let adelina = AdamantContacts.adelina.welcomeMessage {
528528
_ = try? await chatProvider.fakeReceived(
529529
message: adelina.message,
530530
senderId: AdamantContacts.adelina.address,
@@ -535,7 +535,7 @@ extension AppDelegate {
535535
)
536536
}
537537

538-
if let exchenge = AdamantContacts.adamantExchange.messages["chats.welcome_message"] {
538+
if let exchenge = AdamantContacts.adamantExchange.welcomeMessage {
539539
_ = try? await chatProvider.fakeReceived(
540540
message: exchenge.message,
541541
senderId: AdamantContacts.adamantExchange.address,
@@ -546,7 +546,7 @@ extension AppDelegate {
546546
)
547547
}
548548

549-
if let betOnBitcoin = AdamantContacts.betOnBitcoin.messages["chats.welcome_message"] {
549+
if let betOnBitcoin = AdamantContacts.betOnBitcoin.welcomeMessage {
550550
_ = try? await chatProvider.fakeReceived(
551551
message: betOnBitcoin.message,
552552
senderId: AdamantContacts.betOnBitcoin.address,
@@ -557,7 +557,7 @@ extension AppDelegate {
557557
)
558558
}
559559

560-
if let welcome = AdamantContacts.donate.messages["chats.welcome_message"] {
560+
if let welcome = AdamantContacts.donate.welcomeMessage {
561561
_ = try? await chatProvider.fakeReceived(
562562
message: welcome.message,
563563
senderId: AdamantContacts.donate.address,
@@ -568,7 +568,7 @@ extension AppDelegate {
568568
)
569569
}
570570

571-
if let welcome = AdamantContacts.adamantWelcomeWallet.messages["chats.welcome_message"] {
571+
if let welcome = AdamantContacts.adamantWelcomeWallet.welcomeMessage {
572572
_ = try? await chatProvider.fakeReceived(
573573
message: welcome.message,
574574
senderId: AdamantContacts.adamantWelcomeWallet.name,

Adamant/ServiceProtocols/DataProviders/AccountsProvider.swift

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,15 @@ extension AdamantContacts {
105105
}
106106
}
107107

108+
var welcomeMessage: SystemMessage? {
109+
if
110+
let regionCode = Locale.current.regionCode,
111+
prohibitedRegions.contains(regionCode)
112+
{ return nil }
113+
114+
return messages["chats.welcome_message"]
115+
}
116+
108117
var messages: [String: SystemMessage] {
109118
switch self {
110119
case .adamantBountyWallet, .adamantNewBountyWallet:
@@ -168,4 +177,13 @@ extension AdamantContacts {
168177
)]
169178
}
170179
}
180+
181+
var prohibitedRegions: [String] {
182+
switch self {
183+
case .adelina:
184+
return ["CN"]
185+
case .adamantBountyWallet, .adamantNewBountyWallet, .adamantExchange, .betOnBitcoin, .donate, .pwaBountyBot, .adamantIco, .adamantWelcomeWallet, .adamantSupport:
186+
return []
187+
}
188+
}
171189
}

0 commit comments

Comments
 (0)