tweaks

wallet_app/android/app/src/main/java/com/example/walletapp/data/datasource/CoinGeckoApi.kt → wallet_app/android/app/src/main/java/com/example/walletapp/data/coins/CoinGeckoApi.kt

@@ -1,4 +1,4 @@
-package com.example.walletapp.data.datasource
+package com.example.walletapp.data.coins
 
 import retrofit2.Response
 import retrofit2.http.GET
@@ -17,4 +17,4 @@ interface CoinGeckoApi {
         @Query("ids") ids: String, // Comma-separated token IDs
         @Query("vs_currencies") vsCurrencies: String // Comma-separated currency codes
     ): GetTokenPriceResponse
-}
+}

wallet_app/android/app/src/main/java/com/example/walletapp/data/repository/CoinRepository.kt → wallet_app/android/app/src/main/java/com/example/walletapp/data/coins/CoinRepository.kt

@@ -1,10 +1,8 @@
-package com.example.walletapp.data.repository
+package com.example.walletapp.data.coins
 
 import com.example.walletapp.di.RetrofitClient
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import retrofit2.Response
-import com.example.walletapp.data.datasource.GetTokenPriceResponse
 
 class CoinRepository {
     suspend fun getTokenPrices(

wallet_app/android/app/src/main/java/com/example/walletapp/di/RetrofitClient.kt

@@ -1,6 +1,6 @@
 package com.example.walletapp.di
 
-import com.example.walletapp.data.datasource.CoinGeckoApi
+import com.example.walletapp.data.coins.CoinGeckoApi
 
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory

wallet_app/android/app/src/main/java/com/example/walletapp/model/Account.kt

@@ -1,5 +1,5 @@
 package com.example.walletapp.model
 
-class Account {
-    var address: String = ""
-}
+data class Account (
+    val address: String
+)

wallet_app/android/app/src/main/java/com/example/walletapp/model/Token.kt

@@ -1,6 +1,6 @@
 package com.example.walletapp.model
 
-class Token {
-    var address: String = ""
-    var symbol: String = ""
-}
+class Token (
+    val address: String,
+    val symbol: String
+)

wallet_app/android/app/src/main/java/com/example/walletapp/model/User.kt

@@ -1,13 +1,18 @@
 package com.example.walletapp.model
 
-class User {
-    private var accounts: Array<Account> = emptyArray();
+data class User (
+    val accounts: Array<Account>
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
 
-    fun hasAccount(): Boolean {
-        return accounts.isNotEmpty()
+        other as User
+
+        return accounts.contentEquals(other.accounts)
     }
 
-    fun getAccounts(): Array<Account> {
-        return accounts
+    override fun hashCode(): Int {
+        return accounts.contentHashCode()
     }
 }

wallet_app/android/app/src/main/java/com/example/walletapp/ui/account/CoinViewModel.kt

@@ -6,7 +6,7 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.launch
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.State
-import com.example.walletapp.data.repository.CoinRepository
+import com.example.walletapp.data.coins.CoinRepository
 
 class CoinViewModel : ViewModel() {
     private val repository = CoinRepository()

wallet_app/android/app/src/main/java/com/example/walletapp/ui/account/WalletScreen.kt

@@ -94,8 +94,9 @@ fun Wallet(modifier: Modifier, onNewTokenPress: () -> Unit, onReceivePress: () -
     val prices by coinViewModel.prices
     val errorMessage by coinViewModel.errorMessage
 
+    // TODO: 
     LaunchedEffect(Unit) {
-        coinViewModel.getTokenPrices(ids = "starknet,ethereum", vsCurrencies = "usd")  // Fetch starknet and bitcoin prices in USD
+        coinViewModel.getTokenPrices(ids = "starknet,ethereum", vsCurrencies = "usd")
     }
 
     LaunchedEffect (Unit){