Merge branch 'develop' into refactor/swap-bottomsheet-migration
Signed-off-by: banklesss <[email protected]>
Signed-off-by: banklesss <[email protected]>
variant?: 'swap'
}
export const AmountItem = ({
isPrivacyOff,
wallet,
style,
amount,
status,
inWallet,
supply,
variant,
}: AmountItemProps) => {
export const AmountItem = ({isPrivacyOff, wallet, style, amount, inWallet, supply, variant}: AmountItemProps) => {
const {quantity, tokenId} = amount
const tokenInfo = useTokenInfo({wallet, tokenId})
<>
<Spacer width={4} />
{status === 'verified' && <Icon.CheckFilled size={22} color={COLORS.SHELLEY_BLUE} />}
{inWallet && <Icon.Portfolio size={22} color={COLORS.LIGHT_GREEN} />}
</>
)}
)
return (
<>
<SafeAreaView style={styles.container}>
<Spacer height={12} />
<VerifiedTokensInfo openBottomSheet={openBottomSheet} />
<Spacer height={15} />
<View style={[styles.row, styles.ph]}>
<Icon.Portfolio size={20} color={COLORS.LIGHT_GREEN} />
<Spacer width={8} />
<Text style={styles.topText}>{strings.assetsIn}</Text>
</View>
<Boundary loading={loading}>
<TokenList />
</Boundary>
</SafeAreaView>
<BottomSheet title={strings.poolVerification('MuesliSwap')} ref={bottomSheetRef}>
<Text style={styles.modalText}>{strings.poolVerificationInfo('MuesliSwap')}</Text>
<Spacer height={28} />
<Text>
<Text style={styles.modalText}>{strings.eachVerifiedToken}</Text>
<Spacer width={8} />
<Icon.CheckFilled size={28} color={COLORS.SHELLEY_BLUE} />
<Text style={styles.modalText}>{strings.verifiedBadge}</Text>
</Text>
</BottomSheet>
</>
)
}
const VerifiedTokensInfo = ({openBottomSheet}: {openBottomSheet: () => void}) => {
const strings = useStrings()
return (
<View style={(styles.flex, styles.ph)}>
<View style={styles.row}>
<Icon.CheckFilled size={28} color={COLORS.SHELLEY_BLUE} />
<Text style={styles.topText}>{strings.verifiedBy('MuesliSwap')}</Text>
<Spacer width={8} />
<TouchableOpacity onPress={openBottomSheet}>
<Icon.Info size={28} />
</TouchableOpacity>
</View>
</View>
<SafeAreaView style={styles.container}>
<Boundary loading={loading}>
<TokenList />
</Boundary>
</SafeAreaView>
)
}
ListEmptyComponent={<EmptyList filteredTokensForList={filteredTransformedList} allTokenInfos={tokenInfos} />}
/>
<Spacer height={16} />
<View style={[styles.row, styles.ph]}>
<Icon.Portfolio size={20} color={COLORS.LIGHT_GREEN} />
<Spacer width={8} />
<Text style={styles.topText}>{strings.assetsIn}</Text>
</View>
<Counter counter={filteredTransformedList.length} />
</View>
)
fontWeight: 'bold',
color: COLORS.SHELLEY_BLUE,
},
flex: {
flexDirection: 'row',
justifyContent: 'space-between',
},
row: {
flexDirection: 'row',
alignItems: 'center',
alignSelf: 'center',
},
topText: {
fontSize: 16,
},
modalText: {
fontWeight: '400',
lineHeight: 20,
color: '#242838',
fontFamily: 'Rubik',
fontSize: 15,
},
image: {
flex: 1,
alignSelf: 'center',
As we removed those guards from the chain layer, it is important that the logic layer is doing this filtering.
To prevent aborting the wrong Head `headId` was added to the `OnAbortTx`. Logic layer now aborts the head that is seen as initialized.
The flaky test picked up this error
* Removed call to tail, and the 'watchPulser' test Co-authored-by: Alexey Kuleshevich <[email protected]>
This avoids mentioning "Babbage" in downstream packages like hydra-cluster and will reduce the number of places to switch.
Same rationale as previous two commits
This reduces the number of times Babbage is mentioned in the hydra-node package and will help switching eras.
This removes "Requested index-state .. is newer than" warnings when building with cabal.
This avoids mentioning "Babbage" in downstream packages like hydra-cluster and will reduce the number of places to switch.
These re-definitions are to avoid additional witness passing as long as we are just fine with the one specific / latest era (which we are by using Hydra.Cardano.Api). Consequently and according to the package README, these belong to the Api.hs module.
Same rationale as previous commit, got renamed upstream.