Merge branch 'develop' into feature/Localization

# Conflicts:
#	Adamant/Stories/Chats/ChatViewController.swift

Author: RealBonus

Adamant/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.4</string>
+	<string>0.1.5</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>6</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIAppFonts</key>

Adamant/Models/ChatType.swift

@@ -8,6 +8,9 @@
 
 import Foundation
 
+/// - messageExpensive: Old message type, with 0.005 transaction fee
+/// - message: new and main message type, with 0.001 transaction fee
 enum ChatType: Int, Codable {
-	case message = 0
+	case messageOld = 0
+	case message = 1
 }

Adamant/ServiceProtocols/DataProviders/ChatsProvider.swift

@@ -17,6 +17,7 @@ enum ChatsProviderResult {
 enum ChatsProviderError: Error {
 	case notLogged
 	case messageNotValid(ValidateMessageResult)
+	case notEnoughtMoneyToSend
 	case serverError(Error)
 	case accountNotFound(String)
 	case dependencyError(String)

Adamant/ServiceProtocols/FeeCalculator.swift

@@ -9,6 +9,6 @@
 import Foundation
 
 protocol FeeCalculator {
-	func estimatedFeeFor(message: String) -> UInt
+	func estimatedFeeFor(message: AdamantMessage) -> UInt
 	func estimatedFeeFor(transfer: UInt) -> UInt
 }

Adamant/Services/ApiService/AdamantApi+Chats.swift

@@ -20,7 +20,8 @@ extension AdamantApiService.ApiCommands {
 extension AdamantApiService {
 	func getChatTransactions(account: String, height: Int?, offset: Int?, completion: @escaping (ApiServiceResult<[Transaction]>) -> Void) {
 		// MARK: 1. Prepare params
-		var queryItems: [URLQueryItem] = [URLQueryItem(name: "isIn", value: account)]
+		var queryItems: [URLQueryItem] = [URLQueryItem(name: "isIn", value: account),
+										  URLQueryItem(name: "orderBy", value: "timestamp:desc")]
 		if let height = height, height > 0 { queryItems.append(URLQueryItem(name: "fromHeight", value: String(height))) }
 		if let offset = offset { queryItems.append(URLQueryItem(name: "offset", value: String(offset))) }
 

Adamant/Services/DataProviders/AdamantChatsProvider.swift

@@ -16,6 +16,7 @@ class AdamantChatsProvider: ChatsProvider {
 	var stack: CoreDataStack!
 	var adamantCore: AdamantCore!
 	var accountsProvider: AccountsProvider!
+	var feeCalculator: FeeCalculator!
 
 	// MARK: Properties
 	private(set) var state: State = .empty
@@ -154,6 +155,11 @@ extension AdamantChatsProvider {
 			return
 		}
 
+		guard loggedAccount.balance >= feeCalculator.estimatedFeeFor(message: message) else {
+			completion(.error(.notEnoughtMoneyToSend))
+			return
+		}
+		
 		switch validateMessage(message) {
 		case .isValid:
 			break

Adamant/Services/HardFeeCalculator.swift

@@ -9,13 +9,14 @@
 import Foundation
 
 class HardFeeCalculator: FeeCalculator {
-	func estimatedFeeFor(message: String) -> UInt {
-		return AdamantUtilities.from(double: ceil(Double(message.count) / 255.0) * 0.005)
+	func estimatedFeeFor(message: AdamantMessage) -> UInt {
+		switch message {
+		case .text(let text):
+			return AdamantUtilities.from(double: ceil(Double(text.count) / 255.0) * 0.001)
+		}
 	}
 
 	func estimatedFeeFor(transfer: UInt) -> UInt {
 		return AdamantUtilities.from(double: 0.5)
 	}
-	
-	
 }

Adamant/Stories/Chats/ChatViewController.swift

@@ -13,10 +13,11 @@ import CoreData
 // MARK: - Localization
 extension String.adamantLocalized {
 	struct chat {
-		static let estimatedFeeFormat = NSLocalizedString("chat.estimatedFee", comment: "Estimated fee: %f")
+		static let estimatedFeeFormat = NSLocalizedString("chat.estimated-fee", comment: "Estimated fee: %f")
 
 		static let messageIsEmpty = NSLocalizedString("chat.message-is-empty", comment: "Notify user that message cannot be empty")
-		static let messageTooLong = NSLocalizedString("chat.message-too-long", comment: "Message is too long alert")
+		static let messageTooLong = NSLocalizedString("chat.message-too-long", comment: "Message is too long")
+		static let notEnoughMoney = NSLocalizedString("chat.not-enough", comment: "You don't have enough money to send a message.")
 
 		static let internalErrorFormat = NSLocalizedString("chat.internal-error-format", comment: "Internal error: %@")
 		static let serverErrorFormat = NSLocalizedString("chat.server-error-format", comment: "Remote server error: %@")
@@ -137,7 +138,7 @@ class ChatViewController: MessagesViewController {
 
 		if let delegate = delegate, let address = chatroom.partner?.address, let message = delegate.getPreservedMessageFor(address: address, thenRemoveIt: true) {
 			messageInputBar.inputTextView.text = message
-			setEstimatedFee(feeCalculator.estimatedFeeFor(message: message))
+			setEstimatedFee(feeCalculator.estimatedFeeFor(message: AdamantMessage.text(message)))
 		}
     }
 
@@ -359,11 +360,20 @@ extension ChatViewController: MessageInputBarDelegate {
 				case .error(let error):
 					let message: String
 					switch error {
-					case .accountNotFound(let account): message = String.localizedStringWithFormat(String.adamantLocalized.chat.internalErrorFormat, "Account not found: \(account)")
-					case .dependencyError(let error): message = String.localizedStringWithFormat(String.adamantLocalized.chat.internalErrorFormat, error)
-					case .internalError(let error): message = String.localizedStringWithFormat(String.adamantLocalized.chat.internalErrorFormat, String(describing: error))
-					case .notLogged: message = String.localizedStringWithFormat(String.adamantLocalized.chat.internalErrorFormat, "User not logged")
-					case .serverError(let error): message = String.localizedStringWithFormat(String.adamantLocalized.chat.serverErrorFormat, String(describing: error))
+					case .accountNotFound(let account):
+						message = String.localizedStringWithFormat(String.adamantLocalized.chat.internalErrorFormat, "Account not found: \(account)")
+					case .dependencyError(let error):
+						message = String.localizedStringWithFormat(String.adamantLocalized.chat.internalErrorFormat, error)
+					case .internalError(let error):
+						message = String.localizedStringWithFormat(String.adamantLocalized.chat.internalErrorFormat, String(describing: error))
+					case .notLogged:
+						message = String.localizedStringWithFormat(String.adamantLocalized.chat.internalErrorFormat, "User not logged")
+					case .serverError(let error):
+						message = String.localizedStringWithFormat(String.adamantLocalized.chat.serverErrorFormat, String(describing: error))
+
+					case .notEnoughtMoneyToSend:
+						message = String.adamantLocalized.chat.notEnoughMoney
+				
 					case .messageNotValid(let problem):
 						switch problem {
 						case .tooLong:
@@ -388,7 +398,7 @@ extension ChatViewController: MessageInputBarDelegate {
 
 	func messageInputBar(_ inputBar: MessageInputBar, textViewTextDidChangeTo text: String) {
 		if text.count > 0 {
-			let fee = feeCalculator.estimatedFeeFor(message: text)
+			let fee = feeCalculator.estimatedFeeFor(message: .text(text))
 			setEstimatedFee(fee)
 		} else {
 			setEstimatedFee(0)