The House just passed a short-term spending bill, by a vote of 301-123, to take the country through until the week before Thanksgiving. By Congress' standards, this is actually kind of impressive. It's only Sept. 19, which means there's a whole two weeks before the end of the fiscal year and the government running out of money. The Senate is expected to pass it and Trump to sign it sometime next week.
It includes compromises on issues that had held up the bill, which was supposed to have been done last week. Democrats wanted both funding for Medicaid for Puerto Rico, which is subject to a block grant kind of spending mechanism and had reached a crisis point in funding, and also some restrictions or transparency on Trump's ongoing bailout for farmers. Now the Department of Agriculture is going to be required to report to Congress by the end of October on payments made to foreign-owned companies.
They left out anything related to border wall funding; that fight will have to happen later. And will, probably after a second short-term funding bill that will almost certainly follow this one, and which will last until just before Christmas. That will probably be when the big fight and shutdown threats happen. Because that's the world we now live in. But at least this is one crisis postponed.