Skip to content
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.

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

chore: balance migration card follow up #594

Merged
merged 3 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
48 changes: 0 additions & 48 deletions frontend/src/components/icons/SelfCustodyIcon.tsx

This file was deleted.

21 changes: 1 addition & 20 deletions frontend/src/screens/Intro.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import React, { ReactElement } from "react";
import { useNavigate } from "react-router-dom";
import Cloud from "src/assets/images/cloud.png";
import Cloud2 from "src/assets/images/cloud2.png";
import { SelfCustodyIcon } from "src/components/icons/SelfCustodyIcon";
import { Button } from "src/components/ui/button";
import {
Carousel,
Expand Down Expand Up @@ -88,14 +87,6 @@ export function Intro() {
</div>
</div>
</CarouselItem>
<CarouselItem>
<Slide
api={api}
icon={SelfCustodyIcon}
title="Take Self-Custody in One Click"
description="Easily move your funds from Alby hosted balance to your own, self-custodial wallet."
/>
</CarouselItem>
<CarouselItem>
<Slide
api={api}
Expand Down Expand Up @@ -152,17 +143,7 @@ function Slide({

return (
<div className="flex flex-col justify-center items-center h-screen gap-8 p-5">
{Icon === SelfCustodyIcon ? (
<Icon
width="211"
height="64"
viewBox="0 0 211 64"
strokeWidth="0"
className="text-primary-background"
/>
) : (
<Icon className="w-16 h-16 text-primary-background" />
)}
<Icon className="w-16 h-16 text-primary-background" />
<div className="flex flex-col gap-4 text-center items-center max-w-lg">
<div className="text-3xl font-semibold text-primary-background">
{title}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/screens/channels/Channels.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ export default function Channels() {
albyBalance={albyBalance}
reloadAlbyBalance={reloadAlbyBalance}
>
Transfer
Migrate
</TransferFundsButton>
</CardFooter>
</Card>
Expand Down
17 changes: 7 additions & 10 deletions frontend/src/screens/wallet/index.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import {
AlertTriangle,
ArrowDownIcon,
ArrowLeftRight,
ArrowUpIcon,
CreditCard,
} from "lucide-react";
import { Link } from "react-router-dom";
import AppHeader from "src/components/AppHeader";
import BreezRedeem from "src/components/BreezRedeem";
import ExternalLink from "src/components/ExternalLink";
import { SelfCustodyIcon } from "src/components/icons/SelfCustodyIcon";
import Loading from "src/components/Loading";
import TransactionsList from "src/components/TransactionsList";
import { TransferFundsButton } from "src/components/TransferFundsButton";
Expand Down Expand Up @@ -43,16 +43,13 @@ function Wallet() {
{showMigrateCard && (
<div className="flex flex-1 items-center justify-center rounded-lg border border-dashed shadow-sm p-8">
<div className="flex flex-col items-center gap-1 text-center max-w-md">
<SelfCustodyIcon
width="211"
height="64"
viewBox="0 0 211 64"
strokeWidth="0"
className="text-primary-background"
/>
<ArrowLeftRight className="w-10 h-10 text-primary-background" />
<h3 className="mt-4 text-lg font-semibold">
Your funds ({new Intl.NumberFormat().format(albyBalance.sats)}{" "}
sats) are still hosted by Alby.
You still have{" "}
<span className="font-bold">
{new Intl.NumberFormat().format(albyBalance.sats)}
</span>{" "}
sats in your Alby shared wallet
</h3>
<p className="text-sm text-muted-foreground mb-4">
{channels && channels.length > 0
Expand Down
Loading