Skip to content

Commit

Permalink
Merge pull request #352 from Adamant-im/trello.com/c/huLvtGS4
Browse files Browse the repository at this point in the history 
Release 3.2.1 (Verse)
  • Loading branch information
@just-software-dev
just-software-dev authored Oct 1, 2023
2 parents cbe0df4 + 2b595da commit c8f828b
Show file tree
Hide file tree
Showing 18 changed files with 118 additions and 13 deletions.
16 changes: 8 additions & 8 deletions Adamant.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3140,7 +3140,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 3.0.0;
MARKETING_VERSION = 3.2.1;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev.MessageNotificationContentExtension";
Expand Down Expand Up @@ -3170,7 +3170,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 3.0.0;
MARKETING_VERSION = 3.2.1;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger.MessageNotificationContentExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -3322,7 +3322,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.2.0;
MARKETING_VERSION = 3.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -3353,7 +3353,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.2.0;
MARKETING_VERSION = 3.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -3381,7 +3381,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 3.0.0;
MARKETING_VERSION = 3.2.1;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev.TransferNotificationContentExtension";
Expand Down Expand Up @@ -3411,7 +3411,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 3.0.0;
MARKETING_VERSION = 3.2.1;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger.TransferNotificationContentExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -3442,7 +3442,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 3.0.0;
MARKETING_VERSION = 3.2.1;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev.NotificationServiceExtension";
Expand Down Expand Up @@ -3472,7 +3472,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 3.0.0;
MARKETING_VERSION = 3.2.1;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger.NotificationServiceExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
10 changes: 5 additions & 5 deletions Adamant/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
18 changes: 18 additions & 0 deletions Adamant/ServiceProtocols/DataProviders/AccountsProvider.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 []
}
}
}
6 changes: 6 additions & 0 deletions Adamant/Stories/Settings/Contribute/ContributeState.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ struct ContributeState {
description: .localized("Contribute.Section.CodeContributeDescription", comment: .empty),
link: URL(string: "https://github.com/Adamant-im")
),
.init(
image: .asset(named: "row_buy-coins") ?? .init(),
name: .localized("Contribute.Section.Donate", comment: .empty),
description: .localized("Contribute.Section.DonateDescription", comment: .empty),
link: URL(string: "https://adamant.im/donate")
),
.init(
image: .asset(named: "row_rate") ?? .init(),
name: .localized("Contribute.Section.Rate", comment: .empty),
Expand Down
23 changes: 23 additions & 0 deletions ...ources/CommonKit/Assets/Shared.xcassets/Wallets/verse_notification.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "verse_notification.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "[email protected]"
},
{
"idiom" : "universal",
"scale" : "3x",
"filename" : "[email protected]"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added ...sets/Shared.xcassets/Wallets/verse_notification.imageset/verse_notification.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s/Shared.xcassets/Wallets/verse_notification.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s/Shared.xcassets/Wallets/verse_notification.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions ...nKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/verse_wallet.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "verse_wallet.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "[email protected]"
},
{
"idiom" : "universal",
"scale" : "3x",
"filename" : "[email protected]"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added ...CommonKit/Assets/Shared.xcassets/Wallets/verse_wallet.imageset/verse_wallet.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...monKit/Assets/Shared.xcassets/Wallets/verse_wallet.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...monKit/Assets/Shared.xcassets/Wallets/verse_wallet.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions .../Sources/CommonKit/Assets/Shared.xcassets/Wallets/verse_wallet_row.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "verse_wallet_row.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "[email protected]"
},
{
"idiom" : "universal",
"scale" : "3x",
"filename" : "[email protected]"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added ...t/Assets/Shared.xcassets/Wallets/verse_wallet_row.imageset/verse_wallet_row.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ssets/Shared.xcassets/Wallets/verse_wallet_row.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ssets/Shared.xcassets/Wallets/verse_wallet_row.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions CommonKit/Sources/CommonKit/Models/ethereumTokensList.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,18 @@
defaultGasPriceGwei: 30,
defaultGasLimit: 58000,
warningGasPriceGwei: 70),
ERC20Token(symbol: "VERSE",
name: "Verse",
contractAddress: "0x249cA82617eC3DfB2589c4c17ab7EC9765350a18",
decimals: 18,
naturalUnits: 18,
defaultVisibility: true,
defaultOrdinalLevel: 95,
reliabilityGasPricePercent: 10,
reliabilityGasLimitPercent: 10,
defaultGasPriceGwei: 30,
defaultGasLimit: 58000,
warningGasPriceGwei: 70),
ERC20Token(symbol: "WOO",
name: "WOO Network",
contractAddress: "0x4691937a7508860f876c9c0a2a617e7d9e945d4b",
Expand Down
Binary file added NotificationServiceExtension/WalletImages/verse_notificationContent.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c8f828b

Please sign in to comment.