Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

Commit

Permalink
Merge pull request #59 from MXCzkEVM/main
Browse files Browse the repository at this point in the history
Ver:1.3.0
  • Loading branch information
sheenhx authored Sep 18, 2023
2 parents 8d4802a + 3e2d1ce commit 2597e8d
Show file tree
Hide file tree
Showing 35 changed files with 240 additions and 140 deletions.
4 changes: 2 additions & 2 deletions assets/flutter_i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"active": "Aktiv",
"date": "Datum",
"tx": "Tx = Transaktion",
"manage_portfolio": "Portfolio verwalten",
"manage_portfolio": "Token senden/Portfolio verwalten",
"fiat_options": "FIAT Optionen",
"show/hide_balance": "Balance anzeigen/verbergen",
"balance": "Balance",
Expand Down Expand Up @@ -229,7 +229,7 @@
"change_passcode_note": "Ändern Sie Ihren aktuellen Passcode. Wenn Sie Ihren neuen Passcode verlieren, können Sie ihn jederzeit wiederherstellen, indem Sie Ihre Wallet erneut importieren.",
"clear_browser_cache_note": "Browserverlauf und Cookies löschen",
"clear_browser_cache": "Verlauf & Cookies löschen",
"delete_wallet_note": "Setzen Sie alle Ihre Wallet-Daten zurück",
"delete_wallet_note": "Wallet importieren/Setzen Sie alle Ihre Wallet-Daten zurück",
"clear_browser_history_note": "Browserverlauf und Cookies löschen?",
"delete_wallet": "Wallet zurücksetzen",
"export_wallet_note": "Wallet in gesicherten Speicher exportieren",
Expand Down
4 changes: 2 additions & 2 deletions assets/flutter_i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"active": "Active",
"date": "Date",
"tx": "Tx",
"manage_portfolio": "Manage Portfolio",
"manage_portfolio": "Send Token/Manage Portfolio",
"fiat_options": "FIAT Options",
"show/hide_balance": "Show/Hide Balance",
"balance": "Balance",
Expand Down Expand Up @@ -230,7 +230,7 @@
"change_passcode_note": "Change your current passcode. If you lose your new passcode, you can always recover it by re-importing your wallet.",
"clear_browser_cache_note": "Clear browser history and cookies",
"clear_browser_cache": "Clear history & cookies",
"delete_wallet_note": "Delete wallet and clear all data",
"delete_wallet_note": "Import Wallet/Delete wallet and clear all data",
"clear_browser_history_note": "Clear browser history and cookies?",
"delete_wallet": "Delete wallet",
"export_wallet_note": "Export wallet to secured storage",
Expand Down
4 changes: 2 additions & 2 deletions assets/flutter_i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"active": "Activo",
"date": "Fecha",
"tx": "Tx",
"manage_portfolio": "Gestionar Cartera",
"manage_portfolio": "Enviar token/Gestionar Cartera",
"fiat_options": "Opciones FIAT",
"show/hide_balance": "Mostrar/Ocultar Saldo",
"balance": "Saldo",
Expand Down Expand Up @@ -229,7 +229,7 @@
"change_passcode_note": "Cambia tu código de acceso actual. Si pierdes tu nuevo código, siempre puedes recuperarlo volviendo a importar tu billetera.",
"clear_browser_cache_note": "Borra el historial del navegador y las cookies",
"clear_browser_cache": "Borrar historial y cookies",
"delete_wallet_note": "Restablece todos los datos de tu billetera",
"delete_wallet_note": "Importar cartera/Restablece todos los datos de tu billetera",
"clear_browser_history_note": "¿Borrar historial del navegador y cookies?",
"delete_wallet": "Restablecer billetera",
"export_wallet_note": "Exportar cartera a almacenamiento seguro",
Expand Down
4 changes: 2 additions & 2 deletions assets/flutter_i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"active": "Actif",
"date": "Date",
"tx": "Tx devient Transaction",
"manage_portfolio": "Gérer le Portefeuille",
"manage_portfolio": "Envoyer le token/Gérer le Portefeuille",
"fiat_options": "Options FIAT",
"show/hide_balance": "Afficher/Masquer Solde",
"balance": "Solde",
Expand Down Expand Up @@ -229,7 +229,7 @@
"change_passcode_note": "Changez votre code d'accès actuel. Si vous perdez votre nouveau code, vous pouvez toujours le récupérer en réimportant votre portefeuille.",
"clear_browser_cache_note": "Effacez l'historique de navigation et les cookies",
"clear_browser_cache": "Effacer l'historique & les cookies",
"delete_wallet_note": "Réinitialisez toutes vos données de portefeuille",
"delete_wallet_note": "Importer le portefeuille/Réinitialisez toutes vos données de portefeuille",
"clear_browser_history_note": "Effacer l'historique de navigation et les cookies?",
"delete_wallet": "Réinitialiser le portefeuille",
"export_wallet_note": "Exporter le portefeuille vers un stockage sécurisé",
Expand Down
4 changes: 2 additions & 2 deletions assets/flutter_i18n/id.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"active": "Aktif",
"date": "Tanggal",
"tx": "Tx",
"manage_portfolio": "Kelola Portofolio",
"manage_portfolio": "Kirim token/Kelola Portofolio",
"fiat_options": "Opsi FIAT",
"show/hide_balance": "Tampilkan/Sembunyikan Saldo",
"balance": "Saldo",
Expand Down Expand Up @@ -229,7 +229,7 @@
"change_passcode_note": "Ganti kode sandi saat ini Anda. Jika Anda kehilangan kode sandi baru, Anda selalu dapat memulihkannya dengan mengimpor ulang dompet Anda.",
"clear_browser_cache_note": "Hapus riwayat penjelajahan dan cookies",
"clear_browser_cache": "Hapus riwayat & cookies",
"delete_wallet_note": "Atur ulang semua data dompet Anda",
"delete_wallet_note": "Impor Dompet/Atur ulang semua data dompet Anda",
"clear_browser_history_note": "Hapus riwayat penjelajahan dan cookies?",
"delete_wallet": "Reset dompet",
"export_wallet_note": "Ekspor dompet ke penyimpanan yang aman",
Expand Down
4 changes: 2 additions & 2 deletions assets/flutter_i18n/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"active": "Attivo",
"date": "Data",
"tx": "Tx = Transazione",
"manage_portfolio": "Gestisci Portfolio",
"manage_portfolio": "Invia token/Gestisci Portfolio",
"fiat_options": "Opzioni FIAT",
"show/hide_balance": "Mostra/Nascondi Saldo",
"balance": "Saldo",
Expand Down Expand Up @@ -229,7 +229,7 @@
"change_passcode_note": "Cambia il tuo codice di accesso attuale. Se perdi il tuo nuovo codice, puoi sempre recuperarlo reimportando il tuo portafoglio.",
"clear_browser_cache_note": "Cancella la cronologia del browser e i cookie",
"clear_browser_cache": "Cancella cronologia e cookie",
"delete_wallet_note": "Reimposta tutti i dati del tuo portafoglio",
"delete_wallet_note": "Importa portafoglio/Reimposta tutti i dati del tuo portafoglio",
"clear_browser_history_note": "Cancellare cronologia del browser e cookie?",
"delete_wallet": "Ripristina portafoglio",
"export_wallet_note": "Esporta il portafoglio in memoria sicura",
Expand Down
4 changes: 2 additions & 2 deletions assets/flutter_i18n/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"active": "アクティブ",
"date": "日付",
"tx": "取引",
"manage_portfolio": "ポートフォリオを管理する",
"manage_portfolio": "トークンを送る/ポートフォリオを管理する",
"fiat_options": "FIATオプション",
"show/hide_balance": "残高の表示/非表示",
"balance": "残高",
Expand Down Expand Up @@ -229,7 +229,7 @@
"change_passcode_note": "現在のパスコードを変更してください。新しいパスコードを紛失した場合でも、ウォレットを再インポートすることでいつでも回復できます。",
"clear_browser_cache_note": "ブラウザの履歴とクッキーを消去してください",
"clear_browser_cache": "履歴とクッキーを消去",
"delete_wallet_note": "あなたのウォレットデータをすべてリセットします",
"delete_wallet_note": "ウォレットのインポート/あなたのウォレットデータをすべてリセットします",
"clear_browser_history_note": "ブラウザの履歴とクッキーを消去しますか?",
"delete_wallet": "ウォレットをリセット",
"export_wallet_note": "セキュアストレージにウォレットをエクスポートする",
Expand Down
4 changes: 2 additions & 2 deletions assets/flutter_i18n/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"active": "활성화",
"date": "날짜",
"tx": "거래",
"manage_portfolio": "포트폴리오 관리",
"manage_portfolio": "토큰 보내기/포트폴리오 관리",
"fiat_options": "현금자산 관리",
"show/hide_balance": "잔액 표시/숨기기",
"balance": "잔액",
Expand Down Expand Up @@ -229,7 +229,7 @@
"change_passcode_note": "현재 패스코드를 변경하세요. 새 패스코드를 잃어버린 경우, 지갑을 다시 가져오기로 항상 복구할 수 있습니다.",
"clear_browser_cache_note": "브라우저 기록과 쿠키를 삭제하세요",
"clear_browser_cache": "히스토리 & 쿠키 삭제",
"delete_wallet_note": "당신의 지갑 데이터를 모두 초기화하세요",
"delete_wallet_note": "지갑 가져오기/당신의 지갑 데이터를 모두 초기화하세요",
"clear_browser_history_note": "브라우저 기록과 쿠키를 삭제하시겠습니까?",
"delete_wallet": "지갑 초기화",
"export_wallet_note": "지갑을 안전한 저장소로 내보내기",
Expand Down
4 changes: 2 additions & 2 deletions assets/flutter_i18n/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"active": "Actief",
"date": "Datum",
"tx": "Transactie",
"manage_portfolio": "Beheer Portfolio",
"manage_portfolio": "Token versturen/Beheer Portfolio",
"fiat_options": "FIAT Opties",
"show/hide_balance": "Toon/Verberg Saldo",
"balance": "Saldo",
Expand Down Expand Up @@ -229,7 +229,7 @@
"change_passcode_note": "Wijzig uw huidige toegangscode. Als u uw nieuwe toegangscode verliest, kunt u deze altijd herstellen door uw wallet opnieuw te importeren.",
"clear_browser_cache_note": "Wis browsergeschiedenis en cookies",
"clear_browser_cache": "Wis geschiedenis & cookies",
"delete_wallet_note": "Reset al uw walletgegevens.",
"delete_wallet_note": "Portemonnee importeren/Reset al uw walletgegevens.",
"clear_browser_history_note": "Browsergeschiedenis en cookies wissen?",
"delete_wallet": "Wallet resetten",
"export_wallet_note": "Exporteer uw wallet naar een beveiligde opslag.",
Expand Down
4 changes: 2 additions & 2 deletions assets/flutter_i18n/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"active": "Ativo",
"date": "Data",
"tx": "Transação",
"manage_portfolio": "Gerenciar Portfólio",
"manage_portfolio": "Enviar token/Gerenciar Portfólio",
"fiat_options": "Opções FIAT",
"show/hide_balance": "Mostrar/Ocultar Saldo",
"balance": "Saldo",
Expand Down Expand Up @@ -229,7 +229,7 @@
"change_passcode_note": "Altere seu código de acesso atual. Se perder seu novo código, você sempre pode recuperá-lo ao reimportar sua carteira.",
"clear_browser_cache_note": "Limpe o histórico do navegador e os cookies",
"clear_browser_cache": "Limpar histórico & cookies",
"delete_wallet_note": "Redefina todos os dados da sua carteira",
"delete_wallet_note": "Importar carteira/Redefina todos os dados da sua carteira",
"clear_browser_history_note": "Limpar histórico do navegador e cookies?",
"delete_wallet": "Redefinir carteira",
"export_wallet_note": "Exportar carteira para armazenamento seguro",
Expand Down
4 changes: 2 additions & 2 deletions assets/flutter_i18n/ro.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"active": "Activă",
"date": "Dată",
"tx": "Tranzacție",
"manage_portfolio": "Gestionează Portofoliu",
"manage_portfolio": "Trimite token/Gestionează Portofoliu",
"fiat_options": "Opțiuni FIAT",
"show/hide_balance": "Afișează/Ascunde Balanța",
"balance": "Sold",
Expand Down Expand Up @@ -229,7 +229,7 @@
"change_passcode_note": "Schimbă-ți codul de acces actual. Dacă îți pierzi noul cod de acces, îl poți recupera oricând reimportând portofelul tău.",
"clear_browser_cache_note": "Șterge istoricul și cookie-urile browserului",
"clear_browser_cache": "Șterge istoricul & cookie-urile",
"delete_wallet_note": "Resetează toate datele portofelului tău",
"delete_wallet_note": "Importă portofelul/Resetează toate datele portofelului tău",
"clear_browser_history_note": "Ștergeți istoricul și cookie-urile browserului?",
"delete_wallet": "Resetează portofelul",
"export_wallet_note": "Exportați portofelul în spațiul de stocare securizat",
Expand Down
4 changes: 2 additions & 2 deletions assets/flutter_i18n/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"active": "Активный",
"date": "Дата",
"tx": "Транзакция",
"manage_portfolio": "Управление Портфелем",
"manage_portfolio": "Otpravit' token/Управление Портфелем",
"fiat_options": "Наличные",
"show/hide_balance": "Показать/Скрыть Баланс",
"balance": "Баланс",
Expand Down Expand Up @@ -229,7 +229,7 @@
"change_passcode_note": "Измените текущий пароль. Если вы потеряете новый пароль, всегда сможете восстановить его, повторно импортировав кошелек.",
"clear_browser_cache_note": "Очистите историю браузера и куки",
"clear_browser_cache": "Очистить историю и куки",
"delete_wallet_note": "Сбросьте все данные вашего кошелька",
"delete_wallet_note": "Импортировать кошелек/Сбросьте все данные вашего кошелька",
"clear_browser_history_note": "Очистить историю браузера и куки?",
"delete_wallet": "Сбросить кошелек",
"export_wallet_note": "Экспорт кошелька в защищенное хранилище",
Expand Down
4 changes: 2 additions & 2 deletions assets/flutter_i18n/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"active": "Aktif",
"date": "Tarih",
"tx": "İşlem",
"manage_portfolio": "Portföyü Yönet",
"manage_portfolio": "Token gönder/Portföyü Yönet",
"fiat_options": "FIAT Seçenekleri",
"show/hide_balance": "Bakiyeyi Göster/Gizle",
"balance": "Bakiye",
Expand Down Expand Up @@ -229,7 +229,7 @@
"change_passcode_note": "Mevcut şifrenizi değiştirin. Yeni şifrenizi kaybederseniz, cüzdanınızı yeniden içe aktararak her zaman kurtarabilirsiniz.",
"clear_browser_cache_note": "Tarayıcı geçmişini ve çerezleri temizle",
"clear_browser_cache": "Geçmişi temizle & çerezleri sil",
"delete_wallet_note": "Cüzdan verilerinizi sıfırlayın",
"delete_wallet_note": "Cüzdanı İçe Aktar/Cüzdan verilerinizi sıfırlayın",
"clear_browser_history_note": "Tarayıcı geçmişi ve çerezler temizlensin mi?",
"delete_wallet": "Cüzdanı sıfırla",
"export_wallet_note": "Cüzdanı güvenli depolamaya aktar",
Expand Down
4 changes: 2 additions & 2 deletions assets/flutter_i18n/vi.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"active": "Hoạt động",
"date": "Ngày",
"tx": "Giao dịch",
"manage_portfolio": "Quản lý Danh mục đầu tư",
"manage_portfolio": "Gửi token/Quản lý Danh mục đầu tư",
"fiat_options": "Tùy chọn FIAT",
"show/hide_balance": "Hiển thị/Ẩn Số dư",
"balance": "Số dư",
Expand Down Expand Up @@ -229,7 +229,7 @@
"change_passcode_note": "Đổi mã passcode hiện tại của bạn. Nếu bạn mất mã passcode mới, bạn luôn có thể khôi phục nó bằng cách nhập lại ví của bạn.",
"clear_browser_cache_note": "Xóa lịch sử trình duyệt và cookie",
"clear_browser_cache": "Xóa lịch sử & cookie",
"delete_wallet_note": "Đặt lại tất cả dữ liệu ví của bạn",
"delete_wallet_note": "Nhập ví/Đặt lại tất cả dữ liệu ví của bạn",
"clear_browser_history_note": "Xóa lịch sử trình duyệt và cookie?",
"delete_wallet": "Đặt lại ví",
"export_wallet_note": "Xuất ví vào bộ nhớ an toàn",
Expand Down
4 changes: 2 additions & 2 deletions assets/flutter_i18n/zh_CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"active": "活跃",
"date": "日期",
"tx": "交易",
"manage_portfolio": "管理投资组合",
"manage_portfolio": "发送Token/管理投资组合",
"fiat_options": "法币选项",
"show/hide_balance": "显示/隐藏余额",
"balance": "余额",
Expand Down Expand Up @@ -229,7 +229,7 @@
"change_passcode_note": "更改您当前的密码。如果您遗失了新密码,可以通过重新导入钱包来恢复。",
"clear_browser_cache_note": "清除浏览器历史记录和cookies",
"clear_browser_cache": "清除历史记录和cookies",
"delete_wallet_note": "重置您的所有钱包数据",
"delete_wallet_note": "导入钱包/重置您的所有钱包数据",
"clear_browser_history_note": "清除浏览器历史记录和cookies?",
"delete_wallet": "重置钱包",
"export_wallet_note": "将钱包导出到安全存储",
Expand Down
4 changes: 2 additions & 2 deletions assets/flutter_i18n/zh_TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"active": "活躍",
"date": "日期",
"tx": "交易",
"manage_portfolio": "管理投資組合",
"manage_portfolio": "發送Token管理投資組合",
"fiat_options": "法幣選項",
"show/hide_balance": "顯示/隱藏餘額",
"balance": "餘額",
Expand Down Expand Up @@ -229,7 +229,7 @@
"change_passcode_note": "更改您當前的密碼。如果您遺失了新的密碼,您可以通過重新導入您的錢包來恢復它。",
"clear_browser_cache_note": "清除瀏覽器歷史記錄和cookies",
"clear_browser_cache": "清除歷史記錄和cookies",
"delete_wallet_note": "重設所有的錢包數據",
"delete_wallet_note": "導入錢包/重設所有的錢包數據",
"clear_browser_history_note": "清除瀏覽器歷史記錄和cookies?",
"delete_wallet": "重設錢包",
"export_wallet_note": "將錢包導出到安全儲存區",
Expand Down
2 changes: 2 additions & 0 deletions ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@
<string>Would you allow AXS Wallet to use the Calendar?</string>
<key>NSCameraUsageDescription</key>
<string>AXS Wallet needs camera access to scan QR codes for transactions. Scanned data is stored locally and isn't shared.</string>
<key>NSMicrophoneUsageDescription</key>
<string>AXS Wallet needs microphone access to scan QR codes for transactions. Scanned data is stored locally and isn't shared.</string>
<key>NSContactsUsageDescription</key>
<string>Would you allow AXS Wallet to use the Contacts?</string>
<key>NSFaceIDUsageDescription</key>
Expand Down
14 changes: 14 additions & 0 deletions lib/common/components/recent_transactions/utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,20 @@ class RecentTransactionsUtils {
currentTx.value ?? '0', Config.ethDecimals);
logoUrl = Config.mxcLogoUri;
symbol = Config.mxcName;

