From a47e9ebfe7d7acf57f500ee9983dc8009217c431 Mon Sep 17 00:00:00 2001
From: polstianka <peer_id@yahoo.com>
Date: Fri, 31 May 2024 04:34:35 -0400
Subject: [PATCH] BigInteger for coins, token manager, wallets sorting

---
 .idea/.name                                   |   2 +-
 .idea/gradle.xml                              |   1 -
 apps/signer/build.gradle.kts                  |   4 +-
 apps/signer/src/main/AndroidManifest.xml      |   4 +-
 .../signer/screen/sign/SignViewModel.kt       |   5 +-
 .../main/java/com/tonapps/wallet/api/API.kt   |  10 +-
 .../wallet/api/entity/BalanceEntity.kt        |   7 +-
 .../tonapps/wallet/api/entity/TokenEntity.kt  |  10 ++
 .../api/src/main/res/drawable/ic_usdt.xml     |  12 ++
 .../data/events/entities/ActionEntity.kt      |   8 +-
 apps/wallet/data/rates/build.gradle.kts       |   1 +
 .../wallet/data/rates/RatesRepository.kt      |  12 +-
 .../wallet/data/rates/entity/RateEntity.kt    |  17 +-
 .../wallet/data/rates/entity/RatesEntity.kt   |  15 +-
 apps/wallet/data/settings/build.gradle.kts    |   1 -
 .../data/settings/SettingsRepository.kt       |  33 ++++
 .../settings/entities/TokenPrefsEntity.kt     |   7 +
 .../settings/entities/WalletPrefsEntity.kt    |   5 +
 .../settings/folder/BaseSettingsFolder.kt     |  45 +++++
 .../data/settings/folder/TokenPrefsFolder.kt  |  60 +++++++
 .../data/settings/folder/WalletPrefsFolder.kt |  34 ++++
 apps/wallet/data/tokens/build.gradle.kts      |   1 +
 .../wallet/data/token/TokenRepository.kt      |  14 +-
 .../data/token/entities/AccountTokenEntity.kt |  14 +-
 .../data/token/entities/TokenRateEntity.kt    |   5 +-
 .../data/token/source/RemoteDataSource.kt     |  27 ++-
 apps/wallet/instance/build.gradle.kts         |   4 +-
 .../com/tonapps/tonkeeper/api/Extensions.kt   |  12 +-
 .../core/entities/TokenExtendedEntity.kt      |  52 ++++++
 .../core/entities/WalletExtendedEntity.kt     |  13 ++
 .../tonkeeper/core/history/HistoryHelper.kt   |  80 ++++-----
 .../widget/balance/WidgetBalanceProvider.kt   |   4 +-
 .../core/widget/rate/WidgetRateProvider.kt    |   2 +-
 .../tonkeeper/extensions/Navigation.kt        |   2 +-
 .../tonkeeper/fragment/send/SendScreen.kt     |  15 +-
 .../fragment/send/TransactionData.kt          |  18 +-
 .../fragment/send/amount/AmountScreen.kt      |   9 +-
 .../send/amount/AmountScreenFeature.kt        |  46 +++--
 .../fragment/send/amount/AmountScreenState.kt |   3 +-
 .../send/confirm/ConfirmScreenFeature.kt      |  25 +--
 .../send/confirm/ConfirmScreenState.kt        |   3 +-
 .../fragment/send/popup/SelectTokenPopup.kt   |   2 +-
 .../fragment/send/view/AmountInput.kt         |   7 +-
 .../com/tonapps/tonkeeper/koin/KoinModule.kt  |  12 +-
 .../ui/screen/events/EventsViewModel.kt       |   9 -
 .../tonkeeper/ui/screen/init/InitViewModel.kt |   8 +-
 .../tonkeeper/ui/screen/main/MainScreen.kt    |   8 +-
 .../ui/screen/picker/PickerScreen.kt          |  49 -----
 .../tonkeeper/ui/screen/picker/list/Holder.kt | 111 ------------
 .../screen/picker/list/WalletPickerAdapter.kt |  65 -------
 .../tonkeeper/ui/screen/root/RootActivity.kt  |   2 +-
 .../tonkeeper/ui/screen/root/RootEvent.kt     |   3 +-
 .../tonkeeper/ui/screen/root/RootViewModel.kt |  33 ++--
 .../settings/language/LanguageScreen.kt       |   1 -
 .../tonkeeper/ui/screen/token/TokenData.kt    |   5 +-
 .../ui/screen/token/TokenViewModel.kt         |   6 +-
 .../screen/wallet/{ => main}/WalletScreen.kt  |   6 +-
 .../screen/wallet/{ => main}/WalletTokens.kt  |   2 +-
 .../wallet/{ => main}/WalletViewModel.kt      |  60 ++++---
 .../ui/screen/wallet/{ => main}/list/Item.kt  |  68 +++----
 .../wallet/{ => main}/list/WalletAdapter.kt   |  19 +-
 .../{ => main}/list/holder/ActionsHolder.kt   |   4 +-
 .../{ => main}/list/holder/BalanceHolder.kt   |   6 +-
 .../wallet/{ => main}/list/holder/Holder.kt   |   4 +-
 .../wallet/main/list/holder/ManageHolder.kt   |  24 +++
 .../{ => main}/list/holder/PushHolder.kt      |   4 +-
 .../{ => main}/list/holder/SkeletonHolder.kt  |   4 +-
 .../{ => main}/list/holder/SpaceHolder.kt     |   4 +-
 .../{ => main}/list/holder/TitleHolder.kt     |   4 +-
 .../{ => main}/list/holder/TokenHolder.kt     |   4 +-
 .../wallet/manage/TokensManageScreen.kt       |  72 ++++++++
 .../wallet/manage/TokensManageViewModel.kt    | 109 +++++++++++
 .../ui/screen/wallet/manage/list/Adapter.kt   |  63 +++++++
 .../ui/screen/wallet/manage/list/Item.kt      |  51 ++++++
 .../wallet/manage/list/holder/Holder.kt       |  11 ++
 .../wallet/manage/list/holder/SpaceHolder.kt  |  12 ++
 .../wallet/manage/list/holder/TitleHolder.kt  |  24 +++
 .../wallet/manage/list/holder/TokenHolder.kt  |  79 ++++++++
 .../ui/screen/wallet/picker/PickerScreen.kt   | 119 ++++++++++++
 .../{ => wallet}/picker/PickerViewModel.kt    |  17 +-
 .../screen/{ => wallet}/picker/list/Item.kt   |   5 +-
 .../wallet/picker/list/WalletPickerAdapter.kt | 104 +++++++++++
 .../wallet/picker/list/holder/AddHolder.kt    |  24 +++
 .../wallet/picker/list/holder/Holder.kt       |  18 ++
 .../picker/list/holder/SkeletonHolder.kt      |  20 +++
 .../wallet/picker/list/holder/WalletHolder.kt |  87 +++++++++
 .../res/layout/fragment_wallet_picker.xml     |  20 ---
 .../src/main/res/layout/view_wallet_item.xml  |  29 +++
 .../main/res/layout/view_wallet_manage.xml    |  16 ++
 .../res/layout/view_wallet_manage_space.xml   |   4 +
 .../res/layout/view_wallet_manage_title.xml   |  22 +++
 .../res/layout/view_wallet_manage_token.xml   |  66 +++++++
 .../src/main/res/values-ru/strings.xml        |   4 +
 .../src/main/res/values/strings.xml           |   5 +
 lib/blockchain/build.gradle.kts               |   1 +
 .../main/java/com/tonapps/blockchain/Coin.kt  | 110 ------------
 .../main/java/com/tonapps/blockchain/Coins.kt | 125 +++++++++++++
 .../tonapps/extensions/SharedPreferences.kt   |   8 +
 .../java/com/tonapps/icu/CurrencyFormatter.kt | 169 ++++--------------
 .../main/java/uikit/base/BaseListFragment.kt  |  19 +-
 .../src/main/java/uikit/widget/HeaderView.kt  |   5 +
 .../src/main/java/uikit/widget/ModalView.kt   |   4 +-
 .../src/main/res/layout/fragment_list.xml     |  11 +-
 .../res/drawable/ic_eye_closed_outline_28.xml |  16 ++
 .../main/res/drawable/ic_eye_outline_28.xml   |  10 ++
 .../res/drawable/ic_pencil_outline_28.xml     |  13 ++
 .../icon/src/main/res/drawable/ic_pin_28.xml  |  13 ++
 .../src/main/res/drawable/ic_reorder_28.xml   |  15 ++
 108 files changed, 1860 insertions(+), 816 deletions(-)
 create mode 100644 apps/wallet/api/src/main/res/drawable/ic_usdt.xml
 create mode 100644 apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/entities/TokenPrefsEntity.kt
 create mode 100644 apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/entities/WalletPrefsEntity.kt
 create mode 100644 apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/BaseSettingsFolder.kt
 create mode 100644 apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/TokenPrefsFolder.kt
 create mode 100644 apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/WalletPrefsFolder.kt
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/entities/TokenExtendedEntity.kt
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/entities/WalletExtendedEntity.kt
 delete mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/PickerScreen.kt
 delete mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/list/Holder.kt
 delete mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/list/WalletPickerAdapter.kt
 rename apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/{ => main}/WalletScreen.kt (92%)
 rename apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/{ => main}/WalletTokens.kt (95%)
 rename apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/{ => main}/WalletViewModel.kt (89%)
 rename apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/{ => main}/list/Item.kt (82%)
 rename apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/{ => main}/list/WalletAdapter.kt (57%)
 rename apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/{ => main}/list/holder/ActionsHolder.kt (93%)
 rename apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/{ => main}/list/holder/BalanceHolder.kt (96%)
 rename apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/{ => main}/list/holder/Holder.kt (64%)
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/ManageHolder.kt
 rename apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/{ => main}/list/holder/PushHolder.kt (91%)
 rename apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/{ => main}/list/holder/SkeletonHolder.kt (64%)
 rename apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/{ => main}/list/holder/SpaceHolder.kt (62%)
 rename apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/{ => main}/list/holder/TitleHolder.kt (74%)
 rename apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/{ => main}/list/holder/TokenHolder.kt (95%)
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/TokensManageScreen.kt
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/TokensManageViewModel.kt
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/Adapter.kt
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/Item.kt
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/holder/Holder.kt
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/holder/SpaceHolder.kt
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/holder/TitleHolder.kt
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/holder/TokenHolder.kt
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/PickerScreen.kt
 rename apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/{ => wallet}/picker/PickerViewModel.kt (69%)
 rename apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/{ => wallet}/picker/list/Item.kt (89%)
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/WalletPickerAdapter.kt
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/holder/AddHolder.kt
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/holder/Holder.kt
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/holder/SkeletonHolder.kt
 create mode 100644 apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/holder/WalletHolder.kt
 delete mode 100644 apps/wallet/instance/src/main/res/layout/fragment_wallet_picker.xml
 create mode 100644 apps/wallet/instance/src/main/res/layout/view_wallet_manage.xml
 create mode 100644 apps/wallet/instance/src/main/res/layout/view_wallet_manage_space.xml
 create mode 100644 apps/wallet/instance/src/main/res/layout/view_wallet_manage_title.xml
 create mode 100644 apps/wallet/instance/src/main/res/layout/view_wallet_manage_token.xml
 delete mode 100644 lib/blockchain/src/main/java/com/tonapps/blockchain/Coin.kt
 create mode 100644 lib/blockchain/src/main/java/com/tonapps/blockchain/Coins.kt
 create mode 100644 ui/uikit/icon/src/main/res/drawable/ic_eye_closed_outline_28.xml
 create mode 100644 ui/uikit/icon/src/main/res/drawable/ic_eye_outline_28.xml
 create mode 100644 ui/uikit/icon/src/main/res/drawable/ic_pencil_outline_28.xml
 create mode 100644 ui/uikit/icon/src/main/res/drawable/ic_pin_28.xml
 create mode 100644 ui/uikit/icon/src/main/res/drawable/ic_reorder_28.xml

diff --git a/.idea/.name b/.idea/.name
index d0206d0f3..72af3841f 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-Tonkeeper R
\ No newline at end of file
+TON Apps
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a3c9f9ba2..41c918331 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -39,7 +39,6 @@
             <option value="$PROJECT_DIR$/apps/wallet/instance" />
             <option value="$PROJECT_DIR$/apps/wallet/localization" />
             <option value="$PROJECT_DIR$/baselineprofile" />
-            <option value="$PROJECT_DIR$/baselineprofile/signer" />
             <option value="$PROJECT_DIR$/baselineprofile/x" />
             <option value="$PROJECT_DIR$/buildSrc" />
             <option value="$PROJECT_DIR$/core" />
