Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(operator-pass): wall avatars, pages grid, spinner (#3791)

Hampusababea280a67
diff --git a/fluxer_api/src/api/operator_pass/OperatorPassWallPublicationService.ts b/fluxer_api/src/api/operator_pass/OperatorPassWallPublicationService.ts
index 9f66e3164..fe208959f 100644
--- a/fluxer_api/src/api/operator_pass/OperatorPassWallPublicationService.ts
+++ b/fluxer_api/src/api/operator_pass/OperatorPassWallPublicationService.ts
@@ -66,11 +66,16 @@ export class OperatorPassWallPublicationService {
private async buildPublicEntry(
entry: OperatorPassWallEntryRow,
now: Date = operatorPassNow(),
+ {includePreview = false}: {includePreview?: boolean} = {},
): Promise<OperatorPassWallBlobEntry | null> {
- return (await this.buildRankedEntry(entry, now))?.entry ?? null;
+ return (await this.buildRankedEntry(entry, now, {includePreview}))?.entry ?? null;
}
- private async buildRankedEntry(entry: OperatorPassWallEntryRow, now: Date): Promise<RankedWallEntry | null> {
+ private async buildRankedEntry(
+ entry: OperatorPassWallEntryRow,
+ now: Date,
+ {includePreview = false}: {includePreview?: boolean} = {},
+ ): Promise<RankedWallEntry | null> {
if (!isOperatorPassWallListed(entry) || entry.hidden) {
return null;
}
@@ -82,7 +87,7 @@ export class OperatorPassWallPublicationService {
return null;
}
const holder = resolveOperatorPassHolder(state, now);
- if (!holder || (await this.holdsOnlyPreviewPassesBeforeSale(entry.user_id, now))) {
+ if (!holder || (!includePreview && (await this.holdsOnlyPreviewPassesBeforeSale(entry.user_id, now)))) {
return null;
}
return {
@@ -302,7 +307,10 @@ export class OperatorPassWallPublicationService {
async isAvatarServed(sha256: string): Promise<boolean> {
for (const userId of await this.repository.listWallAvatarRefs(sha256)) {
const entry = await this.repository.findWallEntry(userId);
- if (entry?.live_avatar === sha256 && (await this.buildPublicEntry(entry)) !== null) {
+ if (
+ entry?.live_avatar === sha256 &&
+ (await this.buildPublicEntry(entry, operatorPassNow(), {includePreview: true})) !== null
+ ) {
return true;
}
}
@@ -332,7 +340,7 @@ export class OperatorPassWallPublicationService {
}
async publishAvatarIfServed(entry: OperatorPassWallEntryRow): Promise<void> {
- if (entry.live_avatar && (await this.buildPublicEntry(entry)) !== null) {
+ if (entry.live_avatar && (await this.buildPublicEntry(entry, operatorPassNow(), {includePreview: true})) !== null) {
await getOperatorPassWallInfrastructure().avatarStore.publish(entry.live_avatar);
}
}
diff --git a/fluxer_app/src/features/i18n/locales/ar/messages.po b/fluxer_app/src/features/i18n/locales/ar/messages.po
index 564301266..ef35d8bc9 100644
--- a/fluxer_app/src/features/i18n/locales/ar/messages.po
+++ b/fluxer_app/src/features/i18n/locales/ar/messages.po
@@ -41954,7 +41954,7 @@ msgstr "في انتظارك لـ..."
msgid "Waiting for your desktop…"
msgstr "في انتظار سطح المكتب…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "بانتظار دفعتك"
diff --git a/fluxer_app/src/features/i18n/locales/bg/messages.po b/fluxer_app/src/features/i18n/locales/bg/messages.po
index 58913d634..8d382a521 100644
--- a/fluxer_app/src/features/i18n/locales/bg/messages.po
+++ b/fluxer_app/src/features/i18n/locales/bg/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Чакаме те да..."
msgid "Waiting for your desktop…"
msgstr "Изчакване на работната среда…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Чакаме плащането ти"
diff --git a/fluxer_app/src/features/i18n/locales/cs/messages.po b/fluxer_app/src/features/i18n/locales/cs/messages.po
index 2b8dab9d4..c9d98ef68 100644
--- a/fluxer_app/src/features/i18n/locales/cs/messages.po
+++ b/fluxer_app/src/features/i18n/locales/cs/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Čeká se, až..."
msgid "Waiting for your desktop…"
msgstr "Čekáme na vaše desktopové prostředí…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Čekáme na vaši platbu"
diff --git a/fluxer_app/src/features/i18n/locales/da/messages.po b/fluxer_app/src/features/i18n/locales/da/messages.po
index 0df151653..fb1007633 100644
--- a/fluxer_app/src/features/i18n/locales/da/messages.po
+++ b/fluxer_app/src/features/i18n/locales/da/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Venter på, at du ..."
msgid "Waiting for your desktop…"
msgstr "Venter på skrivebordet…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Venter på din betaling"
diff --git a/fluxer_app/src/features/i18n/locales/de/messages.po b/fluxer_app/src/features/i18n/locales/de/messages.po
index 4c88e3fb7..fd1f41d49 100644
--- a/fluxer_app/src/features/i18n/locales/de/messages.po
+++ b/fluxer_app/src/features/i18n/locales/de/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Warten, bis du …"
msgid "Waiting for your desktop…"
msgstr "Warten auf deinen Desktop…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Warten auf deine Zahlung"
diff --git a/fluxer_app/src/features/i18n/locales/el/messages.po b/fluxer_app/src/features/i18n/locales/el/messages.po
index f36e2c380..ab5e1ca96 100644
--- a/fluxer_app/src/features/i18n/locales/el/messages.po
+++ b/fluxer_app/src/features/i18n/locales/el/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Σε περιμένουμε να..."
msgid "Waiting for your desktop…"
msgstr "Αναμονή για την επιφάνεια εργασίας σας…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Αναμονή για την πληρωμή σας"
diff --git a/fluxer_app/src/features/i18n/locales/en-GB/messages.po b/fluxer_app/src/features/i18n/locales/en-GB/messages.po
index c72134eae..33c796513 100644
--- a/fluxer_app/src/features/i18n/locales/en-GB/messages.po
+++ b/fluxer_app/src/features/i18n/locales/en-GB/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Waiting for you to..."
msgid "Waiting for your desktop…"
msgstr "Waiting for your desktop…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Waiting for your payment"
diff --git a/fluxer_app/src/features/i18n/locales/en-US/messages.po b/fluxer_app/src/features/i18n/locales/en-US/messages.po
index a91c89433..a576330bb 100644
--- a/fluxer_app/src/features/i18n/locales/en-US/messages.po
+++ b/fluxer_app/src/features/i18n/locales/en-US/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Waiting for you to..."
msgid "Waiting for your desktop…"
msgstr "Waiting for your desktop…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Waiting for your payment"
diff --git a/fluxer_app/src/features/i18n/locales/es-419/messages.po b/fluxer_app/src/features/i18n/locales/es-419/messages.po
index cccfddfb5..6fe84caa1 100644
--- a/fluxer_app/src/features/i18n/locales/es-419/messages.po
+++ b/fluxer_app/src/features/i18n/locales/es-419/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Esperando que..."
msgid "Waiting for your desktop…"
msgstr "Esperando a tu escritorio…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Esperando tu pago"
diff --git a/fluxer_app/src/features/i18n/locales/es-ES/messages.po b/fluxer_app/src/features/i18n/locales/es-ES/messages.po
index b330e3ca0..d7341c668 100644
--- a/fluxer_app/src/features/i18n/locales/es-ES/messages.po
+++ b/fluxer_app/src/features/i18n/locales/es-ES/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Esperando a que..."
msgid "Waiting for your desktop…"
msgstr "Esperando a tu escritorio…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Esperando tu pago"
diff --git a/fluxer_app/src/features/i18n/locales/fi/messages.po b/fluxer_app/src/features/i18n/locales/fi/messages.po
index caf4b0cf4..494b39b8a 100644
--- a/fluxer_app/src/features/i18n/locales/fi/messages.po
+++ b/fluxer_app/src/features/i18n/locales/fi/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Odotan, että..."
msgid "Waiting for your desktop…"
msgstr "Odotetaan työpöytääsi…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Odotetaan maksuasi"
diff --git a/fluxer_app/src/features/i18n/locales/fr/messages.po b/fluxer_app/src/features/i18n/locales/fr/messages.po
index 098430087..2757a345c 100644
--- a/fluxer_app/src/features/i18n/locales/fr/messages.po
+++ b/fluxer_app/src/features/i18n/locales/fr/messages.po
@@ -41954,7 +41954,7 @@ msgstr "En attente d’une action de votre part…"
msgid "Waiting for your desktop…"
msgstr "En attente de votre bureau…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "En attente de votre paiement"
diff --git a/fluxer_app/src/features/i18n/locales/he/messages.po b/fluxer_app/src/features/i18n/locales/he/messages.po
index 892a9a48c..4ac692a18 100644
--- a/fluxer_app/src/features/i18n/locales/he/messages.po
+++ b/fluxer_app/src/features/i18n/locales/he/messages.po
@@ -41954,7 +41954,7 @@ msgstr "מחכה לך כדי..."
msgid "Waiting for your desktop…"
msgstr "ממתין לשולחן העבודה שלך…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "ממתינים לתשלום שלך"
diff --git a/fluxer_app/src/features/i18n/locales/hi/messages.po b/fluxer_app/src/features/i18n/locales/hi/messages.po
index 898f3b005..fbb478ba6 100644
--- a/fluxer_app/src/features/i18n/locales/hi/messages.po
+++ b/fluxer_app/src/features/i18n/locales/hi/messages.po
@@ -41954,7 +41954,7 @@ msgstr "हम इंतज़ार कर रहे हैं कि आप...
msgid "Waiting for your desktop…"
msgstr "आपके डेस्कटॉप का इंतज़ार हो रहा है…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "आपके भुगतान का इंतज़ार है"
diff --git a/fluxer_app/src/features/i18n/locales/hr/messages.po b/fluxer_app/src/features/i18n/locales/hr/messages.po
index c8ae1d549..3395e44af 100644
--- a/fluxer_app/src/features/i18n/locales/hr/messages.po
+++ b/fluxer_app/src/features/i18n/locales/hr/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Čekamo da..."
msgid "Waiting for your desktop…"
msgstr "Čekanje na radno okruženje…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Čekamo vašu uplatu"
diff --git a/fluxer_app/src/features/i18n/locales/hu/messages.po b/fluxer_app/src/features/i18n/locales/hu/messages.po
index 9b1d41d51..0d0bb66fa 100644
--- a/fluxer_app/src/features/i18n/locales/hu/messages.po
+++ b/fluxer_app/src/features/i18n/locales/hu/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Rád vár, hogy..."
msgid "Waiting for your desktop…"
msgstr "Várakozás a grafikus környezetre…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Várjuk a fizetésedet"
diff --git a/fluxer_app/src/features/i18n/locales/id/messages.po b/fluxer_app/src/features/i18n/locales/id/messages.po
index 6fc8502a6..990c8cba7 100644
--- a/fluxer_app/src/features/i18n/locales/id/messages.po
+++ b/fluxer_app/src/features/i18n/locales/id/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Menunggu kamu untuk..."
msgid "Waiting for your desktop…"
msgstr "Menunggu desktop Anda…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Menunggu pembayaranmu"
diff --git a/fluxer_app/src/features/i18n/locales/it/messages.po b/fluxer_app/src/features/i18n/locales/it/messages.po
index cf3350ca2..c70e45827 100644
--- a/fluxer_app/src/features/i18n/locales/it/messages.po
+++ b/fluxer_app/src/features/i18n/locales/it/messages.po
@@ -41954,7 +41954,7 @@ msgstr "In attesa che tu..."
msgid "Waiting for your desktop…"
msgstr "In attesa del tuo desktop…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "In attesa del tuo pagamento"
diff --git a/fluxer_app/src/features/i18n/locales/ja/messages.po b/fluxer_app/src/features/i18n/locales/ja/messages.po
index e653eed9e..d5ce8eba5 100644
--- a/fluxer_app/src/features/i18n/locales/ja/messages.po
+++ b/fluxer_app/src/features/i18n/locales/ja/messages.po
@@ -41954,7 +41954,7 @@ msgstr "そろそろ…"
msgid "Waiting for your desktop…"
msgstr "デスクトップからの応答を待っています…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "お支払いを待っています"
diff --git a/fluxer_app/src/features/i18n/locales/ko/messages.po b/fluxer_app/src/features/i18n/locales/ko/messages.po
index 4d1d6c982..fb5197f68 100644
--- a/fluxer_app/src/features/i18n/locales/ko/messages.po
+++ b/fluxer_app/src/features/i18n/locales/ko/messages.po
@@ -41954,7 +41954,7 @@ msgstr "기다리고 있어요..."
msgid "Waiting for your desktop…"
msgstr "데스크톱 응답 대기 중…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "결제를 기다리는 중"
diff --git a/fluxer_app/src/features/i18n/locales/lt/messages.po b/fluxer_app/src/features/i18n/locales/lt/messages.po
index b791b9405..302fd84b8 100644
--- a/fluxer_app/src/features/i18n/locales/lt/messages.po
+++ b/fluxer_app/src/features/i18n/locales/lt/messages.po
@@ -41955,7 +41955,7 @@ msgstr "Laukiama, kol jūs..."
msgid "Waiting for your desktop…"
msgstr "Laukiama jūsų darbalaukio…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Laukiame jūsų mokėjimo"
diff --git a/fluxer_app/src/features/i18n/locales/nl/messages.po b/fluxer_app/src/features/i18n/locales/nl/messages.po
index 47271fda3..b86351a12 100644
--- a/fluxer_app/src/features/i18n/locales/nl/messages.po
+++ b/fluxer_app/src/features/i18n/locales/nl/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Wachten tot je..."
msgid "Waiting for your desktop…"
msgstr "Wachten op je desktop…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Wachten op je betaling"
diff --git a/fluxer_app/src/features/i18n/locales/no/messages.po b/fluxer_app/src/features/i18n/locales/no/messages.po
index 8a56719ee..838c79398 100644
--- a/fluxer_app/src/features/i18n/locales/no/messages.po
+++ b/fluxer_app/src/features/i18n/locales/no/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Venter på at du skal ..."
msgid "Waiting for your desktop…"
msgstr "Venter på skrivebordsmiljøet…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Venter på betalingen din"
diff --git a/fluxer_app/src/features/i18n/locales/pl/messages.po b/fluxer_app/src/features/i18n/locales/pl/messages.po
index 01ee2065d..95a2cb8c9 100644
--- a/fluxer_app/src/features/i18n/locales/pl/messages.po
+++ b/fluxer_app/src/features/i18n/locales/pl/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Czekam, aż..."
msgid "Waiting for your desktop…"
msgstr "Oczekiwanie na środowisko graficzne…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Czekamy na Twoją płatność"
diff --git a/fluxer_app/src/features/i18n/locales/pt-BR/messages.po b/fluxer_app/src/features/i18n/locales/pt-BR/messages.po
index c3da094f6..be3c3ee23 100644
--- a/fluxer_app/src/features/i18n/locales/pt-BR/messages.po
+++ b/fluxer_app/src/features/i18n/locales/pt-BR/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Esperando você..."
msgid "Waiting for your desktop…"
msgstr "Aguardando seu ambiente gráfico…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Aguardando seu pagamento"
diff --git a/fluxer_app/src/features/i18n/locales/ro/messages.po b/fluxer_app/src/features/i18n/locales/ro/messages.po
index 040d9ed1a..8881e4995 100644
--- a/fluxer_app/src/features/i18n/locales/ro/messages.po
+++ b/fluxer_app/src/features/i18n/locales/ro/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Te așteaptă să..."
msgid "Waiting for your desktop…"
msgstr "Se așteaptă mediul desktop…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Așteptăm plata ta"
diff --git a/fluxer_app/src/features/i18n/locales/ru/messages.po b/fluxer_app/src/features/i18n/locales/ru/messages.po
index d81e65abb..69d6baf1c 100644
--- a/fluxer_app/src/features/i18n/locales/ru/messages.po
+++ b/fluxer_app/src/features/i18n/locales/ru/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Ждём, пока вы..."
msgid "Waiting for your desktop…"
msgstr "Ожидание ответа системы…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Ждём вашу оплату"
diff --git a/fluxer_app/src/features/i18n/locales/sv-SE/messages.po b/fluxer_app/src/features/i18n/locales/sv-SE/messages.po
index 5d2f7eb03..292a2773e 100644
--- a/fluxer_app/src/features/i18n/locales/sv-SE/messages.po
+++ b/fluxer_app/src/features/i18n/locales/sv-SE/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Väntar på att du ska..."
msgid "Waiting for your desktop…"
msgstr "Väntar på skrivbordsmiljön…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Väntar på din betalning"
diff --git a/fluxer_app/src/features/i18n/locales/th/messages.po b/fluxer_app/src/features/i18n/locales/th/messages.po
index 1dbf4b09a..421198b01 100644
--- a/fluxer_app/src/features/i18n/locales/th/messages.po
+++ b/fluxer_app/src/features/i18n/locales/th/messages.po
@@ -41954,7 +41954,7 @@ msgstr "กำลังรอให้คุณ..."
msgid "Waiting for your desktop…"
msgstr "กำลังรอเดสก์ท็อปของคุณ…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "กำลังรอการชำระเงินของคุณ"
diff --git a/fluxer_app/src/features/i18n/locales/tr/messages.po b/fluxer_app/src/features/i18n/locales/tr/messages.po
index 0459f8a5c..ef7c3f9e9 100644
--- a/fluxer_app/src/features/i18n/locales/tr/messages.po
+++ b/fluxer_app/src/features/i18n/locales/tr/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Seni bekliyorum..."
msgid "Waiting for your desktop…"
msgstr "Masaüstünüz bekleniyor…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Ödemeniz bekleniyor"
diff --git a/fluxer_app/src/features/i18n/locales/uk/messages.po b/fluxer_app/src/features/i18n/locales/uk/messages.po
index 3f5b15f0d..370eb8a8a 100644
--- a/fluxer_app/src/features/i18n/locales/uk/messages.po
+++ b/fluxer_app/src/features/i18n/locales/uk/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Чекаємо, поки ви..."
msgid "Waiting for your desktop…"
msgstr "Очікування робочого середовища…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Чекаємо на вашу оплату"
diff --git a/fluxer_app/src/features/i18n/locales/vi/messages.po b/fluxer_app/src/features/i18n/locales/vi/messages.po
index 841e5decb..8e3a748bc 100644
--- a/fluxer_app/src/features/i18n/locales/vi/messages.po
+++ b/fluxer_app/src/features/i18n/locales/vi/messages.po
@@ -41954,7 +41954,7 @@ msgstr "Đang chờ bạn..."
msgid "Waiting for your desktop…"
msgstr "Đang chờ môi trường máy tính để bàn…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "Đang chờ bạn thanh toán"
diff --git a/fluxer_app/src/features/i18n/locales/zh-CN/messages.po b/fluxer_app/src/features/i18n/locales/zh-CN/messages.po
index fdc196707..8a4d9f5e6 100644
--- a/fluxer_app/src/features/i18n/locales/zh-CN/messages.po
+++ b/fluxer_app/src/features/i18n/locales/zh-CN/messages.po
@@ -41954,7 +41954,7 @@ msgstr "等你来…"
msgid "Waiting for your desktop…"
msgstr "正在等待桌面环境…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "正在等待你付款"
diff --git a/fluxer_app/src/features/i18n/locales/zh-TW/messages.po b/fluxer_app/src/features/i18n/locales/zh-TW/messages.po
index f5dd520f0..3dbffc1e4 100644
--- a/fluxer_app/src/features/i18n/locales/zh-TW/messages.po
+++ b/fluxer_app/src/features/i18n/locales/zh-TW/messages.po
@@ -41954,7 +41954,7 @@ msgstr "等您來…"
msgid "Waiting for your desktop…"
msgstr "正在等待桌面環境…"
-#. Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.
+#. Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.
#: src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
msgid "Waiting for your payment"
msgstr "正在等待您付款"
diff --git a/fluxer_app/src/features/premium/components/operator_pass/OperatorPassHoldingsSection.module.css b/fluxer_app/src/features/premium/components/operator_pass/OperatorPassHoldingsSection.module.css
index 96d5fb5b2..5b93d61fc 100644
--- a/fluxer_app/src/features/premium/components/operator_pass/OperatorPassHoldingsSection.module.css
+++ b/fluxer_app/src/features/premium/components/operator_pass/OperatorPassHoldingsSection.module.css
@@ -31,7 +31,7 @@
.item {
display: flex;
flex-wrap: wrap;
- align-items: center;
+ align-items: flex-start;
justify-content: space-between;
gap: 0.75rem;
padding: 0.625rem 0.75rem;
@@ -102,3 +102,19 @@
flex-wrap: wrap;
column-gap: 0.75rem;
}
+
+.pages {
+ display: grid;
+ grid-template-columns: minmax(0, max-content) repeat(3, max-content);
+ column-gap: 0.75rem;
+ row-gap: 0.125rem;
+ margin-block-start: 0.25rem;
+ color: var(--text-primary-muted);
+ font-size: 0.8125rem;
+ line-height: 1.125rem;
+ overflow-wrap: anywhere;
+}
+
+.pages > .linkGroup {
+ display: contents;
+}
diff --git a/fluxer_app/src/features/premium/components/operator_pass/OperatorPassHoldingsSection.tsx b/fluxer_app/src/features/premium/components/operator_pass/OperatorPassHoldingsSection.tsx
index 720033bb8..81c563e6e 100644
--- a/fluxer_app/src/features/premium/components/operator_pass/OperatorPassHoldingsSection.tsx
+++ b/fluxer_app/src/features/premium/components/operator_pass/OperatorPassHoldingsSection.tsx
@@ -219,6 +219,7 @@ interface RowView {
title: ReactNode;
meta: Array<ReactNode>;
links: Array<ReactNode>;
+ pages?: Array<ReactNode>;
action: ((describedBy: string) => ReactNode) | null;
}
@@ -420,6 +421,7 @@ export const OperatorPassHoldingsSection = observer(function OperatorPassHolding
}
const meta: Array<ReactNode> = [];
const links: Array<ReactNode> = [];
+ const pageLinks: Array<ReactNode> = [];
if (row.paused) meta.push(i18n._(PAUSED_PASS_DESCRIPTOR));
if (row.lockEndsAt) {
meta.push(
@@ -488,7 +490,7 @@ export const OperatorPassHoldingsSection = observer(function OperatorPassHolding
if (pages.length > 1) {
for (const [index, page] of pages.entries()) {
if (!page.certificate_url) continue;
- links.push(
+ pageLinks.push(
certificateLinks(
`page-${page.pass_id}`,
page.pass_id,
@@ -541,7 +543,7 @@ export const OperatorPassHoldingsSection = observer(function OperatorPassHolding
</>
)
: null;
- return {title, meta, links, action};
+ return {title, meta, links, pages: pageLinks, action};
}
case 'offered': {
const name = getOperatorPassOfferUserName(row.offer.recipient);
@@ -580,7 +582,7 @@ export const OperatorPassHoldingsSection = observer(function OperatorPassHolding
};
}
};
- const renderItem = (key: string, kind: string, {title, meta, links, action}: RowView) => {
+ const renderItem = (key: string, kind: string, {title, meta, links, pages = [], action}: RowView) => {
const titleId = `${baseId}-${key}-title`;
const metaIds = meta.map((_, index) => `${baseId}-${key}-meta-${index}`);
return (
@@ -608,6 +610,11 @@ export const OperatorPassHoldingsSection = observer(function OperatorPassHolding
))}
</div>
)}
+ {pages.length > 0 && (
+ <div className={styles.pages} data-flx="premium.operator-pass-holdings-section.pages">
+ {pages}
+ </div>
+ )}
</div>
{action && (
<div className={styles.actions} data-flx="premium.operator-pass-holdings-section.pass-actions">
diff --git a/fluxer_app/src/features/premium/components/operator_pass/checkout/CheckoutStage.module.css b/fluxer_app/src/features/premium/components/operator_pass/checkout/CheckoutStage.module.css
index c0ed495dc..b02f43262 100644
--- a/fluxer_app/src/features/premium/components/operator_pass/checkout/CheckoutStage.module.css
+++ b/fluxer_app/src/features/premium/components/operator_pass/checkout/CheckoutStage.module.css
@@ -86,36 +86,12 @@
gap: 0.5rem;
}
-.pulse {
- width: 0.625rem;
- height: 0.625rem;
- border-radius: 50%;
- background-color: var(--brand-primary);
- animation: pulse 1.6s ease-in-out infinite;
-}
-
.waitingRow {
display: flex;
align-items: center;
gap: 0.75rem;
}
-@keyframes pulse {
- 0%,
- 100% {
- opacity: 0.35;
- transform: scale(0.85);
- }
- 50% {
- opacity: 1;
- transform: scale(1);
- }
-}
-
-:global(html.reduced-motion) .pulse {
- animation: none;
-}
-
.srOnly {
position: absolute;
width: 0.0625rem;
diff --git a/fluxer_app/src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx b/fluxer_app/src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
index 49de1dcc4..4f2ff856b 100644
--- a/fluxer_app/src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
+++ b/fluxer_app/src/features/premium/components/operator_pass/checkout/CheckoutWaitingStage.tsx
@@ -2,6 +2,7 @@
import styles from '@app/features/premium/components/operator_pass/checkout/CheckoutStage.module.css';
import {Button} from '@app/features/ui/button/Button';
+import {Spinner} from '@app/features/ui/components/Spinner';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
@@ -13,7 +14,7 @@ const WAITING_BODY_DESCRIPTOR = msg({
const WAITING_STATUS_DESCRIPTOR = msg({
message: 'Waiting for your payment',
comment:
- 'Short status next to a slowly pulsing dot in the Operator Pass checkout dialog while the app waits for the payment to go through.',
+ 'Short status next to a loading indicator in the Operator Pass checkout dialog while the app waits for the payment to go through.',
});
const OPEN_PAYMENT_PAGE_DESCRIPTOR = msg({
message: 'Open payment page again',
@@ -40,7 +41,9 @@ export function CheckoutWaitingStage({canReopen, onReopen, onStartOver}: Checkou
{i18n._(WAITING_BODY_DESCRIPTOR)}
</p>
<div className={styles.waitingRow} role="status" data-flx="premium.operator-pass-checkout.waiting-status">
- <span className={styles.pulse} aria-hidden="true" data-flx="premium.operator-pass-checkout.pulse" />
+ <span aria-hidden="true" data-flx="premium.operator-pass-checkout.spinner-wrapper">
+ <Spinner size="small" data-flx="premium.operator-pass-checkout.spinner" />
+ </span>
<span className={styles.note} data-flx="premium.operator-pass-checkout.waiting-label">
{i18n._(WAITING_STATUS_DESCRIPTOR)}
</span>
diff --git a/fluxer_app/src/features/user/components/modals/tabs/operator_pass_tab/OperatorPassWallSettings.module.css b/fluxer_app/src/features/user/components/modals/tabs/operator_pass_tab/OperatorPassWallSettings.module.css
index d2acbe1ab..4a1f36b95 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/operator_pass_tab/OperatorPassWallSettings.module.css
+++ b/fluxer_app/src/features/user/components/modals/tabs/operator_pass_tab/OperatorPassWallSettings.module.css
@@ -22,7 +22,7 @@
.rows {
display: flex;
flex-direction: column;
- gap: 0.5rem;
+ gap: 0.75rem;
}
.row {
@@ -32,44 +32,32 @@
min-width: 0;
}
-.rowLabel {
+.rowAvatar {
flex-shrink: 0;
- min-width: 5.5rem;
- color: var(--text-primary-muted);
- font-size: 0.8125rem;
- line-height: 1.125rem;
+ width: 2.5rem;
+ height: 2.5rem;
+ border-radius: 50%;
+ object-fit: cover;
}
-.rowEntry {
+.rowText {
display: flex;
- flex: 1;
- align-items: center;
- gap: 0.5rem;
+ flex-direction: column;
min-width: 0;
}
-.rowAvatar {
- flex-shrink: 0;
- width: 1.5rem;
- height: 1.5rem;
- border-radius: 50%;
- object-fit: cover;
-}
-
.rowName {
min-width: 0;
overflow: hidden;
color: var(--text-primary);
- font-size: 0.875rem;
+ font-size: 0.9375rem;
font-weight: 600;
line-height: 1.25rem;
text-overflow: ellipsis;
white-space: nowrap;
}
-.rowTrailing {
- flex-shrink: 0;
- margin-inline-start: auto;
+.rowMeta {
color: var(--text-primary-muted);
font-size: 0.8125rem;
line-height: 1.125rem;
diff --git a/fluxer_app/src/features/user/components/modals/tabs/operator_pass_tab/OperatorPassWallSettings.tsx b/fluxer_app/src/features/user/components/modals/tabs/operator_pass_tab/OperatorPassWallSettings.tsx
index e60d549a4..8fb0d33df 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/operator_pass_tab/OperatorPassWallSettings.tsx
+++ b/fluxer_app/src/features/user/components/modals/tabs/operator_pass_tab/OperatorPassWallSettings.tsx
@@ -158,18 +158,15 @@ function WallRow({
}) {
return (
<div className={styles.row} data-flx={`user.operator-pass-tab.operator-pass-wall-settings.${flx}`}>
- <span className={styles.rowLabel} data-flx="user.operator-pass-tab.operator-pass-wall-settings.row-label">
- {label}
- </span>
- <div className={styles.rowEntry} data-flx="user.operator-pass-tab.operator-pass-wall-settings.row-entry">
- {avatarUrl && (
- <img
- src={avatarUrl}
- alt=""
- className={styles.rowAvatar}
- data-flx="user.operator-pass-tab.operator-pass-wall-settings.row-avatar"
- />
- )}
+ {avatarUrl && (
+ <img
+ src={avatarUrl}
+ alt=""
+ className={styles.rowAvatar}
+ data-flx="user.operator-pass-tab.operator-pass-wall-settings.row-avatar"
+ />
+ )}
+ <div className={styles.rowText} data-flx="user.operator-pass-tab.operator-pass-wall-settings.row-entry">
<span
className={styles.rowName}
dir="auto"
@@ -177,14 +174,17 @@ function WallRow({
>
{name}
</span>
- {trailing && (
- <span
- className={styles.rowTrailing}
- data-flx="user.operator-pass-tab.operator-pass-wall-settings.row-trailing"
- >
- {trailing}
- </span>
- )}
+ <span className={styles.rowMeta} data-flx="user.operator-pass-tab.operator-pass-wall-settings.row-label">
+ {label}
+ {trailing && (
+ <>
+ <span aria-hidden="true" data-flx="user.operator-pass-tab.operator-pass-wall-settings.row-separator">
+ {' · '}
+ </span>
+ <span data-flx="user.operator-pass-tab.operator-pass-wall-settings.row-trailing">{trailing}</span>
+ </>
+ )}
+ </span>
</div>
</div>
);