Skip to content

Commit

Permalink
Merge pull request #542 from WatchItDev/main
Browse files Browse the repository at this point in the history
merge next branch with main (FOA)
  • Loading branch information
Jadapema authored Feb 14, 2025
2 parents 893b998 + 91e2e5b commit 38458d3
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 17 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ jobs:
- name: Install dependencies
run: npm ci

- name: Build analysis
run: npm run build

- name: Run static analysis
run: npm run lint

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
release:
name: Release
name: Semver Release
runs-on: ubuntu-latest
concurrency: release
environment: ${{ inputs.environment }}
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WatchIt
[![codecov](https://codecov.io/gh/WatchItDev/watchit-app/graph/badge.svg?token=LQSOJRMXIY)](https://codecov.io/gh/WatchItDev/watchit-app)

WatchIt represents a transformative innovation in how audiovisual content is consumed and disseminated. Built on decentralized principles and powered by blockchain technology, the platform ensures secure, equitable, and dynamic content delivery through a network of distributed nodes. This architecture not only enhances system resilience but also fosters meaningful collaboration between creators and audiences, creating a vibrant and sustainable ecosystem.

![App Preview](image.png)
Expand Down
3 changes: 2 additions & 1 deletion src/sections/finance/components/finance-earn-tokens.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ const FinanceEarnTokens: FC<FinanceEarnTokensProps> = ({ sx, lgUp, ...other }) =
const theme = useTheme();

const handleClick = () => {
window.open('https://tropee.com/watchit', '_BLANK');
// TODO move to envs
window.open('https://zealy.io/cw/watchit', '_BLANK');
};

return (
Expand Down
10 changes: 3 additions & 7 deletions src/sections/ownership/components/ownership-process.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import { ERRORS } from '@notifications/errors.ts';
import { INFO } from '@notifications/info.ts';
import { useSubmitAssetToLens } from '@src/hooks/use-submit-assets-to-lens.ts';
import NeonPaper from '@src/sections/publication/NeonPaperContainer.tsx';
import { useSelector } from 'react-redux';
import { useGetAssetOwner } from '@src/hooks/use-get-asset-owner.ts';
import { replacePrefix } from '@src/utils/wallet.ts';

Expand Down Expand Up @@ -71,8 +70,6 @@ const OwnershipProcessContent = ({ onClose }: { onClose: () => void }) => {
const { fetchOwnerAddress } = useGetAssetOwner();
const [isProcessing, setIsProcessing] = useState(false);
const [progress, setProgress] = useState(0);
const sessionData = useSelector((state: any) => state.auth.session);
const userAddress = sessionData?.profile?.ownedBy?.address as string | undefined;
const hashesArray = hashes.split(',')
.map(h => h.trim())
.filter(Boolean);
Expand All @@ -94,15 +91,14 @@ const OwnershipProcessContent = ({ onClose }: { onClose: () => void }) => {
}, '', { autoHideDuration: 3000 });
setProgress(index + 1);

const owner = await fetchOwnerAddress(hash);
const isAssetMine = userAddress === owner
const isTaken = await fetchOwnerAddress(hash);

if (!isAssetMine) {
if (isTaken) {
notifyError(ERRORS.ASSET_ALREADY_REGISTERED_ERROR);
continue;
}

if (!owner) {
if (!isTaken) {
// 2. Register ownership (if it fails, it does not continue)
await registerAsset(hash);
}
Expand Down
10 changes: 5 additions & 5 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ export default defineConfig(({ mode }) => {
project: "watchit-app",
authToken: process.env.VITE_SENTRY_AUTH_TOKEN,
}),
codecovVitePlugin({
bundleName: "WatchItDev/watchit-app",
enableBundleAnalysis: process.env.VITE_CODECOV_TOKEN !== undefined,
uploadToken: process.env.VITE_CODECOV_TOKEN,
}),
nodePolyfills({
// To add only specific polyfills, add them here. If no option is passed, adds all polyfills
include: ['process', "module", "buffer"],
globals: { global: true, process: true, Buffer: true },
}),
codecovVitePlugin({
bundleName: "watchit-app",
enableBundleAnalysis: process.env.VITE_CODECOV_TOKEN !== undefined,
uploadToken: process.env.VITE_CODECOV_TOKEN,
}),
],
resolve: {
alias: {
Expand Down

0 comments on commit 38458d3

Please sign in to comment.