Skip to content

Commit

Permalink
Merge branch 'master' into mh/room-user-add
Browse files Browse the repository at this point in the history
  • Loading branch information
mjh1 committed Jun 28, 2023
2 parents 1d8dfbc + e66a5bb commit 1df20c6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
6 changes: 3 additions & 3 deletions packages/api/src/controllers/experiment/attestation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@ app.post("/", validatePost("attestation"), async (req, res) => {
return res.status(201).json(attestationMetadata);
});

function toContent(attestation: Attestation): string {
return JSON.stringify({
function toContent(attestation: Attestation) {
return {
domain: attestation.domain,
primaryType: attestation.primaryType,
message: attestation.message,
signature: attestation.signature,
signatureType: attestation.signatureType,
});
};
}

async function verifySignature(
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/schema/api-schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1306,7 +1306,7 @@ components:
- content
properties:
content:
type: string
type: object
description: File content to store into IPFS
ipfs:
$ref: "#/components/schemas/ipfs-export-params"
Expand Down
14 changes: 13 additions & 1 deletion packages/www/components/Table/cells/createdAt.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { fileUploadProgressForAsset } from "components/AssetsTable/helpers";
import { Asset } from "livepeer";
import { Badge, Flex } from "@livepeer/design-system";
import { Badge, Box, Flex, Tooltip } from "@livepeer/design-system";
import { UploadIcon } from "@radix-ui/react-icons";
import { format } from "date-fns";
import { useApi } from "hooks";
import { useEffect, useState } from "react";
import ReactTooltip from "react-tooltip";
import { CellComponentProps, TableData } from "../types";
import { QuestionMarkCircledIcon as Help } from "@radix-ui/react-icons";

const CreatedAt = ({ date, fallback }) => {
try {
Expand Down Expand Up @@ -52,6 +53,17 @@ const FileUploading = ({ progress }) => (
const ProcessingProgress = ({ progress }) => (
<Flex gap={1}>
<UploadIcon /> Processing {Math.floor(progress * 100)}%
<Tooltip
multiline
content={
<Box>
Your video can now be played. In the background, it is converted into
several quality levels so that it can be played smoothly by all
viewers.
</Box>
}>
<Help />
</Tooltip>
</Flex>
);

Expand Down

0 comments on commit 1df20c6

Please sign in to comment.