feat: Provide education/confirmation before creating workspaces in New Workspace flows #53845
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| import React, {forwardRef, useState} from 'react'; | ||
| import type {ForwardedRef} from 'react'; | ||
| import {View} from 'react-native'; | ||
| import useLocalize from '@hooks/useLocalize'; | ||
| import useStyleUtils from '@hooks/useStyleUtils'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import variables from '@styles/variables'; | ||
| import CONST from '@src/CONST'; | ||
| import CurrencySelectionListWithOnyx from './CurrencySelectionList'; | ||
| import HeaderWithBackButton from './HeaderWithBackButton'; | ||
| import MenuItemWithTopDescription from './MenuItemWithTopDescription'; | ||
| import Modal from './Modal'; | ||
| import ScreenWrapper from './ScreenWrapper'; | ||
| import type {ValuePickerItem, ValuePickerProps} from './ValuePicker/types'; | ||
|
|
||
| type CurrencyPickerProps = { | ||
| selectedCurrency?: string; | ||
| }; | ||
| function CurrencyPicker({selectedCurrency, label = '', errorText = '', value, onInputChange, furtherDetails}: ValuePickerProps & CurrencyPickerProps, forwardedRef: ForwardedRef<View>) { | ||
| const StyleUtils = useStyleUtils(); | ||
| const styles = useThemeStyles(); | ||
| const [isPickerVisible, setIsPickerVisible] = useState(false); | ||
| const {translate} = useLocalize(); | ||
|
|
||
| const showPickerModal = () => { | ||
| setIsPickerVisible(true); | ||
| }; | ||
|
|
||
| const hidePickerModal = () => { | ||
| setIsPickerVisible(false); | ||
| }; | ||
|
|
||
| const updateInput = (item: ValuePickerItem) => { | ||
| if (item.value !== selectedCurrency) { | ||
| onInputChange?.(item.value); | ||
| } | ||
| hidePickerModal(); | ||
| }; | ||
|
|
||
| const descStyle = !selectedCurrency || selectedCurrency.length === 0 ? StyleUtils.getFontSizeStyle(variables.fontSizeLabel) : null; | ||
|
|
||
| return ( | ||
| <View> | ||
| <MenuItemWithTopDescription | ||
| ref={forwardedRef} | ||
| shouldShowRightIcon | ||
| // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing | ||
| title={value || ''} | ||
| descriptionTextStyle={descStyle} | ||
| description={label} | ||
| onPress={showPickerModal} | ||
| furtherDetails={furtherDetails} | ||
| brickRoadIndicator={errorText ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined} | ||
| errorText={errorText} | ||
| /> | ||
|
|
||
| <Modal | ||
| type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED} | ||
| isVisible={isPickerVisible} | ||
| onClose={() => hidePickerModal} | ||
| onModalHide={hidePickerModal} | ||
| hideModalContentWhileAnimating | ||
| useNativeDriver | ||
| onBackdropPress={hidePickerModal} | ||
| > | ||
| <ScreenWrapper | ||
| style={styles.pb0} | ||
| includePaddingTop={false} | ||
| includeSafeAreaPaddingBottom={false} | ||
| testID={label} | ||
| > | ||
| <HeaderWithBackButton | ||
| title={label} | ||
| onBackButtonPress={hidePickerModal} | ||
| /> | ||
| <CurrencySelectionListWithOnyx | ||
| onSelect={(item) => updateInput({value: item.currencyCode})} | ||
| searchInputLabel={translate('common.currency')} | ||
| initiallySelectedCurrencyCode={selectedCurrency} | ||
| /> | ||
| </ScreenWrapper> | ||
| </Modal> | ||
| </View> | ||
| ); | ||
| } | ||
|
|
||
| CurrencyPicker.displayName = 'CurrencyPicker'; | ||
|
|
||
| export default forwardRef(CurrencyPicker); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -3804,7 +3804,7 @@ const translations = { | |||||
| }, | ||||||
| emptyWorkspace: { | ||||||
| title: 'Create a workspace', | ||||||
| subtitle: 'Create a workspace to track receipts, reimburse expenses, send invoices, and more — all at the speed of chat.', | ||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
Update the copy as per #53753 (comment)
Contributor
Author
There was a problem hiding this comment. I think this update can be made in this PR.
Contributor
There was a problem hiding this comment. @shubham1206agra can you make sure you include this in the above PR |
||||||
| createAWorkspaceCTA: 'Get Started', | ||||||
| features: { | ||||||
| trackAndCollect: 'Track and collect receipts', | ||||||
|
|
@@ -3822,6 +3822,7 @@ const translations = { | |||||
| new: { | ||||||
| newWorkspace: 'New workspace', | ||||||
| getTheExpensifyCardAndMore: 'Get the Expensify Card and more', | ||||||
| confirmWorkspace: 'Confirm Workspace', | ||||||
| }, | ||||||
| people: { | ||||||
| genericFailureMessage: 'An error occurred removing a member from the workspace, please try again.', | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We forgot to add shouldHandleNavigationBack here which caused #57513