diff --git a/android/build.gradle b/android/build.gradle
index 597e821ca..7ca02f85f 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "org.ergoplatform.android"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 2116
-        versionName "1.4.2116"
+        versionCode 2117
+        versionName "1.4.2117"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/ios/robovm.properties b/ios/robovm.properties
index ba73d18d0..b4f7a7be8 100644
--- a/ios/robovm.properties
+++ b/ios/robovm.properties
@@ -1,6 +1,6 @@
-app.version=0.3.2116
+app.version=0.6.2117
 app.id=org.ergoplatform.ios
 app.mainclass=org.ergoplatform.ios.Main
 app.executable=ErgoWallet
-app.build=2116
+app.build=2117
 app.name=Ergo Wallet
\ No newline at end of file
diff --git a/ios/src/main/java/org/ergoplatform/ios/tokens/SendTokenEntryView.kt b/ios/src/main/java/org/ergoplatform/ios/tokens/SendTokenEntryView.kt
index fdeeca511..1b7307389 100644
--- a/ios/src/main/java/org/ergoplatform/ios/tokens/SendTokenEntryView.kt
+++ b/ios/src/main/java/org/ergoplatform/ios/tokens/SendTokenEntryView.kt
@@ -9,6 +9,9 @@ import org.ergoplatform.uilogic.transactions.SendFundsUiLogic
 import org.robovm.apple.coregraphics.CGRect
 import org.robovm.apple.uikit.*
 
+/**
+ * View template for sending token entry on send funds screen
+ */
 class SendTokenEntryView(val uiLogic: SendFundsUiLogic, private val amountErrorField: UIView) :
     UIStackView(CGRect.Zero()) {
 
diff --git a/ios/src/main/java/org/ergoplatform/ios/tokens/TokenEntryView.kt b/ios/src/main/java/org/ergoplatform/ios/tokens/TokenEntryView.kt
index aa27e4e04..017f33caa 100644
--- a/ios/src/main/java/org/ergoplatform/ios/tokens/TokenEntryView.kt
+++ b/ios/src/main/java/org/ergoplatform/ios/tokens/TokenEntryView.kt
@@ -8,6 +8,9 @@ import org.robovm.apple.coregraphics.CGRect
 import org.robovm.apple.uikit.UILayoutConstraintAxis
 import org.robovm.apple.uikit.UIStackView
 
+/**
+ * View template for displaying token information on wallet overview and wallet details screen
+ */
 class TokenEntryView : UIStackView(CGRect.Zero()) {
 
     private val labelTokenVal = Body1BoldLabel()
diff --git a/ios/src/main/java/org/ergoplatform/ios/transactions/ChooseTokenListViewController.kt b/ios/src/main/java/org/ergoplatform/ios/transactions/ChooseTokenListViewController.kt
index 217f94072..3f44b614f 100644
--- a/ios/src/main/java/org/ergoplatform/ios/transactions/ChooseTokenListViewController.kt
+++ b/ios/src/main/java/org/ergoplatform/ios/transactions/ChooseTokenListViewController.kt
@@ -10,6 +10,9 @@ import org.robovm.apple.uikit.*
 
 const val TOKEN_CELL = "TOKEN_CELL"
 
+/**
+ * Let the user choose one or more token(s) from a list of tokens
+ */
 class ChooseTokenListViewController(
     val tokensToChooseFrom: List<WalletToken>,
     val onChoose: (String) -> Unit