Merge pull request #1134 from soramitsu/fixes/for342

Author: PankraSerg

common/src/main/java/jp/co/soramitsu/common/utils/NumberFormatters.kt

@@ -11,10 +11,10 @@ import jp.co.soramitsu.common.utils.formatting.FullPrecisionFormatter
 import jp.co.soramitsu.common.utils.formatting.NumberAbbreviation
 import java.math.BigDecimal
 import java.math.RoundingMode
-import java.text.DateFormat
 import java.text.DecimalFormat
 import java.text.SimpleDateFormat
 import java.util.Date
+import java.util.Locale
 import java.util.concurrent.TimeUnit
 import jp.co.soramitsu.common.utils.formatting.FiatSmallFormatter
 
@@ -103,7 +103,7 @@ fun Long.formatDateTime(context: Context) = DateUtils.getRelativeDateTimeString(
 
 fun Long.formatDateTime(): String = SimpleDateFormat.getDateInstance().format(Date(this))
 
-fun Long.formatTime(): String = DateFormat.getTimeInstance(DateFormat.MEDIUM).format(Date(this))
+fun Long.formatTime(): String = SimpleDateFormat("HH:mm", Locale.getDefault()).format(Date(this))
 
 fun decimalFormatterFor(pattern: String) = DecimalFormat(pattern).apply {
     roundingMode = RoundingMode.FLOOR

feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/data/historySource/SubsquidHistorySource.kt

@@ -37,7 +37,7 @@ class SubsquidHistorySource(
             val transfer = TransactionFilter.TRANSFER.isAppliedOrNull(filters)?.let { transferApplied ->
                 it.transfer?.let { transfer ->
                     Operation(
-                        id = it.extrinsicIdx ?: it.id,
+                        id = it.id,
                         address = it.address,
                         time = it.timestampMillis,
                         chainAsset = chainAsset,