Merge branch 'releases/2.36.x' into develop

* releases/2.36.x:
  v2.36.3
  fix wording for address typehelp screen for taproot (#2060)
  Bump iOS version to v2.36.2-323
  Bump android version to v2.36.2-4194572
  v2.36.2
  LL-8253 Re-adding Elrond that was removed for 2.35 release (#2056)
  Bump iOS version to v2.36.1-322
  Bump android version to v2.36.1-4194571
  Bump android version to v2.36.1-4194570
  Bump iOS version to v2.36.1-321
  Bump iOS version to v2.36.1-320
  Bump android version to v2.36.1-4194569
  Bump iOS version to v2.36.1-319
  fix fastfile
  Bump android version to v2.36.1-4194568
  Bump iOS version to v2.36.1-318
  Bump android version to v2.36.1-4194567
  Bump iOS version to v2.36.1-317
  v2.36.1

android/app/build.gradle

@@ -145,7 +145,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 4194581
-        versionName "2.36.0"
+        versionName "2.36.2"
         resValue "string", "build_config_package", "com.ledger.live"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

fastlane/Fastfile

@@ -332,33 +332,18 @@ platform :android do
 
   desc "upload to Play Store"
   private_lane :upload do |options|
-    if(options[:ci] && options[:nightly])
+    if(options[:ci])
       upload_to_play_store(
-        track: 'Nightly',
+        track: options[:nightly] ? 'Nightly' : "internal",
         package_name: 'com.ledger.live',
         json_key_data: ENV["ANDROID_SERVICE_KEY_CONTENT"]
       )
     else
-      if (options[:ci])
-        upload_to_play_store(
-          track: 'internal',
-          package_name: 'com.ledger.live',
-          json_key_data: ENV["ANDROID_SERVICE_KEY_CONTENT"]
-        )
-      end
-      if(options[:nightly])
-        upload_to_play_store(
-          track: 'Nightly',
-          package_name: 'com.ledger.live',
-          json_key_data: ENV["ANDROID_SERVICE_KEY_CONTENT"]
-        )
-      else
-        upload_to_play_store(
-          track: "internal",
-          package_name: "com.ledger.live",
-          json_key: ENV["ANDROID_SERVICE_KEY_PATH"],
-        )
-      end
+      upload_to_play_store(
+        track: options[:nightly] ? 'Nightly' : "internal",
+        package_name: "com.ledger.live",
+        json_key: ENV["ANDROID_SERVICE_KEY_PATH"],
+      )
     end
   end
 

ios/ledgerlivemobile/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.36.0</string>
+	<string>2.36.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>NSCameraUsageDescription</key>

ios/ledgerlivemobileTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.36.0</string>
+	<string>2.36.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

package.json

@@ -3,7 +3,7 @@
     "node": ">=14"
   },
   "name": "ledgerlivemobile",
-  "version": "2.36.0",
+  "version": "2.36.3",
   "private": true,
   "scripts": {
     "postinstall": "./scripts/post.sh",