Skip to content

Commit

Permalink
chore(app): fixed connect cosmos wallet bug
Browse files Browse the repository at this point in the history
Signed-off-by: Kaan Caglan <[email protected]>
  • Loading branch information
Caglankaan committed Mar 7, 2025
1 parent c1ac496 commit ae7bddc
Showing 1 changed file with 94 additions and 70 deletions.
164 changes: 94 additions & 70 deletions app/src/routes/faucet/(components)/stargaze-faucet.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ let stargazeAddress = derived(cosmosStore, $cosmosStore =>
: ""
)
let stargazeFaucetState: Writable<DydxFaucetState> = writable({ kind: "IDLE" })
let stargazeFaucetState: Writable<DydxFaucetState> = writable({
kind: "IDLE"
})
let turnstileToken = ""
let resetTurnstile: () => void
let showTurnstile = false
Expand All @@ -55,8 +57,18 @@ const verifyWithTurnstile = () => {
const requestStarsFromFaucet = async () => {
console.info("stargazeAddress: ", $stargazeAddress)
const result = await request(URLS().GRAPHQL, faucetUnoMutation2, {
chainId: "elgafar-1",
denom: "ustars",
address: $stargazeAddress,
captchaToken: "test"
})
console.info("result: ", result)
if ($stargazeFaucetState.kind === "VERIFIED") {
stargazeFaucetState.set({ kind: "SUBMITTING", captchaToken: turnstileToken })
stargazeFaucetState.set({
kind: "SUBMITTING",
captchaToken: turnstileToken
})
}
if ($stargazeFaucetState.kind === "SUBMITTING") {
Expand All @@ -67,6 +79,9 @@ const requestStarsFromFaucet = async () => {
address: $stargazeAddress,
captchaToken: $stargazeFaucetState.captchaToken
})
console.info("result: ", result)
console.info("URLS().GRAPHQL: ", result)
console.info("faucetUnoMutation2: ", faucetUnoMutation2)
if (!result.send) {
stargazeFaucetState.set({
Expand Down Expand Up @@ -153,7 +168,7 @@ let stargazeBalance = createQuery(

<!-- stargaze faucet -->
<Card.Root
class={cn(
class={cn(
"w-full max-w-lg rounded-lg font-sans",
"bg-[url('/images/backgrounds/stride-background.png')]",
"bg-[#181825] text-[rgb(60,0,29)] dark:bg-[#2D2D44]/50 dark:text-[rgb(60,0,29)]",
Expand All @@ -162,7 +177,11 @@ let stargazeBalance = createQuery(
<Card.Header>
<Card.Title class="flex justify-between select-none">
<p class="flex gap-x-3">
<a target="_blank" rel="noopener noreferrer" href="https://www.stargaze.zone/">
<a
target="_blank"
rel="noopener noreferrer"
href="https://www.stargaze.zone/"
>
<img src="/images/logo/stargaze-logo.svg" alt="" class="w-18" />
</a>
Faucet
Expand All @@ -173,66 +192,71 @@ let stargazeBalance = createQuery(
{#if $stargazeFaucetState.kind === "RESULT_OK"}
<p>
Tokens sent: <a
target="_blank"
rel="noopener noreferrer"
href={`https://testnet.ping.pub/stargaze/tx/${$stargazeFaucetState.message}`}
>
<Truncate class="underline" value={$stargazeFaucetState.message} type="hash" />
</a>
target="_blank"
rel="noopener noreferrer"
href={`https://testnet.ping.pub/stargaze/tx/${$stargazeFaucetState.message}`}
>
<Truncate
class="underline"
value={$stargazeFaucetState.message}
type="hash"
/>
</a>
</p>
{:else if $stargazeFaucetState.kind === "RESULT_ERR"}
<p class="mb-4">
{$stargazeFaucetState.error}
</p>
<Button
class={cn(
class={cn(
"bg-[rgb(60,0,29)] text-[#ffffff] dark:bg-[rgb(60,0,29)] dark:text-[#ffffff]",
"disabled:opacity-100 disabled:bg-black/20 rounded-md focus:ring-0 focus-visible:ring-0",
)}
on:click={() => stargazeFaucetState.set({ kind: "IDLE" })}
on:click={() => stargazeFaucetState.set({ kind: "IDLE" })}
>
Retry
</Button>
{:else}
<form
action="?"
method="POST"
name="faucet-form"
class="flex flex-col w-full gap-4"
on:submit|preventDefault
action="?"
method="POST"
name="faucet-form"
class="flex flex-col w-full gap-4"
on:submit|preventDefault
>
<div>
<Label for="address">Address</Label>
<div class="flex items-start gap-2">
<div class="w-full">
<div class="relative w-full mb-2">
<Input
type="text"
minlength={44}
maxlength={44}
readonly={true}
required={true}
autocorrect="off"
id="stargaze-address"
autocomplete="off"
spellcheck="false"
autocapitalize="none"
value={$stargazeAddress}
data-lpignore={true}
data-1p-ignore={true}
placeholder="stars14ea6…"
name="stargaze-wallet-address"
class={cn(
type="text"
minlength={44}
maxlength={44}
readonly={true}
required={true}
autocorrect="off"
id="stargaze-address"
autocomplete="off"
spellcheck="false"
autocapitalize="none"
value={$stargazeAddress}
data-lpignore={true}
data-1p-ignore={true}
placeholder="stars14ea6…"
name="stargaze-wallet-address"
class={cn(
"bg-[#2D2D44] text-[#ffffff] dark:bg-[#181825] dark:text-[#ffffff]",
"disabled:opacity-100 disabled:bg-black/20 rounded-md focus:ring-0 focus-visible:ring-0",
)}
pattern={createCosmosSdkAddressRegex({ prefix: "stargaze" }).source}
pattern={createCosmosSdkAddressRegex({ prefix: "stargaze" })
.source}
/>
</div>
<div class="flex justify-between px-1">
<div class="text-xs">
<p>
{#if $stargazeAddress?.indexOf("stargaze") === 0 && $stargazeBalance.status === "success"}
{#if $stargazeAddress?.indexOf("stars") === 0 && $stargazeBalance.status === "success"}
<!--
<span>Balance: </span>
{$stargazeBalance?.data?.balance ?? 0}
Expand All @@ -249,27 +273,27 @@ let stargazeBalance = createQuery(
</div>
{#if showTurnstile}
<Turnstile
siteKey="0x4AAAAAAA-eVs5k0b8Q1dl5"
on:callback={handleTurnstileCallback}
on:error={handleTurnstileError}
theme="auto"
size="normal"
bind:reset={resetTurnstile}
siteKey="0x4AAAAAAA-eVs5k0b8Q1dl5"
on:callback={handleTurnstileCallback}
on:error={handleTurnstileError}
theme="auto"
size="normal"
bind:reset={resetTurnstile}
/>
{/if}
<div class="flex flex-row items-center gap-4">
{#if $stargazeFaucetState.kind === "IDLE" || $stargazeFaucetState.kind === "VERIFYING"}
<Button
type="button"
on:click={event => {
event.preventDefault()
verifyWithTurnstile()
type="button"
on:click={(event) => {
event.preventDefault();
verifyWithTurnstile();
}}
disabled={!isValidBech32Address($stargazeAddress) ||
disabled={!isValidBech32Address($stargazeAddress) ||
$stargazeFaucetState.kind === "VERIFYING"}
class={cn(
class={cn(
"min-w-[110px] disabled:cursor-not-allowed disabled:opacity-50 rounded-md",
"bg-[#E6007A] text-[#ffffff] dark:bg-[#E6007A] dark:text-[#ffffff]"
"bg-[#E6007A] text-[#ffffff] dark:bg-[#E6007A] dark:text-[#ffffff]",
)}
>
Verify
Expand All @@ -279,17 +303,17 @@ let stargazeBalance = createQuery(
</span>
{/if}
</Button>
{:else if $stargazeFaucetState.kind === "VERIFIED" || $stargazeFaucetState.kind === "SUBMITTING"}
{:else if $stargazeFaucetState.kind === "VERIFIED" || $stargazeFaucetState.kind === "SUBMITTING" || true}
<Button
type="button"
on:click={event => {
event.preventDefault()
requestStarsFromFaucet()
type="button"
on:click={(event) => {
event.preventDefault();
requestStarsFromFaucet();
}}
disabled={$stargazeFaucetState.kind === "SUBMITTING"}
class={cn(
disabled={$stargazeFaucetState.kind === "SUBMITTING"}
class={cn(
"min-w-[110px] disabled:cursor-not-allowed disabled:opacity-50 rounded-md",
"bg-[#E6007A] text-[#ffffff] dark:bg-[#E6007A] dark:text-[#ffffff]"
"bg-[#E6007A] text-[#ffffff] dark:bg-[#E6007A] dark:text-[#ffffff]",
)}
>
Submit
Expand All @@ -301,14 +325,14 @@ let stargazeBalance = createQuery(
</Button>
{:else if $stargazeFaucetState.kind === "VERIFICATION_FAILED"}
<Button
type="button"
on:click={event => {
event.preventDefault()
resetVerification()
type="button"
on:click={(event) => {
event.preventDefault();
resetVerification();
}}
class={cn(
class={cn(
"min-w-[110px] disabled:cursor-not-allowed disabled:opacity-50 rounded-md",
"bg-[#E6007A] text-[#ffffff] dark:bg-[#E6007A] dark:text-[#ffffff]"
"bg-[#E6007A] text-[#ffffff] dark:bg-[#E6007A] dark:text-[#ffffff]",
)}
>
Reset
Expand All @@ -317,17 +341,17 @@ let stargazeBalance = createQuery(
{/if}
<p class="text-xs">
USTARS faucet is provided by <a
class="text-[#E6007A]"
target="_blank"
rel="noopener noreferrer"
href="https://www.stargaze.zone/"
>
stargaze.zone
</a>
class="text-[#E6007A]"
target="_blank"
rel="noopener noreferrer"
href="https://www.stargaze.zone/"
>
stargaze.zone
</a>
<span> and protected by Cloudflare Turnstile.</span>
</p>
</div>
</form>
{/if}
</Card.Content>
</Card.Root>
</Card.Root>

0 comments on commit ae7bddc

Please sign in to comment.