mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Sticker pack download: require just one successful sticker download

Browse source
This commit is contained in:
Scott Nonnenberg 2022-03-16 12:18:16 -07:00 • committed by GitHub
parent 3620309f22
commit 5a7196e464
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 159 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

31
ts/components/stickers/StickerPreviewModal.tsx
View file

@ -28,6 +28,10 @@ export type OwnProps = {
export type Props = OwnProps;
function renderBody({ pack, i18n }: Props) {
if (!pack) {
return null;
}
if (pack && pack.status === 'error') {
return (
<div className="module-sticker-manager__preview-modal__container__error">
@ -36,7 +40,7 @@ function renderBody({ pack, i18n }: Props) {
);
}
if (!pack || pack.stickerCount === 0 || !isNumber(pack.stickerCount)) {
if (pack.stickerCount === 0 || !isNumber(pack.stickerCount)) {
return <Spinner svgSize="normal" />;
}
@ -54,15 +58,16 @@ function renderBody({ pack, i18n }: Props) {
/>
</div>
))}
{range(pack.stickerCount - pack.stickers.length).map(i => (
<div
key={`placeholder-${i}`}
className={classNames(
'module-sticker-manager__preview-modal__container__sticker-grid__cell',
'module-sticker-manager__preview-modal__container__sticker-grid__cell--placeholder'
)}
/>
))}
{pack.status === 'pending' &&
range(pack.stickerCount - pack.stickers.length).map(i => (
<div
key={`placeholder-${i}`}
className={classNames(
'module-sticker-manager__preview-modal__container__sticker-grid__cell',
'module-sticker-manager__preview-modal__container__sticker-grid__cell--placeholder'
)}
/>
))}
</div>
);
}
@ -110,6 +115,12 @@ export const StickerPreviewModal = React.memo((props: Props) => {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
React.useEffect(() => {
if (!pack) {
onClose();
}
}, [pack, onClose]);
const isInstalled = Boolean(pack && pack.status === 'installed');
const handleToggleInstall = React.useCallback(() => {
if (!pack) {