From 6b77c4dd4092be33e1be71ead8196b217142deb4 Mon Sep 17 00:00:00 2001
From: Ajay Bura <32841439+ajbura@users.noreply.github.com>
Date: Fri, 17 Jan 2025 09:49:54 +0530
Subject: [PATCH] fix merge issues in image pack file

---
 src/app/molecules/image-pack/ImagePack.jsx | 51 ----------------------
 1 file changed, 51 deletions(-)

diff --git a/src/app/molecules/image-pack/ImagePack.jsx b/src/app/molecules/image-pack/ImagePack.jsx
index f733e3ba..42cc91d2 100644
--- a/src/app/molecules/image-pack/ImagePack.jsx
+++ b/src/app/molecules/image-pack/ImagePack.jsx
@@ -21,9 +21,6 @@ import { useMatrixClient } from '../../hooks/useMatrixClient';
 import { useMediaAuthentication } from '../../hooks/useMediaAuthentication';
 import { getStateEvent } from '../../utils/room';
 
-const renameImagePackItem = (shortcode) =>
-  new Promise((resolve) => {
-    let isCompleted = false;
 const renameImagePackItem = (shortcode) =>
   new Promise((resolve) => {
     let isCompleted = false;
@@ -57,35 +54,6 @@ const renameImagePackItem = (shortcode) =>
       }
     );
   });
-    openReusableDialog(
-      <Text variant="s1" weight="medium">
-        Rename
-      </Text>,
-      (requestClose) => (
-        <div style={{ padding: 'var(--sp-normal)' }}>
-          <form
-            onSubmit={(e) => {
-              e.preventDefault();
-              const sc = e.target.shortcode.value;
-              if (sc.trim() === '') return;
-              isCompleted = true;
-              resolve(sc.trim());
-              requestClose();
-            }}
-          >
-            <Input value={shortcode} name="shortcode" label="Shortcode" autoFocus required />
-            <div style={{ height: 'var(--sp-normal)' }} />
-            <Button variant="primary" type="submit">
-              Rename
-            </Button>
-          </form>
-        </div>
-      ),
-      () => {
-        if (!isCompleted) resolve(null);
-      }
-    );
-  });
 
 function getUsage(usage) {
   if (usage.includes('emoticon') && usage.includes('sticker')) return 'both';
@@ -135,13 +103,6 @@ function useUserImagePack() {
         images: {},
       }
     );
-    return ImagePackBuilder.parsePack(
-      mx.getUserId(),
-      packEvent?.getContent() ?? {
-        pack: { display_name: 'Personal' },
-        images: {},
-      }
-    );
   }, [mx]);
 
   const sendPackContent = (content) => {
@@ -162,7 +123,6 @@ function useImagePackHandles(pack, sendPackContent) {
     let newKey = key?.replace(/\s/g, '_');
     if (pack.getImages().get(newKey)) {
       newKey = suffixRename(newKey, (suffixedKey) => pack.getImages().get(suffixedKey));
-      newKey = suffixRename(newKey, (suffixedKey) => pack.getImages().get(suffixedKey));
     }
     return newKey;
   };
@@ -298,7 +258,6 @@ function ImagePack({ roomId, stateKey, handlePackDelete }) {
       `Are you sure that you want to delete "${pack.displayName}"?`,
       'Delete',
       'danger'
-      'danger'
     );
     if (!isConfirmed) return;
     handlePackDelete(stateKey);
@@ -330,8 +289,6 @@ function ImagePack({ roomId, stateKey, handlePackDelete }) {
         onEditProfile={canChange ? handleEditProfile : null}
       />
       {canChange && <ImagePackUpload onUpload={handleAddItem} />}
-      {images.length === 0 ? null : (
-      {canChange && <ImagePackUpload onUpload={handleAddItem} />}
       {images.length === 0 ? null : (
         <div>
           <div className="image-pack__header">
@@ -373,11 +330,6 @@ function ImagePack({ roomId, stateKey, handlePackDelete }) {
               {viewMore ? 'View less' : `View ${pack.images.size - 2} more`}
             </Button>
           )}
-          {handlePackDelete && (
-            <Button variant="danger" onClick={handleDeletePack}>
-              Delete Pack
-            </Button>
-          )}
         </div>
       )}
       <div className="image-pack__global">
@@ -443,7 +395,6 @@ function ImagePackUser() {
         onEditProfile={handleEditProfile}
       />
       <ImagePackUpload onUpload={handleAddItem} />
-      {images.length === 0 ? null : (
       {images.length === 0 ? null : (
         <div>
           <div className="image-pack__header">
@@ -472,12 +423,10 @@ function ImagePackUser() {
           ))}
         </div>
       )}
-      {pack.images.size > 2 && (
       {pack.images.size > 2 && (
         <div className="image-pack__footer">
           <Button onClick={() => setViewMore(!viewMore)}>
             {viewMore ? 'View less' : `View ${pack.images.size - 2} more`}
-            {viewMore ? 'View less' : `View ${pack.images.size - 2} more`}
           </Button>
         </div>
       )}