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

[APP-1105]: Progress on restore from cloud flow #5358

Merged
merged 7 commits into from
Jan 30, 2024

Conversation

walmat
Copy link
Contributor

@walmat walmat commented Jan 26, 2024

Fixes APP-####

What changed (plus any additional context for devs)

Screen recordings / screenshots

What to test

Copy link

linear bot commented Jan 26, 2024

Copy link

socket-security bot commented Jan 26, 2024

New dependencies detected. Learn more about Socket for GitHub ↗︎

Package New capabilities Transitives Size Publisher
npm/@types/react-native-extra-dimensions-android@1.2.3 None 0 3.77 kB types

View full report↗︎

@walmat walmat marked this pull request as ready for review January 30, 2024 21:52
@walmat walmat merged commit e40d909 into @matthew/APP-1049 Jan 30, 2024
3 of 4 checks passed
@walmat walmat deleted the @matthew/APP-1105 branch January 30, 2024 21:52
skylarbarrera added a commit that referenced this pull request Mar 27, 2024
* [APP-1051]: (feat): add backups global config (#5306)

* (feat): add backups global config

* stash

* add migration for setting initial backup method

* add method to migrations array

* revert pbx change

* change backup status value

* [APP-1052]: Add icon to Settings depending on `preferredBackupMethod` and `backupStatus` (#5313)

* [APP-1052]: (feat): adjust settings page row

* fix migration and hook for useWallets

* simplify an if statement

* wallets and backups screen progress (#5315)

* wallets and backups screen progress

* manual backups progress

* progress

* feat(backups): more work on wallets and backups

* revert pbx

* rev init wallet change

* final touches on wallets and backup view

* cleanup unused stuff and progress on backups flow

* backups: warning + new secret phrase styles (#5322)

* save progress

* cleanup and finish secret phrase / private key viewiing screens

---------

Co-authored-by: Matthew Wall <matthew.wallt@gmail.com>

* chore: cleanup WalletsAndBackup settings screen and replace lang with i18n

* android settings fixes

* @matthew/app 1106 (#5359)

* progress on cloud backup flow

* cloud backup flow progress

* [APP-1105]: Progress on restore from cloud flow (#5358)

* progress on restore from cloud

* progress on choose backup flow

* f

* test signed commit

* backups v2 restore from icloud flow done

* progress on restore step

* restore from backup working

* fix UserData.json restoring from other backups

* some cloud backup type improvements

* fix menu item width bug

* bug fixes

* cleanup unused imports from manage cloud backups file

* typescript, lint and cleanup

* fix lint issues

* fix file name casing

* fix import secret phrase or private key image

* fix casing

* android style fixes

* wrap up work

* android stuff

* android bsstack fixes

* more touches

* fixes

* improve spacing on >1 line wallet rows

* fix lint

* @matthew/app 1135 (#5397)

* fix button legibility

* fix manual backup bug

* change log

* fix bug where create wallet sometimes uses the wrong wallet

* add ens avatars to wallets view

* cleanup size

* add more padding to image on settings page

* fix

* fix algo used to calculate account menu item height

* add change drivce accounts for android

* cleanup .android files

* cleanup .android files

* change dev settings sheet title on android

* fix create wallet modal on close opening the create profile sheet

* add menu item being the entire context menu boundary (#5405)

* few small changes

* @matthew/app 1157 (#5406)

* sort wallets

* fix numeric increment and sort wallets by type and backup status

* i18n stuff

* add icons

* ens fix + context menu button color change (#5414)

* skylar did all this (#5409)

* skylar did all this

* change backupProvider to be served from user data and not local wallet state

* fix stuff

* cleanup merge

* add explainer sheet from global backups

* rm console logs

* improve pin screen on android

* some i18n and cloud backup changes

* backups: show back up state (#5420)

* chore: rug portfolio websocket (#5371)

* rug portfolio websocket

* cleanup

* rug it all

---------

Co-authored-by: skylarbarrera <skylar.barrera@gmail.com>

* skylar did all this

* change backupProvider to be served from user data and not local wallet state

* fix stuff

* cleanup merge

* txSim: price clean up (#5411)

* save

* swaps: fix max native check (#5399)

* audit: undici (#5419)

* fin

* clean up

* only save local password if we dont have

* finish piping up title

---------

Co-authored-by: Derek Nelson <6868432+dereknelson@users.noreply.github.com>
Co-authored-by: Matthew Wall <matthew.wallt@gmail.com>

* impl. backing up all wallets at once (#5432)

* progress

* backup all wallets progress

* add some logging

* Update src/screens/Diagnostics/index.tsx

* .

* Fix Android google drive login quirks (#5461)

* fix android stuff

* fix lint

* rev pbx

* /

* Fix Android ShadowStack causing TextInputs to be funky... and not in a fun way (#5478)

* fix some i18n

* add cloudPlatform to description

* mother of god

* undo test changes

* added assets to xcode

* fix files (#5468)

* Add this wallet sheet doesn't dismiss after backing up to iCloud (#5467)

* fix goBack not being called on backup success

* return success

* fix view cloud backups not working (#5466)

* Android only - previous back up with pin code requires a new creation each time to view (#5482)

* temp change

* change validPin flag when biometrics fails to decrypt

* Fixes to Android Google Account Management (#5476)

* lots of android account changing fixes

* remove log

* remove remoteProvider

* i18n

* test signing key

* init (#5507)

* fix android pin flow

* restore to backup changes

* restore changes

* fix lint

* restoration changes

* getprivatekey call changes

* smol cleanup on keychain

* rm log

* fix current backup not being restored into keychain properly

* add keychain logging

* some backups issues solved

* fix some longstanding android old pin decryption and create wallet not prioritizing seed phrases

* remove unused lodash import and console logs

* final restoration changes

* fix backup prompt not working since it wasn't wrapped in the provider

* undo commit to nfts query

* add login if needed on android

* fix no provider modal

* rm xcode assets

* Update src/components/backup/BackupCloudStep.tsx

Co-authored-by: Bruno Barbieri <1247834+brunobar79@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Bruno Barbieri <1247834+brunobar79@users.noreply.github.com>

* remove keychain logging stuff

* fix lint

* fix i18n paths

---------

Co-authored-by: Skylar Barrera <skylar.barrera@gmail.com>
Co-authored-by: Derek Nelson <6868432+dereknelson@users.noreply.github.com>
Co-authored-by: Derek <dereknelsony0@gmail.com>
Co-authored-by: Bruno Barbieri <1247834+brunobar79@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant