[stable2503] Backport #7671

[paritytech-release-backport-bot]

Backport #7671 into stable2503 from pandres95.

See the documentation on how to use this bot.

[paritytech-release-backport-bot]

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-7671-to-stable2503
git worktree add --checkout .worktree/backport-7671-to-stable2503 backport-7671-to-stable2503
cd .worktree/backport-7671-to-stable2503
git reset --hard HEAD^
git cherry-pick -x 467d1f642c8d5d6b11c45e5212f546af86b6f6e4
git push --force-with-lease

[EgorPopelyaev]

@pandres95 Could you please check the conflict resolution traces here

[pandres95]

@ggwpez @EgorPopelyaev

diff --git a/substrate/frame/referenda/src/types.rs b/substrate/frame/referenda/src/types.rs
index 7bdd4f77e75..9ddb83241b8 100644
--- a/substrate/frame/referenda/src/types.rs
+++ b/substrate/frame/referenda/src/types.rs
@@ -19,11 +19,7 @@
 
 use super::*;
 use alloc::borrow::Cow;
-<<<<<<< HEAD
-use codec::{Decode, Encode, EncodeLike, MaxEncodedLen};
-=======
 use codec::{Compact, Decode, DecodeWithMemTracking, Encode, EncodeLike, Input, MaxEncodedLen};
->>>>>>> 467d1f6 (Fix: [Referenda Tracks] Resolve representation issues that are breaking PJS apps (#7671))
 use core::fmt::Debug;
 use frame_support::{
        traits::{schedule::v3::Anon, Bounded},
@@ -171,15 +167,10 @@ pub type ConstTrackInfo<Balance, Moment, const N: usize = DEFAULT_MAX_TRACK_NAME
        TrackDetails<Balance, Moment, StringLike<N>>;
 
 /// Detailed information about the configuration of a referenda track
-<<<<<<< HEAD
-#[derive(Clone, Encode, Decode, MaxEncodedLen, TypeInfo, Eq, PartialEq, Debug)]
-pub struct TrackInfo<Balance, Moment, const N: usize = DEFAULT_MAX_TRACK_NAME_LEN> {
-=======
 #[derive(
        Clone, Encode, Decode, DecodeWithMemTracking, MaxEncodedLen, TypeInfo, Eq, PartialEq, Debug,
 )]
 pub struct TrackDetails<Balance, Moment, Name> {
->>>>>>> 467d1f6 (Fix: [Referenda Tracks] Resolve representation issues that are breaking PJS apps (#7671))
        /// Name of this track.
        pub name: Name,
        /// A limit for the number of referenda on this track that can be being decided at once.

[github-actions]

This pull request is amending an existing release. Please proceed with extreme caution,
as to not impact downstream teams that rely on the stability of it. Some things to consider:

• Backports are only for 'patch' or 'minor' changes. No 'major' or other breaking change.
• Should be a legit fix for some bug, not adding tons of new features.
• Must either be already audited or not need an audit.

Emergency Bypass

If you really need to bypass this check: add validate: false to each crate
in the Prdoc where a breaking change is introduced. This will release a new major
version of that crate and all its reverse dependencies and basically break the release.

[paritytech-workflow-stopper]

All GitHub workflows were cancelled due to failure one of the required jobs.
Failed workflow url: https://github.com/paritytech/polkadot-sdk/actions/runs/14087407934
Failed job name: test-linux-stable