Merge branch 'develop' into release

website/client/components/payments/sendGemsModal.vue

@@ -155,17 +155,19 @@ export default {
         gemAmount: this.gift.gems.amount,
       });
       this.close();
-      this.$root.$emit('habitica:payment-success', {
-        paymentMethod: 'balance',
-        paymentCompleted: true,
-        paymentType: 'gift-gems-balance',
-        gift: {
-          gems: {
-            amount: this.gift.gems.amount,
+      setTimeout(() => { // wait for the send gem modal to be closed
+        this.$root.$emit('habitica:payment-success', {
+          paymentMethod: 'balance',
+          paymentCompleted: true,
+          paymentType: 'gift-gems-balance',
+          gift: {
+            gems: {
+              amount: this.gift.gems.amount,
+            },
           },
-        },
-        giftReceiver: this.receiverName,
-      });
+          giftReceiver: this.receiverName,
+        });
+      }, 500);
     },
     onHide () {
       // @TODO this breaks amazon purchases because when the amazon modal

website/client/components/payments/successModal.vue

@@ -14,7 +14,7 @@
     .row
       .col-12.modal-body-col
         template(v-if="paymentData.paymentType === 'gems'")
-          span(v-once) {{ $t('paymentYouReceived') }}
+          strong(v-once) {{ $t('paymentYouReceived') }}
           .details-block.gems 
             .svg-icon(v-html="icons.gem", v-once)
             span 20
@@ -55,6 +55,8 @@
   background: $green-10;
   border-top-right-radius: 8px;
   border-top-left-radius: 8px;
+  border-bottom: none;
+
   h2 { 
     color: white; 
   }
@@ -121,6 +123,7 @@
   border-bottom-right-radius: 8px;
   border-bottom-left-radius: 8px;
   justify-content: center;
+  border-top: none;
 
   .small-text {
     font-style: normal;

website/common/locales/en/npc.json

@@ -119,7 +119,7 @@
   "paymentYouReceived": "You received:",
   "paymentYouSentGems": "You sent <strong><%= name %></strong>:",
   "paymentYouSentSubscription": "You sent <strong><%= name %></strong> a <%= months %>-months Habitica subscription.",
-  "paymentSubBilling": "Your subscription will be billed <strong><%= amount %></strong>$ every <strong><%= months %></strong> months.",
+  "paymentSubBilling": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong>.",
   "success": "Success!",
 
   "classGear": "Class Gear",