diff --git a/stylesheets/components/SafetyNumberViewer.scss b/stylesheets/components/SafetyNumberViewer.scss index 2fffffa33..6c284eb76 100644 --- a/stylesheets/components/SafetyNumberViewer.scss +++ b/stylesheets/components/SafetyNumberViewer.scss @@ -114,13 +114,6 @@ width: 18px; height: var(--height); - - opacity: 0; - transition: opacity 200ms ease-in-out; - - &:hover { - opacity: 1; - } } &__prev { diff --git a/ts/RemoteConfig.ts b/ts/RemoteConfig.ts index 510037cdf..87674cd83 100644 --- a/ts/RemoteConfig.ts +++ b/ts/RemoteConfig.ts @@ -31,6 +31,7 @@ export type ConfigKeyType = | 'desktop.pnp' | 'desktop.retryRespondMaxAge' | 'desktop.safetyNumberAci' + | 'desktop.safetyNumberAci.beta' | 'desktop.senderKey.retry' | 'desktop.senderKey.send' | 'desktop.senderKeyMaxAge' diff --git a/ts/state/selectors/items.ts b/ts/state/selectors/items.ts index 883672301..13ab7d699 100644 --- a/ts/state/selectors/items.ts +++ b/ts/state/selectors/items.ts @@ -166,7 +166,15 @@ export const getSafetyNumberMode = createSelector( serverTimeSkew: number, now: number ): SafetyNumberMode => { - if (!isRemoteConfigFlagEnabled(remoteConfig, 'desktop.safetyNumberAci')) { + if ( + !isRemoteConfigFlagEnabled(remoteConfig, 'desktop.safetyNumberAci') && + !( + isRemoteConfigFlagEnabled( + remoteConfig, + 'desktop.safetyNumberAci.beta' + ) && isBeta(window.getVersion()) + ) + ) { return SafetyNumberMode.E164; }