Skip to content

Commit

Permalink
Merge pull request #303 from OlegMakarenko/hotfix/upgrade-sdk-fix-backup
Browse files Browse the repository at this point in the history
hotfix: fix corrupted paper-wallet backup and sdk upgrade
  • Loading branch information
OlegMakarenko authored Jan 27, 2022
2 parents 7328238 + 44fec5c commit 41040c6
Show file tree
Hide file tree
Showing 8 changed files with 358 additions and 254 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@ All notable changes to this project will be documented in this file.

The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [v1.4.0][v1.4.0] - 12-Nov-2021
## [v1.4.1][v1.4.1] - 27-Jan-2022
### Fixed
- Corrupted Paper Wallet Backup. [#284](https://github.com/symbol/mobile-wallet/issues/284)
- Backup saving error. [#145](https://github.com/symbol/mobile-wallet/issues/145)
### Changed
- Upgraded the dependency `symbol-sdk` version to `v1.0.3`.

## [v1.4.0][v1.4.0] - 12-Nov-2021
### Fixed
- Fixed behavior when node is down and application crashes[#259](https://github.com/symbol/mobile-wallet/issues/259)
- Fixed fees selector problems when recipient address is not provided [#254](https://github.com/symbol/mobile-wallet/issues/254)
Expand Down Expand Up @@ -38,3 +44,4 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
[v1.2]: https://github.com/symbol/mobile-wallet/releases/tag/1.2
[v1.3.0]: https://github.com/symbol/mobile-wallet/releases/tag/1.3.0
[v1.4.0]: https://github.com/symbol/mobile-wallet/releases/tag/1.4.0
[v1.4.1]: https://github.com/symbol/mobile-wallet/releases/tag/1.4.1
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This application is built on `React Native` and therefore assumes you have all t
### Prerequisites

- The **default network configuration** is fetched from the `env/default.json` file, and as part of the first-time setup, you should provide these. Check the `env/default.json.example` file to see what keys are required.
- Node version should be **10.xx.x** [A slight limitation because of [realmjs](https://github.com/realm/realm-js) dependency]
- Node version should be **12.1.0** or above.
- [Hermes](https://hermesengine.dev/) is disabled [because of Realm dependency]
- Android hosts 2 different product flavors - `dev` and `prod`, so you will need to specify this when building/releasing the application for android.
- [Yarn](https://yarnpkg.com/en/) is preferred over **NPM** as a package manager.
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

<application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
<application android:usesCleartextTraffic="true" android:requestLegacyExternalStorage="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
</manifest>
1 change: 1 addition & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:allowBackup="false"
android:usesCleartextTraffic="true"
android:requestLegacyExternalStorage="true"
android:theme="@style/AppTheme">
<meta-data android:name="com.dieam.reactnativepushnotification.notification_channel_name"
android:value="Nem Catapult Wallet"/>
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "symbol-mobile-wallet",
"version": "1.4.0",
"version": "1.4.1",
"private": true,
"scripts": {
"git-info": "echo export default \"{ version: '$(git describe --tags `git rev-list --tags --max-count=1`)' };\" > src/shared/_git_commit.js",
Expand Down Expand Up @@ -95,7 +95,7 @@
"react-redux": "^7.2.1",
"react-zlib-js": "^1.0.4",
"readable-stream": "^3.4.0",
"realm": "4.0.0-beta.0",
"realm": "6.0.1",
"redux": "^4.0.5",
"redux-thunk": "^2.3.0",
"regenerator": "0.9.7",
Expand All @@ -109,10 +109,10 @@
"string_decoder": "~0.10.25",
"symbol-address-book": "^1.0.0",
"symbol-hd-wallets": "0.14.1-alpha-202103051108",
"symbol-paper-wallets": "^1.0.2",
"symbol-post-launch-optin-module": "1.0.1",
"symbol-qr-library": "0.14.1-alpha-202103081047",
"symbol-sdk": "1.0.2-alpha-202108061451",
"symbol-sdk": "1.0.3",
"symbol-wallets-lib": "0.1.0",
"timers-browserify": "^1.0.1",
"tls-browserify": "^0.2.2",
"tty-browserify": "0.0.0",
Expand Down
4 changes: 2 additions & 2 deletions scripts/fix-qr-code-workaround.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ fs.readFile(MAIN_FILE_PATH, 'utf8', function(err, data) {
});
});

const MODULE_FILE_PATH = __dirname + '/../node_modules/symbol-paper-wallets/node_modules/symbol-qr-library/dist/src/QRCode.js';
const MODULE_FILE_PATH = __dirname + '/../node_modules/symbol-wallets-lib/node_modules/symbol-qr-library/dist/src/QRCode.js';

if (fs.existsSync(MODULE_FILE_PATH)) {
fs.readFile(MODULE_FILE_PATH, 'utf8', function(err, data) {
const formatted = data.replace(/require\("qrcode"\)/g, 'require("qrcode/lib")');

fs.writeFile(MODULE_FILE_PATH, formatted, 'utf8', function(err) {
if (err) return console.log(err);
else console.log('[+] Fixed QR Code under paper-wallets module...');
else console.log('[+] Fixed QR Code under symbol-wallets-lib module...');
});
});
}
2 changes: 1 addition & 1 deletion src/services/AccountService.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import type { AppNetworkType, NetworkModel } from '@src/storage/models/NetworkMo
import type { MosaicModel } from '@src/storage/models/MosaicModel';
import { AccountSecureStorage } from '@src/storage/persistence/AccountSecureStorage';
import MosaicService from '@src/services/MosaicService';
import { SymbolPaperWallet } from 'symbol-paper-wallets';
import { SymbolPaperWallet } from 'symbol-wallets-lib';
import { getAccountIndexFromDerivationPath } from '@src/utils/format';

export default class AccountService {
Expand Down
Loading

0 comments on commit 41040c6

Please sign in to comment.