Skip to content

Commit

Permalink
fix menu list styling and add remaining options and responses
Browse files Browse the repository at this point in the history
  • Loading branch information
cdOut committed Mar 1, 2024
1 parent b74d6da commit 785680c
Show file tree
Hide file tree
Showing 7 changed files with 180 additions and 33 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
78 changes: 72 additions & 6 deletions src/CONST.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ const KEYBOARD_SHORTCUT_NAVIGATION_TYPE = 'NAVIGATION_SHORTCUT';
// Explicit type annotation is required
const cardActiveStates: number[] = [2, 3, 4, 7];

const onboardingChoices = {
TRACK: 'newDotTrack',
EMPLOYER: 'newDotEmployer',
MANAGE_TEAM: 'newDotManageTeam',
PERSONAL_SPEND: 'newDotPersonalSpend',
CHAT_SPLIT: 'newDotSplitChat',
LOOKING_AROUND: 'newDotLookingAround',
};

const CONST = {
ANDROID_PACKAGE_NAME,
ANIMATED_TRANSITION: 300,
Expand Down Expand Up @@ -3267,12 +3276,69 @@ const CONST = {
MINIMUM_WORKSPACES_TO_SHOW_SEARCH: 8,
},

ONBOARDING_CHOICES: {
TRACK: 'newDotTrack',
EMPLOYER: 'newDotEmployer',
MANAGE_TEAM: 'newDotManageTeam',
CHAT_SPLIT: 'newDotSplitChat',
LOOKING_AROUND: 'newDotLookingAround',
ONBOARDING_CHOICES: {...onboardingChoices},

ONBOARDING_CONCIERGE: {
[onboardingChoices.TRACK]:
'# Welcome to Expensify, let\'s start tracking your expenses!\n' +
'Hi there, I\'m Concierge. Chat with me here for anything you need.\n' +
'\n' +
'To track your expenses, create a workspace to keep everything in one place. Here\'s how:\n' +
'1. From the home screen, click the green + button > New Workspace\n' +
'2. Give your workspace a name (e.g. "My business expenses”).\n' +
'\n' +
'Then, add expenses to your workspace:\n' +
'1. Find your workspace using the search field.\n' +
'2. Click the gray + button next to the message field.\n' +
'3. Click Request money, then add your expense type.\n' +
'\n' +
'We\'ll store all expenses in your new workspace for easy access. Let me know if you have any questions!',
[onboardingChoices.EMPLOYER]:
'# Welcome to Expensify, the fastest way to get paid back!\n' +
'Hi there, I\'m Concierge. Chat with me here for anything you need.\n' +
'\n' +
'To submit expenses for reimbursement:\n' +
'1. From the home screen, click the green + button > Request money.\n' +
'2. Enter an amount or scan a receipt, then input your boss\'s email.\n' +
'\n' +
'That\'ll send a request to get you paid back. Let me know if you have any questions!',
[onboardingChoices.MANAGE_TEAM]:
'# Welcome to Expensify, let\'s start managing your team\'s expenses!\n' +
'Hi there, I\'m Concierge. Chat with me here for anything you need.\n' +
'\n' +
'To manage your team\'s expenses, create a workspace to keep everything in one place. Here\'s how:\n' +
'1. From the home screen, click the green + button > New Workspace\n' +
'2. Give your workspace a name (e.g. “Sales team expenses”).\n' +
'\n' +
'Then, invite your team to your workspace via the Members pane and connect a business bank account to reimburse them. Let me know if you have any questions!',
[onboardingChoices.PERSONAL_SPEND]:
'# Welcome to Expensify, let\'s start tracking your expenses!\n' +
'Hi there, I\'m Concierge. Chat with me here for anything you need.\n' +
'\n' +
'To track your expenses, create a workspace to keep everything in one place. Here\'s how:\n' +
'1. From the home screen, click the green + button > New Workspace\n' +
'2. Give your workspace a name (e.g. "My expenses”).\n' +
'\n' +
'Then, add expenses to your workspace:\n' +
'1. Find your workspace using the search field.\n' +
'2. Click the gray + button next to the message field.\n' +
'3. Click Request money, then add your expense type.\n' +
'\n' +
'We\'ll store all expenses in your new workspace for easy access. Let me know if you have any questions!',
[onboardingChoices.CHAT_SPLIT]:
'# Welcome to Expensify, where splitting the bill is an easy conversation!\n' +
'Hi there, I\'m Concierge. Chat with me here for anything you need.\n' +
'\n' +
'To split an expense:\n' +
'1. From the home screen, click the green + button > Request money.\n' +
'2. Enter an amount or scan a receipt, then choose who you want to split it with.\n' +
'\n' +
'We\'ll send a request to each person so they can pay you back. Let me know if you have any questions!',
[onboardingChoices.LOOKING_AROUND]:
'# Welcome to Expensify!\n' +
'Hi there, I\'m Concierge. Chat with me here for anything you need.\n' +
'\n' +
'Expensify is best known for expense and corporate card management, but we do a lot more than that. Let me know what you\'re interested in and I\'ll help get you started.',
},

REPORT_FIELD_TITLE_FIELD_ID: 'text_title',
Expand Down
2 changes: 2 additions & 0 deletions src/components/Icon/Illustrations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ import Binoculars from '@assets/images/simple-illustrations/simple-illustration_
import CompanyCard from '@assets/images/simple-illustrations/simple-illustration__company-card.svg';
import ReceiptUpload from '@assets/images/simple-illustrations/simple-illustration__receiptupload.svg';
import SplitBill from '@assets/images/simple-illustrations/simple-illustration__splitbill.svg';
import PiggyBank from '@assets/images/simple-illustrations/simple-illustration__piggybank.svg';

export {
Abracadabra,
Expand Down Expand Up @@ -140,4 +141,5 @@ export {
CompanyCard,
ReceiptUpload,
SplitBill,
PiggyBank,
};
2 changes: 1 addition & 1 deletion src/components/MenuItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,8 @@ function MenuItem(
combinedStyle,
!interactive && styles.cursorDefault,
StyleUtils.getButtonBackgroundColorStyle(getButtonState(focused || isHovered, pressed, success, disabled, interactive), true),
!focused && (isHovered || pressed) && hoverAndPressStyle,
...(Array.isArray(wrapperStyle) ? wrapperStyle : [wrapperStyle]),
!focused && (isHovered || pressed) && hoverAndPressStyle,
shouldGreyOutWhenDisabled && disabled && styles.buttonOpacityDisabled,
] as StyleProp<ViewStyle>
}
Expand Down
1 change: 1 addition & 0 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1218,6 +1218,7 @@ export default {
[CONST.ONBOARDING_CHOICES.TRACK]: "Track business spend for taxes",
[CONST.ONBOARDING_CHOICES.EMPLOYER]: "Get paid back by my employer",
[CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: "Manage my team's expenses",
[CONST.ONBOARDING_CHOICES.PERSONAL_SPEND]: "Track and budget personal spend",
[CONST.ONBOARDING_CHOICES.CHAT_SPLIT]: "Chat and split bills with friends",
[CONST.ONBOARDING_CHOICES.LOOKING_AROUND]: "I'm just looking around"
},
Expand Down
Loading

0 comments on commit 785680c

Please sign in to comment.