You are right: number is for countable nouns and amount is for uncountable nouns. However informally, many use amount for the former, especially when they are envisioning a single quantity.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.