Out of state rental and double taxation credit

On my home state (Oregon), the income TT shows on the double taxation screen is my net income from my out of state rental (in Hawaii).  Below that figure, it shows the "Total Tax Paid to Hawaii" and the amount is from my Hawaii State tax overpayment (refund), which I apply towards the 2025 estimated taxes.  To get my net income, I deduct my expenses, and include the real estate taxes paid and the GE (general excise) taxes paid.  Should I be excluding those taxes in figuring the net income and adding these taxes to the "Total Tax Paid to Hawaii" section that appears in the double taxation screen instead?  Thank you in advance for any help!