From cc04a48d2615f3bef9ed72bbde0bfd04aa4c90f4 Mon Sep 17 00:00:00 2001
From: Abhinav <abhinavk.grd@gmail.com>
Date: Sun, 6 Feb 2022 15:22:19 +0530
Subject: [PATCH 1/6] send correct header for video download

---
 src/services/publicCollectionDownloadManager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/publicCollectionDownloadManager.ts b/src/services/publicCollectionDownloadManager.ts
index 71a3a3cdb..f9ab95846 100644
--- a/src/services/publicCollectionDownloadManager.ts
+++ b/src/services/publicCollectionDownloadManager.ts
@@ -144,7 +144,7 @@ class PublicCollectionDownloadManager {
         }
         const resp = await fetch(getPublicCollectionFileURL(file.id), {
             headers: {
-                'X-Auth-Token': token,
+                'X-Auth-Access-Token': token,
             },
         });
         const reader = resp.body.getReader();

From c7bec04603ef5514687f9ae9698d6080ffe552d6 Mon Sep 17 00:00:00 2001
From: Abhinav <abhinavk.grd@gmail.com>
Date: Sun, 6 Feb 2022 15:23:02 +0530
Subject: [PATCH 2/6] update PHOTOSWIPE_HASH_SUFFIX

---
 src/components/PhotoFrame.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/PhotoFrame.tsx b/src/components/PhotoFrame.tsx
index 0f416abd5..b5ab73aa3 100644
--- a/src/components/PhotoFrame.tsx
+++ b/src/components/PhotoFrame.tsx
@@ -50,7 +50,7 @@ const EmptyScreen = styled.div`
     }
 `;
 
