Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 8
fix: recovery fallback#885
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
Merged
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
582ac8d
fix: recovery fallback
coodos b9ce760
feat: clear text traffic
coodos c8e34d0
feat: mandate sync after login
coodos 3e10a54
feat: aab & apk build scripts
coodos 6674d0b
fix: scan page styling
coodos 8869921
feat: normalize styling
coodos de290c6
chore: remove the evault delete flow
coodos 0819642
chore: fix lint
coodos File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2 infrastructure/eid-wallet/src-tauri/gen/android/app/build.gradle.kts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 8 additions & 2 deletions
10 infrastructure/eid-wallet/src/lib/ui/BottomSheet/BottomSheet.svelte
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 8 additions & 7 deletions
15 infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/AuthDrawer.svelte
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -32,10 +32,11 @@ $: if (internalOpen !== lastReportedOpen) { | ||
| <BottomSheet | ||
| isOpen={internalOpen} | ||
| dismissible={false} | ||
| fullScreen={true} | ||
| class="gap-5" | ||
| > | ||
coodos marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| <div class="flex min-h-[70svh] w-full flex-col"> | ||
| <div class="flex flex-1 flex-col items-start overflow-y-auto pt-2"> | ||
| <div class="flex h-full w-full flex-col"> | ||
| <div class="min-h-0 flex flex-1 flex-col items-start overflow-y-auto pt-2"> | ||
| <div | ||
| class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]" | ||
| > | ||
| @@ -54,8 +55,8 @@ $: if (internalOpen !== lastReportedOpen) { | ||
| /> | ||
| </div> | ||
| <h4 class="text-xl font-bold">Code scanned!</h4> | ||
| <p class="text-black-700 text-sm mt-1"> | ||
| <h4 class="text-lg font-bold">Code scanned!</h4> | ||
| <p class="mt-1 text-sm leading-relaxed text-black-700"> | ||
| Please review the connection details below. | ||
| </p> | ||
| @@ -65,7 +66,7 @@ $: if (internalOpen !== lastReportedOpen) { | ||
| <table class="w-full border-collapse"> | ||
| <tbody class="divide-y divide-gray-200"> | ||
| <tr> | ||
| <td class="py-4 px-4"> | ||
| <td class="align-top py-4 px-4"> | ||
| <div | ||
| class="text-xs font-semibold text-black-500 uppercase tracking-wider block" | ||
| > | ||
| @@ -80,7 +81,7 @@ $: if (internalOpen !== lastReportedOpen) { | ||
| </tr> | ||
| <tr> | ||
| <td class="py-4 px-4"> | ||
| <td class="align-top py-4 px-4"> | ||
| <div | ||
| class="text-xs font-semibold text-black-500 uppercase tracking-wider block" | ||
| > | ||
| @@ -128,7 +129,7 @@ $: if (internalOpen !== lastReportedOpen) { | ||
| {/if} | ||
| </div> | ||
| <div class="mt-auto flex w-full flex-col gap-3 pb-2 pt-6"> | ||
| <div class="shrink-0 flex w-full flex-col gap-3 pb-2 pt-6"> | ||
| <div | ||
| class="flex flex-col justify-center gap-3 items-center w-full" | ||
| > | ||
11 changes: 6 additions & 5 deletions
11 infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/LoggedInDrawer.svelte
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 9 additions & 8 deletions
17 infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/RevealDrawer.svelte
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -32,10 +32,11 @@ $: if (internalOpen !== lastReportedOpen) { | ||
| <BottomSheet | ||
| isOpen={internalOpen} | ||
| dismissible={false} | ||
| fullScreen={true} | ||
| class="gap-5" | ||
| > | ||
coodos marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| <div class="flex min-h-[70svh] w-full flex-col"> | ||
| <div class="flex flex-1 flex-col items-start overflow-y-auto pt-2"> | ||
| <div class="flex h-full w-full flex-col"> | ||
| <div class="min-h-0 flex flex-1 flex-col items-start overflow-y-auto pt-2"> | ||
| <div | ||
| class="flex justify-center mb-4 relative items-center overflow-hidden {revealSuccess | ||
| ? 'bg-green-100' | ||
| @@ -63,10 +64,10 @@ $: if (internalOpen !== lastReportedOpen) { | ||
| </div> | ||
| {#if revealSuccess && revealedVoteData} | ||
| <h4 class="text-xl font-bold text-green-800"> | ||
| <h4 class="text-lg font-bold text-green-800"> | ||
| Vote Decrypted | ||
| </h4> | ||
| <p class="text-black-700 mt-1"> | ||
| <p class="mt-1 text-sm leading-relaxed text-black-700"> | ||
| Your selection has been successfully retrieved. | ||
| </p> | ||
| @@ -93,8 +94,8 @@ $: if (internalOpen !== lastReportedOpen) { | ||
| </div> | ||
| </div> | ||
| {:else} | ||
| <h4 class="text-xl font-bold">Reveal Your Blind Vote</h4> | ||
| <p class="text-black-700 mt-1"> | ||
| <h4 class="text-lg font-bold">Reveal Your Blind Vote</h4> | ||
| <p class="mt-1 text-sm leading-relaxed text-black-700"> | ||
| Please review the request details below. | ||
| </p> | ||
| @@ -105,7 +106,7 @@ $: if (internalOpen !== lastReportedOpen) { | ||
| <table class="w-full border-collapse"> | ||
| <tbody class="divide-y divide-gray-200"> | ||
| <tr> | ||
| <td class="py-4 px-4"> | ||
| <td class="align-top py-4 px-4"> | ||
| <div | ||
| class="text-xs font-semibold text-black-500 uppercase tracking-wider block" | ||
| > | ||
| @@ -145,7 +146,7 @@ $: if (internalOpen !== lastReportedOpen) { | ||
| {/if} | ||
| </div> | ||
| <div class="mt-auto flex w-full flex-col gap-3 pb-2 pt-6"> | ||
| <div class="shrink-0 flex w-full flex-col gap-3 pb-2 pt-6"> | ||
| {#if revealSuccess} | ||
| <Button.Action | ||
| variant="solid" | ||
19 changes: 10 additions & 9 deletions
19 infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/SigningDrawer.svelte
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 8 additions & 7 deletions
15 infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/SocialBindingDrawer.svelte
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4 infrastructure/eid-wallet/src/routes/(auth)/e-passport/+page.svelte
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -16,10 +16,14 @@ const handleFinish = async () => { | ||
| const recovery = get(pendingRecovery); | ||
| if (recovery) { | ||
| localStorage.setItem(RECOVERY_SKIP_PROFILE_SETUP_KEY, "true"); | ||
| // Recovery can happen on a fresh device, so make sure a key exists | ||
| // and is synced immediately before entering the app. | ||
| await globalState.walletSdkAdapter.ensureKey("default", "onboarding"); | ||
| globalState.vaultController.vault = { | ||
| uri: recovery.uri, | ||
| ename: recovery.ename, | ||
| }; | ||
| await globalState.vaultController.syncPublicKey(recovery.ename); | ||
| pendingRecovery.set(null); | ||
coodos marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| } | ||
| await goto("/main"); | ||
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.