fix: more review feedback

pull/3083/head
William Grant 10 months ago
parent 5cd7262fa2
commit 8915971c48

@ -72,25 +72,17 @@ export const AboutView = () => {
<CopyToClipboardButton
className="version"
text={versionInfo}
copyContent={versionInfo}
buttonType={SessionButtonType.Simple}
/>
<CopyToClipboardButton
className="commitHash"
text={commitInfo}
copyContent={commitInfo}
buttonType={SessionButtonType.Simple}
/>
<CopyToClipboardButton
className="os"
text={osInfo}
copyContent={osInfo}
buttonType={SessionButtonType.Simple}
/>
<CopyToClipboardButton className="os" text={osInfo} buttonType={SessionButtonType.Simple} />
<CopyToClipboardButton
className="environment"
text={states.join(' - ')}
copyContent={states.join(' - ')}
buttonType={SessionButtonType.Simple}
/>
<a href="https://getsession.org">https://getsession.org</a>

@ -58,7 +58,7 @@ export function SessionQRCode(props: SessionQRCodeProps) {
const qrCanvasSize = 1000;
const canvasLogoSize = logoSize ? (qrCanvasSize * 0.25 * logoSize) / logoSize : 250;
const saveQRCode = async () => {
const saveQRCode = () => {
const fileName = `${id}-${new Date().toISOString()}.jpg`;
try {
if (saveWithTheme) {

@ -8,7 +8,7 @@ import { SessionIconButton } from '../icon';
import { SessionIconButtonProps } from '../icon/SessionIconButton';
type CopyProps = {
copyContent: string;
copyContent?: string;
onCopyComplete?: (copiedValue: string | undefined) => void;
hotkey?: boolean;
};
@ -22,11 +22,24 @@ export const CopyToClipboardButton = (props: CopyToClipboardButtonProps) => {
const [{ value }, copyToClipboard] = useCopyToClipboard();
const onClick = () => {
copyToClipboard(copyContent);
ToastUtils.pushCopiedToClipBoard();
setCopied(true);
if (onCopyComplete) {
onCopyComplete(value);
try {
if (!copyContent && !text) {
throw Error('Nothing to copy!');
}
if (copyContent) {
copyToClipboard(copyContent);
} else if (text) {
copyToClipboard(text);
}
ToastUtils.pushCopiedToClipBoard();
setCopied(true);
if (onCopyComplete) {
onCopyComplete(value);
}
} catch (err) {
window.log.error('CopyToClipboard:', err);
}
};
@ -51,7 +64,7 @@ export const CopyToClipboardButton = (props: CopyToClipboardButtonProps) => {
type CopyToClipboardIconProps = Omit<SessionIconButtonProps, 'children' | 'onClick' | 'iconType'> &
CopyProps;
export const CopyToClipboardIcon = (props: CopyToClipboardIconProps) => {
export const CopyToClipboardIcon = (props: CopyToClipboardIconProps & { copyContent: string }) => {
const { copyContent, onCopyComplete, hotkey = false } = props;
const [{ value }, copyToClipboard] = useCopyToClipboard();

@ -79,7 +79,7 @@ const MemberRow = (
<MemberListItem
key={key}
pubkey={memberPubkey}
isSelected={selectedMemberIds.some(m => m === memberPubkey)}
isSelected={selectedMemberIds.includes(memberPubkey)}
onSelect={addToSelected}
onUnselect={removeFromSelected}
/>

Loading…
Cancel
Save