Skip to content

Commit c8f828b

Browse files
just-software-devjust-software-dev
authored
Merge pull request #352 from Adamant-im/trello.com/c/huLvtGS4
Release 3.2.1 (Verse)
2 parents cbe0df4 + 2b595da commit c8f828b

File tree

18 files changed

+118
-13
lines changed

18 files changed

+118
-13
lines changed

‎Adamant.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3140,7 +3140,7 @@
31403140
"@executable_path/Frameworks",
31413141
"@executable_path/../../Frameworks",
31423142
);
3143-
MARKETING_VERSION = 3.0.0;
3143+
MARKETING_VERSION = 3.2.1;
31443144
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
31453145
MTL_FAST_MATH = YES;
31463146
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev.MessageNotificationContentExtension";
@@ -3170,7 +3170,7 @@
31703170
"@executable_path/Frameworks",
31713171
"@executable_path/../../Frameworks",
31723172
);
3173-
MARKETING_VERSION = 3.0.0;
3173+
MARKETING_VERSION = 3.2.1;
31743174
MTL_FAST_MATH = YES;
31753175
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger.MessageNotificationContentExtension";
31763176
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3322,7 +3322,7 @@
33223322
"$(inherited)",
33233323
"@executable_path/Frameworks",
33243324
);
3325-
MARKETING_VERSION = 3.2.0;
3325+
MARKETING_VERSION = 3.2.1;
33263326
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev";
33273327
PRODUCT_NAME = "$(TARGET_NAME)";
33283328
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3353,7 +3353,7 @@
33533353
"$(inherited)",
33543354
"@executable_path/Frameworks",
33553355
);
3356-
MARKETING_VERSION = 3.2.0;
3356+
MARKETING_VERSION = 3.2.1;
33573357
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger";
33583358
PRODUCT_NAME = "$(TARGET_NAME)";
33593359
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3381,7 +3381,7 @@
33813381
"@executable_path/Frameworks",
33823382
"@executable_path/../../Frameworks",
33833383
);
3384-
MARKETING_VERSION = 3.0.0;
3384+
MARKETING_VERSION = 3.2.1;
33853385
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
33863386
MTL_FAST_MATH = YES;
33873387
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev.TransferNotificationContentExtension";
@@ -3411,7 +3411,7 @@
34113411
"@executable_path/Frameworks",
34123412
"@executable_path/../../Frameworks",
34133413
);
3414-
MARKETING_VERSION = 3.0.0;
3414+
MARKETING_VERSION = 3.2.1;
34153415
MTL_FAST_MATH = YES;
34163416
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger.TransferNotificationContentExtension";
34173417
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3442,7 +3442,7 @@
34423442
"@executable_path/Frameworks",
34433443
"@executable_path/../../Frameworks",
34443444
);
3445-
MARKETING_VERSION = 3.0.0;
3445+
MARKETING_VERSION = 3.2.1;
34463446
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
34473447
MTL_FAST_MATH = YES;
34483448
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev.NotificationServiceExtension";
@@ -3472,7 +3472,7 @@
34723472
"@executable_path/Frameworks",
34733473
"@executable_path/../../Frameworks",
34743474
);
3475-
MARKETING_VERSION = 3.0.0;
3475+
MARKETING_VERSION = 3.2.1;
34763476
MTL_FAST_MATH = YES;
34773477
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger.NotificationServiceExtension";
34783478
PRODUCT_NAME = "$(TARGET_NAME)";

‎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
}

‎Adamant/Stories/Settings/Contribute/ContributeState.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ struct ContributeState {
4848
description: .localized("Contribute.Section.CodeContributeDescription", comment: .empty),
4949
link: URL(string: "https://github.com/Adamant-im")
5050
),
51+
.init(
52+
image: .asset(named: "row_buy-coins") ?? .init(),
53+
name: .localized("Contribute.Section.Donate", comment: .empty),
54+
description: .localized("Contribute.Section.DonateDescription", comment: .empty),
55+
link: URL(string: "https://adamant.im/donate")
56+
),
5157
.init(
5258
image: .asset(named: "row_rate") ?? .init(),
5359
name: .localized("Contribute.Section.Rate", comment: .empty),

‎CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/verse_notification.imageset/Contents.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x",
6+
"filename" : "verse_notification.png"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x",
11+
"filename" : "verse_notification@2x.png"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"scale" : "3x",
16+
"filename" : "verse_notification@3x.png"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}

‎CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/verse_notification.imageset/verse_notification.png

1.05 KB
Loading

‎CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/verse_notification.imageset/verse_notification@2x.png

2.02 KB
Loading

‎CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/verse_notification.imageset/verse_notification@3x.png

3.02 KB
Loading

‎CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/verse_wallet.imageset/Contents.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x",
6+
"filename" : "verse_wallet.png"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x",
11+
"filename" : "verse_wallet@2x.png"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"scale" : "3x",
16+
"filename" : "verse_wallet@3x.png"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}

‎CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/verse_wallet.imageset/verse_wallet.png

1.05 KB
Loading

‎CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/verse_wallet.imageset/verse_wallet@2x.png

2.02 KB
Loading

‎CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/verse_wallet.imageset/verse_wallet@3x.png

3.02 KB
Loading

‎CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/verse_wallet_row.imageset/Contents.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x",
6+
"filename" : "verse_wallet_row.png"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x",
11+
"filename" : "verse_wallet_row@2x.png"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"scale" : "3x",
16+
"filename" : "verse_wallet_row@3x.png"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}

‎CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/verse_wallet_row.imageset/verse_wallet_row.png

1.05 KB
Loading

‎CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/verse_wallet_row.imageset/verse_wallet_row@2x.png

2.02 KB
Loading

‎CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/verse_wallet_row.imageset/verse_wallet_row@3x.png

3.02 KB
Loading

‎CommonKit/Sources/CommonKit/Models/ethereumTokensList.swift

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,18 @@
255255
defaultGasPriceGwei: 30,
256256
defaultGasLimit: 58000,
257257
warningGasPriceGwei: 70),
258+
ERC20Token(symbol: "VERSE",
259+
name: "Verse",
260+
contractAddress: "0x249cA82617eC3DfB2589c4c17ab7EC9765350a18",
261+
decimals: 18,
262+
naturalUnits: 18,
263+
defaultVisibility: true,
264+
defaultOrdinalLevel: 95,
265+
reliabilityGasPricePercent: 10,
266+
reliabilityGasLimitPercent: 10,
267+
defaultGasPriceGwei: 30,
268+
defaultGasLimit: 58000,
269+
warningGasPriceGwei: 70),
258270
ERC20Token(symbol: "WOO",
259271
name: "WOO Network",
260272
contractAddress: "0x4691937a7508860f876c9c0a2a617e7d9e945d4b",

‎NotificationServiceExtension/WalletImages/verse_notificationContent.png

3.02 KB
Loading

0 commit comments

Comments
 (0)