Which country fought a war in vietnam just before the uniyed states

Before the United States directly got involved in the Vietnam war, the French had been fighting against the Vietminh. America was sending millions of dollars to aid France, but the money went to waste after North Vietnam launched an attack on the French post at Dien Bien Phu and after months of bombardment the French finally were kicked out of Vietnam.