bug fixeds

apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt

@@ -108,10 +108,14 @@ class API(
 
     val config: ConfigEntity
         get() {
-            while (configRepository.configEntity == null) {
-                Thread.sleep(16)
-            }
-            return configRepository.configEntity!!
+            val timeout = System.currentTimeMillis() + 2000
+            do {
+                if (configRepository.configEntity != null) {
+                    return configRepository.configEntity!!
+                }
+                Thread.sleep(50)
+            } while (System.currentTimeMillis() < timeout)
+            return ConfigEntity.default
         }
 
     val configFlow: Flow<ConfigEntity>

apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/AccountRepository.kt

@@ -64,8 +64,8 @@ class AccountRepository(
 
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
     private val database = DatabaseSource(context, scope)
-    private val storageSource = StorageSource(context)
-    private val vaultSource = VaultSource(context)
+    private val storageSource: StorageSource by lazy { StorageSource(context) }
+    private val vaultSource: VaultSource by lazy { VaultSource(context) }
     private val migrationHelper = RNMigrationHelper(rnLegacy)
 
     private val _selectedStateFlow = MutableStateFlow<SelectedState>(SelectedState.Initialization)
@@ -82,8 +82,8 @@ class AccountRepository(
     init {
         scope.launch(Dispatchers.IO) {
             if (rnLegacy.isRequestMainMigration()) {
-                database.clearAccounts()
-                storageSource.clear()
+                // database.clearAccounts()
+                // storageSource.clear()
                 migrationFromRN()
                 rnLegacy.setWalletMigrated()
             }

apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/source/StorageSource.kt

@@ -1,6 +1,7 @@
 package com.tonapps.wallet.data.account.source
 
 import android.content.Context
+import android.content.SharedPreferences
 import androidx.core.content.edit
 import com.tonapps.blockchain.ton.extensions.hex
 import com.tonapps.extensions.prefs
@@ -19,7 +20,7 @@ internal class StorageSource(context: Context) {
     }
 
     private val prefs = context.prefs(NAME)
-    private val encryptedPrefs = Security.pref(context, KEY_ALIAS, NAME)
+    private val encryptedPrefs: SharedPreferences by lazy { Security.pref(context, KEY_ALIAS, NAME) }
 
     fun getTonProofToken(publicKey: PublicKeyEd25519): String? {
         val key = tonProofTokenKey(publicKey)

apps/wallet/data/core/build.gradle.kts

@@ -23,6 +23,9 @@ android {
 }
 
 dependencies {
+    api(platform(Dependence.Firebase.bom))
+    api(Dependence.Firebase.crashlytics)
+
     implementation(Dependence.ton)
     implementation(Dependence.Koin.core)
     implementation(Dependence.AndroidX.biometric)

apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/Extensions.kt

@@ -2,6 +2,7 @@ package com.tonapps.wallet.data.core
 
 import android.content.Context
 import androidx.biometric.BiometricManager
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 
 fun accountId(accountId: String, testnet: Boolean): String {
     if (testnet) {
@@ -17,3 +18,7 @@ fun isAvailableBiometric(
     val authStatus = BiometricManager.from(context).canAuthenticate(authenticators)
     return authStatus == BiometricManager.BIOMETRIC_SUCCESS
 }
+
+fun recordException(e: Throwable) {
+    FirebaseCrashlytics.getInstance().recordException(e)
+}

apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/entity/RawMessageEntity.kt

@@ -47,7 +47,7 @@ data class RawMessageEntity(
 
     @IgnoredOnParcel
     val payload: Cell by lazy {
-        payloadValue.safeParseCell() ?: Cell()
+        payloadValue.parseCell()
     }
 
     constructor(json: JSONObject) : this(

apps/wallet/data/dapps/build.gradle.kts

@@ -11,6 +11,7 @@ android {
 dependencies {
     implementation(Dependence.ton)
     implementation(project(Dependence.Wallet.api))
+    implementation(project(Dependence.Wallet.Data.core))
     implementation(project(Dependence.Wallet.Data.rn))
     implementation(project(Dependence.Lib.blockchain))
     implementation(project(Dependence.Lib.extensions))

apps/wallet/data/dapps/src/main/java/com/tonapps/wallet/data/dapps/DAppsRepository.kt

@@ -10,6 +10,7 @@ import com.tonapps.blockchain.ton.extensions.toUserFriendly
 import com.tonapps.extensions.map
 import com.tonapps.extensions.withoutQuery
 import com.tonapps.wallet.api.API
+import com.tonapps.wallet.data.core.recordException
 import com.tonapps.wallet.data.dapps.entities.AppConnectEntity
 import com.tonapps.wallet.data.dapps.entities.AppEntity
 import com.tonapps.wallet.data.dapps.entities.AppPushEntity
@@ -58,7 +59,6 @@ class DAppsRepository(
     init {
         scope.launch(Dispatchers.IO) {
             if (rnLegacy.isRequestMigration()) {
-                database.clearConnections()
                 migrationFromLegacy()
             }
 
@@ -77,6 +77,10 @@ class DAppsRepository(
     }
 
     suspend fun getPushes(tonProof: String, accountId: String): List<AppPushEntity> {
+        if (true) {
+            return emptyList()
+        }
+
         val pushes = api.getPushFromApps(tonProof, accountId).map { AppPushEntity.Body(it) }
         if (pushes.isEmpty()) {
             return emptyList()
@@ -239,7 +243,9 @@ class DAppsRepository(
             for (apps in tcApps.testnet) {
                 migrationFromLegacy(apps, true)
             }
-        } catch (ignored: Throwable) { }
+        } catch (e: Throwable) {
+            recordException(e)
+        }
     }
 
     private suspend fun migrationFromLegacy(connections: RNTCApps, testnet: Boolean) {

apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/RawMessageEntity.kt

@@ -111,6 +111,7 @@ private fun RawMessageEntity.rebuildJettonTransferWithCustomPayload(
     )
 }
 
+
 fun RawMessageEntity.getWalletTransfer(
     excessesAddress: AddrStd? = null,
     newStateInit: StateInit? = null,

apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/helper/BrowserHelper.kt

@@ -52,7 +52,7 @@ object BrowserHelper {
             .setShowTitle(true)
             .setTranslateLocale(activity.locale)
             .setBookmarksButtonEnabled(false)
-            .setShareState(CustomTabsIntent.SHARE_STATE_OFF)
+            .setShareState(CustomTabsIntent.SHARE_STATE_ON)
             .setShareIdentityEnabled(false)
             .setDownloadButtonEnabled(false)
             .setCloseButtonPosition(CustomTabsIntent.CLOSE_BUTTON_POSITION_END)

apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/EventsScreen.kt

@@ -155,8 +155,11 @@ class EventsScreen(wallet: WalletEntity) : MainScreen.Child(R.layout.fragment_ma
     }
 
     override fun getTopBarDrawable(): BarDrawable? {
-        if (this::headerDrawable.isInitialized) {
+        /*if (this::headerDrawable.isInitialized) {
             return headerDrawable
+        }*/
+        if (this::headerView.isInitialized) {
+            return headerView.background as BarDrawable
         }
         return null
     }

apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/main/MainScreen.kt

@@ -111,7 +111,13 @@ class MainScreen: BaseWalletScreen<ScreenContext.None>(R.layout.fragment_main, S
                 navigation?.add(PickerScreen.newInstance())
             }
         }
-        collectFlow(viewModel.childBottomScrolled, bottomTabsView::setDivider)
+        collectFlow(viewModel.childBottomScrolled) {
+            if (bottomTabsView.selectedItemId == R.id.browser) {
+                bottomTabsView.setDivider(false)
+            } else {
+                bottomTabsView.setDivider(it)
+            }
+        }
 
         rootViewModel.eventFlow.filterIsInstance<RootEvent.OpenTab>().onEach {
             val itemId = mainDeepLinks[it.link] ?: return@onEach
@@ -198,9 +204,18 @@ class MainScreen: BaseWalletScreen<ScreenContext.None>(R.layout.fragment_main, S
         } else {
             transaction.add(R.id.child_fragment, fragment)
         }
+        transaction.runOnCommit {
+            checkBottomDivider(fragment)
+        }
         transaction.commitNow()
     }
 
+    private fun checkBottomDivider(fragment: Fragment) {
+        if (fragment is BrowserMainScreen) {
+            bottomTabsView.setDivider(false)
+        }
+    }
+
     override fun onResume() {
         super.onResume()
         window?.setBackgroundDrawable(requireContext().constantBlackColor.drawable)

apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/contacts/main/SendContactsScreen.kt

@@ -49,6 +49,7 @@ class SendContactsScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fra
         super.onViewCreated(view, savedInstanceState)
         headerView = view.findViewById(R.id.header)
         headerView.title = getString(Localization.contacts)
+        headerView.doOnActionClick = { finish() }
 
         listView = view.findViewById(R.id.list)
         listView.adapter = adapter

apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/contacts/main/SendContactsViewModel.kt

@@ -62,10 +62,10 @@ class SendContactsViewModel(
             uiItems.add(Item.Space)
         }
 
-        if (savedContacts.isNotEmpty()) {
+        /*if (savedContacts.isNotEmpty()) {
             uiItems.addAll(savedContacts)
             uiItems.add(Item.Space)
-        }
+        }*/
 
         if (latestContacts.isNotEmpty()) {
             uiItems.addAll(latestContacts)
@@ -135,7 +135,7 @@ class SendContactsViewModel(
         val recipients = actions.filter { it.isOutTransfer(wallet) }.mapNotNull { it.recipient }
         return recipients.filter {
             !it.address.equalsAddress(wallet.address) && !it.isWallet && !contactsRepository.isHidden(it.address.toRawAddress(), wallet.testnet)
-        }.distinctBy { it.address }
+        }.distinctBy { it.address }.take(6)
     }
 
 }

apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/contacts/main/list/holder/LatestHolder.kt

@@ -16,15 +16,15 @@ class LatestHolder(
 
     init {
         emojiView.setEmoji("\uD83D\uDD57")
-        iconView.setImageResource(R.drawable.ic_ellipsis_16)
+        // iconView.setImageResource(R.drawable.ic_ellipsis_16)
     }
 
     override fun onBind(item: Item.LatestContact) {
         itemView.setOnClickListener { onClick(item) }
         itemView.background = item.position.drawable(context)
 
         nameView.text = item.name
-        iconView.setOnClickListener { showMenu(item) }
+        // iconView.setOnClickListener { showMenu(item) }
     }
 
     private fun showMenu(item: Item.LatestContact) {

apps/wallet/instance/app/src/main/res/layout/fragment_browser_main.xml

@@ -49,7 +49,7 @@
     <FrameLayout
         android:id="@+id/search_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="80dp"
         android:layout_gravity="bottom"
         android:paddingHorizontal="@dimen/offsetMedium"
         android:paddingTop="@dimen/offsetMedium"

apps/wallet/instance/app/src/main/res/layout/fragment_main_events_list.xml

@@ -13,9 +13,10 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:paddingHorizontal="@dimen/offsetMedium"
-            android:topOffset="112dp"
             android:clipToPadding="false"/>
 
+        <!--android:topOffset="112dp" -->
+
     </com.tonapps.tonkeeper.ui.component.MainSwipeRefreshLayout>
 
     <uikit.widget.EmptyLayout
@@ -37,12 +38,13 @@
         <uikit.widget.HeaderView
             android:id="@+id/header"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/filters"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:visibility="gone"
             android:paddingBottom="16dp"
             android:paddingHorizontal="@dimen/offsetMedium"/>
 

apps/wallet/instance/app/src/main/res/layout/fragment_send_contacts.xml

@@ -9,7 +9,8 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:ignoreSystemOffset="true"/>
+        app:ignoreSystemOffset="true"
+        android:action="@drawable/ic_close_16"/>
 
     <uikit.widget.SimpleRecyclerView
         android:id="@+id/list"
@@ -18,7 +19,7 @@
         android:layout_marginTop="@dimen/barHeight"
         android:clipToPadding="false"
         android:paddingHorizontal="@dimen/offsetMedium"
-        android:paddingBottom="@dimen/offsetMedium"/>
+        android:paddingBottom="72dp"/>
 
     <Button
         style="@style/Widget.App.Button"
@@ -27,6 +28,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:layout_margin="16dp"
+        android:visibility="gone"
         android:textAppearance="@style/TextAppearance.Label1"
         android:text="@string/add_contact"/>
 

apps/wallet/instance/main/proguard-rules.pro

@@ -36,3 +36,4 @@
 
 -keep class com.tonapps.tonkeeper.manager.** { *; }
 
+

lib/blockchain/src/main/java/com/tonapps/blockchain/ton/TonTransferHelper.kt

@@ -3,6 +3,7 @@ package com.tonapps.blockchain.ton
 import com.tonapps.blockchain.ton.extensions.storeMaybeRef
 import com.tonapps.blockchain.ton.extensions.storeOpCode
 import com.tonapps.blockchain.ton.extensions.storeQueryId
+import com.tonapps.blockchain.ton.extensions.storeStringTail
 import org.ton.block.AddrStd
 import org.ton.block.Coins
 import org.ton.block.MsgAddressInt
@@ -26,7 +27,7 @@ object TonTransferHelper {
 
         return buildCell {
             storeUInt(0, 32)
-            storeBytes(text.toByteArray())
+            storeStringTail(text)
         }
     }
 

lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/BaseWalletContract.kt

@@ -111,11 +111,10 @@ abstract class BaseWalletContract(
             val init = Maybe.of(gift.stateInit?.let {
                 Either.of<StateInit, CellRef<StateInit>>(it, null)
             })
-            val body = if (gift.body == null) {
-                Either.of<Cell, CellRef<Cell>>(Cell.empty(), null)
-            } else {
-                Either.of<Cell, CellRef<Cell>>(null, CellRef(gift.body!!))
-            }
+
+            val body = gift.body?.let {
+                Either.of<Cell, CellRef<Cell>>(null, CellRef(it))
+            } ?: Either.of<Cell, CellRef<Cell>>(Cell.empty(), null)
 
             return MessageRelaxed(
                 info = info,

lib/security/consumer-rules.pro

@@ -0,0 +1,3 @@
+-keep class com.tonapps.security.Sodium {
+    *;
+}

lib/security/src/main/java/com/tonapps/security/KeyHelper.kt

@@ -41,6 +41,7 @@ object KeyHelper {
     private fun generateKey(parameter: KeyGenParameterSpec) {
         val generator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, ANDROID_KEYSTORE)
         generator.init(parameter)
+        generator.generateKey()
     }
 
     private fun keyExists(alias: String): Boolean {