if (currentTx.decodedInput != null) {
if (currentTx.to?.hash != null) {
final tokenIndex = tokensList
.indexWhere((element) => element.address == currentTx.to!.hash);
if (tokenIndex != -1) {
logoUrl = tokensList[tokenIndex].logoUri!;
}
symbol = currentTx.to!.name!;
amount = Formatter.convertWeiToEth(
currentTx.decodedInput?.parameters?[1].value ?? '0',
Config.ethDecimals);
}
}
} else if (currentTx.txTypes != null &&
currentTx.txTypes!.contains('coin_transfer')) {
logoUrl = Config.mxcLogoUri;
Expand Down
9 changes: 7 additions & 2 deletions lib/common/config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,13 @@ class Config {
"https://wannsee-erc20.mxc.com"
];

static String mainnetMns(String name) => 'https://mns.mxc.com/$name.mxc/register';
static String testnetMns(String name) => 'https://wannsee-mns.mxc.com/$name.mxc/register';
static String mainnetMns(String name) =>
'https://mns.mxc.com/$name.mxc/register';
static String testnetMns(String name) =>
'https://wannsee-mns.mxc.com/$name.mxc/register';

// Numbers fixed decimals
static int decimalFixed = 3;

static bool isMxcChains(int chainId) {
return chainId == mxcMainnetChainId || chainId == mxcTestnetChainId;
Expand Down
Loading

0 comments on commit 2597e8d

Please sign in to comment.