Skip to content

Commit

Permalink
mobile_mainnet_7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@DenisDemyanko
DenisDemyanko committed Jun 14, 2022
1 parent dd70b0f commit 3bc8506
Show file tree
Hide file tree
Showing 9 changed files with 75 additions and 28 deletions.
8 changes: 4 additions & 4 deletions BeamWallet.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5074,7 +5074,7 @@
CLANG_WARN_ENUM_CONVERSION = NO;
CODE_SIGN_ENTITLEMENTS = Resources/BeamWallet.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 3;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = KNU2R94BJK;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -5108,7 +5108,7 @@
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/Frameworks/boost",
);
MARKETING_VERSION = 6.3;
MARKETING_VERSION = 7.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -5149,7 +5149,7 @@
CLANG_WARN_ENUM_CONVERSION = NO;
CODE_SIGN_ENTITLEMENTS = Resources/BeamWallet.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = KNU2R94BJK;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -5182,7 +5182,7 @@
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/Frameworks/boost",
);
MARKETING_VERSION = 6.3;
MARKETING_VERSION = 7.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
4 changes: 2 additions & 2 deletions BeamWallet/BeamSDK/AppModel.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
#include <sys/sysctl.h>
#import <sys/utsname.h>

//#import "BeamWallet-Swift.h"
#import "BeamWallet-Swift.h"
//#import "BeamWalletMasterNet-Swift.h"
#import "BeamWalletTestNet-Swift.h"
//#import "BeamWalletTestNet-Swift.h"

