Fix hover/focus bg overriding active bg in ConversationList
Co-authored-by: trevor-signal <131492920+trevor-signal@users.noreply.github.com>
This commit is contained in:
parent
d6cc067507
commit
17ea2b58de
8 changed files with 40 additions and 40 deletions
|
@ -3,7 +3,7 @@
|
|||
|
||||
import { v4 as generateUuid } from 'uuid';
|
||||
import { z } from 'zod';
|
||||
import { Aci, Pni, ServiceId } from '@signalapp/libsignal-client';
|
||||
import type { ServiceId, Aci, Pni } from '@signalapp/libsignal-client';
|
||||
|
||||
import { isValidUuid } from '../util/isValidUuid';
|
||||
import * as log from '../logging/log';
|
||||
|
@ -166,18 +166,6 @@ export const serviceIdSchema = z
|
|||
return x;
|
||||
});
|
||||
|
||||
export function toServiceIdObject(serviceId: ServiceIdString): ServiceId {
|
||||
return ServiceId.parseFromServiceIdString(serviceId);
|
||||
}
|
||||
|
||||
export function toAciObject(aci: AciString): Aci {
|
||||
return Aci.parseFromServiceIdString(aci);
|
||||
}
|
||||
|
||||
export function toPniObject(pni: PniString): Pni {
|
||||
return Pni.parseFromServiceIdString(pni);
|
||||
}
|
||||
|
||||
// Note: getServiceIdString() returns normalized string so we can cast it
|
||||
// without normalizing.
|
||||
export function fromServiceIdObject(obj: ServiceId): ServiceIdString {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue