Skip to content

Commit

Permalink
Dev -> Main (#229)
Browse files Browse the repository at this point in the history
* Fixed selected node url on harvesting

* Fixed selected node url on harvesting

* Update ru.json

Updated version of the translation into Russian

* Update ru.json

* Fix russian file

* fix: remove the Sign button of Aggregate Bonded transaction (#224)

* fix: remove cosign button. add message how to cosign

* fix: hide the agg. bonded sign message if no signature needed

* feat: add translation (#225)

* Fixed download translations (#218)

* Opt-in japanese translation (#212)

* Release note (#228)

* fix: update package name

* feat: release note

Co-authored-by: AdriaCarrera <[email protected]>
Co-authored-by: Klim Geran <[email protected]>
Co-authored-by: OlegMakarenko <[email protected]>
  • Loading branch information
4 people authored Oct 7, 2021
1 parent 50c30ef commit 6f2425a
Show file tree
Hide file tree
Showing 16 changed files with 187 additions and 79 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# CHANGELOG
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.2][v1.2] - 6-Oct-2021

### Fixed
- Remove the Sign button of Aggregate Bonded transaction. [#222](https://github.com/symbol/mobile-wallet/issues/222)
- Fix explorer links [#214](https://github.com/symbol/mobile-wallet/issues/214)
- Fix harvesting status [#134](https://github.com/symbol/mobile-wallet/issues/134)
- Minor translations update.

[v1.2]: https://github.com/symbol/mobile-wallet/releases/tag/1.2
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ android {
}

defaultConfig {
applicationId "nem.group.wallet"
applicationId "nem.group.symbol.wallet"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
missingDimensionStrategy 'react-native-camera', 'general'
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="nem.group.wallet">
package="nem.group.symbol.wallet">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nem.group.wallet;
package nem.group.symbol.wallet;

import android.os.Bundle;
import androidx.annotation.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nem.group.wallet;
package nem.group.symbol.wallet;

import android.app.Application;
import android.content.Context;
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "symbol-mobile-wallet",
"version": "0.0.1",
"version": "1.2",
"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
22 changes: 6 additions & 16 deletions src/components/organisms/transaction/AggregateTransaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ class AggregateTransaction extends BaseTransactionItem<Props> {

renderDetails = () => {
const { transaction, isLoading, isMultisig } = this.props;
const table = { innerTxs: transaction.innerTransactions.length };
if (this.needsSignature()) {
table.signature = translate('table.signDescription'); //TODO: remove when inner transactions presentation is ready
}

if (this.isPostLaunchOptIn()) {
const amount = this.postLaunchAmount();
return (
Expand All @@ -105,22 +110,7 @@ class AggregateTransaction extends BaseTransactionItem<Props> {
}
return (
<View>
<TableView
data={{
innerTxs: transaction.innerTransactions.length,
}}
/>
{this.needsSignature() && (
<Row justify="space-between">
<Button
style={{ padding: 0 }}
isLoading={isLoading}
text={translate('history.transaction.sign')}
theme="light"
onPress={() => this.sign()}
/>
</Row>
)}
<TableView data={table}/>
</View>
);
};
Expand Down
2 changes: 2 additions & 0 deletions src/locales/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,8 @@
}
},
"table": {
"signature": "Signature",
"signDescription": "You can use Symbol Desktop Wallet or Symbol CLI to review and sign this transaction.",
"type": "Type",
"recipientAddress": "Recipient Address",
"messageText": "Message / Memo",
Expand Down
2 changes: 2 additions & 0 deletions src/locales/translations/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,8 @@
"fast": "Rápida"
},
"table": {
"signature": "Firma",
"signDescription": "Puedes utilizar Symbol Desktop Wallet o Symbol CLI para revisar y firmar esta transacción.",
"type": "Tipo",
"recipientAddress": "Dirección de recepción",
"messageText": "Mensaje / Memo",
Expand Down
2 changes: 2 additions & 0 deletions src/locales/translations/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,8 @@
}
},
"table": {
"signature": "Firma",
"signDescription": "Puoi utilizzare Symbol Desktop Wallet o Symbol CLI per rivedere e firmare questa transazione.",
"type": "Type",
"recipientAddress": "Indirizzo del destinatario",
"messageText": "Messaggio",
Expand Down
4 changes: 3 additions & 1 deletion src/locales/translations/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,8 @@
}
},
"table": {
"signature": "署名",
"signDescription": "Symbol デスクトップウォレット または Symbol CLI を使用して、このトランザクションを確認、署名する事ができます。",
"type": "タイプ",
"recipientAddress": "受け取りアドレス",
"messageText": "メッセージ/メモ",
Expand Down Expand Up @@ -471,7 +473,7 @@
},
"home": {
"optInTitle": "オプトイン",
"optInDescription": "ローンチ後のオプトインは、間もなく開始されます。Symbolローンチ後、新しいバージョンを確認してください。",
"optInDescription": "Symbolローンチ後のオプトインはこちらから",
"pendingSignatureTitle": "ペンディング署名",
"pendingSignatureDescription": "署名待ちのペンディングトランザクションがあります"
},
Expand Down
Loading

0 comments on commit 6f2425a

Please sign in to comment.