From 50f7388d47cb48a17495a11bffa2d5155690d216 Mon Sep 17 00:00:00 2001 From: Hwee-Boon Yar Date: Wed, 3 Apr 2024 10:29:04 +0800 Subject: [PATCH] Remove Telegram and Use Discord as the support channel. Closes #7108 --- .../Common/Types/ServiceProvider.swift | 11 +++----- .../Localization/en.lproj/Localizable.strings | 1 - .../Localization/es.lproj/Localizable.strings | 1 - .../Localization/fi.lproj/Localizable.strings | 1 - .../Localization/ja.lproj/Localizable.strings | 1 - .../Localization/ko.lproj/Localizable.strings | 1 - .../zh-Hans.lproj/Localizable.strings | 1 - .../settings_telegram.imageset/Contents.json | 15 ----------- .../settings_telegram.imageset/telegram.pdf | Bin 4206 -> 0 bytes .../ViewModels/SupportViewModel.swift | 24 ++---------------- .../Analytics/AnalyticsTypes.swift | 5 ++-- 11 files changed, 7 insertions(+), 54 deletions(-) delete mode 100644 AlphaWallet/Resources/Assets.xcassets/settings_telegram.imageset/Contents.json delete mode 100644 AlphaWallet/Resources/Assets.xcassets/settings_telegram.imageset/telegram.pdf diff --git a/AlphaWallet/Common/Types/ServiceProvider.swift b/AlphaWallet/Common/Types/ServiceProvider.swift index 95ee4b382a..eadf8bbed4 100644 --- a/AlphaWallet/Common/Types/ServiceProvider.swift +++ b/AlphaWallet/Common/Types/ServiceProvider.swift @@ -1,11 +1,10 @@ // Copyright SIX DAY LLC. All rights reserved. -import Foundation import AlphaWalletFoundation +import Foundation public enum URLServiceProvider { case discord - case telegramCustomer case twitter case reddit case facebook @@ -16,9 +15,7 @@ public enum URLServiceProvider { public var deepLinkURL: URL? { switch self { case .discord: - return URL(string: "https://discord.com/invite/mx23YWRTYf") - case .telegramCustomer: - return URL(string: "https://t.me/AlphaWalletSupport") + return URL(string: "https://discord.gg/nbb9VSF85A") case .twitter: return URL(string: "twitter://user?screen_name=\(Constants.twitterUsername)") case .reddit: @@ -33,9 +30,7 @@ public enum URLServiceProvider { public var remoteURL: URL { switch self { case .discord: - return URL(string: "https://discord.com/invite/mx23YWRTYf")! - case .telegramCustomer: - return URL(string: "https://t.me/AlphaWalletSupport")! + return URL(string: "https://discord.gg/nbb9VSF85A")! case .twitter: return URL(string: "https://twitter.com/\(Constants.twitterUsername)")! case .reddit: diff --git a/AlphaWallet/Localization/en.lproj/Localizable.strings b/AlphaWallet/Localization/en.lproj/Localizable.strings index a6816db838..ee9a4cdedc 100644 --- a/AlphaWallet/Localization/en.lproj/Localizable.strings +++ b/AlphaWallet/Localization/en.lproj/Localizable.strings @@ -782,7 +782,6 @@ "nonfungibles.value.rarity" = "%d%@ have this trait"; "nonfungibles.value.rarity.unique" = "Unique"; "url.discord" = "Discord"; -"url.telegramCustomer" = "Telegram (Customer Support)"; "url.twitter" = "Twitter"; "url.reddit" = "Reddit"; "url.facebook" = "Facebook"; diff --git a/AlphaWallet/Localization/es.lproj/Localizable.strings b/AlphaWallet/Localization/es.lproj/Localizable.strings index 8eb5d4ada6..2918efc797 100644 --- a/AlphaWallet/Localization/es.lproj/Localizable.strings +++ b/AlphaWallet/Localization/es.lproj/Localizable.strings @@ -782,7 +782,6 @@ "nonfungibles.value.rarity" = "%d%@ have this trait"; "nonfungibles.value.rarity.unique" = "Unique"; "url.discord" = "Discord"; -"url.telegramCustomer" = "Telegram (Customer Support)"; "url.twitter" = "Twitter"; "url.reddit" = "Reddit"; "url.facebook" = "Facebook"; diff --git a/AlphaWallet/Localization/fi.lproj/Localizable.strings b/AlphaWallet/Localization/fi.lproj/Localizable.strings index 4c4e4a266b..5c12b8292b 100644 --- a/AlphaWallet/Localization/fi.lproj/Localizable.strings +++ b/AlphaWallet/Localization/fi.lproj/Localizable.strings @@ -782,7 +782,6 @@ "nonfungibles.value.rarity" = "%d%@ have this trait"; "nonfungibles.value.rarity.unique" = "Unique"; "url.discord" = "Discord"; -"url.telegramCustomer" = "Telegram (tuotetuki)"; "url.twitter" = "Twitter"; "url.reddit" = "Reddit"; "url.facebook" = "Facebook"; diff --git a/AlphaWallet/Localization/ja.lproj/Localizable.strings b/AlphaWallet/Localization/ja.lproj/Localizable.strings index 82ae99eeff..f91cdacfb2 100644 --- a/AlphaWallet/Localization/ja.lproj/Localizable.strings +++ b/AlphaWallet/Localization/ja.lproj/Localizable.strings @@ -782,7 +782,6 @@ "nonfungibles.value.rarity" = "%d%@ have this trait"; "nonfungibles.value.rarity.unique" = "Unique"; "url.discord" = "Discord"; -"url.telegramCustomer" = "Telegram (Customer Support)"; "url.twitter" = "Twitter"; "url.reddit" = "Reddit"; "url.facebook" = "Facebook"; diff --git a/AlphaWallet/Localization/ko.lproj/Localizable.strings b/AlphaWallet/Localization/ko.lproj/Localizable.strings index 1459bc1e3c..e8c1cd94ce 100644 --- a/AlphaWallet/Localization/ko.lproj/Localizable.strings +++ b/AlphaWallet/Localization/ko.lproj/Localizable.strings @@ -782,7 +782,6 @@ "nonfungibles.value.rarity" = "%d%@ have this trait"; "nonfungibles.value.rarity.unique" = "Unique"; "url.discord" = "Discord"; -"url.telegramCustomer" = "Telegram (Customer Support)"; "url.twitter" = "Twitter"; "url.reddit" = "Reddit"; "url.facebook" = "Facebook"; diff --git a/AlphaWallet/Localization/zh-Hans.lproj/Localizable.strings b/AlphaWallet/Localization/zh-Hans.lproj/Localizable.strings index 92a4e0018b..951ac6fe75 100644 --- a/AlphaWallet/Localization/zh-Hans.lproj/Localizable.strings +++ b/AlphaWallet/Localization/zh-Hans.lproj/Localizable.strings @@ -782,7 +782,6 @@ "nonfungibles.value.rarity" = "%d%@ have this trait"; "nonfungibles.value.rarity.unique" = "Unique"; "url.discord" = "Discord"; -"url.telegramCustomer" = "Telegram (Customer Support)"; "url.twitter" = "Twitter"; "url.reddit" = "Reddit"; "url.facebook" = "Facebook"; diff --git a/AlphaWallet/Resources/Assets.xcassets/settings_telegram.imageset/Contents.json b/AlphaWallet/Resources/Assets.xcassets/settings_telegram.imageset/Contents.json deleted file mode 100644 index aff4974f48..0000000000 --- a/AlphaWallet/Resources/Assets.xcassets/settings_telegram.imageset/Contents.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "images" : [ - { - "filename" : "telegram.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true - } -} diff --git a/AlphaWallet/Resources/Assets.xcassets/settings_telegram.imageset/telegram.pdf b/AlphaWallet/Resources/Assets.xcassets/settings_telegram.imageset/telegram.pdf deleted file mode 100644 index a40be4f8cf40693f30aeac62ad427fedb16dbd0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4206 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 diff --git a/AlphaWallet/Settings/ViewModels/SupportViewModel.swift b/AlphaWallet/Settings/ViewModels/SupportViewModel.swift index 015f2c199e..6f402d237e 100644 --- a/AlphaWallet/Settings/ViewModels/SupportViewModel.swift +++ b/AlphaWallet/Settings/ViewModels/SupportViewModel.swift @@ -5,10 +5,10 @@ // Created by Vladyslav Shepitko on 04.06.2020. // -import UIKit import AlphaWalletFoundation import AlphaWalletLogger import Combine +import UIKit struct SupportViewModelInput { let willAppear: AnyPublisher @@ -22,7 +22,7 @@ struct SupportViewModelOutput { class SupportViewModel: NSObject { private let analytics: AnalyticsLogger - private let supportedRows: [SupportCase] = [.telegramCustomer, .discord, .email, .twitter, .github, .faq] + private let supportedRows: [SupportCase] = [.discord, .email, .twitter, .github, .faq] init(analytics: AnalyticsLogger) { self.analytics = analytics @@ -61,9 +61,6 @@ class SupportViewModel: NSObject { case .discord: logAccessDiscord() return .openUrl(.discord) - case .telegramCustomer: - logAccessTelegramCustomerSupport() - return .openUrl(.telegramCustomer) case .twitter: logAccessTwitter() return .openUrl(.twitter) @@ -94,10 +91,6 @@ class SupportViewModel: NSObject { analytics.log(navigation: Analytics.Navigation.discord) } - private func logAccessTelegramCustomerSupport() { - analytics.log(navigation: Analytics.Navigation.telegramCustomerSupport) - } - private func logAccessTwitter() { analytics.log(navigation: Analytics.Navigation.twitter) } @@ -136,7 +129,6 @@ extension SupportViewModel { enum SupportCase: String { case discord - case telegramCustomer case twitter case reddit case facebook @@ -154,13 +146,10 @@ extension SupportViewModel { } extension SupportViewModel.SupportCase { - var urlProvider: URLServiceProvider? { switch self { case .discord: return URLServiceProvider.discord - case .telegramCustomer: - return URLServiceProvider.telegramCustomer case .twitter: return URLServiceProvider.twitter case .reddit: @@ -180,8 +169,6 @@ extension SupportViewModel.SupportCase { switch self { case .discord: return URLServiceProvider.discord.title - case .telegramCustomer: - return URLServiceProvider.telegramCustomer.title case .twitter: return URLServiceProvider.twitter.title case .reddit: @@ -205,8 +192,6 @@ extension SupportViewModel.SupportCase { return R.image.iconsSettingsEmail() case .discord: return URLServiceProvider.discord.image - case .telegramCustomer: - return URLServiceProvider.telegramCustomer.image case .twitter: return URLServiceProvider.twitter.image case .reddit: @@ -224,13 +209,10 @@ extension SupportViewModel.SupportCase { } extension URLServiceProvider { - var title: String { switch self { case .discord: return R.string.localizable.urlDiscord() - case .telegramCustomer: - return R.string.localizable.urlTelegramCustomer() case .twitter: return R.string.localizable.urlTwitter() case .reddit: @@ -248,8 +230,6 @@ extension URLServiceProvider { switch self { case .discord: return R.image.iconsSettingsDiscord() - case .telegramCustomer: - return R.image.settings_telegram() case .twitter: return R.image.settings_twitter() case .reddit: diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Analytics/AnalyticsTypes.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Analytics/AnalyticsTypes.swift index b65098a3c7..8c9635da5b 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Analytics/AnalyticsTypes.swift +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Analytics/AnalyticsTypes.swift @@ -47,7 +47,6 @@ public enum Analytics { case deepLink = "Screen: DeepLink" case faq = "Screen: FAQ" case discord = "Screen: Discord" - case telegramCustomerSupport = "Screen: Telegram: Customer Support" case twitter = "Screen: Twitter" case reddit = "Screen: Reddit" case facebook = "Screen: Facebook" @@ -259,8 +258,8 @@ public enum Analytics { } public enum WalletConnectAction: String { - case bridgeUrl - case connectionUrl + case bridgeUrl + case connectionUrl } public enum ShortcutType: String {