#

BeamMW · Jun 11, 2020 · cc90ac3 · cc90ac3
1 parent 536fe05
commit cc90ac3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/BeamWallet/BeamSDK/WalletModel.mm b/BeamWallet/BeamSDK/WalletModel.mm
@@ -1090,8 +1090,17 @@
 }
 
 NSString* WalletModel::GetUTXOTypeString(beam::wallet::Coin coin) {
+ NSLog(@"%d",coin.m_ID.m_Type);
  switch (coin.m_ID.m_Type)
  {
+ case Key::Type::Asset:
+ return [[@"Asset" localized] lowercaseString];
+ case Key::Type::Decoy:
+ return [[@"Decoy" localized] lowercaseString];
+ case Key::Type::Bbs:
+ return [[@"BBS" localized] lowercaseString];
+ case Key::Type::ChildKey:
+ return [[@"ChildKey" localized] lowercaseString];
  case Key::Type::Comission:
  return [[@"transaction_fee" localized] lowercaseString];
  case Key::Type::Coinbase:
@@ -1100,6 +1109,7 @@
  return [[@"regular" localized] lowercaseString];
  case Key::Type::Change:
  return [[@"utxo_type_change" localized] lowercaseString];
+
  case Key::Type::Treasury: {
  return [[@"treasury" localized] lowercaseString];
  }

diff --git a/BeamWallet/ViewControllers/Login/OpenWalletProgressViewController.swift b/BeamWallet/ViewControllers/Login/OpenWalletProgressViewController.swift
@@ -367,8 +367,12 @@ extension OpenWalletProgressViewController : WalletModelDelegate {
 
  let percent = (Float64(done) / Float64(total)) * Float64(100)
 
- if done == total || percent >= 99.9 {
+ print(percent)
+
+ if done == total {
  if !strongSelf.stopRestore {
+ print("stop")
+
  strongSelf.stopRestore = true
 
  let deadlineTime = DispatchTime.now() + .seconds(4)