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

Rc/8.7.2 #1696

Merged
merged 37 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
ec7491c
Referendum Summary Backend
antonijzelinskij Oct 4, 2024
56c83b3
Changed api to chains api
antonijzelinskij Oct 4, 2024
97dcc5c
Run ktlint
antonijzelinskij Oct 4, 2024
0623d5a
Update SpannableExt.kt
antonijzelinskij Oct 4, 2024
143af64
Remove single referendum fetching
antonijzelinskij Oct 4, 2024
b1722e4
Fixed pr notes
antonijzelinskij Oct 4, 2024
2d235ba
Merge pull request #1682 from novasamatech/feature/swipe-gov-backend
antonijzelinskij Oct 4, 2024
16dd145
Fix - no historical delegations shown for finished delegations (#1680)
valentunn Oct 7, 2024
702649a
Chore/refactor network managment (#1681)
valentunn Oct 7, 2024
bc21bfc
Ledger external signing (#1679)
valentunn Oct 7, 2024
79ae97a
Fixed crash on delete chain
antonijzelinskij Oct 9, 2024
9249f38
Fixed binding for killder referenda
antonijzelinskij Oct 9, 2024
45e4254
Hide voting power button if swipe gov cards is empty
antonijzelinskij Oct 9, 2024
e26e612
Update TinderGovBasketFragment.kt
antonijzelinskij Oct 9, 2024
1dc5a61
Fixed JsonDeserializer
antonijzelinskij Oct 9, 2024
880c94f
Changed settings ordering
antonijzelinskij Oct 10, 2024
81d82cf
Block swipe gov for unsupported chains when proxied is using
antonijzelinskij Oct 10, 2024
bcc4564
Merge pull request #1685 from novasamatech/fix/killed-referenda-binding
antonijzelinskij Oct 10, 2024
9016888
Merge pull request #1686 from novasamatech/fix/hide-vote-settings-button
antonijzelinskij Oct 10, 2024
1533078
Merge pull request #1687 from novasamatech/fix/warning-dialog-button-…
antonijzelinskij Oct 10, 2024
ca7b644
Merge pull request #1688 from novasamatech/fix/add-network-exception
antonijzelinskij Oct 10, 2024
9b568d5
Merge pull request #1689 from novasamatech/feature/new-settings-order
antonijzelinskij Oct 10, 2024
de29966
Fixed past dates crashes
antonijzelinskij Oct 10, 2024
166755d
Merge pull request #1691 from novasamatech/fix/past-dates-crashes
antonijzelinskij Oct 11, 2024
8726252
rename string values
leohar Oct 11, 2024
a56f515
fix some strings
leohar Oct 14, 2024
d3cd237
Fixed ordering on settings
antonijzelinskij Oct 15, 2024
c0c8bb4
Merge branch 'master' into fix/master-dev-conflicts
antonijzelinskij Oct 15, 2024
47b7dd7
Merge pull request #1684 from novasamatech/fix/network-remove-crash
antonijzelinskij Oct 15, 2024
ebe260a
Redirect to wallet details
antonijzelinskij Oct 15, 2024
549b9d5
Merge pull request #1695 from novasamatech/fix/master-dev-conflicts
antonijzelinskij Oct 15, 2024
709e5ea
Merge pull request #1693 from novasamatech/fix/settings-ordering
antonijzelinskij Oct 15, 2024
70d4945
Merge branch 'develop' into feat/add_settings_localisation
antonijzelinskij Oct 15, 2024
8a34eb8
Merge pull request #1692 from novasamatech/feat/add_settings_localisa…
antonijzelinskij Oct 15, 2024
9af72ee
Run ktlint
antonijzelinskij Oct 15, 2024
127f873
Merge pull request #1690 from novasamatech/fix/swipe-gov-proxy-chain-…
antonijzelinskij Oct 15, 2024
16ebf40
Bump version code
antonijzelinskij Oct 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class MetadataShortenerTest : BaseIntegrationTest() {
extrinsicBuilder.nativeTransfer(accountId = signer.accountId, amount = BigInteger.ONE)
extrinsicBuilder.systemRemark(remark = byteArrayOf(1, 2, 3))

extrinsicBuilder.build()
extrinsicBuilder.buildExtrinsic()
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class MoonbaseSendIntagrationTest {

val extrinsic = extrinsicBuilderFactory.create(chain, signer, accountId)
.nativeTransfer(accountId, chain.utilityAsset.planksFromAmount(BigDecimal.ONE), keepAlive = true)
.build()
.buildExtrinsic().extrinsicHex

val hash = rpcCalls.submitExtrinsic(chain.id, extrinsic)

Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
buildscript {
ext {
// App version
versionName = '8.7.0'
versionCode = 155
versionName = '8.7.2'
versionCode = 156

applicationId = "io.novafoundation.nova"
releaseApplicationSuffix = "market"
Expand Down Expand Up @@ -51,7 +51,7 @@ buildscript {

web3jVersion = '4.9.5'

substrateSdkVersion = '2.1.4'
substrateSdkVersion = '2.2.0'

gifVersion = '1.2.19'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ private class WrapToListSerializer : JsonDeserializer<List<*>> {
}

return json.asJsonArray.map {
context.deserialize<Any?>(json, valueType)
context.deserialize<Any?>(it, valueType)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ fun Date.formatDateSinceEpoch(resourceManager: ResourceManager): String {
val currentDays = System.currentTimeMillis().daysFromMillis()
val diff = currentDays - time.daysFromMillis()

if (diff < 0) throw IllegalArgumentException("Past date should be less than current")
return when (diff) {
0L -> resourceManager.getString(R.string.today)
1L -> resourceManager.getString(R.string.yesterday)
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,7 @@
<string name="settings_biometric_not_ready_message">Por favor, asegúrate de que la biometría está activada en los Ajustes</string>
<string name="settings_biometric_not_ready_title">Biometría desactivada en los Ajustes</string>
<string name="settings_community">Comunidad</string>
<string name="settings_email">Email</string>
<string name="settings_email">Obtenga ayuda por Email</string>
<string name="settings_general">General</string>
<string name="settings_pin_code_verification_confirmation_message">Cada operación de firma en monederos con par de claves (creados en nova wallet o importados) debería requerir verificación PIN antes de construir la firma</string>
<string name="settings_pin_code_verification_confirmation_title">Solicitar autenticación para firmar operaciones</string>
Expand All @@ -1143,7 +1143,7 @@
<string name="settings_security">Seguridad</string>
<string name="settings_support">Soporte &amp; Retroalimentación</string>
<string name="settings_twitter">Twitter</string>
<string name="settings_wiki">Wiki</string>
<string name="settings_wiki">Wiki y centro de ayuda</string>
<string name="settings_youtube">Youtube</string>
<string name="setup_referendum_vote_conviction_info">La convicción se establecerá en 0.1x cuando se Abstenga</string>
<string name="setup_staking_conflict_message">No puedes hacer stake con Staking Directo y Pools de Nominación al mismo tiempo</string>
Expand Down
18 changes: 9 additions & 9 deletions common/src/main/res/values-fr-rFR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
<string name="assets_balance_details_locks_staking">Staking</string>
<string name="assets_balance_details_locks_vesting">Acquisition</string>
<string name="assets_buy_tokens_placeholder_button">Acheter des tokens</string>
<string name="assets_crowdloan_unlock_banner_description">Vous avez récupéré vos DOT des crowdloans ? Commencez à <font>staker</font> vos DOT aujourd\'hui pour obtenir les récompenses maximales !</string>
<string name="assets_crowdloan_unlock_banner_description">Vous avez récupéré vos DOT des crowdloans ? Commencez à staker vos DOT aujourd\'hui pour obtenir les récompenses maximales !</string>
<string name="assets_crowdloan_unlock_banner_title">Boostez vos DOT 🚀</string>
<string name="assets_filter_title">Filtrer les actifs</string>
<string name="assets_manage_tokens_all_networks">Tous les réseaux</string>
Expand Down Expand Up @@ -525,10 +525,10 @@
<string name="connections_add_connection">Ajouter une connexion</string>
<string name="contacts_scan">Scannez le code QR</string>
<string name="corrupted_backup_error_subtitle">Un problème a été identifié avec votre sauvegarde. Vous avez la possibilité de supprimer la sauvegarde actuelle et d\'en créer une nouvelle. %s avant de continuer.</string>
<string name="corrupted_backup_error_subtitle_highlighted"><font>Assurez-vous d\'avoir sauvegardé les phrases secrètes pour tous les portefeuilles</font></string>
<string name="corrupted_backup_error_subtitle_highlighted">Assurez-vous d\'avoir sauvegardé les phrases secrètes pour tous les portefeuilles</string>
<string name="corrupted_backup_error_title">Sauvegarde trouvée mais vide ou corrompue</string>
<string name="create_cloud_backup_password_alert_subtitle">À l\'avenir, sans le mot de passe de sauvegarde, il est impossible de restaurer vos portefeuilles à partir de la Sauvegarde Cloud.\n%s</string>
<string name="create_cloud_backup_password_alert_subtitle_highlighted"><font>Ce mot de passe ne peut pas être récupéré.</font></string>
<string name="create_cloud_backup_password_alert_subtitle_highlighted">Ce mot de passe ne peut pas être récupéré.</string>
<string name="create_cloud_backup_password_alert_title">Souvenez-vous du mot de passe de sauvegarde</string>
<string name="create_cloud_backup_password_input_confirm_hint">Confirmer le mot de passe</string>
<string name="create_cloud_backup_password_input_hint">Mot de passe de sauvegarde</string>
Expand Down Expand Up @@ -1131,7 +1131,7 @@
<string name="settings_biometric_not_ready_message">Veuillez vous assurer que la biométrie est activée dans les paramètres</string>
<string name="settings_biometric_not_ready_title">La biométrie est désactivée dans les paramètres</string>
<string name="settings_community">Communauté</string>
<string name="settings_email">E-mail</string>
<string name="settings_email">Obtenez de l\'aide par Email</string>
<string name="settings_general">Général</string>
<string name="settings_pin_code_verification_confirmation_message">Chaque opération de signature sur les portefeuilles avec paire de clés (créée dans Nova Wallet ou importée) doit nécessiter une vérification PIN avant de construire la signature</string>
<string name="settings_pin_code_verification_confirmation_title">Demander une authentification pour signer les opérations</string>
Expand All @@ -1143,7 +1143,7 @@
<string name="settings_security">Sécurité</string>
<string name="settings_support">Assistance et commentaires</string>
<string name="settings_twitter">Twitter</string>
<string name="settings_wiki">Wiki</string>
<string name="settings_wiki">Wiki et centre d\'aide</string>
<string name="settings_youtube">YouTube</string>
<string name="setup_referendum_vote_conviction_info">La conviction sera fixée à 0,1x lorsque vous vous abstenez</string>
<string name="setup_staking_conflict_message">Vous ne pouvez pas staker avec le Stake direct et les Pools de Nomination en même temps</string>
Expand Down Expand Up @@ -1417,7 +1417,7 @@
<string name="staking_turing_restake_title">Je veux staker</string>
<string name="staking_turing_yield_boost">Yield Boost</string>
<string name="staking_type_title">Type de staking</string>
<string name="staking_unable_to_stake_more_message">Vous retirez tous vos tokens et ne pouvez pas en <font>stake</font> davantage.</string>
<string name="staking_unable_to_stake_more_message">Vous retirez tous vos tokens et ne pouvez pas en stake davantage.</string>
<string name="staking_unable_to_stake_more_title">Impossible de stake plus</string>
<string name="staking_unbond_crossed_existential" formatted="false">Lors d\'un retrait partiel, vous devez laisser au moins %s en jeu. Voulez-vous effectuer un retrait complet en libérant également %s restants?</string>
<string name="staking_unbond_crossed_existential_title">Montant trop faible reste en stake</string>
Expand Down Expand Up @@ -1466,8 +1466,8 @@
<string name="start_create_wallet_name_your_wallet">Donnez un nom à votre portefeuille</string>
<string name="start_create_wallet_set_wallet_name_explanation">Cela ne sera visible que par vous et vous pourrez le modifier plus tard.</string>
<string name="start_create_wallet_your_wallet_is_ready">Votre portefeuille est prêt</string>
<string name="start_staking_available_balance_gap_message" formatted="false">Vous avez des tokens verrouillés sur votre solde en raison de %s. Pour continuer, vous devez entrer moins de %s ou plus de %s. Pour <font>stake</font> un autre montant, vous devez supprimer vos verrous %s.</string>
<string name="start_staking_cant_stake_amount">Vous ne pouvez pas <font>stake</font> le montant spécifié</string>
<string name="start_staking_available_balance_gap_message" formatted="false">Vous avez des tokens verrouillés sur votre solde en raison de %s. Pour continuer, vous devez entrer moins de %s ou plus de %s. Pour stake un autre montant, vous devez supprimer vos verrous %s.</string>
<string name="start_staking_cant_stake_amount">Vous ne pouvez pas stake le montant spécifié</string>
<string name="start_staking_editing_selection_validators_subtitle" formatted="false">Sélectionné : %d (max %d)</string>
<string name="start_staking_fragment_available_balance">Solde disponible : %1$s (%2$s)</string>
<string name="start_staking_fragment_governance_participation_no_conditions">%s avec vos tokens staked</string>
Expand Down Expand Up @@ -1563,7 +1563,7 @@
<string name="swipe_gov_card_data_loading_error_title">Aucune donnée récupérée</string>
<string name="swipe_gov_card_placeholder_basket_empty_text">Vous avez déjà voté pour tous les référendums disponibles ou il n\'y a pas de référendums pour voter en ce moment. Revenez plus tard.</string>
<string name="swipe_gov_card_placeholder_basket_full_text">Vous avez déjà voté pour tous les référendums disponibles</string>
<string name="swipe_gov_card_requested_title"><font>Demandé :</font></string>
<string name="swipe_gov_card_requested_title">Demandé :</string>
<string name="swipe_gov_cards_basket_title">Liste de vote</string>
<string name="swipe_gov_cards_counter">%d restant</string>
<string name="swipe_gov_cards_full_list">Confirmer les votes</string>
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/res/values-in/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,7 @@
<string name="settings_biometric_not_ready_message">Pastikan biometrik diaktifkan dalam Pengaturan</string>
<string name="settings_biometric_not_ready_title">Biometrik dinonaktifkan dalam Pengaturan</string>
<string name="settings_community">Komunitas</string>
<string name="settings_email">Email</string>
<string name="settings_email">Dapatkan dukungan melalui Email</string>
<string name="settings_general">Umum</string>
<string name="settings_pin_code_verification_confirmation_message">Setiap operasi tanda tangan pada dompet dengan pasangan kunci (dibuat di dompet nova atau diimpor) harus memerlukan verifikasi PIN sebelum membuat tanda tangan</string>
<string name="settings_pin_code_verification_confirmation_title">Minta autentikasi untuk penandatanganan operasi</string>
Expand All @@ -1135,7 +1135,7 @@
<string name="settings_security">Keamanan</string>
<string name="settings_support">Dukungan &amp; Masukan</string>
<string name="settings_twitter">Twitter</string>
<string name="settings_wiki">Wiki</string>
<string name="settings_wiki">Wiki &amp; Pusat Bantuan</string>
<string name="settings_youtube">Youtube</string>
<string name="setup_referendum_vote_conviction_info">Keyakinan akan diatur ke 0,1x ketika Abstain</string>
<string name="setup_staking_conflict_message">Anda tidak dapat melakukan staking dengan Staking Langsung dan Pool Nominasi pada saat yang sama</string>
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,7 @@
<string name="settings_biometric_not_ready_message">Si prega, assicurarsi che la biometria sia abilitata nelle impostazioni</string>
<string name="settings_biometric_not_ready_title">Biometria disabilitata nelle impostazioni</string>
<string name="settings_community">Comunità</string>
<string name="settings_email">Email</string>
<string name="settings_email">Ottieni supporto via Email</string>
<string name="settings_general">Generale</string>
<string name="settings_pin_code_verification_confirmation_message">Ogni operazione di firma sui portafogli con coppia di chiavi (creata in un portafoglio di nova o importata) dovrebbe richiedere la verifica del PIN prima di costruire la firma</string>
<string name="settings_pin_code_verification_confirmation_title">Richiedi autenticazione per la firma operazioni</string>
Expand All @@ -1143,7 +1143,7 @@
<string name="settings_security">Sicurezza</string>
<string name="settings_support">Supporto e Feedback</string>
<string name="settings_twitter">Twitter</string>
<string name="settings_wiki">Wiki</string>
<string name="settings_wiki">Wiki e Centro assistenza</string>
<string name="settings_youtube">Youtube</string>
<string name="setup_referendum_vote_conviction_info">La convinzione sarà impostata a 0.1x quando Abstain</string>
<string name="setup_staking_conflict_message">Non puoi fare staking contemporaneamente con Direct Staking e con Nomination Pools</string>
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,7 @@
<string name="settings_biometric_not_ready_message">設定で生体認証が有効になっていることを確認してください</string>
<string name="settings_biometric_not_ready_title">設定で生体認証が無効になっています</string>
<string name="settings_community">コミュニティ</string>
<string name="settings_email">Eメール</string>
<string name="settings_email">メールでサポートを受ける</string>
<string name="settings_general">一般</string>
<string name="settings_pin_code_verification_confirmation_message">ウォレットでの署名操作(Nova Walletで作成またはインポートされたもの)は、署名の作成前にPIN確認が必要です</string>
<string name="settings_pin_code_verification_confirmation_title">操作の署名に認証を要求</string>
Expand All @@ -1135,7 +1135,7 @@
<string name="settings_security">セキュリティ</string>
<string name="settings_support">サポート&フィードバック</string>
<string name="settings_twitter">Twitter</string>
<string name="settings_wiki">ウィキ</string>
<string name="settings_wiki">ウィキとヘルプセンター</string>
<string name="settings_youtube">Youtube</string>
<string name="setup_referendum_vote_conviction_info">棄権時には信念が0.1xに設定されます</string>
<string name="setup_staking_conflict_message">Direct StakingとNomination Poolsを同時にステークすることはできません</string>
Expand Down
12 changes: 6 additions & 6 deletions common/src/main/res/values-ko/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -564,8 +564,8 @@
<string name="crowdloan_ended_title">크라우드론 종료됨</string>
<string name="crowdloan_enter_referral">추천 코드를 입력하세요</string>
<string name="crowdloan_info">크라우드론 정보</string>
<string name="crowdloan_learn"><![CDATA[<font>크라우드론</font> %s 배우기]]></string>
<string name="crowdloan_learn_v2_2_0"><![CDATA[%s의 <font>크라우드론</font> 웹사이트]]></string>
<string name="crowdloan_learn">크라우드론 %s 배우기</string>
<string name="crowdloan_learn_v2_2_0">%s의 크라우드론 웹사이트</string>
<string name="crowdloan_leasing_period">임대 기간</string>
<string name="crowdloan_main_description_v2_2_0">파라체인을 선택하여 %s을(를) 기여하세요. 기여한 토큰을 돌려받게 되며, 파라체인이 슬롯에 당선되면 경매 종료 후 보상을 받게 됩니다.</string>
<string name="crowdloan_missing_account_message">기여를 위해 지갑에 %s 계정을 추가해야 합니다.</string>
Expand Down Expand Up @@ -821,7 +821,7 @@
<string name="manual_backup_warning_title">비밀번호 구절을 공유하지 마세요!</string>
<string name="mnemonic_card_reveal_subtitle">아무도 화면을 볼 수 없도록 하고\n스크린샷을 찍지 마세요</string>
<string name="mnemonic_card_title">아무에게도 %s 하지 마세요</string>
<string name="mnemonic_card_title_highlight"><font>공유하지 마세요</font></string>
<string name="mnemonic_card_title_highlight">공유하지 마세요</string>
<string name="mnemonic_error_try_another_one">다른 것을 시도해 보세요.</string>
<string name="mnemonic_error_try_another_one_v2_2_0">유효하지 않은 니모닉 구절입니다. 단어 순서를 다시 한번 확인하세요</string>
<string name="multiple_wallets_selection_max_message">%d 개 이상의 지갑을 선택할 수 없습니다</string>
Expand Down Expand Up @@ -1123,7 +1123,7 @@
<string name="settings_biometric_not_ready_message">설정에서 생체 인식이 활성화되었는지 확인하세요</string>
<string name="settings_biometric_not_ready_title">설정에서 생체 인식이 비활성화되었습니다</string>
<string name="settings_community">커뮤니티</string>
<string name="settings_email">이메일</string>
<string name="settings_email">이메일을 통해 지원 받기</string>
<string name="settings_general">일반</string>
<string name="settings_pin_code_verification_confirmation_message">키 페어가 있는 지갑(Nova Wallet에서 생성 또는 가져옴)에 대한 각 서명 작업은 서명을 생성하기 전에 PIN 확인이 필요합니다</string>
<string name="settings_pin_code_verification_confirmation_title">작업 서명을 위해 인증 요청</string>
Expand All @@ -1135,9 +1135,9 @@
<string name="settings_security">보안</string>
<string name="settings_support">지원 및 피드백</string>
<string name="settings_twitter">Twitter</string>
<string name="settings_wiki">위키</string>
<string name="settings_wiki">위키 및 도움말 센터</string>
<string name="settings_youtube">Youtube</string>
<string name="setup_referendum_vote_conviction_info"><font>기권</font> 시 확신도가 0.1x로 설정됩니다</string>
<string name="setup_referendum_vote_conviction_info">기권 시 확신도가 0.1x로 설정됩니다</string>
<string name="setup_staking_conflict_message">직접 Staking과 Nomination Pools를 동시에 사용할 수 없습니다</string>
<string name="setup_staking_conflict_title">이미 Staking 중</string>
<string name="setup_staking_type_advanced_options_condition">고급 Staking 관리</string>
Expand Down
Loading
Loading