fix: remove duplicate translations and when view is used in context n…

…etwork switching show only the expected content and hide the rest
MetaMask · Sep 25, 2024 · e63b9d8 · e63b9d8
1 parent 94a6cd2
commit e63b9d8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/app/components/UI/PermissionsSummary/PermissionsSummary.tsx b/app/components/UI/PermissionsSummary/PermissionsSummary.tsx
@@ -48,6 +48,7 @@ const PermissionsSummary = ({
   isAlreadyConnected = true,
   isRenderedAsBottomSheet = true,
   isDisconnectAllShown = true,
+  isNetworkSwitch = false,
 }: PermissionsSummaryProps) => {
   const { colors } = useTheme();
   const { styles } = useStyles(styleSheet, { isRenderedAsBottomSheet });
@@ -224,7 +225,7 @@ const PermissionsSummary = ({
               </View>
             </View>
           </View>
-          {renderEndAccessory()}
+          {!isNetworkSwitch && renderEndAccessory()}
         </View>
       </TouchableOpacity>
     );
@@ -237,7 +238,7 @@ const PermissionsSummary = ({
           {renderHeader()}
           <View style={styles.title}>
             <TextComponent variant={TextVariant.HeadingSM}>
-              {!isAlreadyConnected
+              {!isAlreadyConnected || isNetworkSwitch
                 ? strings('permissions.title_dapp_url_wants_to', {
                     dappUrl: new URL(currentPageInformation.url).hostname,
                   })
@@ -246,7 +247,7 @@ const PermissionsSummary = ({
                   })}
             </TextComponent>
           </View>
-          {renderAccountPermissionsRequestInfoCard()}
+          {!isNetworkSwitch && renderAccountPermissionsRequestInfoCard()}
           {renderNetworkPermissionsRequestInfoCard()}
         </View>
         <View>

diff --git a/app/components/UI/PermissionsSummary/PermissionsSummary.types.ts b/app/components/UI/PermissionsSummary/PermissionsSummary.types.ts
@@ -14,4 +14,5 @@ export interface PermissionsSummaryProps {
   isAlreadyConnected?: boolean;
   isRenderedAsBottomSheet?: boolean;
   isDisconnectAllShown?: boolean;
+  isNetworkSwitch?: boolean;
 }
diff --git a/app/components/UI/SwitchCustomNetwork/index.js b/app/components/UI/SwitchCustomNetwork/index.js
@@ -173,6 +173,7 @@ const SwitchCustomNetwork = ({
       onCancel={onCancel}
       onConfirm={onConfirm}
       isDisconnectAllShown={false}
+      isNetworkSwitch
     />
   );
 

diff --git a/locales/languages/en.json b/locales/languages/en.json
@@ -1804,17 +1804,6 @@
     "edit": "Edit",
     "cancel": "Cancel"
   },
-  "permissions": {
-    "title_this_site_wants_to": "This site wants to:",
-    "title_dapp_url_wants_to": "{{dappUrl}} wants to:",
-    "title_dapp_url_has_approval_to": "{{dappUrl}} has approval to:",
-    "use_enabled_networks": "Use your enabled networks",
-    "wants_to_see_your_accounts": "See your accounts and suggest transactions",
-    "requesting_for": "Requesting for ",
-    "manage_permissions": "Manage Permissions",
-    "edit": "Edit",
-    "cancel": "Cancel"
-  },
   "select": {
     "cancel": "Cancel",
     "done": "Done"