Short answer: Yes, Hasya (laughter) and Jugupsa (disgust) are discussed in Jain texts as expressions that can accompany the main kashayas, but the classical list of kashayas (passions) is six.

What are the main kashayas (six passions)?

• Raga (attachment/greed)
• Dvesha (aversion/hatred)
• Moha (delusion/ignorance)
• Mada (pride)
• Matsarya (envy/jealousy)
• Krodha (anger)

Hasya and Jugupsa are not counted as one of these six primary kashayas in the core Jain doctrine. They are understood as mental or emotional expressions that can arise in the mind as a result of or alongside these main kashayas, and they are discussed in various Jain commentaries as secondary or peripheral mental states that can cloud discrimination.

Note on tradition:

• The basic six kashayas are consistently taught across Digambara and Śvetāmbara sources.
• Some texts and commentators describe additional nuanced mental states or relate Hasya and Jugupsa to the kashayas in different ways, but the authoritative core remains the six listed above.

If you’d like, I can point you to a JainKnowledge page that discusses kashayas and how Hasya/Jugupsa relate to them. You can read more here