Merge branch 'develop' into bridge-fixes

Emurgo · May 3, 2024 · 69640fb · 69640fb
2 parents c4a4ec0 + 4b9f9f9
commit 69640fb
Show file tree

Hide file tree

Showing 330 changed files with 4,013 additions and 3,716 deletions.
diff --git a/apps/wallet-mobile/.storybook/stories/Button/ExampleButton.js b/apps/wallet-mobile/.storybook/stories/Button/ExampleButton.js
@@ -13,16 +13,15 @@ export const ExampleButton = ({onPress, disabled, text}) => {
 }
 
 const useStyles = () => {
-  const {theme} = useTheme()
-  const {color, padding} = theme
+  const {color, atoms} = useTheme()
   const styles = StyleSheet.create({
     container: {
-      ...padding['x-l'],
-      ...padding['y-s'],
-      backgroundColor: color.primary[500],
+      ...atoms.px_lg,
+      ...atoms.py_sm,
+      backgroundColor: color.primary_c500,
       borderRadius: 8,
     },
-    text: {color: color.gray.min},
+    text: {color: color.gray_cmin},
   })
 
   return styles

diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
diff --git a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
@@ -986,11 +986,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
@@ -1059,11 +1055,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;

diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
@@ -86,7 +86,7 @@
       "<rootDir>/jestSetup.ts"
     ],
     "transformIgnorePatterns": [
-      "node_modules/(?!(jest-)?(@react-native|react-native|react-native-iphone-x-helper|react-native-color-picker|react-native-reanimated)/)"
+      "node_modules/(?!(jest-)?(@react-native|react-native|react-native-iphone-x-helper|react-native-color-picker|react-native-reanimated|react-native-linear-gradient)/)"
     ]
   },
   "dependencies": {

diff --git a/apps/wallet-mobile/src/Catalyst/QrCode.tsx b/apps/wallet-mobile/src/Catalyst/QrCode.tsx
@@ -130,35 +130,34 @@ const messages = defineMessages({
 })
 
 const useStyles = () => {
-  const {theme} = useTheme()
-  const {color, padding} = theme
+  const {color, atoms} = useTheme()
   const styles = StyleSheet.create({
     safeAreaView: {
       flex: 1,
-      backgroundColor: color.gray.min,
+      backgroundColor: color.gray_cmin,
     },
     alertBox: {
-      ...padding['l'],
+      ...atoms.p_lg,
       backgroundColor: 'rgba(255, 16, 81, 0.06)',
       borderRadius: 8,
     },
     contentContainer: {
-      ...padding['x-l'],
+      ...atoms.px_lg,
     },
     note: {
-      color: color.gray[900],
+      color: color.gray_c900,
       fontWeight: 'bold',
     },
     qrCodeBackground: {
       borderRadius: 8,
-      ...padding['l'],
-      backgroundColor: color.gray[50],
+      ...atoms.p_lg,
+      backgroundColor: color.gray_c50,
       alignSelf: 'center',
     },
     secretCodeBox: {
-      backgroundColor: color.gray[50],
+      backgroundColor: color.gray_c50,
       borderRadius: 8,
-      ...padding['l'],
+      ...atoms.p_lg,
       flexDirection: 'row',
     },
   })

diff --git a/apps/wallet-mobile/src/Catalyst/VotingBanner.tsx b/apps/wallet-mobile/src/Catalyst/VotingBanner.tsx
@@ -81,28 +81,27 @@ const messages = defineMessages({
 })
 
 const useStyles = () => {
-  const {theme} = useTheme()
-  const {color, padding} = theme
+  const {color, atoms} = useTheme()
   const styles = StyleSheet.create({
     container: {
-      ...padding['y-l'],
+      ...atoms.py_lg,
       alignItems: 'center',
     },
     button: {
       flexDirection: 'row',
       alignItems: 'center',
       borderRadius: 8,
       borderWidth: 1,
-      borderColor: color.secondary[500],
-      ...padding['y-m'],
-      ...padding['x-xl'],
+      borderColor: color.secondary_c500,
+      ...atoms.py_md,
+      ...atoms.px_xl,
     },
     text: {
-      color: color.secondary[500],
+      color: color.secondary_c500,
     },
   })
   const colors = {
-    iconColor: color.secondary[500],
+    iconColor: color.secondary_c500,
   }
   return {styles, colors}
 }

diff --git a/apps/wallet-mobile/src/Dashboard/Dashboard.tsx b/apps/wallet-mobile/src/Dashboard/Dashboard.tsx
@@ -244,8 +244,7 @@ const messages = defineMessages({
 })
 
 const useStyles = () => {
-  const {theme} = useTheme()
-  const {color} = theme
+  const {color} = useTheme()
 
   const styles = StyleSheet.create({
     root: {
@@ -257,7 +256,7 @@ const useStyles = () => {
     },
     scrollView: {
       flex: 1,
-      backgroundColor: color.gray.min,
+      backgroundColor: color.gray_cmin,
     },
     contentContainer: {
       paddingTop: 16,
@@ -269,13 +268,13 @@ const useStyles = () => {
     },
     actions: {
       flexDirection: 'row',
-      backgroundColor: color.gray.min,
+      backgroundColor: color.gray_cmin,
       padding: 16,
       borderTopLeftRadius: 8,
       borderTopRightRadius: 8,
       elevation: 1,
       shadowOpacity: 0.06,
-      shadowColor: color['black-static'],
+      shadowColor: color.black_static,
       shadowRadius: 6,
       shadowOffset: {width: 0, height: -8},
     },

diff --git a/apps/wallet-mobile/src/Dashboard/DashboardNavigator.tsx b/apps/wallet-mobile/src/Dashboard/DashboardNavigator.tsx
@@ -19,13 +19,13 @@ export const DashboardNavigator = () => {
   const wallet = useSelectedWallet()
   const walletName = useWalletName(wallet)
   const strings = useStrings()
-  const {theme} = useTheme()
+  const {color, atoms} = useTheme()
 
   const manager = useGovernanceManagerMaker()
 
   return (
     <GovernanceProvider manager={manager}>
-      <Stack.Navigator screenOptions={defaultStackNavigationOptions(theme)}>
+      <Stack.Navigator screenOptions={defaultStackNavigationOptions(atoms, color)}>
         <Stack.Screen
           name="staking-dashboard-main"
           component={Dashboard}

diff --git a/apps/wallet-mobile/src/Dashboard/EpochProgress.tsx b/apps/wallet-mobile/src/Dashboard/EpochProgress.tsx
@@ -68,15 +68,14 @@ const messages = defineMessages({
 })
 
 const useStyles = () => {
-  const {theme} = useTheme()
-  const {color, typography, padding} = theme
+  const {atoms, color} = useTheme()
   const styles = StyleSheet.create({
     wrapper: {},
     stats: {
       flex: 1,
       flexDirection: 'column',
-      ...padding['l-l'],
-      ...padding['b-s'],
+      ...atoms.pl_lg,
+      ...atoms.pb_sm,
       flexWrap: 'wrap',
     },
     row: {
@@ -86,23 +85,23 @@ const useStyles = () => {
       alignItems: 'flex-start',
     },
     label: {
-      color: color.gray[900],
-      ...padding['r-m'],
-      ...typography['body-2-m-regular'],
+      color: color.gray_c900,
+      ...atoms.pr_md,
+      ...atoms.body_2_md_regular,
     },
     value: {
-      ...typography['body-1-l-regular'],
-      color: color.gray[700],
+      ...atoms.body_1_lg_regular,
+      color: color.gray_c700,
     },
     timeWrapper: {
       flexDirection: 'row',
       flexWrap: 'nowrap',
     },
     timeBlock: {
-      ...typography['body-1-l-regular'],
-      ...padding['x-xs'],
-      backgroundColor: color.gray[900],
-      color: color.gray[900],
+      ...atoms.body_1_lg_regular,
+      ...atoms.py_xs,
+      backgroundColor: color.gray_c900,
+      color: color.gray_c900,
       marginHorizontal: 4,
       borderRadius: 2,
       textAlign: 'center',

diff --git a/apps/wallet-mobile/src/Dashboard/NotDelegatedInfo.tsx b/apps/wallet-mobile/src/Dashboard/NotDelegatedInfo.tsx
@@ -26,8 +26,7 @@ export const NotDelegatedInfo = () => {
 }
 
 const useStyles = () => {
-  const {theme} = useTheme()
-  const {color, typography} = theme
+  const {color, atoms} = useTheme()
   const styles = StyleSheet.create({
     wrapper: {
       marginTop: 24,
@@ -39,15 +38,15 @@ const useStyles = () => {
     },
     text: {
       textAlign: 'center',
-      color: color.gray[900],
+      color: color.gray_c900,
       lineHeight: 22,
     },
     textFirstLine: {
-      ...typography['body-1-l-regular'],
+      ...atoms.body_1_lg_regular,
       marginBottom: 12,
     },
     textSecondLine: {
-      ...typography['body-2-m-regular'],
+      ...atoms.body_2_md_regular,
       marginBottom: 16,
     },
   })

diff --git a/apps/wallet-mobile/src/Dashboard/StakePoolInfo.tsx b/apps/wallet-mobile/src/Dashboard/StakePoolInfo.tsx
@@ -92,34 +92,33 @@ export const useStakePoolInfoAndHistory = (
 }
 
 const useStyles = () => {
-  const {theme} = useTheme()
-  const {color, padding, typography} = theme
+  const {color, atoms} = useTheme()
   const styles = StyleSheet.create({
     topBlock: {
-      ...padding['y-s'],
-      ...padding['y-l'],
+      ...atoms.py_sm,
+      ...atoms.py_lg,
     },
     poolName: {
-      ...typography['body-1-l-regular'],
+      ...atoms.body_1_lg_regular,
     },
     poolIdBlock: {
       flexDirection: 'row',
     },
     poolId: {
-      color: color.gray[700],
-      ...typography['body-2-m-regular'],
+      color: color.gray_c700,
+      ...atoms.body_2_md_regular,
       flex: 1,
     },
     bottomBlock: {
-      ...padding['x-l'],
-      ...padding['y-xl'],
+      ...atoms.px_lg,
+      ...atoms.py_xl,
     },
     warning: {
-      ...padding['s'],
+      ...atoms.p_sm,
     },
     warningText: {
       fontStyle: 'italic',
-      ...typography['body-3-s-regular'],
+      ...atoms.body_3_sm_regular,
     },
   })
   return styles

diff --git a/apps/wallet-mobile/src/Dashboard/UserSummary.tsx b/apps/wallet-mobile/src/Dashboard/UserSummary.tsx
@@ -103,8 +103,7 @@ export const UserSummary = ({totalAdaSum, totalRewards, totalDelegated, onWithdr
 }
 
 const useStyles = () => {
-  const {theme} = useTheme()
-  const {color, padding, typography} = theme
+  const {color, atoms} = useTheme()
   const styles = StyleSheet.create({
     wrapper: {
       flex: 1,
@@ -116,28 +115,28 @@ const useStyles = () => {
     },
     row: {
       flex: 1,
-      ...padding['y-s'],
+      ...atoms.py_sm,
       flexDirection: 'row',
     },
     icon: {
       paddingLeft: 8,
-      ...padding['s'],
-      ...padding['r-l'],
+      ...atoms.p_sm,
+      ...atoms.pr_lg,
     },
     amountBlock: {
       flexDirection: 'column',
     },
     label: {
-      color: color.gray[900],
-      ...typography['body-2-m-regular'],
+      color: color.gray_c900,
+      ...atoms.body_2_md_regular,
     },
     value: {
-      color: color.gray[800],
-      ...typography['body-1-l-regular'],
+      color: color.gray_c800,
+      ...atoms.body_1_lg_regular,
     },
     withdrawBlock: {
       flex: 1,
-      ...padding['xs'],
+      ...atoms.p_xs,
       justifyContent: 'flex-end',
       flexDirection: 'row',
     },

diff --git a/apps/wallet-mobile/src/Dashboard/WithdrawStakingRewards/TransferSummary/TransferSummary.tsx b/apps/wallet-mobile/src/Dashboard/WithdrawStakingRewards/TransferSummary/TransferSummary.tsx
@@ -190,15 +190,14 @@ const messages = defineMessages({
 })
 
 const useStyles = () => {
-  const {theme} = useTheme()
-  const {color, typography, padding} = theme
+  const {atoms, color} = useTheme()
   const styles = StyleSheet.create({
     item: {
-      ...padding['b-xs'],
+      ...atoms.pb_xs,
     },
     balanceAmount: {
-      color: color.secondary[500],
-      ...typography['body-1-l-regular'],
+      color: color.secondary_c500,
+      ...atoms.body_1_lg_regular,
     },
   })
   return styles