From dcd1ea25827fef34c72b5c814d3fb21efb2fc8b8 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Mon, 16 May 2022 22:33:16 -0600
Subject: [PATCH] Fix order of object override when copying identity server
 terms state

Fixes https://github.com/vector-im/element-web/issues/20003
---
 .../views/settings/tabs/user/GeneralUserSettingsTab.tsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
index 36d3e55d852..e0874084251 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
@@ -211,8 +211,8 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
             // User accepted all terms
             this.setState({
                 requiredPolicyInfo: {
+                    ...this.state.requiredPolicyInfo, // set first so we can override
                     hasTerms: false,
-                    ...this.state.requiredPolicyInfo,
                 },
             });
         } catch (e) {