fix: pass yarn ready

pull/2660/head
William Grant 3 years ago
parent 6cf2c0b0df
commit 1d6f200d50

@ -73,8 +73,8 @@ export const TimerNotification = (props: PropsForExpirationTimer) => {
expirationTimestamp={expirationTimestamp} expirationTimestamp={expirationTimestamp}
isExpired={props.isExpired} isExpired={props.isExpired}
isCentered={true} isCentered={true}
marginInlineStart={`calc(var(--margins-lg) + 6px)`} marginInlineStart={'calc(var(--margins-lg) + 6px)'}
marginInlineEnd={`calc(var(--margins-lg) + 6px)`} marginInlineEnd={'calc(var(--margins-lg) + 6px)'}
key={`readable-message-${messageId}`} key={`readable-message-${messageId}`}
> >
<StyledTimerNotification <StyledTimerNotification

@ -115,6 +115,7 @@ export const ConversationHeaderSubitle = (props: ConversationHeaderSubitleProps)
/> />
)} )}
<span <span
role="button"
className="module-conversation-header__title-text" className="module-conversation-header__title-text"
onKeyPress={(e: any) => { onKeyPress={(e: any) => {
if (e.key === 'Enter') { if (e.key === 'Enter') {

@ -59,8 +59,7 @@ export const OverlayDisappearingMessages = (props: OverlayDisappearingMessagesPr
// NOTE if there is only 'off' and one disappearing message mode then we trigger single mode // NOTE if there is only 'off' and one disappearing message mode then we trigger single mode
const singleMode = const singleMode =
disappearingModeOptions['off'] !== undefined && disappearingModeOptions.off !== undefined && Object.keys(disappearingModeOptions).length === 2
Object.keys(disappearingModeOptions).length === 2
? Object.keys(disappearingModeOptions)[1] ? Object.keys(disappearingModeOptions)[1]
: undefined; : undefined;
const hasOnlyOneMode = Boolean(singleMode && singleMode.length > 0); const hasOnlyOneMode = Boolean(singleMode && singleMode.length > 0);

@ -147,7 +147,8 @@ export type SubRequestInboxType = {
inbox?: { inbox?: {
/** /**
* Deletes all of the user's received messages. * Deletes all of the user's received messages.
@returns a JSON object with one key "deleted" set to the number of deleted messages. * @returns a JSON object with one key "deleted" set to the number of
* deleted messages.
*/ */
type: 'delete'; type: 'delete';
}; };

@ -20,7 +20,7 @@ export const clearInbox = async (roomInfos: OpenGroupRequestCommonType): Promise
const conversation = await Data.getConversationById(converationId); const conversation = await Data.getConversationById(converationId);
if (!conversation) { if (!conversation) {
window.log.warn(`clearInbox Matching conversation not found in db`); window.log.warn('clearInbox Matching conversation not found in db');
} else { } else {
const options: Array<OpenGroupBatchRow> = [ const options: Array<OpenGroupBatchRow> = [
{ {

@ -223,11 +223,11 @@ type ExpireMessageOnSnodeProps = {
export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) { export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) {
const { messageHash, expireTimer, extend, shorten } = props; const { messageHash, expireTimer, extend, shorten } = props;
window.log.info(`WIP: expireMessageOnSnode running!`); // window.log.info('WIP: expireMessageOnSnode running!');
if (extend && shorten) { if (extend && shorten) {
window.log.info( window.log.error(
`WIP: expireMessageOnSnode failed! We cannot extend and shorten a message at the same time`, '[expireMessageOnSnode] We cannot extend and shorten a message at the same time',
messageHash messageHash
); );
return; return;
@ -239,7 +239,7 @@ export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) {
const ourEd25519Key = await UserUtils.getUserED25519KeyPair(); const ourEd25519Key = await UserUtils.getUserED25519KeyPair();
if (!ourPubKey || !ourEd25519Key) { if (!ourPubKey || !ourEd25519Key) {
window.log.info(`WIP: expireMessageOnSnode failed! No pubkey found`, messageHash); window.log.eror('[expireMessageOnSnode] No pubkey found', messageHash);
return; return;
} }
@ -254,7 +254,7 @@ export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) {
}); });
if (!signResult) { if (!signResult) {
window.log.info(`WIP: Signing message expiry on swarm failed!`, messageHash); window.log.error('[expireMessageOnSnode] Signing message expiry on swarm failed', messageHash);
return; return;
} }
@ -289,11 +289,11 @@ export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) {
try { try {
const firstSuccessSnode = await firstTrue(promises); const firstSuccessSnode = await firstTrue(promises);
snode = firstSuccessSnode; snode = firstSuccessSnode;
window.log.info(`WIP: expireMessageOnSnode firstSuccessSnode`, firstSuccessSnode); // window.log.info(`WIP: expireMessageOnSnode firstSuccessSnode`, firstSuccessSnode);
} catch (e) { } catch (e) {
const snodeStr = snode ? `${snode.ip}:${snode.port}` : 'null'; const snodeStr = snode ? `${snode.ip}:${snode.port}` : 'null';
window?.log?.warn( window?.log?.warn(
`WIP: loki_message:::expireMessage - ${e.code ? `${e.code} ` : ''}${e.message} by ${ `loki_message:::expireMessage - ${e.code ? `${e.code} ` : ''}${e.message} by ${
ourPubKey.key ourPubKey.key
} for ${messageHash} via snode:${snodeStr}` } for ${messageHash} via snode:${snodeStr}`
); );

@ -52,6 +52,7 @@ export async function destroyMessagesAndUpdateRedux(
const messageIds = messages.map(m => m.messageId); const messageIds = messages.map(m => m.messageId);
// Delete any attachments // Delete any attachments
// tslint:disable-next-line: prefer-for-of
for (let i = 0; i < messageIds.length; i++) { for (let i = 0; i < messageIds.length; i++) {
const message = await Data.getMessageById(messageIds[i]); const message = await Data.getMessageById(messageIds[i]);
await message?.cleanup(); await message?.cleanup();

Loading…
Cancel
Save