Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/upgrade-ui' into issue-1169
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
  • Loading branch information
dominhquang committed Sep 10, 2024
2 parents 5891fc6 + 3e7ee1f commit 0129b0c
Show file tree
Hide file tree
Showing 30 changed files with 7,313 additions and 254 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/build-internal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ jobs:
fetch-depth: 0
token: ${{ secrets.GH_PAT }}

- name: Remove unused web-runner for Android
run: |
rm -r ./html/OldWeb.bundle
- name: Add APP ENV
run: |
cp .env.development.example .env.production
Expand Down Expand Up @@ -218,4 +222,4 @@ jobs:
description: |
Android: The Deployment has been completed.
Diawi: ${{ steps.upload-diawi-android.outputs.url }}
Diawi QR: ${{ steps.upload-diawi-android.outputs.qrcode }}
Diawi QR: ${{ steps.upload-diawi-android.outputs.qrcode }}
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 1.1.79 (430)


## 1.1.78 (429)


Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ android {
applicationId "app.subwallet.mobile"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 429
versionName "1.1.78"
versionCode 430
versionName "1.1.79"
missingDimensionStrategy 'react-native-camera', 'general'
}

Expand Down
2 changes: 1 addition & 1 deletion html/DevModeWeb.bundle/site/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"><title>SubWallet</title><script inline inline-asset="fallback.js$" inline-asset-delete></script><script inline inline-asset="web-runner.js$" inline-asset-delete></script><script defer="defer" src="fallback-0b81a7f9f3a8fbf3b257.js"></script><script defer="defer" src="web-runner-c9f2c5a0c4e2cc835ad3.js"></script></head><body><div id="root">SubWallet</div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"><title>SubWallet</title><script inline inline-asset="fallback.js$" inline-asset-delete></script><script inline inline-asset="web-runner.js$" inline-asset-delete></script><script defer="defer" src="fallback-0b81a7f9f3a8fbf3b257.js"></script><script defer="defer" src="web-runner-f253b557cb9fdd018b95.js"></script></head><body><div id="root">SubWallet</div></body></html>
11 changes: 8 additions & 3 deletions html/DevModeWeb.bundle/site/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1273,7 +1273,6 @@
"{{number}} {{account}} connected": "",
"Re-enable the network or change RPC on the extension and try again": "",
"Unstable network connection": "",
"This network is not yet supported on SubWallet. |Import the network|https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks| on SubWallet and try again": "",
"Network not supported": "",
"Enter recipient address and try again": "",
"Recipient address not found": "",
Expand All @@ -1288,11 +1287,17 @@
"Insufficient balance on the sender address. Top up your balance and try again": "",
"Unable to sign transaction": "",
"An error occurred when signing this request. Try again or contact support at [email protected]": "",
"Unable to sign message": "",
"This sign method is not supported by SubWallet. Try again or contact support at [email protected]": "",
"Method not supported": "",
"The recipient account has {{amount}} {{nativeSymbol}} which can lead to your {{localSymbol}} being lost. Change recipient account and try again": "",
"Do you still want to get the address?": "",
"Ledger {{ledgerApp}} accounts are NOT compatible with {{networkName}} network. Tokens will get stuck (i.e., can’t be transferred out or staked) when sent to this account type.": "",
"Ledger {{ledgerApp}} address is not supported for this transfer": ""
"Ledger {{ledgerApp}} address is not supported for this transfer": "",
"This network is not yet supported on SubWallet. (Import the network)[https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks] on SubWallet and try again": "",
"An error occurred when attempting to sign this request. Contact support at email: [email protected]": "",
"You’re dual staking via both direct nomination and nomination pool, which": "",
"will not be supported": "",
"from one of the methods to avoid issues": "",
"Read update": "",
"Continue staking?": ""
}
11 changes: 8 additions & 3 deletions html/DevModeWeb.bundle/site/locales/ja/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1273,7 +1273,6 @@
"{{number}} {{account}} connected": "",
"Re-enable the network or change RPC on the extension and try again": "",
"Unstable network connection": "",
"This network is not yet supported on SubWallet. |Import the network|https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks| on SubWallet and try again": "",
"Network not supported": "",
"Enter recipient address and try again": "",
"Recipient address not found": "",
Expand All @@ -1288,11 +1287,17 @@
"Insufficient balance on the sender address. Top up your balance and try again": "",
"Unable to sign transaction": "",
"An error occurred when signing this request. Try again or contact support at [email protected]": "",
"Unable to sign message": "",
"This sign method is not supported by SubWallet. Try again or contact support at [email protected]": "",
"Method not supported": "",
"The recipient account has {{amount}} {{nativeSymbol}} which can lead to your {{localSymbol}} being lost. Change recipient account and try again": "",
"Do you still want to get the address?": "",
"Ledger {{ledgerApp}} accounts are NOT compatible with {{networkName}} network. Tokens will get stuck (i.e., can’t be transferred out or staked) when sent to this account type.": "",
"Ledger {{ledgerApp}} address is not supported for this transfer": ""
"Ledger {{ledgerApp}} address is not supported for this transfer": "",
"This network is not yet supported on SubWallet. (Import the network)[https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks] on SubWallet and try again": "",
"An error occurred when attempting to sign this request. Contact support at email: [email protected]": "",
"You’re dual staking via both direct nomination and nomination pool, which": "",
"will not be supported": "",
"from one of the methods to avoid issues": "",
"Read update": "",
"Continue staking?": ""
}
11 changes: 8 additions & 3 deletions html/DevModeWeb.bundle/site/locales/ru/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1273,7 +1273,6 @@
"{{number}} {{account}} connected": "",
"Re-enable the network or change RPC on the extension and try again": "",
"Unstable network connection": "",
"This network is not yet supported on SubWallet. |Import the network|https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks| on SubWallet and try again": "",
"Network not supported": "",
"Enter recipient address and try again": "",
"Recipient address not found": "",
Expand All @@ -1288,11 +1287,17 @@
"Insufficient balance on the sender address. Top up your balance and try again": "",
"Unable to sign transaction": "",
"An error occurred when signing this request. Try again or contact support at [email protected]": "",
"Unable to sign message": "",
"This sign method is not supported by SubWallet. Try again or contact support at [email protected]": "",
"Method not supported": "",
"The recipient account has {{amount}} {{nativeSymbol}} which can lead to your {{localSymbol}} being lost. Change recipient account and try again": "",
"Do you still want to get the address?": "",
"Ledger {{ledgerApp}} accounts are NOT compatible with {{networkName}} network. Tokens will get stuck (i.e., can’t be transferred out or staked) when sent to this account type.": "",
"Ledger {{ledgerApp}} address is not supported for this transfer": ""
"Ledger {{ledgerApp}} address is not supported for this transfer": "",
"This network is not yet supported on SubWallet. (Import the network)[https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks] on SubWallet and try again": "",
"An error occurred when attempting to sign this request. Contact support at email: [email protected]": "",
"You’re dual staking via both direct nomination and nomination pool, which": "",
"will not be supported": "",
"from one of the methods to avoid issues": "",
"Read update": "",
"Continue staking?": ""
}
11 changes: 8 additions & 3 deletions html/DevModeWeb.bundle/site/locales/vi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1273,7 +1273,6 @@
"{{number}} {{account}} connected": "",
"Re-enable the network or change RPC on the extension and try again": "",
"Unstable network connection": "",
"This network is not yet supported on SubWallet. |Import the network|https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks| on SubWallet and try again": "",
"Network not supported": "",
"Enter recipient address and try again": "",
"Recipient address not found": "",
Expand All @@ -1288,11 +1287,17 @@
"Insufficient balance on the sender address. Top up your balance and try again": "",
"Unable to sign transaction": "",
"An error occurred when signing this request. Try again or contact support at [email protected]": "",
"Unable to sign message": "",
"This sign method is not supported by SubWallet. Try again or contact support at [email protected]": "",
"Method not supported": "",
"The recipient account has {{amount}} {{nativeSymbol}} which can lead to your {{localSymbol}} being lost. Change recipient account and try again": "",
"Do you still want to get the address?": "",
"Ledger {{ledgerApp}} accounts are NOT compatible with {{networkName}} network. Tokens will get stuck (i.e., can’t be transferred out or staked) when sent to this account type.": "",
"Ledger {{ledgerApp}} address is not supported for this transfer": ""
"Ledger {{ledgerApp}} address is not supported for this transfer": "",
"This network is not yet supported on SubWallet. (Import the network)[https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks] on SubWallet and try again": "",
"An error occurred when attempting to sign this request. Contact support at email: [email protected]": "",
"You’re dual staking via both direct nomination and nomination pool, which": "",
"will not be supported": "",
"from one of the methods to avoid issues": "",
"Read update": "",
"Continue staking?": ""
}
11 changes: 8 additions & 3 deletions html/DevModeWeb.bundle/site/locales/zh/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1273,7 +1273,6 @@
"{{number}} {{account}} connected": "",
"Re-enable the network or change RPC on the extension and try again": "",
"Unstable network connection": "",
"This network is not yet supported on SubWallet. |Import the network|https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks| on SubWallet and try again": "",
"Network not supported": "",
"Enter recipient address and try again": "",
"Recipient address not found": "",
Expand All @@ -1288,11 +1287,17 @@
"Insufficient balance on the sender address. Top up your balance and try again": "",
"Unable to sign transaction": "",
"An error occurred when signing this request. Try again or contact support at [email protected]": "",
"Unable to sign message": "",
"This sign method is not supported by SubWallet. Try again or contact support at [email protected]": "",
"Method not supported": "",
"The recipient account has {{amount}} {{nativeSymbol}} which can lead to your {{localSymbol}} being lost. Change recipient account and try again": "",
"Do you still want to get the address?": "",
"Ledger {{ledgerApp}} accounts are NOT compatible with {{networkName}} network. Tokens will get stuck (i.e., can’t be transferred out or staked) when sent to this account type.": "",
"Ledger {{ledgerApp}} address is not supported for this transfer": ""
"Ledger {{ledgerApp}} address is not supported for this transfer": "",
"This network is not yet supported on SubWallet. (Import the network)[https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks] on SubWallet and try again": "",
"An error occurred when attempting to sign this request. Contact support at email: [email protected]": "",
"You’re dual staking via both direct nomination and nomination pool, which": "",
"will not be supported": "",
"from one of the methods to avoid issues": "",
"Read update": "",
"Continue staking?": ""
}

