Skip to content

Commit

Permalink
fix(wallet-mobile): Dependency updates for stake pool delegation (#3232)
Browse files Browse the repository at this point in the history
Co-authored-by: lisicky <lisicky@inbox.ru>
  • Loading branch information
jorbuedo and lisicky committed May 3, 2024
1 parent 4b9f9f9 commit cc9b356
Show file tree
Hide file tree
Showing 10 changed files with 100 additions and 115 deletions.
4 changes: 2 additions & 2 deletions apps/wallet-mobile/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ PODS:
- react-native-config/App (= 1.5.1)
- react-native-config/App (1.5.1):
- React-Core
- react-native-haskell-shelley (6.0.0-alpha.4):
- react-native-haskell-shelley (6.0.0-alpha.9):
- React
- react-native-mmkv (2.11.0):
- MMKV (>= 1.2.13)
Expand Down Expand Up @@ -817,7 +817,7 @@ SPEC CHECKSUMS:
react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
react-native-ble-plx: f10240444452dfb2d2a13a0e4f58d7783e92d76e
react-native-config: 86038147314e2e6d10ea9972022aa171e6b1d4d8
react-native-haskell-shelley: 46f5fa9068996637c969e9526c22bd3867c27810
react-native-haskell-shelley: 4015aef14eca3ecf5e8d8718e8d1b47cdcf60f84
react-native-mmkv: e97c0c79403fb94577e5d902ab1ebd42b0715b43
react-native-pager-view: 0ccb8bf60e2ebd38b1f3669fa3650ecce81db2df
react-native-quick-base64: 62290829c619fbabca4c41cfec75ae759d08fc1c
Expand Down
6 changes: 3 additions & 3 deletions apps/wallet-mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@
"@emurgo/cip4-js": "1.0.7",
"@emurgo/cross-csl-core": "4.4.0",
"@emurgo/cross-csl-mobile": "4.4.0",
"@emurgo/csl-mobile-bridge": "6.0.0-alpha.4",
"@emurgo/csl-mobile-bridge": "6.0.0-alpha.9",
"@emurgo/react-native-blockies-svg": "^0.0.2",
"@emurgo/react-native-hid": "^5.15.6",
"@emurgo/yoroi-lib": "0.15.4-alpha.1",
"@emurgo/yoroi-lib": "0.15.4-alpha.6",
"@formatjs/intl-datetimeformat": "^6.7.0",
"@formatjs/intl-getcanonicallocales": "^2.1.0",
"@formatjs/intl-locale": "^3.2.1",
Expand Down Expand Up @@ -215,7 +215,7 @@
"@babel/preset-env": "^7.20.0",
"@babel/preset-react": "^7.16.7",
"@babel/runtime": "^7.20.0",
"@emurgo/cardano-serialization-lib-nodejs": "^9.1.4",
"@emurgo/cardano-serialization-lib-nodejs": "12.0.0-alpha.28",
"@emurgo/cross-csl-nodejs": "4.4.0",
"@formatjs/cli": "^6.1.0",
"@formatjs/ts-transformer": "^3.13.0",
Expand Down
14 changes: 2 additions & 12 deletions apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,11 @@ export const FailedTxScreen = () => {

<Spacer height={22} />

<Button onPress={navigateTo.buyAda} title={strings.buyAda} style={styles.button} shelleyTheme />
<Button onPress={navigateTo.buyAda} title={strings.buyAda} shelleyTheme />

<Space height="lg" />

<Button
onPress={navigateTo.main}
title={strings.goToMain}
style={styles.button}
textStyles={styles.outlineText}
outline
/>
<Button onPress={navigateTo.main} title={strings.goToMain} textStyles={styles.outlineText} outline />
</View>
)
}
Expand Down Expand Up @@ -88,10 +82,6 @@ const useStyles = () => {
textAlign: 'center',
maxWidth: 330,
},
button: {
...atoms.p_lg,
...atoms.button_2_md,
},
outlineText: {
color: color.primary_c500,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ const useStyles = () => {

const styles = StyleSheet.create({
modal: {
backgroundColor: color.web_overlay,
alignItems: 'center',
flex: 1,
justifyContent: 'flex-end',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {init} from '@emurgo/cross-csl-mobile'
import {PoolInfoApi} from '@emurgo/yoroi-lib'
import {useNavigation} from '@react-navigation/native'
import BigNumber from 'bignumber.js'
Expand Down Expand Up @@ -38,13 +39,13 @@ export const usePoolTransition = () => {
const poolTransitionQuery = useQuery({
enabled: isStaked,
retry: false,
staleTime: 20 * 1000,
staleTime: Infinity,
queryKey: [wallet.id, 'poolTransition', currentPoolId],
queryFn: () => (features.poolTransition ? poolInfoApi.getTransition(currentPoolId) : null),
queryFn: () => (features.poolTransition ? poolInfoApi.getTransition(currentPoolId, init) : null),
})

const poolTransition = poolTransitionQuery.data ?? null
const poolId = poolTransition?.suggested.id ?? ''
const poolId = poolTransition?.suggested.hash ?? ''

const navigateToUpdate = React.useCallback(async () => {
try {
Expand Down
2 changes: 1 addition & 1 deletion apps/wallet-mobile/src/components/Modal/ModalScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const useStyles = () => {
},
sheet: {
flex: 1,
backgroundColor: color.gray_c50,
backgroundColor: color.gray_cmin,
alignSelf: 'stretch',
paddingHorizontal: 16,
paddingBottom: 16,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ const useStyles = () => {
const styles = StyleSheet.create({
modal: {
flex: 1,
backgroundColor: color.gray_c200,
alignItems: 'center',
justifyContent: 'space-between',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,59 +4,59 @@
"defaultMessage": "!!!Not enough funds",
"file": "src/Staking/FailedTx/FailedTxScreen.tsx",
"start": {
"line": 114,
"line": 104,
"column": 18,
"index": 2650
"index": 2490
},
"end": {
"line": 117,
"line": 107,
"column": 3,
"index": 2766
"index": 2606
}
},
{
"id": "components.stakingcenter.failedDelegation.noFundsToProcess",
"defaultMessage": "!!!Your transaction cannot be processed due to lack of funds on your wallet balance",
"file": "src/Staking/FailedTx/FailedTxScreen.tsx",
"start": {
"line": 118,
"line": 108,
"column": 20,
"index": 2788
"index": 2628
},
"end": {
"line": 121,
"line": 111,
"column": 3,
"index": 2970
"index": 2810
}
},
{
"id": "components.stakingcenter.failedDelegation.buyAda",
"defaultMessage": "!!!Buy ada",
"file": "src/Staking/FailedTx/FailedTxScreen.tsx",
"start": {
"line": 122,
"line": 112,
"column": 10,
"index": 2982
"index": 2822
},
"end": {
"line": 125,
"line": 115,
"column": 3,
"index": 3081
"index": 2921
}
},
{
"id": "components.stakingcenter.failedDelegation.goToMain",
"defaultMessage": "!!!Go to main wallet page",
"file": "src/Staking/FailedTx/FailedTxScreen.tsx",
"start": {
"line": 126,
"line": 116,
"column": 12,
"index": 3095
"index": 2935
},
"end": {
"line": 129,
"line": 119,
"column": 3,
"index": 3211
"index": 3051
}
}
]

0 comments on commit cc9b356

Please sign in to comment.