diff --git a/apps/signer/build.gradle.kts b/apps/signer/build.gradle.kts
index 93036d9ed..b9a722a32 100644
--- a/apps/signer/build.gradle.kts
+++ b/apps/signer/build.gradle.kts
@@ -12,8 +12,8 @@ android {
         applicationId = Build.namespacePrefix("signer")
         minSdk = Build.minSdkVersion
         targetSdk = 34
-        versionCode = 13
-        versionName = "0.1.3"
+        versionCode = 14
+        versionName = "0.1.4"
     }
 
     lint {
diff --git a/apps/signer/src/main/AndroidManifest.xml b/apps/signer/src/main/AndroidManifest.xml
index d42b35282..a8cb387dd 100644
--- a/apps/signer/src/main/AndroidManifest.xml
+++ b/apps/signer/src/main/AndroidManifest.xml
@@ -79,12 +79,12 @@
         <service
             android:name="com.google.android.datatransport.runtime.backends.TransportBackendDiscovery"
             tools:node="remove" />
-        <receiver
+        <!--receiver
             android:name="androidx.profileinstaller.ProfileInstallReceiver"
             tools:node="remove" />
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="com.tonapps.signer.androidx-startup"
-            tools:node="remove"/>
+            tools:node="remove"/-->
     </application>
 </manifest>
\ No newline at end of file
diff --git a/apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignViewModel.kt b/apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignViewModel.kt
index 70c7b2344..fe5b2f730 100644
--- a/apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignViewModel.kt
+++ b/apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignViewModel.kt
@@ -41,6 +41,7 @@ import com.tonapps.security.vault.safeArea
 import com.tonapps.uikit.list.ListCell
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.receiveAsFlow
+import java.math.BigDecimal
 
 class SignViewModel(
     private val id: Long,
@@ -201,8 +202,8 @@ class SignViewModel(
     }
 
     private fun formatCoins(coins: Coins): String {
-        val value = coins.amount.toLong() / 1000000000L.toFloat()
-        return CurrencyFormatter.format("TON", value).toString()
+        val value = coins.amount.toLong() / 1000000000L.toDouble()
+        return CurrencyFormatter.format("TON", BigDecimal(value)).toString()
     }
 
     private fun parseAddress(address: MsgAddressInt, bounceable: Boolean = true): String {
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt
index 7873589ec..39ac16595 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt
@@ -1,13 +1,10 @@
 package com.tonapps.wallet.api
 
 import android.content.Context
-import android.os.SystemClock
 import android.util.ArrayMap
-import android.util.Log
-import com.tonapps.blockchain.Coin
+import com.tonapps.blockchain.Coins
 import com.tonapps.blockchain.ton.extensions.base64
 import com.tonapps.blockchain.ton.extensions.isValid
-import com.tonapps.extensions.ifPunycodeToUnicode
 import com.tonapps.extensions.locale
 import com.tonapps.extensions.unicodeToPunycode
 import com.tonapps.network.SSEvent
@@ -45,7 +42,6 @@ import org.json.JSONArray
 import org.json.JSONObject
 import org.ton.api.pub.PublicKeyEd25519
 import org.ton.cell.Cell
-import org.ton.crypto.base64
 import java.util.Locale
 import java.util.concurrent.TimeUnit
 
@@ -118,7 +114,7 @@ class API(
         testnet: Boolean
     ): BalanceEntity {
         val account = accounts(testnet).getAccount(accountId)
-        return BalanceEntity(TokenEntity.TON, Coin.toCoinsDouble(account.balance), accountId)
+        return BalanceEntity(TokenEntity.TON, Coins.of(account.balance), accountId)
     }
 
     fun getJettonsBalances(
@@ -131,7 +127,7 @@ class API(
                 accountId = accountId,
                 currencies = currency
             ).balances
-            return jettonsBalances.map { BalanceEntity(it) }.filter { it.value > 0 }
+            return jettonsBalances.map { BalanceEntity(it) }.filter { !it.value.isZero }
         } catch (e: Throwable) {
             return emptyList()
         }
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/BalanceEntity.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/BalanceEntity.kt
index 687d0edfe..d57cbf785 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/BalanceEntity.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/BalanceEntity.kt
@@ -1,8 +1,7 @@
 package com.tonapps.wallet.api.entity
 
 import android.os.Parcelable
-import android.util.Log
-import com.tonapps.blockchain.Coin
+import com.tonapps.blockchain.Coins
 import io.tonapi.models.JettonBalance
 import io.tonapi.models.TokenRates
 import kotlinx.parcelize.IgnoredOnParcel
@@ -11,7 +10,7 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 data class BalanceEntity(
     val token: TokenEntity,
-    val value: Double,
+    val value: Coins,
     val walletAddress: String
 ): Parcelable {
 
@@ -20,7 +19,7 @@ data class BalanceEntity(
 
     constructor(jettonBalance: JettonBalance) : this(
         token = TokenEntity(jettonBalance.jetton),
-        value = Coin.parseJettonBalance(jettonBalance.balance, jettonBalance.jetton.decimals),
+        value = Coins.of(jettonBalance.balance, jettonBalance.jetton.decimals),
         walletAddress = jettonBalance.walletAddress.address,
     ) {
         rates = jettonBalance.price
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/TokenEntity.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/TokenEntity.kt
index 6792e7343..ffff86cd6 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/TokenEntity.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/TokenEntity.kt
@@ -24,6 +24,7 @@ data class TokenEntity(
     companion object {
 
         val TON_ICON_URI = Uri.Builder().scheme("res").path(R.drawable.ic_ton_with_bg.toString()).build()
+        val USDT_ICON_URI = Uri.Builder().scheme("res").path(R.drawable.ic_usdt.toString()).build()
 
         val TON = TokenEntity(
             address = "TON",
@@ -34,6 +35,15 @@ data class TokenEntity(
             verification = Verification.whitelist
         )
 
+        val USDT = TokenEntity(
+            address = "0:b113a994b5024a16719f69139328eb759596c38a25f59028b146fecdc3621dfe",
+            name = "Tether USD",
+            symbol = "USD₮",
+            imageUri = USDT_ICON_URI,
+            decimals = 6,
+            verification = Verification.whitelist
+        )
+
         private fun convertVerification(verification: JettonVerificationType): Verification {
             return when (verification) {
                 JettonVerificationType.whitelist -> Verification.whitelist
diff --git a/apps/wallet/api/src/main/res/drawable/ic_usdt.xml b/apps/wallet/api/src/main/res/drawable/ic_usdt.xml
new file mode 100644
index 000000000..8a1c18678
--- /dev/null
+++ b/apps/wallet/api/src/main/res/drawable/ic_usdt.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="2500dp"
+    android:height="2500dp"
+    android:viewportWidth="2000"
+    android:viewportHeight="2000">
+  <path
+      android:pathData="M1000,0c552.3,0 1000,447.7 1000,1000s-447.8,1000 -1000,1000S0,1552.4 0,1000 447.7,0 1000,0"
+      android:fillColor="#53ae94"/>
+  <path
+      android:pathData="M1123.4,866.8V718h340.2V491.3H537.3V718H877.5v148.6C601,879.3 393.1,934.1 393.1,999.7s208,120.4 484.4,133.1v476.5h246V1132.8c276,-12.7 483.5,-67.5 483.5,-133s-207.5,-120.3 -483.5,-133m0,225.6v-0.1c-6.9,0.4 -42.6,2.6 -122,2.6 -63.5,0 -108.1,-1.8 -123.9,-2.6v0.2C633.3,1081.7 451,1039.1 451,988.2S633.4,894.8 877.6,884v166.1c16,1.1 61.8,3.8 124.9,3.8 75.9,0 114,-3.2 121,-3.8V884c243.8,10.9 425.7,53.4 425.7,104.2s-182,93.3 -425.7,104.2"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/apps/wallet/data/events/src/main/java/com/tonapps/wallet/data/events/entities/ActionEntity.kt b/apps/wallet/data/events/src/main/java/com/tonapps/wallet/data/events/entities/ActionEntity.kt
index c1dc79ad1..5701f9248 100644
--- a/apps/wallet/data/events/src/main/java/com/tonapps/wallet/data/events/entities/ActionEntity.kt
+++ b/apps/wallet/data/events/src/main/java/com/tonapps/wallet/data/events/entities/ActionEntity.kt
@@ -1,7 +1,7 @@
 package com.tonapps.wallet.data.events.entities
 
 import android.os.Parcelable
-import com.tonapps.blockchain.Coin
+import com.tonapps.blockchain.Coins
 import com.tonapps.wallet.api.entity.AccountEntity
 import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.collectibles.entities.NftEntity
@@ -21,7 +21,7 @@ data class ActionEntity(
     val recipient: AccountEntity? = null,
     val comment: String? = null,
     val token: TokenEntity? = null,
-    val amount: Double? = null,
+    val amount: Coins? = null,
     val nftAddress: String? = null,
     var nftEntity: NftEntity? = null
 ): Parcelable {
@@ -62,7 +62,7 @@ data class ActionEntity(
                 recipient = AccountEntity(tonTransfer.recipient, testnet),
                 comment = tonTransfer.comment,
                 token = TokenEntity.TON,
-                amount = Coin.toCoinsDouble(tonTransfer.amount)
+                amount = Coins.of(tonTransfer.amount)
             )
         }
 
@@ -76,7 +76,7 @@ data class ActionEntity(
                 recipient = jettonTransfer.recipient?.let { AccountEntity(it, testnet) },
                 comment = jettonTransfer.comment,
                 token = TokenEntity(jettonTransfer.jetton),
-                amount = Coin.parseJettonBalance(jettonTransfer.amount, jettonTransfer.jetton.decimals)
+                amount = Coins.of(jettonTransfer.amount, jettonTransfer.jetton.decimals)
             )
         }
 
diff --git a/apps/wallet/data/rates/build.gradle.kts b/apps/wallet/data/rates/build.gradle.kts
index d87b54d74..481f7fc79 100644
--- a/apps/wallet/data/rates/build.gradle.kts
+++ b/apps/wallet/data/rates/build.gradle.kts
@@ -27,6 +27,7 @@ dependencies {
     implementation(project(Dependence.Wallet.api))
     implementation(project(Dependence.Wallet.Data.core))
     implementation(project(Dependence.Module.tonApi))
+    implementation(project(Dependence.Lib.blockchain))
     implementation(project(Dependence.Lib.extensions))
 }
 
diff --git a/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/RatesRepository.kt b/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/RatesRepository.kt
index d07e228dd..142f93fd0 100644
--- a/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/RatesRepository.kt
+++ b/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/RatesRepository.kt
@@ -1,12 +1,15 @@
 package com.tonapps.wallet.data.rates
 
 import android.content.Context
+import com.tonapps.blockchain.Coins
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.core.WalletCurrency
+import com.tonapps.wallet.data.rates.entity.RateDiffEntity
 import com.tonapps.wallet.data.rates.entity.RateEntity
 import com.tonapps.wallet.data.rates.entity.RatesEntity
 import com.tonapps.wallet.data.rates.source.BlobDataSource
 import io.tonapi.models.TokenRates
+import java.math.BigDecimal
 
 class RatesRepository(
     context: Context,
@@ -37,7 +40,14 @@ class RatesRepository(
         }
         val entities = mutableListOf<RateEntity>()
         for (rate in rates) {
-            entities.add(RateEntity(currency, rate.key, rate.value))
+            val value = rate.value
+            val bigDecimal = value.prices?.get(currency.code) ?: BigDecimal.ZERO
+            entities.add(RateEntity(
+                tokenCode = rate.key,
+                currency = currency,
+                value = Coins(bigDecimal),
+                diff = RateDiffEntity(currency, value),
+            ))
         }
         localDataSource.add(currency, entities)
     }
diff --git a/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/entity/RateEntity.kt b/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/entity/RateEntity.kt
index d522fa547..f20f3d797 100644
--- a/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/entity/RateEntity.kt
+++ b/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/entity/RateEntity.kt
@@ -1,6 +1,7 @@
 package com.tonapps.wallet.data.rates.entity
 
 import android.os.Parcelable
+import com.tonapps.blockchain.Coins
 import com.tonapps.wallet.data.core.WalletCurrency
 import io.tonapi.models.TokenRates
 import kotlinx.parcelize.Parcelize
@@ -9,18 +10,6 @@ import kotlinx.parcelize.Parcelize
 data class RateEntity(
     val tokenCode: String,
     val currency: WalletCurrency,
-    val value: Float,
+    val value: Coins,
     val diff: RateDiffEntity
-): Parcelable {
-
-    constructor(
-        currency: WalletCurrency,
-        token: String,
-        rates: TokenRates
-    ) : this(
-        tokenCode = token,
-        currency = currency,
-        value = rates.prices?.get(currency.code)?.toFloat() ?: 0f,
-        diff = RateDiffEntity(currency, rates)
-    )
-}
\ No newline at end of file
+): Parcelable
\ No newline at end of file
diff --git a/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/entity/RatesEntity.kt b/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/entity/RatesEntity.kt
index d7da75d89..3ca74bc14 100644
--- a/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/entity/RatesEntity.kt
+++ b/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/entity/RatesEntity.kt
@@ -1,6 +1,7 @@
 package com.tonapps.wallet.data.rates.entity
 
 import android.os.Parcelable
+import com.tonapps.blockchain.Coins
 import com.tonapps.wallet.data.core.WalletCurrency
 import kotlinx.parcelize.Parcelize
 
@@ -45,27 +46,23 @@ data class RatesEntity(
         return map[token]
     }
 
-    fun rateValue(token: String): Float {
-        return rate(token)?.value ?: 0f
+    fun rateValue(token: String): Coins {
+        return rate(token)?.value ?: Coins.ZERO
     }
 
     fun rateDiff(token: String): RateDiffEntity? {
         return rate(token)?.diff
     }
 
-    fun convert(token: String, value: Float): Float {
+    fun convert(token: String, value: Coins): Coins {
         return value * rateValue(token)
     }
 
-    fun convert(token: String, value: Double): Double {
-        return value * rateValue(token)
-    }
-
-    fun convertFromFiat(token: String, value: Double): Double {
+    fun convertFromFiat(token: String, value: Coins): Coins {
         return value / rateValue(token)
     }
 
-    fun getRate(token: String): Float {
+    fun getRate(token: String): Coins {
         return rateValue(token)
     }
 
diff --git a/apps/wallet/data/settings/build.gradle.kts b/apps/wallet/data/settings/build.gradle.kts
index 79abf7db6..4d83c0331 100644
--- a/apps/wallet/data/settings/build.gradle.kts
+++ b/apps/wallet/data/settings/build.gradle.kts
@@ -21,7 +21,6 @@ android {
     }
 }
 
-
 dependencies {
     implementation(Dependence.KotlinX.coroutines)
     implementation(Dependence.Koin.core)
diff --git a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/SettingsRepository.kt b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/SettingsRepository.kt
index 6689cf0e6..d0ca58db9 100644
--- a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/SettingsRepository.kt
+++ b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/SettingsRepository.kt
@@ -1,19 +1,25 @@
 package com.tonapps.wallet.data.settings
 
 import android.content.Context
+import androidx.collection.ArrayMap
 import com.tonapps.extensions.MutableEffectFlow
 import com.tonapps.extensions.locale
 import com.tonapps.wallet.data.core.SearchEngine
 import com.tonapps.wallet.data.core.Theme
 import com.tonapps.wallet.data.core.WalletCurrency
+import com.tonapps.wallet.data.settings.entities.TokenPrefsEntity
+import com.tonapps.wallet.data.settings.folder.TokenPrefsFolder
+import com.tonapps.wallet.data.settings.folder.WalletPrefsFolder
 import com.tonapps.wallet.localization.Language
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
@@ -65,6 +71,11 @@ class SettingsRepository(
     val walletPush = _walletPush.stateIn(scope, SharingStarted.Eagerly, null).filterNotNull()
 
     private val prefs = context.getSharedPreferences(NAME, Context.MODE_PRIVATE)
+    private val tokenPrefsFolder = TokenPrefsFolder(context)
+    private val walletPrefsFolder = WalletPrefsFolder(context)
+
+    val tokenPrefsChangedFlow: Flow<Unit>
+        get() = tokenPrefsFolder.changedFlow
 
     val installId: String
         get() = prefs.getString(INSTALL_ID_KEY, null) ?: run {
@@ -172,6 +183,28 @@ class SettingsRepository(
         _walletPush.tryEmit(map)
     }
 
+    fun setTokenHidden(walletId: Long, tokenAddress: String, hidden: Boolean) {
+        tokenPrefsFolder.setHidden(walletId, tokenAddress, hidden)
+    }
+
+    fun setTokenPinned(walletId: Long, tokenAddress: String, pinned: Boolean) {
+        tokenPrefsFolder.setPinned(walletId, tokenAddress, pinned)
+    }
+
+    fun setTokensSort(walletId: Long, tokensAddress: List<String>) {
+        tokenPrefsFolder.setSort(walletId, tokensAddress)
+    }
+
+    fun setWalletsSort(walletIds: List<Long>) {
+        walletPrefsFolder.setSort(walletIds)
+    }
+
+    fun getWalletPrefs(walletId: Long) = walletPrefsFolder.get(walletId)
+
+    fun getTokenPrefs(walletId: Long, tokenAddress: String): TokenPrefsEntity {
+        return tokenPrefsFolder.get(walletId, tokenAddress)
+    }
+
     init {
         scope.launch(Dispatchers.IO) {
             _currencyFlow.tryEmit(currency)
diff --git a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/entities/TokenPrefsEntity.kt b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/entities/TokenPrefsEntity.kt
new file mode 100644
index 000000000..3e7c29b53
--- /dev/null
+++ b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/entities/TokenPrefsEntity.kt
@@ -0,0 +1,7 @@
+package com.tonapps.wallet.data.settings.entities
+
+data class TokenPrefsEntity(
+    val pinned: Boolean = false,
+    val hidden: Boolean = false,
+    val index: Int = -1,
+)
\ No newline at end of file
diff --git a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/entities/WalletPrefsEntity.kt b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/entities/WalletPrefsEntity.kt
new file mode 100644
index 000000000..3028a06d8
--- /dev/null
+++ b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/entities/WalletPrefsEntity.kt
@@ -0,0 +1,5 @@
+package com.tonapps.wallet.data.settings.entities
+
+data class WalletPrefsEntity(
+    val index: Int = -1,
+)
\ No newline at end of file
diff --git a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/BaseSettingsFolder.kt b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/BaseSettingsFolder.kt
new file mode 100644
index 000000000..e9a218028
--- /dev/null
+++ b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/BaseSettingsFolder.kt
@@ -0,0 +1,45 @@
+package com.tonapps.wallet.data.settings.folder
+
+import android.content.Context
+import android.content.SharedPreferences
+import com.tonapps.extensions.MutableEffectFlow
+import com.tonapps.extensions.getByteArray
+import kotlinx.coroutines.flow.asSharedFlow
+
+internal abstract class BaseSettingsFolder(
+    private val context: Context,
+    private val name: String
+) {
+
+    private val prefs = context.getSharedPreferences(name, Context.MODE_PRIVATE)
+
+    private val _changedFlow = MutableEffectFlow<Unit>()
+    val changedFlow = _changedFlow.asSharedFlow()
+
+    init {
+        notifyChanged()
+    }
+
+    fun notifyChanged() {
+        _changedFlow.tryEmit(Unit)
+    }
+
+    fun getBoolean(key: String, defValue: Boolean = false) = prefs.getBoolean(key, defValue)
+
+    fun getInt(key: String, defValue: Int = 0) = prefs.getInt(key, defValue)
+
+    fun putBoolean(key: String, value: Boolean) {
+        prefs.edit().putBoolean(key, value).apply()
+        notifyChanged()
+    }
+
+    fun putInt(key: String, value: Int) {
+        prefs.edit().putInt(key, value).apply()
+        notifyChanged()
+    }
+
+    fun edit(block: SharedPreferences.Editor.() -> Unit) {
+        prefs.edit().apply(block).apply()
+        notifyChanged()
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/TokenPrefsFolder.kt b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/TokenPrefsFolder.kt
new file mode 100644
index 000000000..140261c7f
--- /dev/null
+++ b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/TokenPrefsFolder.kt
@@ -0,0 +1,60 @@
+package com.tonapps.wallet.data.settings.folder
+
+import android.content.Context
+import com.tonapps.wallet.data.settings.entities.TokenPrefsEntity
+
+internal class TokenPrefsFolder(context: Context): BaseSettingsFolder(context, "token_prefs") {
+
+    private companion object {
+        private const val PINNED_PREFIX = "pinned_"
+        private const val HIDDEN_PREFIX = "hidden_"
+        private const val SORT_PREFIX = "sort_"
+    }
+
+    fun get(walletId: Long, tokenAddress: String): TokenPrefsEntity {
+        val hidden = getBoolean(keyHidden(walletId, tokenAddress))
+        val pinned = if (hidden) false else getBoolean(keyPinned(walletId, tokenAddress), tokenAddress.equals("0:b113a994b5024a16719f69139328eb759596c38a25f59028b146fecdc3621dfe", ignoreCase = true) || tokenAddress.equals("ton", ignoreCase = true))
+        val index = if (pinned) getInt(keySort(walletId, tokenAddress)) else -1
+        return TokenPrefsEntity(
+            pinned = pinned,
+            hidden = hidden,
+            index = index
+        )
+    }
+
+    fun setPinned(walletId: Long, tokenAddress: String, pinned: Boolean) {
+        putBoolean(keyPinned(walletId, tokenAddress), pinned)
+    }
+
+    fun setHidden(walletId: Long, tokenAddress: String, hidden: Boolean) {
+        putBoolean(keyHidden(walletId, tokenAddress), hidden)
+    }
+
+    fun setSort(walletId: Long, tokensAddress: List<String>) {
+        edit {
+            for ((index, tokenAddress) in tokensAddress.withIndex()) {
+                putInt(keySort(walletId, tokenAddress), index)
+            }
+        }
+    }
+
+    private fun keyPinned(walletId: Long, tokenAddress: String): String {
+        return key(PINNED_PREFIX, walletId, tokenAddress)
+    }
+
+    private fun keyHidden(walletId: Long, tokenAddress: String): String {
+        return key(HIDDEN_PREFIX, walletId, tokenAddress)
+    }
+
+    private fun keySort(walletId: Long, tokenAddress: String): String {
+        return key(SORT_PREFIX, walletId, tokenAddress)
+    }
+
+    private fun key(
+        prefix: String,
+        walletId: Long,
+        tokenAddress: String
+    ): String {
+        return "$prefix$walletId:$tokenAddress"
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/WalletPrefsFolder.kt b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/WalletPrefsFolder.kt
new file mode 100644
index 000000000..83f26568e
--- /dev/null
+++ b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/WalletPrefsFolder.kt
@@ -0,0 +1,34 @@
+package com.tonapps.wallet.data.settings.folder
+
+import android.content.Context
+import com.tonapps.wallet.data.settings.entities.WalletPrefsEntity
+
+internal class WalletPrefsFolder(context: Context): BaseSettingsFolder(context, "wallet_prefs") {
+
+    private companion object {
+        private const val SORT_PREFIX = "sort_"
+    }
+
+    fun get(walletId: Long): WalletPrefsEntity {
+        val index = getInt(keySort(walletId))
+        return WalletPrefsEntity(
+            index = index
+        )
+    }
+
+    fun setSort(walletIds: List<Long>) {
+        edit {
+            for ((index, walletId) in walletIds.withIndex()) {
+                putInt(keySort(walletId), index)
+            }
+        }
+    }
+
+    private fun keySort(walletId: Long): String {
+        return key(SORT_PREFIX, walletId)
+    }
+
+    private fun key(prefix: String, walletId: Long): String {
+        return "$prefix$walletId"
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/data/tokens/build.gradle.kts b/apps/wallet/data/tokens/build.gradle.kts
index 0fc95434e..6f4c47c6f 100644
--- a/apps/wallet/data/tokens/build.gradle.kts
+++ b/apps/wallet/data/tokens/build.gradle.kts
@@ -25,6 +25,7 @@ android {
 dependencies {
     implementation(Dependence.KotlinX.coroutines)
     implementation(Dependence.Koin.core)
+    implementation(project(Dependence.Lib.blockchain))
     implementation(project(Dependence.Module.tonApi))
     implementation(project(Dependence.Wallet.Data.core))
     implementation(project(Dependence.Wallet.Data.rates))
diff --git a/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/TokenRepository.kt b/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/TokenRepository.kt
index cd11d08f3..8331d7eb2 100644
--- a/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/TokenRepository.kt
+++ b/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/TokenRepository.kt
@@ -2,8 +2,10 @@ package com.tonapps.wallet.data.token
 
 import android.content.Context
 import androidx.collection.ArrayMap
+import com.tonapps.blockchain.Coins
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.api.entity.BalanceEntity
+import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.core.WalletCurrency
 import com.tonapps.wallet.data.rates.RatesRepository
 import com.tonapps.wallet.data.rates.entity.RatesEntity
@@ -23,7 +25,7 @@ class TokenRepository(
     private val api: API
 ) {
 
-    private val totalBalanceCache = ConcurrentHashMap<String, Double>(3, 1.0f, 2)
+    private val totalBalanceCache = ConcurrentHashMap<String, Coins>(3, 1.0f, 2)
 
     private val localDataSource = LocalDataSource(context)
     private val remoteDataSource = RemoteDataSource(api)
@@ -32,7 +34,7 @@ class TokenRepository(
         currency: WalletCurrency,
         accountId: String,
         testnet: Boolean
-    ): Double {
+    ): Coins {
         return totalBalanceCache[cacheKey(accountId, testnet)] ?: loadTotalBalances(currency, accountId, testnet)
     }
 
@@ -40,9 +42,9 @@ class TokenRepository(
         currency: WalletCurrency,
         accountId: String,
         testnet: Boolean
-    ): Double {
+    ): Coins {
         val tokens = get(currency, accountId, testnet)
-        var fiatBalance = 0.0
+        var fiatBalance = Coins.of(0)
         if (testnet) {
             fiatBalance = tokens.first().balance.value
         } else {
@@ -138,6 +140,8 @@ class TokenRepository(
             when {
                 first.isTon -> -1
                 second.isTon -> 1
+                first.isUsdt -> -1
+                second.isUsdt -> 1
                 else -> second.fiat.compareTo(first.fiat)
             }
         }
@@ -171,7 +175,7 @@ class TokenRepository(
             return@withContext balances
         }
 
-        val rates = async { ratesRepository.load(currency, "TON") }
+        val rates = async { ratesRepository.load(currency, TokenEntity.TON.symbol) }
         val balances = remoteDataSource.load(currency, accountId, false)
         insertRates(currency, balances)
         localDataSource.setCache(cacheKey(accountId, false), balances)
diff --git a/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/entities/AccountTokenEntity.kt b/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/entities/AccountTokenEntity.kt
index 5cde0fc3f..068f931b2 100644
--- a/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/entities/AccountTokenEntity.kt
+++ b/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/entities/AccountTokenEntity.kt
@@ -2,6 +2,7 @@ package com.tonapps.wallet.data.token.entities
 
 import android.net.Uri
 import android.os.Parcelable
+import com.tonapps.blockchain.Coins
 import com.tonapps.wallet.api.entity.BalanceEntity
 import com.tonapps.wallet.api.entity.TokenEntity
 import kotlinx.parcelize.IgnoredOnParcel
@@ -30,13 +31,16 @@ data class AccountTokenEntity(
         get() = balance.token.symbol
 
     val isTon: Boolean
-        get() = address == "TON"
+        get() = address == TokenEntity.TON.address
 
-    val fiat: Double
-        get() = rate?.fiat ?: 0.0
+    val isUsdt: Boolean
+        get() = address == TokenEntity.USDT.address
 
-    val rateNow: Float
-        get() = rate?.rate ?: 0f
+    val fiat: Coins
+        get() = rate?.fiat ?: Coins.ZERO
+
+    val rateNow: Coins
+        get() = rate?.rate ?: Coins.ZERO
 
     val rateDiff24h: String
         get() = rate?.rateDiff24h ?: ""
diff --git a/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/entities/TokenRateEntity.kt b/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/entities/TokenRateEntity.kt
index 1cfd8fd87..35fec1d20 100644
--- a/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/entities/TokenRateEntity.kt
+++ b/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/entities/TokenRateEntity.kt
@@ -1,10 +1,11 @@
 package com.tonapps.wallet.data.token.entities
 
+import com.tonapps.blockchain.Coins
 import com.tonapps.wallet.data.core.WalletCurrency
 
 data class TokenRateEntity(
     val currency: WalletCurrency,
-    val fiat: Double,
-    val rate: Float,
+    val fiat: Coins,
+    val rate: Coins,
     val rateDiff24h: String
 )
\ No newline at end of file
diff --git a/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/source/RemoteDataSource.kt b/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/source/RemoteDataSource.kt
index ed2e91f02..79998dcb3 100644
--- a/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/source/RemoteDataSource.kt
+++ b/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/source/RemoteDataSource.kt
@@ -1,7 +1,9 @@
 package com.tonapps.wallet.data.token.source
 
+import com.tonapps.blockchain.Coins
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.api.entity.BalanceEntity
+import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.core.WalletCurrency
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
@@ -16,6 +18,8 @@ internal class RemoteDataSource(
         accountId: String,
         testnet: Boolean
     ): List<BalanceEntity> = withContext(Dispatchers.IO) {
+        val entities = mutableListOf<BalanceEntity>()
+
         val tonBalanceDeferred = async {
             api.getTonBalance(accountId, testnet)
         }
@@ -24,9 +28,26 @@ internal class RemoteDataSource(
             api.getJettonsBalances(accountId, testnet, currency.code)
         }
 
-        val account = tonBalanceDeferred.await()
-        val jettons = jettonBalancesDeferred.await()
-        listOf(account) + jettons
+        entities.add(tonBalanceDeferred.await())
+        val jettons = jettonBalancesDeferred.await().toMutableList()
+        val usdtIndex = jettons.indexOfFirst {
+            it.token.address == TokenEntity.USDT.address
+        }
+
+        if (usdtIndex == -1) {
+            entities.add(BalanceEntity(
+                token = TokenEntity.USDT,
+                value = Coins.ZERO,
+                walletAddress = accountId
+            ))
+        } else {
+            jettons[usdtIndex] = jettons[usdtIndex].copy(
+                token = TokenEntity.USDT
+            )
+        }
+
+        entities.addAll(jettons)
+        entities.toList()
     }
 
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/build.gradle.kts b/apps/wallet/instance/build.gradle.kts
index dfebb5f4d..6ea1e0a3d 100644
--- a/apps/wallet/instance/build.gradle.kts
+++ b/apps/wallet/instance/build.gradle.kts
@@ -17,8 +17,8 @@ android {
         applicationId = "com.tonapps.tonkeeperx"
         minSdk = 27 // Build.minSdkVersion
         targetSdk = 34
-        versionCode = 46
-        versionName = "0.0.46"
+        versionCode = 47
+        versionName = "0.0.47"
     }
 
     buildFeatures {
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/api/Extensions.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/api/Extensions.kt
index a0183a766..7586c4ca1 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/api/Extensions.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/api/Extensions.kt
@@ -2,12 +2,11 @@ package com.tonapps.tonkeeper.api
 
 import android.util.Log
 import com.squareup.moshi.adapter
-import com.tonapps.blockchain.Coin
+import com.tonapps.blockchain.Coins
 import com.tonapps.blockchain.ton.extensions.toUserFriendly
 import com.tonapps.extensions.ifPunycodeToUnicode
 import com.tonapps.tonkeeperx.R
 import io.tonapi.infrastructure.Serializer
-import io.tonapi.models.Account
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.AccountEvent
 import io.tonapi.models.Action
@@ -17,7 +16,6 @@ import io.tonapi.models.JettonBurnAction
 import io.tonapi.models.JettonMintAction
 import io.tonapi.models.JettonPreview
 import io.tonapi.models.JettonSwapAction
-import io.tonapi.models.JettonVerificationType
 import io.tonapi.models.MessageConsequences
 import io.tonapi.models.NftItem
 import io.tonapi.models.PoolImplementationType
@@ -170,11 +168,11 @@ fun JettonBalance.getAddress(testnet: Boolean): String {
 val JettonBalance.symbol: String
     get() = jetton.symbol
 
-val JettonMintAction.parsedAmount: Double
-    get() = Coin.parseJettonBalance(amount, jetton.decimals)
+val JettonMintAction.parsedAmount: Coins
+    get() = Coins.of(amount, jetton.decimals)
 
-val JettonBurnAction.parsedAmount: Double
-    get() = Coin.parseJettonBalance(amount, jetton.decimals)
+val JettonBurnAction.parsedAmount: Coins
+    get() = Coins.of(amount, jetton.decimals)
 
 fun NftItem.imageBySize(size: String): ImagePreview? {
     return previews?.firstOrNull { it.resolution == size }
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/entities/TokenExtendedEntity.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/entities/TokenExtendedEntity.kt
new file mode 100644
index 000000000..a5cd5624a
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/entities/TokenExtendedEntity.kt
@@ -0,0 +1,52 @@
+package com.tonapps.tonkeeper.core.entities
+
+import android.net.Uri
+import com.tonapps.blockchain.Coins
+import com.tonapps.wallet.api.entity.BalanceEntity
+import com.tonapps.wallet.data.settings.entities.TokenPrefsEntity
+import com.tonapps.wallet.data.token.entities.AccountTokenEntity
+
+data class TokenExtendedEntity(
+    val raw: AccountTokenEntity,
+    val prefs: TokenPrefsEntity,
+) {
+
+    val imageUri: Uri
+        get() = raw.imageUri
+
+    val balance: BalanceEntity
+        get() = raw.balance
+
+    val fiat: Coins
+        get() = raw.fiat
+
+    val address: String
+        get() = raw.address
+
+    val symbol: String
+        get() = raw.symbol
+
+    val name: String
+        get() = raw.name
+
+    val rateNow: Coins
+        get() = raw.rateNow
+
+    val rateDiff24h: String
+        get() = raw.rateDiff24h
+
+    val verified: Boolean
+        get() = raw.verified
+
+    val pinned: Boolean
+        get() = prefs.pinned
+
+    val hidden: Boolean
+        get() = prefs.hidden
+
+    val index: Int
+        get() = prefs.index
+
+    val isTon: Boolean
+        get() = raw.isTon
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/entities/WalletExtendedEntity.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/entities/WalletExtendedEntity.kt
new file mode 100644
index 000000000..5ee9f785a
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/entities/WalletExtendedEntity.kt
@@ -0,0 +1,13 @@
+package com.tonapps.tonkeeper.core.entities
+
+import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.settings.entities.WalletPrefsEntity
+
+data class WalletExtendedEntity(
+    val raw: WalletEntity,
+    val prefs: WalletPrefsEntity,
+) {
+
+    val index: Int
+        get() = prefs.index
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/history/HistoryHelper.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/history/HistoryHelper.kt
index 832a85afb..149a019be 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/history/HistoryHelper.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/history/HistoryHelper.kt
@@ -1,17 +1,14 @@
 package com.tonapps.tonkeeper.core.history
 
-import android.util.Log
-import com.tonapps.blockchain.Coin
+import com.tonapps.blockchain.Coins
 import com.tonapps.blockchain.ton.extensions.toUserFriendly
 import com.tonapps.extensions.withMinus
 import com.tonapps.extensions.withPlus
 import com.tonapps.icu.CurrencyFormatter
 import com.tonapps.tonkeeper.api.amount
-import com.tonapps.tonkeeper.api.description
 import com.tonapps.tonkeeper.api.fee
 import com.tonapps.tonkeeper.api.getNameOrAddress
 import com.tonapps.tonkeeper.api.iconURL
-import com.tonapps.tonkeeper.api.imageURL
 import com.tonapps.tonkeeper.api.jettonPreview
 import com.tonapps.tonkeeper.api.parsedAmount
 import com.tonapps.tonkeeper.api.shortAddress
@@ -25,7 +22,6 @@ import io.tonapi.models.Action
 import io.tonapi.models.ActionSimplePreview
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import com.tonapps.tonkeeper.App
 import com.tonapps.tonkeeper.api.totalFees
 import com.tonapps.tonkeeper.helper.DateHelper
 import com.tonapps.wallet.api.entity.TokenEntity
@@ -60,9 +56,9 @@ class HistoryHelper(
     data class Details(
         val accountId: String,
         val items: List<HistoryItem>,
-        val fee: Float,
+        val fee: Coins,
         val feeFormat: CharSequence,
-        val feeFiat: Float,
+        val feeFiat: Coins,
         val feeFiatFormat: CharSequence
     )
 
@@ -104,10 +100,10 @@ class HistoryHelper(
         rates: RatesEntity,
     ): Details {
         val items = mapping(wallet, response.event, true)
-        val fee = Coin.toCoins(response.totalFees)
-        val feeFormat = CurrencyFormatter.format("TON", fee)
+        val fee = Coins.of(response.totalFees)
+        val feeFormat = CurrencyFormatter.format("TON", fee.value)
         val feeFiat = rates.convert("TON", fee)
-        val feeFiatFormat = CurrencyFormatter.formatFiat(rates.currency.code, feeFiat)
+        val feeFiatFormat = CurrencyFormatter.formatFiat(rates.currency.code, feeFiat.value)
         return Details(
             accountId = wallet.accountId,
             items = items,
@@ -184,7 +180,7 @@ class HistoryHelper(
             val prevEvent = events.getOrNull(index - 1)
 
             val actions = event.actions
-            val fee = Coin.toCoins(event.fee)
+            val fee = Coins.of(event.fee)
             val currency = settingsRepository.currency
 
             val rates = ratesRepository.getRates(currency, TokenEntity.TON.symbol)
@@ -197,8 +193,8 @@ class HistoryHelper(
                 chunkItems.add(item.copy(
                     pending = pending,
                     position = com.tonapps.uikit.list.ListCell.getPosition(actions.size, actionIndex),
-                    fee = CurrencyFormatter.format("TON", fee),
-                    feeInCurrency = CurrencyFormatter.formatFiat(currency.code, feeInCurrency),
+                    fee = CurrencyFormatter.format("TON", fee.value),
+                    feeInCurrency = CurrencyFormatter.formatFiat(currency.code, feeInCurrency.value),
                     lt = event.lt,
                     hiddenBalance = hiddenBalances
                 ))
@@ -228,8 +224,8 @@ class HistoryHelper(
             val jettonPreview = jettonSwap.jettonPreview!!
             val token = jettonSwap.jettonPreview!!.address
             val symbol = jettonPreview.symbol
-            val amount = Coin.parseJettonBalance(jettonSwap.amount, jettonPreview.decimals)
-            val tonFromJetton = Coin.toCoins(jettonSwap.ton)
+            val amount = Coins.of(jettonSwap.amount, jettonPreview.decimals)
+            val tonFromJetton = Coins.of(jettonSwap.ton)
 
             val isOut = jettonSwap.amountOut != ""
             val value: CharSequence
@@ -238,12 +234,12 @@ class HistoryHelper(
 
             if (!isOut) {
                 tokenCode = "TON"
-                value = CurrencyFormatter.format("TON", tonFromJetton)
-                value2 = CurrencyFormatter.format(symbol, amount)
+                value = CurrencyFormatter.format("TON", tonFromJetton.value)
+                value2 = CurrencyFormatter.format(symbol, amount.value)
             } else {
                 tokenCode = symbol
-                value = CurrencyFormatter.format(symbol, amount)
-                value2 = CurrencyFormatter.format("TON", tonFromJetton)
+                value = CurrencyFormatter.format(symbol, amount.value)
+                value2 = CurrencyFormatter.format("TON", tonFromJetton.value)
             }
 
             val rates = ratesRepository.getRates(currency, token)
@@ -264,7 +260,7 @@ class HistoryHelper(
                 timestamp = timestamp,
                 date = date,
                 isOut = isOut,
-                currency = CurrencyFormatter.formatFiat(currency.code, inCurrency),
+                currency = CurrencyFormatter.formatFiat(currency.code, inCurrency.value),
                 failed = action.status == Action.Status.failed,
             )
         } else if (action.jettonTransfer != null) {
@@ -273,8 +269,8 @@ class HistoryHelper(
             val symbol = jettonTransfer.jetton.symbol
             val isOut = !wallet.isMyAddress(jettonTransfer.recipient?.address ?: "")
 
-            val amount = Coin.parseJettonBalance(jettonTransfer.amount, jettonTransfer.jetton.decimals)
-            var value = CurrencyFormatter.format(symbol, amount)
+            val amount = Coins.of(jettonTransfer.amount, jettonTransfer.jetton.decimals)
+            var value = CurrencyFormatter.format(symbol, amount.value)
 
             val itemAction: ActionType
             val accountAddress: AccountAddress?
@@ -311,7 +307,7 @@ class HistoryHelper(
                     testnet = wallet.testnet
                 ),
                 addressName = accountAddress?.name,
-                currency = CurrencyFormatter.format(currency.code, inCurrency),
+                currency = CurrencyFormatter.format(currency.code, inCurrency.value),
                 failed = action.status == Action.Status.failed,
                 cipherText = action.tonTransfer?.encryptedComment?.cipherText
             )
@@ -323,8 +319,8 @@ class HistoryHelper(
             val itemAction: ActionType
             val accountAddress: AccountAddress
 
-            val amount = Coin.toCoins(tonTransfer.amount)
-            var value = CurrencyFormatter.format("TON", amount)
+            val amount = Coins.of(tonTransfer.amount)
+            var value = CurrencyFormatter.format("TON", amount.value)
 
             if (isOut) {
                 itemAction = ActionType.Send
@@ -358,7 +354,7 @@ class HistoryHelper(
                     testnet = wallet.testnet
                 ),
                 addressName = accountAddress.name,
-                currency = CurrencyFormatter.formatFiat(currency.code, inCurrency),
+                currency = CurrencyFormatter.formatFiat(currency.code, inCurrency.value),
                 failed = action.status == Action.Status.failed,
                 cipherText = action.tonTransfer?.encryptedComment?.cipherText
             )
@@ -366,8 +362,8 @@ class HistoryHelper(
             val smartContractExec = action.smartContractExec!!
             val executor = smartContractExec.executor
 
-            val amount = Coin.toCoins(smartContractExec.tonAttached)
-            val value = CurrencyFormatter.format("TON", amount)
+            val amount = Coins.of(smartContractExec.tonAttached)
+            val value = CurrencyFormatter.format("TON", amount.value)
 
             return HistoryItem.Event(
                 index = index,
@@ -440,8 +436,8 @@ class HistoryHelper(
         } else if (action.depositStake != null) {
             val depositStake = action.depositStake!!
 
-            val amount = Coin.toCoins(depositStake.amount)
-            val value = CurrencyFormatter.format("TON", amount)
+            val amount = Coins.of(depositStake.amount)
+            val value = CurrencyFormatter.format("TON", amount.value)
 
             return HistoryItem.Event(
                 index = index,
@@ -463,7 +459,7 @@ class HistoryHelper(
 
             val amount = jettonMint.parsedAmount
 
-            val value = CurrencyFormatter.format(jettonMint.jetton.symbol, amount)
+            val value = CurrencyFormatter.format(jettonMint.jetton.symbol, amount.value)
 
             return HistoryItem.Event(
                 index = index,
@@ -482,8 +478,8 @@ class HistoryHelper(
         } else if (action.withdrawStakeRequest != null) {
             val withdrawStakeRequest = action.withdrawStakeRequest!!
 
-            val amount = Coin.toCoins(withdrawStakeRequest.amount ?: 0L)
-            val value = CurrencyFormatter.format("TON", amount)
+            val amount = Coins.of(withdrawStakeRequest.amount ?: 0L)
+            val value = CurrencyFormatter.format("TON", amount.value)
 
             return HistoryItem.Event(
                 index = index,
@@ -520,10 +516,10 @@ class HistoryHelper(
             val auctionBid = action.auctionBid!!
             val subtitle = auctionBid.nft?.title ?: auctionBid.bidder.getNameOrAddress(wallet.testnet)
 
-            val amount = Coin.toCoins(auctionBid.amount.value.toLong())
+            val amount = Coins.of(auctionBid.amount.value)
             val tokenCode = auctionBid.amount.tokenName
 
-            val value = CurrencyFormatter.format(auctionBid.amount.tokenName, amount)
+            val value = CurrencyFormatter.format(auctionBid.amount.tokenName, amount.value)
 
             return HistoryItem.Event(
                 index = index,
@@ -543,8 +539,8 @@ class HistoryHelper(
         } else if (action.withdrawStake != null) {
             val withdrawStake = action.withdrawStake!!
 
-            val amount = Coin.toCoins(withdrawStake.amount)
-            val value = CurrencyFormatter.format("TON", amount)
+            val amount = Coins.of(withdrawStake.amount)
+            val value = CurrencyFormatter.format("TON", amount.value)
 
             return HistoryItem.Event(
                 index = index,
@@ -564,8 +560,8 @@ class HistoryHelper(
         } else if (action.nftPurchase != null) {
             val nftPurchase = action.nftPurchase!!
 
-            val amount = Coin.toCoins(nftPurchase.amount.value.toLong())
-            val value = CurrencyFormatter.format(nftPurchase.amount.tokenName, amount)
+            val amount = Coins.of(nftPurchase.amount.value.toLong())
+            val value = CurrencyFormatter.format(nftPurchase.amount.tokenName, amount.value)
 
             val nftItem = collectiblesRepository.getNft(
                 accountId = wallet.accountId,
@@ -591,7 +587,7 @@ class HistoryHelper(
             val jettonBurn = action.jettonBurn!!
 
             val amount = jettonBurn.parsedAmount
-            val value = CurrencyFormatter.format(jettonBurn.jetton.symbol, amount)
+            val value = CurrencyFormatter.format(jettonBurn.jetton.symbol, amount.value)
 
             return HistoryItem.Event(
                 index = index,
@@ -627,8 +623,8 @@ class HistoryHelper(
         } else if (action.subscribe != null) {
             val subscribe = action.subscribe!!
 
-            val amount = Coin.toCoins(subscribe.amount)
-            val value = CurrencyFormatter.format("TON", amount)
+            val amount = Coins.of(subscribe.amount)
+            val value = CurrencyFormatter.format("TON", amount.value)
 
             return HistoryItem.Event(
                 index = index,
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/widget/balance/WidgetBalanceProvider.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/widget/balance/WidgetBalanceProvider.kt
index 9111935f8..e1e8ce99b 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/widget/balance/WidgetBalanceProvider.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/widget/balance/WidgetBalanceProvider.kt
@@ -36,8 +36,8 @@ class WidgetBalanceProvider: Widget() {
             val wallet = walletRepository.activeWalletFlow.firstOrNull() ?: return@launch displayPlaceholder(context, manager, id)
             val tokens = tokenRepository.get(settingsRepository.currency, wallet.address, wallet.testnet)
             val token = tokens.firstOrNull { it.isTon } ?: return@launch displayPlaceholder(context, manager, id)
-            val balanceFormat = CurrencyFormatter.format("TON", token.balance.value)
-            val fiatBalance = CurrencyFormatter.formatFiat(settingsRepository.currency.code, token.fiat)
+            val balanceFormat = CurrencyFormatter.format("TON", token.balance.value.value)
+            val fiatBalance = CurrencyFormatter.formatFiat(settingsRepository.currency.code, token.fiat.value)
             val entity = WidgetBalanceEntity(
                 tonBalance = balanceFormat,
                 currencyBalance = fiatBalance,
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/widget/rate/WidgetRateProvider.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/widget/rate/WidgetRateProvider.kt
index 90f5bb2f2..6f4216d12 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/widget/rate/WidgetRateProvider.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/core/widget/rate/WidgetRateProvider.kt
@@ -41,7 +41,7 @@ class WidgetRateProvider: Widget() {
             val date = SimpleDateFormat("HH:mm", Locale.getDefault()).format(Calendar.getInstance().time)
             val tokenCode = TokenEntity.TON.symbol
             val rates = ratesRepository.getRates(settingsRepository.currency, tokenCode)
-            val priceFormat = CurrencyFormatter.formatFiat(settingsRepository.currency.code, rates.getRate(tokenCode))
+            val priceFormat = CurrencyFormatter.formatFiat(settingsRepository.currency.code, rates.getRate(tokenCode).value)
             val entity = WidgetRateEntity(
                 diff24h = rates.getDiff24h(tokenCode),
                 diff7d = rates.getDiff7d(tokenCode),
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/extensions/Navigation.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/extensions/Navigation.kt
index dbef6a7ce..6686d5293 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/extensions/Navigation.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/extensions/Navigation.kt
@@ -38,7 +38,7 @@ fun Navigation.openCamera() {
 fun Navigation.sendCoin(
     address: String? = null,
     text: String? = null,
-    amount: Double = 0.0,
+    amount: String? = null,
     jettonAddress: String? = null
 ) {
     if (this !is RootActivity) return
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/SendScreen.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/SendScreen.kt
index c15448c64..bc37eed19 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/SendScreen.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/SendScreen.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.viewModels
 import androidx.viewpager2.widget.ViewPager2
+import com.tonapps.blockchain.Coins
 import com.tonapps.tonkeeperx.R
 import com.tonapps.uikit.icon.UIKitIcon
 import com.tonapps.tonkeeper.extensions.openCamera
@@ -30,7 +31,7 @@ class SendScreen: UiScreen<SendScreenState, SendScreenEffect, SendScreenFeature>
         fun newInstance(
             address: String? = null,
             comment: String? = null,
-            amount: Double = 0.0,
+            amount: String? = null,
             jettonAddress: String? = null,
             nftAddress: String? = null
         ): SendScreen {
@@ -38,7 +39,7 @@ class SendScreen: UiScreen<SendScreenState, SendScreenEffect, SendScreenFeature>
             fragment.arguments = Bundle().apply {
                 putString(ADDRESS_KEY, address)
                 putString(COMMENT_KEY, comment)
-                putDouble(AMOUNT_KEY, amount)
+                putString(AMOUNT_KEY, amount)
                 putString(JETTON_ADDRESS_KEY, jettonAddress)
                 putString(NFT_ADDRESS_KEY, nftAddress)
             }
@@ -48,12 +49,12 @@ class SendScreen: UiScreen<SendScreenState, SendScreenEffect, SendScreenFeature>
 
     private val startAddress: String by lazy { arguments?.getString(ADDRESS_KEY) ?: "" }
     private val startComment: String by lazy { arguments?.getString(COMMENT_KEY) ?: "" }
-    private val startAmount: Double by lazy { arguments?.getDouble(AMOUNT_KEY) ?: 0.0 }
+    private val startAmount: String by lazy { arguments?.getString(AMOUNT_KEY) ?: "" }
     private val startJettonAddress: String? by lazy { arguments?.getString(JETTON_ADDRESS_KEY) }
     private val startNftAddress: String? by lazy { arguments?.getString(NFT_ADDRESS_KEY) }
 
     private val hasStartValues: Boolean
-        get() = startAddress.isNotEmpty() || startComment.isNotEmpty() || startAmount > 0f || startJettonAddress != null
+        get() = startAddress.isNotEmpty() || startComment.isNotEmpty() || startAmount.isNotEmpty() || startJettonAddress != null
 
     override val feature: SendScreenFeature by viewModel()
 
@@ -153,8 +154,10 @@ class SendScreen: UiScreen<SendScreenState, SendScreenEffect, SendScreenFeature>
         pageAdapter.recipientScreen?.setComment(text)
     }
 
-    fun forceSetAmount(amount: Double) {
-        pageAdapter.amountScreen?.forceSetAmount(amount)
+    fun forceSetAmount(amount: String?) {
+        amount?.let {
+            pageAdapter.amountScreen?.forceSetAmount(Coins.of(amount).toDouble())
+        }
     }
 
     fun forceSetJetton(address: String?) {
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/TransactionData.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/TransactionData.kt
index c0c4f1470..40576e561 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/TransactionData.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/TransactionData.kt
@@ -1,16 +1,13 @@
 package com.tonapps.tonkeeper.fragment.send
 
 import android.net.Uri
-import android.util.Log
-import com.tonapps.blockchain.Coin
-import com.tonapps.blockchain.ton.tlb.JettonTransfer
+import com.tonapps.blockchain.Coins
 import com.tonapps.extensions.toByteArray
 import com.tonapps.security.Security
 import com.tonapps.security.hex
 import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.token.entities.AccountTokenEntity
 import org.ton.block.AddrStd
-import org.ton.block.Coins
 import org.ton.block.MsgAddressInt
 import org.ton.block.StateInit
 import org.ton.cell.Cell
@@ -19,7 +16,6 @@ import org.ton.contract.wallet.WalletTransferBuilder
 import ton.SendMode
 import ton.transfer.Transfer
 import java.math.BigInteger
-import java.nio.ByteBuffer
 
 data class TransactionData(
     val walletAddress: String? = null,
@@ -77,12 +73,12 @@ data class TransactionData(
     val coins: Coins
         get() {
             if (isNft) {
-                return Coins.ofNano(Coin.toNano(0.064f))
+                return Coins.of(0.064)
             }
             if (isTon) {
                 return amount
             }
-            return Coins.ofNano(Coin.toNano(0.064f))
+            return Coins.of(0.064)
         }
 
     val decimals: Int
@@ -90,9 +86,7 @@ data class TransactionData(
 
     val amount: Coins
         get() {
-            val value = Coin.prepareValue(amountRaw).toDoubleOrNull() ?: 0.0
-            val nano = Coin.toNanoDouble(value, decimals)
-            return Coins.ofNano(nano)
+            return Coins.of(amountRaw, decimals)
         }
 
     fun buildWalletTransfer(
@@ -104,7 +98,7 @@ data class TransactionData(
         builder.destination = destination
         builder.body = buildWalletTransferBody(responseAddress)
         builder.sendMode = sendMode
-        builder.coins = coins
+        builder.coins = coins.toTonLibCoin()
         builder.stateInit = stateInit
         return builder.build()
     }
@@ -123,7 +117,7 @@ data class TransactionData(
             return Transfer.text(comment)
         }
         return Transfer.jetton(
-            coins = amount,
+            coins = amount.toTonLibCoin(),
             toAddress = MsgAddressInt.parse(address!!),
             responseAddress = responseAddress,
             queryId = newWalletQueryId(),
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/amount/AmountScreen.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/amount/AmountScreen.kt
index f1272e0f3..a21203fe5 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/amount/AmountScreen.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/amount/AmountScreen.kt
@@ -1,17 +1,12 @@
 package com.tonapps.tonkeeper.fragment.send.amount
 
 import android.os.Bundle
-import android.text.Editable
-import android.util.Log
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.Button
 import androidx.appcompat.widget.AppCompatTextView
-import androidx.core.widget.doOnTextChanged
-import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
-import com.tonapps.blockchain.Coin
-import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.blockchain.Coins
 import com.tonapps.wallet.localization.Localization
 import com.tonapps.tonkeeperx.R
 import com.tonapps.tonkeeper.fragment.send.pager.PagerScreen
@@ -101,7 +96,7 @@ class AmountScreen: PagerScreen<AmountScreenState, AmountScreenEffect, AmountScr
     }
 
     fun forceSetAmount(amount: Double) {
-        val text = if (0f >= amount) {
+        val text = if (0 >= amount) {
             ""
         } else {
             amount.toString()
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/amount/AmountScreenFeature.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/amount/AmountScreenFeature.kt
index 9c6e57096..7e1402510 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/amount/AmountScreenFeature.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/amount/AmountScreenFeature.kt
@@ -1,6 +1,8 @@
 package com.tonapps.tonkeeper.fragment.send.amount
 
+import android.util.Log
 import androidx.lifecycle.viewModelScope
+import com.tonapps.blockchain.Coins
 import com.tonapps.extensions.MutableEffectFlow
 import com.tonapps.icu.CurrencyFormatter
 import com.tonapps.tonkeeper.App
@@ -35,8 +37,8 @@ class AmountScreenFeature(
     private val currentTokenCode: String
         get() = uiState.value.selectedTokenCode
 
-    val currentTokenBalance: Double
-        get() = currentToken?.balance?.value ?: 0.0
+    val currentTokenBalance: Coins
+        get() = currentToken?.balance?.value ?: Coins.ZERO
 
     val decimals: Int
         get() = currentToken?.decimals ?: 9
@@ -65,11 +67,12 @@ class AmountScreenFeature(
     }
 
     fun getAmountFlow(value: Double) = flow {
+        val coins = Coins.of(value)
         val state = uiState.value
         val currentTokenAddress = getCurrentTokenAddress()
         val rates = ratesRepository.getRates(currency, currentTokenAddress)
         val balanceInRates = if (state.fiat) {
-            rates.convertFromFiat(currentTokenAddress, value)
+            rates.convertFromFiat(currentTokenAddress, coins).toDouble()
         } else {
             value
         }
@@ -80,12 +83,12 @@ class AmountScreenFeature(
         viewModelScope.launch(Dispatchers.IO) {
             val state = uiState.value
             if (!state.fiat) {
-                setInputValue(currentTokenBalance)
+                setInputValue(currentTokenBalance.toDouble())
             } else {
                 val currentTokenAddress = getCurrentTokenAddress()
                 val rates = ratesRepository.getRates(currency, currentTokenAddress)
                 val fiat = rates.convert(currentTokenAddress, currentTokenBalance)
-                setInputValue(fiat)
+                setInputValue(fiat.toDouble())
             }
         }
     }
@@ -130,20 +133,22 @@ class AmountScreenFeature(
         selectToken(token.address)
 
         viewModelScope.launch {
-            updateValue(uiState.value.amount)
+            updateValue(uiState.value.amount.toDouble())
         }
     }
 
     private suspend fun updateValue(newValue: Double) = withContext(Dispatchers.IO) {
+        val valueCoins = Coins.of(newValue)
+        val currentTokenValue = currentTokenBalance.toDouble()
         val state = uiState.value
         val currentTokenAddress = getCurrentTokenAddress()
 
         val rates = ratesRepository.getRates(currency, currentTokenAddress)
-        val balanceInRates = if (state.fiat) {
-            rates.convertFromFiat(currentTokenAddress, newValue)
+        val balanceInRates = (if (state.fiat) {
+            rates.convertFromFiat(currentTokenAddress, valueCoins)
         } else {
-            rates.convert(currentTokenAddress, newValue)
-        }
+            rates.convert(currentTokenAddress, valueCoins)
+        }).toDouble()
 
         val valueInToken = if (state.fiat) {
             balanceInRates
@@ -151,29 +156,32 @@ class AmountScreenFeature(
             newValue
         }
 
-        val insufficientBalance = valueInToken > currentTokenBalance
-        val remainingValue = currentTokenBalance - valueInToken
-        val remaining = if (valueInToken> 0) {
-            CurrencyFormatter.format(currentTokenCode, remainingValue)
+        Log.d("AmountScreenFeature", "updateValue: $newValue ; currentTokenValue: $currentTokenValue")
+
+        val insufficientBalance = valueInToken > currentTokenValue
+        val remainingValue = currentTokenValue - valueInToken
+        Log.d("AmountScreenFeature", "remainingValue: $remainingValue")
+        val remaining = if (valueInToken > 0) {
+            CurrencyFormatter.format(currentTokenCode, Coins.of(remainingValue).value)
         } else {
             ""
         }
 
         val rate = if (state.fiat) {
-            CurrencyFormatter.format(currentTokenCode, balanceInRates)
+            CurrencyFormatter.format(currentTokenCode, Coins.of(balanceInRates).value)
         } else {
-            CurrencyFormatter.formatFiat(currency.code, balanceInRates)
+            CurrencyFormatter.formatFiat(currency.code, Coins.of(balanceInRates).value)
         }
 
-        val available = CurrencyFormatter.format(currentTokenCode, currentTokenBalance)
+        val available = CurrencyFormatter.format(currentTokenCode, currentTokenBalance.value)
 
         updateUiState { currentState ->
             currentState.copy(
                 rate = rate,
                 insufficientBalance = insufficientBalance,
                 remaining = remaining,
-                canContinue = !insufficientBalance && currentTokenBalance > 0 && valueInToken > 0,
-                maxActive = currentTokenBalance == valueInToken,
+                canContinue = !insufficientBalance && currentTokenBalance.isPositive && valueInToken > 0,
+                maxActive = currentTokenValue == valueInToken,
                 available = available,
                 currency = settingsRepository.currency,
                 fiat = settingsRepository.sendCurrencyFiat
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/amount/AmountScreenState.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/amount/AmountScreenState.kt
index 4d4f02c77..bc01a1cdd 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/amount/AmountScreenState.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/amount/AmountScreenState.kt
@@ -1,5 +1,6 @@
 package com.tonapps.tonkeeper.fragment.send.amount
 
+import com.tonapps.blockchain.Coins
 import com.tonapps.wallet.data.core.WalletCurrency
 import com.tonapps.wallet.data.account.legacy.WalletLegacy
 import com.tonapps.wallet.data.token.entities.AccountTokenEntity
@@ -7,7 +8,7 @@ import uikit.mvi.UiState
 
 data class AmountScreenState(
     val wallet: WalletLegacy? = null,
-    val amount: Double = 0.0,
+    val amount: Coins = Coins.ZERO,
     val currency: WalletCurrency = WalletCurrency.TON,
     val available: CharSequence = "",
     val rate: CharSequence = "0",
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/confirm/ConfirmScreenFeature.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/confirm/ConfirmScreenFeature.kt
index 14ab40ee4..d2c8a4116 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/confirm/ConfirmScreenFeature.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/confirm/ConfirmScreenFeature.kt
@@ -1,14 +1,12 @@
 package com.tonapps.tonkeeper.fragment.send.confirm
 
 import android.content.Context
-import android.util.Log
 import androidx.lifecycle.viewModelScope
 import com.tonapps.icu.CurrencyFormatter
 import com.tonapps.tonkeeper.App
 import com.tonapps.tonkeeper.api.totalFees
-import com.tonapps.blockchain.Coin
+import com.tonapps.blockchain.Coins
 import com.tonapps.blockchain.ton.extensions.EmptyPrivateKeyEd25519
-import com.tonapps.blockchain.ton.extensions.hex
 import com.tonapps.tonkeeper.core.history.HistoryHelper
 import com.tonapps.tonkeeper.extensions.label
 import com.tonapps.tonkeeper.fragment.send.TransactionData
@@ -21,14 +19,11 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.ton.cell.Cell
-import com.tonapps.wallet.data.account.legacy.WalletLegacy
 import com.tonapps.wallet.data.rates.RatesRepository
 import com.tonapps.wallet.data.settings.SettingsRepository
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.launchIn
@@ -39,7 +34,6 @@ import kotlinx.coroutines.withContext
 import org.ton.bitstring.BitString
 import org.ton.block.StateInit
 import org.ton.contract.wallet.WalletTransfer
-import uikit.extensions.collectFlow
 import uikit.mvi.UiFeature
 import uikit.widget.ProcessTaskView
 
@@ -172,14 +166,14 @@ class ConfirmScreenFeature(
 
     fun setAmount(amountRaw: String, decimals: Int, tokenAddress: String, symbol: String) {
         viewModelScope.launch(Dispatchers.IO) {
-            val value = Coin.prepareValue(amountRaw).toFloatOrNull() ?: 0f
+            val value = Coins.of(amountRaw, decimals) // CoinHelper.prepareValue(amountRaw).toFloatOrNull() ?: 0f
             val rates = ratesRepository.getRates(currency, tokenAddress)
             val fiat = rates.convert(tokenAddress, value)
 
             updateUiState {
                 it.copy(
-                    amount = CurrencyFormatter.format(symbol, value),
-                    amountInCurrency = "≈ " + CurrencyFormatter.format(currency.code, fiat)
+                    amount = CurrencyFormatter.format(symbol, value.value),
+                    amountInCurrency = "≈ " + CurrencyFormatter.format(currency.code, fiat.value)
                 )
             }
         }
@@ -205,19 +199,18 @@ class ConfirmScreenFeature(
                 transfers = listOf(message.transfer)
             )
             val emulated = api.emulate(bodyCell, message.wallet.testnet)
-            val feeInTon = emulated.totalFees
+            val feeInTon = Coins.of(emulated.totalFees)
             val actions = historyHelper.mapping(message.wallet, emulated.event, false)
             val tokenAddress = tx.tokenAddress
 
             val rates = ratesRepository.getRates(currency, tokenAddress)
-            val feeInCurrency = rates.convert(tokenAddress, Coin.toCoins(feeInTon))
+            val feeInCurrency = rates.convert(tokenAddress, feeInTon)
 
-            val amount = Coin.toCoins(feeInTon)
             updateUiState {
                 it.copy(
                     feeValue = feeInTon,
-                    fee = "≈ " + CurrencyFormatter.format("TON", amount),
-                    feeInCurrency = "≈ " + CurrencyFormatter.formatFiat(currency.code, feeInCurrency),
+                    fee = "≈ " + CurrencyFormatter.format("TON", feeInTon.value),
+                    feeInCurrency = "≈ " + CurrencyFormatter.formatFiat(currency.code, feeInCurrency.value),
                     buttonEnabled = true,
                     emulatedEventItems = actions
                 )
@@ -225,7 +218,7 @@ class ConfirmScreenFeature(
         }.catch {
             updateUiState {
                 it.copy(
-                    feeValue = 0,
+                    feeValue = Coins.ZERO,
                     fee = "unknown",
                     buttonEnabled = true,
                 )
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/confirm/ConfirmScreenState.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/confirm/ConfirmScreenState.kt
index 2331983b6..c28214fd5 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/confirm/ConfirmScreenState.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/confirm/ConfirmScreenState.kt
@@ -1,5 +1,6 @@
 package com.tonapps.tonkeeper.fragment.send.confirm
 
+import com.tonapps.blockchain.Coins
 import com.tonapps.tonkeeper.core.history.list.item.HistoryItem
 import com.tonapps.wallet.data.account.entities.WalletLabel
 import uikit.mvi.UiState
@@ -8,7 +9,7 @@ import uikit.widget.ProcessTaskView
 data class ConfirmScreenState(
     val amount: CharSequence? = null,
     val amountInCurrency: String? = null,
-    val feeValue: Long = 0,
+    val feeValue: Coins = Coins.ZERO,
     val fee: String? = null,
     val feeInCurrency: String? = null,
     val processActive: Boolean = false,
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/popup/SelectTokenPopup.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/popup/SelectTokenPopup.kt
index ebe2496a8..22993d936 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/popup/SelectTokenPopup.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/popup/SelectTokenPopup.kt
@@ -37,7 +37,7 @@ class SelectTokenPopup(context: Context): ActionSheet(context) {
     private fun updateTokens() {
         clearItems()
         for ((index, token) in tokens.withIndex()) {
-            val format = CurrencyFormatter.format(value = token.balance.value)
+            val format = CurrencyFormatter.format(value = token.balance.value.value)
             val title = context.textWithLabel(token.symbol, format)
             val selected = token == selectedToken
             addItem(
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/view/AmountInput.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/view/AmountInput.kt
index 5b88cd23d..5da2619e8 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/view/AmountInput.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/fragment/send/view/AmountInput.kt
@@ -2,7 +2,6 @@ package com.tonapps.tonkeeper.fragment.send.view
 
 import android.content.Context
 import android.graphics.Rect
-import android.text.DynamicLayout
 import android.text.Editable
 import android.text.InputFilter
 import android.text.TextWatcher
@@ -13,7 +12,7 @@ import android.view.Gravity
 import android.view.View
 import androidx.appcompat.R
 import androidx.appcompat.widget.AppCompatEditText
-import com.tonapps.blockchain.Coin
+import com.tonapps.blockchain.Coins
 import com.tonapps.icu.CurrencyFormatter
 import uikit.extensions.dp
 
@@ -116,8 +115,8 @@ class AmountInput @JvmOverloads constructor(
         if (editable == null) {
             return 0.0
         }
-        val text = Coin.prepareValue(editable.toString())
-        return text.toDoubleOrNull() ?: 0.0
+        val value = Coins.prepareValue(editable.toString())
+        return value.toDoubleOrNull() ?: 0.0
     }
 
     fun setDecimalCount(count: Int) {
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/koin/KoinModule.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/koin/KoinModule.kt
index 5c42ce53c..00c162522 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/koin/KoinModule.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/koin/KoinModule.kt
@@ -33,15 +33,16 @@ import com.tonapps.tonkeeper.ui.screen.settings.language.LanguageViewModel
 import com.tonapps.tonkeeper.ui.screen.name.base.NameViewModel
 import com.tonapps.tonkeeper.ui.screen.name.edit.EditNameViewModel
 import com.tonapps.tonkeeper.ui.screen.notifications.NotificationsViewModel
-import com.tonapps.tonkeeper.ui.screen.picker.PickerViewModel
-import com.tonapps.tonkeeper.ui.screen.picker.list.WalletPickerAdapter
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.PickerViewModel
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.list.WalletPickerAdapter
 import com.tonapps.tonkeeper.ui.screen.settings.main.SettingsViewModel
 import com.tonapps.tonkeeper.ui.screen.settings.passcode.ChangePasscodeViewModel
 import com.tonapps.tonkeeper.ui.screen.settings.security.SecurityViewModel
 import com.tonapps.tonkeeper.ui.screen.settings.theme.ThemeViewModel
 import com.tonapps.tonkeeper.ui.screen.token.TokenViewModel
-import com.tonapps.tonkeeper.ui.screen.wallet.WalletViewModel
-import com.tonapps.tonkeeper.ui.screen.wallet.list.WalletAdapter
+import com.tonapps.tonkeeper.ui.screen.wallet.main.WalletViewModel
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.WalletAdapter
+import com.tonapps.tonkeeper.ui.screen.wallet.manage.TokensManageViewModel
 import com.tonapps.wallet.data.settings.SettingsRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -69,7 +70,7 @@ val koinModel = module {
     viewModel { MainViewModel(get(), get()) }
     viewModel { RootViewModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
     viewModel { RecipientScreenFeature(get()) }
-    viewModel { PickerViewModel(get()) }
+    viewModel { PickerViewModel(get(), get()) }
     viewModel { WalletViewModel(get(), get(), get(), get(), get(), get(), get(), get(), get()) }
     viewModel { CurrencyViewModel(get()) }
     viewModel { SettingsViewModel(get(), get(), get(), get()) }
@@ -93,6 +94,7 @@ val koinModel = module {
     viewModel { BackupViewModel(get(), get(), get()) }
     viewModel { BackupCheckViewModel(get(), get()) }
     viewModel { BackupAttentionViewModel(get(), get()) }
+    viewModel { TokensManageViewModel(get(), get(), get()) }
 
     viewModel { ConfirmScreenFeature(get(), get(), get(), get(), get(), get()) }
     viewModel { AmountScreenFeature(get(), get(), get()) }
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/events/EventsViewModel.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/events/EventsViewModel.kt
index 42d40f037..6556e3097 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/events/EventsViewModel.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/events/EventsViewModel.kt
@@ -2,17 +2,12 @@ package com.tonapps.tonkeeper.ui.screen.events
 
 import android.app.Application
 import android.net.Uri
-import android.util.Log
 import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.tonapps.network.NetworkMonitor
 import com.tonapps.tonkeeper.core.history.HistoryHelper
 import com.tonapps.tonkeeper.core.history.list.item.HistoryItem
-import com.tonapps.tonkeeper.helper.DateFormat
 import com.tonapps.tonkeeper.helper.DateHelper
-import com.tonapps.tonkeeper.ui.screen.wallet.WalletViewModel
-import com.tonapps.tonkeeper.ui.screen.wallet.list.Item
 import com.tonapps.wallet.data.account.WalletRepository
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.core.ScreenCacheSource
@@ -21,10 +16,8 @@ import com.tonapps.wallet.data.push.PushManager
 import com.tonapps.wallet.data.push.entities.AppPushEntity
 import com.tonapps.wallet.data.settings.SettingsRepository
 import com.tonapps.wallet.data.tonconnect.TonConnectRepository
-import com.tonapps.wallet.localization.Localization
 import io.tonapi.models.AccountEvent
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -39,8 +32,6 @@ import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import uikit.extensions.collectFlow
-import java.util.Calendar
-import java.util.Date
 
 class EventsViewModel(
     private val application: Application,
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/init/InitViewModel.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/init/InitViewModel.kt
index 7ed69ed54..be8bbad68 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/init/InitViewModel.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/init/InitViewModel.kt
@@ -4,13 +4,11 @@ import android.Manifest
 import android.app.Application
 import android.content.pm.PackageManager
 import android.os.Build
-import android.util.Log
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.tonapps.blockchain.Coin
+import com.tonapps.blockchain.Coins
 import com.tonapps.blockchain.ton.contract.WalletV4R2Contract
 import com.tonapps.blockchain.ton.contract.WalletVersion
 import com.tonapps.blockchain.ton.extensions.toAccountId
@@ -220,14 +218,14 @@ class InitViewModel(
 
         val items = mutableListOf<AccountItem>()
         for ((index, account) in accounts.withIndex()) {
-            val balance = Coin.toCoins(account.balance)
+            val balance = Coins.of(account.balance)
             val hasTokens = deferredTokens[index].await().size > 1
             val hasCollectibles = deferredCollectibles[index].await().isNotEmpty()
             val item = AccountItem(
                 address = AddrStd(account.address).toWalletAddress(testnet),
                 name = account.name,
                 walletVersion = account.walletVersion,
-                balanceFormat = CurrencyFormatter.format("TON", balance),
+                balanceFormat = CurrencyFormatter.format("TON", balance.value),
                 tokens = hasTokens,
                 collectibles = hasCollectibles,
                 selected = account.walletVersion == WalletVersion.V4R2 || (account.balance > 0 || hasTokens || hasCollectibles),
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/main/MainScreen.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/main/MainScreen.kt
index 1ada23a15..53fbb0f42 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/main/MainScreen.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/main/MainScreen.kt
@@ -1,11 +1,8 @@
 package com.tonapps.tonkeeper.ui.screen.main
 
-import android.content.Context
 import android.os.Bundle
-import android.util.Log
 import android.view.View
 import androidx.annotation.LayoutRes
-import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
 import com.tonapps.tonkeeper.extensions.removeAllFragments
 import com.tonapps.tonkeeperx.R
@@ -13,13 +10,12 @@ import com.tonapps.tonkeeper.ui.screen.browser.main.BrowserMainScreen
 import com.tonapps.tonkeeper.ui.screen.root.RootViewModel
 import com.tonapps.tonkeeper.ui.screen.collectibles.CollectiblesScreen
 import com.tonapps.tonkeeper.ui.screen.events.EventsScreen
-import com.tonapps.tonkeeper.ui.screen.picker.PickerScreen
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.PickerScreen
 import com.tonapps.tonkeeper.ui.screen.root.RootEvent
 import com.tonapps.tonkeeper.ui.screen.swap.SwapScreen
-import com.tonapps.tonkeeper.ui.screen.wallet.WalletScreen
+import com.tonapps.tonkeeper.ui.screen.wallet.main.WalletScreen
 import com.tonapps.uikit.color.constantBlackColor
 import com.tonapps.uikit.color.drawable
-import com.tonapps.wallet.data.account.WalletType
 import org.koin.androidx.viewmodel.ext.android.activityViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import kotlinx.coroutines.flow.filterIsInstance
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/PickerScreen.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/PickerScreen.kt
deleted file mode 100644
index fdb996d32..000000000
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/PickerScreen.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.tonapps.tonkeeper.ui.screen.picker
-
-import android.os.Bundle
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import com.tonapps.tonkeeper.ui.screen.add.AddScreen
-import com.tonapps.tonkeeper.ui.screen.picker.list.WalletPickerAdapter
-import com.tonapps.tonkeeper.ui.screen.picker.list.Item
-import com.tonapps.tonkeeperx.R
-import org.koin.android.ext.android.inject
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import uikit.HapticHelper
-import uikit.base.BaseFragment
-import uikit.extensions.collectFlow
-import uikit.extensions.topScrolled
-import uikit.navigation.Navigation.Companion.navigation
-import uikit.widget.ModalHeader
-import uikit.widget.SimpleRecyclerView
-
-class PickerScreen: BaseFragment(R.layout.fragment_wallet_picker), BaseFragment.Modal {
-
-    override val scaleBackground: Boolean = true
-
-    private val pickerViewModel: PickerViewModel by viewModel()
-    private val adapter: WalletPickerAdapter by inject()
-
-    private lateinit var listView: RecyclerView
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        collectFlow(pickerViewModel.walletChangedFlow) {
-            finish()
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        val headerView = view.findViewById<ModalHeader>(R.id.header)
-        headerView.onCloseClick = ::finish
-
-        listView = view.findViewById<SimpleRecyclerView>(R.id.list)
-        listView.adapter = adapter
-        collectFlow(listView.topScrolled, headerView::setDivider)
-    }
-
-    companion object {
-        fun newInstance() = PickerScreen()
-    }
-}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/list/Holder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/list/Holder.kt
deleted file mode 100644
index a003d0a17..000000000
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/list/Holder.kt
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.tonapps.tonkeeper.ui.screen.picker.list
-
-import android.content.res.ColorStateList
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import androidx.annotation.LayoutRes
-import androidx.appcompat.widget.AppCompatImageView
-import androidx.appcompat.widget.AppCompatTextView
-import com.tonapps.emoji.ui.EmojiView
-import com.tonapps.tonkeeper.koin.walletRepository
-import com.tonapps.tonkeeper.ui.screen.add.AddScreen
-import com.tonapps.tonkeeperx.R
-import com.tonapps.uikit.icon.UIKitIcon
-import com.tonapps.uikit.list.BaseListHolder
-import com.tonapps.wallet.localization.Localization
-import com.tonapps.wallet.data.account.WalletType
-import com.tonapps.wallet.data.core.HIDDEN_BALANCE
-import uikit.extensions.drawable
-import uikit.navigation.Navigation
-import uikit.navigation.Navigation.Companion.navigation
-
-abstract class Holder<I: Item>(
-    parent: ViewGroup,
-    @LayoutRes resId: Int
-): BaseListHolder<I>(parent, resId) {
-
-    val navigation: Navigation?
-        get() = context.navigation
-
-    class Skeleton(
-        parent: ViewGroup
-    ): Holder<Item.Skeleton>(parent, R.layout.view_wallet_item) {
-
-        init {
-            findViewById<View>(R.id.wallet_color).visibility = View.GONE
-        }
-
-        override fun onBind(item: Item.Skeleton) {
-            itemView.background = item.position.drawable(context)
-        }
-    }
-
-    class Wallet(
-        parent: ViewGroup
-    ): Holder<Item.Wallet>(parent, R.layout.view_wallet_item) {
-
-        private val colorView = findViewById<View>(R.id.wallet_color)
-        private val emojiView = findViewById<EmojiView>(R.id.wallet_emoji)
-        private val nameView = findViewById<AppCompatTextView>(R.id.wallet_name)
-        private val balanceView = findViewById<AppCompatTextView>(R.id.wallet_balance)
-        private val checkView = findViewById<AppCompatImageView>(R.id.check)
-        private val typeView = findViewById<AppCompatTextView>(R.id.wallet_type)
-
-        override fun onBind(item: Item.Wallet) {
-            itemView.background = item.position.drawable(context)
-            itemView.setOnClickListener {
-                context.walletRepository?.chooseWallet(item.walletId)
-            }
-
-            colorView.backgroundTintList = ColorStateList.valueOf(item.color)
-            emojiView.setEmoji(item.emoji)
-            nameView.text = item.name
-            if (item.hiddenBalance) {
-                balanceView.text = HIDDEN_BALANCE
-            } else {
-                balanceView.text = item.balance
-            }
-
-            if (item.selected) {
-                checkView.setImageResource(UIKitIcon.ic_donemark_otline_28)
-            } else {
-                checkView.setImageResource(0)
-            }
-            setType(item.walletType)
-        }
-
-        private fun setType(type: WalletType) {
-            if (type == WalletType.Default) {
-                typeView.visibility = View.GONE
-                return
-            }
-            typeView.visibility = View.VISIBLE
-            val resId = when (type) {
-                WalletType.Watch -> Localization.watch_only
-                WalletType.Testnet -> Localization.testnet
-                WalletType.Signer -> Localization.signer
-                else -> throw IllegalArgumentException("Unknown wallet type: $type")
-            }
-            typeView.setText(resId)
-        }
-    }
-
-    class AddWallet(
-        parent: ViewGroup
-    ): Holder<Item.AddWallet>(parent, R.layout.view_wallet_add_item) {
-
-        private val addButton = findViewById<View>(R.id.add)
-
-        init {
-            addButton.setOnClickListener {
-                navigation?.add(AddScreen.newInstance())
-            }
-        }
-
-        override fun onBind(item: Item.AddWallet) {
-
-        }
-    }
-
-}
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/list/WalletPickerAdapter.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/list/WalletPickerAdapter.kt
deleted file mode 100644
index 8179d145d..000000000
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/list/WalletPickerAdapter.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.tonapps.tonkeeper.ui.screen.picker.list
-
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.tonapps.uikit.list.BaseListAdapter
-import com.tonapps.uikit.list.BaseListHolder
-import com.tonapps.uikit.list.BaseListItem
-import com.tonapps.uikit.list.ListCell
-import com.tonapps.wallet.data.account.entities.WalletEntity
-
-class WalletPickerAdapter: BaseListAdapter() {
-
-    companion object {
-
-        private val defaultItems: List<Item> = listOf(
-            Item.Skeleton(ListCell.getPosition(3, 0)),
-            Item.Skeleton(ListCell.getPosition(3, 1)),
-            Item.Skeleton(ListCell.getPosition(3, 2)),
-            Item.AddWallet
-        )
-
-        fun map(
-            wallets: List<WalletEntity>,
-            activeWallet: WalletEntity,
-            balances: List<CharSequence>,
-            hiddenBalance: Boolean
-        ): List<Item> {
-            val uiItems = mutableListOf<Item>()
-            for ((index, wallet) in wallets.withIndex()) {
-                val item = Item.Wallet(
-                    accountId = wallet.accountId,
-                    walletId = wallet.id,
-                    walletLabel = wallet.label,
-                    walletType = wallet.type,
-                    selected = wallet.id == activeWallet.id,
-                    position = ListCell.getPosition(wallets.size, index),
-                    balance = balances[index],
-                    hiddenBalance = hiddenBalance
-                )
-                uiItems.add(item)
-            }
-            uiItems.add(Item.AddWallet)
-            return uiItems
-        }
-    }
-
-    init {
-        submitList(defaultItems)
-    }
-
-    override fun createHolder(parent: ViewGroup, viewType: Int): BaseListHolder<out BaseListItem> {
-        return when(viewType) {
-            Item.TYPE_WALLET -> Holder.Wallet(parent)
-            Item.TYPE_ADD_WALLET -> Holder.AddWallet(parent)
-            Item.TYPE_SKELETON -> Holder.Skeleton(parent)
-            else -> throw IllegalArgumentException("Unknown view type: $viewType")
-        }
-    }
-
-    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
-        super.onAttachedToRecyclerView(recyclerView)
-        recyclerView.setHasFixedSize(false)
-        recyclerView.isNestedScrollingEnabled = true
-    }
-}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootActivity.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootActivity.kt
index 9061f0a90..97268385e 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootActivity.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootActivity.kt
@@ -148,7 +148,7 @@ class RootActivity: NavigationActivity() {
             is RootEvent.Singer -> add(InitScreen.newInstance(InitArgs.Type.Signer, event.publicKey, event.name, event.walletSource))
             is RootEvent.TonConnect -> add(TCAuthFragment.newInstance(event.request))
             is RootEvent.Browser -> add(WebFragment.newInstance(event.uri))
-            is RootEvent.Transfer -> add(SendScreen.newInstance(event.address, event.text, event.amount ?: 0.0, event.jettonAddress))
+            is RootEvent.Transfer -> add(SendScreen.newInstance(event.address, event.text, event.amount, event.jettonAddress))
             is RootEvent.Transaction -> TransactionDialog.open(this, event.event)
             is RootEvent.BuyOrSell -> fiatDialog.show()
             is RootEvent.BuyOrSellDirect -> fiatDialog.openDirect(event.name)
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootEvent.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootEvent.kt
index bc1951082..2fe6b37ce 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootEvent.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootEvent.kt
@@ -1,6 +1,7 @@
 package com.tonapps.tonkeeper.ui.screen.root
 
 import android.net.Uri
+import com.tonapps.blockchain.Coins
 import com.tonapps.tonkeeper.core.history.list.item.HistoryItem
 import com.tonapps.tonkeeperx.R
 import com.tonapps.wallet.data.account.WalletSource
@@ -39,7 +40,7 @@ sealed class RootEvent {
 
     data class Transfer(
         val address: String,
-        val amount: Double?,
+        val amount: String?,
         val text: String?,
         val jettonAddress: String?
     ): RootEvent()
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootViewModel.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootViewModel.kt
index 3cb159e05..2a0ef0b59 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootViewModel.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootViewModel.kt
@@ -2,25 +2,19 @@ package com.tonapps.tonkeeper.ui.screen.root
 
 import android.app.Application
 import android.content.Context
-import android.content.Intent
 import android.net.Uri
 import android.util.Log
-import androidx.core.app.Person
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
-import androidx.core.graphics.drawable.IconCompat
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.crashlytics.setCustomKeys
 import com.google.firebase.ktx.Firebase
-import com.tonapps.blockchain.Coin
-import com.tonapps.emoji.Emoji
 import com.tonapps.extensions.MutableEffectFlow
-import com.tonapps.extensions.getQueryLong
 import com.tonapps.icu.CurrencyFormatter
-import com.tonapps.tonkeeper.App
 import com.tonapps.tonkeeper.core.deeplink.DeepLink
+import com.tonapps.tonkeeper.core.entities.WalletExtendedEntity
 import com.tonapps.tonkeeper.core.history.HistoryHelper
 import com.tonapps.tonkeeper.core.history.list.item.HistoryItem
 import com.tonapps.tonkeeper.core.signer.SingerArgs
@@ -28,17 +22,14 @@ import com.tonapps.tonkeeper.core.widget.Widget
 import com.tonapps.tonkeeper.helper.ShortcutHelper
 import com.tonapps.tonkeeper.password.PasscodeRepository
 import com.tonapps.wallet.data.push.GooglePushService
-import com.tonapps.wallet.data.push.PushManager
 import com.tonapps.tonkeeper.sign.SignManager
 import com.tonapps.tonkeeper.sign.SignRequestEntity
 import com.tonapps.tonkeeper.ui.screen.main.MainScreen
-import com.tonapps.tonkeeper.ui.screen.picker.list.WalletPickerAdapter
-import com.tonapps.tonkeeper.ui.screen.wallet.WalletViewModel.Companion.getWalletScreen
-import com.tonapps.tonkeeper.ui.screen.wallet.list.Item
-import com.tonapps.tonkeeper.ui.screen.wallet.list.WalletAdapter
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.list.WalletPickerAdapter
+import com.tonapps.tonkeeper.ui.screen.wallet.main.WalletViewModel.Companion.getWalletScreen
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.Item
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.WalletAdapter
 import com.tonapps.tonkeeperx.R
-import com.tonapps.uikit.color.accentBlueColor
-import com.tonapps.uikit.icon.UIKitIcon
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.account.WalletRepository
 import com.tonapps.wallet.data.account.WalletSource
@@ -65,9 +56,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.drop
-import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.firstOrNull
@@ -149,7 +138,13 @@ class RootViewModel(
             settingsRepository.hiddenBalancesFlow,
         ) { wallets, wallet, hiddenBalance ->
             val balances = getBalances(wallets)
-            walletPickerAdapter.submitList(WalletPickerAdapter.map(wallets, wallet, balances, hiddenBalance))
+            val entities = wallets.map {
+                WalletExtendedEntity(
+                    raw = it,
+                    prefs = settingsRepository.getWalletPrefs(it.id)
+                )
+            }.sortedBy { it.index }
+            walletPickerAdapter.submitList(WalletPickerAdapter.map(entities.map { it.raw }, wallet, balances, hiddenBalance))
         }.launchIn(viewModelScope)
 
         viewModelScope.launch(Dispatchers.IO) {
@@ -336,7 +331,7 @@ class RootViewModel(
         } else if (uri.path?.startsWith("/transfer/") == true) {
             _eventFlow.tryEmit(RootEvent.Transfer(
                 address = uri.pathSegments.last(),
-                amount = uri.getQueryLong("amount")?.let { Coin.toCoinsDouble(it) },
+                amount = uri.getQueryParameter("amount"),
                 text = uri.getQueryParameter("text"),
                 jettonAddress = uri.getQueryParameter("jetton"),
             ))
@@ -413,6 +408,6 @@ class RootViewModel(
             settingsRepository.currency
         }
         val totalBalance = tokenRepository.getTotalBalances(currency, accountId, testnet)
-        return CurrencyFormatter.formatFiat(currency.code, totalBalance.toFloat())
+        return CurrencyFormatter.formatFiat(currency.code, totalBalance.value)
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/language/LanguageScreen.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/language/LanguageScreen.kt
index 80f369c39..692dbe213 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/language/LanguageScreen.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/language/LanguageScreen.kt
@@ -3,7 +3,6 @@ package com.tonapps.tonkeeper.ui.screen.settings.language
 import android.os.Bundle
 import android.view.View
 import com.tonapps.tonkeeper.ui.screen.settings.language.list.Adapter
-import com.tonapps.tonkeeper.ui.screen.wallet.WalletViewModel
 import com.tonapps.wallet.localization.Localization
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import uikit.base.BaseFragment
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/token/TokenData.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/token/TokenData.kt
index 80b1e95b7..ddffe5bb6 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/token/TokenData.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/token/TokenData.kt
@@ -1,6 +1,7 @@
 package com.tonapps.tonkeeper.ui.screen.token
 
 import android.net.Uri
+import com.tonapps.blockchain.Coins
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.token.entities.AccountTokenEntity
 
@@ -33,9 +34,9 @@ data class TokenData(
     val iconUri: Uri
         get() = token.imageUri
 
-    val balance: Double
+    val balance: Coins
         get() = token.balance.value
 
-    val fiat: Double
+    val fiat: Coins
         get() = token.fiat
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/token/TokenViewModel.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/token/TokenViewModel.kt
index 70bb110c1..2f5e93688 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/token/TokenViewModel.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/token/TokenViewModel.kt
@@ -96,8 +96,8 @@ class TokenViewModel(
     private fun buildItems(token: TokenData, charts: List<ChartEntity>) {
         val items = mutableListOf<Item>()
         items.add(Item.Balance(
-            balance = CurrencyFormatter.format(token.symbol, token.balance),
-            fiat = CurrencyFormatter.format(settingsRepository.currency.code, token.fiat),
+            balance = CurrencyFormatter.format(token.symbol, token.balance.value, token.token.decimals),
+            fiat = CurrencyFormatter.format(settingsRepository.currency.code, token.fiat.value),
             iconUri = token.iconUri,
         ))
         items.add(Item.Actions(
@@ -111,7 +111,7 @@ class TokenViewModel(
         ))
         if (token.verified) {
             items.add(Item.Price(
-                fiatPrice = CurrencyFormatter.format(settingsRepository.currency.code, token.token.rateNow),
+                fiatPrice = CurrencyFormatter.format(settingsRepository.currency.code, token.token.rateNow.value),
                 rateDiff24h = token.token.rateDiff24h
             ))
             items.add(Item.Chart(
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/WalletScreen.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/WalletScreen.kt
similarity index 92%
rename from apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/WalletScreen.kt
rename to apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/WalletScreen.kt
index b8fc995aa..0f936bef0 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/WalletScreen.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/WalletScreen.kt
@@ -1,4 +1,4 @@
-package com.tonapps.tonkeeper.ui.screen.wallet
+package com.tonapps.tonkeeper.ui.screen.wallet.main
 
 import android.os.Bundle
 import android.view.View
@@ -6,9 +6,9 @@ import androidx.recyclerview.widget.RecyclerView
 import com.tonapps.tonkeeper.ui.component.MainRecyclerView
 import com.tonapps.tonkeeper.ui.component.wallet.WalletHeaderView
 import com.tonapps.tonkeeper.ui.screen.main.MainScreen
-import com.tonapps.tonkeeper.ui.screen.picker.PickerScreen
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.PickerScreen
 import com.tonapps.tonkeeper.ui.screen.settings.main.SettingsScreen
-import com.tonapps.tonkeeper.ui.screen.wallet.list.WalletAdapter
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.WalletAdapter
 import com.tonapps.tonkeeperx.R
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/WalletTokens.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/WalletTokens.kt
similarity index 95%
rename from apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/WalletTokens.kt
rename to apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/WalletTokens.kt
index f01d41136..0e950fc44 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/WalletTokens.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/WalletTokens.kt
@@ -1,4 +1,4 @@
-package com.tonapps.tonkeeper.ui.screen.wallet
+package com.tonapps.tonkeeper.ui.screen.wallet.main
 
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.core.WalletCurrency
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/WalletViewModel.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/WalletViewModel.kt
similarity index 89%
rename from apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/WalletViewModel.kt
rename to apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/WalletViewModel.kt
index 27ee6d66b..6a81aa6c9 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/WalletViewModel.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/WalletViewModel.kt
@@ -1,11 +1,12 @@
-package com.tonapps.tonkeeper.ui.screen.wallet
+package com.tonapps.tonkeeper.ui.screen.wallet.main
 
-import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.tonapps.blockchain.Coins
 import com.tonapps.icu.CurrencyFormatter
 import com.tonapps.network.NetworkMonitor
-import com.tonapps.tonkeeper.ui.screen.wallet.list.Item
+import com.tonapps.tonkeeper.core.entities.TokenExtendedEntity
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.Item
 import com.tonapps.uikit.list.ListCell
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.api.entity.TokenEntity
@@ -29,7 +30,6 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.filter
@@ -38,7 +38,6 @@ import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import uikit.extensions.collectFlow
@@ -78,11 +77,7 @@ class WalletViewModel(
 
     val uiLabelFlow = walletRepository.activeWalletFlow.map { it.label }
 
-    // private val tokens = WalletTokens(tokenRepository)
-
     init {
-        // combine(walletRepository.activeWalletFlow, settingsRepository.currencyFlow, tokens::load).launchIn(viewModelScope)
-
         collectFlow(walletRepository.activeWalletFlow.map { screenCacheSource.getWalletScreen(it) }.flowOn(Dispatchers.IO)) { items ->
             if (items.isNullOrEmpty()) {
                 _uiItemsFlow.value = listOf(Item.Skeleton(true))
@@ -90,8 +85,10 @@ class WalletViewModel(
                 _uiItemsFlow.value = items.map {
                     if (it !is Item.Token) {
                         it
-                    } else if (it.isTon) {
+                    } else if (it.isTON) {
                         it.copy(iconUri = TokenEntity.TON_ICON_URI)
+                    } else if (it.isUSDT) {
+                        it.copy(iconUri = TokenEntity.USDT_ICON_URI)
                     } else {
                         it
                     }
@@ -154,14 +151,28 @@ class WalletViewModel(
         }.launchIn(viewModelScope)
 
         combine(
+            walletRepository.activeWalletFlow,
             dataFlow,
             statusFlow,
-        ) { tokens, status ->
-            val (fiatBalance, uiItems) = buildTokenUiItems(tokens.currency, tokens.wallet.testnet, tokens.list)
+            settingsRepository.tokenPrefsChangedFlow,
+        ) { wallet, tokens, status, _ ->
+            val (fiatBalance, uiItems) = buildTokenUiItems(tokens.currency, tokens.wallet.testnet, tokens.list.map {
+                TokenExtendedEntity(
+                    raw = it,
+                    prefs = settingsRepository.getTokenPrefs(wallet.id, it.address)
+                )
+            }.filter { !it.hidden }.sortedWith(compareBy<TokenExtendedEntity> {
+                !it.isTon
+            }.thenBy {
+                !it.pinned
+            }.thenBy {
+                it.index
+            }))
+
             val balanceFormat = if (tokens.wallet.testnet) {
-                CurrencyFormatter.formatFiat("TON", fiatBalance.toFloat())
+                CurrencyFormatter.formatFiat(TokenEntity.TON.symbol, fiatBalance.value)
             } else {
-                CurrencyFormatter.formatFiat(tokens.currency.code, fiatBalance.toFloat())
+                CurrencyFormatter.formatFiat(tokens.currency.code, fiatBalance.value)
             }
 
             val actualStatus = if (tokens.isOnline) {
@@ -233,9 +244,9 @@ class WalletViewModel(
     private fun buildTokenUiItems(
         currency: WalletCurrency,
         testnet: Boolean,
-        tokens: List<AccountTokenEntity>,
-    ): Pair<Double, List<Item.Token>> {
-        var fiatBalance = 0.0
+        tokens: List<TokenExtendedEntity>,
+    ): Pair<Coins, List<Item.Token>> {
+        var fiatBalance = Coins.of(0)
         if (testnet) {
             fiatBalance = tokens.first().balance.value
         }
@@ -243,8 +254,8 @@ class WalletViewModel(
         for ((index, token) in tokens.withIndex()) {
             fiatBalance += token.fiat
 
-            val balanceFormat = CurrencyFormatter.format(value = token.balance.value)
-            val fiatFormat = CurrencyFormatter.formatFiat(currency.code, token.fiat)
+            val balanceFormat = CurrencyFormatter.format(value = token.balance.value.value)
+            val fiatFormat = CurrencyFormatter.formatFiat(currency.code, token.fiat.value)
 
             val item = Item.Token(
                 position = ListCell.getPosition(tokens.size, index),
@@ -256,7 +267,7 @@ class WalletViewModel(
                 balanceFormat = balanceFormat,
                 fiat = token.fiat,
                 fiatFormat = fiatFormat,
-                rate = CurrencyFormatter.formatFiat(currency.code, token.rateNow),
+                rate = CurrencyFormatter.formatFiat(currency.code, token.rateNow.value),
                 rateDiff24h = token.rateDiff24h,
                 verified = token.verified,
                 testnet = testnet,
@@ -276,14 +287,16 @@ class WalletViewModel(
         apps: List<DAppEntity>,
     ) {
         val items = mutableListOf<Item>()
-        items.add(Item.Balance(
+        items.add(
+            Item.Balance(
             balance = balance,
             address = wallet.address,
             walletType = wallet.type,
             status = status,
             hiddenBalance = settingsRepository.hiddenBalances
         ))
-        items.add(Item.Actions(
+        items.add(
+            Item.Actions(
             address = wallet.address,
             token = TokenEntity.TON,
             walletType = wallet.type,
@@ -296,6 +309,9 @@ class WalletViewModel(
         items.add(Item.Space(true))
         items.addAll(list)
         items.add(Item.Space(true))
+        if (list.size > 2) {
+            items.add(Item.Manage(true))
+        }
         _uiItemsFlow.value = items.toList()
         setCached(wallet, items)
     }
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/Item.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/Item.kt
similarity index 82%
rename from apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/Item.kt
rename to apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/Item.kt
index 2cb51d883..e27306e9b 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/Item.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/Item.kt
@@ -1,9 +1,10 @@
-package com.tonapps.tonkeeper.ui.screen.wallet.list
+package com.tonapps.tonkeeper.ui.screen.wallet.main.list
 
 import android.content.Context
 import android.net.Uri
 import android.os.Parcel
 import android.os.Parcelable
+import com.tonapps.blockchain.Coins
 import com.tonapps.extensions.readArrayCompat
 import com.tonapps.extensions.readBooleanCompat
 import com.tonapps.extensions.readCharSequenceCompat
@@ -30,6 +31,7 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
         const val TYPE_SKELETON = 4
         const val TYPE_PUSH = 5
         const val TYPE_TITLE = 6
+        const val TYPE_MANAGE = 7
 
         fun createFromParcel(parcel: Parcel): Item {
             return when (parcel.readInt()) {
@@ -39,6 +41,7 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
                 TYPE_SPACE -> Space(parcel)
                 TYPE_SKELETON -> Skeleton(parcel)
                 TYPE_PUSH -> Push(parcel)
+                TYPE_MANAGE -> Manage(parcel)
                 else -> throw IllegalArgumentException("Unknown type")
             }
         }
@@ -91,9 +94,7 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
         companion object CREATOR : Parcelable.Creator<Balance> {
             override fun createFromParcel(parcel: Parcel) = Balance(parcel)
 
-            override fun newArray(size: Int): Array<Balance?> {
-                return arrayOfNulls(size)
-            }
+            override fun newArray(size: Int): Array<Balance?> = arrayOfNulls(size)
         }
     }
 
@@ -124,9 +125,7 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
         companion object CREATOR : Parcelable.Creator<Actions> {
             override fun createFromParcel(parcel: Parcel) = Actions(parcel)
 
-            override fun newArray(size: Int): Array<Actions?> {
-                return arrayOfNulls(size)
-            }
+            override fun newArray(size: Int): Array<Actions?> = arrayOfNulls(size)
         }
     }
 
@@ -136,9 +135,9 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
         val address: String,
         val symbol: String,
         val name: String,
-        val balance: Double,
+        val balance: Coins,
         val balanceFormat: CharSequence,
-        val fiat: Double,
+        val fiat: Coins,
         val fiatFormat: CharSequence,
         val rate: CharSequence,
         val rateDiff24h: String,
@@ -147,7 +146,9 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
         val hiddenBalance: Boolean
     ): Item(TYPE_TOKEN) {
 
-        val isTon = symbol == "TON"
+        val isTON = symbol == TokenEntity.TON.symbol
+
+        val isUSDT = symbol == TokenEntity.USDT.symbol
 
         constructor(parcel: Parcel) : this(
             parcel.readEnum(ListCell.Position::class.java)!!,
@@ -155,9 +156,9 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
             parcel.readString()!!,
             parcel.readString()!!,
             parcel.readString()!!,
-            parcel.readDouble(),
-            parcel.readCharSequenceCompat()!!,
-            parcel.readDouble(),
+            parcel.readParcelableCompat()!!,
+            parcel.readCharSequenceCompat() ?: "",
+            parcel.readParcelableCompat()!!,
             parcel.readCharSequenceCompat()!!,
             parcel.readCharSequenceCompat()!!,
             parcel.readString()!!,
@@ -172,9 +173,9 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
             dest.writeString(address)
             dest.writeString(symbol)
             dest.writeString(name)
-            dest.writeDouble(balance)
+            dest.writeParcelable(balance, flags)
             dest.writeCharSequenceCompat(balanceFormat)
-            dest.writeDouble(fiat)
+            dest.writeParcelable(fiat, flags)
             dest.writeCharSequenceCompat(fiatFormat)
             dest.writeCharSequenceCompat(rate)
             dest.writeString(rateDiff24h)
@@ -186,9 +187,7 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
         companion object CREATOR : Parcelable.Creator<Token> {
             override fun createFromParcel(parcel: Parcel) = Token(parcel)
 
-            override fun newArray(size: Int): Array<Token?> {
-                return arrayOfNulls(size)
-            }
+            override fun newArray(size: Int): Array<Token?> = arrayOfNulls(size)
         }
     }
 
@@ -205,9 +204,7 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
         companion object CREATOR : Parcelable.Creator<Space> {
             override fun createFromParcel(parcel: Parcel) = Space(parcel)
 
-            override fun newArray(size: Int): Array<Space?> {
-                return arrayOfNulls(size)
-            }
+            override fun newArray(size: Int): Array<Space?> = arrayOfNulls(size)
         }
     }
 
@@ -224,9 +221,7 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
         companion object CREATOR : Parcelable.Creator<Skeleton> {
             override fun createFromParcel(parcel: Parcel) = Skeleton(parcel)
 
-            override fun newArray(size: Int): Array<Skeleton?> {
-                return arrayOfNulls(size)
-            }
+            override fun newArray(size: Int): Array<Skeleton?> = arrayOfNulls(size)
         }
     }
 
@@ -254,9 +249,7 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
         companion object CREATOR : Parcelable.Creator<Push> {
             override fun createFromParcel(parcel: Parcel) = Push(parcel)
 
-            override fun newArray(size: Int): Array<Push?> {
-                return arrayOfNulls(size)
-            }
+            override fun newArray(size: Int): Array<Push?> = arrayOfNulls(size)
         }
     }
 
@@ -279,9 +272,24 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
         companion object CREATOR : Parcelable.Creator<Title> {
             override fun createFromParcel(parcel: Parcel) = Title(parcel)
 
-            override fun newArray(size: Int): Array<Title?> {
-                return arrayOfNulls(size)
-            }
+            override fun newArray(size: Int): Array<Title?> = arrayOfNulls(size)
+        }
+    }
+
+    data class Manage(val value: Boolean): Item(TYPE_MANAGE) {
+
+        constructor(parcel: Parcel) : this(
+            parcel.readBooleanCompat()
+        )
+
+        override fun marshall(dest: Parcel, flags: Int) {
+            dest.writeBooleanCompat(value)
+        }
+
+        companion object CREATOR : Parcelable.Creator<Manage> {
+            override fun createFromParcel(parcel: Parcel) = Manage(parcel)
+
+            override fun newArray(size: Int): Array<Manage?> = arrayOfNulls(size)
         }
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/WalletAdapter.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/WalletAdapter.kt
similarity index 57%
rename from apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/WalletAdapter.kt
rename to apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/WalletAdapter.kt
index a5529a8d4..b84403f3c 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/WalletAdapter.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/WalletAdapter.kt
@@ -1,14 +1,14 @@
-package com.tonapps.tonkeeper.ui.screen.wallet.list
+package com.tonapps.tonkeeper.ui.screen.wallet.main.list
 
-import android.util.Log
 import android.view.ViewGroup
-import com.tonapps.tonkeeper.ui.screen.wallet.list.holder.ActionsHolder
-import com.tonapps.tonkeeper.ui.screen.wallet.list.holder.BalanceHolder
-import com.tonapps.tonkeeper.ui.screen.wallet.list.holder.PushHolder
-import com.tonapps.tonkeeper.ui.screen.wallet.list.holder.SkeletonHolder
-import com.tonapps.tonkeeper.ui.screen.wallet.list.holder.SpaceHolder
-import com.tonapps.tonkeeper.ui.screen.wallet.list.holder.TitleHolder
-import com.tonapps.tonkeeper.ui.screen.wallet.list.holder.TokenHolder
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder.ActionsHolder
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder.BalanceHolder
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder.ManageHolder
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder.PushHolder
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder.SkeletonHolder
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder.SpaceHolder
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder.TitleHolder
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder.TokenHolder
 import com.tonapps.uikit.list.BaseListAdapter
 import com.tonapps.uikit.list.BaseListHolder
 import com.tonapps.uikit.list.BaseListItem
@@ -30,6 +30,7 @@ class WalletAdapter(
             Item.TYPE_SKELETON -> SkeletonHolder(parent)
             Item.TYPE_PUSH -> PushHolder(parent)
             Item.TYPE_TITLE -> TitleHolder(parent)
+            Item.TYPE_MANAGE -> ManageHolder(parent)
             else -> throw IllegalArgumentException("Unknown view type: $viewType")
         }
     }
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/ActionsHolder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/ActionsHolder.kt
similarity index 93%
rename from apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/ActionsHolder.kt
rename to apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/ActionsHolder.kt
index d87a459f0..81ded81a5 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/ActionsHolder.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/ActionsHolder.kt
@@ -1,4 +1,4 @@
-package com.tonapps.tonkeeper.ui.screen.wallet.list.holder
+package com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder
 
 import android.view.View
 import android.view.ViewGroup
@@ -7,7 +7,7 @@ import com.tonapps.tonkeeper.extensions.openCamera
 import com.tonapps.tonkeeper.extensions.sendCoin
 import com.tonapps.tonkeeper.ui.screen.qr.QRScreen
 import com.tonapps.tonkeeper.ui.screen.swap.SwapScreen
-import com.tonapps.tonkeeper.ui.screen.wallet.list.Item
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.Item
 import com.tonapps.tonkeeperx.R
 import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.account.WalletType
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/BalanceHolder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/BalanceHolder.kt
similarity index 96%
rename from apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/BalanceHolder.kt
rename to apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/BalanceHolder.kt
index f741fd26e..df44d1069 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/BalanceHolder.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/BalanceHolder.kt
@@ -1,8 +1,7 @@
-package com.tonapps.tonkeeper.ui.screen.wallet.list.holder
+package com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder
 
 import android.content.Context
 import android.graphics.Canvas
-import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Rect
 import android.graphics.RectF
@@ -10,10 +9,9 @@ import android.util.TypedValue
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.AppCompatTextView
-import androidx.core.graphics.toRectF
 import com.tonapps.tonkeeper.api.shortAddress
 import com.tonapps.tonkeeper.extensions.copyWithToast
-import com.tonapps.tonkeeper.ui.screen.wallet.list.Item
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.Item
 import com.tonapps.tonkeeperx.R
 import com.tonapps.uikit.color.UIKitColor
 import com.tonapps.uikit.color.accentGreenColor
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/Holder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/Holder.kt
similarity index 64%
rename from apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/Holder.kt
rename to apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/Holder.kt
index c2c387179..b4a58a0dc 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/Holder.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/Holder.kt
@@ -1,8 +1,8 @@
-package com.tonapps.tonkeeper.ui.screen.wallet.list.holder
+package com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder
 
 import android.view.ViewGroup
 import androidx.annotation.LayoutRes
-import com.tonapps.tonkeeper.ui.screen.wallet.list.Item
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.Item
 import com.tonapps.uikit.list.BaseListHolder
 
 abstract class Holder<I: Item>(
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/ManageHolder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/ManageHolder.kt
new file mode 100644
index 000000000..9a0f7e049
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/ManageHolder.kt
@@ -0,0 +1,24 @@
+package com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder
+
+import android.view.ViewGroup
+import android.widget.Button
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.Item
+import com.tonapps.tonkeeper.ui.screen.wallet.manage.TokensManageScreen
+import com.tonapps.tonkeeperx.R
+import uikit.navigation.Navigation
+
+class ManageHolder(
+    parent: ViewGroup
+): Holder<Item.Manage>(parent, R.layout.view_wallet_manage) {
+
+    init {
+        findViewById<Button>(R.id.button).setOnClickListener {
+            Navigation.from(context)?.add(TokensManageScreen.newInstance())
+        }
+    }
+
+    override fun onBind(item: Item.Manage) {
+
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/PushHolder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/PushHolder.kt
similarity index 91%
rename from apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/PushHolder.kt
rename to apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/PushHolder.kt
index 2a26b22fb..5b212389e 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/PushHolder.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/PushHolder.kt
@@ -1,10 +1,10 @@
-package com.tonapps.tonkeeper.ui.screen.wallet.list.holder
+package com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder
 
 import android.net.Uri
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.AppCompatTextView
-import com.tonapps.tonkeeper.ui.screen.wallet.list.Item
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.Item
 import com.tonapps.tonkeeperx.R
 import uikit.navigation.Navigation
 import uikit.widget.FrescoView
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/SkeletonHolder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/SkeletonHolder.kt
similarity index 64%
rename from apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/SkeletonHolder.kt
rename to apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/SkeletonHolder.kt
index c92ca2e84..21254fb17 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/SkeletonHolder.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/SkeletonHolder.kt
@@ -1,7 +1,7 @@
-package com.tonapps.tonkeeper.ui.screen.wallet.list.holder
+package com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder
 
 import android.view.ViewGroup
-import com.tonapps.tonkeeper.ui.screen.wallet.list.Item
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.Item
 import com.tonapps.tonkeeperx.R
 
 class SkeletonHolder(parent: ViewGroup): Holder<Item.Skeleton>(parent,  R.layout.view_wallet_skeleton) {
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/SpaceHolder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/SpaceHolder.kt
similarity index 62%
rename from apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/SpaceHolder.kt
rename to apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/SpaceHolder.kt
index 4fdceea76..b9b1f2a14 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/SpaceHolder.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/SpaceHolder.kt
@@ -1,7 +1,7 @@
-package com.tonapps.tonkeeper.ui.screen.wallet.list.holder
+package com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder
 
 import android.view.ViewGroup
-import com.tonapps.tonkeeper.ui.screen.wallet.list.Item
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.Item
 import com.tonapps.tonkeeperx.R
 
 class SpaceHolder(parent: ViewGroup): Holder<Item.Space>(parent,  R.layout.view_wallet_space) {
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/TitleHolder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/TitleHolder.kt
similarity index 74%
rename from apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/TitleHolder.kt
rename to apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/TitleHolder.kt
index fbd951e67..3a2db6525 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/TitleHolder.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/TitleHolder.kt
@@ -1,8 +1,8 @@
-package com.tonapps.tonkeeper.ui.screen.wallet.list.holder
+package com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder
 
 import android.view.ViewGroup
 import androidx.appcompat.widget.AppCompatTextView
-import com.tonapps.tonkeeper.ui.screen.wallet.list.Item
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.Item
 import com.tonapps.tonkeeperx.R
 
 class TitleHolder(parent: ViewGroup): Holder<Item.Title>(parent, R.layout.view_wallet_title) {
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/TokenHolder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/TokenHolder.kt
similarity index 95%
rename from apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/TokenHolder.kt
rename to apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/TokenHolder.kt
index 22425f482..5dea10d2a 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/list/holder/TokenHolder.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/TokenHolder.kt
@@ -1,11 +1,11 @@
-package com.tonapps.tonkeeper.ui.screen.wallet.list.holder
+package com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder
 
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.AppCompatTextView
 import com.tonapps.tonkeeper.extensions.buildRateString
 import com.tonapps.tonkeeper.ui.screen.token.TokenScreen
-import com.tonapps.tonkeeper.ui.screen.wallet.list.Item
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.Item
 import com.tonapps.tonkeeperx.R
 import com.tonapps.uikit.color.accentOrangeColor
 import com.tonapps.uikit.color.textSecondaryColor
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/TokensManageScreen.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/TokensManageScreen.kt
new file mode 100644
index 000000000..a6c66fde0
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/TokensManageScreen.kt
@@ -0,0 +1,72 @@
+package com.tonapps.tonkeeper.ui.screen.wallet.manage
+
+import android.os.Bundle
+import android.util.Log
+import android.view.View
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import com.tonapps.tonkeeper.ui.screen.wallet.manage.list.Adapter
+import com.tonapps.tonkeeper.ui.screen.wallet.manage.list.Item
+import com.tonapps.tonkeeper.ui.screen.wallet.manage.list.holder.Holder
+import com.tonapps.wallet.localization.Localization
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import uikit.base.BaseFragment
+import uikit.base.BaseListFragment
+import uikit.extensions.collectFlow
+import uikit.extensions.getDimensionPixelSize
+
+class TokensManageScreen: BaseListFragment(), BaseFragment.BottomSheet {
+
+    private val tokensManageViewModel: TokensManageViewModel by viewModel()
+    private val adapter: Adapter by lazy {
+        Adapter(tokensManageViewModel::onPinChange, tokensManageViewModel::onHiddenChange)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        collectFlow(tokensManageViewModel.uiItemsFlow, adapter::submitList)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setTitle(getString(Localization.manage))
+        setAdapter(adapter)
+        val horizontalOffset = requireContext().getDimensionPixelSize(uikit.R.dimen.cornerMedium)
+        setListPadding(horizontalOffset, 0, horizontalOffset, 0)
+        setTouchHelperCallback(object : ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0) {
+
+            override fun isLongPressDragEnabled() = true
+
+            override fun onMove(
+                recyclerView: RecyclerView,
+                viewHolder: RecyclerView.ViewHolder,
+                target: RecyclerView.ViewHolder
+            ): Boolean {
+                val item = (viewHolder as? Holder<*>)?.item ?: return false
+                if (item is Item.Token && item.pinned) {
+                    adapter.moveItem(viewHolder.bindingAdapterPosition, target.bindingAdapterPosition)
+                    return true
+                }
+                return false
+            }
+
+            override fun clearView(
+                recyclerView: RecyclerView,
+                viewHolder: RecyclerView.ViewHolder
+            ) {
+                super.clearView(recyclerView, viewHolder)
+                val item = (viewHolder as? Holder<*>)?.item ?: return
+                if (item is Item.Token && item.pinned) {
+                    tokensManageViewModel.changeOrder(item.address, viewHolder.bindingAdapterPosition)
+                }
+            }
+
+            override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) { }
+
+        })
+    }
+
+    companion object {
+        fun newInstance() = TokensManageScreen()
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/TokensManageViewModel.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/TokensManageViewModel.kt
new file mode 100644
index 000000000..3e380f0df
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/TokensManageViewModel.kt
@@ -0,0 +1,109 @@
+package com.tonapps.tonkeeper.ui.screen.wallet.manage
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.tonapps.tonkeeper.core.entities.TokenExtendedEntity
+import com.tonapps.tonkeeper.ui.screen.wallet.manage.list.Item
+import com.tonapps.uikit.list.ListCell
+import com.tonapps.wallet.data.account.WalletRepository
+import com.tonapps.wallet.data.settings.SettingsRepository
+import com.tonapps.wallet.data.token.TokenRepository
+import com.tonapps.wallet.localization.Localization
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.take
+import uikit.extensions.collectFlow
+
+class TokensManageViewModel(
+    private val walletRepository: WalletRepository,
+    private val settingsRepository: SettingsRepository,
+    private val tokenRepository: TokenRepository,
+): ViewModel() {
+
+    private val tokensFlow = combine(
+        walletRepository.activeWalletFlow,
+        settingsRepository.tokenPrefsChangedFlow,
+    ) { wallet, _ ->
+        tokenRepository.getLocal(settingsRepository.currency, wallet.accountId, wallet.testnet).map { token ->
+            TokenExtendedEntity(
+                raw = token,
+                prefs = settingsRepository.getTokenPrefs(wallet.id, token.address),
+            )
+        }.filter { !it.raw.isTon }
+    }
+
+    private val _uiItemsFlow = MutableStateFlow<List<Item>>(emptyList())
+    val uiItemsFlow = _uiItemsFlow.asStateFlow()
+
+    init {
+        tokensFlow.map { tokens ->
+            val pinnedTokens = tokens.filter { it.pinned }.sortedBy {
+                it.index
+            }
+            val otherTokens = tokens.filter { !it.pinned }
+
+            val items = mutableListOf<Item>()
+            if (pinnedTokens.isNotEmpty()) {
+                items.add(Item.Title(Localization.pinned))
+                for ((index, token) in pinnedTokens.withIndex()) {
+                    items.add(Item.Token(ListCell.getPosition(pinnedTokens.size, index), token))
+                }
+            }
+
+            if (otherTokens.isNotEmpty()) {
+                items.add(Item.Space)
+                items.add(Item.Title(Localization.all_assets, Localization.sorted_by_price))
+                for ((index, token) in otherTokens.withIndex()) {
+                    items.add(Item.Token(ListCell.getPosition(otherTokens.size, index), token))
+                }
+            }
+
+            items
+        }.flowOn(Dispatchers.IO).onEach { _uiItemsFlow.value = it }.launchIn(viewModelScope)
+    }
+
+    fun changeOrder(address: String, toIndex: Int) {
+        val uiItems = _uiItemsFlow.value.toMutableList()
+        val fromIndex = uiItems.indexOfFirst {
+            it is Item.Token && it.address == address
+        }
+        if (fromIndex == -1) {
+            return
+        }
+        val item = uiItems.removeAt(fromIndex)
+        uiItems.add(toIndex, item)
+
+        val pinnedItems = uiItems.filterIsInstance<Item.Token>().filter { it.pinned }
+        val newPinnedUiItems = pinnedItems.mapIndexed { index, pinnedItem ->
+            pinnedItem.copy(position = ListCell.getPosition(pinnedItems.size, index))
+        }.toList()
+        uiItems.removeAll(pinnedItems)
+        uiItems.addAll(1, newPinnedUiItems)
+
+        _uiItemsFlow.value = uiItems
+
+        collectFlow(walletRepository.activeWalletFlow.take(1)) { wallet ->
+            settingsRepository.setTokensSort(wallet.id, newPinnedUiItems.map {
+                it.address
+            })
+        }
+    }
+
+    fun onPinChange(tokenAddress: String, pin: Boolean) {
+        collectFlow(walletRepository.activeWalletFlow.take(1)) { wallet ->
+            settingsRepository.setTokenPinned(wallet.id, tokenAddress, pin)
+        }
+    }
+
+    fun onHiddenChange(tokenAddress: String, hidden: Boolean) {
+        collectFlow(walletRepository.activeWalletFlow.take(1)) { wallet ->
+            settingsRepository.setTokenHidden(wallet.id, tokenAddress, hidden)
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/Adapter.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/Adapter.kt
new file mode 100644
index 000000000..ccb717655
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/Adapter.kt
@@ -0,0 +1,63 @@
+package com.tonapps.tonkeeper.ui.screen.wallet.manage.list
+
+import android.annotation.SuppressLint
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import com.tonapps.tonkeeper.ui.screen.wallet.manage.list.holder.Holder
+import com.tonapps.tonkeeper.ui.screen.wallet.manage.list.holder.SpaceHolder
+import com.tonapps.tonkeeper.ui.screen.wallet.manage.list.holder.TitleHolder
+import com.tonapps.tonkeeper.ui.screen.wallet.manage.list.holder.TokenHolder
+import com.tonapps.uikit.list.BaseListAdapter
+import com.tonapps.uikit.list.BaseListHolder
+import com.tonapps.uikit.list.BaseListItem
+import com.tonapps.uikit.list.DiffCallback
+
+class Adapter(
+    private val doOnPinChange: (tokenAddress: String, pin: Boolean) -> Unit,
+    private val doOnHiddeChange: (tokenAddress: String, hidden: Boolean) -> Unit
+): RecyclerView.Adapter<Holder<*>>() {
+
+    private var list = listOf<Item>()
+
+    private fun getItem(position: Int) = list[position]
+
+    override fun getItemViewType(position: Int) = list[position].type
+
+    @SuppressLint("NotifyDataSetChanged")
+    fun submitList(newList: List<Item>) {
+        this.list = newList
+        notifyDataSetChanged()
+    }
+
+    fun moveItem(fromPosition: Int, toPosition: Int) {
+        val newList = list.toMutableList()
+        val item = newList.removeAt(fromPosition)
+        newList.add(toPosition, item)
+        list = newList
+        notifyItemMoved(fromPosition, toPosition)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder<*> {
+        return when(viewType) {
+            Item.TYPE_TITLE -> TitleHolder(parent)
+            Item.TYPE_TOKEN -> TokenHolder(parent, doOnPinChange, doOnHiddeChange)
+            Item.TYPE_SPACE -> SpaceHolder(parent)
+            else -> throw IllegalArgumentException("Unknown view type: $viewType")
+        }
+    }
+
+    override fun getItemCount() = list.size
+
+    override fun onBindViewHolder(holder: Holder<*>, position: Int) {
+        holder.bind(getItem(position))
+    }
+
+    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
+        super.onAttachedToRecyclerView(recyclerView)
+        recyclerView.setHasFixedSize(true)
+        recyclerView.isNestedScrollingEnabled = true
+        recyclerView.itemAnimator = null
+        recyclerView.layoutAnimation = null
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/Item.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/Item.kt
new file mode 100644
index 000000000..e25652c25
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/Item.kt
@@ -0,0 +1,51 @@
+package com.tonapps.tonkeeper.ui.screen.wallet.manage.list
+
+import android.net.Uri
+import androidx.annotation.StringRes
+import com.tonapps.blockchain.Coins
+import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.tonkeeper.core.entities.TokenExtendedEntity
+import com.tonapps.uikit.list.BaseListItem
+import com.tonapps.uikit.list.ListCell
+
+sealed class Item(type: Int): BaseListItem(type) {
+
+    companion object {
+        const val TYPE_TITLE = 1
+        const val TYPE_TOKEN = 2
+        const val TYPE_SPACE = 3
+    }
+
+    data class Title(
+        @StringRes val titleRes: Int,
+        @StringRes val detailsRes: Int = 0
+    ): Item(TYPE_TITLE)
+
+    data class Token(
+        val position: ListCell.Position,
+        val iconUri: Uri,
+        val address: String,
+        val symbol: String,
+        val balance: Coins,
+        val balanceFormat: CharSequence,
+        val pinned: Boolean,
+        val hidden: Boolean
+    ): Item(TYPE_TOKEN) {
+
+        constructor(
+            position: ListCell.Position,
+            token: TokenExtendedEntity,
+        ) : this(
+            position = position,
+            iconUri = token.imageUri,
+            address = token.address,
+            symbol = token.symbol,
+            balance = token.balance.value,
+            balanceFormat = CurrencyFormatter.format(token.symbol, token.balance.value.value),
+            pinned = token.pinned,
+            hidden = token.hidden
+        )
+    }
+
+    data object Space: Item(TYPE_SPACE)
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/holder/Holder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/holder/Holder.kt
new file mode 100644
index 000000000..360acb701
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/holder/Holder.kt
@@ -0,0 +1,11 @@
+package com.tonapps.tonkeeper.ui.screen.wallet.manage.list.holder
+
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import com.tonapps.tonkeeper.ui.screen.wallet.manage.list.Item
+import com.tonapps.uikit.list.BaseListHolder
+
+abstract class Holder<I: Item>(
+    parent: ViewGroup,
+    @LayoutRes resId: Int,
+): BaseListHolder<I>(parent, resId)
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/holder/SpaceHolder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/holder/SpaceHolder.kt
new file mode 100644
index 000000000..9869a2748
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/holder/SpaceHolder.kt
@@ -0,0 +1,12 @@
+package com.tonapps.tonkeeper.ui.screen.wallet.manage.list.holder
+
+import android.view.ViewGroup
+import com.tonapps.tonkeeper.ui.screen.wallet.manage.list.Item
+import com.tonapps.tonkeeperx.R
+
+class SpaceHolder(parent: ViewGroup): Holder<Item.Space>(parent, R.layout.view_wallet_manage_space) {
+    override fun onBind(item: Item.Space) {
+
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/holder/TitleHolder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/holder/TitleHolder.kt
new file mode 100644
index 000000000..287779148
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/holder/TitleHolder.kt
@@ -0,0 +1,24 @@
+package com.tonapps.tonkeeper.ui.screen.wallet.manage.list.holder
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.ui.screen.wallet.manage.list.Item
+import com.tonapps.tonkeeperx.R
+
+class TitleHolder(parent: ViewGroup): Holder<Item.Title>(parent, R.layout.view_wallet_manage_title) {
+
+    private val titleView = findViewById<AppCompatTextView>(R.id.title)
+    private val detailsView = findViewById<AppCompatTextView>(R.id.details)
+
+    override fun onBind(item: Item.Title) {
+        titleView.setText(item.titleRes)
+        if (item.detailsRes != 0) {
+            detailsView.setText(item.detailsRes)
+            detailsView.visibility = View.VISIBLE
+        } else {
+            detailsView.visibility = View.GONE
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/holder/TokenHolder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/holder/TokenHolder.kt
new file mode 100644
index 000000000..8b02a22f2
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/list/holder/TokenHolder.kt
@@ -0,0 +1,79 @@
+package com.tonapps.tonkeeper.ui.screen.wallet.manage.list.holder
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.ui.screen.wallet.manage.list.Item
+import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.color.accentBlueColor
+import com.tonapps.uikit.color.iconPrimaryColor
+import com.tonapps.uikit.color.iconSecondaryColor
+import com.tonapps.uikit.color.stateList
+import com.tonapps.uikit.icon.UIKitIcon
+import uikit.extensions.drawable
+import uikit.widget.FrescoView
+
+class TokenHolder(
+    parent: ViewGroup,
+    private val doOnPinChange: (tokenAddress: String, pin: Boolean) -> Unit,
+    private val doOnHiddeChange: (tokenAddress: String, hidden: Boolean) -> Unit
+): Holder<Item.Token>(parent, R.layout.view_wallet_manage_token) {
+
+    private val iconView = findViewById<FrescoView>(R.id.icon)
+    private val titleView = findViewById<AppCompatTextView>(R.id.title)
+    private val balanceView = findViewById<AppCompatTextView>(R.id.balance)
+    private val pinnedView = findViewById<AppCompatImageView>(R.id.pinned)
+    private val hiddenView = findViewById<AppCompatImageView>(R.id.hidden)
+    private val reorderView = findViewById<AppCompatImageView>(R.id.reorder)
+
+    override fun onBind(item: Item.Token) {
+        itemView.background = item.position.drawable(context)
+        iconView.setImageURI(item.iconUri, this)
+        titleView.text = item.symbol
+        balanceView.text = item.balanceFormat
+
+        pinnedView.setOnClickListener {
+            val pinned = !item.pinned
+            doOnPinChange(item.address, pinned)
+            applyPinnedState(pinned)
+        }
+        applyPinnedState(item.pinned)
+
+        hiddenView.setOnClickListener {
+            val hidden = !item.hidden
+            doOnHiddeChange(item.address, hidden)
+            applyHiddenState(hidden, item.pinned)
+        }
+        applyHiddenState(item.hidden, item.pinned)
+    }
+
+    private fun applyPinnedState(pinned: Boolean) {
+        pinnedView.imageTintList = if (pinned) {
+            context.accentBlueColor.stateList
+        } else {
+            context.iconSecondaryColor.stateList
+        }
+
+        if (pinned) {
+            reorderView.visibility = View.VISIBLE
+            hiddenView.visibility = View.GONE
+            pinnedView.visibility = View.VISIBLE
+        } else {
+            reorderView.visibility = View.GONE
+            hiddenView.visibility = View.VISIBLE
+        }
+    }
+
+    private fun applyHiddenState(hidden: Boolean, pinned: Boolean) {
+        if (hidden) {
+            hiddenView.imageTintList = context.iconSecondaryColor.stateList
+            hiddenView.setImageResource(UIKitIcon.ic_eye_closed_outline_28)
+            pinnedView.visibility = View.GONE
+        } else {
+            hiddenView.imageTintList = context.accentBlueColor.stateList
+            hiddenView.setImageResource(UIKitIcon.ic_eye_outline_28)
+            pinnedView.visibility = View.VISIBLE
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/PickerScreen.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/PickerScreen.kt
new file mode 100644
index 000000000..3ad94ad29
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/PickerScreen.kt
@@ -0,0 +1,119 @@
+package com.tonapps.tonkeeper.ui.screen.wallet.picker
+
+import android.content.Context
+import android.os.Bundle
+import android.view.Gravity
+import android.view.View
+import android.widget.FrameLayout
+import androidx.appcompat.widget.AppCompatTextView
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.list.Item
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.list.WalletPickerAdapter
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.list.holder.Holder
+import com.tonapps.uikit.color.buttonSecondaryForegroundColor
+import com.tonapps.wallet.localization.Localization
+import org.koin.android.ext.android.inject
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import uikit.base.BaseFragment
+import uikit.base.BaseListFragment
+import uikit.extensions.collectFlow
+import uikit.extensions.dp
+import uikit.extensions.getDimensionPixelSize
+import uikit.extensions.setPaddingHorizontal
+
+class PickerScreen: BaseListFragment(), BaseFragment.Modal {
+
+    override val scaleBackground: Boolean = true
+
+    private val pickerViewModel: PickerViewModel by viewModel()
+    private val adapter: WalletPickerAdapter by inject()
+
+    private lateinit var actionButton: AppCompatTextView
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        collectFlow(pickerViewModel.walletChangedFlow) {
+            finish()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val horizontalOffset = requireContext().getDimensionPixelSize(uikit.R.dimen.cornerMedium)
+
+        actionButton = createActionButton(view.context)
+        actionButton.setOnClickListener { pickerViewModel.toggleEditMode() }
+        addViewHeader(actionButton, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, 32.dp, Gravity.CENTER_VERTICAL).also {
+            it.marginEnd = horizontalOffset
+            it.marginStart = horizontalOffset
+        })
+
+        setListPadding(horizontalOffset, 0, horizontalOffset, 0)
+        setTitle(getString(Localization.wallets))
+        setAdapter(adapter)
+
+        setTouchHelperCallback(object : ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0) {
+
+            override fun isLongPressDragEnabled() = true
+
+            override fun onMove(
+                recyclerView: RecyclerView,
+                viewHolder: RecyclerView.ViewHolder,
+                target: RecyclerView.ViewHolder
+            ): Boolean {
+                val item = (viewHolder as? Holder<*>)?.item ?: return false
+                if (item is Item.Wallet && item.editMode) {
+                    adapter.moveItem(viewHolder.bindingAdapterPosition, target.bindingAdapterPosition)
+                    return true
+                }
+                return false
+            }
+
+            override fun clearView(
+                recyclerView: RecyclerView,
+                viewHolder: RecyclerView.ViewHolder
+            ) {
+                super.clearView(recyclerView, viewHolder)
+                val item = (viewHolder as? Holder<*>)?.item ?: return
+                if (item is Item.Wallet && item.editMode) {
+                    pickerViewModel.saveOrder(adapter.rebuild())
+                }
+            }
+
+            override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) { }
+
+        })
+
+        collectFlow(pickerViewModel.editModeFlow, ::applyEditMove)
+    }
+
+    private fun applyEditMove(edit: Boolean) {
+        if (edit) {
+            actionButton.setText(Localization.done)
+        } else {
+            actionButton.setText(Localization.edit)
+        }
+        adapter.submitList(adapter.currentList.map {
+            if (it is Item.Wallet) {
+                it.copy(editMode = edit)
+            } else {
+                it
+            }
+        })
+    }
+
+    private fun createActionButton(context: Context): AppCompatTextView {
+        val button = AppCompatTextView(context)
+        button.setPaddingHorizontal(14.dp)
+        button.gravity = Gravity.CENTER
+        button.setBackgroundResource(uikit.R.drawable.bg_button_secondary)
+        button.setTextAppearance(uikit.R.style.TextAppearance_Label2)
+        button.setTextColor(requireContext().buttonSecondaryForegroundColor)
+        return button
+    }
+
+    companion object {
+        fun newInstance() = PickerScreen()
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/PickerViewModel.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/PickerViewModel.kt
similarity index 69%
rename from apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/PickerViewModel.kt
rename to apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/PickerViewModel.kt
index 02e84a71d..020ed4ada 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/PickerViewModel.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/PickerViewModel.kt
@@ -1,10 +1,10 @@
-package com.tonapps.tonkeeper.ui.screen.picker
+package com.tonapps.tonkeeper.ui.screen.wallet.picker
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.tonapps.icu.CurrencyFormatter
 import com.tonapps.tonkeeper.core.widget.Widget
-import com.tonapps.tonkeeper.ui.screen.picker.list.Item
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.list.Item
 import com.tonapps.uikit.list.ListCell
 import com.tonapps.wallet.data.account.WalletRepository
 import com.tonapps.wallet.data.account.entities.WalletEntity
@@ -29,9 +29,20 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 class PickerViewModel(
-    private val walletRepository: WalletRepository
+    private val walletRepository: WalletRepository,
+    private val settingsRepository: SettingsRepository,
 ): ViewModel() {
 
+    private val _editModeFlow = MutableStateFlow(false)
+    val editModeFlow = _editModeFlow.asStateFlow()
+
     val walletChangedFlow = walletRepository.activeWalletFlow.drop(1).take(1)
 
+    fun toggleEditMode() {
+        _editModeFlow.value = !_editModeFlow.value
+    }
+
+    fun saveOrder(wallerIds: List<Long>) {
+        settingsRepository.setWalletsSort(wallerIds)
+    }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/list/Item.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/Item.kt
similarity index 89%
rename from apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/list/Item.kt
rename to apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/Item.kt
index 62ec5a645..323584d29 100644
--- a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/picker/list/Item.kt
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/Item.kt
@@ -1,4 +1,4 @@
-package com.tonapps.tonkeeper.ui.screen.picker.list
+package com.tonapps.tonkeeper.ui.screen.wallet.picker.list
 
 import com.tonapps.uikit.list.BaseListItem
 import com.tonapps.uikit.list.ListCell
@@ -24,7 +24,8 @@ sealed class Item(type: Int): BaseListItem(type) {
         val selected: Boolean,
         val position: ListCell.Position,
         val balance: CharSequence,
-        val hiddenBalance: Boolean
+        val hiddenBalance: Boolean,
+        val editMode: Boolean = false
     ): Item(TYPE_WALLET) {
 
         val color: Int
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/WalletPickerAdapter.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/WalletPickerAdapter.kt
new file mode 100644
index 000000000..b2e758185
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/WalletPickerAdapter.kt
@@ -0,0 +1,104 @@
+package com.tonapps.tonkeeper.ui.screen.wallet.picker.list
+
+import android.annotation.SuppressLint
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.list.holder.AddHolder
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.list.holder.Holder
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.list.holder.SkeletonHolder
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.list.holder.WalletHolder
+import com.tonapps.uikit.list.ListCell
+import com.tonapps.wallet.data.account.entities.WalletEntity
+
+class WalletPickerAdapter: RecyclerView.Adapter<Holder<*>>() {
+
+    companion object {
+
+        private val defaultItems: List<Item> = listOf(
+            Item.Skeleton(ListCell.Position.SINGLE),
+            Item.AddWallet
+        )
+
+        fun map(
+            wallets: List<WalletEntity>,
+            activeWallet: WalletEntity,
+            balances: List<CharSequence>,
+            hiddenBalance: Boolean
+        ): List<Item> {
+            val uiItems = mutableListOf<Item>()
+            for ((index, wallet) in wallets.withIndex()) {
+                val item = Item.Wallet(
+                    accountId = wallet.accountId,
+                    walletId = wallet.id,
+                    walletLabel = wallet.label,
+                    walletType = wallet.type,
+                    selected = wallet.id == activeWallet.id,
+                    position = ListCell.getPosition(wallets.size, index),
+                    balance = balances[index],
+                    hiddenBalance = hiddenBalance
+                )
+                uiItems.add(item)
+            }
+            uiItems.add(Item.AddWallet)
+            return uiItems
+        }
+    }
+
+    private var list = defaultItems.toList()
+
+    val currentList: List<Item>
+        get() = list
+
+    private fun getItem(position: Int) = list[position]
+
+    override fun getItemViewType(position: Int) = list[position].type
+
+    @SuppressLint("NotifyDataSetChanged")
+    fun submitList(newList: List<Item>) {
+        this.list = newList
+        notifyDataSetChanged()
+    }
+
+    fun moveItem(fromPosition: Int, toPosition: Int) {
+        val newList = list.toMutableList()
+        val item = newList.removeAt(fromPosition)
+        newList.add(toPosition, item)
+        list = newList
+        notifyItemMoved(fromPosition, toPosition)
+    }
+
+    fun rebuild(): List<Long> {
+        var wallets = list.filterIsInstance<Item.Wallet>()
+        wallets = wallets.mapIndexed { index, it ->
+            it.copy(position = ListCell.getPosition(wallets.size, index))
+        }
+        val uiItems = mutableListOf<Item>()
+        uiItems.addAll(wallets)
+        uiItems.add(Item.AddWallet)
+        submitList(uiItems)
+        return wallets.map { it.walletId }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder<*> {
+        return when(viewType) {
+            Item.TYPE_WALLET -> WalletHolder(parent)
+            Item.TYPE_ADD_WALLET -> AddHolder(parent)
+            Item.TYPE_SKELETON -> SkeletonHolder(parent)
+            else -> throw IllegalArgumentException("Unknown view type: $viewType")
+        }
+    }
+
+    override fun getItemCount() = list.size
+
+    override fun onBindViewHolder(holder: Holder<*>, position: Int) {
+        holder.bind(getItem(position))
+    }
+
+    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
+        super.onAttachedToRecyclerView(recyclerView)
+        recyclerView.setHasFixedSize(false)
+        recyclerView.isNestedScrollingEnabled = true
+        recyclerView.itemAnimator = null
+        recyclerView.layoutAnimation = null
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/holder/AddHolder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/holder/AddHolder.kt
new file mode 100644
index 000000000..a2bf39681
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/holder/AddHolder.kt
@@ -0,0 +1,24 @@
+package com.tonapps.tonkeeper.ui.screen.wallet.picker.list.holder
+
+import android.view.View
+import android.view.ViewGroup
+import com.tonapps.tonkeeper.ui.screen.add.AddScreen
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.list.Item
+import com.tonapps.tonkeeperx.R
+
+class AddHolder(
+    parent: ViewGroup
+): Holder<Item.AddWallet>(parent, R.layout.view_wallet_add_item) {
+
+    private val addButton = findViewById<View>(R.id.add)
+
+    init {
+        addButton.setOnClickListener {
+            navigation?.add(AddScreen.newInstance())
+        }
+    }
+
+    override fun onBind(item: Item.AddWallet) {
+
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/holder/Holder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/holder/Holder.kt
new file mode 100644
index 000000000..635368595
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/holder/Holder.kt
@@ -0,0 +1,18 @@
+package com.tonapps.tonkeeper.ui.screen.wallet.picker.list.holder
+
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.list.Item
+import com.tonapps.uikit.list.BaseListHolder
+import uikit.navigation.Navigation
+import uikit.navigation.Navigation.Companion.navigation
+
+abstract class Holder<I: Item>(
+    parent: ViewGroup,
+    @LayoutRes resId: Int
+): BaseListHolder<I>(parent, resId) {
+
+    val navigation: Navigation?
+        get() = context.navigation
+
+}
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/holder/SkeletonHolder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/holder/SkeletonHolder.kt
new file mode 100644
index 000000000..8ca214653
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/holder/SkeletonHolder.kt
@@ -0,0 +1,20 @@
+package com.tonapps.tonkeeper.ui.screen.wallet.picker.list.holder
+
+import android.view.View
+import android.view.ViewGroup
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.list.Item
+import com.tonapps.tonkeeperx.R
+import uikit.extensions.drawable
+
+class SkeletonHolder(
+    parent: ViewGroup
+): Holder<Item.Skeleton>(parent, R.layout.view_wallet_item) {
+
+    init {
+        findViewById<View>(R.id.wallet_color).visibility = View.GONE
+    }
+
+    override fun onBind(item: Item.Skeleton) {
+        itemView.background = item.position.drawable(context)
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/holder/WalletHolder.kt b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/holder/WalletHolder.kt
new file mode 100644
index 000000000..447559c2f
--- /dev/null
+++ b/apps/wallet/instance/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/list/holder/WalletHolder.kt
@@ -0,0 +1,87 @@
+package com.tonapps.tonkeeper.ui.screen.wallet.picker.list.holder
+
+import android.content.res.ColorStateList
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.emoji.ui.EmojiView
+import com.tonapps.tonkeeper.koin.walletRepository
+import com.tonapps.tonkeeper.ui.screen.name.edit.EditNameScreen
+import com.tonapps.tonkeeper.ui.screen.wallet.picker.list.Item
+import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.icon.UIKitIcon
+import com.tonapps.wallet.data.account.WalletType
+import com.tonapps.wallet.data.core.HIDDEN_BALANCE
+import com.tonapps.wallet.localization.Localization
+import uikit.extensions.drawable
+import uikit.navigation.Navigation
+
+class WalletHolder(
+    parent: ViewGroup
+): Holder<Item.Wallet>(parent, R.layout.view_wallet_item) {
+
+    private val colorView = findViewById<View>(R.id.wallet_color)
+    private val emojiView = findViewById<EmojiView>(R.id.wallet_emoji)
+    private val nameView = findViewById<AppCompatTextView>(R.id.wallet_name)
+    private val balanceView = findViewById<AppCompatTextView>(R.id.wallet_balance)
+    private val checkView = findViewById<AppCompatImageView>(R.id.check)
+    private val typeView = findViewById<AppCompatTextView>(R.id.wallet_type)
+    private val editView = findViewById<View>(R.id.edit)
+    private val pencilView = findViewById<View>(R.id.pencil)
+
+    init {
+        pencilView.setOnClickListener {
+            navigation?.add(EditNameScreen.newInstance())
+        }
+    }
+
+    override fun onBind(item: Item.Wallet) {
+        itemView.background = item.position.drawable(context)
+        itemView.setOnClickListener {
+            if (!item.editMode) {
+                context.walletRepository?.chooseWallet(item.walletId)
+            }
+        }
+
+        colorView.backgroundTintList = ColorStateList.valueOf(item.color)
+        emojiView.setEmoji(item.emoji)
+        nameView.text = item.name
+        if (item.hiddenBalance) {
+            balanceView.text = HIDDEN_BALANCE
+        } else {
+            balanceView.text = item.balance
+        }
+
+        if (item.selected) {
+            checkView.setImageResource(UIKitIcon.ic_donemark_otline_28)
+        } else {
+            checkView.setImageResource(0)
+        }
+
+        if (item.editMode) {
+            editView.visibility = View.VISIBLE
+            checkView.visibility = View.GONE
+        } else {
+            editView.visibility = View.GONE
+            checkView.visibility = View.VISIBLE
+        }
+
+        setType(item.walletType)
+    }
+
+    private fun setType(type: WalletType) {
+        if (type == WalletType.Default) {
+            typeView.visibility = View.GONE
+            return
+        }
+        typeView.visibility = View.VISIBLE
+        val resId = when (type) {
+            WalletType.Watch -> Localization.watch_only
+            WalletType.Testnet -> Localization.testnet
+            WalletType.Signer -> Localization.signer
+            else -> throw IllegalArgumentException("Unknown wallet type: $type")
+        }
+        typeView.setText(resId)
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/res/layout/fragment_wallet_picker.xml b/apps/wallet/instance/src/main/res/layout/fragment_wallet_picker.xml
deleted file mode 100644
index 26007600e..000000000
--- a/apps/wallet/instance/src/main/res/layout/fragment_wallet_picker.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<uikit.widget.ColumnLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <uikit.widget.ModalHeader
-        android:id="@+id/header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/wallets"/>
-
-    <uikit.widget.SimpleRecyclerView
-        android:id="@+id/list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:overScrollMode="never"
-        android:minHeight="78dp"
-        android:layout_marginHorizontal="@dimen/offsetMedium"/>
-
-</uikit.widget.ColumnLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/res/layout/view_wallet_item.xml b/apps/wallet/instance/src/main/res/layout/view_wallet_item.xml
index d4eea1f1d..b4b5476cd 100644
--- a/apps/wallet/instance/src/main/res/layout/view_wallet_item.xml
+++ b/apps/wallet/instance/src/main/res/layout/view_wallet_item.xml
@@ -44,6 +44,7 @@
                 android:layout_marginHorizontal="@dimen/offsetExtraSmall"
                 android:paddingHorizontal="@dimen/offsetExtraSmall"
                 android:gravity="center"
+                android:visibility="gone"
                 android:background="@drawable/bg_wallet_type"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.Body4CAPS"
@@ -69,4 +70,32 @@
         android:layout_gravity="center"
         android:tint="?attr/accentBlueColor"/>
 
+    <uikit.widget.RowLayout
+        android:id="@+id/edit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/pencil"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_gravity="center"
+            android:src="@drawable/ic_pencil_outline_28"
+            android:tint="?attr/iconSecondaryColor"/>
+
+        <View
+            android:layout_width="@dimen/offsetMedium"
+            android:layout_height="0dp"/>
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/order"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_gravity="center"
+            android:tint="?attr/iconSecondaryColor"
+            android:src="@drawable/ic_reorder_28"/>
+
+    </uikit.widget.RowLayout>
 </uikit.widget.RowLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/res/layout/view_wallet_manage.xml b/apps/wallet/instance/src/main/res/layout/view_wallet_manage.xml
new file mode 100644
index 000000000..c0201e88b
--- /dev/null
+++ b/apps/wallet/instance/src/main/res/layout/view_wallet_manage.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="48dp">
+
+    <Button
+        style="@style/Widget.App.Button.Secondary"
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:layout_gravity="center"
+        android:text="@string/manage"
+        android:background="@drawable/bg_button_secondary_18"
+        android:textAppearance="@style/TextAppearance.Label2"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/res/layout/view_wallet_manage_space.xml b/apps/wallet/instance/src/main/res/layout/view_wallet_manage_space.xml
new file mode 100644
index 000000000..7dcb5ed41
--- /dev/null
+++ b/apps/wallet/instance/src/main/res/layout/view_wallet_manage_space.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/offsetMedium"/>
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/res/layout/view_wallet_manage_title.xml b/apps/wallet/instance/src/main/res/layout/view_wallet_manage_title.xml
new file mode 100644
index 000000000..cf853e7e7
--- /dev/null
+++ b/apps/wallet/instance/src/main/res/layout/view_wallet_manage_title.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="48dp">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center|start"
+        android:textAppearance="@style/TextAppearance.Label1"
+        android:textColor="?attr/textPrimaryColor"/>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/details"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center|end"
+        android:visibility="gone"
+        android:textAppearance="@style/TextAppearance.Body2"
+        android:textColor="?attr/textSecondaryColor"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/src/main/res/layout/view_wallet_manage_token.xml b/apps/wallet/instance/src/main/res/layout/view_wallet_manage_token.xml
new file mode 100644
index 000000000..2393ec32f
--- /dev/null
+++ b/apps/wallet/instance/src/main/res/layout/view_wallet_manage_token.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<uikit.widget.RowLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="76dp"
+    android:padding="@dimen/offsetMedium"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    
+    <uikit.widget.FrescoView
+        android:id="@+id/icon"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        app:roundAsCircle="true"/>
+
+    <uikit.widget.ColumnLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_gravity="center"
+        android:paddingHorizontal="@dimen/offsetMedium">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.Label1"
+            android:textColor="?attr/textPrimaryColor"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/balance"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/offsetExtraExtraSmall"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textSecondaryColor"/>
+
+    </uikit.widget.ColumnLayout>
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/pinned"
+        android:layout_width="28dp"
+        android:layout_height="28dp"
+        android:layout_gravity="center"
+        android:src="@drawable/ic_pin_28"/>
+
+    <View
+        android:layout_width="@dimen/offsetMedium"
+        android:layout_height="0dp"/>
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/hidden"
+        android:layout_width="28dp"
+        android:layout_height="28dp"
+        android:layout_gravity="center"/>
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/reorder"
+        android:layout_width="28dp"
+        android:layout_height="28dp"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        android:tint="?attr/iconSecondaryColor"
+        android:src="@drawable/ic_reorder_28"/>
+
+</uikit.widget.RowLayout>
\ No newline at end of file
diff --git a/apps/wallet/localization/src/main/res/values-ru/strings.xml b/apps/wallet/localization/src/main/res/values-ru/strings.xml
index d1efd0924..a72c3008a 100644
--- a/apps/wallet/localization/src/main/res/values-ru/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-ru/strings.xml
@@ -3,6 +3,10 @@
     <string name="ton" translatable="false">TON</string>
     <string name="toncoin" translatable="false">Toncoin</string>
 
+    <string name="edit">Редактировать</string>
+    <string name="pinned">Закреплённые</string>
+    <string name="all_assets">Все активы</string>
+    <string name="sorted_by_price">По стоимости</string>
     <string name="manual">Вручную</string>
     <string name="manual_description">Создайте резервную копию своего кошелька вручную, записав секретный ключ.</string>
     <string name="manual_backup_done">Резервная копия сделана</string>
diff --git a/apps/wallet/localization/src/main/res/values/strings.xml b/apps/wallet/localization/src/main/res/values/strings.xml
index f108aa446..952a97752 100644
--- a/apps/wallet/localization/src/main/res/values/strings.xml
+++ b/apps/wallet/localization/src/main/res/values/strings.xml
@@ -4,6 +4,11 @@
     <string name="toncoin" translatable="false">Toncoin</string>
     <string name="bitcoin" translatable="false">Bitcoin</string>
 
+    <string name="edit">Edit</string>
+    <string name="pinned">Pinned</string>
+    <string name="all_assets">All Assets</string>
+    <string name="sorted_by_price">Sorted by Price</string>
+
     <string name="manual">Manual</string>
     <string name="manual_description">Back up your wallet manually by writing down the recovery phrase.</string>
     <string name="manual_backup_done">Manual Backup Done</string>
diff --git a/lib/blockchain/build.gradle.kts b/lib/blockchain/build.gradle.kts
index 06e191d8f..99ef105c5 100644
--- a/lib/blockchain/build.gradle.kts
+++ b/lib/blockchain/build.gradle.kts
@@ -25,4 +25,5 @@ android {
 dependencies {
     api(Dependence.ton)
     api(Dependence.KotlinX.io)
+    implementation(project(Dependence.Lib.extensions))
 }
\ No newline at end of file
diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/Coin.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/Coin.kt
deleted file mode 100644
index 05f8ff119..000000000
--- a/lib/blockchain/src/main/java/com/tonapps/blockchain/Coin.kt
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.tonapps.blockchain
-
-import android.util.Log
-import java.math.BigDecimal
-import java.math.BigInteger
-import java.math.MathContext
-import java.math.RoundingMode
-import kotlin.math.pow
-
-object Coin {
-
-    const val TON_DECIMALS = 9
-
-    private const val DEFAULT_DECIMALS = 18
-    private const val BASE = 1000000000L
-
-    fun parseJettonBalance(
-        v: String,
-        decimals: Int
-    ): Double {
-        val bigDecimal = safeBigDecimal(v)
-        val divisor = BigDecimal.TEN.pow(decimals)
-        val result = bigDecimal.divide(divisor, decimals, RoundingMode.DOWN)
-        return result.toDouble()
-    }
-
-    /*fun parseFloat(
-        value: String,
-        decimals: Int = TON_DECIMALS
-    ): Float {
-        val floatValue = prepareValue(value).toFloatOrNull() ?: return 0f
-        val formatString = "%.${decimals}f"
-        val formattedString = formatString.format(floatValue)
-        return formattedString.toFloatOrNull() ?: 0f
-    }*/
-
-    fun bigDecimal(
-        value: String,
-        decimals: Int = TON_DECIMALS
-    ): BigDecimal {
-        return try {
-            BigDecimal(value).movePointRight(decimals)
-        } catch (e: Exception) {
-            BigDecimal.ZERO
-        }
-    }
-
-    private fun safeBigDecimal(
-        value: String
-    ): BigDecimal {
-        return try {
-            val string = prepareValue(value)
-            BigDecimal(string)
-        } catch (e: Throwable) {
-            BigDecimal.ZERO
-        }
-    }
-
-    fun prepareValue(value: String): String {
-        var v = value.trim()
-        if (v.endsWith(".") || v.startsWith(",")) {
-            v = v.dropLast(1)
-        }
-        if (v.startsWith("0")) {
-            v = v.dropWhile { it == '0' }
-        }
-        if (v.startsWith(".") || v.startsWith(",")) {
-            v = "0$v"
-        }
-        if (v.contains(",")) {
-            v = v.replace(",", ".")
-        }
-        if (v.isEmpty()) {
-            v = "0"
-        }
-        return v
-    }
-
-    fun toNano(
-        value: Float,
-        decimals: Int = TON_DECIMALS
-    ): Long {
-        // old return (value * BASE).toLong()
-        return (value * 10.0.pow(decimals)).toLong()
-    }
-
-    fun toNanoDouble(
-        value: Double,
-        decimals: Int = TON_DECIMALS
-    ): Long {
-        // old return (value * BASE).toLong()
-        return (value * 10.0.pow(decimals)).toLong()
-    }
-
-    fun toCoins(
-        value: Long,
-        decimals: Int = TON_DECIMALS
-    ): Float {
-        // old return value / BASE.toFloat()
-        return value / 10.0.pow(decimals).toFloat()
-    }
-
-    fun toCoinsDouble(
-        value: Long,
-        decimals: Int = TON_DECIMALS
-    ): Double {
-        return value / 10.0.pow(decimals)
-    }
-
-}
\ No newline at end of file
diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/Coins.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/Coins.kt
new file mode 100644
index 000000000..80e1bc782
--- /dev/null
+++ b/lib/blockchain/src/main/java/com/tonapps/blockchain/Coins.kt
@@ -0,0 +1,125 @@
+package com.tonapps.blockchain
+
+import android.os.Parcel
+import android.os.Parcelable
+import com.tonapps.extensions.readSerializableCompat
+import java.math.BigDecimal
+import java.math.RoundingMode
+import kotlin.math.pow
+
+data class Coins(
+    val value: BigDecimal
+): Parcelable {
+
+    companion object {
+
+        @JvmField
+        val CREATOR = object : Parcelable.Creator<Coins> {
+            override fun createFromParcel(parcel: Parcel) = Coins(parcel)
+            override fun newArray(size: Int): Array<Coins?> = arrayOfNulls(size)
+        }
+
+        val ZERO = Coins(BigDecimal.ZERO)
+
+        const val DEFAULT_DECIMALS = 9
+        // private const val BASE = 1000000000L
+
+        fun of(
+            value: String,
+            decimals: Int = DEFAULT_DECIMALS
+        ): Coins {
+            val divisor = BigDecimal.TEN.pow(decimals)
+            val bigDecimal = safeBigDecimal(prepareValue(value)).divide(divisor, decimals, RoundingMode.DOWN)
+            return Coins(bigDecimal)
+        }
+
+        fun of(
+            value: Long,
+            decimals: Int = DEFAULT_DECIMALS
+        ): Coins {
+            val bigDecimal = BigDecimal(value / 10.0.pow(decimals))
+            return Coins(bigDecimal)
+        }
+
+        fun of(
+            value: Double,
+            decimals: Int = DEFAULT_DECIMALS
+        ): Coins {
+            val bigDecimal = BigDecimal(value)
+            return Coins(bigDecimal)
+        }
+
+        private fun safeBigDecimal(
+            value: String
+        ): BigDecimal {
+            return try {
+                BigDecimal(value)
+            } catch (e: Throwable) {
+                BigDecimal.ZERO
+            }
+        }
+
+        @Deprecated("Remove this dirty hack")
+        fun prepareValue(value: String): String {
+            var v = value.trim()
+            if (v.endsWith(".") || v.startsWith(",")) {
+                v = v.dropLast(1)
+            }
+            if (v.startsWith("0")) {
+                v = v.dropWhile { it == '0' }
+            }
+            if (v.startsWith(".") || v.startsWith(",")) {
+                v = "0$v"
+            }
+            if (v.contains(",")) {
+                v = v.replace(",", ".")
+            }
+            if (v.isEmpty()) {
+                v = "0"
+            }
+            return v
+        }
+    }
+
+    val isZero: Boolean
+        get() = value.compareTo(BigDecimal.ZERO) == 0
+
+    val isPositive: Boolean
+        get() = value > BigDecimal.ZERO
+
+    constructor(parcel: Parcel) : this(
+        parcel.readSerializableCompat()!!
+    )
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeSerializable(value)
+    }
+
+    operator fun plus(other: Coins) = Coins(value + other.value)
+
+    operator fun minus(other: Coins) = Coins(value - other.value)
+
+    operator fun times(other: Coins) = Coins(value * other.value)
+
+    operator fun div(other: Coins) = Coins(value / other.value)
+
+    operator fun rem(other: Coins) = Coins(value % other.value)
+
+    operator fun inc() = Coins(value + BigDecimal.ONE)
+
+    operator fun dec() = Coins(value - BigDecimal.ONE)
+
+    operator fun compareTo(other: Coins) = value.compareTo(other.value)
+
+    fun toTonLibCoin(): org.ton.block.Coins {
+        return org.ton.block.Coins.ofNano(value.toBigInteger())
+    }
+
+    fun toDouble(): Double {
+        return value.toDouble()
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+}
\ No newline at end of file
diff --git a/lib/extensions/src/main/java/com/tonapps/extensions/SharedPreferences.kt b/lib/extensions/src/main/java/com/tonapps/extensions/SharedPreferences.kt
index 1e8c2d8ce..190da40cf 100644
--- a/lib/extensions/src/main/java/com/tonapps/extensions/SharedPreferences.kt
+++ b/lib/extensions/src/main/java/com/tonapps/extensions/SharedPreferences.kt
@@ -3,6 +3,14 @@ package com.tonapps.extensions
 import android.content.SharedPreferences
 import androidx.core.content.edit
 
+fun SharedPreferences.getByteArray(key: String): ByteArray? {
+    val bytes = getString(key, null)?.base64 ?: return null
+    if (bytes.isEmpty()) {
+        return null
+    }
+    return bytes
+}
+
 inline fun <reified T : Enum<T>> SharedPreferences.getEnum(key: String, default: T): T {
     val value = this.getInt(key, -1)
     return if (value >= 0) {
diff --git a/lib/icu/src/main/java/com/tonapps/icu/CurrencyFormatter.kt b/lib/icu/src/main/java/com/tonapps/icu/CurrencyFormatter.kt
index 92e0a171b..cba6f8c65 100644
--- a/lib/icu/src/main/java/com/tonapps/icu/CurrencyFormatter.kt
+++ b/lib/icu/src/main/java/com/tonapps/icu/CurrencyFormatter.kt
@@ -61,6 +61,11 @@ object CurrencyFormatter {
         put("BTC", "₿")
     }
 
+    private val thresholds = listOf(
+        BigDecimal("0.0001") to 8,
+        BigDecimal("0.01") to 2
+    )
+
     private fun isTON(currency: String): Boolean {
         return currency == "TON"
     }
@@ -69,6 +74,7 @@ object CurrencyFormatter {
         return isTON(currency) || currency == "BTC"
     }
 
+    private val roundingMode = RoundingMode.DOWN
     private val format = NumberFormat.getCurrencyInstance() as DecimalFormat
     private val pattern = format.toPattern().replace(CURRENCY_SIGN, "").trim()
     private val cache = ConcurrentHashMap<String, DecimalFormat>(symbols.size, 1.0f, 2)
@@ -76,169 +82,77 @@ object CurrencyFormatter {
     val monetarySymbolFirstPosition = format.toPattern().startsWith(CURRENCY_SIGN)
     val monetaryDecimalSeparator = format.decimalFormatSymbols.monetaryDecimalSeparator.toString()
 
-    private fun formatFloat(
-        value: Float,
-        decimals: Int,
-    ): String {
-        if (0f >= value) {
-            return "0"
-        }
-        return getFormat(decimals).format(value)
-    }
-
-    private fun formatDouble(
-        value: Double,
-        decimals: Int,
-    ): String {
-        if (0f >= value) {
-            return "0"
-        }
-        return getFormat(decimals).format(value)
-    }
-
     fun format(
         currency: String = "",
-        value: Float,
-        decimals: Int,
-    ): CharSequence {
-        val amount = formatFloat(value, decimals)
-        return format(currency, amount)
-    }
-
-    fun format(
-        currency: String = "",
-        value: Double,
-        decimals: Int,
-    ): CharSequence {
-        val amount = formatDouble(value, decimals)
-        return format(currency, amount)
-    }
-
-    fun format(
-        currency: String = "",
-        value: BigInteger,
-        decimals: Int
-    ): CharSequence {
-        val amount = getFormat(decimals).format(value)
-        return format(currency, amount)
-    }
-
-    fun format(
-        currency: String = "",
-        value: Float,
-    ): CharSequence {
-        val decimals = decimalCount(value)
-        return format(currency, value, decimals)
-    }
-
-    fun format(
-        currency: String = "",
-        value: Double,
-    ): CharSequence {
-        val floatValue = value.toFloat()
-        val decimals = decimalCount(floatValue)
-        return format(currency, floatValue, decimals)
-    }
-
-    fun format(
-        currency: String = "",
-        value: BigInteger
-    ): CharSequence {
-        var bigDecimal = value.toBigDecimal().stripTrailingZeros()
-        if (bigDecimal.scale() > 0) {
-            bigDecimal = bigDecimal.setScale(2, RoundingMode.HALF_DOWN)
-        }
-        val decimals = bigDecimal.scale()
-        val amount = getFormat(decimals).format(value)
-        return format(currency, amount)
-    }
-
-    fun format(
-        currency: String = "",
-        value: BigDecimal
+        value: BigDecimal,
+        scale: Int = 0,
     ): CharSequence {
         var bigDecimal = value.stripTrailingZeros()
-        if (bigDecimal.scale() > 0) {
-            bigDecimal = bigDecimal.setScale(2, RoundingMode.HALF_DOWN)
+        if (scale > 0) {
+            bigDecimal = bigDecimal.setScale(scale, roundingMode)
+        } else if (bigDecimal.scale() > 0) {
+            bigDecimal = bigDecimal.setScale(getScale(bigDecimal), roundingMode)
+        }
+        val decimals = bigDecimal.stripTrailingZeros().scale()
+        var amount = getFormat(decimals).format(value)
+        amount = amount.removeSuffix("0")
+        amount = amount.removeSuffix(monetaryDecimalSeparator)
+        if (amount.isBlank()) {
+            amount = "0"
         }
-        val decimals = bigDecimal.scale()
-        val amount = getFormat(decimals).format(value)
         return format(currency, amount)
     }
 
-    fun formatRate(
+    fun formatFiat(
         currency: String,
-        value: Float
+        value: BigDecimal,
+        scale: Int = 2,
     ): CharSequence {
-        return format(currency, value, 4)
+        return format(currency, value, scale)
     }
 
-    fun formatFiat(
-        currency: String,
-        value: Double
-    ): CharSequence {
-        var decimals = 2
-        if (0.0001f > value) {
-            decimals = 8
-        } else if (0.01f > value) {
-            decimals = 4
+    private fun getScale(value: BigDecimal): Int {
+        if (value == BigDecimal.ZERO) {
+            return 0
+        } else if (value <= BigDecimal.ZERO) {
+            return 2
         }
-        return format(currency, value, decimals)
-    }
 
-    fun formatFiat(
-        currency: String,
-        value: Float
-    ): CharSequence {
-        var decimals = 2
-        if (0.0001f > value) {
-            decimals = 8
-        } else if (0.01f > value) {
-            decimals = 4
+        for ((threshold, scale) in thresholds) {
+            if (value < threshold) {
+                return scale
+            }
         }
-        return format(currency, value, decimals)
+        return 2
     }
 
+
     private fun format(
         currency: String = "",
         value: String,
     ): CharSequence {
-        val amount = removeTrailingZeros(value)
         val symbol = symbols[currency]
         val builder = StringBuilder()
         if (symbol != null) {
             if (monetarySymbolFirstPosition && !isCrypto(currency)) {
                 builder.append(symbol)
                 builder.append(SMALL_SPACE)
-                builder.append(amount)
+                builder.append(value)
             } else {
-                builder.append(amount)
+                builder.append(value)
                 builder.append(SMALL_SPACE)
                 builder.append(symbol)
             }
         } else if (currency == "") {
-            builder.append(amount)
+            builder.append(value)
         } else {
-            builder.append(amount)
+            builder.append(value)
             builder.append(SMALL_SPACE)
             builder.append(currency)
         }
         return builder.toString()
     }
 
-    private fun decimalCount(value: Float): Int {
-        if (0f >= value || value % 1.0f == 0.0f) {
-            return 0
-        }
-        if (0.0001f > value) {
-            return 8
-        }
-        if (0.01f > value) {
-            return 4
-        }
-        return 2
-    }
-
     private fun getFormat(decimals: Int): DecimalFormat {
         val key = cacheKey(decimals)
         var format = cache[key]
@@ -261,11 +175,4 @@ object CurrencyFormatter {
         decimalFormat.isGroupingUsed = true
         return decimalFormat
     }
-
-    private fun removeTrailingZeros(value: String): String {
-        if (!value.contains(monetaryDecimalSeparator)) {
-            return value
-        }
-        return value.removeSuffix("0").removeSuffix(monetaryDecimalSeparator)
-    }
 }
\ No newline at end of file
diff --git a/ui/uikit/core/src/main/java/uikit/base/BaseListFragment.kt b/ui/uikit/core/src/main/java/uikit/base/BaseListFragment.kt
index 2cb5bb6cd..b62c6e880 100644
--- a/ui/uikit/core/src/main/java/uikit/base/BaseListFragment.kt
+++ b/ui/uikit/core/src/main/java/uikit/base/BaseListFragment.kt
@@ -2,7 +2,9 @@ package uikit.base
 
 import android.os.Bundle
 import android.view.View
+import android.widget.FrameLayout
 import androidx.annotation.DrawableRes
+import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import com.tonapps.uikit.icon.UIKitIcon
 import uikit.R
@@ -14,22 +16,33 @@ import uikit.widget.HeaderView
 
 open class BaseListFragment: BaseFragment(R.layout.fragment_list) {
 
+    private lateinit var headerContainer: FrameLayout
     private lateinit var headerView: HeaderView
     private lateinit var listView: RecyclerView
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        headerContainer = view.findViewById(R.id.header_container)
+
         headerView = view.findViewById(R.id.header)
         if (this is SwipeBack) {
             headerView.setIcon(UIKitIcon.ic_chevron_left_16)
             headerView.doOnCloseClick = { finish() }
+        } else if (this is BottomSheet || this is Modal) {
+            headerView.setIgnoreSystemOffset()
+            headerView.setAction(UIKitIcon.ic_close_16)
+            headerView.doOnActionClick = { finish() }
         }
+
         listView = view.findViewById(R.id.list)
         listView.applyNavBottomPadding(requireContext().getDimensionPixelSize(R.dimen.cornerMedium))
-
         collectFlow(listView.topScrolled, headerView::setDivider)
     }
 
+    fun addViewHeader(view: View, params: FrameLayout.LayoutParams? = null) {
+        headerContainer.addView(view, params)
+    }
+
     fun findListItemView(position: Int): View? {
         return listView.findViewHolderForAdapterPosition(position)?.itemView
     }
@@ -50,6 +63,10 @@ open class BaseListFragment: BaseFragment(R.layout.fragment_list) {
         headerView.title = title
     }
 
+    fun setTouchHelperCallback(callback: ItemTouchHelper.SimpleCallback) {
+        ItemTouchHelper(callback).attachToRecyclerView(listView)
+    }
+
     fun setListPadding(left: Int, top: Int, right: Int, bottom: Int) {
         listView.setPadding(left, top, right, bottom)
     }
diff --git a/ui/uikit/core/src/main/java/uikit/widget/HeaderView.kt b/ui/uikit/core/src/main/java/uikit/widget/HeaderView.kt
index 54c3d4216..f5a6868c4 100644
--- a/ui/uikit/core/src/main/java/uikit/widget/HeaderView.kt
+++ b/ui/uikit/core/src/main/java/uikit/widget/HeaderView.kt
@@ -6,6 +6,7 @@ import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowInsets
+import android.widget.Button
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.AppCompatImageView
@@ -104,6 +105,10 @@ open class HeaderView @JvmOverloads constructor(
         }
     }
 
+    fun setIgnoreSystemOffset(value: Boolean = true) {
+        ignoreSystemOffset = value
+    }
+
     override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets {
         if (ignoreSystemOffset) {
             return super.onApplyWindowInsets(insets)
diff --git a/ui/uikit/core/src/main/java/uikit/widget/ModalView.kt b/ui/uikit/core/src/main/java/uikit/widget/ModalView.kt
index f2871fa96..dd0673654 100644
--- a/ui/uikit/core/src/main/java/uikit/widget/ModalView.kt
+++ b/ui/uikit/core/src/main/java/uikit/widget/ModalView.kt
@@ -143,7 +143,6 @@ class ModalView @JvmOverloads constructor(
     }
 
     fun hide(force: Boolean) {
-        Log.d("ModalViewLog", "hide!")
         if (force) {
             behavior.isHideable = true
         }
@@ -169,6 +168,9 @@ class ModalView @JvmOverloads constructor(
     }
 
     private fun setPeekHeight(newPeekHeight: Int) {
+        if (behavior.peekHeight == newPeekHeight && behavior.state == BottomSheetBehavior.STATE_EXPANDED) {
+            return
+        }
         post {
             behavior.peekHeight = newPeekHeight
             behavior.state = BottomSheetBehavior.STATE_EXPANDED
diff --git a/ui/uikit/core/src/main/res/layout/fragment_list.xml b/ui/uikit/core/src/main/res/layout/fragment_list.xml
index 30c453536..28eb58938 100644
--- a/ui/uikit/core/src/main/res/layout/fragment_list.xml
+++ b/ui/uikit/core/src/main/res/layout/fragment_list.xml
@@ -3,10 +3,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <uikit.widget.HeaderView
-        android:id="@+id/header"
+    <FrameLayout
+        android:id="@+id/header_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content">
+        <uikit.widget.HeaderView
+            android:id="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+    </FrameLayout>
 
     <uikit.widget.SimpleRecyclerView
         android:id="@+id/list"
diff --git a/ui/uikit/icon/src/main/res/drawable/ic_eye_closed_outline_28.xml b/ui/uikit/icon/src/main/res/drawable/ic_eye_closed_outline_28.xml
new file mode 100644
index 000000000..90479bf01
--- /dev/null
+++ b/ui/uikit/icon/src/main/res/drawable/ic_eye_closed_outline_28.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M23.707,5.71C24.098,5.32 24.098,4.686 23.707,4.296C23.316,3.905 22.683,3.905 22.293,4.296L19.496,7.093C18.003,6.159 16.174,5.503 14,5.503C10.105,5.503 7.352,7.599 5.62,9.598C4.751,10.601 4.119,11.599 3.704,12.345C3.496,12.72 3.341,13.034 3.237,13.258C3.184,13.37 3.145,13.459 3.117,13.523C3.104,13.555 3.093,13.58 3.085,13.598L3.076,13.62L3.073,13.627L3.072,13.63L3.072,13.631C3.072,13.631 3.072,13.632 4,14.003L3.072,13.631C2.977,13.869 2.976,14.136 3.072,14.374L4,14.003C3.072,14.374 3.072,14.374 3.072,14.374L3.072,14.375L3.073,14.377L3.074,14.38L3.078,14.391L3.092,14.424C3.104,14.452 3.12,14.49 3.142,14.539C3.185,14.637 3.248,14.775 3.331,14.945C3.497,15.286 3.746,15.76 4.082,16.306C4.698,17.306 5.623,18.572 6.89,19.699L4.293,22.296C3.902,22.686 3.902,23.32 4.293,23.71C4.683,24.101 5.317,24.101 5.707,23.71L23.707,5.71ZM8.307,18.282L18.036,8.552C16.9,7.92 15.564,7.503 14,7.503C10.896,7.503 8.648,9.157 7.131,10.908C6.375,11.781 5.819,12.657 5.452,13.317C5.3,13.59 5.182,13.825 5.097,14.003L5.128,14.069C5.27,14.36 5.488,14.775 5.785,15.257C6.35,16.174 7.185,17.305 8.307,18.282Z"
+      android:fillColor="#556170"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M21.824,10.436C22.271,10.111 22.897,10.211 23.221,10.658C23.797,11.451 24.219,12.184 24.499,12.722C24.639,12.991 24.744,13.212 24.815,13.369C24.851,13.447 24.878,13.51 24.897,13.554C24.906,13.577 24.913,13.594 24.919,13.607L24.925,13.623L24.927,13.628L24.928,13.63L24.929,13.631C24.929,13.631 24.929,13.632 24,14.003C24.929,14.374 24.928,14.375 24.928,14.375L24.927,14.379L24.924,14.386L24.915,14.408C24.907,14.426 24.897,14.451 24.883,14.483C24.856,14.547 24.816,14.636 24.764,14.748C24.659,14.972 24.504,15.286 24.296,15.66C23.881,16.407 23.25,17.406 22.381,18.408C20.648,20.407 17.896,22.503 14,22.503C13.346,22.503 12.722,22.444 12.126,22.334C11.583,22.234 11.223,21.713 11.323,21.17C11.423,20.627 11.944,20.267 12.487,20.367C12.964,20.455 13.468,20.503 14,20.503C17.105,20.503 19.353,18.849 20.87,17.098C21.626,16.226 22.182,15.349 22.548,14.689C22.7,14.416 22.818,14.181 22.904,14.003C22.855,13.901 22.795,13.781 22.725,13.645C22.481,13.176 22.109,12.531 21.602,11.832C21.278,11.385 21.377,10.76 21.824,10.436Z"
+      android:fillColor="#556170"/>
+  <path
+      android:pathData="M24,14.003L24.929,13.631C25.024,13.87 25.024,14.137 24.928,14.375L24,14.003Z"
+      android:fillColor="#556170"/>
+</vector>
diff --git a/ui/uikit/icon/src/main/res/drawable/ic_eye_outline_28.xml b/ui/uikit/icon/src/main/res/drawable/ic_eye_outline_28.xml
new file mode 100644
index 000000000..9bf086595
--- /dev/null
+++ b/ui/uikit/icon/src/main/res/drawable/ic_eye_outline_28.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M5.452,14.69C5.3,14.417 5.182,14.182 5.096,14.004C5.182,13.826 5.3,13.591 5.452,13.318C5.819,12.658 6.374,11.781 7.131,10.909C8.648,9.158 10.895,7.504 14,7.504C17.105,7.504 19.352,9.158 20.869,10.909C21.626,11.781 22.181,12.658 22.548,13.318C22.7,13.591 22.818,13.826 22.904,14.004C22.818,14.182 22.7,14.417 22.548,14.69C22.181,15.35 21.626,16.226 20.869,17.099C19.352,18.85 17.105,20.504 14,20.504C10.895,20.504 8.648,18.85 7.131,17.099C6.374,16.226 5.819,15.35 5.452,14.69ZM24.928,13.632C24.928,13.632 24.928,13.633 24,14.004C24.928,14.375 24.928,14.376 24.928,14.376L24.928,14.377L24.927,14.38L24.924,14.387L24.915,14.409C24.907,14.427 24.897,14.452 24.883,14.484C24.855,14.548 24.816,14.637 24.764,14.749C24.659,14.973 24.504,15.287 24.296,15.661C23.881,16.408 23.249,17.406 22.381,18.409C20.648,20.408 17.895,22.504 14,22.504C10.105,22.504 7.352,20.408 5.619,18.409C4.751,17.406 4.119,16.408 3.704,15.661C3.496,15.287 3.341,14.973 3.236,14.749C3.184,14.637 3.144,14.548 3.117,14.484C3.103,14.452 3.093,14.427 3.085,14.409L3.076,14.387L3.073,14.38L3.072,14.377L3.072,14.376C3.072,14.376 3.072,14.375 4,14.004C3.072,13.633 3.072,13.632 3.072,13.632L3.072,13.631L3.073,13.628L3.076,13.621L3.085,13.599C3.093,13.581 3.103,13.556 3.117,13.524C3.144,13.46 3.184,13.371 3.236,13.259C3.341,13.035 3.496,12.721 3.704,12.346C4.119,11.6 4.751,10.601 5.619,9.599C7.352,7.6 10.105,5.504 14,5.504C17.895,5.504 20.648,7.6 22.381,9.599C23.249,10.601 23.881,11.6 24.296,12.346C24.504,12.721 24.659,13.035 24.764,13.259C24.816,13.371 24.855,13.46 24.883,13.524C24.897,13.556 24.907,13.581 24.915,13.599L24.924,13.621L24.927,13.628L24.928,13.631L24.928,13.632ZM24,14.004L24.928,13.633C25.024,13.871 25.024,14.137 24.928,14.375L24,14.004ZM3.072,13.633L4,14.004L3.072,14.375C2.976,14.137 2.976,13.871 3.072,13.633ZM14,17.754C16.071,17.754 17.75,16.075 17.75,14.004C17.75,11.933 16.071,10.254 14,10.254C11.929,10.254 10.25,11.933 10.25,14.004C10.25,16.075 11.929,17.754 14,17.754Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/ui/uikit/icon/src/main/res/drawable/ic_pencil_outline_28.xml b/ui/uikit/icon/src/main/res/drawable/ic_pencil_outline_28.xml
new file mode 100644
index 000000000..858ae6f6e
--- /dev/null
+++ b/ui/uikit/icon/src/main/res/drawable/ic_pencil_outline_28.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M16.149,5.839L5.803,16.185C5.182,16.806 4.871,17.117 4.641,17.473C4.378,17.88 4.191,18.331 4.089,18.805C4,19.22 4,19.659 4,20.538C4,21.668 4,22.233 4.199,22.674C4.424,23.175 4.825,23.576 5.326,23.802C5.767,24 6.332,24 7.462,24C8.341,24 8.78,24 9.195,23.911C9.669,23.809 10.12,23.622 10.526,23.359C10.883,23.129 11.194,22.818 11.815,22.197L22.161,11.851C23.151,10.861 23.646,10.366 23.855,9.805C24.086,9.186 24.086,8.504 23.855,7.885C23.646,7.324 23.151,6.829 22.161,5.839C21.171,4.849 20.677,4.354 20.115,4.145C19.496,3.914 18.814,3.914 18.195,4.145C17.634,4.354 17.139,4.849 16.149,5.839ZM5.995,20.241C6.001,19.597 6.005,19.275 6.103,18.978C6.136,18.88 6.176,18.785 6.223,18.693C6.366,18.415 6.594,18.187 7.049,17.732L15.774,9.006L18.967,12.199L10.223,20.959C9.789,21.394 9.572,21.611 9.308,21.752C9.221,21.798 9.13,21.838 9.037,21.871C8.755,21.971 8.448,21.985 7.835,22.012L6.926,22.052C6.532,22.07 6.335,22.079 6.197,21.983C6.152,21.952 6.113,21.914 6.08,21.87C5.98,21.735 5.982,21.538 5.986,21.144L5.995,20.241ZM20.38,10.783L21.402,9.759C21.799,9.362 21.997,9.163 22.035,8.922C22.048,8.844 22.048,8.765 22.035,8.687C21.997,8.447 21.798,8.248 21.401,7.851L20.119,6.57C19.721,6.172 19.522,5.974 19.282,5.935C19.204,5.923 19.125,5.923 19.047,5.936C18.806,5.974 18.608,6.172 18.21,6.57L17.188,7.592L20.38,10.783Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M15,23C15,22.448 15.448,22 16,22H23C23.552,22 24,22.448 24,23C24,23.552 23.552,24 23,24H16C15.448,24 15,23.552 15,23Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/ui/uikit/icon/src/main/res/drawable/ic_pin_28.xml b/ui/uikit/icon/src/main/res/drawable/ic_pin_28.xml
new file mode 100644
index 000000000..db1605f8c
--- /dev/null
+++ b/ui/uikit/icon/src/main/res/drawable/ic_pin_28.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <group>
+    <clip-path
+        android:pathData="M0,0.004h28v28h-28z"/>
+    <path
+        android:pathData="M16.889,6.872C18.303,5.458 17.243,4.397 17.95,3.69C18.48,3.16 19.775,3.394 22.192,5.812C24.61,8.229 24.844,9.524 24.314,10.054C23.607,10.761 22.546,9.701 21.132,11.115L19.01,13.236C16.535,15.711 20.071,19.247 17.95,21.368C16.889,22.429 14.414,20.661 11.589,17.836L8.761,20.664C6.993,22.432 4.518,24.907 3.811,24.199C3.104,23.492 5.579,21.017 7.346,19.25L10.175,16.421C7.343,13.59 5.575,11.115 6.636,10.054C8.757,7.933 12.293,11.468 14.768,8.994L16.889,6.872Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/ui/uikit/icon/src/main/res/drawable/ic_reorder_28.xml b/ui/uikit/icon/src/main/res/drawable/ic_reorder_28.xml
new file mode 100644
index 000000000..f3d83eb33
--- /dev/null
+++ b/ui/uikit/icon/src/main/res/drawable/ic_reorder_28.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M6,8.751C6,8.337 6.336,8.001 6.75,8.001H21.25C21.664,8.001 22,8.337 22,8.751C22,9.165 21.664,9.501 21.25,9.501H6.75C6.336,9.501 6,9.165 6,8.751Z"
+      android:fillColor="#8994A3"/>
+  <path
+      android:pathData="M6,14.001C6,13.587 6.336,13.251 6.75,13.251H21.25C21.664,13.251 22,13.587 22,14.001C22,14.415 21.664,14.751 21.25,14.751H6.75C6.336,14.751 6,14.415 6,14.001Z"
+      android:fillColor="#8994A3"/>
+  <path
+      android:pathData="M6.75,18.501C6.336,18.501 6,18.837 6,19.251C6,19.665 6.336,20.001 6.75,20.001H21.25C21.664,20.001 22,19.665 22,19.251C22,18.837 21.664,18.501 21.25,18.501H6.75Z"
+      android:fillColor="#8994A3"/>
+</vector>