Merge branch 'yuji/fix-duplicate-balance' (#2126)

.changelog/unreleased/bug-fixes/2125-fix-duplicate-balance.md

@@ -0,0 +1,2 @@
+- Fix balance query not to return duplicate results
+  ([\#2125](https://github.com/anoma/namada/issues/2125))

apps/src/lib/client/rpc.rs

@@ -656,16 +656,23 @@ async fn query_tokens<'a>(
     owner: Option<&Address>,
 ) -> BTreeMap<String, Address> {
     let wallet = context.wallet().await;
+    let mut base_token = base_token;
     // Base tokens
     let mut tokens = match base_token {
         Some(base_token) => {
             let mut map = BTreeMap::new();
-            map.insert(wallet.lookup_alias(base_token), base_token.clone());
+            if let Some(alias) = wallet.find_alias(base_token) {
+                map.insert(alias.to_string(), base_token.clone());
+            }
             map
         }
         None => wallet.tokens_with_aliases(),
     };
 
+    // Check all IBC denoms if the token isn't an pre-existing token
+    if tokens.is_empty() {
+        base_token = None;
+    }
     let prefixes = match (base_token, owner) {
         (Some(base_token), Some(owner)) => vec![
             ibc_denom_key_prefix(Some(base_token.to_string())),