Skip to content

fix: resolve issues #393, #394, #395, #396 #461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mimah97 merged 1 commit into from
Jun 30, 2026
+11 −7
Merged

fix: resolve issues #393, #394, #395, #396 #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/deploy-testnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Deploy Contracts to Testnet

on:
push:
branches:
- main
workflow_dispatch:
inputs:
force:
Expand Down
1 change: 1 addition & 0 deletions apps/api/src/pools/pools.repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export class PoolsRepository {
where: search
? {
OR: [
{ id: { contains: search, mode: 'insensitive' } },
{ token0Address: { contains: search, mode: 'insensitive' } },
{ token1Address: { contains: search, mode: 'insensitive' } },
],
Expand Down
12 changes: 6 additions & 6 deletions apps/web/app/portfolio/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { useEffect } from 'react';
import { useWalletContext } from '@/context/WalletContext';
import { usePortfolio } from '@/hooks/usePortfolio';
import { PositionCard } from '@/components/PositionCard';
import { WalletButton } from '@/components/WalletButton';
import { API_BASE, SWYFT_NETWORK_PASSPHRASE } from '@/lib/constants';
import { signTransaction } from '@stellar/freighter-api';
import { buildCollectTx } from '@swyft/sdk';
Expand All @@ -24,12 +25,6 @@ export default function PortfolioPage() {
const [showClosed, setShowClosed] = useState(false);
const [collectingId, setCollectingId] = useState<string | null>(null);

// Redirect if no wallet connected
useEffect(() => {
if (address === null && !loading) {
router.replace('/');
}
}, [address, loading, router]);

const handleCollectFees = useCallback(
async (positionId: string) => {
Expand Down Expand Up @@ -143,6 +138,11 @@ export default function PortfolioPage() {
{/* Empty state */}
{!loading && positions.length === 0 && (
<div className="flex flex-col items-center justify-center gap-4 py-20 text-center">
{!address && (
<div className="mb-4">
<WalletButton />
</div>
)}
{showClosed ? (
<>
<p className="text-sm text-zinc-500">You have no positions yet.</p>
Expand Down
2 changes: 1 addition & 1 deletion packages/contract/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"deploy:testnet:force": "bash scripts/deploy-testnet.sh --force"
},
"devDependencies": {
"@stellar/stellar-sdk": "^13.0.0",
"@stellar/stellar-sdk": "^13.1.0",
"@types/jest": "^30.0.0",
"jest": "^30.0.0",
"ts-jest": "^29.2.5",
Expand Down