Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,19 @@ jobs:
path: app/ios/xbuild/Build
key: ${{ runner.os }}-dd-xcode

- name: Get Yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT

- name: Restore Yarn cache
uses: actions/cache@v4
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-

- name: Install dependencies
working-directory: ./
run: |
Expand Down
42 changes: 26 additions & 16 deletions .github/workflows/quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,27 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: "3.11"

- name: Setup NodeJS
uses: ./.github/workflows/actions/setup-node

- name: Cache app node_modules
uses: actions/cache@v3
- name: Get Yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT

- name: Restore Yarn cache
uses: actions/cache@v4
id: yarn-cache
with:
path: .yarn/cache
# Cache will be invalidated if yarn.lock changes
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
restore-keys: ${{ runner.os }}-yarn-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-

- name: Install dependencies
working-directory: app
run: yarn install --immutable-cache
run: yarn install --immutable

- name: Cache bcsc-core build output
uses: actions/cache@v3
Expand Down Expand Up @@ -70,22 +75,27 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: "3.11"

- name: Setup NodeJS
uses: ./.github/workflows/actions/setup-node

- name: Cache app node_modules
uses: actions/cache@v3
- name: Get Yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT

- name: Restore Yarn cache
uses: actions/cache@v4
id: yarn-cache
with:
path: .yarn/cache
# Cache will be invalidated if yarn.lock changes
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
restore-keys: ${{ runner.os }}-yarn-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-

- name: Install dependencies
working-directory: app
run: yarn install --immutable-cache
run: yarn install --immutable

