Merge pull request #353 from Adamant-im/trello.com/c/CWnyTDnm

[trello.com/c/CWnyTDnm] No Adelina for China
Adamant-im · Oct 1, 2023 · 2b595da · 2b595da
2 parents 8bba0b0 + 50c3110
commit 2b595da
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/Adamant/AppDelegate.swift b/Adamant/AppDelegate.swift
@@ -524,7 +524,7 @@ extension AppDelegate {
             unread = true
         }
 
-        if let adelina = AdamantContacts.adelina.messages["chats.welcome_message"] {
+        if let adelina = AdamantContacts.adelina.welcomeMessage {
             _ = try? await chatProvider.fakeReceived(
                 message: adelina.message,
                 senderId: AdamantContacts.adelina.address,
@@ -535,7 +535,7 @@ extension AppDelegate {
             )
         }
 
-        if let exchenge = AdamantContacts.adamantExchange.messages["chats.welcome_message"] {
+        if let exchenge = AdamantContacts.adamantExchange.welcomeMessage {
             _ = try? await chatProvider.fakeReceived(
                 message: exchenge.message,
                 senderId: AdamantContacts.adamantExchange.address,
@@ -546,7 +546,7 @@ extension AppDelegate {
             )
         }
 
-        if let betOnBitcoin = AdamantContacts.betOnBitcoin.messages["chats.welcome_message"] {
+        if let betOnBitcoin = AdamantContacts.betOnBitcoin.welcomeMessage {
             _ = try? await chatProvider.fakeReceived(
                 message: betOnBitcoin.message,
                 senderId: AdamantContacts.betOnBitcoin.address,
@@ -557,7 +557,7 @@ extension AppDelegate {
             )
         }
 
-        if let welcome = AdamantContacts.donate.messages["chats.welcome_message"] {
+        if let welcome = AdamantContacts.donate.welcomeMessage {
             _ = try? await chatProvider.fakeReceived(
                 message: welcome.message,
                 senderId: AdamantContacts.donate.address,
@@ -568,7 +568,7 @@ extension AppDelegate {
             )
         }
 
-        if let welcome = AdamantContacts.adamantWelcomeWallet.messages["chats.welcome_message"] {
+        if let welcome = AdamantContacts.adamantWelcomeWallet.welcomeMessage {
             _ = try? await chatProvider.fakeReceived(
                 message: welcome.message,
                 senderId: AdamantContacts.adamantWelcomeWallet.name,

diff --git a/Adamant/ServiceProtocols/DataProviders/AccountsProvider.swift b/Adamant/ServiceProtocols/DataProviders/AccountsProvider.swift
@@ -105,6 +105,15 @@ extension AdamantContacts {
         }
     }
 
+    var welcomeMessage: SystemMessage? {
+        if
+            let regionCode = Locale.current.regionCode,
+            prohibitedRegions.contains(regionCode)
+        { return nil }
+
+        return messages["chats.welcome_message"]
+    }
+
     var messages: [String: SystemMessage] {
         switch self {
         case .adamantBountyWallet, .adamantNewBountyWallet:
@@ -168,4 +177,13 @@ extension AdamantContacts {
             )]
         }
     }
+
+    var prohibitedRegions: [String] {
+        switch self {
+        case .adelina:
+            return ["CN"]
+        case .adamantBountyWallet, .adamantNewBountyWallet, .adamantExchange, .betOnBitcoin, .donate, .pwaBountyBot, .adamantIco, .adamantWelcomeWallet, .adamantSupport:
+            return []
+        }
+    }
 }