Skip to content

Commit b9967c7

Browse files
authored
Merge branch 'main' into task-1
2 parents 7815445 + 8a3e778 commit b9967c7

2 files changed

Lines changed: 4 additions & 13 deletions

File tree

src/components/layout/Footer.tsx

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
<<<<<<< HEAD
21
/**
32
* Shared Footer Component.
43
* Contains copyright information, primary resource links, and social media integrations.
54
* Automatically sticks to the bottom of the viewport via flexbox in the layout.
65
*/
7-
=======
86
"use client";
97

108
import React from "react";
119
import { ExternalLink } from "lucide-react";
1210
import NetworkToggle from "../NetworkToggle";
1311
import Icon from "../ui/Icon";
14-
>>>>>>> upstream/main
1512

1613
import React from "react";
1714
import { ExternalLink, Twitter, Github, Mail } from "lucide-react";
@@ -21,21 +18,17 @@ import Link from "next/link";
2118
* A consistent footer for all TradeFlow pages.
2219
*/
2320
export default function Footer() {
24-
<<<<<<< HEAD
2521
// --- Configuration ---
2622
const currentYear = new Date().getFullYear();
27-
=======
2823
const handleClearCache = () => {
2924
localStorage.clear();
3025
sessionStorage.clear(); // Good measure for QA
3126
alert("App data cleared. Please refresh the page.");
3227
};
33-
>>>>>>> upstream/main
3428

3529
return (
3630
<footer className="bg-slate-900 border-t border-slate-800 py-12 px-8 mt-auto" role="contentinfo">
3731
<div className="max-w-7xl mx-auto">
38-
<<<<<<< HEAD
3932
<div className="flex flex-col lg:flex-row justify-between items-start lg:items-center gap-12 lg:gap-8">
4033

4134
{/* Brand Info */}
@@ -122,7 +115,6 @@ export default function Footer() {
122115
<div className="w-1.5 h-1.5 rounded-full bg-emerald-500 shadow-[0_0_8px_rgba(16,185,129,0.5)]" />
123116
Network Status: Operational
124117
</div>
125-
=======
126118
<div className="flex flex-col md:flex-row justify-between items-center gap-4">
127119

128120
<div className="flex items-center gap-4">
@@ -179,16 +171,12 @@ export default function Footer() {
179171
<span className="text-slate-400 text-sm">Systems Operational</span>
180172
</div>
181173

182-
>>>>>>> upstream/main
183174
</div>
184175
</div>
185176
</footer>
186177
);
187178
}
188-
<<<<<<< HEAD
189179

190-
=======
191180
// Inconsequential change for repo health
192181

193182
// Maintenance: minor update
194-
>>>>>>> upstream/main

src/lib/stellar.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ import {
1818
// Re-export WalletType for backward compatibility
1919
export { WalletType };
2020

21-
// Default to Testnet for development
21+
/**
22+
* The RPC endpoint for the Stellar network.
23+
* Currently defaults to the public Soroban Testnet.
24+
*/
2225
const RPC_URL = "https://soroban-testnet.stellar.org";
2326

2427
/**

0 commit comments

Comments
 (0)