Merge pull request #118 from KeystoneHQ/bug-fix

fix spaniese issues

Author: caixiao-QA

app/src/main/java/com/keystone/cold/ui/fragment/main/web3/EthFeeMarketTxFragment.java

@@ -84,9 +84,9 @@ protected void init(View view) {
         coinListViewModel.loadETHTx(bundle.getString(KEY_TX_ID)).observe(this, genericETHTxEntity -> {
             this.genericETHTxEntity = genericETHTxEntity;
             if (this.genericETHTxEntity != null) {
-                double maxPriorityFee = Double.parseDouble(genericETHTxEntity.getMaxPriorityFeePerGas().replaceAll("[^0-9\\\\.]", ""));
+                double maxPriorityFee = genericETHTxEntity.getMaxPriorityFeePerGasValue().doubleValue();
                 boolean isMaxPriorityFeeExceeded = maxPriorityFee > MAX_PRIORITY_PER_GAS;
-                double maxfee = Double.parseDouble(genericETHTxEntity.getMaxFeePerGas().replaceAll("[^0-9\\\\.]", ""));
+                double maxfee = genericETHTxEntity.getMaxFeePerGasValue().doubleValue();
                 boolean isMaxFeeExceeded = maxfee > MAX_FEE_PER_GAS;
                 isExceeded = isMaxPriorityFeeExceeded || isMaxFeeExceeded;
                 updateUI();

app/src/main/java/com/keystone/cold/ui/fragment/main/web3/EthLegacyTxFragment.java

@@ -79,7 +79,7 @@ protected void init(View view) {
         coinListViewModel.loadETHTx(bundle.getString(KEY_TX_ID)).observe(this, genericETHTxEntity -> {
             this.genericETHTxEntity = genericETHTxEntity;
             if (this.genericETHTxEntity != null) {
-                if (viewModel.getGasPrice(genericETHTxEntity.getFee(), genericETHTxEntity.getGasLimit()).doubleValue() > MAX_PER_GAS) {
+                if (viewModel.getGasPrice(genericETHTxEntity.getFeeValue(), genericETHTxEntity.getGasLimitValue()).doubleValue() > MAX_PER_GAS) {
                     isExceeded = true;
                 }
                 updateUI();

app/src/main/java/com/keystone/cold/ui/fragment/main/web3/EthTxConfirmFragment.java

@@ -319,7 +319,7 @@ protected void initData(Bundle savedInstanceState) {
         viewModel.getObservableEthTx().observe(this, genericETHTxEntity -> {
             this.genericETHTxEntity = genericETHTxEntity;
             if (this.genericETHTxEntity != null) {
-                if (viewModel.getGasPrice(genericETHTxEntity.getFee(), genericETHTxEntity.getGasLimit()).doubleValue() > MAX_PER_GAS) {
+                if (viewModel.getGasPrice(genericETHTxEntity.getFeeValue(), genericETHTxEntity.getGasLimitValue()).doubleValue() > MAX_PER_GAS) {
                     isExceeded = true;
                 }
                 updateUI();

app/src/main/java/com/keystone/cold/viewmodel/tx/GenericETHTxEntity.java

@@ -99,6 +99,7 @@ public static GenericETHTxEntity transformDbEntity(Web3TxEntity web3TxEntity) {
                     genericETHTxEntity.setAmountValue(amount);
                     genericETHTxEntity.setAmount(nf.format(value) + Web3TxViewModel.getSymbol(chainId));
                     genericETHTxEntity.setFee(nf.format(fee) + Web3TxViewModel.getSymbol(chainId));
+                    genericETHTxEntity.setFeeValue(fee);
                     JSONObject addition = new JSONObject(web3TxEntity.getAddition());
                     genericETHTxEntity.setFromTFCard(addition.getBoolean("isFromTFCard"));
                     break;

app/src/main/java/com/keystone/cold/viewmodel/tx/Web3TxViewModel.java

@@ -589,6 +589,12 @@ public BigDecimal getGasPrice(String fee, String limit) {
         return value.divide(gasLimit.multiply(BigDecimal.TEN.pow(9)), 8, BigDecimal.ROUND_HALF_UP);
     }
 
+    public BigDecimal getGasPrice(BigDecimal feeValue, BigDecimal limitValue) {
+        if (limitValue == null) return new BigDecimal(-1);
+        BigDecimal value = feeValue.multiply(BigDecimal.TEN.pow(18));
+        return value.divide(limitValue.multiply(BigDecimal.TEN.pow(9)), 8, BigDecimal.ROUND_HALF_UP);
+    }
+
     public static String getSymbol(int chainId) {
         String symbol = " ";
         if (chainIdJSONObject != null) {