Merge pull request #724 from aibtcdev/aibtc-la

Aibtc la

Author: biwasxyz

.vscode/settings.json

@@ -20,5 +20,8 @@
   ],
   "[typescript]": {
     "editor.defaultFormatter": "vscode.typescript-language-features"
-  }
+  },
+  "python-envs.defaultEnvManager": "ms-python.python:conda",
+  "python-envs.defaultPackageManager": "ms-python.python:conda",
+  "python-envs.pythonProjects": []
 }

src/components/aidaos/RootDAOPage.tsx

@@ -44,6 +44,7 @@ import { getStacksAddress } from "@/lib/address";
 // import { useAgentAccount } from "@/hooks/useAgentAccount";
 // import { BalanceDisplay } from "@/components/reusables/BalanceDisplay";
 import { TwitterCard } from "@/components/twitter/TwitterCard";
+import { rewardPerPassedProposal } from "@/config/features";
 
 // Network configuration
 const isMainnet = process.env.NEXT_PUBLIC_STACKS_NETWORK === "mainnet";
@@ -373,6 +374,10 @@ export function RootDAOPage({ children, daoName }: RootDAOPageProps) {
     return proposals.filter((proposal) => proposal.passed === true).length;
   }, [proposals]);
 
+  const totalRewards = useMemo(() => {
+    return passedProposals * rewardPerPassedProposal;
+  }, [passedProposals]);
+
   if (isBasicLoading || !dao) {
     return (
       <main className="flex h-screen w-full items-center justify-center">
@@ -482,7 +487,9 @@ export function RootDAOPage({ children, daoName }: RootDAOPageProps) {
               </div>
               <div className="flex items-center gap-2">
                 <span className="font-bold">Total Rewards:</span>
-                <span className="font-medium">$4,005</span>
+                <span className="font-medium">
+                  ${totalRewards.toLocaleString()}
+                </span>
               </div>
             </div>
           </div>
@@ -520,19 +527,23 @@ export function RootDAOPage({ children, daoName }: RootDAOPageProps) {
               <TwitterCard
                 name="AIBTC"
                 username="aibtcdev"
-                tweet={`AIBTC order update — proof of coffee ritual ☕
+                tweet={`AIBTC order — LA interviews 🌴
+
+hit the streets of LA and record a video asking a stranger:
+
+• "What do you love about LA?"
+• "What's one thing you'd fix about LA?"
+
+quote this post with the video and neighborhood you were in
 
-quote this post with:
-1️⃣ a coffee selfie
-2️⃣ tag a blue-check builder you respect
-3️⃣ tell us what you've built today for bitcoin
+approved entries earn $50 BTC
 
-submit daily at aibtc.com`}
-                date="Nov 7, 2025"
-                time="8:14 PM"
+details in next post`}
+                date="Nov 25, 2025"
+                // time="8:14 PM"
                 avatarUrl="/logos/aibtcdev-avatar-250px.png"
                 verified={true}
-                link="https://x.com/aibtcdev/status/1985732853540470816"
+                // link="https://x.com/aibtcdev/status/1990455534554841152"
                 title="The Current Order"
               />
             </div>

src/components/proposals/ProposalCard.tsx

@@ -16,6 +16,8 @@ import { useProposalVote } from "@/hooks/useProposalVote";
 import { Button } from "@/components/ui/button";
 import { RefreshCw, AlertCircle } from "lucide-react";
 import { motion } from "framer-motion";
+import { safeNumberFromBigInt } from "@/utils/proposal";
+import { cn } from "@/lib/utils";
 
 interface ProposalCardProps {
   proposal: Proposal | ProposalWithDAO;
@@ -31,14 +33,16 @@ export default function ProposalCard({
   const router = useRouter();
 
   // Use the unified status system
-  const { statusConfig, isActive, isPassed } = useProposalStatus(proposal);
+  const { status, statusConfig, isActive } = useProposalStatus(proposal);
 
   // Use centralized vote hook for consistent data fetching
   const {
     voteDisplayData,
+    calculations,
     error: hasVoteDataError,
     refreshVoteData,
     isLoading: isLoadingVotes,
+    vetoCheck,
   } = useProposalVote({
     proposal,
     contractPrincipal: proposal.contract_principal,
@@ -90,6 +94,43 @@ export default function ProposalCard({
   // const liquidTokens = Number(proposal.liquid_tokens);
   const { totalVotes, hasVoteData } = voteSummary;
 
+  // Enhanced calculations for quorum and threshold display
+  const enhancedCalculations = useMemo(() => {
+    if (!calculations) return null;
+
+    const quorumPercentage = safeNumberFromBigInt(proposal.voting_quorum);
+    const thresholdPercentage = safeNumberFromBigInt(proposal.voting_threshold);
+
+    // Calculate if requirements are met
+    const metQuorum = calculations.participationRate >= quorumPercentage;
+    const metThreshold =
+      calculations.totalVotes > 0
+        ? calculations.approvalRate >= thresholdPercentage
+        : false;
+
+    return {
+      ...calculations,
+      quorumPercentage,
+      thresholdPercentage,
+      metQuorum,
+      metThreshold,
+    };
+  }, [calculations, proposal]);
+
+  // Helper function for status display
+  const getStatusText = (met: boolean, percentage?: number) => {
+    // If voting hasn't started (PENDING, DRAFT), show "Pending"
+    if (status === "PENDING" || status === "DRAFT") {
+      return "Pending";
+    }
+
+    if (isActive) {
+      return percentage !== undefined ? `${percentage.toFixed(1)}%` : "0%";
+    }
+
+    return met ? "Passed" : "Failed";
+  };
+
   // Memoize DAO info
   const daoInfo = useMemo(() => {
     const proposalWithDAO = proposal as ProposalWithDAO;
@@ -130,12 +171,93 @@ export default function ProposalCard({
                   ? `#${proposal.proposal_id}: ${proposal.title}`
                   : proposal.title}
               </h3>
-              <div className="flex items-center gap-2 sm:gap-3 mb-2">
+              <div className="flex flex-wrap items-center gap-2 mb-2">
                 <ProposalStatusBadge
                   proposal={proposal}
                   size="sm"
                   className="flex-shrink-0"
                 />
+
+                {/* Quorum and Threshold Badges */}
+                {enhancedCalculations &&
+                  statusConfig.label !== "Pending" &&
+                  statusConfig.label !== "Draft" && (
+                    <>
+                      {/* Quorum Badge */}
+                      <div
+                        className={cn(
+                          "px-2 py-0.5 rounded-sm text-xs font-medium border flex-shrink-0",
+                          isActive
+                            ? enhancedCalculations.metQuorum
+                              ? "bg-success/10 border-success/20"
+                              : "bg-primary/10 border-primary/20"
+                            : enhancedCalculations.metQuorum
+                              ? "bg-success/10 border-success/20"
+                              : "bg-destructive/10 border-destructive/20"
+                        )}
+                      >
+                        <span className="text-muted-foreground">Quorum:</span>{" "}
+                        <span
+                          className={cn(
+                            isActive
+                              ? enhancedCalculations.metQuorum
+                                ? "text-success"
+                                : "text-primary"
+                              : enhancedCalculations.metQuorum
+                                ? "text-success"
+                                : "text-destructive"
+                          )}
+                        >
+                          {getStatusText(
+                            enhancedCalculations.metQuorum,
+                            enhancedCalculations.participationRate
+                          )}
+                        </span>
+                      </div>
+
+                      {/* Threshold Badge */}
+                      <div
+                        className={cn(
+                          "px-2 py-0.5 rounded-sm text-xs font-medium border flex-shrink-0",
+                          isActive
+                            ? enhancedCalculations.metThreshold
+                              ? "bg-success/10 border-success/20"
+                              : "bg-primary/10 border-primary/20"
+                            : enhancedCalculations.metThreshold
+                              ? "bg-success/10 border-success/20"
+                              : "bg-destructive/10 border-destructive/20"
+                        )}
+                      >
+                        <span className="text-muted-foreground">
+                          Threshold:
+                        </span>{" "}
+                        <span
+                          className={cn(
+                            isActive
+                              ? enhancedCalculations.metThreshold
+                                ? "text-success"
+                                : "text-primary"
+                              : enhancedCalculations.metThreshold
+                                ? "text-success"
+                                : "text-destructive"
+                          )}
+                        >
+                          {getStatusText(
+                            enhancedCalculations.metThreshold,
+                            enhancedCalculations.approvalRate
+                          )}
+                        </span>
+                      </div>
+                    </>
+                  )}
+
+                {/* Veto Override Warning Badge */}
+                {vetoCheck?.vetoExceedsForVote && !isActive && (
+                  <div className="px-2 py-0.5 rounded-sm text-xs font-medium border flex-shrink-0 bg-destructive/10 border-destructive/20">
+                    <span className="text-destructive">⚠️ Vetoed</span>
+                  </div>
+                )}
+
                 <div className="flex items-center gap-1 text-xs text-foreground/75 flex-shrink-0">
                   <Clock className="h-3 w-3 flex-shrink-0" />
                   <span className="whitespace-nowrap">
@@ -347,28 +469,11 @@ export default function ProposalCard({
             </div>
           )}
 
-          {/* Completed Status */}
-          {/* {isPassed && (
-          <div className="text-sm">
-            <span className="text-foreground/75">Final result: </span>
-            <span className="font-medium">
-              <span className="text-success">
-                <TokenBalance variant="abbreviated" value={votesFor} /> For
-              </span>
-              ,{" "}
-              <span className="text-destructive">
-                <TokenBalance variant="abbreviated" value={votesAgainst} />{" "}
-                Against
-              </span>
-            </span>
-          </div>
-        )} */}
-
-          {/* Enhanced Chart Section for detailed view - Hide for pending proposals */}
+          {/* Vote Status Chart - Show for active, veto period, execution window, passed, and failed proposals */}
           {(isActive ||
             statusConfig.label === "Veto Period" ||
             statusConfig.label === "Execution Window" ||
-            isPassed ||
+            statusConfig.label === "Passed" ||
             statusConfig.label === "Failed") &&
             statusConfig.label !== "Pending" && (
               <div className="">

src/components/proposals/ProposalSubmission.tsx

@@ -264,6 +264,9 @@ export function ProposalSubmission({
   const [xUsernameError, setXUsernameError] = useState<string | null>(null);
   const [xProfile, setXProfile] = useState<XProfile | null>(null);
 
+  // Consent checkbox state
+  const [consentChecked, setConsentChecked] = useState(false);
+
   const { accessToken, isLoading: isSessionLoading, userId } = useAuth();
   const {
     needsXLink,
@@ -811,6 +814,7 @@ export function ProposalSubmission({
         if (isSuccess) {
           setTxStatusView("confirmed-success");
           setTwitterUrl("");
+          setConsentChecked(false);
           // setSelectedAirdropTxHash(null); // Commented out - airdrop feature disabled
         } else if (isFailed) setTxStatusView("confirmed-failure");
 
@@ -1319,6 +1323,28 @@ export function ProposalSubmission({
                 </div>
               </div>
             )}
+
+          {/* Blocked User Lock Overlay */}
+          {hasAccessToken &&
+            !needsXLink &&
+            !isXLoading &&
+            profile?.is_blocked === true && (
+              <div className="absolute inset-0 bg-zinc-900 rounded-sm flex flex-col items-center justify-center z-10">
+                <div className="text-center space-y-4 max-w-md mx-auto px-6">
+                  <div className="w-16 h-16 rounded-sm bg-red-900/20 border border-red-800/30 flex items-center justify-center mx-auto">
+                    <Lock className="w-8 h-8 text-red-400" />
+                  </div>
+                  <div>
+                    <h3 className="text-xl font-bold text-red-300 mb-2">
+                      Account Restricted
+                    </h3>
+                    <p className="text-sm text-red-200/80 leading-relaxed">
+                      Your account is restricted from submitting contributions.
+                    </p>
+                  </div>
+                </div>
+              </div>
+            )}
           {/* Airdrop notification - Commented out per user request */}
           {/* {hasAccessToken && (
             <div className="bg-secondary/40 rounded-sm p-3 shadow-sm">
@@ -1668,6 +1694,28 @@ export function ProposalSubmission({
           </form>
         </div>
 
+        {/* Consent Checkbox - Outside overlays */}
+        {hasAccessToken && (
+          <div className="flex items-start gap-3  rounded-sm">
+            <input
+              type="checkbox"
+              id="consent-checkbox"
+              checked={consentChecked}
+              onChange={(e) => setConsentChecked(e.target.checked)}
+              disabled={isSubmitting || isLoadingExtensions || isLoadingAgents}
+              className="mt-1 h-4 w-4 rounded border-white/10 bg-background text-primary cursor-pointer"
+            />
+            <label
+              htmlFor="consent-checkbox"
+              className="text-sm text-muted-foreground leading-relaxed cursor-pointer select-none"
+            >
+              By submitting, you confirm you obtained consent from everyone
+              identifiable in these photos or videos and authorize AIBTC to
+              share and repost them.
+            </label>
+          </div>
+        )}
+
         {/* Footer CTA */}
         <div className="pt-6">
           {!hasAccessToken ? (
@@ -1679,6 +1727,7 @@ export function ProposalSubmission({
                 disabled={
                   !twitterUrl.trim() ||
                   !isValidTwitterUrl ||
+                  !consentChecked ||
                   isSubmitting ||
                   isValidatingXUsername ||
                   !hasAgentAccount ||
@@ -1694,7 +1743,8 @@ export function ProposalSubmission({
                   isLoadingEmbed ||
                   !twitterEmbedData ||
                   !!xUsernameError ||
-                  !canSubmitContribution
+                  !canSubmitContribution ||
+                  profile?.is_blocked === true
                 }
                 className="bg-primary hover:bg-primary/90 text-primary-foreground font-bold px-6 py-2 text-sm rounded-sm shadow-md hover:shadow-lg transition-all duration-200"
               >
@@ -1746,6 +1796,11 @@ export function ProposalSubmission({
                     <Loader />
                     <span className="break-words">Loading Post Content...</span>
                   </div>
+                ) : profile?.is_blocked === true ? (
+                  <div className="flex items-center gap-2">
+                    <Lock className="w-4 h-4" />
+                    <span>Account Restricted</span>
+                  </div>
                 ) : (
                   <div className="flex items-center gap-2">
                     <Send className="h-4 w-4" />