Merge branch 'WietseWind:main' into main

Author: Ekiserrepe

android/app/build.gradle

@@ -7,7 +7,7 @@ apply plugin: "com.google.firebase.crashlytics"
 import com.android.build.OutputFile
 
 def canonicalVersionName = "4.0.0"
-def canonicalVersionCode = 83
+def canonicalVersionCode = 85
 
 // NOTE: DO NOT change postFixSize value, this is for handling legacy method for handling the versioning in android
 def postFixSize = 30_000

ios/Xaman.xcodeproj/project.pbxproj

@@ -1070,7 +1070,7 @@
 					"${PODS_ROOT}/Firebase/CoreOnly/Sources",
 					"\"$(PODS_ROOT)/boost\"",
 					"\"$(PODS_ROOT)/Headers/Private/React-Core\"",
-					"$CONFIGURATION_TEMP_DIR/Xaman.build/DerivedSources",
+					$CONFIGURATION_TEMP_DIR/Xaman.build/DerivedSources,
 				);
 				INFOPLIST_FILE = XamanTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
@@ -1155,7 +1155,7 @@
 					"${PODS_ROOT}/Firebase/CoreOnly/Sources",
 					"\"$(PODS_ROOT)/boost\"",
 					"\"$(PODS_ROOT)/Headers/Private/React-Core\"",
-					"$CONFIGURATION_TEMP_DIR/Xaman.build/DerivedSources",
+					$CONFIGURATION_TEMP_DIR/Xaman.build/DerivedSources,
 				);
 				INFOPLIST_FILE = XamanTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
@@ -1183,7 +1183,7 @@
 				CODE_SIGN_ENTITLEMENTS = Xaman/Xaman.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 85;
 				DEVELOPMENT_TEAM = LK5BBJNJZ6;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1194,7 +1194,7 @@
 				INFOPLIST_FILE = Xaman/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.0.0;
+				MARKETING_VERSION = 4.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1219,13 +1219,13 @@
 				CODE_SIGN_ENTITLEMENTS = Xaman/Xaman.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 85;
 				DEVELOPMENT_TEAM = LK5BBJNJZ6;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				INFOPLIST_FILE = Xaman/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.0.0;
+				MARKETING_VERSION = 4.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1271,8 +1271,8 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
 				CXX = "";
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;

ios/Xaman/Info.plist

@@ -54,7 +54,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>83</string>
+	<string>85</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/XamanTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>83</string>
+	<string>85</string>
 </dict>
 </plist>

src/common/helpers/navigator.ts

@@ -1,4 +1,4 @@
-import { get } from 'lodash';
+import { get, merge } from 'lodash';
 import { Platform, InteractionManager } from 'react-native';
 
 import { Navigation, Options, LayoutTabsChildren } from 'react-native-navigation';
@@ -320,7 +320,7 @@ const Navigator = {
                     name: overlay,
                     id: overlay,
                     passProps: Object.assign(passProps, { componentType: ComponentTypes.Overlay }),
-                    options: {
+                    options: merge({
                         overlay: {
                             handleKeyboardEvents: true,
                         },
@@ -334,8 +334,7 @@ const Navigator = {
                               waitForRender: true, // Wait for the component to render before ANY transitions
                             },
                         },
-                        ...options,
-                    },
+                    }, options || {}),
                 },
             });
         }

src/components/General/SwipeButton/SwipeButton.tsx

@@ -59,6 +59,7 @@ class SwipeButton extends Component<Props, State> {
     };
 
     private animatedWidth: Animated.Value;
+    // private animatedWidth: number;
     private defaultContainerWidth: number;
     private maxWidth: number;
     private panResponder: any;
@@ -76,6 +77,7 @@ class SwipeButton extends Component<Props, State> {
         this.defaultContainerWidth = AppSizes.scale(45);
         this.maxWidth = 0;
         this.animatedWidth = new Animated.Value(this.defaultContainerWidth);
+        // this.animatedWidth = this.defaultContainerWidth;
 
         this.panResponder = PanResponder.create({
             onStartShouldSetPanResponder: () => true,
@@ -138,10 +140,11 @@ class SwipeButton extends Component<Props, State> {
     };
 
     changePosition = (width: number) => {
+        // this.animatedWidth = width;
         Animated.timing(this.animatedWidth, {
             toValue: width,
             duration: 400,
-            useNativeDriver: false,
+            useNativeDriver: true,
         }).start();
     };
 
@@ -194,11 +197,8 @@ class SwipeButton extends Component<Props, State> {
             // Reached end position
             this.changePosition(this.maxWidth);
         } else {
-            Animated.timing(this.animatedWidth, {
-                toValue: newWidth,
-                duration: 0,
-                useNativeDriver: false,
-            }).start();
+            // this.animatedWidth = newWidth;
+            this.animatedWidth.setValue(newWidth);
         }
     };
 
@@ -298,7 +298,10 @@ class SwipeButton extends Component<Props, State> {
                 <Text style={[styles.label, labelColor ? { color: labelColor } : {}]}>{label}</Text>
                 <Animated.View
                     testID={testID}
-                    style={[styles.thumpContainer, { width: this.animatedWidth }]}
+                    style={[
+                        styles.thumpContainer,
+                        { transform: [ { translateX: this.animatedWidth } ] },
+                    ]}
                     // eslint-disable-next-line react/jsx-props-no-spreading
                     {...this.panResponder.panHandlers}
                 >

src/components/General/SwipeButton/styles.ts

@@ -34,6 +34,7 @@ const Styles = StyleService.create({
         alignSelf: 'flex-start',
         marginVertical: 1,
         marginHorizontal: 5,
+        left: -AppSizes.scale(45),
     },
     iconContainer: {
         height: AppSizes.scale(44),

src/components/Modules/AssetsList/Tokens/TokensList.tsx

@@ -212,7 +212,7 @@ class TokensList extends Component<Props, State> {
                 { token, account },
                 {
                     overlay: {
-                        interceptTouchOutside: true,
+                        interceptTouchOutside: false,
                         //     ^^  Needed for tapping backdrop = close, uses onTouchStart={this.startTouch}
                     },
                 },

src/components/Modules/MutationWidgets/ActionButtons.tsx

@@ -349,20 +349,25 @@ class ActionButtons extends PureComponent<Props, State> {
 
     renderActionButtons = () => {
         const { availableActions } = this.state;
+        const { item } = this.props;
 
         if (!availableActions) {
             return null;
         }
 
-        return availableActions.map((type) => (
-            <View style={[AppStyles.paddingBottomExtraSml]}>
-                <ActionButton
-                    key={`action-button-${type}`}
-                    actionType={type}
-                    onPress={this.onActionButtonPress}
-                />
-            </View>
-        ));
+        return availableActions.map((type) => {
+            const key = `action-button-${type}-${item.Account}-${(item as any)?.Destination}`;
+
+            return (
+                <View style={[AppStyles.paddingBottomExtraSml]}>
+                    <ActionButton
+                        key={key}
+                        actionType={type}
+                        onPress={this.onActionButtonPress}
+                    />
+                </View>
+            );
+        });
     };
 
     render() {

src/screens/Account/Add/Import/Steps/EnterSeed/styles.tsx

@@ -16,6 +16,7 @@ const styles = StyleService.create({
         borderColor: 'transparent',
         borderWidth: 0,
         width: '100%',
+        color: '$contrast',
     }, 
     value: {
         fontFamily: AppFonts.base.family,