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

[Issue-1826] Implement Manage Account #1830

Merged
merged 40 commits into from
Dec 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
c4988d5
[Issue-1826] Implement Manage Account
Oct 29, 2024
507bb2a
[Issue-1826] Implement Manage Account
Oct 31, 2024
e7a64be
[Issue-1826] Implement Export Account
Oct 31, 2024
4abf47e
[Issue-1826] Implement Export Account
Oct 31, 2024
59820d8
[Issue-1826] Implement Export Account
Nov 1, 2024
50d8bb4
[Issue-1826] Implement Export Account
Nov 4, 2024
7d34d32
[Issue-1826] Implement Export Account
Nov 4, 2024
5cc0d2b
[Issue-1826] Implement Export Account
Nov 5, 2024
4ea2faf
[Issue-1826] Implement Export Account
Nov 6, 2024
638580e
[Issue-1826] Implement Export Account
Nov 7, 2024
ca5a696
[Issue-1826] Fix bug keyring and SendFund
Nov 12, 2024
e01b7ad
[Issue-1826] Fix bug in SendFund Confirmation
Nov 13, 2024
e3e544a
[Issue-1826] Fix bug in SendFund Confirmation
Nov 15, 2024
bc6fdfc
[Issue-1826] Fix bug in issue 1828
Nov 15, 2024
0a1821c
[Issue-1826] Fix bug for Transaction actions
Nov 19, 2024
29cfbca
[Issue-1826] Fix bug for issue #1833
Nov 20, 2024
dab2074
[Issue-1826] Update workflow
Nov 21, 2024
b77bc53
[Issue-1826] Update workflow
Nov 21, 2024
5dc4554
[Issue-1826] Update workflow
Nov 21, 2024
f9f11cf
[Issue-1826] Refactor code and fix bug build android for unified account
Dec 2, 2024
c99fd97
[Issue-1826] Fix bug keyring
Dec 2, 2024
33b7e56
[Issue-1836] Fix bug related to Transfer feature
Dec 5, 2024
e26a63e
[Issue-1840] Fix bug related to token
Dec 5, 2024
0ebddb9
[Issue-1841] Fix bug related to Buy token
Dec 5, 2024
02ddb24
[Issue-1838] Fix bug related to History
Dec 5, 2024
4ad91dc
[Issue-1838] Fix UI bug
Dec 6, 2024
e048f6e
[Issue-1838] Fix UI bug
Dec 9, 2024
58772c7
[Issue-1838] Fix UI bug
Dec 10, 2024
b5ff9ff
[Issue-1833] Fix UI bug
Dec 10, 2024
64f854e
[Issue-1833] Fix UI bug
Dec 10, 2024
c2cee7f
[Issue-1833] Fix Transaction and Swap feature
Dec 12, 2024
5abafa8
[Issue-1833] Fix Transaction and Swap feature
Dec 12, 2024
b529610
[Issue-1833] Fix UI bug
Dec 12, 2024
cef2868
[Issue-1833] Fix UI bug
Dec 13, 2024
874d2d3
[Issue-1833] Fix UI bug
Dec 17, 2024
84760d3
[Issue-1834] Fix some UI bug
Dec 20, 2024
5ad343a
[Issue-1834] Fix some UI bug
Dec 20, 2024
871db00
[Issue-1850] Fix bug for Ton transfer
Dec 23, 2024
61832c2
[Issue-1850] Fix bug for Ton transfer
Dec 24, 2024
5355218
[Issue-1826] Fix some UI bug
Dec 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/build-internal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
# iOS build workflow -------------------------------------------------
build-ios:
name: iOS builds
runs-on: macos-13
runs-on: macos-15
env:
GH_PAT: ${{ secrets.GH_PAT }}
GH_RELEASE_GITHUB_API_TOKEN: ${{ secrets.GH_PAT }}
Expand Down
12 changes: 11 additions & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,24 @@ buildscript {
ext {
kotlinVersion = "1.6.21"
buildToolsVersion = "33.0.0"
minSdkVersion = 21
minSdkVersion = 24
compileSdkVersion = 34
targetSdkVersion = 34
androidXBrowser = "1.4.0"
kotlinVersion = "1.8.0"
// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
ndkVersion = "23.1.7779620"
}
subprojects { subproject ->
afterEvaluate{
if((subproject.plugins.hasPlugin('android') || subproject.plugins.hasPlugin('android-library'))) {
android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
}
}
}
}
repositories {
google()
mavenCentral()
Expand Down
1 change: 1 addition & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ module.exports = {
['@babel/plugin-transform-flow-strip-types'],
['@babel/plugin-transform-private-methods', { loose: true }],
'react-native-reanimated/plugin',
['babel-plugin-transform-import-meta', { module: 'ES6' }],
],
presets: ['module:metro-react-native-babel-preset'],
env: {
Expand Down

Large diffs are not rendered by default.

Binary file not shown.
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-e4c46eeab95bcb58e4bc.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-d03c5442ae4eb884eae0.js"></script></head><body><div id="root">SubWallet</div></body></html>
99 changes: 81 additions & 18 deletions html/DevModeWeb.bundle/site/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -653,18 +653,15 @@
"You can unstake from a dApp once": "",
"You can unstake from a validator once": "",
"Unable to find account": "",
"\"{{suri}}\" is not a valid derivation path": "",
"The password of each account is needed to set up master password": "",
"Not found token from registry": "",
"Not found ERC20 address for this token": "",
"Cannot create account": "",
"Cannot find network": "",
"Failed to decode data. Please use a valid QR code": "",
"Invalid derive path": "",
"Not found {{shortenUrl}} in auth list": "",
"Not found signature": "",
"Failed to get balance. Please check your internet connection or change your network endpoint": "",
"This account is watch-only": "",
"Invalid URL for provider": "",
"Incomplete. Please continue scanning": "",
"Failed to decrypt data": "",
Expand Down Expand Up @@ -724,7 +721,6 @@
"Hide private key": "",
"Show private key": "",
"Private key": "",
"Invalid private key. Please try again.": "",
"Required once": "",
"Always require": "",
"Disconnect wallet": "",
Expand Down Expand Up @@ -997,23 +993,12 @@
"Error!": "",
"Failed to get data. Please try again later.": "",
"Your selected network has lost connection. Update it by re-enabling it or changing network provider": "",
"Some errors occurred. Please try again later": "",
"ZK assets are hidden as ZK mode is disabled": "",
"Something went wrong": "",
"ZK mode is syncing": "",
"All done, you can go back home": "",
"This may take a few minutes. Please keep the app open": "",
"Zk mode is ready": "",
"Zk mode is syncing: {{percent}}%": "",
"Zk mode": "",
"Derive": "",
"Export": "",
"ZK mode requires data synchronization": "",
"Using the app is not advised until synchronization finishes. First-time synchronization can take up to 45 minutes or longer. Proceed?": "",
"Enable ZK mode?": "",
"To import an existing wallet, please enter private key": "",
"Enter private key": "",
"Accounts": "",
"Add to stake confirm": "",
"Unstake confirm": "",
"Claim rewards confirm": "",
Expand Down Expand Up @@ -1234,7 +1219,6 @@
"This update is required by Google, and helps improve the privacy, security, and performance of SubWallet extension.\n You can learn more details on Chrome for Developers, or safely dismiss this message.": "",
"EVM QR signer account": "",
"Substrate QR signer account": "",
"Invalid QR code. EVM networks are not supported": "",
"Feature not available for <highlight>{{accountTitle}}</highlight>. Change to another account type and try again.": "",
"Insufficient stake. You need to stake at least {{number}} {{tokenSymbol}} to earn rewards": "",
"You don't have enough {{symbol}} ({{chainName}}) to pay gas fee. Top up your transferable balance and try again": "",
Expand Down Expand Up @@ -1292,7 +1276,6 @@
"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": "",
"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": "",
Expand All @@ -1310,5 +1293,85 @@
"One or more accounts found in this file are invalid. Only {{x}} accounts can be imported as listed below": "",
"All accounts found in this file are invalid. Import another JSON file and try again": "",
"Unable to import": "",
"Some accounts can’t be imported": ""
"Some accounts can’t be imported": "",
"We are not supporting for bounceable address. The send mode is work as non-bounceable address.": "",
"Not found TEP74 address for this token": "",
"This feature is not available with this account": "",
"Account already exists under the name \"{{name}}\"": "",
"Incorrect password": "",
"Account already exists under the name {{name}}": "",
"No accounts found to import": "",
"Please choose at least one account type": "",
"Account name already exists": "",
"Invalid private key": "",
"Account not found": "",
"Account name already in use": "",
"Invalid derivation path": "",
"Derivation path not supported": "",
"Unable to find parent account": "",
"Derive this account": "",
"Solo account": "",
"Unified account": "",
"injected account": "",
"My wallet": "",
"My contact": "",
"Domain name": "",
"Advanced address conversion": "",
"This feature auto-converts your recipient address into the correct format for your chosen destination network. Wrong destination network will result in loss of funds. Only enable if you’re an advanced user": "",
"Advanced address detection": "",
"Recommended": "",
"Custom": "",
"Choose fee": "",
"Fee paid in": "",
"Low": "",
"Medium": "",
"Highest": "",
"Estimate fee": "",
"Injected account": "",
"Select address": "",
"Enter network name": "",
"Account name invalid": "",
"Enter a name for your account.\n You can edit this later.": "",
"Enter the account name": "",
"Import from JSON file": "",
"Import from private key": "",
"Derive path is required": "",
"This derived account can only be used in SubWallet and won’t be compatible with other wallets. Do you still want to continue?": "",
"Incompatible account": "",
"Create derived account": "",
"You are creating a derived account from account <highlight>{{accountName}}</highlight>. Customize the derivation path and name the account as you wish": "",
"Derivation path": "",
"Create account": "",
"Click to change wallet address": "",
"Duplicate account name": "",
"You have accounts with the same name. We have added characters to these account names to differentiate them. You can change account names later using": "",
"Enter your account name or address": "",
"This seed phrase creates a unified account that can be used for Polkadot, Ethereum, Bitcoin and TON ecosystem. Keep in mind that for TON specifically, this seed phrase is not compatible with TON-native wallets.": "",
"TON wallets have ": "",
", each with its own wallet address and balance. Select a version with the address you want to get": "",
"Wallet address & version": "",
"Incompatible seed phrase": "",
"This address's seed phrase is not compatible with TON-native wallets. Continue using this address or create a new account that can be used on both SubWallet and TON-native wallets": "",
"EVM QR-singer account is not supported": "",
"Upgrade to Unified account": "",
"Enter network name or address ": "",
"Enter account name or address": "",
"Derived account": "",
"Derivation info": "",
"Delete account": "",
"Parent account": "",
"This seed phrase generates a unified account that can be used on multiple ecosystems in SubWallet including TON.": "",
"Note that you can’t import this seed phrase into TON-native wallets as this seed phrase is incompatible with TON-native wallets.": "",
"Existed account": "",
" You have accounts with the same name. We have added numbers to these account names to differentiate them. You can change account names later using ": "",
"this guide": "",
"Unlock file": "",
"Import 1 account": "",
"Select the account(s) you'd like to import": "",
"All accounts found in this file already exist in SubWallet": "",
"No available TON account": "",
"Unsupported address": "",
"Failed to import. Incompatible NFT": "",
"TON wallets have multiple versions, each with its own wallet address and balance. <highlight>Change versions</highlight> if you don't see balances": "",
"Change wallet address & version": ""
}
99 changes: 81 additions & 18 deletions html/DevModeWeb.bundle/site/locales/ja/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -653,18 +653,15 @@
"You can unstake from a dApp once": "dAppからのアンステークは一度だけ可能です。",
"You can unstake from a validator once": "バリデーターからのアンステークは一度だけ可能です。",
"Unable to find account": "アカウントが見つかりません。",
"\"{{suri}}\" is not a valid derivation path": "",
"The password of each account is needed to set up master password": "マスターパスワードの設定には、各アカウントのパスワードが必要です。",
"Not found token from registry": "レジストリからトークンが見つかりません",
"Not found ERC20 address for this token": "このトークンのERC20アドレスが見つかりません",
"Cannot create account": "アカウントを作成できません",
"Cannot find network": "ネットワークが見つかりません",
"Failed to decode data. Please use a valid QR code": "データのデコードに失敗しました。有効なQRコードを使用してください。",
"Invalid derive path": "",
"Not found {{shortenUrl}} in auth list": "認証リストに{{shortenUrl}}が見つかりません",
"Not found signature": "",
"Failed to get balance. Please check your internet connection or change your network endpoint": "残高の取得に失敗しました。インターネット接続を確認するか、ネットワークのエンドポイントを変更してください。",
"This account is watch-only": "このアカウントはウォッチ専用です",
"Invalid URL for provider": "",
"Incomplete. Please continue scanning": "",
"Failed to decrypt data": "",
Expand Down Expand Up @@ -724,7 +721,6 @@
"Hide private key": "",
"Show private key": "",
"Private key": "秘密鍵",
"Invalid private key. Please try again.": "",
"Required once": "",
"Always require": "",
"Disconnect wallet": "",
Expand Down Expand Up @@ -997,23 +993,12 @@
"Error!": "",
"Failed to get data. Please try again later.": "",
"Your selected network has lost connection. Update it by re-enabling it or changing network provider": "",
"Some errors occurred. Please try again later": "",
"ZK assets are hidden as ZK mode is disabled": "",
"Something went wrong": "",
"ZK mode is syncing": "",
"All done, you can go back home": "",
"This may take a few minutes. Please keep the app open": "",
"Zk mode is ready": "",
"Zk mode is syncing: {{percent}}%": "",
"Zk mode": "",
"Derive": "",
"Export": "",
"ZK mode requires data synchronization": "",
"Using the app is not advised until synchronization finishes. First-time synchronization can take up to 45 minutes or longer. Proceed?": "",
"Enable ZK mode?": "",
"To import an existing wallet, please enter private key": "",
"Enter private key": "",
"Accounts": "",
"Add to stake confirm": "",
"Unstake confirm": "",
"Claim rewards confirm": "",
Expand Down Expand Up @@ -1234,7 +1219,6 @@
"This update is required by Google, and helps improve the privacy, security, and performance of SubWallet extension.\n You can learn more details on Chrome for Developers, or safely dismiss this message.": "",
"EVM QR signer account": "",
"Substrate QR signer account": "",
"Invalid QR code. EVM networks are not supported": "",
"Feature not available for <highlight>{{accountTitle}}</highlight>. Change to another account type and try again.": "",
"Insufficient stake. You need to stake at least {{number}} {{tokenSymbol}} to earn rewards": "",
"You don't have enough {{symbol}} ({{chainName}}) to pay gas fee. Top up your transferable balance and try again": "",
Expand Down Expand Up @@ -1292,7 +1276,6 @@
"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": "",
"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": "",
Expand All @@ -1310,5 +1293,85 @@
"One or more accounts found in this file are invalid. Only {{x}} accounts can be imported as listed below": "",
"All accounts found in this file are invalid. Import another JSON file and try again": "",
"Unable to import": "",
"Some accounts can’t be imported": ""
"Some accounts can’t be imported": "",
"We are not supporting for bounceable address. The send mode is work as non-bounceable address.": "",
"Not found TEP74 address for this token": "",
"This feature is not available with this account": "",
"Account already exists under the name \"{{name}}\"": "",
"Incorrect password": "",
"Account already exists under the name {{name}}": "",
"No accounts found to import": "",
"Please choose at least one account type": "",
"Account name already exists": "",
"Invalid private key": "",
"Account not found": "",
"Account name already in use": "",
"Invalid derivation path": "",
"Derivation path not supported": "",
"Unable to find parent account": "",
"Derive this account": "",
"Solo account": "",
"Unified account": "",
"injected account": "",
"My wallet": "",
"My contact": "",
"Domain name": "",
"Advanced address conversion": "",
"This feature auto-converts your recipient address into the correct format for your chosen destination network. Wrong destination network will result in loss of funds. Only enable if you’re an advanced user": "",
"Advanced address detection": "",
"Recommended": "",
"Custom": "",
"Choose fee": "",
"Fee paid in": "",
"Low": "",
"Medium": "",
"Highest": "",
"Estimate fee": "",
"Injected account": "",
"Select address": "",
"Enter network name": "",
"Account name invalid": "",
"Enter a name for your account.\n You can edit this later.": "",
"Enter the account name": "",
"Import from JSON file": "",
"Import from private key": "",
"Derive path is required": "",
"This derived account can only be used in SubWallet and won’t be compatible with other wallets. Do you still want to continue?": "",
"Incompatible account": "",
"Create derived account": "",
"You are creating a derived account from account <highlight>{{accountName}}</highlight>. Customize the derivation path and name the account as you wish": "",
"Derivation path": "",
"Create account": "",
"Click to change wallet address": "",
"Duplicate account name": "",
"You have accounts with the same name. We have added characters to these account names to differentiate them. You can change account names later using": "",
"Enter your account name or address": "",
"This seed phrase creates a unified account that can be used for Polkadot, Ethereum, Bitcoin and TON ecosystem. Keep in mind that for TON specifically, this seed phrase is not compatible with TON-native wallets.": "",
"TON wallets have ": "",
", each with its own wallet address and balance. Select a version with the address you want to get": "",
"Wallet address & version": "",
"Incompatible seed phrase": "",
"This address's seed phrase is not compatible with TON-native wallets. Continue using this address or create a new account that can be used on both SubWallet and TON-native wallets": "",
"EVM QR-singer account is not supported": "",
"Upgrade to Unified account": "",
"Enter network name or address ": "",
"Enter account name or address": "",
"Derived account": "",
"Derivation info": "",
"Delete account": "",
"Parent account": "",
"This seed phrase generates a unified account that can be used on multiple ecosystems in SubWallet including TON.": "",
"Note that you can’t import this seed phrase into TON-native wallets as this seed phrase is incompatible with TON-native wallets.": "",
"Existed account": "",
" You have accounts with the same name. We have added numbers to these account names to differentiate them. You can change account names later using ": "",
"this guide": "",
"Unlock file": "",
"Import 1 account": "",
"Select the account(s) you'd like to import": "",
"All accounts found in this file already exist in SubWallet": "",
"No available TON account": "",
"Unsupported address": "",
"Failed to import. Incompatible NFT": "",
"TON wallets have multiple versions, each with its own wallet address and balance. <highlight>Change versions</highlight> if you don't see balances": "",
"Change wallet address & version": ""
}
Loading