Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hot fix 1 4 0 #563

Open
wants to merge 43 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
5680afd
Android Fixes
prameetc Feb 19, 2019
bdc139e
Merge branch 'feature/ui-release' of https://github.com/Bit-Nation/BI…
prameetc Feb 21, 2019
3e3f34b
Minor Fixes
prameetc Feb 22, 2019
7bb2f7e
Merge branch 'feature/ui-release' of https://github.com/Bit-Nation/BI…
prameetc Feb 22, 2019
05f10ff
update realm fix conflict with node 10, rn-nodeify lib, lucy btn notary
hunght Feb 23, 2019
45bae51
revert realm version
hunght Feb 23, 2019
14c9a2e
Added Zendesk Support and Integration
prameetc Feb 23, 2019
9978a98
refactor tab nations and add bitnation chat group
hunght Feb 25, 2019
7ed8fdb
fix conflict when push screen towhall tab
hunght Feb 26, 2019
e357055
fix conflict when push screen nations tab
hunght Feb 26, 2019
18027ad
fixed crash when no message on bitnation group
hunght Feb 26, 2019
f2d6df3
ios fix tabview push replace showModal
hunght Feb 26, 2019
949489b
ios fix tabview push replace showModal
hunght Feb 26, 2019
9e2e561
Revert "fixed crash when no message on bitnation group"
hunght Feb 26, 2019
d3b74bc
update nation id for bitnation group nation
hunght Feb 26, 2019
e2bfa97
fix conflict
hunght Feb 26, 2019
4719a2d
[UI] update some UI change
hunght Feb 27, 2019
e622aa2
Fixes to tab bar and headers
prameetc Feb 27, 2019
9886a2a
Fixed Conflicts
prameetc Feb 27, 2019
3495894
[UI] update govmarket tab
hunght Feb 28, 2019
11818cc
[UI] redesign some ui
hunght Feb 28, 2019
21a4db4
add resource menu icon
hunght Feb 28, 2019
1e8ebf2
resize logo menu
hunght Mar 1, 2019
21a1b80
fixed test
hunght Mar 3, 2019
6b740c8
Removed Unused Header and Search
prameetc Mar 5, 2019
1c8f82e
Updated Tests
prameetc Mar 5, 2019
8012e35
updated text icon govmarket
hunght Mar 10, 2019
4e7abbc
Added Codepush
prameetc Mar 12, 2019
027b450
Updated Lucy Modal
prameetc Mar 12, 2019
3a8a807
updated text and icons govmarket
hunght Mar 12, 2019
976a262
Merge branch 'feature/ui-release' of github.com:Bit-Nation/BITNATION-…
hunght Mar 12, 2019
d547189
Merge branch 'feature/ui-release' of github.com:Bit-Nation/BITNATION-…
hunght Mar 12, 2019
5746de2
Added Staging Assets Code
prameetc Mar 12, 2019
8ef8ba5
update icon nations
hunght Mar 13, 2019
a07ad7c
fixed image for nations
hunght Mar 13, 2019
ea64952
updated feature nationslist
hunght Mar 13, 2019
ab10672
Fixed Lucy Modal
prameetc Mar 13, 2019
df9152a
Added Navigation to report a service
prameetc Mar 13, 2019
bd3e45c
fixed setting issues
hunght Mar 14, 2019
746eab7
added CONFIRM_KEY_PROCESS_SCREEN
hunght Mar 14, 2019
2dd934c
change language to en as default
hunght Mar 14, 2019
83e442b
fixed flow test
hunght Mar 14, 2019
5e2d720
updated test
hunght Mar 14, 2019
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
4 changes: 2 additions & 2 deletions __tests__/src/components/common/__snapshots__/Button.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ ShallowWrapper {
/>,
undefined,
],
"disabled": true,
"disabled": false,
"enabled": true,
"onPress": [Function],
"style": Array [
Expand Down Expand Up @@ -480,7 +480,7 @@ ShallowWrapper {
/>,
undefined,
],
"disabled": true,
"disabled": false,
"enabled": true,
"onPress": [Function],
"style": Array [
Expand Down
16 changes: 16 additions & 0 deletions __tests__/src/components/common/__snapshots__/PanelView.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1342,6 +1342,7 @@ ShallowWrapper {
style={Object {}}
/>,
<CustomButton
enabled={true}
onPress={[Function]}
style={
Object {
Expand Down Expand Up @@ -1506,6 +1507,7 @@ ShallowWrapper {
"key": undefined,
"nodeType": "function",
"props": Object {
"enabled": true,
"onPress": [Function],
"style": Object {
"alignSelf": "stretch",
Expand Down Expand Up @@ -1592,6 +1594,7 @@ ShallowWrapper {
style={Object {}}
/>,
<CustomButton
enabled={true}
onPress={[Function]}
style={
Object {
Expand Down Expand Up @@ -1756,6 +1759,7 @@ ShallowWrapper {
"key": undefined,
"nodeType": "function",
"props": Object {
"enabled": true,
"onPress": [Function],
"style": Object {
"alignSelf": "stretch",
Expand Down Expand Up @@ -1930,6 +1934,7 @@ ShallowWrapper {
/>
</View>,
<CustomButton
enabled={true}
onPress={[Function]}
style={
Object {
Expand Down Expand Up @@ -2162,6 +2167,7 @@ ShallowWrapper {
"key": undefined,
"nodeType": "function",
"props": Object {
"enabled": true,
"onPress": [Function],
"style": Object {
"alignSelf": "stretch",
Expand Down Expand Up @@ -2280,6 +2286,7 @@ ShallowWrapper {
/>
</View>,
<CustomButton
enabled={true}
onPress={[Function]}
style={
Object {
Expand Down Expand Up @@ -2512,6 +2519,7 @@ ShallowWrapper {
"key": undefined,
"nodeType": "function",
"props": Object {
"enabled": true,
"onPress": [Function],
"style": Object {
"alignSelf": "stretch",
Expand Down Expand Up @@ -2680,6 +2688,7 @@ ShallowWrapper {
style={Object {}}
/>,
<CustomButton
enabled={true}
onPress={[Function]}
style={
Object {
Expand Down Expand Up @@ -2902,6 +2911,7 @@ ShallowWrapper {
"key": undefined,
"nodeType": "function",
"props": Object {
"enabled": true,
"onPress": [Function],
"style": Object {
"alignSelf": "stretch",
Expand Down Expand Up @@ -3030,6 +3040,7 @@ ShallowWrapper {
style={Object {}}
/>,
<CustomButton
enabled={true}
onPress={[Function]}
style={
Object {
Expand Down Expand Up @@ -3252,6 +3263,7 @@ ShallowWrapper {
"key": undefined,
"nodeType": "function",
"props": Object {
"enabled": true,
"onPress": [Function],
"style": Object {
"alignSelf": "stretch",
Expand Down Expand Up @@ -3436,6 +3448,7 @@ ShallowWrapper {
style={Object {}}
/>,
<CustomButton
enabled={true}
onPress={[Function]}
style={
Object {
Expand Down Expand Up @@ -3652,6 +3665,7 @@ ShallowWrapper {
"key": undefined,
"nodeType": "function",
"props": Object {
"enabled": true,
"onPress": [Function],
"style": Object {
"alignSelf": "stretch",
Expand Down Expand Up @@ -3764,6 +3778,7 @@ ShallowWrapper {
style={Object {}}
/>,
<CustomButton
enabled={true}
onPress={[Function]}
style={
Object {
Expand Down Expand Up @@ -3980,6 +3995,7 @@ ShallowWrapper {
"key": undefined,
"nodeType": "function",
"props": Object {
"enabled": true,
"onPress": [Function],
"style": Object {
"alignSelf": "stretch",
Expand Down
4 changes: 4 additions & 0 deletions __tests__/src/screens/ChatScreen/__snapshots__/index.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ ShallowWrapper {
"key": undefined,
"nodeType": "class",
"props": Object {
"groupDefault": false,
"groupNationId": undefined,
"hideSpinner": [Function],
"isBot": false,
"isFetching": true,
Expand Down Expand Up @@ -79,6 +81,8 @@ ShallowWrapper {
"key": undefined,
"nodeType": "class",
"props": Object {
"groupDefault": false,
"groupNationId": undefined,
"hideSpinner": [Function],
"isBot": false,
"isFetching": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ ShallowWrapper {
title="Previous"
/>
<CustomButton
enabled={true}
onPress={[Function]}
style={
Object {
Expand Down Expand Up @@ -318,6 +319,7 @@ ShallowWrapper {
title="Previous"
/>
<CustomButton
enabled={true}
onPress={[Function]}
style={
Object {
Expand Down Expand Up @@ -416,6 +418,7 @@ ShallowWrapper {
title="Previous"
/>
<CustomButton
enabled={true}
onPress={[Function]}
style={
Object {
Expand Down Expand Up @@ -538,6 +541,7 @@ ShallowWrapper {
title="Previous"
/>,
<CustomButton
enabled={true}
onPress={[Function]}
style={
Object {
Expand Down Expand Up @@ -578,6 +582,7 @@ ShallowWrapper {
"key": undefined,
"nodeType": "function",
"props": Object {
"enabled": true,
"onPress": [Function],
"style": Object {
"width": 90,
Expand Down Expand Up @@ -729,6 +734,7 @@ ShallowWrapper {
title="Previous"
/>
<CustomButton
enabled={true}
onPress={[Function]}
style={
Object {
Expand Down Expand Up @@ -882,6 +888,7 @@ ShallowWrapper {
title="Previous"
/>
<CustomButton
enabled={true}
onPress={[Function]}
style={
Object {
Expand Down Expand Up @@ -980,6 +987,7 @@ ShallowWrapper {
title="Previous"
/>
<CustomButton
enabled={true}
onPress={[Function]}
style={
Object {
Expand Down Expand Up @@ -1102,6 +1110,7 @@ ShallowWrapper {
title="Previous"
/>,
<CustomButton
enabled={true}
onPress={[Function]}
style={
Object {
Expand Down Expand Up @@ -1142,6 +1151,7 @@ ShallowWrapper {
"key": undefined,
"nodeType": "function",
"props": Object {
"enabled": true,
"onPress": [Function],
"style": Object {
"width": 90,
Expand Down
Loading