prevent removing default assets

api/walletApi-V0.yml

@@ -283,13 +283,13 @@ paths:
       operationId: SignMessage
       description: Sign a message using the account associated with the provided nickname in the path.
       parameters:
-          - $ref: "#/parameters/nickname"
-          - in: body
-            name: body
-            required: true
-            x-nullable: false
-            schema:
-              $ref: "#/definitions/SignMessageRequest"
+        - $ref: "#/parameters/nickname"
+        - in: body
+          name: body
+          required: true
+          x-nullable: false
+          schema:
+            $ref: "#/definitions/SignMessageRequest"
       produces:
         - application/json
       responses:
@@ -753,3 +753,5 @@ definitions:
         properties:
           balance:
             type: string
+          isDefault:
+            type: boolean

internal/handler/wallet/get_all_assets.go

@@ -79,6 +79,7 @@ func (g *getAllAssets) getMASAsset(acc *account.Account) (*models.AssetInfoWithB
 	massaAsset := &models.AssetInfoWithBalance{
 		AssetInfo: assets.MASInfo(),
 		Balance:   fmt.Sprint(infos[0].CandidateBalance),
+		IsDefault: true,
 	}
 
 	return massaAsset, nil
@@ -90,31 +91,41 @@ func (g *getAllAssets) getAssetsData(acc *account.Account) ([]*models.AssetInfoW
 		logger.Errorf("Failed to get default assets: %s", err.Error())
 	}
 
-	assetsInfo := make([]models.AssetInfo, 0)
+	assetsInfo := make([]*models.AssetInfoWithBalance, 0)
 
 	// Initialize map to track addressed already added
 	includedAddresses := map[string]bool{}
 
 	for _, asset := range defaultAssets {
-		assetsInfo = append(assetsInfo, asset)
+		completeAsset := &models.AssetInfoWithBalance{
+			AssetInfo: asset,
+			Balance:   "",
+			IsDefault: true,
+		}
+		assetsInfo = append(assetsInfo, completeAsset)
 		includedAddresses[asset.Address] = true
 	}
 
 	// Append default assets ensuring no duplication
 	for _, asset := range g.AssetsStore.Assets[acc.Nickname].ContractAssets {
 		// Append the asset info to the result slice if it is not already in the list
 		if _, exists := includedAddresses[asset.Address]; !exists {
-			assetsInfo = append(assetsInfo, asset)
+			completeAsset := &models.AssetInfoWithBalance{
+				AssetInfo: asset,
+				Balance:   "",
+				IsDefault: false,
+			}
+			assetsInfo = append(assetsInfo, completeAsset)
 			includedAddresses[asset.Address] = true
 		}
 	}
 
 	assetsWithBalance := make([]*models.AssetInfoWithBalance, 0)
 
 	// Retrieve all assets from the selected nickname
-	for _, assetInfo := range assetsInfo {
+	for _, asset := range assetsInfo {
 		// Fetch the balance for the current asset
-		balance, resp := g.fetchAssetData(assetInfo.Address, acc)
+		balance, resp := g.fetchAssetData(asset.Address, acc)
 		if resp != nil {
 			return nil, resp
 		}
@@ -124,13 +135,8 @@ func (g *getAllAssets) getAssetsData(acc *account.Account) ([]*models.AssetInfoW
 			continue
 		}
 
-		// Create the asset info with balance and append it to the result slice
-		assetWithBalance := &models.AssetInfoWithBalance{
-			AssetInfo: assetInfo,
-			Balance:   *balance,
-		}
-
-		assetsWithBalance = append(assetsWithBalance, assetWithBalance)
+		asset.Balance = *balance
+		assetsWithBalance = append(assetsWithBalance, asset)
 	}
 
 	return assetsWithBalance, nil

web-frontend/src/models/AssetModel.ts

@@ -4,4 +4,5 @@ export interface Asset {
   symbol: string;
   decimals: number;
   balance: string;
+  isDefault: boolean;
 }

web-frontend/src/pages/Assets/AssetsList.tsx

@@ -42,7 +42,7 @@ export function AssetsList(props: AssetsListProps) {
           decimals={token.decimals}
           balance={token.balance}
           key={index}
-          disable={token?.symbol === MAS ? true : false}
+          disable={token?.isDefault}
           onDelete={() => {
             handleDelete(token.address);
           }}