-const PHOTOSWIPE_HASH_SUFFIX = '&photoswipe-opened';
+const PHOTOSWIPE_HASH_SUFFIX = '&opened';
 
 interface Props {
     files: EnteFile[];

From 99bd6d71fb702e25095f0c97bbe5ac7417dc70af Mon Sep 17 00:00:00 2001
From: Abhinav <abhinavk.grd@gmail.com>
Date: Sun, 6 Feb 2022 16:02:10 +0530
Subject: [PATCH 3/6] fix file info UI

---
 src/components/Container.ts              |  2 +-
 src/components/PhotoSwipe/PhotoSwipe.tsx | 54 ++++++++++++++----------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/components/Container.ts b/src/components/Container.ts
index b9d207fcb..9ec7b7faa 100644
--- a/src/components/Container.ts
+++ b/src/components/Container.ts
@@ -50,7 +50,7 @@ export const Value = styled.div<{ width?: string }>`
     justify-content: flex-start;
     align-items: center;
     width: ${(props) => props.width ?? '30%'};
-    text-align: center;
+
     color: #ddd;
 `;
 
diff --git a/src/components/PhotoSwipe/PhotoSwipe.tsx b/src/components/PhotoSwipe/PhotoSwipe.tsx
index 9b3ca6281..e7d65d4fc 100644
--- a/src/components/PhotoSwipe/PhotoSwipe.tsx
+++ b/src/components/PhotoSwipe/PhotoSwipe.tsx
@@ -148,7 +148,14 @@ function RenderCreationTime({
         <>
             <Row>
                 <Label width="30%">{constants.CREATION_TIME}</Label>
-                <Value width={isInEditMode ? '50%' : '60%'}>
+                <Value
+                    width={
+                        !shouldDisableEdits
+                            ? isInEditMode
+                                ? '50%'
+                                : '60%'
+                            : '70%'
+                    }>
                     {isInEditMode ? (
                         <EnteDateTimePicker
                             loading={loading}
@@ -160,29 +167,30 @@ function RenderCreationTime({
                         formatDateTime(pickedTime)
                     )}
                 </Value>
-                <Value
-                    width={isInEditMode ? '20%' : '10%'}
-                    style={{ cursor: 'pointer', marginLeft: '10px' }}>
-                    {!shouldDisableEdits &&
+                {!shouldDisableEdits && (
+                    <Value
+                        width={isInEditMode ? '20%' : '10%'}
+                        style={{ cursor: 'pointer', marginLeft: '10px' }}>
                         (!isInEditMode ? (
-                            <IconButton onClick={openEditMode}>
-                                <EditIcon />
-                            </IconButton>
+                        <IconButton onClick={openEditMode}>
+                            <EditIcon />
+                        </IconButton>
                         ) : (
-                            <>
-                                <IconButton onClick={saveEdits}>
-                                    {loading ? (
-                                        <SmallLoadingSpinner />
-                                    ) : (
-                                        <TickIcon />
-                                    )}
-                                </IconButton>
-                                <IconButton onClick={discardEdits}>
-                                    <CloseIcon />
-                                </IconButton>
-                            </>
-                        ))}
-                </Value>
+                        <>
+                            <IconButton onClick={saveEdits}>
+                                {loading ? (
+                                    <SmallLoadingSpinner />
+                                ) : (
+                                    <TickIcon />
+                                )}
+                            </IconButton>
+                            <IconButton onClick={discardEdits}>
+                                <CloseIcon />
+                            </IconButton>
+                        </>
+                        ))
+                    </Value>
+                )}
             </Row>
         </>
     );
@@ -323,7 +331,7 @@ function RenderFileName({
                 <Label width="30%">{constants.FILE_NAME}</Label>
                 {!isInEditMode ? (
                     <>
-                        <Value width="60%">
+                        <Value width={!shouldDisableEdits ? '60%' : '70%'}>
                             <FreeFlowText>
                                 {getFileTitle(filename, extension)}
                             </FreeFlowText>

From f5f7ea726a6d00a9babc1827eb205301b41faa8b Mon Sep 17 00:00:00 2001
From: Abhinav <abhinavk.grd@gmail.com>
Date: Sun, 6 Feb 2022 16:06:36 +0530
Subject: [PATCH 4/6] dont show info button for shared albums

---
 src/components/PhotoSwipe/PhotoSwipe.tsx | 34 +++++++++++++-----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/components/PhotoSwipe/PhotoSwipe.tsx b/src/components/PhotoSwipe/PhotoSwipe.tsx
index e7d65d4fc..9032f4f59 100644
--- a/src/components/PhotoSwipe/PhotoSwipe.tsx
+++ b/src/components/PhotoSwipe/PhotoSwipe.tsx
@@ -743,11 +743,13 @@ function PhotoSwipe(props: Iprops) {
                                         }}
                                     />
                                 )}
-                            <button
-                                className="pswp-custom info-btn"
-                                title={constants.INFO}
-                                onClick={handleOpenInfo}
-                            />
+                            {!props.isSharedCollection && (
+                                <button
+                                    className="pswp-custom info-btn"
+                                    title={constants.INFO}
+                                    onClick={handleOpenInfo}
+                                />
+                            )}
                             <div className="pswp__preloader">
                                 <div className="pswp__preloader__icn">
                                     <div className="pswp__preloader__cut">
@@ -773,16 +775,18 @@ function PhotoSwipe(props: Iprops) {
                     </div>
                 </div>
             </div>
-            <InfoModal
-                shouldDisableEdits={props.isSharedCollection}
-                showInfo={showInfo}
-                handleCloseInfo={handleCloseInfo}
-                items={items}
-                photoSwipe={photoSwipe}
-                metadata={metadata}
-                exif={exif}
-                scheduleUpdate={scheduleUpdate}
-            />
+            {!props.isSharedCollection && (
+                <InfoModal
+                    shouldDisableEdits={props.isSharedCollection}
+                    showInfo={showInfo}
+                    handleCloseInfo={handleCloseInfo}
+                    items={items}
+                    photoSwipe={photoSwipe}
+                    metadata={metadata}
+                    exif={exif}
+                    scheduleUpdate={scheduleUpdate}
+                />
+            )}
         </>
     );
 }

From 2cdd326d29ad5e2f46a02282a557723c54199441 Mon Sep 17 00:00:00 2001
From: Abhinav <abhinavk.grd@gmail.com>
Date: Sun, 6 Feb 2022 16:13:11 +0530
Subject: [PATCH 5/6] change GoToEnte button link to ente website

---
 src/components/PhotoList.tsx                  |  2 +-
 src/components/pages/sharedAlbum/GoToEnte.tsx | 11 ++---------
 src/constants/publicCollection/index.ts       |  2 --
 src/constants/urls/index.ts                   |  1 +
 4 files changed, 4 insertions(+), 12 deletions(-)
 create mode 100644 src/constants/urls/index.ts

diff --git a/src/components/PhotoList.tsx b/src/components/PhotoList.tsx
index e1d62b8da..598edb891 100644
--- a/src/components/PhotoList.tsx
+++ b/src/components/PhotoList.tsx
@@ -12,7 +12,7 @@ import {
 } from 'constants/gallery';
 import constants from 'utils/strings/constants';
 import { PublicCollectionGalleryContext } from 'utils/publicCollectionGallery';
-import { ENTE_WEBSITE_LINK } from 'constants/publicCollection';
+import { ENTE_WEBSITE_LINK } from 'constants/urls';
 import { getVariantColor, ButtonVariant } from './pages/gallery/LinkButton';
 
 const A_DAY = 24 * 60 * 60 * 1000;
diff --git a/src/components/pages/sharedAlbum/GoToEnte.tsx b/src/components/pages/sharedAlbum/GoToEnte.tsx
index b83fd88f2..7fefe8308 100644
--- a/src/components/pages/sharedAlbum/GoToEnte.tsx
+++ b/src/components/pages/sharedAlbum/GoToEnte.tsx
@@ -1,3 +1,4 @@
+import { ENTE_WEBSITE_LINK } from 'constants/urls';
 import React, { useEffect, useState } from 'react';
 import { Button } from 'react-bootstrap';
 import styled from 'styled-components';
@@ -42,17 +43,9 @@ function GoToEnte() {
         }
     };
 
-    const getHookLink = (os: OS) => {
-        if (os === OS.ANDROID || os === OS.IOS) {
-            return 'https://ente.io/app';
-        } else {
-            return 'https://web.ente.io';
-        }
-    };
-
     return (
         <Wrapper>
-            <ButtonWithLink href={getHookLink(os)}>
+            <ButtonWithLink href={ENTE_WEBSITE_LINK}>
                 {getButtonText(os)}
             </ButtonWithLink>
         </Wrapper>
diff --git a/src/constants/publicCollection/index.ts b/src/constants/publicCollection/index.ts
index b5bce8cff..731e30d5e 100644
--- a/src/constants/publicCollection/index.ts
+++ b/src/constants/publicCollection/index.ts
@@ -2,5 +2,3 @@ export enum REPORT_REASON {
     COPYRIGHT = 'COPYRIGHT',
     MALICIOUS_CONTENT = 'MALICIOUS_CONTENT',
 }
-
-export const ENTE_WEBSITE_LINK = 'https://ente.io';
diff --git a/src/constants/urls/index.ts b/src/constants/urls/index.ts
new file mode 100644
index 000000000..0d4dff35b
--- /dev/null
+++ b/src/constants/urls/index.ts
@@ -0,0 +1 @@
+export const ENTE_WEBSITE_LINK = 'https://ente.io';

From 1baa4ab93d6dbb644bb1ca818679b91103648d55 Mon Sep 17 00:00:00 2001
From: Abhinav <abhinavk.grd@gmail.com>
Date: Sun, 6 Feb 2022 16:33:48 +0530
Subject: [PATCH 6/6] fix edit creation date ui

---
 src/components/PhotoSwipe/PhotoSwipe.tsx | 34 ++++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/PhotoSwipe/PhotoSwipe.tsx b/src/components/PhotoSwipe/PhotoSwipe.tsx
index 9032f4f59..327644956 100644
--- a/src/components/PhotoSwipe/PhotoSwipe.tsx
+++ b/src/components/PhotoSwipe/PhotoSwipe.tsx
@@ -171,24 +171,24 @@ function RenderCreationTime({
                     <Value
                         width={isInEditMode ? '20%' : '10%'}
                         style={{ cursor: 'pointer', marginLeft: '10px' }}>
-                        (!isInEditMode ? (
-                        <IconButton onClick={openEditMode}>
-                            <EditIcon />
-                        </IconButton>
+                        {!isInEditMode ? (
+                            <IconButton onClick={openEditMode}>
+                                <EditIcon />
+                            </IconButton>
                         ) : (
-                        <>
-                            <IconButton onClick={saveEdits}>
-                                {loading ? (
-                                    <SmallLoadingSpinner />
-                                ) : (
-                                    <TickIcon />
-                                )}
-                            </IconButton>
-                            <IconButton onClick={discardEdits}>
-                                <CloseIcon />
-                            </IconButton>
-                        </>
-                        ))
+                            <>
+                                <IconButton onClick={saveEdits}>
+                                    {loading ? (
+                                        <SmallLoadingSpinner />
+                                    ) : (
+                                        <TickIcon />
+                                    )}
+                                </IconButton>
+                                <IconButton onClick={discardEdits}>
+                                    <CloseIcon />
+                                </IconButton>
+                            </>
+                        )}
                     </Value>
                 )}
             </Row>