Merge branch 'feat/t-replace' of github.com:boundlessfi/boundless into feat/t-replace

Author: 0xdevcollins

.github/workflows/close-linked-issues.yml

@@ -0,0 +1,84 @@
+name: Close Linked Issues
+
+# Auto-close issues referenced with Closes/Fixes/Resolves #N when a PR merges.
+#
+# GitHub's built-in auto-close only fires for PRs merged into the default branch
+# (main). This repo's feature PRs merge into integration branches such as
+# feat/t-replace, so linked issues are otherwise left open. This workflow closes
+# them on any base branch.
+#
+# pull_request_target runs in the base-repo context, so it has an issues:write
+# token even for PRs opened from forks (the normal pull_request event would get
+# a read-only token). It never checks out or runs PR head code, so it is safe.
+
+on:
+  pull_request_target:
+    types: [closed]
+
+permissions:
+  issues: write
+  contents: read
+
+jobs:
+  close-linked-issues:
+    name: Close linked issues
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged == true
+    steps:
+      - name: Close issues referenced in the PR body
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const pr = context.payload.pull_request;
+            const body = pr.body || '';
+
+            // Match "<keyword> #123" / "<keyword>: #123", keyword case-insensitive.
+            const keyword = '(?:close[sd]?|fix(?:e[sd])?|resolve[sd]?)';
+            const re = new RegExp(`${keyword}\\s*:?\\s+#(\\d+)`, 'gi');
+
+            const numbers = new Set();
+            for (const m of body.matchAll(re)) {
+              numbers.add(Number(m[1]));
+            }
+
+            if (numbers.size === 0) {
+              core.info('No "Closes/Fixes/Resolves #N" references found in the PR body.');
+              return;
+            }
+
+            for (const issue_number of numbers) {
+              try {
+                const { data: issue } = await github.rest.issues.get({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number,
+                });
+
+                // Skip PRs (the API treats PRs as issues) and already-closed issues.
+                if (issue.pull_request) {
+                  core.info(`#${issue_number} is a pull request, skipping.`);
+                  continue;
+                }
+                if (issue.state === 'closed') {
+                  core.info(`#${issue_number} is already closed, skipping.`);
+                  continue;
+                }
+
+                await github.rest.issues.createComment({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number,
+                  body: `Closed by #${pr.number} (merged into \`${pr.base.ref}\`).`,
+                });
+                await github.rest.issues.update({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number,
+                  state: 'closed',
+                  state_reason: 'completed',
+                });
+                core.info(`Closed #${issue_number}.`);
+              } catch (err) {
+                core.warning(`Could not close #${issue_number}: ${err.message}`);
+              }
+            }

app/(landing)/bounties/[id]/page.tsx

@@ -0,0 +1,22 @@
+import { Metadata } from 'next';
+
+import { generatePageMetadata } from '@/lib/metadata';
+import BountyDetail from '@/components/bounties/detail/BountyDetail';
+
+export const metadata: Metadata = generatePageMetadata('bounties');
+
+interface BountyDetailPageProps {
+  params: Promise<{ id: string }>;
+}
+
+export default async function BountyDetailPageRoute({
+  params,
+}: BountyDetailPageProps) {
+  const { id } = await params;
+
+  return (
+    <div className='relative mx-auto min-h-screen max-w-[1440px] px-5 py-8 md:px-[50px] lg:px-[100px]'>
+      <BountyDetail id={id} />
+    </div>
+  );
+}

app/(landing)/bounties/page.tsx

@@ -1,16 +1,14 @@
-import { redirect } from 'next/navigation';
 import { Metadata } from 'next';
+
 import { generatePageMetadata } from '@/lib/metadata';
+import BountiesPage from '@/components/bounties/marketplace/BountiesPage';
 
-export const metadata: Metadata = generatePageMetadata('grants');
+export const metadata: Metadata = generatePageMetadata('bounties');
 
-const GrantPage = () => {
-  redirect('/coming-soon');
+export default function BountiesPageRoute() {
   return (
-    <div className='mx-auto mt-10 max-w-[1440px] px-5 py-5 text-center text-4xl font-bold text-white md:px-[50px] lg:px-[100px]'>
-      Bounties Page
+    <div className='relative mx-auto min-h-screen max-w-[1440px] px-5 py-8 md:px-[50px] lg:px-[100px]'>
+      <BountiesPage />
     </div>
   );
-};
-
-export default GrantPage;
+}

app/me/bounties/page.tsx

@@ -0,0 +1,5 @@
+import MyBountiesPage from '@/components/me/bounties/MyBountiesPage';
+
+export default function MyBountiesRoutePage() {
+  return <MyBountiesPage />;
+}

app/me/earnings/page.tsx

@@ -104,6 +104,20 @@ const ActivityItem: React.FC<ActivityItemProps> = ({ activity }) => (
         <span className='capitalize'>{activity.source}</span>
         <span>•</span>
         <span>{new Date(activity.occurredAt).toLocaleDateString()}</span>
+        {/* Reward-receipt tx (txHash arrives with backend #335; cast until codegen). */}
+        {(activity as { txHash?: string }).txHash && (
+          <>
+            <span>•</span>
+            <a
+              href={`https://stellar.expert/explorer/testnet/tx/${(activity as { txHash?: string }).txHash}`}
+              target='_blank'
+              rel='noreferrer'
+              className='text-primary hover:underline'
+            >
+              View tx
+            </a>
+          </>
+        )}
       </div>
     </div>
     <div className='text-right'>

components/app-sidebar.tsx

@@ -9,6 +9,7 @@ import {
   IconUserCircle,
   IconUsers,
   IconRocket,
+  IconTarget,
 } from '@tabler/icons-react';
 
 import { NavMain } from '@/components/nav-main';
@@ -67,6 +68,13 @@ const getNavigationData = (counts?: {
           : undefined,
     },
   ],
+  bounties: [
+    {
+      title: 'My Bounties',
+      url: '/me/bounties',
+      icon: IconTarget,
+    },
+  ],
   account: [
     {
       title: 'Profile',
@@ -151,6 +159,7 @@ export function AppSidebar({
         <NavMain items={navigationData.main} />
         <NavMain items={navigationData.crowdfunding} label='Crowdfunding' />
         <NavMain items={navigationData.hackathons} label='Hackathons' />
+        <NavMain items={navigationData.bounties} label='Bounties' />
         <NavMain items={navigationData.account} label='Account' />
       </SidebarContent>
       {/* Footer with User */}