From 2bddadc14e2387b64c63698acfd8249ef8a23afa Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Tue, 17 May 2022 00:20:16 -0600
Subject: [PATCH] Fix order of object override when copying identity server
 terms state (#8619)

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 36d3e55d85..e087408425 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) {