Lithium supply for the US was an issue until the deposits in Southern California and Nevada were investigated. Now the US has enough reserves for 50 years of EV production. That was until the reserves on Oregon Nevada border were discovered and appear to be the largest deposit in the world.
Cobalt and nickel are being deigned out of batteries (LFP and Li Sulfur batteries etc)

As to motor and generators rare earths are being minimized. Not sure how far that process will go.

In any case I agree Ukraine will trade minerals rights for security. The natural gas deposits are more valuable to the EU. That might yield a better result.