using namespace beam;
using namespace ECC;
Expand Down
63 changes: 45 additions & 18 deletions BeamWallet/BeamSDK/Objects/BMTransaction.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,13 +347,25 @@ -(UIImage*)statusIcon {
if (self.enumType == BMTransactionTypePushTransaction) {
if(_isIncome) {
if (_isSelf && !self.isFailed) {
switch (_enumStatus) {
case BMTransactionStatusCompleted:
return !_isShielded ? [UIImage imageNamed:@"icon-sent-max-privacy-own"] : [UIImage imageNamed:@"icon-sent-own-offline"];
case BMTransactionStatusConfirming:
return !_isShielded ? [UIImage imageNamed:@"icon-sent-max-privacy-own"] : [UIImage imageNamed:@"icon-sent-own-offline"];
default:
return !_isShielded ? [UIImage imageNamed:@"icon-seding-max-privacy-own"] : [UIImage imageNamed:@"icon-send-own-offline"];
if (_isPublicOffline) {
switch (_enumStatus) {
case BMTransactionStatusCompleted:
return [UIImage imageNamed:@"icon-sent-own-offline"];
case BMTransactionStatusConfirming:
return [UIImage imageNamed:@"icon-sent-own-offline"];
default:
return [UIImage imageNamed:@"icon-send-own-offline"];
}
}
else {
switch (_enumStatus) {
case BMTransactionStatusCompleted:
return !_isShielded ? [UIImage imageNamed:@"icon-sent-max-privacy-own"] : [UIImage imageNamed:@"icon-sent-own-offline"];
case BMTransactionStatusConfirming:
return !_isShielded ? [UIImage imageNamed:@"icon-sent-max-privacy-own"] : [UIImage imageNamed:@"icon-sent-own-offline"];
default:
return !_isShielded ? [UIImage imageNamed:@"icon-seding-max-privacy-own"] : [UIImage imageNamed:@"icon-send-own-offline"];
}
}
}
else if(self.isCancelled) {
Expand Down Expand Up @@ -391,13 +403,25 @@ -(UIImage*)statusIcon {
}
else{
if (_isSelf && !self.isFailed) {
switch (_enumStatus) {
case BMTransactionStatusCompleted:
return !_isShielded ? [UIImage imageNamed:@"icon-sent-max-privacy-own"] : [UIImage imageNamed:@"icon-sent-own-offline"];
case BMTransactionStatusConfirming:
return !_isShielded ? [UIImage imageNamed:@"icon-sent-max-privacy-own"] : [UIImage imageNamed:@"icon-sent-own-offline"];
default:
return !_isShielded ? [UIImage imageNamed:@"icon-seding-max-privacy-own"] : [UIImage imageNamed:@"icon-send-own-offline"];
if (_isSelf && _isPublicOffline) {
switch (_enumStatus) {
case BMTransactionStatusCompleted:
return [UIImage imageNamed:@"icon-sent-own-offline"];
case BMTransactionStatusConfirming:
return [UIImage imageNamed:@"icon-sent-own-offline"];
default:
return [UIImage imageNamed:@"icon-send-own-offline"];
}
}
else {
switch (_enumStatus) {
case BMTransactionStatusCompleted:
return !_isShielded ? [UIImage imageNamed:@"icon-sent-max-privacy-own"] : [UIImage imageNamed:@"icon-sent-own-offline"];
case BMTransactionStatusConfirming:
return !_isShielded ? [UIImage imageNamed:@"icon-sent-max-privacy-own"] : [UIImage imageNamed:@"icon-sent-own-offline"];
default:
return !_isShielded ? [UIImage imageNamed:@"icon-seding-max-privacy-own"] : [UIImage imageNamed:@"icon-send-own-offline"];
}
}
}
else if(self.isCancelled) {
Expand All @@ -409,7 +433,10 @@ -(UIImage*)statusIcon {
}
}
else if(self.isFailed) {
if (_isPublicOffline || _isMaxPrivacy) {
if(_isPublicOffline) {
return [UIImage imageNamed:@"icon-failed-max-offline"];
}
else if (_isMaxPrivacy) {
return [UIImage imageNamed:@"icon-failed-max-online"];
}
else {
Expand All @@ -419,11 +446,11 @@ -(UIImage*)statusIcon {
else if (_isPublicOffline || _isMaxPrivacy) {
switch (_enumStatus) {
case BMTransactionStatusPending:
return [UIImage imageNamed:@"icon-in-progress-max-online"];
return _isPublicOffline ? [UIImage imageNamed:@"icon-icon-sending-public"] : [UIImage imageNamed:@"icon-in-progress-max-online"];
case BMTransactionStatusInProgress:
return [UIImage imageNamed:@"icon-in-progress-max-online"];
return _isPublicOffline ? [UIImage imageNamed:@"icon-icon-sending-public"] : [UIImage imageNamed:@"icon-in-progress-max-online"];
case BMTransactionStatusRegistering:
return [UIImage imageNamed:@"icon-in-progress-max-online"];
return _isPublicOffline ? [UIImage imageNamed:@"icon-icon-sending-public"] : [UIImage imageNamed:@"icon-in-progress-max-online"];
case BMTransactionStatusCompleted:
return _isPublicOffline ? [UIImage imageNamed:@"icon-send-max-offline"] : [UIImage imageNamed:@"icon-send-max-online"];
case BMTransactionStatusConfirming:
Expand Down
2 changes: 1 addition & 1 deletion BeamWallet/ViewControllers/Main/Assets/AssetDetailViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ extension AssetDetailViewController: UIContextMenuInteractionDelegate {
array.append(action2)

if !transaction.isIncome && !transaction.isDapps {
let action3 = UIAction(title: Localizable.shared.strings.copy_details, image: nil) { action in
let action3 = UIAction(title: Localizable.shared.strings.repeat_transaction, image: nil) { action in
viewModel.repeatTransation(transaction: viewModel.transaction!)
}
array.append(action3)
Expand Down
2 changes: 1 addition & 1 deletion BeamWallet/ViewControllers/Main/Wallet/Transaction/TransactionsTableView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ extension TransactionsTableView: UIContextMenuInteractionDelegate {
array.append(action2)

if !transaction.isIncome && !transaction.isDapps {
let action3 = UIAction(title: Localizable.shared.strings.copy_details, image: nil) { action in
let action3 = UIAction(title: Localizable.shared.strings.repeat_transaction, image: nil) { action in
viewModel.repeatTransation(transaction: viewModel.transaction!)
}
array.append(action3)
Expand Down
2 changes: 1 addition & 1 deletion BeamWallet/ViewControllers/Main/Wallet/WalletViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ extension WalletViewController: UITableViewDelegate {
array.append(action2)

if !transaction.isIncome && !transaction.isDapps {
let action3 = UIAction(title: Localizable.shared.strings.copy_details, image: nil) { action in
let action3 = UIAction(title: Localizable.shared.strings.repeat_transaction, image: nil) { action in
viewModel.repeatTransation(transaction: viewModel.transaction!)
}
array.append(action3)
Expand Down
21 changes: 21 additions & 0 deletions Resources/Assets.xcassets/icon-icon-sending-public.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...sets.xcassets/icon-icon-sending-public.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.
1 change: 0 additions & 1 deletion Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@
<key>UIBackgroundModes</key>
<array>
<string>fetch</string>
<string>processing</string>
<string>remote-notification</string>
</array>
<key>UIFileSharingEnabled</key>
Expand Down

0 comments on commit 3bc8506

Please sign in to comment.