Merge pull request #745 from redjex/fix-gift-converted-text

Gifts: a gift converted to Stars says so under it, as in Telegram Desktop

Author: morethanwords

src/components/chat/bubbles/starGift.tsx

@@ -76,6 +76,15 @@ export function StarGiftBubble(props: {
       return <I18nTsx key="StarGiftDefaultMessageUpgrade" />
     }
 
+    if(props.gift.isConverted && props.gift.isIncoming) {
+      return (
+        <I18nTsx
+          key="StarGiftGotStars"
+          args={`${props.gift.raw.convert_stars}`}
+        />
+      );
+    }
+
     if(props.gift.raw.convert_stars !== undefined && !props.gift.isUpgraded) {
       return props.gift.isIncoming ? (
         <I18nTsx

src/components/popups/starGiftInfo.tsx

@@ -876,6 +876,7 @@ export default function showStarGiftInfoPopup(options: {
                 try {
                   await managers.appGiftsManager.convertGift(input);
                   context.hide();
+                  toastNew({langPackKey: 'StarGiftGotStars', langPackArguments: [+saved.convert_stars]});
                 } catch(err) {
                   toastNew({langPackKey: 'Error.AnError'});
                 }

src/lang.ts

@@ -4019,6 +4019,10 @@ const lang = {
     'one_value': 'Add this gift to your profile or convert it to %d Star.',
     'other_value': 'Add this gift to your profile or convert it to %d Stars.'
   },
+  'StarGiftGotStars': {
+    'one_value': 'You got **%d Star** for this gift.',
+    'other_value': 'You got **%d Stars** for this gift.'
+  },
   'StarGiftDefaultMessageConvertableOut': {
     'one_value': '%2$s can add this gift on their profile or convert it to %1$d Star.',
     'other_value': '%2$s can add this gift on their profile or convert it to %1$d Stars.'

src/lib/appManagers/appGiftsManager.ts

@@ -419,6 +419,24 @@ export default class AppGiftsManager extends AppManager {
     await this.apiManager.invokeApiSingle('payments.convertStarGift', {
       stargift: gift
     });
+
+    // * the server does not edit the gift's message, so it is marked here for its bubble to say so
+    if(gift._ !== 'inputSavedStarGiftUser') return;
+    const mid = this.appMessagesIdsManager.generateMessageId(gift.msg_id);
+    const message = this.appMessagesManager.getMessageById(mid) as Message.messageService;
+    if(message?._ !== 'messageService' || message.action._ !== 'messageActionStarGift') return;
+
+    const storage = this.appMessagesManager.getHistoryMessagesStorage(message.peerId);
+    this.appMessagesManager.modifyMessage(message, (message) => {
+      (message.action as MessageAction.messageActionStarGift).pFlags.converted = true;
+    }, storage);
+
+    this.rootScope.dispatchEvent('message_edit', {
+      storageKey: storage.key,
+      peerId: message.peerId,
+      mid: message.mid,
+      message
+    });
   }
 
   public async getPremiumGiftOptions(): Promise<MyPremiumGiftOption[]> {

src/scripts/out/langPack.strings

@@ -3524,6 +3524,8 @@
 "StarGiftDefaultMessageOut" = "%s can display this gift on their profile.";
 "StarGiftDefaultMessageConvertable_one" = "Add this gift to your profile or convert it to %d Star.";
 "StarGiftDefaultMessageConvertable_other" = "Add this gift to your profile or convert it to %d Stars.";
+"StarGiftGotStars_one" = "You got **%d Star** for this gift.";
+"StarGiftGotStars_other" = "You got **%d Stars** for this gift.";
 "StarGiftDefaultMessageConvertableOut_one" = "%2$s can add this gift on their profile or convert it to %1$d Star.";
 "StarGiftDefaultMessageConvertableOut_other" = "%2$s can add this gift on their profile or convert it to %1$d Stars.";
 "StarGiftDefaultMessageUpgrade" = "Upgrade this gift to a unique collectible.";