diff --git a/BeamWallet.xcodeproj/project.pbxproj b/BeamWallet.xcodeproj/project.pbxproj index 4cf1ccdd..ca8c7aa1 100644 --- a/BeamWallet.xcodeproj/project.pbxproj +++ b/BeamWallet.xcodeproj/project.pbxproj @@ -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; @@ -5108,7 +5108,7 @@ "$(PROJECT_DIR)", "$(PROJECT_DIR)/Frameworks/boost", ); - MARKETING_VERSION = 6.3; + MARKETING_VERSION = 7.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -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 = ( @@ -5182,7 +5182,7 @@ "$(PROJECT_DIR)", "$(PROJECT_DIR)/Frameworks/boost", ); - MARKETING_VERSION = 6.3; + MARKETING_VERSION = 7.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/BeamWallet/BeamSDK/AppModel.mm b/BeamWallet/BeamSDK/AppModel.mm index 72f75502..23f3a3a5 100644 --- a/BeamWallet/BeamSDK/AppModel.mm +++ b/BeamWallet/BeamSDK/AppModel.mm @@ -72,9 +72,9 @@ #include #import -//#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; diff --git a/BeamWallet/BeamSDK/Objects/BMTransaction.m b/BeamWallet/BeamSDK/Objects/BMTransaction.m index cd6e063d..17e9914c 100644 --- a/BeamWallet/BeamSDK/Objects/BMTransaction.m +++ b/BeamWallet/BeamSDK/Objects/BMTransaction.m @@ -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) { @@ -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) { @@ -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 { @@ -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: diff --git a/BeamWallet/ViewControllers/Main/Assets/AssetDetailViewController.swift b/BeamWallet/ViewControllers/Main/Assets/AssetDetailViewController.swift index d9f6db01..01e2f856 100644 --- a/BeamWallet/ViewControllers/Main/Assets/AssetDetailViewController.swift +++ b/BeamWallet/ViewControllers/Main/Assets/AssetDetailViewController.swift @@ -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) diff --git a/BeamWallet/ViewControllers/Main/Wallet/Transaction/TransactionsTableView.swift b/BeamWallet/ViewControllers/Main/Wallet/Transaction/TransactionsTableView.swift index 6b2a0bdc..7b3dcb72 100644 --- a/BeamWallet/ViewControllers/Main/Wallet/Transaction/TransactionsTableView.swift +++ b/BeamWallet/ViewControllers/Main/Wallet/Transaction/TransactionsTableView.swift @@ -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) diff --git a/BeamWallet/ViewControllers/Main/Wallet/WalletViewController.swift b/BeamWallet/ViewControllers/Main/Wallet/WalletViewController.swift index a68321fc..e3a18d09 100644 --- a/BeamWallet/ViewControllers/Main/Wallet/WalletViewController.swift +++ b/BeamWallet/ViewControllers/Main/Wallet/WalletViewController.swift @@ -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) diff --git a/Resources/Assets.xcassets/icon-icon-sending-public.imageset/Contents.json b/Resources/Assets.xcassets/icon-icon-sending-public.imageset/Contents.json new file mode 100644 index 00000000..6ea75941 --- /dev/null +++ b/Resources/Assets.xcassets/icon-icon-sending-public.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon-icon-sending-public@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Resources/Assets.xcassets/icon-icon-sending-public.imageset/icon-icon-sending-public@3x.png b/Resources/Assets.xcassets/icon-icon-sending-public.imageset/icon-icon-sending-public@3x.png new file mode 100644 index 00000000..68a62763 Binary files /dev/null and b/Resources/Assets.xcassets/icon-icon-sending-public.imageset/icon-icon-sending-public@3x.png differ diff --git a/Resources/Info.plist b/Resources/Info.plist index 076fa9cd..af47988c 100644 --- a/Resources/Info.plist +++ b/Resources/Info.plist @@ -142,7 +142,6 @@ UIBackgroundModes fetch - processing remote-notification UIFileSharingEnabled