u2

Author: saledjenic

services/communitytokens/communitytokensdatabase/database.go

@@ -47,7 +47,7 @@ func (db *Database) GetTokenPrivilegesLevel(chainID uint64, contractAddress stri
 }
 
 func (db *Database) GetTokens() ([]*token.CommunityToken, error) {
-	rows, err := db.db.Query(`SELECT community_id, address, name, symbol, chain_id, decimals, type FROM community_tokens`)
+	rows, err := db.db.Query(`SELECT community_id, address, name, symbol, chain_id, decimals, type, image_base64 FROM community_tokens`)
 	if err != nil {
 		return nil, err
 	}
@@ -56,7 +56,7 @@ func (db *Database) GetTokens() ([]*token.CommunityToken, error) {
 	var result []*token.CommunityToken
 	for rows.Next() {
 		token := token.CommunityToken{}
-		err := rows.Scan(&token.CommunityID, &token.Address, &token.Name, &token.Symbol, &token.ChainID, &token.Decimals, &token.TokenType)
+		err := rows.Scan(&token.CommunityID, &token.Address, &token.Name, &token.Symbol, &token.ChainID, &token.Decimals, &token.TokenType, &token.Base64Image)
 		if err != nil {
 			return nil, err
 		}

services/wallet/token/community_token.go

@@ -132,34 +132,11 @@ func (tm *Manager) getDiscoveredTokens(onlyCommunityCustoms bool) ([]*tokentypes
 }
 
 func (tm *Manager) GetCustoms(onlyCommunityCustoms bool) ([]*tokentypes.Token, error) {
-	communityTokens, err := tm.communityTokensDB.GetTokens()
-	if err != nil {
-		return nil, err
-	}
-
 	var (
 		result         []*tokentypes.Token
 		processedToken = make(map[string]struct{})
 	)
 
-	for _, communityToken := range communityTokens {
-		token := &tokentypes.Token{
-			Token: &types.Token{
-				Address:  common.HexToAddress(communityToken.Address),
-				Name:     communityToken.Name,
-				Symbol:   communityToken.Symbol,
-				Decimals: uint(communityToken.Decimals),
-				ChainID:  uint64(communityToken.ChainID),
-			},
-			CommunityData: &tokentypes.CommunityData{
-				ID: communityToken.CommunityID,
-			},
-		}
-
-		processedToken[token.Key()] = struct{}{}
-		result = append(result, token)
-	}
-
 	discoveredTokens, err := tm.getDiscoveredTokens(onlyCommunityCustoms)
 	if err != nil {
 		return nil, err
@@ -173,6 +150,32 @@ func (tm *Manager) GetCustoms(onlyCommunityCustoms bool) ([]*tokentypes.Token, e
 		result = append(result, discoveredToken)
 	}
 
+	if onlyCommunityCustoms {
+		communityTokens, err := tm.communityTokensDB.GetTokens()
+		if err != nil {
+			return nil, err
+		}
+
+		for _, communityToken := range communityTokens {
+			token := &tokentypes.Token{
+				Token: &types.Token{
+					Address:  common.HexToAddress(communityToken.Address),
+					Name:     communityToken.Name,
+					Symbol:   communityToken.Symbol,
+					Decimals: uint(communityToken.Decimals),
+					ChainID:  uint64(communityToken.ChainID),
+					LogoURI:  communityToken.Base64Image,
+				},
+				CommunityData: &tokentypes.CommunityData{
+					ID: communityToken.CommunityID,
+				},
+			}
+
+			processedToken[token.Key()] = struct{}{}
+			result = append(result, token)
+		}
+	}
+
 	return result, nil
 }