Skip to content

Commit

Permalink
Merge pull request #25 from boltcard/card-pin-number
Browse files Browse the repository at this point in the history
Add PIN support
  • Loading branch information
chloehjung15 authored Aug 9, 2023
2 parents 61d5470 + 8279537 commit 470c5bb
Show file tree
Hide file tree
Showing 14 changed files with 929 additions and 782 deletions.
2 changes: 2 additions & 0 deletions App.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
} from 'react-native';
import { NavigationContainer, CommonActions } from '@react-navigation/native';
import { SafeAreaProvider } from 'react-native-safe-area-context';
import Toast from 'react-native-toast-message';
import { navigationRef } from './NavigationService';
import * as NavigationService from './NavigationService';
import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
Expand Down Expand Up @@ -382,6 +383,7 @@ const App = () => {
<Biometric />
<WidgetCommunication />
<Privacy />
<Toast />
</SafeAreaProvider>
);
};
Expand Down
2 changes: 1 addition & 1 deletion BlueComponents.js
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ export const BlueFormTextInput = props => {
underlineColorAndroid="transparent"
style={{
paddingHorizontal: 8,
paddingVertical: 3,
paddingVertical: Platform.OS == 'ios' ? 8 : 3,
marginTop: 5,
marginHorizontal: 0,
borderColor: colors.formBorder,
Expand Down
4 changes: 0 additions & 4 deletions Navigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ import UnlockWith from './UnlockWith';

import BoltCardCreate from './screen/boltcard/create';
import BoltCardDetails from './screen/boltcard/details';
import BoltCardCreateHelp from './screen/boltcard/createHelp'
import BoltCardDisconnectHelp from './screen/boltcard/disconnectHelp'
import BoltCardDisconnect from './screen/boltcard/disconnect';

const WalletsStack = createNativeStackNavigator();
Expand Down Expand Up @@ -482,8 +480,6 @@ const BoltCardCreateRoot = () => {
<BoltCardCreateStack.Screen name="BoltCardCreate" component={BoltCardCreate} options={BoltCardCreate.navigationOptions(theme)} />
<BoltCardCreateStack.Screen name="BoltCardDisconnect" component={BoltCardDisconnect} options={BoltCardDisconnect.navigationOptions(theme)} />
<BoltCardCreateStack.Screen name="BoltCardDetails" component={BoltCardDetails} options={BoltCardDetails.navigationOptions(theme)} />
<BoltCardCreateStack.Screen name="BoltCardCreateHelp" component={BoltCardCreateHelp} options={BoltCardCreateHelp.navigationOptions(theme)} />
<BoltCardCreateStack.Screen name="BoltCardDisconnectHelp" component={BoltCardDisconnectHelp} options={BoltCardDisconnectHelp.navigationOptions(theme)} />
</BoltCardCreateStack.Navigator>
);
};
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ android {
/*
* https://www.epochconverter.com/
*/
versionCode 1684890697
versionName "0.1.8"
versionCode 1691557776
versionName "0.3.1"
multiDexEnabled true
testBuildType System.getProperty('testBuildType', 'debug') // This will later be used to control the test apk build type
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
Expand Down
Loading

0 comments on commit 470c5bb

Please sign in to comment.