Large diffs are not rendered by default.

6,891 changes: 6,890 additions & 1 deletion html/PageJs.bundle/page.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion html/Web.bundle/site/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"><title>SubWallet</title><script inline inline-asset="fallback.js$" inline-asset-delete></script><script inline inline-asset="web-runner.js$" inline-asset-delete></script><script defer="defer" src="fallback-0b81a7f9f3a8fbf3b257.js"></script><script defer="defer" src="web-runner-4fa0c4a3ab6f3552b853.js"></script></head><body><div id="root">SubWallet</div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"><title>SubWallet</title><script inline inline-asset="fallback.js$" inline-asset-delete></script><script inline inline-asset="web-runner.js$" inline-asset-delete></script><script defer="defer" src="fallback-0b81a7f9f3a8fbf3b257.js"></script><script defer="defer" src="web-runner-dbeee7aa0f69e421c437.js"></script></head><body><div id="root">SubWallet</div></body></html>
11 changes: 8 additions & 3 deletions html/Web.bundle/site/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1273,7 +1273,6 @@
"{{number}} {{account}} connected": "",
"Re-enable the network or change RPC on the extension and try again": "",
"Unstable network connection": "",
"This network is not yet supported on SubWallet. |Import the network|https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks| on SubWallet and try again": "",
"Network not supported": "",
"Enter recipient address and try again": "",
"Recipient address not found": "",
Expand All @@ -1288,11 +1287,17 @@
"Insufficient balance on the sender address. Top up your balance and try again": "",
"Unable to sign transaction": "",
"An error occurred when signing this request. Try again or contact support at [email protected]": "",
"Unable to sign message": "",
"This sign method is not supported by SubWallet. Try again or contact support at [email protected]": "",
"Method not supported": "",
"The recipient account has {{amount}} {{nativeSymbol}} which can lead to your {{localSymbol}} being lost. Change recipient account and try again": "",
"Do you still want to get the address?": "",
"Ledger {{ledgerApp}} accounts are NOT compatible with {{networkName}} network. Tokens will get stuck (i.e., can’t be transferred out or staked) when sent to this account type.": "",
"Ledger {{ledgerApp}} address is not supported for this transfer": ""
"Ledger {{ledgerApp}} address is not supported for this transfer": "",
"This network is not yet supported on SubWallet. (Import the network)[https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks] on SubWallet and try again": "",
"An error occurred when attempting to sign this request. Contact support at email: [email protected]": "",
"You’re dual staking via both direct nomination and nomination pool, which": "",
"will not be supported": "",
"from one of the methods to avoid issues": "",
"Read update": "",
"Continue staking?": ""
}
11 changes: 8 additions & 3 deletions html/Web.bundle/site/locales/ja/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1273,7 +1273,6 @@
"{{number}} {{account}} connected": "",
"Re-enable the network or change RPC on the extension and try again": "",
"Unstable network connection": "",
"This network is not yet supported on SubWallet. |Import the network|https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks| on SubWallet and try again": "",
"Network not supported": "",
"Enter recipient address and try again": "",
"Recipient address not found": "",
Expand All @@ -1288,11 +1287,17 @@
"Insufficient balance on the sender address. Top up your balance and try again": "",
"Unable to sign transaction": "",
"An error occurred when signing this request. Try again or contact support at [email protected]": "",
"Unable to sign message": "",
"This sign method is not supported by SubWallet. Try again or contact support at [email protected]": "",
"Method not supported": "",
"The recipient account has {{amount}} {{nativeSymbol}} which can lead to your {{localSymbol}} being lost. Change recipient account and try again": "",
"Do you still want to get the address?": "",
"Ledger {{ledgerApp}} accounts are NOT compatible with {{networkName}} network. Tokens will get stuck (i.e., can’t be transferred out or staked) when sent to this account type.": "",
"Ledger {{ledgerApp}} address is not supported for this transfer": ""
"Ledger {{ledgerApp}} address is not supported for this transfer": "",
"This network is not yet supported on SubWallet. (Import the network)[https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks] on SubWallet and try again": "",
"An error occurred when attempting to sign this request. Contact support at email: [email protected]": "",
"You’re dual staking via both direct nomination and nomination pool, which": "",
"will not be supported": "",
"from one of the methods to avoid issues": "",
"Read update": "",
"Continue staking?": ""
}
11 changes: 8 additions & 3 deletions html/Web.bundle/site/locales/ru/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1273,7 +1273,6 @@
"{{number}} {{account}} connected": "",
"Re-enable the network or change RPC on the extension and try again": "",
"Unstable network connection": "",
"This network is not yet supported on SubWallet. |Import the network|https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks| on SubWallet and try again": "",
"Network not supported": "",
"Enter recipient address and try again": "",
"Recipient address not found": "",
Expand All @@ -1288,11 +1287,17 @@
"Insufficient balance on the sender address. Top up your balance and try again": "",
"Unable to sign transaction": "",
"An error occurred when signing this request. Try again or contact support at [email protected]": "",
"Unable to sign message": "",
"This sign method is not supported by SubWallet. Try again or contact support at [email protected]": "",
"Method not supported": "",
"The recipient account has {{amount}} {{nativeSymbol}} which can lead to your {{localSymbol}} being lost. Change recipient account and try again": "",
"Do you still want to get the address?": "",
"Ledger {{ledgerApp}} accounts are NOT compatible with {{networkName}} network. Tokens will get stuck (i.e., can’t be transferred out or staked) when sent to this account type.": "",
"Ledger {{ledgerApp}} address is not supported for this transfer": ""
"Ledger {{ledgerApp}} address is not supported for this transfer": "",
"This network is not yet supported on SubWallet. (Import the network)[https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks] on SubWallet and try again": "",
"An error occurred when attempting to sign this request. Contact support at email: [email protected]": "",
"You’re dual staking via both direct nomination and nomination pool, which": "",
"will not be supported": "",
"from one of the methods to avoid issues": "",
"Read update": "",
"Continue staking?": ""
}
Loading

0 comments on commit 0129b0c

Please sign in to comment.