Wi-Fi doesn't work after activing EDGE data
I've had the 3GS on T-Mobile USA for about a month and the Wi-Fi has been working great. 2 days ago, I activated the EDGE data and now EDGE works fine but when I turn on Wi-Fi, it doesn't find any. My friends iPhone that's on T-Mobile can find all the Wi-Fi networks but mine can't after I entered the information in Settings > General > Network > Cellular Data Network. I got the info from my friends 3G that's on Tmo. His EDGE and Wi-Fi work great.
The info is
Cellular Data > APN: internet2.voicestream.com
MMS > APN: wap.voicestream.com