fix: regression issues

TERITORI · Dec 29, 2023 · b454516 · b454516
1 parent 8ef93bc
commit b454516
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 23 deletions.
diff --git a/packages/components/NetworkSelector/NetworkSelector.tsx b/packages/components/NetworkSelector/NetworkSelector.tsx
@@ -64,6 +64,7 @@ export const NetworkSelector: React.FC<{
           forceNetworkId={forceNetworkId}
           forceNetworkKind={forceNetworkKind}
           forceNetworkFeatures={forceNetworkFeatures}
+          onSelect={() => setDropdownState(false)}
         />
       )}
     </View>

diff --git a/packages/components/NetworkSelector/NetworkSelectorMenu.tsx b/packages/components/NetworkSelector/NetworkSelectorMenu.tsx
@@ -28,7 +28,14 @@ export const NetworkSelectorMenu: FC<{
   forceNetworkKind?: NetworkKind;
   forceNetworkFeatures?: NetworkFeature[];
   style?: StyleProp<ViewStyle>;
-}> = ({ forceNetworkId, forceNetworkKind, forceNetworkFeatures, style }) => {
+  onSelect: () => void;
+}> = ({
+  forceNetworkId,
+  forceNetworkKind,
+  forceNetworkFeatures,
+  style,
+  onSelect,
+}) => {
   const { resetMediaPlayer } = useMediaPlayer();
   const dispatch = useAppDispatch();
   const { wallets } = useWallets();
@@ -39,6 +46,7 @@ export const NetworkSelectorMenu: FC<{
   const isMobile = useIsMobile();
 
   const onPressNetwork = (networkId: string) => {
+    onSelect();
     let walletProvider: WalletProvider | null = null;
 
     const network = getNetwork(networkId);

diff --git a/packages/components/NetworkSelector/NetworkSelectorMobile.tsx b/packages/components/NetworkSelector/NetworkSelectorMobile.tsx
@@ -51,6 +51,7 @@ export const NetworkSelectorMobile: React.FC<{
           forceNetworkId={forceNetworkId}
           forceNetworkKind={forceNetworkKind}
           forceNetworkFeatures={forceNetworkFeatures}
+          onSelect={() => setDropdownState(false)}
         />
       )}
     </View>

diff --git a/packages/components/TopMenu/TopMenuMobile.tsx b/packages/components/TopMenu/TopMenuMobile.tsx
@@ -13,28 +13,31 @@ export const TopMenuMobile: FC = () => {
   const selectedWallet = useSelectedWallet();
 
   return (
-    <View ref={dropdownRef} collapsable={false}>
-      <TouchableOpacity onPress={() => setDropdownState(false)}>
+    <View>
+      <TouchableOpacity onPress={() => setDropdownState(true)}>
         <UserAvatarWithFrame size="XXS" userId={selectedWallet?.userId} />
       </TouchableOpacity>
-
-      <TopMenuBox
-        style={[
-          {
-            backgroundColor: neutral00,
-            position: "absolute",
-            top: 48,
-            right: -60,
-          },
-          !isDropdownOpen && { display: "none" },
-        ]}
-        mainContainerStyle={{
-          borderTopWidth: 0,
-          borderRightWidth: 0,
-          borderTopRightRadius: 0,
-          borderBottomRightRadius: 0,
-        }}
-      />
+      <View ref={dropdownRef} collapsable={false}>
+        <TopMenuBox
+          ref={dropdownRef}
+          collapsable={false}
+          style={[
+            {
+              backgroundColor: neutral00,
+              position: "absolute",
+              top: 48,
+              right: -60,
+            },
+            !isDropdownOpen && { display: "none" },
+          ]}
+          mainContainerStyle={{
+            borderTopWidth: 0,
+            borderRightWidth: 0,
+            borderTopRightRadius: 0,
+            borderBottomRightRadius: 0,
+          }}
+        />
+      </View>
     </View>
   );
 };
diff --git a/packages/components/toasts/Toast.tsx b/packages/components/toasts/Toast.tsx
@@ -42,8 +42,8 @@ export const Toast: React.FC<{
     <TouchableOpacity
       onPress={onPress}
       style={{
-        maxWidth: width,
-        width,
+        maxWidth: Math.min(TOAST_WIDTH, width),
+        width: Math.min(TOAST_WIDTH, width),
         height: "auto",
         position: "absolute",
         top: insets.top + layout.spacing_x1,