From 4ead5fce0c4cb34748f9f736e5b09418115a35a5 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Mon, 14 Oct 2019 13:20:04 +0200
Subject: [PATCH] Fix gifting subscriptions

---
 Habitica/build.gradle                                        | 2 +-
 .../habitica/ui/activities/GiftSubscriptionActivity.kt       | 5 +++--
 fastlane/changelog.txt                                       | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 5a4b319d8..5adce1d14 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -149,7 +149,7 @@ android {
         multiDexEnabled true
         resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
 
-        versionCode 2258
+        versionCode 2261
         versionName "2.2"
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
index bbde6ee9b..d24a7b696 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
@@ -86,8 +86,8 @@ class GiftSubscriptionActivity : BaseActivity() {
         giftedUserID = intent.getStringExtra("userID")
         giftedUsername = intent.getStringExtra("username")
         if (giftedUserID == null && giftedUsername == null) {
-            giftedUserID = navArgs<GiftGemsActivityArgs>().value.userID
-            giftedUsername = navArgs<GiftGemsActivityArgs>().value.username
+            giftedUserID = navArgs<GiftSubscriptionActivityArgs>().value.userID
+            giftedUsername = navArgs<GiftSubscriptionActivityArgs>().value.username
         }
 
         subscriptionButton?.setOnClickListener {
@@ -112,6 +112,7 @@ class GiftSubscriptionActivity : BaseActivity() {
         purchaseHandler?.startListening()
 
         purchaseHandler?.getAllGiftSubscriptionProducts {
+            //skus = it.skus
             for (sku in it.skus) {
                 updateButtonLabel(sku, sku.price, it)
             }
diff --git a/fastlane/changelog.txt b/fastlane/changelog.txt
index 26d9a3c46..ef6e423da 100644
--- a/fastlane/changelog.txt
+++ b/fastlane/changelog.txt
@@ -1,4 +1,4 @@
-In this update we added managing party members to the party screen and in-app notifications for certain notifications.
-We also fixed some issues with notifications and improved the feedback when opening a mystery item
+In this update we added the option to gift gems to other users!
+We also fixed issues with feeding pets, gear display and using skills.
 
 Be sure to download this update now for a better Habitica experience!