From fdef94e826c2eb3aaebac13ae83b5883fe31f68b Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Tue, 15 Dec 2020 15:54:29 -0600
Subject: [PATCH] fix(g1g1): correct blank private message

---
 test/api/unit/libs/payments/payments.test.js      |  2 +-
 .../src/components/header/banners/giftPromo.vue   |  6 +++---
 .../src/components/payments/sendGemsModal.vue     | 14 ++++++++++----
 .../src/components/settings/subscription.vue      | 15 +++++++++++----
 website/server/libs/payments/subscriptions.js     |  6 +++---
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/test/api/unit/libs/payments/payments.test.js b/test/api/unit/libs/payments/payments.test.js
index 17f99aacb0..666ff59017 100644
--- a/test/api/unit/libs/payments/payments.test.js
+++ b/test/api/unit/libs/payments/payments.test.js
@@ -344,7 +344,7 @@ describe('payments/index', () => {
           const msg = '`Hello sender, you received 3 months of subscription as part of our holiday gift-giving promotion!`';
 
           expect(user.sendMessage).to.be.calledTwice;
-          expect(user.sendMessage).to.be.calledWith(user, { senderMsg: msg, save: false });
+          expect(user.sendMessage).to.be.calledWith(user, { receiverMsg: msg, save: false });
         });
       });
     });
diff --git a/website/client/src/components/header/banners/giftPromo.vue b/website/client/src/components/header/banners/giftPromo.vue
index 8e998e84c4..5308a9f658 100644
--- a/website/client/src/components/header/banners/giftPromo.vue
+++ b/website/client/src/components/header/banners/giftPromo.vue
@@ -11,21 +11,21 @@
       @click="showSelectUser"
     >
       <div
+        v-once
         class="svg-icon svg-gifts left-gift"
         v-html="icons.gifts"
-        v-once
       >
       </div>
       <div
+        v-once
         class="announce-text"
         v-html="$t('g1g1Announcement')"
-        v-once
       >
       </div>
       <div
+        v-once
         class="svg-icon svg-gifts right-gift"
         v-html="icons.gifts"
-        v-once
       >
       </div>
     </div>
diff --git a/website/client/src/components/payments/sendGemsModal.vue b/website/client/src/components/payments/sendGemsModal.vue
index 7c57a21f39..794676c51d 100644
--- a/website/client/src/components/payments/sendGemsModal.vue
+++ b/website/client/src/components/payments/sendGemsModal.vue
@@ -103,12 +103,18 @@
               </div>
             </div>
             <div
-              class="col-md-7"
               v-if="currentEvent && currentEvent.promo && currentEvent.promo === 'g1g1'"
+              class="col-md-7"
             >
-              <h4 v-once> {{ $t('winterPromoGiftHeader') }} </h4>
-              <p v-once> {{ $t('winterPromoGiftDetails1') }} </p>
-              <p v-once> {{ $t('winterPromoGiftDetails2') }} </p>
+              <h4 v-once>
+                {{ $t('winterPromoGiftHeader') }}
+              </h4>
+              <p v-once>
+                {{ $t('winterPromoGiftDetails1') }}
+              </p>
+              <p v-once>
+                {{ $t('winterPromoGiftDetails2') }}
+              </p>
             </div>
           </div>
         </div>
diff --git a/website/client/src/components/settings/subscription.vue b/website/client/src/components/settings/subscription.vue
index 2244ffa3f3..1372da794f 100644
--- a/website/client/src/components/settings/subscription.vue
+++ b/website/client/src/components/settings/subscription.vue
@@ -309,15 +309,22 @@
       </div>
       <div
         v-if="currentEvent && currentEvent.promo && currentEvent.promo === 'g1g1'"
-        class="m-5">
+        class="m-5"
+      >
       </div>
       <div
         v-if="currentEvent && currentEvent.promo && currentEvent.promo === 'g1g1'"
         class="ml-5 mt-3"
       >
-        <h2 v-once> {{ $t('winterPromoGiftHeader') }} </h2>
-        <p v-once> {{ $t('winterPromoGiftDetails1') }} </p>
-        <p v-once> {{ $t('winterPromoGiftDetails2') }} </p>
+        <h2 v-once>
+          {{ $t('winterPromoGiftHeader') }}
+        </h2>
+        <p v-once>
+          {{ $t('winterPromoGiftDetails1') }}
+        </p>
+        <p v-once>
+          {{ $t('winterPromoGiftDetails2') }}
+        </p>
       </div>
     </div>
   </div>
diff --git a/website/server/libs/payments/subscriptions.js b/website/server/libs/payments/subscriptions.js
index 31b794bcb1..e2d6a1a2f9 100644
--- a/website/server/libs/payments/subscriptions.js
+++ b/website/server/libs/payments/subscriptions.js
@@ -198,13 +198,13 @@ async function createSubscription (data) {
     // generate the message in both languages, so both users can understand it
     const languages = [data.user.preferences.language, data.gift.member.preferences.language];
     if (data.promo) {
-      let senderMsg = shared.i18n.t(`giftedSubscription${data.promo}Promo`, {
+      let receiverMsg = shared.i18n.t(`giftedSubscription${data.promo}Promo`, {
         username: data.gift.member.profile.name,
         monthCount: shared.content.subscriptionBlocks[data.gift.subscription.key].months,
       }, languages[0]);
 
-      senderMsg = `\`${senderMsg}\``;
-      data.user.sendMessage(data.gift.member, { senderMsg, save: false });
+      receiverMsg = `\`${receiverMsg}\``;
+      data.user.sendMessage(data.gift.member, { receiverMsg, save: false });
     } else {
       let senderMsg = shared.i18n.t('giftedSubscriptionFull', {
         username: data.gift.member.profile.name,