fixes

Author: DenisDemyanko

BeamWallet.xcodeproj/project.pbxproj

@@ -5008,7 +5008,7 @@
 				CODE_SIGN_ENTITLEMENTS = Resources/BeamWalletMasterNet.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 25;
+				CURRENT_PROJECT_VERSION = 26;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = KNU2R94BJK;
 				ENABLE_BITCODE = NO;
@@ -5088,7 +5088,7 @@
 				CODE_SIGN_ENTITLEMENTS = Resources/BeamWalletMasterNet.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 25;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = KNU2R94BJK;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

BeamWallet/BeamSDK/AppModel.mm

@@ -1234,7 +1234,7 @@ -(void)setExpires:(int)hours toAddress:(NSString*)address {
             {
 
                 try{
-                    wallet->getAsync()->updateAddress(walletID, addresses[i].m_label, hours == 0 ? WalletAddress::ExpirationStatus::Never : WalletAddress::ExpirationStatus::OneDay);
+                    wallet->getAsync()->updateAddress(walletID, addresses[i].m_label, hours == 0 ? WalletAddress::ExpirationStatus::Never : WalletAddress::ExpirationStatus::Auto);
                 }
                 catch (const std::exception& e) {
                     NSLog(@"setExpires failed");
@@ -1297,7 +1297,7 @@ -(void)setWalletComment:(NSString*)comment toAddress:(NSString*_Nonnull)address
             if ([wAddress isEqualToString:address])
             {
                 try{
-                    wallet->getAsync()->updateAddress(walletID, comment.string, addresses[i].m_duration == 0 ? WalletAddress::ExpirationStatus::Never : WalletAddress::ExpirationStatus::OneDay);
+                    wallet->getAsync()->updateAddress(walletID, comment.string, addresses[i].m_duration == 0 ? WalletAddress::ExpirationStatus::Never : WalletAddress::ExpirationStatus::Auto);
                 }
                 catch (const std::exception& e) {
                     NSLog(@"setExpires failed");
@@ -1659,7 +1659,7 @@ -(void)editAddress:(BMAddress*_Nonnull)address {
                             addresses[i].setExpirationStatus(beam::wallet::WalletAddress::ExpirationStatus::Never);
                         }
                         else{
-                            addresses[i].setExpirationStatus(beam::wallet::WalletAddress::ExpirationStatus::OneDay);
+                            addresses[i].setExpirationStatus(beam::wallet::WalletAddress::ExpirationStatus::Auto);
                         }
                     }
                     else{

BeamWallet/BeamSDK/AssetsManager.mm

@@ -24,7 +24,7 @@
 
 static NSString *assetsKey = @"assetsKeyNew";
 
-NSArray *colors = @[@"#72fdff",@"#2acf1d",@"#ffbb54",@"#d885ff",@"#008eff",@"#a37dff",@"#91e300",@"#ffe75a",@"#9643ff",@"#395bff",@"#ff3b3b",@"#73ff7c",@"#ffa86c",@"#ff3abe",@"#00aee1",@"#ff5200",@"#6464ff",@"#ff7a21",@"#63afff",@"#c81f68"];
+NSArray *colors = @[@"#72fdff",@"#2acf1d",@"#ffbb54",@"#d885ff",@"#008eff",@"#ff746b",@"#91e300",@"#ffe75a",@"#9643ff",@"#395bff",@"#ff3b3b",@"#73ff7c",@"#ffa86c",@"#ff3abe",@"#00aee1",@"#ff5200",@"#6464ff",@"#ff7a21",@"#63afff",@"#c81f68"];
 
 @implementation AssetsManager
 

BeamWallet/Extensions/String.swift

@@ -175,6 +175,20 @@ extension String {
         return (formatter.string(from: NSNumber(value: value)) ?? "0.00") + " \(assetName)"
     }
 
+    static func currencyShort(value:Double, name: String) -> String {
+        var assetName = name
+        if assetName == "assets" {
+            assetName = "BEAM"
+        }
+        if assetName.count > 10 {
+            assetName = assetName.prefix(10) + "..."
+        }
+        if Settings.sharedManager().isHideAmounts {
+            return assetName
+        }
+        return (formatter.string(from: NSNumber(value: value)) ?? "0.00") + " \(assetName)"
+    }
+    
     func isValidUrl() -> Bool {
         let urlRegEx = "^(https?://)?(www\\.)?([-a-z0-9]{1,63}\\.)*?[a-z0-9][-a-z0-9]{0,61}[a-z0-9]\\.[a-z]{2,6}(/[-\\w@\\+\\.~#\\?&/=%]*)?$"
         let urlTest = NSPredicate(format:"SELF MATCHES %@", urlRegEx)

BeamWallet/Manager/NotificationManager.swift

@@ -87,7 +87,7 @@ class NotificationManager : NSObject {
         }
         else if (notification.type == TRANSACTION) {
             if let transaction = AppModel.sharedManager().transaction(byId: notification.pId) {
-                let assetValue = String.currency(value: transaction.realAmount, name: transaction.asset.unitName)
+                let assetValue = String.currencyShort(value: transaction.realAmount, name: transaction.asset.unitName)
 
                 var title = ""
                 var detail = ""

BeamWallet/ViewControllers/Main/Notifications/NotificationItem.swift

@@ -44,7 +44,7 @@ class NotificationItem {
         }
         else if(notification.type == TRANSACTION) {
             if let transaction = AppModel.sharedManager().transaction(byId: notification.pId) {
-                let assetValue = String.currency(value: transaction.realAmount, name: transaction.asset.unitName)
+                let assetValue = String.currencyShort(value: transaction.realAmount, name: transaction.asset.unitName)
 
                 if transaction.isIncome {
                     if transaction.isFailed() || transaction.isExpired() || transaction.isCancelled() {

BeamWallet/ViewControllers/Main/QRCode/QRCodeSmallViewController.swift

@@ -71,7 +71,12 @@ class QRCodeSmallViewController: BaseViewController {
             infoLabel.text = text
         }
         else {
-            infoLabel.text = Localizable.shared.strings.receive_description
+            if !AppModel.sharedManager().checkIsOwnNode() {
+                infoLabel.text = Localizable.shared.strings.receive_description_2
+            }
+            else {
+                infoLabel.text = Localizable.shared.strings.receive_description
+            }
         }
 
         codeView.generateCode(qrString, foregroundColor: UIColor.white, backgroundColor: UIColor.clear)

BeamWallet/ViewControllers/Main/Wallet/Cells/AssetAvailableCell.swift

@@ -47,7 +47,7 @@ class AssetAvailableCell: RippleCell {
 
         if asset.locked() > 0 {
             lockedLabel.text = asset.isBeam() ? String.currency(value: asset.realLocked())
-                : String.currency(value: asset.realLocked(), name: asset.unitName)
+                : String.currencyShort(value: asset.realLocked(), name: asset.unitName)
 
             lockedView.isHidden = false
             topOffset.constant = 18