diff --git a/fe1-web/src/core/functions/Mnemonic.ts b/fe1-web/src/core/functions/Mnemonic.ts index 0b4f90b5cf..c798465034 100644 --- a/fe1-web/src/core/functions/Mnemonic.ts +++ b/fe1-web/src/core/functions/Mnemonic.ts @@ -104,5 +104,7 @@ export function generateUsernameFromBase64(input: string): string { return `defaultUsername${randomInt(0, 10000000).toString().padStart(4, '0')}`; } const number = getFirstNumberDigits(input, 4); - return `${words[0]}${words[1]}${number}`; + const word1 = words[0].charAt(0).toUpperCase() + words[0].slice(1); + const word2 = words[1].charAt(0).toUpperCase() + words[1].slice(1); + return `${word1}${word2}${number}`; } diff --git a/fe1-web/src/core/functions/__tests__/Mnemonic.test.ts b/fe1-web/src/core/functions/__tests__/Mnemonic.test.ts index 13f4b163e3..745e1899f1 100644 --- a/fe1-web/src/core/functions/__tests__/Mnemonic.test.ts +++ b/fe1-web/src/core/functions/__tests__/Mnemonic.test.ts @@ -2,18 +2,18 @@ import { generateUsernameFromBase64 } from '../Mnemonic'; test('generateUsernameFromBase64 should generate the correct username for the token: d_xeXEsurEnyWOp04mrrMxC3m4cS-3jK_9_Aw-UYfww=', () => { const popToken = 'd_xeXEsurEnyWOp04mrrMxC3m4cS-3jK_9_Aw-UYfww='; - const result = 'spoonissue0434'; + const result = 'SpoonIssue0434'; expect(generateUsernameFromBase64(popToken)).toBe(result); }); test('generateUsernameFromBase64 should generate the correct username for the token: e5YJ5Q6x39u_AIK78_puEE2X5wy7Y7iYZLeuZx1lnZI=', () => { const popToken = 'e5YJ5Q6x39u_AIK78_puEE2X5wy7Y7iYZLeuZx1lnZI='; - const result = 'bidtrial5563'; + const result = 'BidTrial5563'; expect(generateUsernameFromBase64(popToken)).toBe(result); }); test('generateUsernameFromBase64 should generate the correct username for the token: Y5ZAd_7Ba31uu4EUIYbG2AVnthR623-NdPyYhtyechE=', () => { const popToken = 'Y5ZAd_7Ba31uu4EUIYbG2AVnthR623-NdPyYhtyechE='; - const result = 'figuredevote5731'; + const result = 'FigureDevote5731'; expect(generateUsernameFromBase64(popToken)).toBe(result); }); diff --git a/fe1-web/src/features/rollCall/screens/__tests__/__snapshots__/ViewSingleRollCall.test.tsx.snap b/fe1-web/src/features/rollCall/screens/__tests__/__snapshots__/ViewSingleRollCall.test.tsx.snap index 5e5017eb36..ba471fdccf 100644 --- a/fe1-web/src/features/rollCall/screens/__tests__/__snapshots__/ViewSingleRollCall.test.tsx.snap +++ b/fe1-web/src/features/rollCall/screens/__tests__/__snapshots__/ViewSingleRollCall.test.tsx.snap @@ -874,7 +874,7 @@ exports[`EventRollCall render correctly no duplicate attendees opened roll calls } testID="attendee_0" > - bestdespair0001 + BestDespair0001 - bestdespair0002 + BestDespair0002 - bestdespair0001 + BestDespair0001 - bestdespair0002 + BestDespair0002 - bestdespair0001 + BestDespair0001 - bestdespair0002 + BestDespair0002 - bestdespair0001 + BestDespair0001 - bestdespair0002 + BestDespair0002 - bestdespair0001 + BestDespair0001 - bestdespair0002 + BestDespair0002 - bestdespair0001 + BestDespair0001 - bestdespair0002 + BestDespair0002 - bestdespair0001 + BestDespair0001 - bestdespair0002 + BestDespair0002 - bestdespair0001 + BestDespair0001 - bestdespair0002 + BestDespair0002 - pilotmusic0000 + PilotMusic0000 @@ -1002,7 +1002,7 @@ exports[`ChirpCard for deletion renders correctly for non-sender 1`] = ` ] } > - clickbetter0000 + ClickBetter0000 @@ -1808,7 +1808,7 @@ exports[`ChirpCard for deletion renders correctly for sender 1`] = ` ] } > - clickbetter0000 + ClickBetter0000 @@ -2670,7 +2670,7 @@ exports[`ChirpCard for reaction renders correctly with reaction 1`] = ` ] } > - clickbetter0000 + ClickBetter0000 @@ -3476,7 +3476,7 @@ exports[`ChirpCard for reaction renders correctly without reaction 1`] = ` ] } > - clickbetter0000 + ClickBetter0000 diff --git a/fe1-web/src/features/social/components/__tests__/__snapshots__/Profile.test.tsx.snap b/fe1-web/src/features/social/components/__tests__/__snapshots__/Profile.test.tsx.snap index 59a552c559..26231780a8 100644 --- a/fe1-web/src/features/social/components/__tests__/__snapshots__/Profile.test.tsx.snap +++ b/fe1-web/src/features/social/components/__tests__/__snapshots__/Profile.test.tsx.snap @@ -36,7 +36,7 @@ exports[`Profile renders correctly 1`] = ` ] } > - daughterscrub0000 + DaughterScrub0000 - daughterscrub0000 + DaughterScrub0000 - clickbetter0000 + ClickBetter0000 @@ -927,7 +927,7 @@ exports[`SocialTopChirps renders correctly 1`] = ` ] } > - limitroad0000 + LimitRoad0000 @@ -1405,7 +1405,7 @@ exports[`SocialTopChirps renders correctly 1`] = ` ] } > - clickbetter0000 + ClickBetter0000 diff --git a/fe1-web/src/features/wallet/screens/WalletSingleRollCall.tsx b/fe1-web/src/features/wallet/screens/WalletSingleRollCall.tsx index 55e1f02283..bad0591749 100644 --- a/fe1-web/src/features/wallet/screens/WalletSingleRollCall.tsx +++ b/fe1-web/src/features/wallet/screens/WalletSingleRollCall.tsx @@ -6,6 +6,7 @@ import { StyleSheet, Text, TextStyle, View } from 'react-native'; import { PoPTextButton, QRCode } from 'core/components'; import ScreenWrapper from 'core/components/ScreenWrapper'; +import { generateUsernameFromBase64 } from 'core/functions/Mnemonic'; import { AppParamList } from 'core/navigation/typing/AppParamList'; import { WalletParamList } from 'core/navigation/typing/WalletParamList'; import { ScannablePopToken } from 'core/objects/ScannablePopToken'; @@ -19,10 +20,14 @@ type NavigationProps = CompositeScreenProps< const styles = StyleSheet.create({ publicKey: { - marginVertical: Spacing.x2, + marginTop: Spacing.x05, + marginBottom: Spacing.x1, color: Color.inactive, textAlign: 'center', } as TextStyle, + username: { + marginTop: Spacing.x2, + } as TextStyle, }); /** @@ -41,6 +46,9 @@ const WalletSingleRollCall = () => { /> + + {generateUsernameFromBase64(rollCallTokenPublicKey)} + {rollCallTokenPublicKey} diff --git a/fe1-web/src/features/wallet/screens/__tests__/__snapshots__/WalletSingleRollCall.test.tsx.snap b/fe1-web/src/features/wallet/screens/__tests__/__snapshots__/WalletSingleRollCall.test.tsx.snap index 12048ac916..e8b768b1fd 100644 --- a/fe1-web/src/features/wallet/screens/__tests__/__snapshots__/WalletSingleRollCall.test.tsx.snap +++ b/fe1-web/src/features/wallet/screens/__tests__/__snapshots__/WalletSingleRollCall.test.tsx.snap @@ -425,6 +425,26 @@ exports[`ViewSingleRollCallScreenHeader renders correctly 1`] = ` + + LoyalBorrow3877 + + + LoyalBorrow3877 +