hotfix/replace pretty addresses with plain ones (#307)

* task: replace pretty addresses with plain ones * task: update changelog * task: fix changelog
symbol · Feb 1, 2022 · 618ecdf · 618ecdf
1 parent 41040c6
commit 618ecdf
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,11 +3,12 @@ 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.1][v1.4.1] - 27-Jan-2022
+## [v1.4.1][v1.4.1] - 1-Feb-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
+- Removed dashes from addresses. [#296](https://github.com/symbol/mobile-wallet/issues/296)
 - Upgraded the dependency `symbol-sdk` version to `v1.0.3`.
 
 ## [v1.4.0][v1.4.0] - 12-Nov-2021

diff --git a/src/components/controls/InputAddress.js b/src/components/controls/InputAddress.js
@@ -58,7 +58,7 @@ class InputAccount extends Component<Props, State> {
             const contactQR = ContactQR.fromJSON(res.data);
             const { network } = this.props;
             const networkType = NetworkService.getNetworkTypeFromModel(network);
-            this.props.onChangeText(PublicAccount.createFromPublicKey(contactQR.accountPublicKey, networkType).address.pretty());
+            this.props.onChangeText(PublicAccount.createFromPublicKey(contactQR.accountPublicKey, networkType).address.plain());
             return;
         } catch (e) {
             console.log(e);

diff --git a/src/screens/PostLaunchOptIn/OptInAccountDetails.js b/src/screens/PostLaunchOptIn/OptInAccountDetails.js
@@ -136,7 +136,7 @@ class OptInAccountDetails extends Component<Props, State> {
                             <Text type={'bold'} theme={'light'}>
                                 {translate('optin.destination')}
                             </Text>
-                            <CopyView>{publicAccount.address.pretty()}</CopyView>
+                            <CopyView>{publicAccount.address.plain()}</CopyView>
                         </Section>
                     )}
                     <Section type="form-item">

diff --git a/src/screens/PostLaunchOptIn/OptInReview.js b/src/screens/PostLaunchOptIn/OptInReview.js
@@ -91,7 +91,7 @@ class OptInReview extends Component<Props, State> {
             data = {
                 optinAddress: selectedNIS1Account.address,
                 optinNIS1Multisig: selectedNIS1MultisigAccount,
-                optinMultisigDestination: publicAccount.address.pretty(),
+                optinMultisigDestination: publicAccount.address.plain(),
                 // optinCosigner: AccountService.getAddressByAccountModelAndNetwork(selectedSymbolAccount, network),
             };
         } else {

diff --git a/src/screens/PostLaunchOptIn/OptInSelectSymbolAccount.js b/src/screens/PostLaunchOptIn/OptInSelectSymbolAccount.js
@@ -78,7 +78,7 @@ class OptInSelectSymbolAccount extends Component<Props, State> {
                             {translate('optin.destinationMultisigAccount')}
                         </Text>
                         <Text style={styles.titleText} theme="light" type={'regular'} align={'left'}>
-                            {publicAccount.address.pretty()}
+                            {publicAccount.address.plain()}
                         </Text>
                         <Text style={styles.titleText} theme="light" type={'bold'} align={'left'}>
                             {translate('optin.selectCosignerSymbolDescription')}

diff --git a/src/screens/PostLaunchOptIn/OptInSelectSymbolMultisigDestination.js b/src/screens/PostLaunchOptIn/OptInSelectSymbolMultisigDestination.js
@@ -58,7 +58,7 @@ class OptInSelectSymbolMultisigDestination extends Component<Props, State> {
         if (publicAccount && pubkey.length === 64) {
             this.setState({
                 multisigAccount: {
-                    address: publicAccount.address.pretty(),
+                    address: publicAccount.address.plain(),
                     publicKey: publicAccount.publicKey,
                 },
             });

diff --git a/src/services/AccountService.js b/src/services/AccountService.js
@@ -45,7 +45,7 @@ export default class AccountService {
      * Generates random mnemonic
      */
     static getAddressByAccountModelAndNetwork(accountModel: AccountModel, network: AppNetworkType): string {
-        return Account.createFromPrivateKey(accountModel.privateKey, this._appNetworkToNetworkType(network)).address.pretty();
+        return Account.createFromPrivateKey(accountModel.privateKey, this._appNetworkToNetworkType(network)).address.plain();
     }
     /**
      * Generates random mnemonic
@@ -215,7 +215,7 @@ export default class AccountService {
         try {
             const multisigInfo = await new MultisigHttp(network.node).getMultisigAccountInfo(Address.createFromRawAddress(address)).toPromise();
             return {
-                cosignatoryOf: multisigInfo.multisigAddresses.map(address => address.pretty()),
+                cosignatoryOf: multisigInfo.multisigAddresses.map(address => address.plain()),
                 isMultisig: multisigInfo.cosignatoryAddresses.length > 0,
             };
         } catch (e) {

diff --git a/src/services/FetchTransactionService.js b/src/services/FetchTransactionService.js
@@ -166,7 +166,7 @@ export default class FetchTransactionService {
         let transactionModel: TransactionModel = {
             type: 'unknown',
             status: transaction.isConfirmed() ? 'confirmed' : 'unconfirmed',
-            signerAddress: transaction.signer.address.pretty(),
+            signerAddress: transaction.signer.address.plain(),
             deadline: formatTransactionLocalDateTime(transaction.deadline.toLocalDateTime(network.epochAdjustment)),
             hash: transaction.transactionInfo.hash,
             fee: transaction.maxFee.toString(),
@@ -216,7 +216,7 @@ export default class FetchTransactionService {
         return {
             ...transactionModel,
             type: 'transfer',
-            recipientAddress: transaction.recipientAddress instanceof Address ? transaction.recipientAddress.pretty() : transaction.recipientAddress.id.toHex(),
+            recipientAddress: transaction.recipientAddress instanceof Address ? transaction.recipientAddress.plain() : transaction.recipientAddress.id.toHex(),
             messageText: transaction.message.payload,
             messageEncrypted: transaction.message.type === 0x01,
             mosaics: mosaicModels,

diff --git a/src/services/ListenerService.js b/src/services/ListenerService.js
@@ -36,7 +36,7 @@ export default class ListenerService {
                 }
             })
             .then(() => {
-                console.log('Listening ' + address.pretty());
+                console.log('Listening ' + address.plain());
 
                 this.addConfirmed(rawAddress);
                 this.addUnconfirmed(rawAddress);

diff --git a/src/services/QRService.js b/src/services/QRService.js
@@ -87,7 +87,7 @@ export default class {
 
 		const formattedMosaic = await this.formatMosaic(transaction.mosaics[0], network);
 		const formatedTransaction = {
-			recipientAddress: transaction.recipientAddress.pretty(),
+			recipientAddress: transaction.recipientAddress.plain(),
 			message: transaction.message.payload,
 			mosaicName: formattedMosaic.mosaicName,
 			mosaicId: formattedMosaic.mosaicId,
@@ -116,7 +116,7 @@ export default class {
 		const contactQr = QRCodeGenerator.fromJSON(JSON.stringify(data));
 		const parsed = {
 			...contactQr,
-			address: Address.createFromPublicKey(contactQr.accountPublicKey, contactQr.networkType).pretty()
+			address: Address.createFromPublicKey(contactQr.accountPublicKey, contactQr.networkType).plain()
 		};
 
 		return parsed;

diff --git a/src/store/account.js b/src/store/account.js
@@ -94,11 +94,11 @@ export default {
                 const accountSigners = AccountService.getSigners(Address.createFromRawAddress(address), multisigAccountGraph);
                 let allSigners = [];
                 accountSigners.forEach(signer => {
-                    allSigners.push(signer.address.pretty());
+                    allSigners.push(signer.address.plain());
                     signer.parentSigners.forEach(parent => {
-                        allSigners.push(parent.address.pretty());
+                        allSigners.push(parent.address.plain());
                         parent.parentSigners.forEach(topLevel => {
-                            allSigners.push(topLevel.address.pretty());
+                            allSigners.push(topLevel.address.plain());
                         });
                     });
                 });