- name: Automated testing
run: yarn test
2 changes: 1 addition & 1 deletion app/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const App = () => {
<ErrorBoundaryWrapper logger={BCLogger}>
<ContainerProvider value={bcwContainer}>
<StoreProvider initialState={initialState} reducer={reducer}>
<ThemeProvider themes={themes} defaultThemeName={BCThemeNames.BCWallet}>
<ThemeProvider themes={themes} defaultThemeName={BCThemeNames.BCSC}>
<NavContainer navigationRef={navigationRef}>
<AnimatedComponentsProvider value={animatedComponents}>
<AuthProvider>
Expand Down
18 changes: 9 additions & 9 deletions app/ios/AriesBifold.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@
productReference = 00E356EE1AD99517003FC87E /* AriesBifoldTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
13B07F861A680F5B00A75B9A /* AriesBifold */ = {
13B07F861A680F5B00A75B9A /* BCWallet */ = {
isa = PBXNativeTarget;
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "AriesBifold" */;
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "BCWallet" */;
buildPhases = (
4CEDB2CE40AFB66799F0C504 /* [CP] Check Pods Manifest.lock */,
FD10A7F022414F080027D42C /* Start Packager */,
Expand All @@ -220,7 +220,7 @@
);
dependencies = (
);
name = AriesBifold;
name = BCWallet;
productName = AriesBifold;
productReference = 13B07F961A680F5B00A75B9A /* BCWallet.app */;
productType = "com.apple.product-type.application";
Expand Down Expand Up @@ -255,7 +255,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
13B07F861A680F5B00A75B9A /* AriesBifold */,
13B07F861A680F5B00A75B9A /* BCWallet */,
00E356ED1AD99517003FC87E /* AriesBifoldTests */,
);
};
Expand Down Expand Up @@ -470,7 +470,7 @@
/* Begin PBXTargetDependency section */
00E356F51AD99517003FC87E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 13B07F861A680F5B00A75B9A /* AriesBifold */;
target = 13B07F861A680F5B00A75B9A /* BCWallet */;
targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
Expand Down Expand Up @@ -557,7 +557,7 @@
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = ca.bc.gov.BCWallet;
PRODUCT_NAME = BCWallet;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
Expand Down Expand Up @@ -595,8 +595,8 @@
"-ObjC",
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = ca.bc.gov.BCWallet;
PRODUCT_NAME = BCWallet;
PRODUCT_BUNDLE_IDENTIFIER = ca.bc.gov.iddev.servicescard;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
Expand Down Expand Up @@ -756,7 +756,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "AriesBifold" */ = {
13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "BCWallet" */ = {
isa = XCConfigurationList;
buildConfigurations = (
13B07F941A680F5B00A75B9A /* Debug */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "BCWallet.app"
BlueprintName = "AriesBifold"
BlueprintName = "BCWallet"
ReferencedContainer = "container:AriesBifold.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand Down Expand Up @@ -56,7 +56,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "BCWallet.app"
BlueprintName = "AriesBifold"
BlueprintName = "BCWallet"
ReferencedContainer = "container:AriesBifold.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
Expand All @@ -73,7 +73,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "BCWallet.app"
BlueprintName = "AriesBifold"
BlueprintName = "BCWallet"
ReferencedContainer = "container:AriesBifold.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
Expand Down
4 changes: 2 additions & 2 deletions app/ios/AriesBifold/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>BC Wallet</string>
<string>BC Services Card</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
Expand Down Expand Up @@ -69,7 +69,7 @@
<key>NSFaceIDUsageDescription</key>
<string>$(PRODUCT_NAME) wants to use your FaceID/TouchID to authenticate your identity</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>We include this permission because a library our app uses references it, even though we don't use it directly</string>
<string>We include this permission because a library our app uses references it, even though we don&apos;t use it directly</string>
<key>NSMicrophoneUsageDescription</key>
<string>$(PRODUCT_NAME) needs access to your microphone to enable video calls</string>
<key>UIAppFonts</key>
Expand Down
18 changes: 12 additions & 6 deletions app/ios/GoogleService-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CLIENT_ID</key>
<string>27280337469-sandmglpe2viuf4p5u122tp4kc0hgqb7.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.27280337469-sandmglpe2viuf4p5u122tp4kc0hgqb7</string>
<key>API_KEY</key>
<string>AIzaSyCL37I5zpWEauPopROBm6d64bGDiimAvZE</string>
<string>AIzaSyBYE9-AFaGgXjS9wMXxkQcvR0gb-1L36ak</string>
<key>GCM_SENDER_ID</key>
<string>1008044298583</string>
<string>27280337469</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>ca.bc.gov.BCWallet</string>
<string>ca.bc.gov.iddev.servicescard</string>
<key>PROJECT_ID</key>
<string>bc-wallet-mobile</string>
<string>bcsc-ios-app</string>
<key>STORAGE_BUCKET</key>
<string>bc-wallet-mobile.appspot.com</string>
<string>bcsc-ios-app.appspot.com</string>
<key>IS_ADS_ENABLED</key>
<false></false>
<key>IS_ANALYTICS_ENABLED</key>
Expand All @@ -25,6 +29,8 @@
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:1008044298583:ios:76bfc02e8a3c04f844ae12</string>
<string>1:27280337469:ios:d17c95af9612ae764dd854</string>
<key>DATABASE_URL</key>
<string>https://bcsc-ios-app.firebaseio.com</string>
</dict>
</plist>
Binary file modified app/ios/Media.xcassets/AppIcon.appiconset/iTunesArtwork.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/src/store.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ export const initialState: BCState = {
developer: developerState,
dismissPersonCredentialOffer: dismissPersonCredentialOfferState,
bcsc: bcscState,
mode: Mode.BCWallet,
mode: Mode.BCSC,
}

const bcReducer = (state: BCState, action: ReducerAction<BCDispatchAction>): BCState => {
Expand Down
3 changes: 2 additions & 1 deletion app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"@screens/*": ["src/screens/*"],
"@services/*": ["src/services/*"],
"@types/*": ["src/types/*"],
"@utils/*": ["src/utils/*"]
"@utils/*": ["src/utils/*"],
"react-native-bcsc-core": ["../packages/bcsc-core/src"]
}
},
"exclude": ["node_modules", "metro.config.js", "babel.config.js", "jest.config.js", "jestSetup.js"]
Expand Down
Loading