Merge branch 'ui_develop' into develop

src/common/mnemonic-encoding.cpp

@@ -3379,6 +3379,12 @@ namespace tools
       return wordsArray[n];
     }
 
+    bool valid_word(const std::string& w)
+    {
+      auto it = wordsMap.find(w);
+      return it != wordsMap.end();
+    }
+
     uint64_t num_by_word(const std::string& w)
     {
       auto it = wordsMap.find(w);

src/common/mnemonic-encoding.h

@@ -46,5 +46,6 @@ namespace tools
 		std::string binary2text(const std::vector<unsigned char>& binary);
     std::string word_by_num(uint32_t n);
     uint64_t num_by_word(const std::string& w);
+    bool valid_word(const std::string& w);
 	}
 }

src/currency_core/account.cpp

@@ -232,6 +232,13 @@ namespace currency
     std::list<std::string> words;
     boost::split(words, seed_phrase, boost::is_space());
 
+    //let's validate each word 
+    for (const auto& w: words)
+    {
+      if (!tools::mnemonic_encoding::valid_word(words))
+        return false;
+    }
+
     std::string timestamp_word;
     if (words.size() == SEED_PHRASE_V1_WORDS_COUNT)
     {

src/gui/qt-daemon/application/mainwindow.cpp

@@ -1989,6 +1989,7 @@ QString MainWindow::get_seed_phrase_info(const QString& param)
   PREPARE_ARG_FROM_JSON(view::seed_info_param, rwtp);
   PREPARE_RESPONSE(view::seed_phrase_info, ar);
   ar.error_code = m_backend.get_seed_phrase_info(rwtp.seed_phrase, rwtp.seed_password, ar.response_data).c_str();
+  LOG_PRINT_CYAN("[get_seed_phrase_info]:" << epee::serialization::store_t_to_json(ar), LOG_LEVEL_0);
   return MAKE_RESPONSE(ar);
   CATCH_ENTRY_FAIL_API_RESPONCE();
 }

src/gui/qt-daemon/html_source/src/app/wallet/wallet.component.html

@@ -16,7 +16,7 @@
     </div>
   </div>
   <div>
-    <button [routerLink]="['/details']" routerLinkActive="active" tooltip="{{ 'WALLET.TOOLTIPS.SETTINGS' | translate }}" placement="left" tooltipClass="table-tooltip account-tooltip" [delay]="500" [timeDelay]="500" [disabled]="variablesService.daemon_state !== 2">
+    <button [routerLink]="['/details']" routerLinkActive="active" tooltip="{{ 'WALLET.TOOLTIPS.SETTINGS' | translate }}" placement="left" tooltipClass="table-tooltip account-tooltip" [delay]="500" [timeDelay]="500" [disabled]="variablesService.daemon_state !== 2 || !walletLoaded">
       <i class="icon details"></i>
     </button>
   </div>

src/gui/qt-daemon/html_source/src/app/wallet/wallet.component.ts

@@ -27,6 +27,7 @@ export class WalletComponent implements OnInit, OnDestroy {
   copyAnimation = false;
   copyAnimationTimeout;
   balanceTooltip;
+  walletLoaded;
   activeTab = 'history';
   public mining = false;
   public currentPage = 1;
@@ -203,6 +204,7 @@ export class WalletComponent implements OnInit, OnDestroy {
         this.variablesService.currentWallet.wakeAlias = false;
       }
     });
+    this.updateWalletStatus();
   }
   resetPaginationValues() {
     this.ngZone.run(() => {
@@ -369,4 +371,13 @@ export class WalletComponent implements OnInit, OnDestroy {
     clearTimeout(this.copyAnimationTimeout);
   }
 
+  updateWalletStatus() {
+    this.backend.eventSubscribe('update_wallet_status', (data) => {
+      const wallet_state = data.wallet_state;
+      this.walletLoaded = false;
+      if (wallet_state === 2) {
+        this.walletLoaded = true;
+      }
+    });
+  }
 }