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

Fix/daef 301 Importing a wallet from a file #439

Merged
merged 13 commits into from
Aug 30, 2017

Conversation

tomislavhoracek
Copy link
Contributor

@tomislavhoracek tomislavhoracek commented Aug 25, 2017

This PR introduces integration of "wallet name" field and updated API endpoint for importing wallet.

TODOs

  • Inject working default-wallet.json file to be used in acceptance tests
  • Inspect acceptance tests (currently import-wallet acceptance test are failing due to the fact that current import endpoint doesn't accept .key files)
  • Once API endpoint is updated check if importBackupJSON endpoint flow-type declaration is correct: API update delayed
declare function importBackupJSON(tls: TlsConfig, filePath: string, walletPassword: ?string, walletName: ?string): Promise<ApiWallet>;
  • Inject updated Japanese translation (on import dialog label for wallet file has been changed from "Upload your key file" to "Import file")
"wallet.file.import.dialog.walletFileLabel": "Import file"
  • Make sure this feature is working both with wallet JSON and wallet key file after API has been updated API update delayed
  • Handle imports of both .key and .json files in the Front-End
  • Add error handling for 'Wallet already imported' case - this is error response for that case:
Wallet with id LaVWX1....V2UtYartph9kL already exists
  • Inject missing/updated Japanese translations:
"api.errors.WalletAlreadyImportedError": "Wallet you are trying to import already exists."
"api.errors.WalletAlreadyRestoredError": "Wallet you are trying to restore already exists."
"api.errors.WalletFileImportError": "Wallet could not be imported, please make sure you are providing a correct file."
"wallet.add.dialog.import.description": "Import wallet from a file"

import wallet

…ing-a-wallet-from-a-file

# Conflicts:
#	CHANGELOG.md
#	app/i18n/locales/ja-JP.json
Copy link
Contributor

@darko-mijic darko-mijic left a comment

Choose a reason for hiding this comment

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

Looks great! And it works. ;)

@darko-mijic darko-mijic merged commit c70bd45 into master Aug 30, 2017
@darko-mijic darko-mijic deleted the fix/daef-301-importing-a-wallet-from-a-file branch August 30, 2017 01:55
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.

3 participants