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

Recovery initialization #1418

Merged
merged 31 commits into from
Aug 23, 2019
Merged

Recovery initialization #1418

merged 31 commits into from
Aug 23, 2019

Conversation

VolkerSchiewe
Copy link

Moving the screen that shows the seed phrase to the settings screen

VolkerSchiewe and others added 22 commits July 24, 2019 10:49
# Conflicts:
#	src/routes.ts
#	src/ui/recovery/container/seedPhrase.tsx
#	src/ui/settings/containers/settings.tsx
JolocomTheme should be imported from the generic theme file, as the
font name is different on iOS and Android.
We are using position relative and absolute to put the mnemonic phrase
in the middle of the screen, using the length of the current word with
an average character length.
There may be a way to calculate the actual rendered length of the word
and use that to position more accurately.
…rase

Fix/recovery/center mnemonic phrase
# Conflicts:
#	src/actions/registration/index.ts
#	src/routes.ts
#	src/ui/landing/containers/landing.tsx
#	src/ui/registration/containers/seedPhrase.tsx
#	src/ui/settings/containers/settings.tsx
#	tests/actions/registration/__snapshots__/index.test.ts.snap
#	tests/ui/containers/__snapshots__/seedPhrase.test.tsx.snap
#	tests/ui/containers/landing.test.tsx
@VolkerSchiewe VolkerSchiewe self-assigned this Aug 21, 2019
# Conflicts:
#	package.json
#	src/actions/generic/index.ts
#	src/routes.ts
This was referenced Aug 21, 2019
@chunningham chunningham assigned saifahn and unassigned saifahn and VolkerSchiewe Aug 22, 2019
@chunningham chunningham requested review from chunningham and removed request for mnzaki and saifahn August 22, 2019 10:37
package.json Show resolved Hide resolved
src/routes.ts Show resolved Hide resolved
src/ui/settings/containers/settings.tsx Outdated Show resolved Hide resolved
# Conflicts:
#	src/routes.ts
#	src/ui/documents/containers/documents.tsx
#	src/ui/home/components/records.tsx
#	src/ui/home/containers/claims.tsx
#	src/ui/recovery/components/seedPhrase.tsx
#	src/ui/settings/components/settings.tsx
#	tests/ui/components/__snapshots__/seedPhrase.test.tsx.snap
#	tests/ui/containers/__snapshots__/claims.test.tsx.snap
# Conflicts:
#	src/ui/home/components/records.tsx
#	src/ui/recovery/components/seedPhrase.tsx
#	tests/ui/components/__snapshots__/seedPhrase.test.tsx.snap
Copy link
Contributor

@chunningham chunningham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noice

@chunningham chunningham merged commit 089e848 into develop Aug 23, 2019
@VolkerSchiewe VolkerSchiewe deleted the 1266/recovery-init branch August 23, 2019 11:11
This was referenced Sep 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants