* Closes #3787 * Merge options only when viewController conforms to RNNRootViewProtocol * better practice * Fixes e2e
|
|
||
67 |
|
67 |
|
68 |
|
68 |
|
69 |
|
69 |
|
70 |
|
|
|
71 |
|
|
|
72 |
|
|
|
73 |
|
|
|
|
70 |
|
|
|
71 |
|
|
|
72 |
|
|
74 |
|
73 |
|
75 |
|
74 |
|
76 |
|
|
|
77 |
|
|
|
78 |
|
|
|
79 |
|
|
|
80 |
|
|
|
81 |
|
|
|
82 |
|
|
|
83 |
|
|
|
84 |
|
|
|
85 |
|
|
|
86 |
|
|
|
87 |
|
|
|
88 |
|
|
|
89 |
|
|
|
|
75 |
|
|
90 |
|
76 |
|
91 |
|
77 |
|
92 |
|
|
|
93 |
|
78 |
|
94 |
|
79 |
|
95 |
|
80 |
|
|
|
||
7 |
|
7 |
|
8 |
|
8 |
|
9 |
|
9 |
|
10 |
|
|
|
11 |
|
10 |
|
12 |
|
11 |
|
13 |
|
12 |
|
|
|
||
19 |
|
19 |
|
20 |
|
20 |
|
21 |
|
21 |
|
22 |
|
|
|
23 |
|
|
|
24 |
|
|
|
25 |
|
|
|
26 |
|
|
|
27 |
|
|
|
28 |
|
|
|
29 |
|
|
|
30 |
|
|
|
31 |
|
|
|
32 |
|
|
|
33 |
|
|
|
34 |
|
22 |
|
35 |
|
23 |
|
36 |
|
24 |
|