Skip to content

fix oisy and show wallet popup info #136

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.

Sign up for GitHub

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

Merged
evanmcfarland merged 1 commit into from
Nov 11, 2025
Merged

fix oisy and show wallet popup info #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
244 changes: 110 additions & 134 deletions src/alex_frontend/src/features/login/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,144 +93,126 @@ const Login:React.FC<LoginProps> = ({ fullpage = false }) => {
<div className="space-y-6 w-full">
{/* Native Wallets Section */}
<div className="space-y-3">
<div className="flex items-center gap-2 text-muted dark:text-primary ">
<Wallet className="w-5 h-5" />
<h2 className="text-lg font-semibold">
Native Wallets
</h2>
</div>

{/* Internet Identity Card */}
<div
className="border border-border rounded-lg p-4 bg-gradient-to-br from-background to-muted/30 hover:border-primary transition-colors cursor-pointer group"
onClick={() =>
ii.login({
derivationOrigin: "https://yj5ba-aiaaa-aaaap-qkmoa-cai.icp0.io",
identityProvider: process.env.DFX_NETWORK === "local" ? `http://${process.env.CANISTER_ID_INTERNET_IDENTITY}.localhost:4943`: "https://id.ai",
})
}
>
<div className="flex items-center justify-between mb-3">
<div className="flex items-center gap-2">
<img
src="/images/ic.svg"
alt="Internet Identity"
className="w-8 h-8"
/>
<div>
<h3 className="font-semibold text-base">
Internet Identity
</h3>
<p className="text-xs text-muted-foreground">
Secure authentication
powered by DFINITY
</p>
</div>
</div>
<ArrowRight className="w-4 h-4 text-muted-foreground group-hover:text-primary transition-colors" />
</div>

<div className="flex items-center gap-1 text-xs text-muted-foreground mb-3">
<Shield className="w-3 h-3" />
<span>No password required</span>
<div className="space-y-1">
<div className="flex items-center gap-2 text-muted dark:text-primary ">
<Wallet className="w-5 h-5" />
<h2 className="text-lg font-semibold">
Native Wallets
</h2>
</div>
<p className="text-sm text-muted-foreground">
Internet Computer native authentication methods with seamless integration
</p>
</div>

{/* Footer with four wallets */}
<div className="flex gap-2">
<Button
onClick={(e) => {
e.stopPropagation();
nfid.login()
}}
variant="outline"
className="flex-1 h-12 flex items-center justify-center gap-2 border border-border hover:border-primary transition-colors text-xs"
>
<img
src="/images/nfid-logo.png"
alt="NFID"
className="w-5 h-5"
/>
<span className="text-sm font-medium">
NFID
</span>
</Button>

<Button
onClick={(e) => {
e.stopPropagation();
ii.login({
derivationOrigin: "https://yj5ba-aiaaa-aaaap-qkmoa-cai.icp0.io",
identityProvider: process.env.DFX_NETWORK === "local" ? `http://${process.env.CANISTER_ID_INTERNET_IDENTITY}.localhost:4943`: "https://identity.ic0.app",
})
<div className="flex gap-3">
<Button
onClick={() =>
ii.login({
derivationOrigin: "https://yj5ba-aiaaa-aaaap-qkmoa-cai.icp0.io",
identityProvider: process.env.DFX_NETWORK === "local" ? `http://${process.env.CANISTER_ID_INTERNET_IDENTITY}.localhost:4943`: "https://id.ai",
})
}
variant="outline"
className="flex-1 h-12 flex items-center justify-center gap-2 border border-border hover:border-primary transition-colors"
>
<img
src="/images/ic.svg"
alt="Internet Identity 2.0"
className="w-5 h-5"
/>
<span className="text-sm font-medium">
Internet Identity 2.0
</span>
</Button>

}}
variant="outline"
className="flex-1 h-12 flex items-center justify-center gap-2 border border-border hover:border-primary transition-colors text-xs"
>
<img
src="/images/ic.svg"
alt="Internet Identity Legacy"
className="w-5 h-5"
/>
<span className="text-sm font-medium">
II (Legacy)
</span>
</Button>
<Button
onClick={() =>
ii.login({
derivationOrigin: "https://yj5ba-aiaaa-aaaap-qkmoa-cai.icp0.io",
identityProvider: process.env.DFX_NETWORK === "local" ? `http://${process.env.CANISTER_ID_INTERNET_IDENTITY}.localhost:4943`: "https://identity.ic0.app",
})
}
variant="outline"
className="flex-1 h-12 flex items-center justify-center gap-2 border border-border hover:border-primary transition-colors"
>
<img
src="/images/ic.svg"
alt="Internet Identity Legacy"
className="w-5 h-5"
/>
<span className="text-sm font-medium">
Internet Identity (Legacy)
</span>
</Button>

<Button
onClick={(e) => {
e.stopPropagation();
oisy.login();
}}
variant="outline"
className="flex-1 h-12 flex items-center justify-center gap-2 border border-border hover:border-primary transition-colors text-xs"
>
<img
src="/images/oisy-logo.svg"
alt="OISY"
className="w-5 h-5"
/>
<span className="text-sm font-medium">
OISY
</span>
</Button>
<Button
onClick={() => nfid.login()}
variant="outline"
className="flex-1 h-12 flex items-center justify-center gap-2 border border-border hover:border-primary transition-colors"
>
<img
src="/images/nfid-logo.png"
alt="NFID"
className="w-5 h-5"
/>
<span className="text-sm font-medium">
NFID
</span>
</Button>

<Button
onClick={(e) => {
e.stopPropagation();
plug.login();
}}
variant="outline"
className="flex-1 h-12 flex items-center justify-center gap-2 border border-border hover:border-primary transition-colors text-xs"
>
<img
src="/images/plug-logo.png"
alt="Plug"
className="dark:bg-white w-5 h-5"
/>
<span className="text-sm font-medium">
Plug
</span>
</Button>
</div>
<Button
onClick={() => plug.login()}
variant="outline"
className="flex-1 h-12 flex items-center justify-center gap-2 border border-border hover:border-primary transition-colors"
>
<img
src="/images/plug-logo.png"
alt="Plug"
className="dark:bg-white w-5 h-5"
/>
<span className="text-sm font-medium">
Plug
</span>
</Button>
</div>
</div>

{/* Cross-chain Section */}
<div className="space-y-3">
<div className="text-muted dark:text-primary flex items-center gap-2">
<Globe className="w-5 h-5" />
<h2 className="text-lg font-semibold">
Cross-chain
</h2>
{/* External Wallets Section */}
<div className="space-y-4">
<div className="space-y-1">
<div className="text-muted dark:text-primary flex items-center gap-2">
<Globe className="w-5 h-5" />
<h2 className="text-lg font-semibold">
External Wallets
</h2>
</div>
<p className="text-sm text-muted-foreground">
Connect with external wallets through secure identity delegation.<br />
<span className="text-xs text-muted-foreground/80 italic">
Tip: If nothing happens, make sure your wallet extension (e.g. MetaMask, Phantom, or Wander) is installed, unlocked, and allowed to open pop-ups.
</span>
</p>
</div>

<div className="flex gap-3">
<Button
onClick={(e) =>{
e.stopPropagation();
ethereum.login()
}}
onClick={() => oisy.login()}
variant="outline"
className="flex-1 h-12 flex items-center justify-center gap-2 border border-border hover:border-primary transition-colors"
>
<img
src="/images/oisy-logo.svg"
alt="OISY"
className="w-5 h-5"
/>
<span className="text-sm font-medium">
OISY
</span>
</Button>

<Button
onClick={() => ethereum.login()}
variant="outline"
className="flex-1 h-12 flex items-center justify-center gap-2 border border-border hover:border-primary transition-colors"
>
Expand All @@ -245,10 +227,7 @@ const Login:React.FC<LoginProps> = ({ fullpage = false }) => {
</Button>

<Button
onClick={(e) =>{
e.stopPropagation()
solana.login()
}}
onClick={() => solana.login()}
variant="outline"
className="flex-1 h-12 flex items-center justify-center gap-2 border border-border hover:border-primary transition-colors"
>
Expand Down Expand Up @@ -278,10 +257,7 @@ const Login:React.FC<LoginProps> = ({ fullpage = false }) => {
</Button>

<Button
onClick={(e) =>{
e.stopPropagation();
arweave.login()
}}
onClick={() => arweave.login()}
variant="outline"
className="flex-1 h-12 flex items-center justify-center gap-2 border border-border hover:border-primary transition-colors"
>
Expand Down
2 changes: 1 addition & 1 deletion src/alex_frontend/src/lib/ic-use-identity/hooks/useOisy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ export function useOisy() {
windowOpenerFeatures: "width=400,height=650,left=100,top=100",
});

const signer = new Signer({ transport , derivationOrigin: "https://yj5ba-aiaaa-aaaap-qkmoa-cai.icp0.io"});
const signer = new Signer({ transport });

const owner = await connectWallet(signer);

Expand Down