Skip to content

Commit

Permalink
Sync from main to dev (#119)
Browse files Browse the repository at this point in the history
  • Loading branch information
jrwbabylonlab authored Aug 30, 2024
2 parents 90423a7 + ad8b11d commit 54e887f
Show file tree
Hide file tree
Showing 14 changed files with 32 additions and 1,953 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simple-staking",
"version": "0.2.42",
"version": "0.2.43",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down
14 changes: 6 additions & 8 deletions src/app/components/Footer/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import { GoHome } from "react-icons/go";
import { IoMdBook } from "react-icons/io";
import { MdAlternateEmail, MdForum } from "react-icons/md";

import { useTerms } from "@/app/context/Terms/TermsContext";

const iconLinks = [
{
name: "Website",
Expand Down Expand Up @@ -68,20 +66,20 @@ const iconLinks = [
interface FooterProps {}

export const Footer: React.FC<FooterProps> = () => {
const { openTerms } = useTerms();

return (
<div className="container mx-auto flex flex-col items-center">
<div className="w-24">
<div className="divider my-1" />
</div>
<div className="flex justify-center gap-8 p-2">
<button
onClick={openTerms}
className="transition-colors hover:text-primary cursor-pointer btn btn-link no-underline text-base-content"
<a
href="https://babylonlabs.io/terms-of-use"
target="_blank"
rel="noopener noreferrer"
className="transition-colors hover:text-primary"
>
Terms of Use
</button>
</a>
</div>
<div className="flex flex-wrap justify-center gap-8 p-4 pt-2 md:flex-row md:p-6 md:pt-2">
{iconLinks.map(({ name, url, Icon }) => (
Expand Down
25 changes: 12 additions & 13 deletions src/app/components/Modals/ConnectModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import { IoMdClose } from "react-icons/io";
import { PiWalletBold } from "react-icons/pi";
import { Tooltip } from "react-tooltip";

import { usePrivacy } from "@/app/context/Privacy/PrivacyContext";
import { useTerms } from "@/app/context/Terms/TermsContext";
import { getNetworkConfig } from "@/config/network.config";
import { BROWSER_INJECTED_WALLET_NAME, walletList } from "@/utils/wallet/list";
import { WalletProvider } from "@/utils/wallet/wallet_provider";
Expand Down Expand Up @@ -42,9 +40,6 @@ export const ConnectModal: React.FC<ConnectModalProps> = ({
// And whether or not it should be injected
const BROWSER = "btcwallet";

const { openTerms } = useTerms();
const { openPrivacy } = usePrivacy();

useEffect(() => {
const fetchWalletProviderDetails = async () => {
// Check if the browser wallet is injectable
Expand Down Expand Up @@ -157,19 +152,23 @@ export const ConnectModal: React.FC<ConnectModalProps> = ({
/>
<span className="label-text">
I certify that I have read and accept the updated{" "}
<button
onClick={openTerms}
className="cursor-pointer btn btn-link px-0 h-auto min-h-0"
<a
href="https://babylonlabs.io/terms-of-use"
target="_blank"
rel="noopener noreferrer"
className="link link-primary"
>
Terms of Use
</button>
</a>
{" and "}
<button
onClick={openPrivacy}
className="cursor-pointer btn btn-link px-0 h-auto min-h-0"
<a
href="https://babylonlabs.io/privacy-policy"
target="_blank"
rel="noopener noreferrer"
className="link link-primary"
>
Privacy Policy
</button>
</a>
.
</span>
</label>
Expand Down
30 changes: 0 additions & 30 deletions src/app/components/Modals/Privacy/PrivacyModal.tsx

This file was deleted.

Loading

0 comments on commit 54e887f

Please sign in to comment.